net/i40e: backport i40e fixes and share code to 21.11
Subsystems (2)
RFC 1/1 net/i40e: backport i40e fixes and share code to 21.11
Backport all the i40e share code to 21.11 based on cid-i40e.2022.03.08. Backport all the iavf share code to 21.11 based on cid-avf.2022.03.08. Backport all DPDK bug fixes of i40e and iavf to 21.11 from 22.03.
--- drivers/common/iavf/README | 2 +- drivers/common/iavf/iavf_common.c | 861 +++++++++++++++++++- drivers/common/iavf/iavf_prototype.h | 4 +- drivers/common/iavf/iavf_status.h | 2 +- drivers/common/iavf/iavf_type.h | 87 +- drivers/common/iavf/virtchnl.h | 36 +- drivers/common/iavf/virtchnl_inline_ipsec.h | 9 + drivers/net/bonding/rte_eth_bond_pmd.c | 16 +- drivers/net/i40e/base/README | 2 +- drivers/net/i40e/base/i40e_common.c | 46 +- drivers/net/i40e/base/i40e_devids.h | 2 + drivers/net/i40e/base/i40e_prototype.h | 1 + drivers/net/i40e/base/i40e_register.h | 45 +- drivers/net/i40e/base/i40e_status.h | 2 +- drivers/net/i40e/base/i40e_type.h | 7 + drivers/net/i40e/i40e_ethdev.c | 43 +- drivers/net/i40e/i40e_pf.c | 4 +- drivers/net/i40e/i40e_regs.h | 11 +- drivers/net/i40e/i40e_rxtx_vec_common.h | 2 +- drivers/net/iavf/iavf_ethdev.c | 3 + drivers/net/iavf/iavf_ipsec_crypto.c | 24 +- drivers/net/iavf/iavf_ipsec_crypto.h | 4 +- drivers/net/iavf/iavf_rxtx.c | 105 ++- drivers/net/iavf/iavf_rxtx.h | 43 +- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 4 +- drivers/net/iavf/iavf_rxtx_vec_avx512.c | 4 +- drivers/net/iavf/iavf_rxtx_vec_sse.c | 4 +- drivers/net/iavf/iavf_vchnl.c | 4 +- drivers/net/ice/ice_dcf.c | 4 +- 29 files changed, 1200 insertions(+), 181 deletions(-)
drivers/common/iavf/README +1 -1
@@ -6,7 +6,7 @@ Intel® IAVF driver ================= This directory contains source code of FreeBSD IAVF driver of version -cid-avf.2021.08.16.tar.gz released by the team which develops +cid-avf.2022.03.08.tar.gz released by the team which develops basic drivers for any IAVF NIC. The directory of base/ contains the original source package.
drivers/common/iavf/iavf_common.c +853 -8
891 lines not on this page · raw message
drivers/common/iavf/iavf_prototype.h +2 -2
@@ -69,7 +69,7 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw);extern struct iavf_rx_ptype_decoded iavf_ptype_lookup[]; -STATIC INLINE struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype) +STATIC INLINE struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u16 ptype) {return iavf_ptype_lookup[ptype]; }
@@ -87,7 +87,7 @@ enum iavf_status iavf_vf_reset(struct iavf_hw *hw);__rte_internal enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,enum virtchnl_ops v_opcode, -enum iavf_status v_retval, +enum virtchnl_status_code v_retval,u8 *msg,u16 msglen,struct iavf_asq_cmd_details *cmd_details); enum iavf_status iavf_aq_debug_dump(struct iavf_hw *hw, u8 cluster_id,
drivers/common/iavf/iavf_status.h +1 -1
@@ -19,7 +19,7 @@ enum iavf_status {IAVF_ERR_ADAPTER_STOPPED =-9 ,IAVF_ERR_INVALID_MAC_ADDR =-10 ,IAVF_ERR_DEVICE_NOT_SUPPORTED =-11 , -IAVF_ERR_MASTER_REQUESTS_PENDING =-12 , +IAVF_ERR_PRIMARY_REQUESTS_PENDING =-12 ,IAVF_ERR_INVALID_LINK_SETTINGS =-13 ,IAVF_ERR_AUTONEG_NOT_COMPLETE =-14 , IAVF_ERR_RESET_FAILED = -15,
drivers/common/iavf/iavf_type.h +86 -1
111 lines not on this page · raw message
drivers/common/iavf/virtchnl.h +34 -2
@@ -23,7 +23,7 @@* * The PF is required to return a status code in v_retval for all messages * except RESET_VF, which does not require any response. The returned value -* is of virtchnl_status_code type, defined in the shared type.h. +* is of virtchnl_status_code type, defined here. * * In general, VF driver initialization should roughly follow the order of * these opcodes. The VF driver must first validate the API version of the
@@ -40,7 +40,11 @@#include "virtchnl_inline_ipsec.h" -/* Error Codes */ +/* Error Codes +* Note that many older versions of various iAVF drivers convert the reported +* status code directly into an iavf_status enumeration. For this reason, it +* is important that the values of these enumerations line up. +*/ enum virtchnl_status_code {VIRTCHNL_STATUS_SUCCESS =0 ,VIRTCHNL_STATUS_ERR_PARAM =-5 ,
@@ -281,6 +285,30 @@ static inline const char *virtchnl_op_str(enum virtchnl_ops v_opcode) } } +static inline const char *virtchnl_stat_str (enum virtchnl_status_code v_status) +{ +switch (v_status) { +case VIRTCHNL_STATUS_SUCCESS : +return "VIRTCHNL_STATUS_SUCCESS" ; +case VIRTCHNL_STATUS_ERR_PARAM : +return "VIRTCHNL_STATUS_ERR_PARAM" ; +case VIRTCHNL_STATUS_ERR_NO_MEMORY : +return "VIRTCHNL_STATUS_ERR_NO_MEMORY" ; +case VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH : +return "VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH" ; +case VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR : +return "VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR" ; +case VIRTCHNL_STATUS_ERR_INVALID_VF_ID : +return "VIRTCHNL_STATUS_ERR_INVALID_VF_ID" ; +case VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR : +return "VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR" ; +case VIRTCHNL_STATUS_ERR_NOT_SUPPORTED : +return "VIRTCHNL_STATUS_ERR_NOT_SUPPORTED" ; +default : +return "Unknown status code (update virtchnl.h)" ; + } +} +/* These macros are used to generate compilation errors if a structure/union * is not exactly the correct length. It gives a divide by zero error if the * structure/union is not of the correct size, otherwise it creates an enum
@@ -1653,6 +1681,10 @@ enum virtchnl_proto_hdr_field {PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_DWN ),VIRTCHNL_PROTO_HDR_GTPU_UP_QFI =PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP ), +/* L2TPv2 */ +VIRTCHNL_PROTO_HDR_L2TPV2_SESS_ID = +PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_L2TPV2 ), + VIRTCHNL_PROTO_HDR_L2TPV2_LEN_SESS_ID, };struct virtchnl_proto_hdr {
drivers/common/iavf/virtchnl_inline_ipsec.h +9 -0
@@ -446,6 +446,15 @@ struct virtchnl_ipsec_sp_cfg {/* Set TC (congestion domain) if true. For future use. */ u8 set_tc; + +/* 0 for NAT-T unsupported, 1 for NAT-T supported */ +u8 is_udp; + +/* reserved */ +u8 reserved; + +/* NAT-T UDP port number. Only valid in case NAT-T supported */ +u16 udp_port; } __rte_packed;
drivers/net/bonding/rte_eth_bond_pmd.c +8 -8
@@ -1734,14 +1734,6 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, } } - errval =rte_eth_dev_set_mtu (slave_eth_dev->data->port_id, - bonded_eth_dev->data->mtu); -if (errval !=0 && errval != -ENOTSUP ) { -RTE_BOND_LOG (ERR ,"rte_eth_dev_set_mtu: port %u, err (%d)" , - slave_eth_dev->data->port_id, errval); -return errval; - } -/* Configure device */ errval = rte_eth_dev_configure(slave_eth_dev->data->port_id, nb_rx_queues, nb_tx_queues,
@@ -1752,6 +1744,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,return errval; } + errval =rte_eth_dev_set_mtu (slave_eth_dev->data->port_id, + bonded_eth_dev->data->mtu); +if (errval !=0 && errval != -ENOTSUP ) { +RTE_BOND_LOG (ERR ,"rte_eth_dev_set_mtu: port %u, err (%d)" , + slave_eth_dev->data->port_id, errval); +return errval; + } +/* Setup Rx Queues */ for (q_id =0 ; q_id < bonded_eth_dev->data->nb_rx_queues; q_id++) { bd_rx_q = (struct bond_rx_queue *)bonded_eth_dev->data->rx_queues[q_id];
drivers/net/i40e/base/README +1 -1
@@ -6,7 +6,7 @@ Intel® I40E driver ================== This directory contains source code of FreeBSD i40e driver of version -cid-i40e.2021.08.16.tar.gz released by the team which develops +cid-i40e.2022.03.08.tar.gz released by the team which develops basic drivers for any i40e NIC. The directory of base/ contains the original source package. This driver is valid for the product(s) listed below
drivers/net/i40e/base/i40e_common.c +38 -8
107 lines not on this page · raw message
drivers/net/i40e/base/i40e_devids.h +2 -0
@@ -26,6 +26,7 @@#define I40E_DEV_ID_XXV710_N3000 0x0D58#define I40E_DEV_ID_10G_BASE_T_BC 0x15FF#define I40E_DEV_ID_5G_BASE_T_BC 0x101F +#define I40E_DEV_ID_1G_BASE_T_BC 0x0DD2#if defined(INTEGRATED_VF ) || defined(VF_DRIVER ) || defined(I40E_NDIS_SUPPORT )#define I40E_DEV_ID_VF 0x154C#define I40E_DEV_ID_VF_HV 0x1571
@@ -48,6 +49,7 @@#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2#define I40E_DEV_ID_SFP_I_X722 0x37D3 +#define I40E_DEV_ID_SFP_X722_A 0x0DDA#if defined(INTEGRATED_VF ) || defined(VF_DRIVER ) || defined(I40E_NDIS_SUPPORT )#define I40E_DEV_ID_X722_VF 0x37CD#endif /* VF_DRIVER */
drivers/net/i40e/base/i40e_prototype.h +1 -0
@@ -73,6 +73,7 @@ const char *i40e_stat_str(struct i40e_hw *hw, enum i40e_status_code stat_err);#ifdef PF_DRIVER u32 i40e_led_get (struct i40e_hw *hw); +bool i40e_led_get_blink (struct i40e_hw *hw);void i40e_led_set (struct i40e_hw *hw,u32 mode,bool blink);enum i40e_status_code i40e_led_set_phy (struct i40e_hw *hw,bool on,u16 led_addr,u32 mode);
drivers/net/i40e/base/i40e_register.h +8 -37
63 lines not on this page · raw message
drivers/net/i40e/base/i40e_status.h +1 -1
@@ -19,7 +19,7 @@ enum i40e_status_code {I40E_ERR_ADAPTER_STOPPED =-9 ,I40E_ERR_INVALID_MAC_ADDR =-10 ,I40E_ERR_DEVICE_NOT_SUPPORTED =-11 , -I40E_ERR_MASTER_REQUESTS_PENDING =-12 , +I40E_ERR_PRIMARY_REQUESTS_PENDING =-12 ,I40E_ERR_INVALID_LINK_SETTINGS =-13 ,I40E_ERR_AUTONEG_NOT_COMPLETE =-14 , I40E_ERR_RESET_FAILED = -15,
drivers/net/i40e/base/i40e_type.h +7 -0
@@ -1428,6 +1428,7 @@ struct i40e_eth_stats {u64 tx_broadcast;/* bptc */ u64 tx_discards;/* tdpc */ u64 tx_errors;/* tepc */ +u64 rx_discards_other;/* rxerr1 */ };/* Statistics collected per VEB per TC */
@@ -1922,6 +1923,10 @@ struct i40e_lldp_variables {#define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000/* INPUT SET MASK for RSS, flow director, and flexible payload */ +#define I40E_X722_L3_SRC_SHIFT 49 +#define I40E_X722_L3_SRC_MASK (0x3ULL << I40E_X722_L3_SRC_SHIFT) +#define I40E_X722_L3_DST_SHIFT 41 +#define I40E_X722_L3_DST_MASK (0x3ULL << I40E_X722_L3_DST_SHIFT)#define I40E_L3_SRC_SHIFT 47#define I40E_L3_SRC_MASK (0x3ULL << I40E_L3_SRC_SHIFT)#define I40E_L3_V6_SRC_SHIFT 43
@@ -1990,6 +1995,8 @@ struct i40e_metadata_segment {#define I40E_DDP_TRACKID_INVALID 0xFFFFFFFF#define I40E_DDP_TRACKID_GRP_MSK 0x00FF0000#define I40E_DDP_TRACKID_GRP_COMP_ALL 0xFF +#define I40E_DDP_TRACKID_PKGTYPE_MSK 0xFF000000 +#define I40E_DDP_TRACKID_PKGTYPE_RDONLY 0u32 track_id;char name[I40E_DDP_NAME_SIZE ]; };
drivers/net/i40e/i40e_ethdev.c +35 -8
97 lines not on this page · raw message
drivers/net/i40e/i40e_pf.c +2 -2
@@ -597,14 +597,14 @@ i40e_pf_config_irq_link_list(struct i40e_pf_vf *vf, tempmap = vvm->rxq_map;for (i =0 ; i <sizeof (vvm->rxq_map) *BITS_PER_CHAR ; i++) {if (tempmap &0x1 ) - linklistmap |= (1 << (2 * i)); + linklistmap |=RTE_BIT64 (2 * i); tempmap >>=1 ; } tempmap = vvm->txq_map;for (i =0 ; i <sizeof (vvm->txq_map) *BITS_PER_CHAR ; i++) {if (tempmap &0x1 ) - linklistmap |= (1 << (2 * i +1 )); + linklistmap |=RTE_BIT64 (2 * i +1 ); tempmap >>=1 ; }
drivers/net/i40e/i40e_regs.h +1 -10
@@ -586,9 +586,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_PEARPMAX, 0, 0, 0, 0, "GLHMC_PEARPMAX"}, {I40E_GLHMC_PEMROBJSZ, 0, 0, 0, 0, "GLHMC_PEMROBJSZ"}, {I40E_GLHMC_PEMRMAX, 0, 0, 0, 0, "GLHMC_PEMRMAX"}, - {I40E_GLHMC_PEXFOBJSZ, 0, 0, 0, 0, "GLHMC_PEXFOBJSZ"}, - {I40E_GLHMC_PEXFMAX, 0, 0, 0, 0, "GLHMC_PEXFMAX"}, - {I40E_GLHMC_PEXFFLMAX, 0, 0, 0, 0, "GLHMC_PEXFFLMAX"}, {I40E_GLHMC_PEQ1OBJSZ, 0, 0, 0, 0, "GLHMC_PEQ1OBJSZ"}, {I40E_GLHMC_PEQ1MAX, 0, 0, 0, 0, "GLHMC_PEQ1MAX"}, {I40E_GLHMC_PEQ1FLMAX, 0, 0, 0, 0, "GLHMC_PEQ1FLMAX"},
@@ -616,9 +613,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_APBVTINUSEBASE(0), 15, 4, 0, 0, "GLHMC_APBVTINUSEBASE"}, {I40E_GLHMC_PEMRBASE(0), 15, 4, 0, 0, "GLHMC_PEMRBASE"}, {I40E_GLHMC_PEMRCNT(0), 15, 4, 0, 0, "GLHMC_PEMRCNT"}, - {I40E_GLHMC_PEXFBASE(0), 15, 4, 0, 0, "GLHMC_PEXFBASE"}, - {I40E_GLHMC_PEXFCNT(0), 15, 4, 0, 0, "GLHMC_PEXFCNT"}, - {I40E_GLHMC_PEXFFLBASE(0), 15, 4, 0, 0, "GLHMC_PEXFFLBASE"}, {I40E_GLHMC_PEQ1BASE(0), 15, 4, 0, 0, "GLHMC_PEQ1BASE"}, {I40E_GLHMC_PEQ1CNT(0), 15, 4, 0, 0, "GLHMC_PEQ1CNT"}, {I40E_GLHMC_PEQ1FLBASE(0), 15, 4, 0, 0, "GLHMC_PEQ1FLBASE"},
@@ -653,9 +647,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_VFAPBVTINUSEBASE(0), 31, 4, 0, 0, "GLHMC_VFAPBVTINUSEBASE"}, {I40E_GLHMC_VFPEMRBASE(0), 31, 4, 0, 0, "GLHMC_VFPEMRBASE"}, {I40E_GLHMC_VFPEMRCNT(0), 31, 4, 0, 0, "GLHMC_VFPEMRCNT"}, - {I40E_GLHMC_VFPEXFBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFBASE"}, - {I40E_GLHMC_VFPEXFCNT(0), 31, 4, 0, 0, "GLHMC_VFPEXFCNT"}, - {I40E_GLHMC_VFPEXFFLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFFLBASE"}, {I40E_GLHMC_VFPEQ1BASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1BASE"}, {I40E_GLHMC_VFPEQ1CNT(0), 31, 4, 0, 0, "GLHMC_VFPEQ1CNT"}, {I40E_GLHMC_VFPEQ1FLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1FLBASE"},
@@ -896,7 +887,7 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GL_FCOEDDPC(0), 143, 8, 0, 0, "GL_FCOEDDPC"}, {I40E_GL_FCOECRC(0), 143, 8, 0, 0, "GL_FCOECRC"}, {I40E_GL_FCOEPRC(0), 143, 8, 0, 0, "GL_FCOEPRC"}, - {I40E_GL_RXERR1_L(0), 143, 8, 0, 0, "GL_RXERR1_L"}, + {I40E_GL_RXERR1L(0), 143, 8, 0, 0, "GL_RXERR1_L"}, {I40E_GL_FCOEDIFEC(0), 143, 8, 0, 0, "GL_FCOEDIFEC"}, {I40E_GL_RXERR2_L(0), 143, 8, 0, 0, "GL_RXERR2_L"}, {I40E_GL_FCOEDWRCL(0), 143, 8, 0, 0, "GL_FCOEDWRCL"},
drivers/net/i40e/i40e_rxtx_vec_common.h +1 -1
@@ -103,7 +103,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)if (txq->offloads &RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE ) {for (i =0 ; i < n; i++) { free[i] = txep[i].mbuf; - txep[i].mbuf =NULL ; +/* no need to reset txep[i].mbuf in vector path */ }rte_mempool_put_bulk (free[0 ]->pool, (void **)free, n); goto done;
drivers/net/iavf/iavf_ethdev.c +3 -0
@@ -2278,6 +2278,9 @@ iavf_init_vf(struct rte_eth_dev *dev) } } +if (vf->vsi_res->num_queue_pairs >IAVF_MAX_NUM_QUEUES_DFLT ) + vf->lv_enabled = true; +if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC ) {if (iavf_get_supported_rxdid (adapter) !=0 ) {PMD_INIT_LOG (ERR ,"failed to do get supported rxdid" );
drivers/net/iavf/iavf_ipsec_crypto.c +18 -6
@@ -614,7 +614,7 @@ set_session_parameter(struct iavf_security_ctx *iavf_sctx,if (conf->crypto_xform->auth.algo ==RTE_CRYPTO_AUTH_AES_GMAC ) { sess->block_sz =get_auth_blocksize (iavf_sctx, conf->crypto_xform->auth.algo); - sess->iv_sz = conf->crypto_xform->auth.iv.length; + sess->iv_sz =sizeof (uint64_t );/* iv len inc. salt */ sess->icv_sz = conf->crypto_xform->auth.digest_length; }else { sess->block_sz = get_cipher_blocksize(iavf_sctx,
@@ -736,7 +736,9 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,uint8_t is_v4, rte_be32_t v4_dst_addr, uint8_t *v6_dst_addr, - uint8_t drop) + uint8_t drop, + bool is_udp, + uint16_t udp_port) { struct inline_ipsec_msg *request = NULL, *response = NULL;size_t request_len, response_len;
@@ -781,6 +783,8 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,/** Traffic Class/Congestion Domain currently not support */ request->ipsec_data.sp_cfg->set_tc =0 ; request->ipsec_data.sp_cfg->cgd =0 ; + request->ipsec_data.sp_cfg->is_udp = is_udp; + request->ipsec_data.sp_cfg->udp_port =htons (udp_port); response_len =sizeof (struct inline_ipsec_msg ) +sizeof (struct virtchnl_ipsec_sp_cfg_resp );
@@ -1352,6 +1356,8 @@ iavf_ipsec_crypto_set_security_capabililites(struct iavf_security_ctx capabilities =rte_zmalloc ("crypto_cap" ,sizeof (struct rte_cryptodev_capabilities ) * (number_of_capabilities +1 ),0 ); +if (!capabilities) +return -ENOMEM ; capabilities[number_of_capabilities].op =RTE_CRYPTO_OP_TYPE_UNDEFINED ;/**
@@ -1551,8 +1557,8 @@ iavf_security_ctx_destroy(struct iavf_adapter *adapter)rte_free (iavf_sctx);rte_free (sctx); - iavf_sctx =NULL ; - sctx =NULL ; + adapter->security_ctx =NULL ; + adapter->vf.eth_dev->security_ctx =NULL ;return 0 ; }
@@ -1623,6 +1629,7 @@ struct iavf_ipsec_flow_item {struct rte_ipv6_hdr ipv6_hdr; };struct rte_udp_hdr udp_hdr; +uint8_t is_udp; }; static void
@@ -1735,6 +1742,7 @@ iavf_ipsec_flow_item_parse(struct rte_eth_dev *ethdev,parse_udp_item ((const struct rte_flow_item_udp *) pattern[2 ].spec, &ipsec_flow->udp_hdr); + ipsec_flow->is_udp = true; ipsec_flow->spi = ((const struct rte_flow_item_esp *) pattern[3 ].spec)->hdr.spi;
@@ -1804,7 +1812,9 @@ iavf_ipsec_flow_create(struct iavf_adapter *ad,1 , ipsec_flow->ipv4_hdr.dst_addr,NULL , - 0); +0 , + ipsec_flow->is_udp, + ipsec_flow->udp_hdr.dst_port); }else { ipsec_flow->id = iavf_ipsec_crypto_inbound_security_policy_add(ad,
@@ -1812,7 +1822,9 @@ iavf_ipsec_flow_create(struct iavf_adapter *ad,0 ,0 , ipsec_flow->ipv6_hdr.dst_addr, - 0); +0 , + ipsec_flow->is_udp, + ipsec_flow->udp_hdr.dst_port); }if (ipsec_flow->id <1 ) {
drivers/net/iavf/iavf_ipsec_crypto.h +3 -1
@@ -145,7 +145,9 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,uint8_t is_v4, rte_be32_t v4_dst_addr, uint8_t *v6_dst_addr, - uint8_t drop); + uint8_t drop, + bool is_udp, + uint16_t udp_port);/** * Delete inbound security policy rule from hardware
drivers/net/iavf/iavf_rxtx.c +77 -28
190 lines not on this page · raw message
drivers/net/iavf/iavf_rxtx.h +1 -42
56 lines not on this page · raw message
drivers/net/iavf/iavf_rxtx_vec_avx2.c +1 -3
@@ -1450,9 +1450,6 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t flags =IAVF_TX_DESC_CMD_EOP |IAVF_TX_DESC_CMD_ICRC ;uint64_t rs =IAVF_TX_DESC_CMD_RS | flags; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs (txq);
@@ -1516,6 +1513,7 @@ iavf_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec_avx2 (tx_queue, &tx_pkts[nb_tx], num);
drivers/net/iavf/iavf_rxtx_vec_avx512.c +1 -3
@@ -1907,9 +1907,6 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t flags =IAVF_TX_DESC_CMD_EOP |IAVF_TX_DESC_CMD_ICRC ;uint64_t rs =IAVF_TX_DESC_CMD_RS | flags; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs_avx512 (txq);
@@ -1975,6 +1972,7 @@ iavf_xmit_pkts_vec_avx512_cmn(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec_avx512 (tx_queue, &tx_pkts[nb_tx], num, offload);
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -3
@@ -1120,9 +1120,6 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t rs =IAVF_TX_DESC_CMD_RS | flags;int i; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs (txq);
@@ -1189,6 +1186,7 @@ iavf_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec (tx_queue, &tx_pkts[nb_tx], num); nb_tx += ret;
drivers/net/iavf/iavf_vchnl.c +2 -2
@@ -165,7 +165,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args,return -1 ; } - ret =iavf_aq_send_msg_to_pf (hw, args->ops,IAVF_SUCCESS , + ret =iavf_aq_send_msg_to_pf (hw, args->ops,VIRTCHNL_STATUS_SUCCESS , args->in_args, args->in_args_size,NULL );if (ret) {PMD_DRV_LOG (ERR ,"fail to send cmd %d" , args->ops);
@@ -502,7 +502,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)VIRTCHNL_VF_OFFLOAD_VLAN_V2 |VIRTCHNL_VF_LARGE_NUM_QPAIRS |VIRTCHNL_VF_OFFLOAD_QOS | -+VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO ; +VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO ; args.in_args = (uint8_t *)∩︀ args.in_args_size =sizeof (caps);
drivers/net/ice/ice_dcf.c +2 -2
@@ -40,7 +40,7 @@ static __rte_always_inline int ice_dcf_send_cmd_req_no_irq(struct ice_dcf_hw *hw, enum virtchnl_ops op, uint8_t *req_msg, uint16_t req_msglen) { - return iavf_aq_send_msg_to_pf(&hw->avf, op, IAVF_SUCCESS, + return iavf_aq_send_msg_to_pf(&hw->avf, op, VIRTCHNL_STATUS_SUCCESS, req_msg, req_msglen, NULL); }
@@ -105,7 +105,7 @@ static __rte_always_inline int ice_dcf_vc_cmd_send(struct ice_dcf_hw *hw, struct dcf_virtchnl_cmd *cmd) { return iavf_aq_send_msg_to_pf(&hw->avf, - cmd->v_op, IAVF_SUCCESS, + cmd->v_op, VIRTCHNL_STATUS_SUCCESS, cmd->req_msg, cmd->req_msglen, NULL); }
Signature · 1 line
2.27.0
RFC v2 1/1 net/i40e: backport i40e fixes and share code to 21.11
Backport all the i40e share code to 21.11 based on cid-i40e.2022.03.08. Backport all the iavf share code to 21.11 based on cid-avf.2022.03.08. Backport all DPDK bug fixes of i40e and iavf to 21.11 from 22.03.
---
v2: add new device id for i40e.
--- drivers/common/iavf/README | 2 +- drivers/common/iavf/iavf_common.c | 861 +++++++++++++++++++- drivers/common/iavf/iavf_prototype.h | 4 +- drivers/common/iavf/iavf_status.h | 2 +- drivers/common/iavf/iavf_type.h | 87 +- drivers/common/iavf/virtchnl.h | 36 +- drivers/common/iavf/virtchnl_inline_ipsec.h | 9 + drivers/net/bonding/rte_eth_bond_pmd.c | 16 +- drivers/net/i40e/base/README | 2 +- drivers/net/i40e/base/i40e_common.c | 46 +- drivers/net/i40e/base/i40e_devids.h | 2 + drivers/net/i40e/base/i40e_prototype.h | 1 + drivers/net/i40e/base/i40e_register.h | 45 +- drivers/net/i40e/base/i40e_status.h | 2 +- drivers/net/i40e/base/i40e_type.h | 7 + drivers/net/i40e/i40e_ethdev.c | 46 +- drivers/net/i40e/i40e_pf.c | 4 +- drivers/net/i40e/i40e_regs.h | 11 +- drivers/net/i40e/i40e_rxtx_vec_common.h | 2 +- drivers/net/iavf/iavf_ethdev.c | 3 + drivers/net/iavf/iavf_ipsec_crypto.c | 24 +- drivers/net/iavf/iavf_ipsec_crypto.h | 4 +- drivers/net/iavf/iavf_rxtx.c | 105 ++- drivers/net/iavf/iavf_rxtx.h | 43 +- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 4 +- drivers/net/iavf/iavf_rxtx_vec_avx512.c | 4 +- drivers/net/iavf/iavf_rxtx_vec_sse.c | 4 +- drivers/net/iavf/iavf_vchnl.c | 4 +- drivers/net/ice/ice_dcf.c | 4 +- 29 files changed, 1203 insertions(+), 181 deletions(-)
drivers/common/iavf/README +1 -1
@@ -6,7 +6,7 @@ Intel® IAVF driver ================= This directory contains source code of FreeBSD IAVF driver of version -cid-avf.2021.08.16.tar.gz released by the team which develops +cid-avf.2022.03.08.tar.gz released by the team which develops basic drivers for any IAVF NIC. The directory of base/ contains the original source package.
drivers/common/iavf/iavf_common.c +853 -8
891 lines not on this page · raw message
drivers/common/iavf/iavf_prototype.h +2 -2
@@ -69,7 +69,7 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw);extern struct iavf_rx_ptype_decoded iavf_ptype_lookup[]; -STATIC INLINE struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype) +STATIC INLINE struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u16 ptype) {return iavf_ptype_lookup[ptype]; }
@@ -87,7 +87,7 @@ enum iavf_status iavf_vf_reset(struct iavf_hw *hw);__rte_internal enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,enum virtchnl_ops v_opcode, -enum iavf_status v_retval, +enum virtchnl_status_code v_retval,u8 *msg,u16 msglen,struct iavf_asq_cmd_details *cmd_details); enum iavf_status iavf_aq_debug_dump(struct iavf_hw *hw, u8 cluster_id,
drivers/common/iavf/iavf_status.h +1 -1
@@ -19,7 +19,7 @@ enum iavf_status {IAVF_ERR_ADAPTER_STOPPED =-9 ,IAVF_ERR_INVALID_MAC_ADDR =-10 ,IAVF_ERR_DEVICE_NOT_SUPPORTED =-11 , -IAVF_ERR_MASTER_REQUESTS_PENDING =-12 , +IAVF_ERR_PRIMARY_REQUESTS_PENDING =-12 ,IAVF_ERR_INVALID_LINK_SETTINGS =-13 ,IAVF_ERR_AUTONEG_NOT_COMPLETE =-14 , IAVF_ERR_RESET_FAILED = -15,
drivers/common/iavf/iavf_type.h +86 -1
111 lines not on this page · raw message
drivers/common/iavf/virtchnl.h +34 -2
@@ -23,7 +23,7 @@* * The PF is required to return a status code in v_retval for all messages * except RESET_VF, which does not require any response. The returned value -* is of virtchnl_status_code type, defined in the shared type.h. +* is of virtchnl_status_code type, defined here. * * In general, VF driver initialization should roughly follow the order of * these opcodes. The VF driver must first validate the API version of the
@@ -40,7 +40,11 @@#include "virtchnl_inline_ipsec.h" -/* Error Codes */ +/* Error Codes +* Note that many older versions of various iAVF drivers convert the reported +* status code directly into an iavf_status enumeration. For this reason, it +* is important that the values of these enumerations line up. +*/ enum virtchnl_status_code {VIRTCHNL_STATUS_SUCCESS =0 ,VIRTCHNL_STATUS_ERR_PARAM =-5 ,
@@ -281,6 +285,30 @@ static inline const char *virtchnl_op_str(enum virtchnl_ops v_opcode) } } +static inline const char *virtchnl_stat_str (enum virtchnl_status_code v_status) +{ +switch (v_status) { +case VIRTCHNL_STATUS_SUCCESS : +return "VIRTCHNL_STATUS_SUCCESS" ; +case VIRTCHNL_STATUS_ERR_PARAM : +return "VIRTCHNL_STATUS_ERR_PARAM" ; +case VIRTCHNL_STATUS_ERR_NO_MEMORY : +return "VIRTCHNL_STATUS_ERR_NO_MEMORY" ; +case VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH : +return "VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH" ; +case VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR : +return "VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR" ; +case VIRTCHNL_STATUS_ERR_INVALID_VF_ID : +return "VIRTCHNL_STATUS_ERR_INVALID_VF_ID" ; +case VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR : +return "VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR" ; +case VIRTCHNL_STATUS_ERR_NOT_SUPPORTED : +return "VIRTCHNL_STATUS_ERR_NOT_SUPPORTED" ; +default : +return "Unknown status code (update virtchnl.h)" ; + } +} +/* These macros are used to generate compilation errors if a structure/union * is not exactly the correct length. It gives a divide by zero error if the * structure/union is not of the correct size, otherwise it creates an enum
@@ -1653,6 +1681,10 @@ enum virtchnl_proto_hdr_field {PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_DWN ),VIRTCHNL_PROTO_HDR_GTPU_UP_QFI =PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP ), +/* L2TPv2 */ +VIRTCHNL_PROTO_HDR_L2TPV2_SESS_ID = +PROTO_HDR_FIELD_START (VIRTCHNL_PROTO_HDR_L2TPV2 ), + VIRTCHNL_PROTO_HDR_L2TPV2_LEN_SESS_ID, };struct virtchnl_proto_hdr {
drivers/common/iavf/virtchnl_inline_ipsec.h +9 -0
@@ -446,6 +446,15 @@ struct virtchnl_ipsec_sp_cfg {/* Set TC (congestion domain) if true. For future use. */ u8 set_tc; + +/* 0 for NAT-T unsupported, 1 for NAT-T supported */ +u8 is_udp; + +/* reserved */ +u8 reserved; + +/* NAT-T UDP port number. Only valid in case NAT-T supported */ +u16 udp_port; } __rte_packed;
drivers/net/bonding/rte_eth_bond_pmd.c +8 -8
@@ -1734,14 +1734,6 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, } } - errval =rte_eth_dev_set_mtu (slave_eth_dev->data->port_id, - bonded_eth_dev->data->mtu); -if (errval !=0 && errval != -ENOTSUP ) { -RTE_BOND_LOG (ERR ,"rte_eth_dev_set_mtu: port %u, err (%d)" , - slave_eth_dev->data->port_id, errval); -return errval; - } -/* Configure device */ errval = rte_eth_dev_configure(slave_eth_dev->data->port_id, nb_rx_queues, nb_tx_queues,
@@ -1752,6 +1744,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,return errval; } + errval =rte_eth_dev_set_mtu (slave_eth_dev->data->port_id, + bonded_eth_dev->data->mtu); +if (errval !=0 && errval != -ENOTSUP ) { +RTE_BOND_LOG (ERR ,"rte_eth_dev_set_mtu: port %u, err (%d)" , + slave_eth_dev->data->port_id, errval); +return errval; + } +/* Setup Rx Queues */ for (q_id =0 ; q_id < bonded_eth_dev->data->nb_rx_queues; q_id++) { bd_rx_q = (struct bond_rx_queue *)bonded_eth_dev->data->rx_queues[q_id];
drivers/net/i40e/base/README +1 -1
@@ -6,7 +6,7 @@ Intel® I40E driver ================== This directory contains source code of FreeBSD i40e driver of version -cid-i40e.2021.08.16.tar.gz released by the team which develops +cid-i40e.2022.03.08.tar.gz released by the team which develops basic drivers for any i40e NIC. The directory of base/ contains the original source package. This driver is valid for the product(s) listed below
drivers/net/i40e/base/i40e_common.c +38 -8
107 lines not on this page · raw message
drivers/net/i40e/base/i40e_devids.h +2 -0
@@ -26,6 +26,7 @@#define I40E_DEV_ID_XXV710_N3000 0x0D58#define I40E_DEV_ID_10G_BASE_T_BC 0x15FF#define I40E_DEV_ID_5G_BASE_T_BC 0x101F +#define I40E_DEV_ID_1G_BASE_T_BC 0x0DD2#if defined(INTEGRATED_VF ) || defined(VF_DRIVER ) || defined(I40E_NDIS_SUPPORT )#define I40E_DEV_ID_VF 0x154C#define I40E_DEV_ID_VF_HV 0x1571
@@ -48,6 +49,7 @@#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2#define I40E_DEV_ID_SFP_I_X722 0x37D3 +#define I40E_DEV_ID_SFP_X722_A 0x0DDA#if defined(INTEGRATED_VF ) || defined(VF_DRIVER ) || defined(I40E_NDIS_SUPPORT )#define I40E_DEV_ID_X722_VF 0x37CD#endif /* VF_DRIVER */
drivers/net/i40e/base/i40e_prototype.h +1 -0
@@ -73,6 +73,7 @@ const char *i40e_stat_str(struct i40e_hw *hw, enum i40e_status_code stat_err);#ifdef PF_DRIVER u32 i40e_led_get (struct i40e_hw *hw); +bool i40e_led_get_blink (struct i40e_hw *hw);void i40e_led_set (struct i40e_hw *hw,u32 mode,bool blink);enum i40e_status_code i40e_led_set_phy (struct i40e_hw *hw,bool on,u16 led_addr,u32 mode);
drivers/net/i40e/base/i40e_register.h +8 -37
63 lines not on this page · raw message
drivers/net/i40e/base/i40e_status.h +1 -1
@@ -19,7 +19,7 @@ enum i40e_status_code {I40E_ERR_ADAPTER_STOPPED =-9 ,I40E_ERR_INVALID_MAC_ADDR =-10 ,I40E_ERR_DEVICE_NOT_SUPPORTED =-11 , -I40E_ERR_MASTER_REQUESTS_PENDING =-12 , +I40E_ERR_PRIMARY_REQUESTS_PENDING =-12 ,I40E_ERR_INVALID_LINK_SETTINGS =-13 ,I40E_ERR_AUTONEG_NOT_COMPLETE =-14 , I40E_ERR_RESET_FAILED = -15,
drivers/net/i40e/base/i40e_type.h +7 -0
@@ -1428,6 +1428,7 @@ struct i40e_eth_stats {u64 tx_broadcast;/* bptc */ u64 tx_discards;/* tdpc */ u64 tx_errors;/* tepc */ +u64 rx_discards_other;/* rxerr1 */ };/* Statistics collected per VEB per TC */
@@ -1922,6 +1923,10 @@ struct i40e_lldp_variables {#define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000/* INPUT SET MASK for RSS, flow director, and flexible payload */ +#define I40E_X722_L3_SRC_SHIFT 49 +#define I40E_X722_L3_SRC_MASK (0x3ULL << I40E_X722_L3_SRC_SHIFT) +#define I40E_X722_L3_DST_SHIFT 41 +#define I40E_X722_L3_DST_MASK (0x3ULL << I40E_X722_L3_DST_SHIFT)#define I40E_L3_SRC_SHIFT 47#define I40E_L3_SRC_MASK (0x3ULL << I40E_L3_SRC_SHIFT)#define I40E_L3_V6_SRC_SHIFT 43
@@ -1990,6 +1995,8 @@ struct i40e_metadata_segment {#define I40E_DDP_TRACKID_INVALID 0xFFFFFFFF#define I40E_DDP_TRACKID_GRP_MSK 0x00FF0000#define I40E_DDP_TRACKID_GRP_COMP_ALL 0xFF +#define I40E_DDP_TRACKID_PKGTYPE_MSK 0xFF000000 +#define I40E_DDP_TRACKID_PKGTYPE_RDONLY 0u32 track_id;char name[I40E_DDP_NAME_SIZE ]; };
drivers/net/i40e/i40e_ethdev.c +38 -8
107 lines not on this page · raw message
drivers/net/i40e/i40e_pf.c +2 -2
@@ -597,14 +597,14 @@ i40e_pf_config_irq_link_list(struct i40e_pf_vf *vf, tempmap = vvm->rxq_map;for (i =0 ; i <sizeof (vvm->rxq_map) *BITS_PER_CHAR ; i++) {if (tempmap &0x1 ) - linklistmap |= (1 << (2 * i)); + linklistmap |=RTE_BIT64 (2 * i); tempmap >>=1 ; } tempmap = vvm->txq_map;for (i =0 ; i <sizeof (vvm->txq_map) *BITS_PER_CHAR ; i++) {if (tempmap &0x1 ) - linklistmap |= (1 << (2 * i +1 )); + linklistmap |=RTE_BIT64 (2 * i +1 ); tempmap >>=1 ; }
drivers/net/i40e/i40e_regs.h +1 -10
@@ -586,9 +586,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_PEARPMAX, 0, 0, 0, 0, "GLHMC_PEARPMAX"}, {I40E_GLHMC_PEMROBJSZ, 0, 0, 0, 0, "GLHMC_PEMROBJSZ"}, {I40E_GLHMC_PEMRMAX, 0, 0, 0, 0, "GLHMC_PEMRMAX"}, - {I40E_GLHMC_PEXFOBJSZ, 0, 0, 0, 0, "GLHMC_PEXFOBJSZ"}, - {I40E_GLHMC_PEXFMAX, 0, 0, 0, 0, "GLHMC_PEXFMAX"}, - {I40E_GLHMC_PEXFFLMAX, 0, 0, 0, 0, "GLHMC_PEXFFLMAX"}, {I40E_GLHMC_PEQ1OBJSZ, 0, 0, 0, 0, "GLHMC_PEQ1OBJSZ"}, {I40E_GLHMC_PEQ1MAX, 0, 0, 0, 0, "GLHMC_PEQ1MAX"}, {I40E_GLHMC_PEQ1FLMAX, 0, 0, 0, 0, "GLHMC_PEQ1FLMAX"},
@@ -616,9 +613,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_APBVTINUSEBASE(0), 15, 4, 0, 0, "GLHMC_APBVTINUSEBASE"}, {I40E_GLHMC_PEMRBASE(0), 15, 4, 0, 0, "GLHMC_PEMRBASE"}, {I40E_GLHMC_PEMRCNT(0), 15, 4, 0, 0, "GLHMC_PEMRCNT"}, - {I40E_GLHMC_PEXFBASE(0), 15, 4, 0, 0, "GLHMC_PEXFBASE"}, - {I40E_GLHMC_PEXFCNT(0), 15, 4, 0, 0, "GLHMC_PEXFCNT"}, - {I40E_GLHMC_PEXFFLBASE(0), 15, 4, 0, 0, "GLHMC_PEXFFLBASE"}, {I40E_GLHMC_PEQ1BASE(0), 15, 4, 0, 0, "GLHMC_PEQ1BASE"}, {I40E_GLHMC_PEQ1CNT(0), 15, 4, 0, 0, "GLHMC_PEQ1CNT"}, {I40E_GLHMC_PEQ1FLBASE(0), 15, 4, 0, 0, "GLHMC_PEQ1FLBASE"},
@@ -653,9 +647,6 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLHMC_VFAPBVTINUSEBASE(0), 31, 4, 0, 0, "GLHMC_VFAPBVTINUSEBASE"}, {I40E_GLHMC_VFPEMRBASE(0), 31, 4, 0, 0, "GLHMC_VFPEMRBASE"}, {I40E_GLHMC_VFPEMRCNT(0), 31, 4, 0, 0, "GLHMC_VFPEMRCNT"}, - {I40E_GLHMC_VFPEXFBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFBASE"}, - {I40E_GLHMC_VFPEXFCNT(0), 31, 4, 0, 0, "GLHMC_VFPEXFCNT"}, - {I40E_GLHMC_VFPEXFFLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEXFFLBASE"}, {I40E_GLHMC_VFPEQ1BASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1BASE"}, {I40E_GLHMC_VFPEQ1CNT(0), 31, 4, 0, 0, "GLHMC_VFPEQ1CNT"}, {I40E_GLHMC_VFPEQ1FLBASE(0), 31, 4, 0, 0, "GLHMC_VFPEQ1FLBASE"},
@@ -896,7 +887,7 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GL_FCOEDDPC(0), 143, 8, 0, 0, "GL_FCOEDDPC"}, {I40E_GL_FCOECRC(0), 143, 8, 0, 0, "GL_FCOECRC"}, {I40E_GL_FCOEPRC(0), 143, 8, 0, 0, "GL_FCOEPRC"}, - {I40E_GL_RXERR1_L(0), 143, 8, 0, 0, "GL_RXERR1_L"}, + {I40E_GL_RXERR1L(0), 143, 8, 0, 0, "GL_RXERR1_L"}, {I40E_GL_FCOEDIFEC(0), 143, 8, 0, 0, "GL_FCOEDIFEC"}, {I40E_GL_RXERR2_L(0), 143, 8, 0, 0, "GL_RXERR2_L"}, {I40E_GL_FCOEDWRCL(0), 143, 8, 0, 0, "GL_FCOEDWRCL"},
drivers/net/i40e/i40e_rxtx_vec_common.h +1 -1
@@ -103,7 +103,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)if (txq->offloads &RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE ) {for (i =0 ; i < n; i++) { free[i] = txep[i].mbuf; - txep[i].mbuf =NULL ; +/* no need to reset txep[i].mbuf in vector path */ }rte_mempool_put_bulk (free[0 ]->pool, (void **)free, n); goto done;
drivers/net/iavf/iavf_ethdev.c +3 -0
@@ -2278,6 +2278,9 @@ iavf_init_vf(struct rte_eth_dev *dev) } } +if (vf->vsi_res->num_queue_pairs >IAVF_MAX_NUM_QUEUES_DFLT ) + vf->lv_enabled = true; +if (vf->vf_res->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC ) {if (iavf_get_supported_rxdid (adapter) !=0 ) {PMD_INIT_LOG (ERR ,"failed to do get supported rxdid" );
drivers/net/iavf/iavf_ipsec_crypto.c +18 -6
@@ -614,7 +614,7 @@ set_session_parameter(struct iavf_security_ctx *iavf_sctx,if (conf->crypto_xform->auth.algo ==RTE_CRYPTO_AUTH_AES_GMAC ) { sess->block_sz =get_auth_blocksize (iavf_sctx, conf->crypto_xform->auth.algo); - sess->iv_sz = conf->crypto_xform->auth.iv.length; + sess->iv_sz =sizeof (uint64_t );/* iv len inc. salt */ sess->icv_sz = conf->crypto_xform->auth.digest_length; }else { sess->block_sz = get_cipher_blocksize(iavf_sctx,
@@ -736,7 +736,9 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,uint8_t is_v4, rte_be32_t v4_dst_addr, uint8_t *v6_dst_addr, - uint8_t drop) + uint8_t drop, + bool is_udp, + uint16_t udp_port) { struct inline_ipsec_msg *request = NULL, *response = NULL;size_t request_len, response_len;
@@ -781,6 +783,8 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,/** Traffic Class/Congestion Domain currently not support */ request->ipsec_data.sp_cfg->set_tc =0 ; request->ipsec_data.sp_cfg->cgd =0 ; + request->ipsec_data.sp_cfg->is_udp = is_udp; + request->ipsec_data.sp_cfg->udp_port =htons (udp_port); response_len =sizeof (struct inline_ipsec_msg ) +sizeof (struct virtchnl_ipsec_sp_cfg_resp );
@@ -1352,6 +1356,8 @@ iavf_ipsec_crypto_set_security_capabililites(struct iavf_security_ctx capabilities =rte_zmalloc ("crypto_cap" ,sizeof (struct rte_cryptodev_capabilities ) * (number_of_capabilities +1 ),0 ); +if (!capabilities) +return -ENOMEM ; capabilities[number_of_capabilities].op =RTE_CRYPTO_OP_TYPE_UNDEFINED ;/**
@@ -1551,8 +1557,8 @@ iavf_security_ctx_destroy(struct iavf_adapter *adapter)rte_free (iavf_sctx);rte_free (sctx); - iavf_sctx =NULL ; - sctx =NULL ; + adapter->security_ctx =NULL ; + adapter->vf.eth_dev->security_ctx =NULL ;return 0 ; }
@@ -1623,6 +1629,7 @@ struct iavf_ipsec_flow_item {struct rte_ipv6_hdr ipv6_hdr; };struct rte_udp_hdr udp_hdr; +uint8_t is_udp; }; static void
@@ -1735,6 +1742,7 @@ iavf_ipsec_flow_item_parse(struct rte_eth_dev *ethdev,parse_udp_item ((const struct rte_flow_item_udp *) pattern[2 ].spec, &ipsec_flow->udp_hdr); + ipsec_flow->is_udp = true; ipsec_flow->spi = ((const struct rte_flow_item_esp *) pattern[3 ].spec)->hdr.spi;
@@ -1804,7 +1812,9 @@ iavf_ipsec_flow_create(struct iavf_adapter *ad,1 , ipsec_flow->ipv4_hdr.dst_addr,NULL , - 0); +0 , + ipsec_flow->is_udp, + ipsec_flow->udp_hdr.dst_port); }else { ipsec_flow->id = iavf_ipsec_crypto_inbound_security_policy_add(ad,
@@ -1812,7 +1822,9 @@ iavf_ipsec_flow_create(struct iavf_adapter *ad,0 ,0 , ipsec_flow->ipv6_hdr.dst_addr, - 0); +0 , + ipsec_flow->is_udp, + ipsec_flow->udp_hdr.dst_port); }if (ipsec_flow->id <1 ) {
drivers/net/iavf/iavf_ipsec_crypto.h +3 -1
@@ -145,7 +145,9 @@ iavf_ipsec_crypto_inbound_security_policy_add(struct iavf_adapter *adapter,uint8_t is_v4, rte_be32_t v4_dst_addr, uint8_t *v6_dst_addr, - uint8_t drop); + uint8_t drop, + bool is_udp, + uint16_t udp_port);/** * Delete inbound security policy rule from hardware
drivers/net/iavf/iavf_rxtx.c +77 -28
190 lines not on this page · raw message
drivers/net/iavf/iavf_rxtx.h +1 -42
56 lines not on this page · raw message
drivers/net/iavf/iavf_rxtx_vec_avx2.c +1 -3
@@ -1450,9 +1450,6 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t flags =IAVF_TX_DESC_CMD_EOP |IAVF_TX_DESC_CMD_ICRC ;uint64_t rs =IAVF_TX_DESC_CMD_RS | flags; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs (txq);
@@ -1516,6 +1513,7 @@ iavf_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec_avx2 (tx_queue, &tx_pkts[nb_tx], num);
drivers/net/iavf/iavf_rxtx_vec_avx512.c +1 -3
@@ -1907,9 +1907,6 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t flags =IAVF_TX_DESC_CMD_EOP |IAVF_TX_DESC_CMD_ICRC ;uint64_t rs =IAVF_TX_DESC_CMD_RS | flags; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs_avx512 (txq);
@@ -1975,6 +1972,7 @@ iavf_xmit_pkts_vec_avx512_cmn(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec_avx512 (tx_queue, &tx_pkts[nb_tx], num, offload);
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -3
@@ -1120,9 +1120,6 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,uint64_t rs =IAVF_TX_DESC_CMD_RS | flags;int i; -/* cross rx_thresh boundary is not allowed */ - nb_pkts =RTE_MIN (nb_pkts, txq->rs_thresh); -if (txq->nb_free < txq->free_thresh)iavf_tx_free_bufs (txq);
@@ -1189,6 +1186,7 @@ iavf_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,while (nb_pkts) {uint16_t ret, num; +/* cross rs_thresh boundary is not allowed */ num = (uint16_t )RTE_MIN (nb_pkts, txq->rs_thresh); ret =iavf_xmit_fixed_burst_vec (tx_queue, &tx_pkts[nb_tx], num); nb_tx += ret;
drivers/net/iavf/iavf_vchnl.c +2 -2
@@ -165,7 +165,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args,return -1 ; } - ret =iavf_aq_send_msg_to_pf (hw, args->ops,IAVF_SUCCESS , + ret =iavf_aq_send_msg_to_pf (hw, args->ops,VIRTCHNL_STATUS_SUCCESS , args->in_args, args->in_args_size,NULL );if (ret) {PMD_DRV_LOG (ERR ,"fail to send cmd %d" , args->ops);
@@ -502,7 +502,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)VIRTCHNL_VF_OFFLOAD_VLAN_V2 |VIRTCHNL_VF_LARGE_NUM_QPAIRS |VIRTCHNL_VF_OFFLOAD_QOS | -+VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO ; +VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO ; args.in_args = (uint8_t *)∩︀ args.in_args_size =sizeof (caps);
drivers/net/ice/ice_dcf.c +2 -2
@@ -40,7 +40,7 @@ static __rte_always_inline int ice_dcf_send_cmd_req_no_irq(struct ice_dcf_hw *hw, enum virtchnl_ops op, uint8_t *req_msg, uint16_t req_msglen) { - return iavf_aq_send_msg_to_pf(&hw->avf, op, IAVF_SUCCESS, + return iavf_aq_send_msg_to_pf(&hw->avf, op, VIRTCHNL_STATUS_SUCCESS, req_msg, req_msglen, NULL); }
@@ -105,7 +105,7 @@ static __rte_always_inline int ice_dcf_vc_cmd_send(struct ice_dcf_hw *hw, struct dcf_virtchnl_cmd *cmd) { return iavf_aq_send_msg_to_pf(&hw->avf, - cmd->v_op, IAVF_SUCCESS, + cmd->v_op, VIRTCHNL_STATUS_SUCCESS, cmd->req_msg, cmd->req_msglen, NULL); }
Signature · 1 line
2.27.0