From patchwork Tue Aug 1 16:54:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27330 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id DDC52A16C; Tue, 1 Aug 2017 18:55:38 +0200 (CEST) Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by dpdk.org (Postfix) with ESMTP id A0F1AA0C6 for ; Tue, 1 Aug 2017 18:55:16 +0200 (CEST) Received: by mail-wr0-f172.google.com with SMTP id k71so9255207wrc.2 for ; Tue, 01 Aug 2017 09:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=zq8MKi6VqfeT2TtZ+/t/oRcFw8AQ63ullWnAjzluNUE=; b=amIbOdRQs+E8wbku/totKHmmO3o5xZHtsfMKClso+0EBmT4vEkOCMh1jwhIKyrBEKk epdOxvZlIhzqnHBMgiP9Px6xpoa7/XBTfoVgmQuCO8A7wiOCsWVg81z3J6o1NXODeT3i V6qhg63xIWnSJFSemmVVj0Z/FeD+zYwStkXwStvbTPGOGY0XzsnPR5E44sVTHswZnl2Z 7N/5gTJ0ir9xth2uy3xobDv/aY7ktGdkTbLN0BmqICqjbuf6hn0aygTZRodvIEhNUDkX /j4K8+oalmDAr/igrkTwMq5S27fctaFpfNhtGQ5cqZl65X9eJ2jg9033VdIzAgdjvXeT 7hUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zq8MKi6VqfeT2TtZ+/t/oRcFw8AQ63ullWnAjzluNUE=; b=r7aA+lelxyWITfqcWZ9ETSZ/U2TKfZWcsrqKnKjAo3M0r5OBHcQGsiP+ch3t0DgHC6 GtKfYBvokXaTOhK1bVqzq6O3MkPcySMU4fTsAAmrZZ9DIjj/r3ukbJnSkgJYu6Qv0eAC BSsCWYQKV9v/sLag/jyxAqcDgHa+LnK1+UGEioLSyPSmt0jz2/xz4CcffmnRKolvoZqm n/KZOH6IapJ7OKuNNtUQqCVqDsGx88P/Hp3WZ888thI9S8U9BcnVlHRMOExeldAWx2Sq kSIUAe+OnsKzzjdCGogfFX1bo+DhFkqKvBg16VDci1Iwmv2TzsDsvQrr6EGcGP4jd2g1 LvhA== X-Gm-Message-State: AIVw111LwUrjtSpGJZeDYcsbaOaF4ouexorueken2I+pQbqUwgUKuyjZ l+lnXW7tqC0wUknEKRo= X-Received: by 10.223.179.83 with SMTP id k19mr17960424wrd.198.1501606515931; Tue, 01 Aug 2017 09:55:15 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id v9sm1770319wmg.41.2017.08.01.09.55.14 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:14 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 1 Aug 2017 18:54:05 +0200 Message-Id: <7c454998a918c29815332297f8fe88b6ce47260c.1501598384.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 18/48] net/mlx4: drop packet type recognition support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The Verbs API used to implement packet type recognition is deprecated. Support will be added back after refactoring the PMD. Signed-off-by: Adrien Mazarguil --- doc/guides/nics/features/mlx4.ini | 1 - drivers/net/mlx4/mlx4.c | 70 +--------------------------------- 2 files changed, 2 insertions(+), 69 deletions(-) diff --git a/doc/guides/nics/features/mlx4.ini b/doc/guides/nics/features/mlx4.ini index 08a2e17..27c7ae3 100644 --- a/doc/guides/nics/features/mlx4.ini +++ b/doc/guides/nics/features/mlx4.ini @@ -14,7 +14,6 @@ MTU update = Y Jumbo frame = Y Scattered Rx = Y SR-IOV = Y -Packet type parsing = Y Basic stats = Y Stats per queue = Y Other kdrv = Y diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 36a616b..e0e5d1f 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -96,12 +96,6 @@ typedef union { #define WR_ID(o) (((wr_id_t *)&(o))->data) -/* Transpose flags. Useful to convert IBV to DPDK flags. */ -#define TRANSPOSE(val, from, to) \ - (((from) >= (to)) ? \ - (((val) & (from)) / ((from) / (to))) : \ - (((val) & (from)) * ((to) / (from)))) - /** Configuration structure for device arguments. */ struct mlx4_conf { struct { @@ -2088,47 +2082,6 @@ rxq_cleanup(struct rxq *rxq) memset(rxq, 0, sizeof(*rxq)); } -/** - * Translate RX completion flags to packet type. - * - * @param flags - * RX completion flags returned by poll_length_flags(). - * - * @note: fix mlx4_dev_supported_ptypes_get() if any change here. - * - * @return - * Packet type for struct rte_mbuf. - */ -static inline uint32_t -rxq_cq_to_pkt_type(uint32_t flags) -{ - uint32_t pkt_type; - - if (flags & IBV_EXP_CQ_RX_TUNNEL_PACKET) - pkt_type = - TRANSPOSE(flags, - IBV_EXP_CQ_RX_OUTER_IPV4_PACKET, - RTE_PTYPE_L3_IPV4_EXT_UNKNOWN) | - TRANSPOSE(flags, - IBV_EXP_CQ_RX_OUTER_IPV6_PACKET, - RTE_PTYPE_L3_IPV6_EXT_UNKNOWN) | - TRANSPOSE(flags, - IBV_EXP_CQ_RX_IPV4_PACKET, - RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN) | - TRANSPOSE(flags, - IBV_EXP_CQ_RX_IPV6_PACKET, - RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN); - else - pkt_type = - TRANSPOSE(flags, - IBV_EXP_CQ_RX_IPV4_PACKET, - RTE_PTYPE_L3_IPV4_EXT_UNKNOWN) | - TRANSPOSE(flags, - IBV_EXP_CQ_RX_IPV6_PACKET, - RTE_PTYPE_L3_IPV6_EXT_UNKNOWN); - return pkt_type; -} - static uint16_t mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n); @@ -2315,7 +2268,7 @@ mlx4_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) NB_SEGS(pkt_buf) = j; PORT(pkt_buf) = rxq->port_id; PKT_LEN(pkt_buf) = pkt_buf_len; - pkt_buf->packet_type = rxq_cq_to_pkt_type(flags); + pkt_buf->packet_type = 0; pkt_buf->ol_flags = 0; /* Return packet. */ @@ -2470,7 +2423,7 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) NEXT(seg) = NULL; PKT_LEN(seg) = len; DATA_LEN(seg) = len; - seg->packet_type = rxq_cq_to_pkt_type(flags); + seg->packet_type = 0; seg->ol_flags = 0; /* Return packet. */ @@ -3369,24 +3322,6 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) priv_unlock(priv); } -static const uint32_t * -mlx4_dev_supported_ptypes_get(struct rte_eth_dev *dev) -{ - static const uint32_t ptypes[] = { - /* refers to rxq_cq_to_pkt_type() */ - RTE_PTYPE_L3_IPV4, - RTE_PTYPE_L3_IPV6, - RTE_PTYPE_INNER_L3_IPV4, - RTE_PTYPE_INNER_L3_IPV6, - RTE_PTYPE_UNKNOWN - }; - - if (dev->rx_pkt_burst == mlx4_rx_burst || - dev->rx_pkt_burst == mlx4_rx_burst_sp) - return ptypes; - return NULL; -} - /** * DPDK callback to get device statistics. * @@ -3768,7 +3703,6 @@ static const struct eth_dev_ops mlx4_dev_ops = { .stats_get = mlx4_stats_get, .stats_reset = mlx4_stats_reset, .dev_infos_get = mlx4_dev_infos_get, - .dev_supported_ptypes_get = mlx4_dev_supported_ptypes_get, .rx_queue_setup = mlx4_rx_queue_setup, .tx_queue_setup = mlx4_tx_queue_setup, .rx_queue_release = mlx4_rx_queue_release,