From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 94872A0C41; Wed, 17 Nov 2021 19:08:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E2A841141; Wed, 17 Nov 2021 19:08:19 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id BE5594068C for ; Wed, 17 Nov 2021 19:08:17 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="297440520" X-IronPort-AV: E=Sophos;i="5.87,241,1631602800"; d="scan'208";a="297440520" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 10:08:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,241,1631602800"; d="scan'208";a="454981648" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.27]) by orsmga006.jf.intel.com with ESMTP; 17 Nov 2021 10:08:12 -0800 From: Ferruh Yigit To: Rasesh Mody , Shahed Shaikh , Rahul Lakkireddy , Apeksha Gupta , Sachin Saxena , Qi Zhang , Xiao Wang , Ziyang Xuan , Xiaoyun Wang , Guoyang Zhou , Beilei Xing , Jingjing Wu , Qiming Yang , Rosen Xu , Haiyue Wang , Jiawen Wu , Jian Wang , Maxime Coquelin , Chenbo Xia , Olivier Matz Cc: Ferruh Yigit , dev@dpdk.org Subject: [PATCH v2] net: add macro for VLAN header length Date: Wed, 17 Nov 2021 18:08:02 +0000 Message-Id: <20211117180802.2577014-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211110174029.614449-1-ferruh.yigit@intel.com> References: <20211110174029.614449-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Multiple drivers are defining macros for VLAN header length, to remove the redundancy defining macro in the ether header. And updated drivers to use the new macro. Signed-off-by: Ferruh Yigit Acked-by: Haiyue Wang Acked-by: Rosen Xu Acked-by: Jiawen Wu --- v2: * update new enetfec driver too * Add doxygen comment to macro --- drivers/net/bnx2x/bnx2x_vfpf.c | 2 +- drivers/net/bnx2x/bnx2x_vfpf.h | 2 -- drivers/net/cxgbe/cxgbe_compat.h | 1 - drivers/net/cxgbe/sge.c | 2 +- drivers/net/enetfec/enet_ethdev.h | 1 - drivers/net/enetfec/enet_rxtx.c | 4 ++-- drivers/net/fm10k/fm10k.h | 2 -- drivers/net/fm10k/fm10k_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.h | 3 +-- drivers/net/i40e/i40e_ethdev.h | 4 +--- drivers/net/iavf/iavf.h | 3 +-- drivers/net/ice/ice_dcf_ethdev.c | 2 +- drivers/net/ice/ice_ethdev.h | 4 +--- drivers/net/ipn3ke/ipn3ke_ethdev.h | 3 +-- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ixgbe/ixgbe_ethdev.h | 1 - drivers/net/ixgbe/ixgbe_rxtx.c | 4 ++-- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.h | 1 - drivers/net/ngbe/ngbe_rxtx.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.h | 1 - drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/txgbe/txgbe_rxtx.c | 4 ++-- examples/vhost/main.c | 3 +-- lib/net/rte_ether.h | 5 +++-- 26 files changed, 25 insertions(+), 41 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c index 0e8a92cd336e..945e3df84ff8 100644 --- a/drivers/net/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/bnx2x/bnx2x_vfpf.c @@ -54,7 +54,7 @@ bnx2x_check_bull(struct bnx2x_softc *sc) if (valid_bitmap & (1 << MAC_ADDR_VALID) && memcmp(bull->mac, sc->old_bulletin.mac, ETH_ALEN)) rte_memcpy(&sc->link_params.mac_addr, bull->mac, ETH_ALEN); if (valid_bitmap & (1 << VLAN_VALID)) - rte_memcpy(&bull->vlan, &sc->old_bulletin.vlan, VLAN_HLEN); + rte_memcpy(&bull->vlan, &sc->old_bulletin.vlan, RTE_VLAN_HLEN); sc->old_bulletin = *bull; diff --git a/drivers/net/bnx2x/bnx2x_vfpf.h b/drivers/net/bnx2x/bnx2x_vfpf.h index 7aab8b101aaa..957734126687 100644 --- a/drivers/net/bnx2x/bnx2x_vfpf.h +++ b/drivers/net/bnx2x/bnx2x_vfpf.h @@ -10,8 +10,6 @@ #include "ecore_sp.h" -#define VLAN_HLEN 4 - struct vf_resource_query { uint8_t num_rxqs; uint8_t num_txqs; diff --git a/drivers/net/cxgbe/cxgbe_compat.h b/drivers/net/cxgbe/cxgbe_compat.h index 83ae1c2e5a83..8d3737fc6100 100644 --- a/drivers/net/cxgbe/cxgbe_compat.h +++ b/drivers/net/cxgbe/cxgbe_compat.h @@ -75,7 +75,6 @@ extern int cxgbe_mbox_logtype; #define CXGBE_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) #define PTR_ALIGN(p, a) ((typeof(p))CXGBE_ALIGN((unsigned long)(p), (a))) -#define VLAN_HLEN 4 #define ETHER_ADDR_LEN 6 #define rmb() rte_rmb() /* dpdk rte provided rmb */ diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c index 9e464cb3da9f..f623f3e68420 100644 --- a/drivers/net/cxgbe/sge.c +++ b/drivers/net/cxgbe/sge.c @@ -72,7 +72,7 @@ static inline unsigned int fl_mtu_bufsize(struct adapter *adapter, { struct sge *s = &adapter->sge; - return CXGBE_ALIGN(s->pktshift + RTE_ETHER_HDR_LEN + VLAN_HLEN + mtu, + return CXGBE_ALIGN(s->pktshift + RTE_ETHER_HDR_LEN + RTE_VLAN_HLEN + mtu, s->fl_align); } diff --git a/drivers/net/enetfec/enet_ethdev.h b/drivers/net/enetfec/enet_ethdev.h index 798b6eee05bd..573b0672cd65 100644 --- a/drivers/net/enetfec/enet_ethdev.h +++ b/drivers/net/enetfec/enet_ethdev.h @@ -10,7 +10,6 @@ #define BD_LEN 49152 #define ENETFEC_TX_FR_SIZE 2048 #define ETH_HLEN RTE_ETHER_HDR_LEN -#define VLAN_HLEN 4 /* full duplex */ #define FULL_DUPLEX 0x00 diff --git a/drivers/net/enetfec/enet_rxtx.c b/drivers/net/enetfec/enet_rxtx.c index eac5ccf69bb7..49b326315dde 100644 --- a/drivers/net/enetfec/enet_rxtx.c +++ b/drivers/net/enetfec/enet_rxtx.c @@ -111,9 +111,9 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts, vlan_tag = rte_be_to_cpu_16(vlan_header->vlan_tci); vlan_packet_rcvd = true; - memmove((uint8_t *)mbuf_data + VLAN_HLEN, + memmove((uint8_t *)mbuf_data + RTE_VLAN_HLEN, data, RTE_ETHER_ADDR_LEN * 2); - rte_pktmbuf_adj(mbuf, VLAN_HLEN); + rte_pktmbuf_adj(mbuf, RTE_VLAN_HLEN); } if (rxq->fep->bufdesc_ex && diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h index b7522a47a80b..7cfa29faa85a 100644 --- a/drivers/net/fm10k/fm10k.h +++ b/drivers/net/fm10k/fm10k.h @@ -81,8 +81,6 @@ RTE_MIN(((txq)->nb_desc - 2), (txq)->free_thresh) #define FM10K_TX_RS_THRESH_DIV(txq) ((txq)->nb_desc) -#define FM10K_VLAN_TAG_SIZE 4 - /* Maximum number of MAC addresses per PF/VF */ #define FM10K_MAX_MACADDR_NUM 64 diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index c25c32314065..7c85a057466a 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -759,7 +759,7 @@ fm10k_dev_rx_init(struct rte_eth_dev *dev) /* It adds dual VLAN length for supporting dual VLAN */ if ((dev->data->mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + - 2 * FM10K_VLAN_TAG_SIZE) > buf_size || + 2 * RTE_VLAN_HLEN) > buf_size || rxq->offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { uint32_t reg; dev->data->scattered_rx = 1; diff --git a/drivers/net/hinic/hinic_pmd_ethdev.h b/drivers/net/hinic/hinic_pmd_ethdev.h index 8f1b3d58886f..5eca8b10b9e1 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.h +++ b/drivers/net/hinic/hinic_pmd_ethdev.h @@ -35,9 +35,8 @@ #define HINIC_MAX_MTU_SIZE 9600 #define HINIC_MIN_MTU_SIZE 256 -#define HINIC_VLAN_TAG_SIZE 4 #define HINIC_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + HINIC_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) #define HINIC_MIN_FRAME_SIZE (HINIC_MIN_MTU_SIZE + HINIC_ETH_OVERHEAD) #define HINIC_MAX_JUMBO_FRAME_SIZE (HINIC_MAX_MTU_SIZE + HINIC_ETH_OVERHEAD) diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index d8042abbd9be..2d182f8000a6 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -27,8 +27,6 @@ */ #define I40E_GL_RXERR1_H(_i) (0x00318004 + ((_i) * 8)) -#define I40E_VLAN_TAG_SIZE 4 - #define I40E_AQ_LEN 32 #define I40E_AQ_BUF_SZ 4096 /* Number of queues per TC should be one of 1, 2, 4, 8, 16, 32, 64 */ @@ -292,7 +290,7 @@ struct rte_flow { * Considering QinQ packet, the VLAN tag needs to be counted twice. */ #define I40E_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) #define I40E_ETH_MAX_LEN (RTE_ETHER_MTU + I40E_ETH_OVERHEAD) #define I40E_RXTX_BYTES_H_16_BIT(bytes) ((bytes) & ~I40E_48_BIT_MASK) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index f413dbed833a..0bb5698583ba 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -78,9 +78,8 @@ /* The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice. */ -#define IAVF_VLAN_TAG_SIZE 4 #define IAVF_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IAVF_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) #define IAVF_ETH_MAX_LEN (RTE_ETHER_MTU + IAVF_ETH_OVERHEAD) #define IAVF_32_BIT_WIDTH (CHAR_BIT * 4) diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index d1e675764127..28f7f7fb72c4 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -81,7 +81,7 @@ ice_dcf_init_rxq(struct rte_eth_dev *dev, struct ice_rx_queue *rxq) rxq->max_pkt_len = max_pkt_len; if ((dev_data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) || - (rxq->max_pkt_len + 2 * ICE_VLAN_TAG_SIZE) > buf_size) { + (rxq->max_pkt_len + 2 * RTE_VLAN_HLEN) > buf_size) { dev_data->scattered_rx = 1; } rxq->qrx_tail = hw->hw_addr + IAVF_QRX_TAIL1(rxq->queue_id); diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index f8d0f0c6ee26..11f7eb435233 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -14,8 +14,6 @@ #include "base/ice_adminq_cmd.h" #include "base/ice_flow.h" -#define ICE_VLAN_TAG_SIZE 4 - #define ICE_ADMINQ_LEN 32 #define ICE_SBIOQ_LEN 32 #define ICE_MAILBOXQ_LEN 32 @@ -136,7 +134,7 @@ * Considering QinQ packet, the VLAN tag needs to be counted twice. */ #define ICE_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) #define ICE_ETH_MAX_LEN (RTE_ETHER_MTU + ICE_ETH_OVERHEAD) #define ICE_RXTX_BYTES_HIGH(bytes) ((bytes) & ~ICE_40_BIT_MASK) diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h b/drivers/net/ipn3ke/ipn3ke_ethdev.h index ba3f8821e235..041f13d9c365 100644 --- a/drivers/net/ipn3ke/ipn3ke_ethdev.h +++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h @@ -633,13 +633,12 @@ ipn3ke_tm_ops_get(struct rte_eth_dev *ethdev, #define IPN3KE_MAC_RX_FRAME_CONTROL_EN_ALLMCAST_MASK \ IPN3KE_MASK(0x1, IPN3KE_MAC_RX_FRAME_CONTROL_EN_ALLMCAST_SHIFT) -#define IPN3KE_VLAN_TAG_SIZE 4 /** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice. */ #define IPN3KE_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IPN3KE_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2) #define IPN3KE_ETH_MAX_LEN (RTE_ETHER_MTU + IPN3KE_ETH_OVERHEAD) #define IPN3KE_MAC_FRAME_SIZE_MAX 9728 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 1911cf2fab05..fe61dba81d68 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5173,7 +5173,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) * scattered packets when this feature has not been enabled before. */ if (dev->data->dev_started && !dev->data->scattered_rx && - frame_size + 2 * IXGBE_VLAN_TAG_SIZE > + frame_size + 2 * RTE_VLAN_HLEN > dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM) { PMD_INIT_LOG(ERR, "Stop port first."); return -EINVAL; @@ -6341,7 +6341,7 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) * scattered packets when this feature has not been enabled before. */ if (dev_data->dev_started && !dev_data->scattered_rx && - (max_frame + 2 * IXGBE_VLAN_TAG_SIZE > + (max_frame + 2 * RTE_VLAN_HLEN > dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) { PMD_INIT_LOG(ERR, "Stop port first."); return -EINVAL; diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 876b670f2682..83e8b5e56a6f 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -43,7 +43,6 @@ #define IXGBE_NB_STAT_MAPPING_REGS 32 #define IXGBE_EXTENDED_VLAN (uint32_t)(1 << 26) /* EXTENDED VLAN ENABLE */ #define IXGBE_VFTA_SIZE 128 -#define IXGBE_VLAN_TAG_SIZE 4 #define IXGBE_HKEY_MAX_INDEX 10 #define IXGBE_MAX_RX_QUEUE_NUM 128 #define IXGBE_MAX_INTR_QUEUE_NUM 15 diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index cd259430461a..d7c80d424263 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -5153,7 +5153,7 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev) IXGBE_SRRCTL_BSIZEPKT_SHIFT); /* It adds dual VLAN length for supporting dual VLAN */ - if (frame_size + 2 * IXGBE_VLAN_TAG_SIZE > buf_size) + if (frame_size + 2 * RTE_VLAN_HLEN > buf_size) dev->data->scattered_rx = 1; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) rx_conf->offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP; @@ -5729,7 +5729,7 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_SCATTER || /* It adds dual VLAN length for supporting dual VLAN */ - (frame_size + 2 * IXGBE_VLAN_TAG_SIZE) > buf_size) { + (frame_size + 2 * RTE_VLAN_HLEN) > buf_size) { if (!dev->data->scattered_rx) PMD_INIT_LOG(DEBUG, "forcing scatter mode"); dev->data->scattered_rx = 1; diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 775789f59607..981592f7f495 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -2488,7 +2488,7 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) * scattered packets when this feature has not been enabled before. */ if (dev_data->dev_started && !dev_data->scattered_rx && - (frame_size + 2 * NGBE_VLAN_TAG_SIZE > + (frame_size + 2 * RTE_VLAN_HLEN > dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) { PMD_INIT_LOG(ERR, "Stop port first."); return -EINVAL; diff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h index c68582e5aea5..bb96f6a5e7e0 100644 --- a/drivers/net/ngbe/ngbe_ethdev.h +++ b/drivers/net/ngbe/ngbe_ethdev.h @@ -19,7 +19,6 @@ #define NGBE_FLAG_NEED_LINK_CONFIG ((uint32_t)(1 << 4)) #define NGBE_VFTA_SIZE 128 -#define NGBE_VLAN_TAG_SIZE 4 #define NGBE_HKEY_MAX_INDEX 10 /*Default value of Max Rx Queue*/ #define NGBE_MAX_RX_QUEUE_NUM 8 diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c index 0feea92588a1..86a5ef5486ec 100644 --- a/drivers/net/ngbe/ngbe_rxtx.c +++ b/drivers/net/ngbe/ngbe_rxtx.c @@ -2951,7 +2951,7 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev) /* It adds dual VLAN length for supporting dual VLAN */ if (dev->data->mtu + NGBE_ETH_OVERHEAD + - 2 * NGBE_VLAN_TAG_SIZE > buf_size) + 2 * RTE_VLAN_HLEN > buf_size) dev->data->scattered_rx = 1; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) rx_conf->offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP; diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 04afc6134142..47d0e6ea40f2 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3461,7 +3461,7 @@ txgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) * scattered packets when this feature has not been enabled before. */ if (dev_data->dev_started && !dev_data->scattered_rx && - (frame_size + 2 * TXGBE_VLAN_TAG_SIZE > + (frame_size + 2 * RTE_VLAN_HLEN > dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) { PMD_INIT_LOG(ERR, "Stop port first."); return -EINVAL; diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h index 8304b68292da..262dbb5e38ff 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -36,7 +36,6 @@ * FreeBSD driver. */ #define TXGBE_VFTA_SIZE 128 -#define TXGBE_VLAN_TAG_SIZE 4 #define TXGBE_HKEY_MAX_INDEX 10 /*Default value of Max Rx Queue*/ #define TXGBE_MAX_RX_QUEUE_NUM 128 diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index 67ae69dec30a..c7c298ae2d02 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -1111,7 +1111,7 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) * scattered packets when this feature has not been enabled before. */ if (dev_data->dev_started && !dev_data->scattered_rx && - (max_frame + 2 * TXGBE_VLAN_TAG_SIZE > + (max_frame + 2 * RTE_VLAN_HLEN > dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) { PMD_INIT_LOG(ERR, "Stop port first."); return -EINVAL; diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 497af8d22d23..35b77cb271ba 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -4389,7 +4389,7 @@ txgbe_dev_rx_init(struct rte_eth_dev *dev) /* It adds dual VLAN length for supporting dual VLAN */ if (dev->data->mtu + TXGBE_ETH_OVERHEAD + - 2 * TXGBE_VLAN_TAG_SIZE > buf_size) + 2 * RTE_VLAN_HLEN > buf_size) dev->data->scattered_rx = 1; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) rx_conf->offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP; @@ -4906,7 +4906,7 @@ txgbevf_dev_rx_init(struct rte_eth_dev *dev) if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_SCATTER || /* It adds dual VLAN length for supporting dual VLAN */ (dev->data->mtu + TXGBE_ETH_OVERHEAD + - 2 * TXGBE_VLAN_TAG_SIZE) > buf_size) { + 2 * RTE_VLAN_HLEN) > buf_size) { if (!dev->data->scattered_rx) PMD_INIT_LOG(DEBUG, "forcing scatter mode"); dev->data->scattered_rx = 1; diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 8bf61b32b669..33d023aa3973 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -195,7 +195,6 @@ struct vhost_bufftable *vhost_txbuff[RTE_MAX_LCORE * MAX_VHOST_DEVICE]; #define MBUF_TABLE_DRAIN_TSC ((rte_get_tsc_hz() + US_PER_S - 1) \ / US_PER_S * BURST_TX_DRAIN_US) -#define VLAN_HLEN 4 static inline int open_dma(const char *value) @@ -1015,7 +1014,7 @@ find_local_dest(struct vhost_dev *vdev, struct rte_mbuf *m, * by minus length of vlan tag, so need restore * the packet length by plus it. */ - *offset = VLAN_HLEN; + *offset = RTE_VLAN_HLEN; *vlan_tag = vlan_tags[vdev->vid]; RTE_LOG_DP(DEBUG, VHOST_DATA, diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index 1a0dbf0d607c..3d9852d9e29a 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -35,9 +35,10 @@ extern "C" { (RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN - \ RTE_ETHER_CRC_LEN) /**< Ethernet MTU. */ +#define RTE_VLAN_HLEN 4 /**< VLAN (IEEE 802.1Q) header length. */ +/** Maximum VLAN frame length (excluding QinQ), including CRC. */ #define RTE_ETHER_MAX_VLAN_FRAME_LEN \ - (RTE_ETHER_MAX_LEN + 4) - /**< Maximum VLAN frame length, including CRC. */ + (RTE_ETHER_MAX_LEN + RTE_VLAN_HLEN) #define RTE_ETHER_MAX_JUMBO_FRAME_LEN \ 0x3F00 /**< Maximum Jumbo frame length, including CRC. */ -- 2.31.1