net: add macro for VLAN header length
PATCH 1/1 net: add macro for VLAN header length
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.
--- 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/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 +++-- 24 files changed, 23 insertions(+), 38 deletions(-)
drivers/net/bnx2x/bnx2x_vfpf.c +1 -1
@@ -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;
drivers/net/bnx2x/bnx2x_vfpf.h +0 -2
@@ -10,8 +10,6 @@#include "ecore_sp.h" -#define VLAN_HLEN 4 -struct vf_resource_query {uint8_t num_rxqs;uint8_t num_txqs;
drivers/net/cxgbe/cxgbe_compat.h +0 -1
@@ -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 */
drivers/net/cxgbe/sge.c +1 -1
@@ -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); }
drivers/net/fm10k/fm10k.h +0 -2
@@ -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
drivers/net/fm10k/fm10k_ethdev.c +1 -1
@@ -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 ;
drivers/net/hinic/hinic_pmd_ethdev.h +1 -2
@@ -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)
drivers/net/i40e/i40e_ethdev.h +1 -3
@@ -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)
drivers/net/iavf/iavf.h +1 -2
@@ -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)
drivers/net/ice/ice_dcf_ethdev.c +1 -1
@@ -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);
drivers/net/ice/ice_ethdev.h +1 -3
@@ -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)
drivers/net/ipn3ke/ipn3ke_ethdev.h +1 -2
@@ -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
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
@@ -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 ;
drivers/net/ixgbe/ixgbe_ethdev.h +0 -1
@@ -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
drivers/net/ixgbe/ixgbe_rxtx.c +2 -2
@@ -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 ;
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/ngbe/ngbe_ethdev.h +0 -1
@@ -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
drivers/net/ngbe/ngbe_rxtx.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.h +0 -1
@@ -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
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_rxtx.c +2 -2
@@ -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 ;
examples/vhost/main.c +1 -2
@@ -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 4static inline int open_dma (const char *value)
@@ -1010,7 +1009,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,
lib/net/rte_ether.h +3 -2
@@ -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 +/** Maximum VLAN frame length, 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. */
Signature · 1 line
2.31.1
Quoted 34 lines
-----Original Message-----
From: Yigit, Ferruh <[email protected]>
Sent: Thursday, November 11, 2021 01:40
To: Rasesh Mody <[email protected]>; Shahed Shaikh <[email protected]>; Rahul Lakkireddy <[email protected]>; Zhang, Qi Z <[email protected]>; Wang, Xiao W <[email protected]>; Ziyang Xuan <[email protected]>; Xiaoyun Wang <[email protected]>; Guoyang Zhou <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Yang, Qiming <[email protected]>; Xu, Rosen <[email protected]>; Wang, Haiyue <[email protected]>; Jiawen Wu <[email protected]>; Jian Wang <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Olivier Matz <[email protected]>
Cc: Yigit, Ferruh <[email protected]>; [email protected]
Subject: [PATCH] net: add macro for VLAN header lengthMultiple 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 <[email protected]>--- 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/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 +--
Quoted 3 lines
drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ixgbe/ixgbe_ethdev.h | 1 - drivers/net/ixgbe/ixgbe_rxtx.c | 4 ++--
Thanks for the cleanup work. ;-)
Quoted 15 lines
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 +++-- 24 files changed, 23 insertions(+), 38 deletions(-)--
2.31.1
Hi,
Quoted 23 lines
-----Original Message-----
From: Yigit, Ferruh <[email protected]>
Sent: Thursday, November 11, 2021 1:40
To: Rasesh Mody <[email protected]>; Shahed Shaikh <[email protected]>; Rahul Lakkireddy <[email protected]>; Zhang, Qi Z <[email protected]>; Wang, Xiao W <[email protected]>; Ziyang Xuan <[email protected]>; Xiaoyun Wang <[email protected]>; Guoyang Zhou <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Yang, Qiming <[email protected]>; Xu, Rosen <[email protected]>; Wang, Haiyue <[email protected]>; Jiawen Wu <[email protected]>; Jian Wang <[email protected]>; Maxime Coquelin <[email protected]>; Xia, Chenbo <[email protected]>; Olivier Matz <[email protected]>
Cc: Yigit, Ferruh <[email protected]>; [email protected]
Subject: [PATCH] net: add macro for VLAN header lengthMultiple 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 <[email protected]>
Quoted 13 lines
--- 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/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 +--
Quoted 13 lines
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 +++-- 24 files changed, 23 insertions(+), 38 deletions(-)
Quoted 20 lines · Ferruh Yigit
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 <[email protected]>--- 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/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 -
Quoted 8 lines
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 ++--
For txgbe/ngbe,
Quoted 3 lines
examples/vhost/main.c | 3 +-- lib/net/rte_ether.h | 5 +++-- 24 files changed, 23 insertions(+), 38 deletions(-)
10/11/2021 18:40, Ferruh Yigit:
Quoted 5 lines
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 <[email protected]>
[...]
lib/net/rte_ether.h extern "C" { · line 38
Quoted 3 lines
lib/net/rte_ether.h +1
-0+#define RTE_VLAN_HLEN 4
Please could you add a doxygen comment for this constant?
lib/net/rte_ether.h extern "C" { · line 41
Quoted 5 lines
lib/net/rte_ether.h +2
-2+/** Maximum VLAN frame length, 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)
What about QinQ?
Quoted 5 lines · Thomas Monjalon
10/11/2021 18:40, Ferruh Yigit:
Quoted 4 lines
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.
Quoted 8 lines
Quoted 1 line
Signed-off-by Ferruh Yigit <[email protected]>[...]
lib/net/rte_ether.h extern "C" { · line 38
Quoted 3 lines
lib/net/rte_ether.h +1
-0+#define RTE_VLAN_HLEN 4Please could you add a doxygen comment for this constant?
ack.
Quoted 8 lines
lib/net/rte_ether.h extern "C" { · line 41
Quoted 5 lines
lib/net/rte_ether.h +2
-2+/** Maximum VLAN frame length, 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)What about QinQ?
I am just replacing hardcoded value with macro in this patch. Changing 'RTE_ETHER_MAX_LEN' may have unexpected affect, and may not be good thing to the at this stage.
17/11/2021 11:00, Ferruh Yigit:
Quoted 26 lines · Thomas Monjalon
Quoted 5 lines
10/11/2021 18:40, Ferruh Yigit:
Quoted 4 lines
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.Quoted 8 lines
Quoted 1 line
Signed-off-by Ferruh Yigit <[email protected]>[...]
lib/net/rte_ether.h extern "C" { · line 38
Quoted 3 lines
lib/net/rte_ether.h +1
-0+#define RTE_VLAN_HLEN 4Please could you add a doxygen comment for this constant?
ack.
Quoted 8 lines
lib/net/rte_ether.h extern "C" { · line 41
Quoted 5 lines
lib/net/rte_ether.h +2
-2+/** Maximum VLAN frame length, 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)What about QinQ?
Quoted 3 lines
I am just replacing hardcoded value with macro in this patch. Changing '
RTE_ETHER_MAX_LEN' may have unexpected affect, and may not be good thing to the at this stage.
Sure
But can we take this opportunity to note that this macro does not take QinQ into account?
Just a comment update?
Same for RTE_VLAN_HLEN, it is only one VLAN.
Quoted 27 lines · Thomas Monjalon
17/11/2021 11:00, Ferruh Yigit:
Quoted 26 lines · Thomas Monjalon
Quoted 5 lines
10/11/2021 18:40, Ferruh Yigit:
Quoted 4 lines
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.Quoted 8 lines
Quoted 1 line
Signed-off-by Ferruh Yigit <[email protected]>[...]
lib/net/rte_ether.h extern "C" { · line 38
Quoted 3 lines
lib/net/rte_ether.h +1
-0+#define RTE_VLAN_HLEN 4Please could you add a doxygen comment for this constant?
ack.
Quoted 8 lines
lib/net/rte_ether.h extern "C" { · line 41
Quoted 5 lines
lib/net/rte_ether.h +2
-2+/** Maximum VLAN frame length, 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)What about QinQ?
Quoted 9 lines
Quoted 3 lines
I am just replacing hardcoded value with macro in this patch. Changing '
RTE_ETHER_MAX_LEN' may have unexpected affect, and may not be good thing to the at this stage.Sure
But can we take this opportunity to note that this macro does not take QinQ into account?
Just a comment update?
Yep, a can put a brief note.
Quoted 3 lines
Same for
RTE_VLAN_HLEN, it is only one VLAN.
PATCH v2 1/1 net: add macro for VLAN header length
In reply to Ferruh YigitMultiple 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.
---
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(-)
drivers/net/bnx2x/bnx2x_vfpf.c +1 -1
@@ -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;
drivers/net/bnx2x/bnx2x_vfpf.h +0 -2
@@ -10,8 +10,6 @@#include "ecore_sp.h" -#define VLAN_HLEN 4 -struct vf_resource_query {uint8_t num_rxqs;uint8_t num_txqs;
drivers/net/cxgbe/cxgbe_compat.h +0 -1
@@ -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 */
drivers/net/cxgbe/sge.c +1 -1
@@ -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); }
drivers/net/enetfec/enet_ethdev.h +0 -1
@@ -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
drivers/net/enetfec/enet_rxtx.c +2 -2
@@ -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 &&
drivers/net/fm10k/fm10k.h +0 -2
@@ -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
drivers/net/fm10k/fm10k_ethdev.c +1 -1
@@ -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 ;
drivers/net/hinic/hinic_pmd_ethdev.h +1 -2
@@ -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)
drivers/net/i40e/i40e_ethdev.h +1 -3
@@ -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)
drivers/net/iavf/iavf.h +1 -2
@@ -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)
drivers/net/ice/ice_dcf_ethdev.c +1 -1
@@ -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);
drivers/net/ice/ice_ethdev.h +1 -3
@@ -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)
drivers/net/ipn3ke/ipn3ke_ethdev.h +1 -2
@@ -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
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
@@ -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 ;
drivers/net/ixgbe/ixgbe_ethdev.h +0 -1
@@ -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
drivers/net/ixgbe/ixgbe_rxtx.c +2 -2
@@ -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 ;
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/ngbe/ngbe_ethdev.h +0 -1
@@ -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
drivers/net/ngbe/ngbe_rxtx.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.h +0 -1
@@ -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
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_rxtx.c +2 -2
@@ -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 ;
examples/vhost/main.c +1 -2
@@ -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 4static 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,
lib/net/rte_ether.h +3 -2
@@ -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. */
Signature · 1 line
2.31.1
PATCH v3 1/1 net: add macro for VLAN header length
In reply to Ferruh YigitMultiple 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.
---
v2:
* update new enetfec driver too
* Add doxygen comment to macro
v3:
*update more drivers: axgbe, bnxt, hns3, mvneta, mvpp2
--- drivers/net/axgbe/axgbe_dev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.h | 3 +-- drivers/net/bnx2x/bnx2x_vfpf.c | 2 +- drivers/net/bnx2x/bnx2x_vfpf.h | 2 -- drivers/net/bnxt/bnxt.h | 5 ++--- drivers/net/bnxt/bnxt_hwrm.c | 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/hns3/hns3_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/mvneta/mvneta_ethdev.h | 3 +-- drivers/net/mvpp2/mrvl_ethdev.h | 3 +-- 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 +++-- 33 files changed, 33 insertions(+), 54 deletions(-)
drivers/net/axgbe/axgbe_dev.c +1 -1
@@ -51,7 +51,7 @@ static int get_lastbit_set(int x)static inline unsigned int axgbe_get_max_frame (struct axgbe_port *pdata) {return pdata->eth_dev->data->mtu +RTE_ETHER_HDR_LEN + -RTE_ETHER_CRC_LEN +VLAN_HLEN ; +RTE_ETHER_CRC_LEN +RTE_VLAN_HLEN ; }/* query busy bit */
drivers/net/axgbe/axgbe_ethdev.h +1 -2
@@ -12,11 +12,10 @@#include "rte_time.h" #define IRQ 0xff -#define VLAN_HLEN 4#define AXGBE_TX_MAX_BUF_SIZE (0x3fff & ~(64 - 1))#define AXGBE_RX_MAX_BUF_SIZE (0x3fff & ~(64 - 1)) -#define AXGBE_RX_MIN_BUF_SIZE (RTE_ETHER_MAX_LEN + VLAN_HLEN) +#define AXGBE_RX_MIN_BUF_SIZE (RTE_ETHER_MAX_LEN + RTE_VLAN_HLEN)#define AXGBE_MAX_MAC_ADDRS 32#define AXGBE_MAX_HASH_MAC_ADDRS 256
drivers/net/bnx2x/bnx2x_vfpf.c +1 -1
@@ -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;
drivers/net/bnx2x/bnx2x_vfpf.h +0 -2
@@ -10,8 +10,6 @@#include "ecore_sp.h" -#define VLAN_HLEN 4 -struct vf_resource_query {uint8_t num_rxqs;uint8_t num_txqs;
drivers/net/bnxt/bnxt.h +2 -3
@@ -76,14 +76,13 @@ ((bp)->pdev->id.subsystem_device_id == BROADCOM_DEV_957508_N2100)#define BNXT_MAX_MTU 9574 -#define VLAN_TAG_SIZE 4#define BNXT_NUM_VLANS 2#define BNXT_MAX_PKT_LEN (BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\ RTE_ETHER_CRC_LEN +\ - (BNXT_NUM_VLANS * VLAN_TAG_SIZE)) + (BNXT_NUM_VLANS * RTE_VLAN_HLEN))/* FW adds extra 4 bytes for FCS */ #define BNXT_VNIC_MRU (mtu)\ - ((mtu) + RTE_ETHER_HDR_LEN + VLAN_TAG_SIZE * BNXT_NUM_VLANS) + ((mtu) + RTE_ETHER_HDR_LEN + RTE_VLAN_HLEN * BNXT_NUM_VLANS)#define BNXT_VF_RSV_NUM_RSS_CTX 1#define BNXT_VF_RSV_NUM_L2_CTX 4/* TODO: For now, do not support VMDq/RFS on VFs. */
drivers/net/bnxt/bnxt_hwrm.c +1 -1
@@ -3557,7 +3557,7 @@ bnxt_fill_vf_func_cfg_req_old(struct bnxt *bp, HWRM_FUNC_CFG_INPUT_ENABLES_NUM_HW_RING_GRPS); req->admin_mtu =rte_cpu_to_le_16 (bp->eth_dev->data->mtu +RTE_ETHER_HDR_LEN + -RTE_ETHER_CRC_LEN +VLAN_TAG_SIZE * +RTE_ETHER_CRC_LEN +RTE_VLAN_HLEN *BNXT_NUM_VLANS ); req->mru =rte_cpu_to_le_16 (BNXT_VNIC_MRU (bp->eth_dev->data->mtu)); req->num_rsscos_ctxs = rte_cpu_to_le_16(bp->max_rsscos_ctx /
drivers/net/cxgbe/cxgbe_compat.h +0 -1
@@ -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 */
drivers/net/cxgbe/sge.c +1 -1
@@ -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); }
drivers/net/enetfec/enet_ethdev.h +0 -1
@@ -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
drivers/net/enetfec/enet_rxtx.c +2 -2
@@ -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 &&
drivers/net/fm10k/fm10k.h +0 -2
@@ -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
drivers/net/fm10k/fm10k_ethdev.c +1 -1
@@ -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 ;
drivers/net/hinic/hinic_pmd_ethdev.h +1 -2
@@ -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)
drivers/net/hns3/hns3_ethdev.h +1 -2
@@ -62,7 +62,6 @@#define HNS3_MAX_NON_TSO_BD_PER_PKT 8#define HNS3_MAX_TSO_BD_PER_PKT 63#define HNS3_MAX_FRAME_LEN 9728 -#define HNS3_VLAN_TAG_SIZE 4#define HNS3_DEFAULT_RX_BUF_LEN 2048#define HNS3_MAX_BD_PAYLEN (1024 * 1024 - 1)#define HNS3_MAX_TSO_HDR_SIZE 512
@@ -70,7 +69,7 @@#define HNS3_MAX_LRO_SIZE 64512#define HNS3_ETH_OVERHEAD \ - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + HNS3_VLAN_TAG_SIZE * 2) + (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + RTE_VLAN_HLEN * 2)#define HNS3_PKTLEN_TO_MTU (pktlen) ((pktlen) - HNS3_ETH_OVERHEAD)#define HNS3_MAX_MTU (HNS3_MAX_FRAME_LEN - HNS3_ETH_OVERHEAD)#define HNS3_DEFAULT_MTU 1500UL
drivers/net/i40e/i40e_ethdev.h +1 -3
@@ -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)
drivers/net/iavf/iavf.h +1 -2
@@ -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)
drivers/net/ice/ice_dcf_ethdev.c +1 -1
@@ -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);
drivers/net/ice/ice_ethdev.h +1 -3
@@ -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)
drivers/net/ipn3ke/ipn3ke_ethdev.h +1 -2
@@ -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
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
@@ -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 ;
drivers/net/ixgbe/ixgbe_ethdev.h +0 -1
@@ -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
drivers/net/ixgbe/ixgbe_rxtx.c +2 -2
@@ -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 ;
drivers/net/mvneta/mvneta_ethdev.h +1 -2
@@ -45,9 +45,8 @@/** Rx queue descriptors alignment in B */ #define MRVL_NETA_RXD_ALIGN 32 -#define MRVL_NETA_VLAN_TAG_LEN 4#define MRVL_NETA_ETH_HDRS_LEN (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ - MRVL_NETA_VLAN_TAG_LEN) + RTE_VLAN_HLEN)#define MRVL_NETA_HDRS_LEN (MV_MH_SIZE + MRVL_NETA_ETH_HDRS_LEN)#define MRVL_NETA_MTU_TO_MRU (mtu) ((mtu) + MRVL_NETA_HDRS_LEN)
drivers/net/mvpp2/mrvl_ethdev.h +1 -2
@@ -72,9 +72,8 @@/** Minimum number of sent buffers to release from shadow queue to BM */ #define MRVL_PP2_BUF_RELEASE_BURST_SIZE 64 -#define MRVL_PP2_VLAN_TAG_LEN 4#define MRVL_PP2_ETH_HDRS_LEN (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ - (2 * MRVL_PP2_VLAN_TAG_LEN)) + (2 * RTE_VLAN_HLEN))#define MRVL_PP2_HDRS_LEN (MV_MH_SIZE + MRVL_PP2_ETH_HDRS_LEN)#define MRVL_PP2_MTU_TO_MRU (mtu) ((mtu) + MRVL_PP2_HDRS_LEN)#define MRVL_PP2_MRU_TO_MTU (mru) ((mru) - MRVL_PP2_HDRS_LEN)
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/ngbe/ngbe_ethdev.h +0 -1
@@ -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
drivers/net/ngbe/ngbe_rxtx.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_ethdev.h +0 -1
@@ -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
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -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 ;
drivers/net/txgbe/txgbe_rxtx.c +2 -2
@@ -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 ;
examples/vhost/main.c +1 -2
@@ -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 4static 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,
lib/net/rte_ether.h +3 -2
@@ -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. */
Signature · 1 line
2.31.1
Thomas Monjalon
Applied17/11/2021 19:24, Ferruh Yigit:
Quoted 8 lines
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 <[email protected]>Acked-by Haiyue Wang <[email protected]>Acked-by Rosen Xu <[email protected]>Acked-by Jiawen Wu <[email protected]>
Applied, thanks.