Re: [dpdk-dev] [PATCH 0/2] Fix vhost performance regression
Hi Yinan, On 7/24/20 6:55 AM, Wang, Yinan wrote: > Hi Maxime, > > The performance drop issue can be fixed, thanks! > The multi-queues interrupt issue still exist w/ this patch set. Thanks for the test report, so that's only half good. I'm setting up the multi-queues interrupt test case to further debug it. Regards, Maxime > BR, > Yinan > >> -Original Message- >> From: Maxime Coquelin >> Sent: 2020?7?23? 21:09 >> To: dev@dpdk.org; ma...@mellanox.com; Xia, Chenbo >> ; Liu, Yong ; Wang, Yinan >> >> Cc: tho...@monjalon.net; Yigit, Ferruh ; >> david.march...@redhat.com; Maxime Coquelin >> >> Subject: [PATCH 0/2] Fix vhost performance regression >> >> Hi, >> >> This series aims at fixing the performance degradation reported >> by Intel QE. I managed to reproduce the issue, and this series >> fixes it. >> >> I only tested the first test case provided in the Bz[0], but wanted >> to send early for Intel QE to try and confirm it solves the issue. >> >> I will work on reproducing the other test cases, and see if this >> also fixes them. >> >> Thanks to Intel QE team for finding this issue. >> Maxime >> >> [0]: https://bugs.dpdk.org/show_bug.cgi?id=507#c0 >> >> Maxime Coquelin (2): >> vhost: fix guest notification setting >> net/vhost: fix queue update >> >> drivers/net/vhost/rte_eth_vhost.c | 25 ++--- >> lib/librte_vhost/vhost.c | 24 >> lib/librte_vhost/vhost.h | 5 + >> lib/librte_vhost/vhost_user.c | 11 --- >> 4 files changed, 39 insertions(+), 26 deletions(-) >> >> -- >> 2.26.2 >
Re: [dpdk-dev] [PATCH] net/ice: fix GTPU down/uplink and extension conflict
hi, simei
On 7/24/2020 10:10 AM, Simei Su wrote:
When adding a RSS rule with GTPU_DWN/UP, it will search profile
table from the top index. If a RSS rule with GTPU_EH already exists,
then GTPU_DWN/UP packet will match GTPU_EH profile. This patch solves
this issue by removing existed GTPU_EH rule before creating a new
GTPU_DWN/UP rule.
Suggest interpret the relation ship bettween GTPU_EH_UPLINK/DWNLINK with
GTPU_EH to help knowledge the reason.
Fixes: 2e2810fc1868 ("net/ice: fix GTPU RSS")
Signed-off-by: Simei Su
---
drivers/net/ice/ice_ethdev.c | 47 +++
drivers/net/ice/ice_ethdev.h | 15 +
drivers/net/ice/ice_hash.c | 139 +++
3 files changed, 201 insertions(+)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index a4a0390..8839146 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2538,6 +2538,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4 rss flow fail %d",
__func__, ret);
A blank line need.
+ /* Store hash field and header for gtpu_eh ipv4 */
+ pf->gtpu_eh.ipv4.hash_fld = ICE_FLOW_HASH_IPV4;
+ pf->gtpu_eh.ipv4.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
+ ICE_FLOW_SEG_HDR_IPV4 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4,
ICE_FLOW_SEG_HDR_PPPOE |
@@ -2564,6 +2569,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6 rss flow fail %d",
__func__, ret);
+ /* Store hash field and header for gtpu_eh ipv6 */
+ pf->gtpu_eh.ipv6.hash_fld = ICE_FLOW_HASH_IPV6;
+ pf->gtpu_eh.ipv6.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
+ ICE_FLOW_SEG_HDR_IPV6 |
+ ICE_FLOW_SEG_HDR_IPV_OTHER;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV6,
ICE_FLOW_SEG_HDR_PPPOE |
@@ -2586,6 +2596,9 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_UDP rss flow fail %d",
__func__, ret);
+ /* Store hash field and header for gtpu_eh ipv4_udp */
+ pf->gtpu_eh.ipv4_udp.hash_fld = ICE_HASH_UDP_IPV4;
+ pf->gtpu_eh.ipv4_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV4,
ICE_FLOW_SEG_HDR_PPPOE, 0);
@@ -2606,6 +2619,9 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_UDP rss flow fail %d",
__func__, ret);
+ /* Store hash field and header for gtpu_eh ipv6_udp */
+ pf->gtpu_eh.ipv6_udp.hash_fld = ICE_HASH_UDP_IPV6;
+ pf->gtpu_eh.ipv6_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV6,
ICE_FLOW_SEG_HDR_PPPOE, 0);
@@ -2626,6 +2642,9 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_TCP rss flow fail %d",
__func__, ret);
+ /* Store hash field and header for gtpu_eh ipv4_tcp */
+ pf->gtpu_eh.ipv4_tcp.hash_fld = ICE_HASH_TCP_IPV4;
+ pf->gtpu_eh.ipv4_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV4,
ICE_FLOW_SEG_HDR_PPPOE, 0);
@@ -2646,6 +2665,9 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_TCP rss flow fail %d",
__func__, ret);
+ /* Store hash field and header for gtpu_eh ipv6_tcp */
+ pf->gtpu_eh.ipv6_tcp.hash_fld = ICE_HASH_TCP_IPV6;
+ pf->gtpu_eh.ipv6_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV6,
ICE_FLOW_SEG_HDR_PPPOE, 0);
@@ -2695,6 +2717,28 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
}
}
+static void
+ice_rss_ctx_init(struct ice_pf *pf)
+{
+ pf->gtpu_eh.ipv4.hash_fld = 0;
+ pf->gtpu_eh.ipv4.pkt_hdr = 0;
+
+ pf->gtpu_eh.ipv6.hash_fld = 0;
+ pf->gtpu_eh.ipv6.pkt_hdr = 0;
+
+ pf->gtpu_eh.ipv4_udp.hash_fld = 0;
+ pf->gtpu_eh.ipv4_udp.pkt_hdr = 0;
+
+
[dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ
This patch enable i40e outer vlan strip on and off in QinQ
mode with mask bit of DEV_RX_OFFLOAD_QINQ_STRIP, users can
use "vlan set qinq_strip on 0" to enable or "vlan set
qinq_strip on 0" to disable i40e outer vlan strip when
try with testpmd app.
Fixes: 4861cde46116 (i40e: new poll mode driver)
Signed-off-by: Wei Zhao
---
drivers/net/i40e/i40e_ethdev.c | 45 +-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f2861..f5be6606c 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -48,6 +48,8 @@
#define ETH_I40E_VF_MSG_CFG"vf_msg_cfg"
#define I40E_CLEAR_PXE_WAIT_MS 200
+#define I40E_VSI_TSR_QINQ_STRIP0x4010
+#define I40E_VSI_TSR(_i) (0x00050800 + ((_i) * 4))
/* Maximun number of capability elements */
#define I40E_MAX_CAP_ELE_NUM 128
@@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
return ret;
}
+/* Configure outer vlan stripping on or off in QinQ mode */
+static int
+i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on)
+{
+ struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+ int ret = I40E_SUCCESS;
+ uint32_t reg;
+
+ if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
+ PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
+ return -EINVAL;
+ }
+
+ /* Configure for outer VLAN RX stripping */
+ reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
+
+ if (on)
+ reg |= I40E_VSI_TSR_QINQ_STRIP;
+ else
+ reg &= ~I40E_VSI_TSR_QINQ_STRIP;
+
+ ret = i40e_aq_debug_write_register(hw,
+ I40E_VSI_TSR(vsi->vsi_id),
+ reg, NULL);
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
+ vsi->vsi_id);
+ return I40E_ERR_CONFIG;
+ }
+
+ return ret;
+}
+
static int
i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
@@ -4004,6 +4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
i40e_vsi_config_double_vlan(vsi, FALSE);
}
+ if (mask & ETH_QINQ_STRIP_MASK) {
+ /* Enable or disable outer VLAN stripping */
+ if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
+ i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
+ else
+ i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
+ }
+
return 0;
}
@@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
/* Apply vlan offload setting */
mask = ETH_VLAN_STRIP_MASK |
+ ETH_QINQ_STRIP_MASK |
ETH_VLAN_FILTER_MASK |
ETH_VLAN_EXTEND_MASK;
ret = i40e_vlan_offload_set(dev, mask);
@@ -10872,7 +10916,6 @@ i40e_configure_registers(struct i40e_hw *hw)
}
}
-#define I40E_VSI_TSR(_i)(0x00050800 + ((_i) * 4))
#define I40E_VSI_TSR_QINQ_CONFIG0xc030
#define I40E_VSI_L2TAGSTXVALID(_i) (0x00042800 + ((_i) * 4))
#define I40E_VSI_L2TAGSTXVALID_QINQ 0xab
--
2.19.1
Re: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ
Add maintainers.
> -Original Message-
> From: Zhao1, Wei
> Sent: Friday, July 24, 2020 3:02 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Qi Z ; Zhao1, Wei
>
> Subject: [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ
>
> This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit
> of
> DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip on 0" to
> enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when try
> with testpmd app.
>
> Fixes: 4861cde46116 (i40e: new poll mode driver)
>
> Signed-off-by: Wei Zhao
> ---
> drivers/net/i40e/i40e_ethdev.c | 45 +-
> 1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 05d5f2861..f5be6606c 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -48,6 +48,8 @@
> #define ETH_I40E_VF_MSG_CFG "vf_msg_cfg"
>
> #define I40E_CLEAR_PXE_WAIT_MS 200
> +#define I40E_VSI_TSR_QINQ_STRIP 0x4010
> +#define I40E_VSI_TSR(_i) (0x00050800 + ((_i) * 4))
>
> /* Maximun number of capability elements */
> #define I40E_MAX_CAP_ELE_NUM 128
> @@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
> return ret;
> }
>
> +/* Configure outer vlan stripping on or off in QinQ mode */ static int
> +i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on) {
> + struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
> + int ret = I40E_SUCCESS;
> + uint32_t reg;
> +
> + if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
> + PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
> + return -EINVAL;
> + }
> +
> + /* Configure for outer VLAN RX stripping */
> + reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
> +
> + if (on)
> + reg |= I40E_VSI_TSR_QINQ_STRIP;
> + else
> + reg &= ~I40E_VSI_TSR_QINQ_STRIP;
> +
> + ret = i40e_aq_debug_write_register(hw,
> +I40E_VSI_TSR(vsi->vsi_id),
> +reg, NULL);
> + if (ret < 0) {
> + PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
> + vsi->vsi_id);
> + return I40E_ERR_CONFIG;
> + }
> +
> + return ret;
> +}
> +
> static int
> i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask) { @@ -4004,6
> +4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> i40e_vsi_config_double_vlan(vsi, FALSE);
> }
>
> + if (mask & ETH_QINQ_STRIP_MASK) {
> + /* Enable or disable outer VLAN stripping */
> + if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
> + i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
> + else
> + i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
> + }
> +
> return 0;
> }
>
> @@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
>
> /* Apply vlan offload setting */
> mask = ETH_VLAN_STRIP_MASK |
> +ETH_QINQ_STRIP_MASK |
> ETH_VLAN_FILTER_MASK |
> ETH_VLAN_EXTEND_MASK;
> ret = i40e_vlan_offload_set(dev, mask); @@ -10872,7 +10916,6 @@
> i40e_configure_registers(struct i40e_hw *hw)
> }
> }
>
> -#define I40E_VSI_TSR(_i)(0x00050800 + ((_i) * 4))
> #define I40E_VSI_TSR_QINQ_CONFIG0xc030
> #define I40E_VSI_L2TAGSTXVALID(_i) (0x00042800 + ((_i) * 4)) #define
> I40E_VSI_L2TAGSTXVALID_QINQ 0xab
> --
> 2.19.1
[dpdk-dev] [PATCH v1] vdpa/ifc: fix vring update after device config
The device ready state in vhost lib is now defined as the state
that first queue pair is ready. And kick/callfd may be updated
by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still
has to update callfd when working with QEMU. This patch fixes
this vring update problem by implementing the set_vring_state
callback.
Fixes: a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)
Suggested-by: Maxime Coquelin
Signed-off-by: Chenbo Xia
Acked-by: Wang Xiao W
---
drivers/vdpa/ifc/base/ifcvf.h | 1 +
drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
index eb04a9406..a288ce57d 100644
--- a/drivers/vdpa/ifc/base/ifcvf.h
+++ b/drivers/vdpa/ifc/base/ifcvf.h
@@ -115,6 +115,7 @@ struct vring_info {
u16 size;
u16 last_avail_idx;
u16 last_used_idx;
+ bool enable;
};
struct ifcvf_hw {
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index a757d45ec..9da25f0c7 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {
struct ifcvf_internal {
struct rte_pci_device *pdev;
struct ifcvf_hw hw;
+ int configured;
int vfio_container_fd;
int vfio_group_fd;
int vfio_dev_fd;
@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)
DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
vdev->device->name);
+ internal->configured = 1;
return 0;
}
@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)
update_datapath(internal);
}
+ internal->configured = 0;
return 0;
}
@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device
*vdev, uint64_t *features)
return 0;
}
+static int
+ifcvf_set_vring_state(int vid, int vring, int state)
+{
+ struct rte_vdpa_device *vdev;
+ struct internal_list *list;
+ struct ifcvf_internal *internal;
+ struct ifcvf_hw *hw;
+ struct ifcvf_pci_common_cfg *cfg;
+ int ret = 0;
+
+ vdev = rte_vhost_get_vdpa_device(vid);
+ list = find_internal_resource_by_vdev(vdev);
+ if (list == NULL) {
+ DRV_LOG(ERR, "Invalid vDPA device: %p", vdev);
+ return -1;
+ }
+
+ internal = list->internal;
+ if (vring < 0 || vring >= internal->max_queues * 2) {
+ DRV_LOG(ERR, "Vring index %d not correct", vring);
+ return -1;
+ }
+
+ hw = &internal->hw;
+ if (!internal->configured)
+ goto exit;
+
+ cfg = hw->common_cfg;
+ IFCVF_WRITE_REG16(vring, &cfg->queue_select);
+ IFCVF_WRITE_REG16(state, &cfg->queue_enable);
+
+ if (!state && hw->vring[vring].enable) {
+ ret = vdpa_disable_vfio_intr(internal);
+ if (ret)
+ return ret;
+ }
+
+ if (state && !hw->vring[vring].enable) {
+ ret = vdpa_enable_vfio_intr(internal, 0);
+ if (ret)
+ return ret;
+ }
+
+exit:
+ hw->vring[vring].enable = !!state;
+ return 0;
+}
+
static struct rte_vdpa_dev_ops ifcvf_ops = {
.get_queue_num = ifcvf_get_queue_num,
.get_features = ifcvf_get_vdpa_features,
.get_protocol_features = ifcvf_get_protocol_features,
.dev_conf = ifcvf_dev_config,
.dev_close = ifcvf_dev_close,
- .set_vring_state = NULL,
+ .set_vring_state = ifcvf_set_vring_state,
.set_features = ifcvf_set_features,
.migration_done = NULL,
.get_vfio_group_fd = ifcvf_get_vfio_group_fd,
@@ -1170,6 +1221,7 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
goto error;
}
+ internal->configured = 0;
internal->max_queues = IFCVF_MAX_QUEUES;
features = ifcvf_get_features(&internal->hw);
internal->features = (features &
--
2.17.1
[dpdk-dev] [PATCH v5] net/i40e: fix incorrect hash look up table
The hash look up table (LUT) is managed by global register but it is not
initialized when RSS is disabled. Once user wants to enable RSS during
runtime, the LUT will not be initialized.
This patch fixes the issue by initializing the LUT whatever RSS enabled
or not.
Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow")
Cc: sta...@dpdk.org
Signed-off-by: Shougang Wang
---
v5:
-Removed useless function
---
drivers/net/i40e/i40e_ethdev.c | 25 ++---
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f2861..6fa0a5c71 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -302,7 +302,6 @@ static int i40e_dev_init_vlan(struct rte_eth_dev *dev);
static int i40e_veb_release(struct i40e_veb *veb);
static struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,
struct i40e_vsi *vsi);
-static int i40e_pf_config_mq_rx(struct i40e_pf *pf);
static int i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on);
static inline int i40e_find_all_mac_for_vlan(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
@@ -398,6 +397,7 @@ static void i40e_ethertype_filter_restore(struct i40e_pf
*pf);
static void i40e_tunnel_filter_restore(struct i40e_pf *pf);
static void i40e_filter_restore(struct i40e_pf *pf);
static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
+static int i40e_pf_config_rss(struct i40e_pf *pf);
static const char *const valid_keys[] = {
ETH_I40E_FLOATING_VEB_ARG,
@@ -1954,7 +1954,7 @@ i40e_dev_configure(struct rte_eth_dev *dev)
goto err;
/* VMDQ setup.
-* Needs to move VMDQ setting out of i40e_pf_config_mq_rx() as VMDQ and
+* Needs to move VMDQ setting out of i40e_pf_config_rss() as VMDQ and
* RSS setting have different requirements.
* General PMD driver call sequence are NIC init, configure,
* rx/tx_queue_setup and dev_start. In rx/tx_queue_setup() function, it
@@ -6478,7 +6478,7 @@ i40e_dev_rx_init(struct i40e_pf *pf)
uint16_t i;
struct i40e_rx_queue *rxq;
- i40e_pf_config_mq_rx(pf);
+ i40e_pf_config_rss(pf);
for (i = 0; i < data->nb_rx_queues; i++) {
rxq = data->rx_queues[i];
if (!rxq || !rxq->q_set)
@@ -8984,6 +8984,7 @@ i40e_pf_calc_configured_queues_num(struct i40e_pf *pf)
static int
i40e_pf_config_rss(struct i40e_pf *pf)
{
+ enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct rte_eth_rss_conf rss_conf;
uint32_t i, lut = 0;
@@ -9022,7 +9023,8 @@ i40e_pf_config_rss(struct i40e_pf *pf)
}
rss_conf = pf->dev_data->dev_conf.rx_adv_conf.rss_conf;
- if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0) {
+ if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0 ||
+ !(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
i40e_pf_disable_rss(pf);
return 0;
}
@@ -9195,21 +9197,6 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev,
return ret;
}
-static int
-i40e_pf_config_mq_rx(struct i40e_pf *pf)
-{
- int ret = 0;
- enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
-
- /* RSS setup */
- if (mq_mode & ETH_MQ_RX_RSS_FLAG)
- ret = i40e_pf_config_rss(pf);
- else
- i40e_pf_disable_rss(pf);
-
- return ret;
-}
-
/* Get the symmetric hash enable configurations per port */
static void
i40e_get_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t *enable)
--
2.17.1
Re: [dpdk-dev] [dpdk-dev v1] net/iavf: add gtpu hash in default
> -Original Message- > From: Guo, Jia > Sent: Friday, July 24, 2020 10:22 AM > To: Zhang, Qi Z ; Xing, Beilei ; > Wu, Jingjing > Cc: dev@dpdk.org; Guo, Junfeng ; Su, Simei > ; Guo, Jia > Subject: [dpdk-dev v1] net/iavf: add gtpu hash in default > > Add GTPU_IP and GTPU_EH hash in default. > > Signed-off-by: Jeff Guo Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
Re: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ
> -Original Message-
> From: dev On Behalf Of Wei Zhao
> Sent: Friday, July 24, 2020 15:02
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Qi Z ; Zhao1, Wei
>
> Subject: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ
>
> This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit
> of DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip on 0"
> to enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when
> try with testpmd app.
>
> Fixes: 4861cde46116 (i40e: new poll mode driver)
>
> Signed-off-by: Wei Zhao
> ---
> drivers/net/i40e/i40e_ethdev.c | 45
> +-
> 1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 05d5f2861..f5be6606c 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -48,6 +48,8 @@
> #define ETH_I40E_VF_MSG_CFG "vf_msg_cfg"
>
> #define I40E_CLEAR_PXE_WAIT_MS 200
> +#define I40E_VSI_TSR_QINQ_STRIP 0x4010
> +#define I40E_VSI_TSR(_i) (0x00050800 + ((_i) * 4))
>
> /* Maximun number of capability elements */
> #define I40E_MAX_CAP_ELE_NUM 128
> @@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
> return ret;
> }
>
> +/* Configure outer vlan stripping on or off in QinQ mode */ static int
> +i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on) {
> + struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
> + int ret = I40E_SUCCESS;
> + uint32_t reg;
> +
> + if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
> + PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
> + return -EINVAL;
> + }
> +
> + /* Configure for outer VLAN RX stripping */
> + reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
> +
> + if (on)
> + reg |= I40E_VSI_TSR_QINQ_STRIP;
> + else
> + reg &= ~I40E_VSI_TSR_QINQ_STRIP;
> +
> + ret = i40e_aq_debug_write_register(hw,
> +I40E_VSI_TSR(vsi->vsi_id),
> +reg, NULL);
> + if (ret < 0) {
> + PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
> + vsi->vsi_id);
> + return I40E_ERR_CONFIG;
> + }
> +
> + return ret;
> +}
> +
> static int
> i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask) { @@ -4004,6
> +4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> i40e_vsi_config_double_vlan(vsi, FALSE);
> }
>
> + if (mask & ETH_QINQ_STRIP_MASK) {
> + /* Enable or disable outer VLAN stripping */
> + if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
> + i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
> + else
> + i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
> + }
> +
> return 0;
> }
>
> @@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
>
> /* Apply vlan offload setting */
> mask = ETH_VLAN_STRIP_MASK |
> +ETH_QINQ_STRIP_MASK |
> ETH_VLAN_FILTER_MASK |
> ETH_VLAN_EXTEND_MASK;
> ret = i40e_vlan_offload_set(dev, mask); @@ -10872,7 +10916,6 @@
> i40e_configure_registers(struct i40e_hw *hw)
> }
> }
>
> -#define I40E_VSI_TSR(_i)(0x00050800 + ((_i) * 4))
> #define I40E_VSI_TSR_QINQ_CONFIG0xc030
> #define I40E_VSI_L2TAGSTXVALID(_i) (0x00042800 + ((_i) * 4)) #define
> I40E_VSI_L2TAGSTXVALID_QINQ 0xab
> --
> 2.19.1
Reviewed-by: Qiming Yang
Re: [dpdk-dev] [PATCH 0/2] Fix vhost performance regression
On 7/24/20 9:06 AM, Maxime Coquelin wrote:
> Hi Yinan,
>
> On 7/24/20 6:55 AM, Wang, Yinan wrote:
>> Hi Maxime,
>>
>> The performance drop issue can be fixed, thanks!
>> The multi-queues interrupt issue still exist w/ this patch set.
>
> Thanks for the test report, so that's only half good.
> I'm setting up the multi-queues interrupt test case to further debug it.
I have now a reproducer, i.e. only interrupts are received on rxq0.
(gdb) p *((struct internal_list *)internal_list)->eth_dev->intr_handle
$20 = {
{
vfio_dev_fd = 0,
uio_cfg_fd = 0
},
fd = 0,
type = RTE_INTR_HANDLE_VDEV,
max_intr = 2,
nb_efd = 1,
efd_counter_size = 8 '\b',
efds = {622, 621, 624, 626, 628, 630, 632, 634, 636, 638, 640, 642,
692, 646, 701, 650, 0 },
elist = {{
status = 1,
fd = 622,
epfd = 645,
epdata = {
event = 2147483651,
data = 0x1,
cb_fun = 0x8af840 ,
cb_arg = 0x7f4df0001580
}
}, {
status = 0,
fd = 0,
epfd = 0,
epdata = {
event = 0,
data = 0x0,
cb_fun = 0x0,
cb_arg = 0x0
}
} },
intr_vec = 0x7f4df0007db0
}
In above dump, we can see the efds are well set via the fix provided by
Matan, but max_intr and nb_efd aren't so polling won't take them into
account.
I'm working on a fix.
Regards,
Maxime
> Regards,
> Maxime
>
>> BR,
>> Yinan
>>
>>> -Original Message-
>>> From: Maxime Coquelin
>>> Sent: 2020?7?23? 21:09
>>> To: dev@dpdk.org; ma...@mellanox.com; Xia, Chenbo
>>> ; Liu, Yong ; Wang, Yinan
>>>
>>> Cc: tho...@monjalon.net; Yigit, Ferruh ;
>>> david.march...@redhat.com; Maxime Coquelin
>>>
>>> Subject: [PATCH 0/2] Fix vhost performance regression
>>>
>>> Hi,
>>>
>>> This series aims at fixing the performance degradation reported
>>> by Intel QE. I managed to reproduce the issue, and this series
>>> fixes it.
>>>
>>> I only tested the first test case provided in the Bz[0], but wanted
>>> to send early for Intel QE to try and confirm it solves the issue.
>>>
>>> I will work on reproducing the other test cases, and see if this
>>> also fixes them.
>>>
>>> Thanks to Intel QE team for finding this issue.
>>> Maxime
>>>
>>> [0]: https://bugs.dpdk.org/show_bug.cgi?id=507#c0
>>>
>>> Maxime Coquelin (2):
>>> vhost: fix guest notification setting
>>> net/vhost: fix queue update
>>>
>>> drivers/net/vhost/rte_eth_vhost.c | 25 ++---
>>> lib/librte_vhost/vhost.c | 24
>>> lib/librte_vhost/vhost.h | 5 +
>>> lib/librte_vhost/vhost_user.c | 11 ---
>>> 4 files changed, 39 insertions(+), 26 deletions(-)
>>>
>>> --
>>> 2.26.2
>>
>
Re: [dpdk-dev] [PATCH v5] net/i40e: fix incorrect hash look up table
Tested-by: Zhang, XiX
Regards,
Xie Wei
-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Shougang Wang
Sent: Friday, July 24, 2020 4:13 PM
To: dev@dpdk.org
Cc: Xing, Beilei ; Guo, Jia ; Yang,
Qiming ; Wang, ShougangX ;
sta...@dpdk.org
Subject: [dpdk-dev] [PATCH v5] net/i40e: fix incorrect hash look up table
The hash look up table (LUT) is managed by global register but it is not
initialized when RSS is disabled. Once user wants to enable RSS during runtime,
the LUT will not be initialized.
This patch fixes the issue by initializing the LUT whatever RSS enabled or not.
Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow")
Cc: sta...@dpdk.org
Signed-off-by: Shougang Wang
---
v5:
-Removed useless function
---
drivers/net/i40e/i40e_ethdev.c | 25 ++---
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f2861..6fa0a5c71 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -302,7 +302,6 @@ static int i40e_dev_init_vlan(struct rte_eth_dev *dev);
static int i40e_veb_release(struct i40e_veb *veb); static struct i40e_veb
*i40e_veb_setup(struct i40e_pf *pf,
struct i40e_vsi *vsi);
-static int i40e_pf_config_mq_rx(struct i40e_pf *pf); static int
i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on); static inline int
i40e_find_all_mac_for_vlan(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
@@ -398,6 +397,7 @@ static void i40e_ethertype_filter_restore(struct i40e_pf
*pf); static void i40e_tunnel_filter_restore(struct i40e_pf *pf); static void
i40e_filter_restore(struct i40e_pf *pf); static void
i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
+static int i40e_pf_config_rss(struct i40e_pf *pf);
static const char *const valid_keys[] = {
ETH_I40E_FLOATING_VEB_ARG,
@@ -1954,7 +1954,7 @@ i40e_dev_configure(struct rte_eth_dev *dev)
goto err;
/* VMDQ setup.
-* Needs to move VMDQ setting out of i40e_pf_config_mq_rx() as VMDQ and
+* Needs to move VMDQ setting out of i40e_pf_config_rss() as VMDQ and
* RSS setting have different requirements.
* General PMD driver call sequence are NIC init, configure,
* rx/tx_queue_setup and dev_start. In rx/tx_queue_setup() function,
it @@ -6478,7 +6478,7 @@ i40e_dev_rx_init(struct i40e_pf *pf)
uint16_t i;
struct i40e_rx_queue *rxq;
- i40e_pf_config_mq_rx(pf);
+ i40e_pf_config_rss(pf);
for (i = 0; i < data->nb_rx_queues; i++) {
rxq = data->rx_queues[i];
if (!rxq || !rxq->q_set)
@@ -8984,6 +8984,7 @@ i40e_pf_calc_configured_queues_num(struct i40e_pf *pf)
static int i40e_pf_config_rss(struct i40e_pf *pf) {
+ enum rte_eth_rx_mq_mode mq_mode =
+pf->dev_data->dev_conf.rxmode.mq_mode;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct rte_eth_rss_conf rss_conf;
uint32_t i, lut = 0;
@@ -9022,7 +9023,8 @@ i40e_pf_config_rss(struct i40e_pf *pf)
}
rss_conf = pf->dev_data->dev_conf.rx_adv_conf.rss_conf;
- if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0) {
+ if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0 ||
+ !(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
i40e_pf_disable_rss(pf);
return 0;
}
@@ -9195,21 +9197,6 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev,
return ret;
}
-static int
-i40e_pf_config_mq_rx(struct i40e_pf *pf) -{
- int ret = 0;
- enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
-
- /* RSS setup */
- if (mq_mode & ETH_MQ_RX_RSS_FLAG)
- ret = i40e_pf_config_rss(pf);
- else
- i40e_pf_disable_rss(pf);
-
- return ret;
-}
-
/* Get the symmetric hash enable configurations per port */ static void
i40e_get_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t *enable)
--
2.17.1
Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
> -Original Message- > From: Guo, Jia > Sent: Friday, July 24, 2020 12:07 PM > To: Zhang, Qi Z ; Xing, Beilei ; > Wu, Jingjing > Cc: dev@dpdk.org; Guo, Junfeng ; Su, Simei > ; Guo, Jia > Subject: [dpdk-dev v1] net/iavf: delete unsupported rss types > > The combined hash type should be bound with prefix protocol when configure it, > so delete some useless and unsupported part for rss types mapping. > > Signed-off-by: Jeff Guo Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
[dpdk-dev] [PATCH 1/1] librte_eal: wrapper around rte_intr_callback_unregister().
Avoid race with unregister interrupt hanlder if interrupt
source has some active callbacks at the moment, use wrapper
around rte_intr_callback_unregister() to check for -EAGAIN
return value.
Signed-off-by: Renata Saiakhova
---
lib/librte_eal/freebsd/eal_interrupts.c | 16 ++--
lib/librte_eal/linux/eal_interrupts.c | 16 ++--
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/freebsd/eal_interrupts.c
b/lib/librte_eal/freebsd/eal_interrupts.c
index 6d53d33c8..a92a7a025 100644
--- a/lib/librte_eal/freebsd/eal_interrupts.c
+++ b/lib/librte_eal/freebsd/eal_interrupts.c
@@ -259,8 +259,8 @@ rte_intr_callback_unregister_pending(const struct
rte_intr_handle *intr_handle,
return ret;
}
-int
-rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
+static int
+__rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
rte_intr_callback_fn cb_fn, void *cb_arg)
{
int ret;
@@ -345,6 +345,18 @@ rte_intr_callback_unregister(const struct rte_intr_handle
*intr_handle,
return ret;
}
+int
+rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
+ rte_intr_callback_fn cb_fn, void *cb_arg)
+{
+ int ret = 0;
+
+ while ((ret = __rte_intr_callback_unregister(intr_handle, cb_fn,
cb_arg)) == -EAGAIN)
+ rte_pause();
+
+ return ret;
+}
+
int
rte_intr_enable(const struct rte_intr_handle *intr_handle)
{
diff --git a/lib/librte_eal/linux/eal_interrupts.c
b/lib/librte_eal/linux/eal_interrupts.c
index 13db5c4e8..d5dcfc36b 100644
--- a/lib/librte_eal/linux/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal_interrupts.c
@@ -596,8 +596,8 @@ rte_intr_callback_unregister_pending(const struct
rte_intr_handle *intr_handle,
return ret;
}
-int
-rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
+static int
+__rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
rte_intr_callback_fn cb_fn, void *cb_arg)
{
int ret;
@@ -662,6 +662,18 @@ rte_intr_callback_unregister(const struct rte_intr_handle
*intr_handle,
return ret;
}
+int
+rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
+ rte_intr_callback_fn cb_fn, void *cb_arg)
+{
+ int ret = 0;
+
+ while ((ret = __rte_intr_callback_unregister(intr_handle, cb_fn,
cb_arg)) == -EAGAIN)
+ rte_pause();
+
+ return ret;
+}
+
int
rte_intr_enable(const struct rte_intr_handle *intr_handle)
{
--
2.17.2
[dpdk-dev] [PATCH 0/1] Avoid race with unregister interrupt hanlder if interrupt
For pci_vfio, while removing the device by rte_dev_remove(), pci_vfio_disable_notifier() will call rte_intr_callback_unregister(), which may return -EAGAIN, if an interrupt source (kernel) has some active callbacks right now. As a result, the callback (req notifier) can be never unregistered, and the corresponding descriptor (vfio_req_intr_handle.fd) can be never closed. The kernel will continuously try to notify the user space using req notifier, but as the device is already removed, in this case it even cannot find a bus for that device, the log is full of messages "EAL: Cannot find bus for device (XX:XX.X)" Renata Saiakhova (1): librte_eal: wrapper around rte_intr_callback_unregister(). lib/librte_eal/freebsd/eal_interrupts.c | 16 ++-- lib/librte_eal/linux/eal_interrupts.c | 16 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) -- 2.17.2
[dpdk-dev] [PATCH v3 01/22] net/bnxt: add shadow and search capability to tcam
From: Mike Baucom
- Add TCAM shadow tables for searching
- Add Search API to allow reuse of TCAM entries
Signed-off-by: Mike Baucom
Reviewed-by: Randy Schacher
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/tf_core.c| 73 ++
drivers/net/bnxt/tf_core/tf_core.h| 101 +++
drivers/net/bnxt/tf_core/tf_device_p4.c | 2 +-
drivers/net/bnxt/tf_core/tf_shadow_tcam.c | 885 +-
drivers/net/bnxt/tf_core/tf_shadow_tcam.h | 258 +++
drivers/net/bnxt/tf_core/tf_tcam.c| 300 +++-
drivers/net/bnxt/tf_core/tf_tcam.h| 31 +-
7 files changed, 1449 insertions(+), 201 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_core.c
b/drivers/net/bnxt/tf_core/tf_core.c
index 97e7952a9..ca3280b6b 100644
--- a/drivers/net/bnxt/tf_core/tf_core.c
+++ b/drivers/net/bnxt/tf_core/tf_core.c
@@ -607,6 +607,79 @@ tf_search_identifier(struct tf *tfp,
return 0;
}
+int
+tf_search_tcam_entry(struct tf *tfp,
+struct tf_search_tcam_entry_parms *parms)
+{
+ int rc;
+ struct tf_session *tfs;
+ struct tf_dev_info *dev;
+ struct tf_tcam_alloc_search_parms sparms;
+
+ TF_CHECK_PARMS2(tfp, parms);
+
+ memset(&sparms, 0, sizeof(struct tf_tcam_alloc_search_parms));
+
+ /* Retrieve the session information */
+ rc = tf_session_get_session(tfp, &tfs);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: Failed to lookup session, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ /* Retrieve the device information */
+ rc = tf_session_get_device(tfs, &dev);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: Failed to lookup device, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ if (dev->ops->tf_dev_alloc_search_tcam == NULL) {
+ rc = -EOPNOTSUPP;
+ TFP_DRV_LOG(ERR,
+ "%s: Operation not supported, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ sparms.dir = parms->dir;
+ sparms.type = parms->tcam_tbl_type;
+ sparms.key = parms->key;
+ sparms.key_size = TF_BITS2BYTES_WORD_ALIGN(parms->key_sz_in_bits);
+ sparms.mask = parms->mask;
+ sparms.priority = parms->priority;
+ sparms.alloc = parms->alloc;
+
+ /* Result is an in/out and so no need to copy during outputs */
+ sparms.result = parms->result;
+ sparms.result_size =
+ TF_BITS2BYTES_WORD_ALIGN(parms->result_sz_in_bits);
+
+ rc = dev->ops->tf_dev_alloc_search_tcam(tfp, &sparms);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: TCAM allocation failed, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ /* Copy the outputs */
+ parms->hit = sparms.hit;
+ parms->search_status = sparms.search_status;
+ parms->ref_cnt = sparms.ref_cnt;
+ parms->idx = sparms.idx;
+
+ return 0;
+}
+
int
tf_alloc_tcam_entry(struct tf *tfp,
struct tf_alloc_tcam_entry_parms *parms)
diff --git a/drivers/net/bnxt/tf_core/tf_core.h
b/drivers/net/bnxt/tf_core/tf_core.h
index 67415adaf..349a1f1a7 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -290,6 +290,18 @@ enum tf_tcam_tbl_type {
TF_TCAM_TBL_TYPE_MAX
};
+/**
+ * TCAM SEARCH STATUS
+ */
+enum tf_tcam_search_status {
+ /** The entry was not found, but an idx was allocated if requested. */
+ MISS,
+ /** The entry was found, and the result/idx are valid */
+ HIT,
+ /** The entry was not found and the table is full */
+ REJECT
+};
+
/**
* EM Resources
* These defines are provisioned during
@@ -949,6 +961,8 @@ int tf_free_tbl_scope(struct tf *tfp,
/**
* @page tcam TCAM Access
*
+ * @ref tf_search_tcam_entry
+ *
* @ref tf_alloc_tcam_entry
*
* @ref tf_set_tcam_entry
@@ -958,6 +972,93 @@ int tf_free_tbl_scope(struct tf *tfp,
* @ref tf_free_tcam_entry
*/
+/**
+ * tf_search_tcam_entry parameter definition (experimental)
+ */
+struct tf_search_tcam_entry_parms {
+ /**
+* [in] receive or transmit direction
+*/
+ enum tf_dir dir;
+ /**
+* [in] TCAM table type
+*/
+ enum tf_tcam_tbl_type tcam_tbl_type;
+ /**
+* [in] Key data to match on
+*/
+ uint8_t *key;
+ /**
+* [in] key size in bits
+*/
+ uint16_t key_sz_in_bits;
+ /**
+* [in] Mask data to match on
+*/
+ uint8_t *mask;
+ /**
+* [in]
[dpdk-dev] [PATCH v3 04/22] net/bnxt: modify ulp mapper to use tcam search
From: Mike Baucom
modified ulp mappper to use the new tf_search_tcam_entry API.
When search before allocation is requested, mapper calls
tc_search_tcam_entry with the alloc flag.
- On HIT, the result and tcam index is returned.
- On MISS, the tcam index is returned but the result is
created and the tcam entry is set.
- On REJECT, the flow request is rejected.
Signed-off-by: Mike Baucom
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 106 ++-
1 file changed, 71 insertions(+), 35 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 6a727ed34..2d3373df2 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -690,7 +690,7 @@ ulp_mapper_ident_extract(struct bnxt_ulp_mapper_parms
*parms,
{
struct ulp_flow_db_res_params fid_parms;
uint64_t id = 0;
- uint32_t idx;
+ uint32_t idx = 0;
struct tf_search_identifier_parms sparms = { 0 };
struct tf_free_identifier_parms free_parms = { 0 };
struct tf *tfp;
@@ -1292,12 +1292,13 @@ ulp_mapper_tcam_tbl_process(struct
bnxt_ulp_mapper_parms *parms,
struct tf *tfp;
int32_t rc, trc;
struct tf_alloc_tcam_entry_parms aparms = { 0 };
+ struct tf_search_tcam_entry_parms searchparms = { 0 };
struct tf_set_tcam_entry_parms sparms = { 0 };
struct ulp_flow_db_res_params fid_parms = { 0 };
struct tf_free_tcam_entry_parms free_parms = { 0 };
uint32_t hit = 0;
uint16_t tmplen = 0;
- struct ulp_blob res_blob;
+ uint16_t idx;
/* Skip this if was handled by the cache. */
if (parms->tcam_tbl_opc == BNXT_ULP_MAPPER_TCAM_TBL_OPC_CACHE_SKIP) {
@@ -1352,37 +1353,72 @@ ulp_mapper_tcam_tbl_process(struct
bnxt_ulp_mapper_parms *parms,
}
}
- aparms.dir = tbl->direction;
- aparms.tcam_tbl_type= tbl->resource_type;
- aparms.search_enable= tbl->srch_b4_alloc;
- aparms.key_sz_in_bits = tbl->key_bit_size;
- aparms.key = ulp_blob_data_get(&key, &tmplen);
- if (tbl->key_bit_size != tmplen) {
- BNXT_TF_DBG(ERR, "Key len (%d) != Expected (%d)\n",
- tmplen, tbl->key_bit_size);
- return -EINVAL;
- }
+ if (!tbl->srch_b4_alloc) {
+ /*
+* No search for re-use is requested, so simply allocate the
+* tcam index.
+*/
+ aparms.dir = tbl->direction;
+ aparms.tcam_tbl_type= tbl->resource_type;
+ aparms.search_enable= tbl->srch_b4_alloc;
+ aparms.key_sz_in_bits = tbl->key_bit_size;
+ aparms.key = ulp_blob_data_get(&key, &tmplen);
+ if (tbl->key_bit_size != tmplen) {
+ BNXT_TF_DBG(ERR, "Key len (%d) != Expected (%d)\n",
+ tmplen, tbl->key_bit_size);
+ return -EINVAL;
+ }
- aparms.mask = ulp_blob_data_get(&mask, &tmplen);
- if (tbl->key_bit_size != tmplen) {
- BNXT_TF_DBG(ERR, "Mask len (%d) != Expected (%d)\n",
- tmplen, tbl->key_bit_size);
- return -EINVAL;
- }
+ aparms.mask = ulp_blob_data_get(&mask, &tmplen);
+ if (tbl->key_bit_size != tmplen) {
+ BNXT_TF_DBG(ERR, "Mask len (%d) != Expected (%d)\n",
+ tmplen, tbl->key_bit_size);
+ return -EINVAL;
+ }
- aparms.priority = tbl->priority;
+ aparms.priority = tbl->priority;
- /*
-* All failures after this succeeds require the entry to be freed.
-* cannot return directly on failure, but needs to goto error
-*/
- rc = tf_alloc_tcam_entry(tfp, &aparms);
- if (rc) {
- BNXT_TF_DBG(ERR, "tcam alloc failed rc=%d.\n", rc);
- return rc;
- }
+ /*
+* All failures after this succeeds require the entry to be
+* freed. cannot return directly on failure, but needs to goto
+* error.
+*/
+ rc = tf_alloc_tcam_entry(tfp, &aparms);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "tcam alloc failed rc=%d.\n", rc);
+ return rc;
+ }
+ idx = aparms.idx;
+ hit = aparms.hit;
+ } else {
+ /*
+* Searching before allocation to see if we already have an
+* entry. This allows re-use of a constrained resource.
+*/
+ searchparms
[dpdk-dev] [PATCH v3 00/22] bnxt patches
Some fixes, cleanups and changes to augment pre-existing support in infrastructure Please apply v1->v2: - Fixed some typos in patch [9/20]. v2->v3: - Fixed coding style issues in patch [15/20] to use __rte_attribute. - Updated commit messages. - Added a patch to fix a logic error [21/22]. - Added a patch to fix compilation issue with -O and -g CFLAGS [22/22]. Ajit Khaparde (2): net/bnxt: fix if condition net/bnxt: fix build error with extra cflags Kishore Padmanabha (7): net/bnxt: add access to nat global register net/bnxt: configure parif for offload miss rules net/bnxt: update nat template net/bnxt: configure parif for the egress rules net/bnxt: ignore VLAN priority mask net/bnxt: add egress template with VLAN tag match net/bnxt: add tcam table processing for search and alloc Mike Baucom (9): net/bnxt: add shadow and search capability to tcam net/bnxt: modify ulp mapper to use tcam search net/bnxt: add tf hash API net/bnxt: modify tf shadow tcam to use tf hash net/bnxt: add shadow table capability with search net/bnxt: modify ulp mapper to use tbl search net/bnxt: modify shadow tcam and tbl reference count logic net/bnxt: add templates for search before alloc net/bnxt: enable shadow tables during session open Somnath Kotur (1): net/bnxt: cleanup VF-representor dev ops Venkat Duvvuru (3): net/bnxt: skip mark id injection into mbuf net/bnxt: fix port default rule create and destroy net/bnxt: delete VF FW rules on representor create drivers/net/bnxt/bnxt.h | 6 +- drivers/net/bnxt/bnxt_ethdev.c| 83 +- drivers/net/bnxt/bnxt_hwrm.c | 49 ++ drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_reps.c | 94 +- drivers/net/bnxt/bnxt_rxr.c | 3 + drivers/net/bnxt/bnxt_txq.h | 1 - drivers/net/bnxt/bnxt_txr.c | 19 +- drivers/net/bnxt/hsi_struct_def_dpdk.h| 138 +++ drivers/net/bnxt/meson.build | 1 + drivers/net/bnxt/tf_core/Makefile | 1 + drivers/net/bnxt/tf_core/tf_core.c| 139 ++- drivers/net/bnxt/tf_core/tf_core.h| 174 drivers/net/bnxt/tf_core/tf_device_p4.c | 4 +- drivers/net/bnxt/tf_core/tf_hash.c| 106 +++ drivers/net/bnxt/tf_core/tf_hash.h| 27 + drivers/net/bnxt/tf_core/tf_shadow_tbl.c | 766 +++- drivers/net/bnxt/tf_core/tf_shadow_tbl.h | 124 +-- drivers/net/bnxt/tf_core/tf_shadow_tcam.c | 818 +- drivers/net/bnxt/tf_core/tf_shadow_tcam.h | 258 +++--- drivers/net/bnxt/tf_core/tf_tbl.c | 246 +- drivers/net/bnxt/tf_core/tf_tbl.h | 22 +- drivers/net/bnxt/tf_core/tf_tcam.c| 300 ++- drivers/net/bnxt/tf_core/tf_tcam.h| 31 +- drivers/net/bnxt/tf_ulp/bnxt_ulp.c| 97 ++- drivers/net/bnxt/tf_ulp/bnxt_ulp.h| 18 +- drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 127 ++- drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 2 +- drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 2 +- drivers/net/bnxt/tf_ulp/ulp_mapper.c | 505 +++ drivers/net/bnxt/tf_ulp/ulp_port_db.c | 2 + drivers/net/bnxt/tf_ulp/ulp_port_db.h | 1 + drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 81 ++ drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 434 ++ .../net/bnxt/tf_ulp/ulp_template_db_class.c | 556 +++- .../net/bnxt/tf_ulp/ulp_template_db_enum.h| 73 +- drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 4 +- drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 8 +- 38 files changed, 4462 insertions(+), 860 deletions(-) create mode 100644 drivers/net/bnxt/tf_core/tf_hash.c create mode 100644 drivers/net/bnxt/tf_core/tf_hash.h -- 2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 03/22] net/bnxt: configure parif for offload miss rules
From: Kishore Padmanabha
PARIF is handler to a partition of the physical port.
For the offload miss rules, the parif miss path needs to be
considered. The higher parif are reserved for handling this.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 4 +--
drivers/net/bnxt/tf_ulp/ulp_port_db.h| 1 +
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 40
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
index 4d4f7c4ea..d86e4c9ae 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
@@ -12,8 +12,6 @@
#include "ulp_flow_db.h"
#include "ulp_mapper.h"
-#define BNXT_ULP_FREE_PARIF_BASE 11
-
struct bnxt_ulp_def_param_handler {
int32_t (*vfr_func)(struct bnxt_ulp_context *ulp_ctx,
struct ulp_tlv_param *param,
@@ -85,6 +83,8 @@ ulp_set_parif_in_comp_fld(struct bnxt_ulp_context *ulp_ctx,
if (parif_type == BNXT_ULP_PHY_PORT_PARIF) {
idx = BNXT_ULP_CF_IDX_PHY_PORT_PARIF;
+ /* Parif needs to be reset to a free partition */
+ parif += BNXT_ULP_FREE_PARIF_BASE;
} else if (parif_type == BNXT_ULP_DRV_FUNC_PARIF) {
idx = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF;
/* Parif needs to be reset to a free partition */
diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.h
b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
index 393d01b7c..2b323d168 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
@@ -10,6 +10,7 @@
#define BNXT_PORT_DB_MAX_INTF_LIST 256
#define BNXT_PORT_DB_MAX_FUNC 2048
+#define BNXT_ULP_FREE_PARIF_BASE 11
enum bnxt_ulp_svif_type {
BNXT_ULP_DRV_FUNC_SVIF = 0,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 3891bcdc1..39f801b2f 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -158,6 +158,43 @@ bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action
actions[],
return BNXT_TF_RC_SUCCESS;
}
+/*
+ * Function to handle the post processing of the computed
+ * fields for the interface.
+ */
+static void
+bnxt_ulp_comp_fld_intf_update(struct ulp_rte_parser_params *params)
+{
+ uint32_t ifindex;
+ uint16_t port_id, parif;
+ enum bnxt_ulp_direction_type dir;
+
+ /* get the direction details */
+ dir = ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_DIRECTION);
+
+ if (dir == BNXT_ULP_DIR_INGRESS) {
+ /* read the port id details */
+ port_id = ULP_COMP_FLD_IDX_RD(params,
+ BNXT_ULP_CF_IDX_INCOMING_IF);
+ if (ulp_port_db_dev_port_to_ulp_index(params->ulp_ctx,
+ port_id,
+ &ifindex)) {
+ BNXT_TF_DBG(ERR, "ParseErr:Portid is not valid\n");
+ return;
+ }
+ /* Set port PARIF */
+ if (ulp_port_db_parif_get(params->ulp_ctx, ifindex,
+ BNXT_ULP_PHY_PORT_PARIF, &parif)) {
+ BNXT_TF_DBG(ERR, "ParseErr:ifindex is not valid\n");
+ return;
+ }
+ /* Parif needs to be reset to a free partition */
+ parif += BNXT_ULP_FREE_PARIF_BASE;
+ ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
+ parif);
+ }
+}
+
/*
* Function to handle the post processing of the parsing details
*/
@@ -213,6 +250,9 @@ bnxt_ulp_rte_parser_post_process(struct
ulp_rte_parser_params *params)
/* Merge the hdr_fp_bit into the proto header bit */
params->hdr_bitmap.bits |= params->hdr_fp_bit.bits;
+ /* Update the computed interface parameters */
+ bnxt_ulp_comp_fld_intf_update(params);
+
/* TBD: Handle the flow rejection scenarios */
return 0;
}
--
2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 02/22] net/bnxt: add access to nat global register
From: Kishore Padmanabha
Add support to enable or disable the NAT global registers.
The NAT feature is enabled in hardware during initialization
and disabled at deinitialization of the application.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 83 ++
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 4 ++
2 files changed, 87 insertions(+)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index 0869231a0..7c65a4b1b 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -596,6 +596,52 @@ ulp_session_deinit(struct bnxt_ulp_session_state *session)
}
}
+/*
+ * Internal api to enable NAT feature.
+ * Set set_flag to 1 to set the value or zero to reset the value.
+ * returns 0 on success.
+ */
+static int32_t
+bnxt_ulp_global_cfg_update(struct bnxt *bp,
+ enum tf_dir dir,
+ enum tf_global_config_type type,
+ uint32_t offset,
+ uint32_t value,
+ uint32_t set_flag)
+{
+ uint32_t global_cfg = 0;
+ int rc;
+ struct tf_global_cfg_parms parms;
+
+ /* Initialize the params */
+ parms.dir = dir,
+ parms.type = type,
+ parms.offset = offset,
+ parms.config = (uint8_t *)&global_cfg,
+ parms.config_sz_in_bytes = sizeof(global_cfg);
+
+ rc = tf_get_global_cfg(&bp->tfp, &parms);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Failed to get global cfg 0x%x rc:%d\n",
+ type, rc);
+ return rc;
+ }
+
+ if (set_flag)
+ global_cfg |= value;
+ else
+ global_cfg &= ~value;
+
+ /* SET the register RE_CFA_REG_ACT_TECT */
+ rc = tf_set_global_cfg(&bp->tfp, &parms);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Failed to set global cfg 0x%x rc:%d\n",
+ type, rc);
+ return rc;
+ }
+ return rc;
+}
+
/*
* When a port is initialized by dpdk. This functions is called
* and this function initializes the ULP context and rest of the
@@ -732,6 +778,29 @@ bnxt_ulp_init(struct bnxt *bp)
goto jump_to_error;
}
+ /*
+* Enable NAT feature. Set the global configuration register
+* Tunnel encap to enable NAT with the reuse of existing inner
+* L2 header smac and dmac
+*/
+ rc = bnxt_ulp_global_cfg_update(bp, TF_DIR_RX, TF_TUNNEL_ENCAP,
+ TF_TUNNEL_ENCAP_NAT,
+ (BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |
+ BNXT_ULP_NAT_INNER_L2_HEADER_DMAC), 1);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Failed to set rx global configuration\n");
+ goto jump_to_error;
+ }
+
+ rc = bnxt_ulp_global_cfg_update(bp, TF_DIR_TX, TF_TUNNEL_ENCAP,
+ TF_TUNNEL_ENCAP_NAT,
+ (BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |
+ BNXT_ULP_NAT_INNER_L2_HEADER_DMAC), 1);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Failed to set tx global configuration\n");
+ goto jump_to_error;
+ }
+
return rc;
jump_to_error:
@@ -785,6 +854,19 @@ bnxt_ulp_deinit(struct bnxt *bp)
/* Delete the Port database */
ulp_port_db_deinit(bp->ulp_ctx);
+ /* Disable NAT feature */
+ (void)bnxt_ulp_global_cfg_update(bp, TF_DIR_RX, TF_TUNNEL_ENCAP,
+TF_TUNNEL_ENCAP_NAT,
+(BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |
+ BNXT_ULP_NAT_INNER_L2_HEADER_DMAC),
+0);
+
+ (void)bnxt_ulp_global_cfg_update(bp, TF_DIR_TX, TF_TUNNEL_ENCAP,
+TF_TUNNEL_ENCAP_NAT,
+(BNXT_ULP_NAT_INNER_L2_HEADER_SMAC |
+ BNXT_ULP_NAT_INNER_L2_HEADER_DMAC),
+0);
+
/* Delete the ulp context and tf session */
ulp_ctx_detach(bp, session);
@@ -942,6 +1024,7 @@ bnxt_ulp_eth_dev_ptr2_cntxt_get(struct rte_eth_dev *dev)
if (BNXT_ETH_DEV_IS_REPRESENTOR(dev)) {
struct bnxt_vf_representor *vfr = dev->data->dev_private;
+
bp = vfr->parent_dev->data->dev_private;
}
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index f9e5e2ba6..7c95ead55 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -14,6 +14,10 @@
#include "ulp_template_db_enum.h"
+/* NAT defines to reuse existing inner L2 SMAC and DMAC */
+#d
[dpdk-dev] [PATCH v3 07/22] net/bnxt: update nat template
From: Kishore Padmanabha
The template is updated to support additional combinations
of NAT actions.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 412 +++---
.../net/bnxt/tf_ulp/ulp_template_db_class.c | 16 +-
.../net/bnxt/tf_ulp/ulp_template_db_enum.h| 26 +-
drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 4 +-
4 files changed, 285 insertions(+), 173 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
index 0f19e8ed1..31fe90577 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
@@ -12,80 +12,88 @@ uint16_t ulp_act_sig_tbl[BNXT_ULP_ACT_SIG_TBL_MAX_SZ] = {
[BNXT_ULP_ACT_HID_015a] = 1,
[BNXT_ULP_ACT_HID_00eb] = 2,
[BNXT_ULP_ACT_HID_0043] = 3,
- [BNXT_ULP_ACT_HID_01d6] = 4,
- [BNXT_ULP_ACT_HID_015e] = 5,
- [BNXT_ULP_ACT_HID_00ef] = 6,
- [BNXT_ULP_ACT_HID_0047] = 7,
- [BNXT_ULP_ACT_HID_01da] = 8,
- [BNXT_ULP_ACT_HID_025b] = 9,
- [BNXT_ULP_ACT_HID_01ec] = 10,
- [BNXT_ULP_ACT_HID_0144] = 11,
- [BNXT_ULP_ACT_HID_02d7] = 12,
- [BNXT_ULP_ACT_HID_025f] = 13,
- [BNXT_ULP_ACT_HID_01f0] = 14,
- [BNXT_ULP_ACT_HID_0148] = 15,
- [BNXT_ULP_ACT_HID_02db] = 16,
- [BNXT_ULP_ACT_HID_] = 17,
- [BNXT_ULP_ACT_HID_0002] = 18,
- [BNXT_ULP_ACT_HID_0800] = 19,
- [BNXT_ULP_ACT_HID_0101] = 20,
- [BNXT_ULP_ACT_HID_0020] = 21,
- [BNXT_ULP_ACT_HID_0901] = 22,
- [BNXT_ULP_ACT_HID_0121] = 23,
- [BNXT_ULP_ACT_HID_0004] = 24,
- [BNXT_ULP_ACT_HID_0804] = 25,
- [BNXT_ULP_ACT_HID_0105] = 26,
- [BNXT_ULP_ACT_HID_0024] = 27,
- [BNXT_ULP_ACT_HID_0905] = 28,
- [BNXT_ULP_ACT_HID_0125] = 29,
- [BNXT_ULP_ACT_HID_0001] = 30,
- [BNXT_ULP_ACT_HID_0005] = 31,
- [BNXT_ULP_ACT_HID_0009] = 32,
- [BNXT_ULP_ACT_HID_000d] = 33,
- [BNXT_ULP_ACT_HID_0021] = 34,
- [BNXT_ULP_ACT_HID_0029] = 35,
- [BNXT_ULP_ACT_HID_0025] = 36,
- [BNXT_ULP_ACT_HID_002d] = 37,
- [BNXT_ULP_ACT_HID_0801] = 38,
- [BNXT_ULP_ACT_HID_0809] = 39,
- [BNXT_ULP_ACT_HID_0805] = 40,
- [BNXT_ULP_ACT_HID_080d] = 41,
- [BNXT_ULP_ACT_HID_0c15] = 42,
- [BNXT_ULP_ACT_HID_0c19] = 43,
- [BNXT_ULP_ACT_HID_02f6] = 44,
- [BNXT_ULP_ACT_HID_04f8] = 45,
- [BNXT_ULP_ACT_HID_01df] = 46,
- [BNXT_ULP_ACT_HID_05e3] = 47,
- [BNXT_ULP_ACT_HID_02fa] = 48,
- [BNXT_ULP_ACT_HID_04fc] = 49,
- [BNXT_ULP_ACT_HID_01e3] = 50,
- [BNXT_ULP_ACT_HID_05e7] = 51,
- [BNXT_ULP_ACT_HID_03f7] = 52,
- [BNXT_ULP_ACT_HID_05f9] = 53,
- [BNXT_ULP_ACT_HID_02e0] = 54,
- [BNXT_ULP_ACT_HID_06e4] = 55,
- [BNXT_ULP_ACT_HID_03fb] = 56,
- [BNXT_ULP_ACT_HID_05fd] = 57,
- [BNXT_ULP_ACT_HID_02e4] = 58,
- [BNXT_ULP_ACT_HID_06e8] = 59,
- [BNXT_ULP_ACT_HID_040d] = 60,
- [BNXT_ULP_ACT_HID_040f] = 61,
- [BNXT_ULP_ACT_HID_0413] = 62,
- [BNXT_ULP_ACT_HID_0c0d] = 63,
- [BNXT_ULP_ACT_HID_0567] = 64,
- [BNXT_ULP_ACT_HID_0a49] = 65,
- [BNXT_ULP_ACT_HID_050e] = 66,
- [BNXT_ULP_ACT_HID_0d0e] = 67,
- [BNXT_ULP_ACT_HID_0668] = 68,
- [BNXT_ULP_ACT_HID_0b4a] = 69,
- [BNXT_ULP_ACT_HID_0411] = 70,
- [BNXT_ULP_ACT_HID_056b] = 71,
- [BNXT_ULP_ACT_HID_0a4d] = 72,
- [BNXT_ULP_ACT_HID_0c11] = 73,
- [BNXT_ULP_ACT_HID_0512] = 74,
- [BNXT_ULP_ACT_HID_0d12] = 75,
- [BNXT_ULP_ACT_HID_066c] = 76,
- [BNXT_ULP_ACT_HID_0b4e] = 77
+ [BNXT_ULP_ACT_HID_03d8] = 4,
+ [BNXT_ULP_ACT_HID_02c1] = 5,
+ [BNXT_ULP_ACT_HID_015e] = 6,
+ [BNXT_ULP_ACT_HID_00ef] = 7,
+ [BNXT_ULP_ACT_HID_0047] = 8,
+ [BNXT_ULP_ACT_HID_03dc] = 9,
+ [BNXT_ULP_ACT_HID_02c5] = 10,
+ [BNXT_ULP_ACT_HID_025b] = 11,
+ [BNXT_ULP_ACT_HID_01ec] = 12,
+ [BNXT_ULP_ACT_HID_0144] = 13,
+ [BNXT_ULP_ACT_HID_04d9] = 14,
+ [BNXT_ULP_ACT_HID_03c2] = 15,
+ [BNXT_ULP_ACT_HID_025f] = 16,
+ [BNXT_ULP_ACT_HID_01f0] = 17,
+ [BNXT_ULP_ACT_HID_0148] = 18,
+ [BNXT_ULP_ACT_HID_04dd] = 19,
+ [BNXT_ULP_ACT_HID_03c6] = 20,
+ [BNXT_ULP_ACT_HID_] = 21,
+ [BNXT_ULP_ACT_HID_0002] = 22,
+ [BNXT_ULP_ACT_HID_0800] = 23,
+ [BNXT_ULP_ACT_HID_0101] = 24,
+ [BNXT_ULP_ACT_HID_0020] = 25,
+ [BNXT_ULP_ACT_HID_0901] = 26,
+ [BNXT_ULP_ACT_HID_0121] = 27,
+ [BNXT_ULP_ACT_HID_0004] = 28,
+ [BNXT_ULP_ACT_HID_0804] = 29,
+ [BNXT_ULP_ACT_HID_0105] = 30,
+ [BNXT_ULP_ACT_HID_0024] = 31,
+ [BNXT_ULP_ACT_HID_0905] = 32,
+ [BNXT_ULP_ACT_HID_0125] = 33,
+ [BNXT_ULP_ACT_HID_0001] = 34,
+ [BNXT_ULP_ACT_HID_0005] = 35,
+ [BNXT_ULP_ACT_HID_0009] = 36,
+ [BNXT_ULP
[dpdk-dev] [PATCH v3 05/22] net/bnxt: add tf hash API
From: Mike Baucom
Added tf_hash API for common hash uses across tf_core functions
Signed-off-by: Mike Baucom
Reviewed-by: Farah Smith
Reviewed-by: Kishore Padmanabha
---
drivers/net/bnxt/meson.build | 1 +
drivers/net/bnxt/tf_core/Makefile | 1 +
drivers/net/bnxt/tf_core/tf_hash.c | 106 +
drivers/net/bnxt/tf_core/tf_hash.h | 27
4 files changed, 135 insertions(+)
create mode 100644 drivers/net/bnxt/tf_core/tf_hash.c
create mode 100644 drivers/net/bnxt/tf_core/tf_hash.h
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 8529b333c..190469e29 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -47,6 +47,7 @@ sources = files('bnxt_cpr.c',
'tf_core/tf_global_cfg.c',
'tf_core/tf_em_host.c',
'tf_core/tf_shadow_identifier.c',
+ 'tf_core/tf_hash.c',
'hcapi/hcapi_cfa_p4.c',
diff --git a/drivers/net/bnxt/tf_core/Makefile
b/drivers/net/bnxt/tf_core/Makefile
index cca0e2e85..cf6aaec6c 100644
--- a/drivers/net/bnxt/tf_core/Makefile
+++ b/drivers/net/bnxt/tf_core/Makefile
@@ -32,3 +32,4 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c
SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c
diff --git a/drivers/net/bnxt/tf_core/tf_hash.c
b/drivers/net/bnxt/tf_core/tf_hash.c
new file mode 100644
index 0..68476cbc1
--- /dev/null
+++ b/drivers/net/bnxt/tf_core/tf_hash.c
@@ -0,0 +1,106 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019-2020 Broadcom
+ * All rights reserved.
+ */
+
+#include "tf_hash.h"
+
+/* CRC polynomial 0xedb88320 */
+static const uint32_t tf_hash_crc32tbl[] = {
+ 0x, 0x77073096, 0xee0e612c, 0x990951ba,
+ 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+ 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+ 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+ 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+ 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+ 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+ 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+ 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+ 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+ 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+ 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+ 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+ 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+ 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+ 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+ 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+ 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+ 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+ 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+ 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+ 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+ 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+ 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+ 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+ 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+ 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+ 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+ 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+ 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+ 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+ 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+ 0x8f659eff, 0xf862ae69, 0x616bffd3, 0
[dpdk-dev] [PATCH v3 06/22] net/bnxt: skip mark id injection into mbuf
From: Venkat Duvvuru
When a packet is looped back from VF to VFR, it is marked to identify
the VFR interface. However, this mark_id shouldn't be percolated up to
the OVS as it is internal to pmd.
This patch fixes it by skipping mark injection into mbuf if the packet
is received on VFR interface.
Signed-off-by: Venkat Duvvuru
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Somnath Kotur
---
drivers/net/bnxt/bnxt_rxr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index baf73cb25..43b1256dc 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -485,6 +485,9 @@ bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct
rx_pkt_cmpl_hi *rxcmp1,
rc = ulp_mark_db_mark_get(bp->ulp_ctx, gfid,
cfa_code, vfr_flag, &mark_id);
if (!rc) {
+ /* VF to VFR Rx path. So, skip mark_id injection in mbuf */
+ if (vfr_flag && *vfr_flag)
+ return mark_id;
/* Got the mark, write it to the mbuf and return */
mbuf->hash.fdir.hi = mark_id;
mbuf->udata64 = (cfa_code & 0xull) << 32;
--
2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 08/22] net/bnxt: configure parif for the egress rules
From: Kishore Padmanabha
The parif for the egress rules need to be dynamically
configured based on the port type.
PARIF is handler to a partition of the physical port.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
---
drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 11 ++--
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 35
drivers/net/bnxt/tf_ulp/ulp_port_db.c | 2 +
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 54 +++
drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 16 --
.../net/bnxt/tf_ulp/ulp_template_db_class.c | 25 +++--
.../net/bnxt/tf_ulp/ulp_template_db_enum.h| 14 ++---
7 files changed, 123 insertions(+), 34 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
index d86e4c9ae..ddc6da8a8 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
@@ -81,17 +81,12 @@ ulp_set_parif_in_comp_fld(struct bnxt_ulp_context *ulp_ctx,
if (rc)
return rc;
- if (parif_type == BNXT_ULP_PHY_PORT_PARIF) {
+ if (parif_type == BNXT_ULP_PHY_PORT_PARIF)
idx = BNXT_ULP_CF_IDX_PHY_PORT_PARIF;
- /* Parif needs to be reset to a free partition */
- parif += BNXT_ULP_FREE_PARIF_BASE;
- } else if (parif_type == BNXT_ULP_DRV_FUNC_PARIF) {
+ else if (parif_type == BNXT_ULP_DRV_FUNC_PARIF)
idx = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF;
- /* Parif needs to be reset to a free partition */
- parif += BNXT_ULP_FREE_PARIF_BASE;
- } else {
+ else
idx = BNXT_ULP_CF_IDX_VF_FUNC_PARIF;
- }
ULP_COMP_FLD_IDX_WR(mapper_params, idx, parif);
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 2d3373df2..a071c0750 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -998,6 +998,41 @@ ulp_mapper_result_field_process(struct
bnxt_ulp_mapper_parms *parms,
return -EINVAL;
}
break;
+ case BNXT_ULP_MAPPER_OPC_IF_COMP_FIELD_THEN_CF_ELSE_CF:
+ if (!ulp_operand_read(fld->result_operand,
+ (uint8_t *)&idx,
+ sizeof(uint16_t))) {
+ BNXT_TF_DBG(ERR, "%s key operand read failed.\n", name);
+ return -EINVAL;
+ }
+ idx = tfp_be_to_cpu_16(idx);
+ if (idx >= BNXT_ULP_CF_IDX_LAST) {
+ BNXT_TF_DBG(ERR, "%s invalid index %u\n", name, idx);
+ return -EINVAL;
+ }
+ /* check if the computed field is set */
+ if (ULP_COMP_FLD_IDX_RD(parms, idx))
+ val = fld->result_operand_true;
+ else
+ val = fld->result_operand_false;
+
+ /* read the appropriate computed field */
+ if (!ulp_operand_read(val, (uint8_t *)&idx, sizeof(uint16_t))) {
+ BNXT_TF_DBG(ERR, "%s val operand read failed\n", name);
+ return -EINVAL;
+ }
+ idx = tfp_be_to_cpu_16(idx);
+ if (idx >= BNXT_ULP_CF_IDX_LAST) {
+ BNXT_TF_DBG(ERR, "%s invalid index %u\n", name, idx);
+ return -EINVAL;
+ }
+ val = ulp_blob_push_32(blob, &parms->comp_fld[idx],
+ fld->field_bit_size);
+ if (!val) {
+ BNXT_TF_DBG(ERR, "%s push to key blob failed\n", name);
+ return -EINVAL;
+ }
+ break;
default:
BNXT_TF_DBG(ERR, "invalid result mapper opcode 0x%x\n",
fld->result_opcode);
diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c
b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
index 0fc7c0ab2..30876478d 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
@@ -372,6 +372,8 @@ ulp_port_db_parif_get(struct bnxt_ulp_context *ulp_ctxt,
phy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;
*parif = port_db->phy_port_list[phy_port_id].port_parif;
}
+ /* Parif needs to be reset to a free partition */
+ *parif += BNXT_ULP_FREE_PARIF_BASE;
return 0;
}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 39f801b2f..67f9319d6 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -167,31 +167,63 @@ bnxt_ulp_comp_fld_intf_update(struct
ulp_rte_parser_params *params)
{
uint32_t ifindex;
uint16_t port_id, parif;
+ uint32_t mtype;
enum bnxt_ulp_direction_type
[dpdk-dev] [PATCH v3 10/22] net/bnxt: add egress template with VLAN tag match
From: Kishore Padmanabha
Added egress template with VLAN tag match
Signed-off-by: Kishore Padmanabha
Reviewed-by: Shahaji Bhosle
---
.../net/bnxt/tf_ulp/ulp_template_db_class.c | 501 +-
.../net/bnxt/tf_ulp/ulp_template_db_enum.h| 28 +-
2 files changed, 509 insertions(+), 20 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
index 330c5ecdd..41d1d8772 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
@@ -162,7 +162,31 @@ uint16_t ulp_class_sig_tbl[BNXT_ULP_CLASS_SIG_TBL_MAX_SZ]
= {
[BNXT_ULP_CLASS_HID_01d1] = 151,
[BNXT_ULP_CLASS_HID_0319] = 152,
[BNXT_ULP_CLASS_HID_01cd] = 153,
- [BNXT_ULP_CLASS_HID_0305] = 154
+ [BNXT_ULP_CLASS_HID_0305] = 154,
+ [BNXT_ULP_CLASS_HID_01e2] = 155,
+ [BNXT_ULP_CLASS_HID_032a] = 156,
+ [BNXT_ULP_CLASS_HID_0650] = 157,
+ [BNXT_ULP_CLASS_HID_0198] = 158,
+ [BNXT_ULP_CLASS_HID_01de] = 159,
+ [BNXT_ULP_CLASS_HID_0316] = 160,
+ [BNXT_ULP_CLASS_HID_066c] = 161,
+ [BNXT_ULP_CLASS_HID_01a4] = 162,
+ [BNXT_ULP_CLASS_HID_01c2] = 163,
+ [BNXT_ULP_CLASS_HID_030a] = 164,
+ [BNXT_ULP_CLASS_HID_0670] = 165,
+ [BNXT_ULP_CLASS_HID_01b8] = 166,
+ [BNXT_ULP_CLASS_HID_003e] = 167,
+ [BNXT_ULP_CLASS_HID_02f6] = 168,
+ [BNXT_ULP_CLASS_HID_078c] = 169,
+ [BNXT_ULP_CLASS_HID_0044] = 170,
+ [BNXT_ULP_CLASS_HID_01d2] = 171,
+ [BNXT_ULP_CLASS_HID_031a] = 172,
+ [BNXT_ULP_CLASS_HID_0660] = 173,
+ [BNXT_ULP_CLASS_HID_01a8] = 174,
+ [BNXT_ULP_CLASS_HID_01ce] = 175,
+ [BNXT_ULP_CLASS_HID_0306] = 176,
+ [BNXT_ULP_CLASS_HID_067c] = 177,
+ [BNXT_ULP_CLASS_HID_01b4] = 178
};
struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
@@ -2833,6 +2857,382 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[]
= {
BNXT_ULP_MATCH_TYPE_BITMASK_EM },
.class_tid = 21,
.wc_pri = 11
+ },
+ [155] = {
+ .class_hid = BNXT_ULP_CLASS_HID_01e2,
+ .hdr_sig = { .bits =
+ BNXT_ULP_HDR_BIT_O_ETH |
+ BNXT_ULP_HDR_BIT_OO_VLAN |
+ BNXT_ULP_HDR_BIT_O_IPV4 |
+ BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+ .field_sig = { .bits =
+ BNXT_ULP_HF21_BITMASK_O_ETH_SMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_DMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_TYPE |
+ BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+ .class_tid = 21,
+ .wc_pri = 12
+ },
+ [156] = {
+ .class_hid = BNXT_ULP_CLASS_HID_032a,
+ .hdr_sig = { .bits =
+ BNXT_ULP_HDR_BIT_O_ETH |
+ BNXT_ULP_HDR_BIT_OO_VLAN |
+ BNXT_ULP_HDR_BIT_O_IPV4 |
+ BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+ .field_sig = { .bits =
+ BNXT_ULP_HF21_BITMASK_O_ETH_SMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_DMAC |
+ BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+ .class_tid = 21,
+ .wc_pri = 13
+ },
+ [157] = {
+ .class_hid = BNXT_ULP_CLASS_HID_0650,
+ .hdr_sig = { .bits =
+ BNXT_ULP_HDR_BIT_O_ETH |
+ BNXT_ULP_HDR_BIT_OO_VLAN |
+ BNXT_ULP_HDR_BIT_O_IPV4 |
+ BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+ .field_sig = { .bits =
+ BNXT_ULP_HF21_BITMASK_O_ETH_SMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_DMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_TYPE |
+ BNXT_ULP_HF21_BITMASK_OO_VLAN_VID |
+ BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+ .class_tid = 21,
+ .wc_pri = 14
+ },
+ [158] = {
+ .class_hid = BNXT_ULP_CLASS_HID_0198,
+ .hdr_sig = { .bits =
+ BNXT_ULP_HDR_BIT_O_ETH |
+ BNXT_ULP_HDR_BIT_OO_VLAN |
+ BNXT_ULP_HDR_BIT_O_IPV4 |
+ BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+ .field_sig = { .bits =
+ BNXT_ULP_HF21_BITMASK_O_ETH_SMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_DMAC |
+ BNXT_ULP_HF21_BITMASK_OO_VLAN_VID |
+ BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+ .class_tid = 21,
+ .wc_pri = 15
+ },
+ [159] = {
+ .class_hid = BNXT_ULP_CLASS_HID_01de,
+ .hdr_sig = { .bits =
+ BNXT_ULP_HDR_BIT_O_ETH |
+ BNXT_ULP_HDR_BIT_OO_VLAN |
+ BNXT_ULP_HDR_BIT_O_IPV6 |
+ BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+ .field_sig = { .bits =
+ BNXT_ULP_HF21_BITMASK_O_ETH_SMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_DMAC |
+ BNXT_ULP_HF21_BITMASK_O_ETH_TYPE |
+ BNXT_ULP_MATCH_TYPE_BITMASK_EM },
+ .class_tid = 21,
+ .wc_pri = 16
+ },
+ [160] = {
+ .class_hid = BNXT_ULP_CLASS_HID_0316,
+ .hdr_sig = { .bits =
+
[dpdk-dev] [PATCH v3 09/22] net/bnxt: ignore VLAN priority mask
From: Kishore Padmanabha This is a work around for the OVS setting offload rules that are passing vlan priority mask as wild card and currently we do not support it. Signed-off-by: Kishore Padmanabha Reviewed-by: Michael Baucom --- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 9 + 1 file changed, 9 insertions(+) diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index 67f9319d6..665f5d381 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -709,8 +709,17 @@ ulp_rte_vlan_hdr_handler(const struct rte_flow_item *item, vlan_tag |= ~ULP_VLAN_TAG_MASK; vlan_tag = htons(vlan_tag); +#ifdef ULP_DONT_IGNORE_TOS ulp_rte_prsr_mask_copy(params, &idx, &priority, sizeof(priority)); +#else + /* +* The priority field is ignored since OVS is setting it as +* wild card match and it is not supported. This is a work +* around and shall be addressed in the future. +*/ + idx += 1; +#endif ulp_rte_prsr_mask_copy(params, &idx, &vlan_tag, sizeof(vlan_tag)); ulp_rte_prsr_mask_copy(params, &idx, &vlan_mask->inner_type, -- 2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 11/22] net/bnxt: modify tf shadow tcam to use tf hash
From: Mike Baucom
Removed the hash calculation from tf_shadow_tcam in favor of using a
new common implementation.
Signed-off-by: Mike Baucom
Reviewed-by: Kishore Padmanabha
Reviewed-by: Farah Smith
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/tf_shadow_tcam.c | 77 +--
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_shadow_tcam.c
b/drivers/net/bnxt/tf_core/tf_shadow_tcam.c
index 51aae4ff6..beaea0340 100644
--- a/drivers/net/bnxt/tf_core/tf_shadow_tcam.c
+++ b/drivers/net/bnxt/tf_core/tf_shadow_tcam.c
@@ -7,6 +7,7 @@
#include "tf_util.h"
#include "tfp.h"
#include "tf_shadow_tcam.h"
+#include "tf_hash.h"
/**
* The implementation includes 3 tables per tcam table type.
@@ -164,74 +165,6 @@ struct tf_shadow_tcam_db {
struct tf_shadow_tcam_ctxt *ctxt[TF_TCAM_TBL_TYPE_MAX];
};
-/* CRC polynomial 0xedb88320 */
-static const uint32_t tf_shadow_tcam_crc32tbl[] = {
- 0x, 0x77073096, 0xee0e612c, 0x990951ba,
- 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
- 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
- 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
- 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
- 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
- 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
- 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
- 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
- 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
- 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
- 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
- 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
- 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
- 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
- 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
- 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
- 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
- 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
- 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
- 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
- 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
- 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
- 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
- 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
- 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
- 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
- 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
- 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
- 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
- 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
- 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
- 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
- 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
- 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
- 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
- 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
- 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
- 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
- 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
- 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
- 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
- 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
- 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
- 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
- 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
- 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
- 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
- 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
- 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
- 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
- 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
- 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
- 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
- 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
- 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
- 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
- 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
- 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
- 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
- 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
- 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
- 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
- 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
/**
* Returns the number of entries in the contexts shadow table.
*/
@@ -289,13 +222,7 @@ tf_shadow_tcam_res_cpy(struct tf_shadow_tcam_ctxt *ctxt,
static uint32_t
tf_shadow_tcam_crc32_calc(uint8_t *key, uint32_t len)
{
- uint32_t crc = ~0U;
-
- while (len--)
- crc = tf_shadow_tcam_crc32tbl[(crc ^ key[len]) & 0xff] ^
- (crc >> 8);
-
- return ~crc;
+ return tf_hash_calc_cr
[dpdk-dev] [PATCH v3 12/22] net/bnxt: add shadow table capability with search
From: Mike Baucom
- Added Index Table shadow tables for searching
- Added Search API to allow reuse of Table entries
Signed-off-by: Mike Baucom
Reviewed-by: Farah Smith
---
drivers/net/bnxt/tf_core/tf_core.c| 66 +-
drivers/net/bnxt/tf_core/tf_core.h| 79 ++-
drivers/net/bnxt/tf_core/tf_device_p4.c | 2 +-
drivers/net/bnxt/tf_core/tf_shadow_tbl.c | 768 +-
drivers/net/bnxt/tf_core/tf_shadow_tbl.h | 124 ++--
drivers/net/bnxt/tf_core/tf_shadow_tcam.c | 6 +
drivers/net/bnxt/tf_core/tf_tbl.c | 246 ++-
drivers/net/bnxt/tf_core/tf_tbl.h | 22 +-
drivers/net/bnxt/tf_core/tf_tcam.h| 2 +-
9 files changed, 1211 insertions(+), 104 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_core.c
b/drivers/net/bnxt/tf_core/tf_core.c
index ca3280b6b..0dbde1de2 100644
--- a/drivers/net/bnxt/tf_core/tf_core.c
+++ b/drivers/net/bnxt/tf_core/tf_core.c
@@ -75,7 +75,6 @@ tf_open_session(struct tf *tfp,
/* Session vs session client is decided in
* tf_session_open_session()
*/
- printf("TF_OPEN, %s\n", parms->ctrl_chan_name);
rc = tf_session_open_session(tfp, &oparms);
/* Logging handled by tf_session_open_session */
if (rc)
@@ -953,6 +952,71 @@ tf_alloc_tbl_entry(struct tf *tfp,
return 0;
}
+int
+tf_search_tbl_entry(struct tf *tfp,
+ struct tf_search_tbl_entry_parms *parms)
+{
+ int rc;
+ struct tf_session *tfs;
+ struct tf_dev_info *dev;
+ struct tf_tbl_alloc_search_parms sparms;
+
+ TF_CHECK_PARMS2(tfp, parms);
+
+ /* Retrieve the session information */
+ rc = tf_session_get_session(tfp, &tfs);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: Failed to lookup session, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ /* Retrieve the device information */
+ rc = tf_session_get_device(tfs, &dev);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: Failed to lookup device, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ if (dev->ops->tf_dev_alloc_search_tbl == NULL) {
+ rc = -EOPNOTSUPP;
+ TFP_DRV_LOG(ERR,
+ "%s: Operation not supported, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ memset(&sparms, 0, sizeof(struct tf_tbl_alloc_search_parms));
+ sparms.dir = parms->dir;
+ sparms.type = parms->type;
+ sparms.result = parms->result;
+ sparms.result_sz_in_bytes = parms->result_sz_in_bytes;
+ sparms.alloc = parms->alloc;
+ sparms.tbl_scope_id = parms->tbl_scope_id;
+ rc = dev->ops->tf_dev_alloc_search_tbl(tfp, &sparms);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "%s: TBL allocation failed, rc:%s\n",
+ tf_dir_2_str(parms->dir),
+ strerror(-rc));
+ return rc;
+ }
+
+ /* Return the outputs from the search */
+ parms->hit = sparms.hit;
+ parms->search_status = sparms.search_status;
+ parms->ref_cnt = sparms.ref_cnt;
+ parms->idx = sparms.idx;
+
+ return 0;
+}
+
int
tf_free_tbl_entry(struct tf *tfp,
struct tf_free_tbl_entry_parms *parms)
diff --git a/drivers/net/bnxt/tf_core/tf_core.h
b/drivers/net/bnxt/tf_core/tf_core.h
index 349a1f1a7..db1093515 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -291,9 +291,9 @@ enum tf_tcam_tbl_type {
};
/**
- * TCAM SEARCH STATUS
+ * SEARCH STATUS
*/
-enum tf_tcam_search_status {
+enum tf_search_status {
/** The entry was not found, but an idx was allocated if requested. */
MISS,
/** The entry was found, and the result/idx are valid */
@@ -1011,7 +1011,7 @@ struct tf_search_tcam_entry_parms {
/**
* [out] Search result status (hit, miss, reject)
*/
- enum tf_tcam_search_status search_status;
+ enum tf_search_status search_status;
/**
* [out] Current refcnt after allocation
*/
@@ -1285,6 +1285,79 @@ int tf_free_tcam_entry(struct tf *tfp,
* @ref tf_bulk_get_tbl_entry
*/
+/**
+ * tf_alloc_tbl_entry parameter definition
+ */
+struct tf_search_tbl_entry_parms {
+ /**
+* [in] Receive or transmit direction
+*/
+ enum tf_dir dir;
+ /**
+* [in] Type of the allocation
+*/
+ enum tf_tbl_type type;
+ /**
+* [in] Table scope identifier (ignored unless TF_TBL_TYPE_EXT)
+*/
+ uint32_t tbl_scope_id;
+ /**
+* [in] Result data to sea
[dpdk-dev] [PATCH v3 14/22] net/bnxt: fix port default rule create and destroy
From: Venkat Duvvuru
Currently, the flow_ids of port_to_app/app_to_port & tx_cfa_action
for the first port are getting over-written by the second port because
these fields are stored in the ulp context which is common across the
ports.
This patch fixes the problem by having per port structure to store these
fields.
Fixes: 9f702636d7ba ("net/bnxt: add port default rules for ingress and egress")
Signed-off-by: Venkat Duvvuru
Reviewed-by: Somnath Kotur
Reviewed-by: Kishore Padmanabha
---
drivers/net/bnxt/bnxt.h | 5 +-
drivers/net/bnxt/bnxt_ethdev.c | 81 +
drivers/net/bnxt/bnxt_txq.h | 1 -
drivers/net/bnxt/bnxt_txr.c | 6 +-
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 12 ++-
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 14 ++-
drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 116
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 2 +-
9 files changed, 151 insertions(+), 88 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 50f93ff5b..41e7ae5bd 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -784,6 +784,7 @@ struct bnxt {
struct bnxt_flow_stat_info *flow_stat;
uint8_t flow_xstat;
uint16_tmax_num_kflows;
+ uint16_ttx_cfa_action;
};
#define BNXT_FC_TIMER 1 /* Timer freq in Sec Flow Counters */
@@ -797,7 +798,7 @@ struct bnxt_vf_representor {
uint16_tfw_fid;
uint16_tdflt_vnic_id;
uint16_tsvif;
- uint32_tvfr_tx_cfa_action;
+ uint16_tvfr_tx_cfa_action;
uint16_trx_cfa_code;
uint32_trep2vf_flow_id;
uint32_tvf2rep_flow_id;
@@ -872,6 +873,8 @@ extern int bnxt_logtype_driver;
extern const struct rte_flow_ops bnxt_ulp_rte_flow_ops;
int32_t bnxt_ulp_init(struct bnxt *bp);
void bnxt_ulp_deinit(struct bnxt *bp);
+int32_t bnxt_ulp_create_df_rules(struct bnxt *bp);
+void bnxt_ulp_destroy_df_rules(struct bnxt *bp, bool global);
uint16_t bnxt_get_vnic_id(uint16_t port, enum bnxt_ulp_intf_type type);
uint16_t bnxt_get_svif(uint16_t port_id, bool func_svif,
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 0829493ea..dfc4b4190 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1168,73 +1168,6 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)
return rc;
}
-static int32_t
-bnxt_create_port_app_df_rule(struct bnxt *bp, uint8_t flow_type,
-uint32_t *flow_id)
-{
- uint16_t port_id = bp->eth_dev->data->port_id;
- struct ulp_tlv_param param_list[] = {
- {
- .type = BNXT_ULP_DF_PARAM_TYPE_DEV_PORT_ID,
- .length = 2,
- .value = {(port_id >> 8) & 0xff, port_id & 0xff}
- },
- {
- .type = BNXT_ULP_DF_PARAM_TYPE_LAST,
- .length = 0,
- .value = {0}
- }
- };
-
- return ulp_default_flow_create(bp->eth_dev, param_list, flow_type,
- flow_id);
-}
-
-static int32_t
-bnxt_create_df_rules(struct bnxt *bp)
-{
- struct bnxt_ulp_data *cfg_data;
- int rc;
-
- cfg_data = bp->ulp_ctx->cfg_data;
- rc = bnxt_create_port_app_df_rule(bp, BNXT_ULP_DF_TPL_PORT_TO_VS,
- &cfg_data->port_to_app_flow_id);
- if (rc) {
- PMD_DRV_LOG(ERR,
- "Failed to create port to app default rule\n");
- return rc;
- }
-
- BNXT_TF_DBG(DEBUG, "* created port to app default rule **\n");
- rc = bnxt_create_port_app_df_rule(bp, BNXT_ULP_DF_TPL_VS_TO_PORT,
- &cfg_data->app_to_port_flow_id);
- if (!rc) {
- rc = ulp_default_flow_db_cfa_action_get(bp->ulp_ctx,
-
cfg_data->app_to_port_flow_id,
-
&cfg_data->tx_cfa_action);
- if (rc)
- goto err;
-
- BNXT_TF_DBG(DEBUG,
- "* created app to port default rule *\n");
- return 0;
- }
-
-err:
- BNXT_TF_DBG(DEBUG, "Failed to create app to port default rule\n");
- return rc;
-}
-
-static void
-bnxt_destroy_df_rules(struct bnxt *bp)
-{
- struct bnxt_ulp_data *cfg_data;
-
- cfg_data = bp->ulp_ctx->cfg_data;
- ulp_default_flow_destroy(bp->eth_dev, cfg_data->port_to_app_flow_id);
- ulp_default_flow_destroy(bp->eth_dev, cfg_data->app_to_port_flow_id);
-}
-
static int bnxt_dev_start_o
[dpdk-dev] [PATCH v3 13/22] net/bnxt: modify ulp mapper to use tbl search
From: Mike Baucom
modified ulp mappper to use the new tf_search_tbl_entry API.
When search before allocation is requested, mapper calls
tc_search_tbl_entry with the alloc flag.
- On HIT, the result and table index is returned.
- On MISS, the table index is returned but the result is
created and the table entry is set.
- On REJECT, the flow request is rejected.
Signed-off-by: Mike Baucom
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 75 +++-
1 file changed, 51 insertions(+), 24 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index a071c0750..4dee65971 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -1764,9 +1764,10 @@ ulp_mapper_index_tbl_process(struct
bnxt_ulp_mapper_parms *parms,
struct ulp_blob data;
uint64_t idx = 0;
uint16_t tmplen;
- uint32_t i, num_flds;
+ uint32_t i, num_flds, index, hit;
int32_t rc = 0, trc = 0;
struct tf_alloc_tbl_entry_parms aparms = { 0 };
+ struct tf_search_tbl_entry_parms srchparms = { 0 };
struct tf_set_tbl_entry_parms sparms = { 0 };
struct tf_free_tbl_entry_parms free_parms = { 0 };
uint32_t tbl_scope_id;
@@ -1868,33 +1869,59 @@ ulp_mapper_index_tbl_process(struct
bnxt_ulp_mapper_parms *parms,
return 0; /* success */
}
+ index = 0;
+ hit = 0;
/* Perform the tf table allocation by filling the alloc params */
- aparms.dir = tbl->direction;
- aparms.type = tbl->resource_type;
- aparms.search_enable= tbl->srch_b4_alloc;
- aparms.result = ulp_blob_data_get(&data, &tmplen);
- aparms.result_sz_in_bytes = ULP_BITS_2_BYTE(tmplen);
- aparms.tbl_scope_id = tbl_scope_id;
-
- /* All failures after the alloc succeeds require a free */
- rc = tf_alloc_tbl_entry(tfp, &aparms);
- if (rc) {
- BNXT_TF_DBG(ERR, "Alloc table[%d][%s] failed rc=%d\n",
- aparms.type,
- (aparms.dir == TF_DIR_RX) ? "RX" : "TX",
- rc);
- return rc;
- }
+ if (tbl->srch_b4_alloc) {
+ memset(&srchparms, 0, sizeof(srchparms));
+ srchparms.dir = tbl->direction;
+ srchparms.type = tbl->resource_type;
+ srchparms.alloc = 1;
+ srchparms.result = ulp_blob_data_get(&data, &tmplen);
+ srchparms.result_sz_in_bytes = ULP_BITS_2_BYTE(tmplen);
+ srchparms.tbl_scope_id = tbl_scope_id;
+ rc = tf_search_tbl_entry(tfp, &srchparms);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Alloc table[%s][%s] failed rc=%d\n",
+ tf_tbl_type_2_str(tbl->resource_type),
+ tf_dir_2_str(tbl->direction), rc);
+ return rc;
+ }
+ if (srchparms.search_status == REJECT) {
+ BNXT_TF_DBG(ERR, "Alloc table[%s][%s] rejected.\n",
+ tf_tbl_type_2_str(tbl->resource_type),
+ tf_dir_2_str(tbl->direction));
+ return -ENOMEM;
+ }
+ index = srchparms.idx;
+ hit = srchparms.hit;
+ } else {
+ aparms.dir = tbl->direction;
+ aparms.type = tbl->resource_type;
+ aparms.search_enable= tbl->srch_b4_alloc;
+ aparms.result = ulp_blob_data_get(&data, &tmplen);
+ aparms.result_sz_in_bytes = ULP_BITS_2_BYTE(tmplen);
+ aparms.tbl_scope_id = tbl_scope_id;
+ /* All failures after the alloc succeeds require a free */
+ rc = tf_alloc_tbl_entry(tfp, &aparms);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Alloc table[%s][%s] failed rc=%d\n",
+ tf_tbl_type_2_str(tbl->resource_type),
+ tf_dir_2_str(tbl->direction), rc);
+ return rc;
+ }
+ index = aparms.idx;
+ }
/*
* calculate the idx for the result record, for external EM the offset
* needs to be shifted accordingly. If external non-inline table types
* are used then need to revisit this logic.
*/
- if (aparms.type == TF_TBL_TYPE_EXT)
- idx = TF_ACT_REC_OFFSET_2_PTR(aparms.idx);
+ if (tbl->resource_type == TF_TBL_TYPE_EXT)
+ idx = TF_ACT_REC_OFFSET_2_PTR(index);
else
- idx = aparms.idx;
+ idx = index;
/* Always storing values in Regfile in BE */
idx = tfp_cpu_to_be_64(idx);
[dpdk-dev] [PATCH v3 15/22] net/bnxt: delete VF FW rules on representor create
From: Venkat Duvvuru
Truflow stack adds VFR to VF and VF to VFR conduits when VF
representor is created. However, in the ingress direction the
VF's fw rules conflict with Truflow rules, resulting in not hitting
the Truflow VFR rules. To fix this, fw is going to remove it’s
VF rules when vf representor is created in Truflow mode and will
restore the removed rules when vf representor is destroyed.
This patch invokes the vf representor alloc and free hwrm commands
as part of which fw will do the above mentioned actions.
Signed-off-by: Venkat Duvvuru
Signed-off-by: Somnath Kotur
Reviewed-by: Shahaji Bhosle
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_hwrm.c | 49 +
drivers/net/bnxt/bnxt_hwrm.h | 2 +
drivers/net/bnxt/bnxt_reps.c | 19 +++-
drivers/net/bnxt/hsi_struct_def_dpdk.h | 138 +
4 files changed, 205 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 7ea13a8b2..f5f0dfe73 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -5486,6 +5486,55 @@ int bnxt_hwrm_cfa_counter_qstats(struct bnxt *bp,
return 0;
}
+int bnxt_hwrm_cfa_vfr_alloc(struct bnxt *bp, uint16_t vf_idx)
+{
+ struct hwrm_cfa_vfr_alloc_output *resp = bp->hwrm_cmd_resp_addr;
+ struct hwrm_cfa_vfr_alloc_input req = {0};
+ int rc;
+
+ if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+ PMD_DRV_LOG(DEBUG,
+ "Not a PF or trusted VF. Command not supported\n");
+ return 0;
+ }
+
+ HWRM_PREP(&req, HWRM_CFA_VFR_ALLOC, BNXT_USE_CHIMP_MB);
+ req.vf_id = rte_cpu_to_le_16(vf_idx);
+ snprintf(req.vfr_name, sizeof(req.vfr_name), "%svfr%d",
+bp->eth_dev->data->name, vf_idx);
+
+ rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+ HWRM_CHECK_RESULT();
+
+ HWRM_UNLOCK();
+ PMD_DRV_LOG(DEBUG, "VFR %d allocated\n", vf_idx);
+ return rc;
+}
+
+int bnxt_hwrm_cfa_vfr_free(struct bnxt *bp, uint16_t vf_idx)
+{
+ struct hwrm_cfa_vfr_free_output *resp = bp->hwrm_cmd_resp_addr;
+ struct hwrm_cfa_vfr_free_input req = {0};
+ int rc;
+
+ if (!(BNXT_PF(bp) || BNXT_VF_IS_TRUSTED(bp))) {
+ PMD_DRV_LOG(DEBUG,
+ "Not a PF or trusted VF. Command not supported\n");
+ return 0;
+ }
+
+ HWRM_PREP(&req, HWRM_CFA_VFR_FREE, BNXT_USE_CHIMP_MB);
+ req.vf_id = rte_cpu_to_le_16(vf_idx);
+ snprintf(req.vfr_name, sizeof(req.vfr_name), "%svfr%d",
+bp->eth_dev->data->name, vf_idx);
+
+ rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
+ HWRM_CHECK_RESULT();
+ HWRM_UNLOCK();
+ PMD_DRV_LOG(DEBUG, "VFR %d freed\n", vf_idx);
+ return rc;
+}
+
#ifdef RTE_LIBRTE_BNXT_PMD_SYSTEM
int
bnxt_hwrm_oem_cmd(struct bnxt *bp, uint32_t entry_num)
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 01201a7a4..4a2af13c9 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -278,4 +278,6 @@ int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp);
int bnxt_hwrm_oem_cmd(struct bnxt *bp, uint32_t entry_num);
int bnxt_clear_one_vnic_filter(struct bnxt *bp,
struct bnxt_filter_info *filter);
+int bnxt_hwrm_cfa_vfr_alloc(struct bnxt *bp, uint16_t vf_idx);
+int bnxt_hwrm_cfa_vfr_free(struct bnxt *bp, uint16_t vf_idx);
#endif
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index c425e69aa..2f775e0c0 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -272,7 +272,7 @@ static int bnxt_tf_vfr_alloc(struct rte_eth_dev *vfr_ethdev)
if (rc) {
BNXT_TF_DBG(DEBUG,
"Default flow rule creation for VFR->VF failed!\n");
- return -EIO;
+ goto err;
}
BNXT_TF_DBG(DEBUG, "*** Default flow rule created for VFR->VF! ***\n");
@@ -283,7 +283,7 @@ static int bnxt_tf_vfr_alloc(struct rte_eth_dev *vfr_ethdev)
if (rc) {
BNXT_TF_DBG(DEBUG,
"Failed to get action_ptr for VFR->VF dflt rule\n");
- return -EIO;
+ goto rep2vf_free;
}
BNXT_TF_DBG(DEBUG, "tx_cfa_action = %d\n", vfr->vfr_tx_cfa_action);
rc = ulp_default_flow_create(parent_dev, param_list,
@@ -292,13 +292,24 @@ static int bnxt_tf_vfr_alloc(struct rte_eth_dev
*vfr_ethdev)
if (rc) {
BNXT_TF_DBG(DEBUG,
"Default flow rule creation for VF->VFR failed!\n");
- return -EIO;
+ goto rep2vf_free;
}
BNXT_TF_DBG(DEBUG, "*** Default flow rule created for VF->VFR! ***\n");
BNXT_TF_DBG(DEBUG, "vfr2rep_flow_id = %d\n", vfr->vf2rep_flow_id);
+ rc = bnxt_hwrm_cf
[dpdk-dev] [PATCH v3 17/22] net/bnxt: add tcam table processing for search and alloc
From: Kishore Padmanabha
Added support for tcam table processing to enable the search
and allocate support. This also includes the tcam entry update
support.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 317 --
.../net/bnxt/tf_ulp/ulp_template_db_enum.h| 5 +-
drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 8 +-
3 files changed, 213 insertions(+), 117 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 4dee65971..6ac4b0f83 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -1317,20 +1317,177 @@ ulp_mapper_mark_vfr_idx_process(struct
bnxt_ulp_mapper_parms *parms,
return rc;
}
+/*
+ * Tcam table - create the result blob.
+ * data [out] - the result blob data
+ */
+static int32_t
+ulp_mapper_tcam_tbl_result_create(struct bnxt_ulp_mapper_parms *parms,
+ struct bnxt_ulp_mapper_tbl_info *tbl,
+ struct ulp_blob *data)
+{
+ struct bnxt_ulp_mapper_result_field_info *dflds;
+ uint32_t num_dflds;
+ uint32_t encap_flds = 0;
+ uint32_t i;
+ int32_t rc = 0;
+
+ /* Create the result data blob */
+ dflds = ulp_mapper_result_fields_get(tbl, &num_dflds,
+&encap_flds);
+ if (!dflds || !num_dflds || encap_flds) {
+ BNXT_TF_DBG(ERR, "Failed to get data fields.\n");
+ return -EINVAL;
+ }
+
+ for (i = 0; i < num_dflds; i++) {
+ rc = ulp_mapper_result_field_process(parms,
+tbl->direction,
+&dflds[i],
+data,
+"TCAM Result");
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Failed to set data fields\n");
+ return -EINVAL;
+ }
+ }
+ return rc;
+}
+
+/* Tcam table scan the identifier list and allocate each identifier */
+static int32_t
+ulp_mapper_tcam_tbl_scan_ident_alloc(struct bnxt_ulp_mapper_parms *parms,
+struct bnxt_ulp_mapper_tbl_info *tbl)
+{
+ struct bnxt_ulp_mapper_ident_info *idents;
+ uint32_t num_idents;
+ uint32_t i;
+
+ /*
+* Since the cache entry is responsible for allocating
+* identifiers when in use, allocate the identifiers only
+* during normal processing.
+*/
+ if (parms->tcam_tbl_opc ==
+ BNXT_ULP_MAPPER_TCAM_TBL_OPC_NORMAL) {
+ idents = ulp_mapper_ident_fields_get(tbl, &num_idents);
+
+ for (i = 0; i < num_idents; i++) {
+ if (ulp_mapper_ident_process(parms, tbl,
+&idents[i], NULL))
+ return -EINVAL;
+ }
+ }
+ return 0;
+}
+
+/*
+ * Tcam table scan the identifier list and extract the identifier from
+ * the result blob.
+ */
+static int32_t
+ulp_mapper_tcam_tbl_scan_ident_extract(struct bnxt_ulp_mapper_parms *parms,
+ struct bnxt_ulp_mapper_tbl_info *tbl,
+ struct ulp_blob *data)
+{
+ struct bnxt_ulp_mapper_ident_info *idents;
+ uint32_t num_idents = 0, i;
+ int32_t rc = 0;
+
+ /*
+* Extract the listed identifiers from the result field,
+* no need to allocate them.
+*/
+ idents = ulp_mapper_ident_fields_get(tbl, &num_idents);
+ for (i = 0; i < num_idents; i++) {
+ rc = ulp_mapper_ident_extract(parms, tbl, &idents[i], data);
+ if (rc) {
+ BNXT_TF_DBG(ERR, "Error in identifier extraction\n");
+ return rc;
+ }
+ }
+ return rc;
+}
+
+/* Internal function to write the tcam entry */
+static int32_t
+ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,
+ struct bnxt_ulp_mapper_tbl_info *tbl,
+ struct ulp_blob *key,
+ struct ulp_blob *mask,
+ struct ulp_blob *data,
+ uint16_t idx)
+{
+ struct tf_set_tcam_entry_parms sparms = { 0 };
+ struct tf *tfp;
+ uint16_t tmplen;
+ int32_t rc;
+
+ tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);
+ if (!tfp) {
+ BNXT_TF_DBG(ERR, "Failed to get truflow pointer\n");
+ return -EINVAL;
+ }
+
+ sparms.dir = tbl->direction;
+ sparms.tcam_tbl_type= tbl->resource_type;
+ sparms.idx = idx;
+ /* Already verified the key/mask lengths *
[dpdk-dev] [PATCH v3 19/22] net/bnxt: enable shadow tables during session open
From: Mike Baucom Turn on shadow memory in the core to allow search before allocate. This allows reuse of constrained resources. Signed-off-by: Mike Baucom Reviewed-by: Venkat Duvvuru Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index 2febd5814..077527f78 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -81,7 +81,7 @@ ulp_ctx_session_open(struct bnxt *bp, return rc; } - params.shadow_copy = false; + params.shadow_copy = true; params.device_type = TF_DEVICE_TYPE_WH; resources = ¶ms.resources; /** RX **/ -- 2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 18/22] net/bnxt: add templates for search before alloc
From: Mike Baucom
Search before alloc allows reuse of constrained resources such as tcam,
encap, and source modifications. The new templates will search the
entry and alloc only if necessary.
Signed-off-by: Mike Baucom
Reviewed-by: Venkat Duvvuru
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 6 +++---
drivers/net/bnxt/tf_ulp/ulp_template_db_class.c | 14 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
index 58b581cf6..14ce16ebd 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c
@@ -1052,7 +1052,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {
.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,
.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG,
.direction = TF_DIR_TX,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.result_start_idx = 96,
.result_bit_size = 0,
.result_num_fields = 0,
@@ -1069,7 +1069,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {
.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,
.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG,
.direction = TF_DIR_TX,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.result_start_idx = 99,
.result_bit_size = 0,
.result_num_fields = 0,
@@ -1084,7 +1084,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {
.resource_sub_type =
BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,
.direction = TF_DIR_TX,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.result_start_idx = 102,
.result_bit_size = 0,
.result_num_fields = 0,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
index 41d1d8772..94160a902 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c
@@ -3782,7 +3782,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 108,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4210,7 +4210,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 457,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4282,7 +4282,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 526,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4354,7 +4354,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 595,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4426,7 +4426,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 664,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4570,7 +4570,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {
.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
.direction = TF_DIR_RX,
.priority = BNXT_ULP_PRIORITY_LEVEL_0,
- .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,
+ .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,
.key_start_idx = 802,
.blob_key_bit_size = 167,
.key_bit_size = 167,
@@ -4998,7 +4998,7 @@
Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
On 7/24/2020 5:07 AM, Jeff Guo wrote: > The combined hash type should be bound with prefix protocol when > configure it, so delete some useless and unsupported part for > rss types mapping. > > Signed-off-by: Jeff Guo Hi Jeff, Can you please add the fixes line as reference? There is a refactoring in the middle, so I assume patch wouldn't be candidate for backport, but still good to document the fixed commit. <...>
[dpdk-dev] [PATCH v3 16/22] net/bnxt: modify shadow tcam and tbl reference count logic
From: Mike Baucom Moved setting the refcnt for shadow tcam and table entries to the allocation path only. The insert can be called multiple times for updates and was resetting the refcnt to 1 each time. Now multiple insertion/modifications will not change the reference count. Signed-off-by: Mike Baucom Reviewed-by: Kishore Padmanabha --- drivers/net/bnxt/tf_core/tf_shadow_tbl.c | 2 -- drivers/net/bnxt/tf_core/tf_shadow_tcam.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_shadow_tbl.c b/drivers/net/bnxt/tf_core/tf_shadow_tbl.c index 019a26eba..a4207eb3a 100644 --- a/drivers/net/bnxt/tf_core/tf_shadow_tbl.c +++ b/drivers/net/bnxt/tf_core/tf_shadow_tbl.c @@ -687,8 +687,6 @@ tf_shadow_tbl_insert(struct tf_shadow_tbl_insert_parms *parms) if (!TF_SHADOW_HB_HANDLE_IS_VALID(sr_entry->hb_handle)) return 0; - sr_entry->refcnt = 1; - return 0; } diff --git a/drivers/net/bnxt/tf_core/tf_shadow_tcam.c b/drivers/net/bnxt/tf_core/tf_shadow_tcam.c index a0130d6a8..e2c347a1e 100644 --- a/drivers/net/bnxt/tf_core/tf_shadow_tcam.c +++ b/drivers/net/bnxt/tf_core/tf_shadow_tcam.c @@ -472,6 +472,7 @@ tf_shadow_tcam_bind_index(struct tf_shadow_tcam_bind_index_parms *parms) /* Write the result table */ sr_entry->key_size = parms->key_size; sr_entry->hb_handle = parms->hb_handle; + sr_entry->refcnt = 1; return 0; } @@ -738,7 +739,6 @@ tf_shadow_tcam_insert(struct tf_shadow_tcam_insert_parms *parms) memcpy(sr_entry->result, sparms->result, sparms->result_size); sr_entry->result_size = sparms->result_size; - sr_entry->refcnt = 1; return 0; } -- 2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 20/22] net/bnxt: cleanup VF-representor dev ops
From: Somnath Kotur
No need to access rx_cfa_code, cfa_code_map from the VF-Rep functions
anymore.
Fixes: 322bd6e70272 ("net/bnxt: add port representor infrastructure")
Reviewed-by: Venkat Duvvuru
Signed-off-by: Somnath Kotur
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt.h | 1 -
drivers/net/bnxt/bnxt_reps.c | 75
2 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 41e7ae5bd..f4b2a3f92 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -799,7 +799,6 @@ struct bnxt_vf_representor {
uint16_tdflt_vnic_id;
uint16_tsvif;
uint16_tvfr_tx_cfa_action;
- uint16_trx_cfa_code;
uint32_trep2vf_flow_id;
uint32_tvf2rep_flow_id;
/* Private data store of associated PF/Trusted VF */
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index 2f775e0c0..6fa9a30d2 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -230,6 +230,9 @@ int bnxt_vf_rep_link_update_op(struct rte_eth_dev *eth_dev,
int wait_to_compl)
int rc;
parent_bp = rep->parent_dev->data->dev_private;
+ if (!parent_bp)
+ return 0;
+
rc = bnxt_link_update_op(parent_bp->eth_dev, wait_to_compl);
/* Link state. Inherited from PF or trusted VF */
@@ -324,7 +327,7 @@ static int bnxt_vfr_alloc(struct rte_eth_dev *vfr_ethdev)
}
/* Check if representor has been already allocated in FW */
- if (vfr->vfr_tx_cfa_action && vfr->rx_cfa_code)
+ if (vfr->vfr_tx_cfa_action)
return 0;
/*
@@ -406,9 +409,11 @@ static int bnxt_vfr_free(struct bnxt_vf_representor *vfr)
}
parent_bp = vfr->parent_dev->data->dev_private;
+ if (!parent_bp)
+ return 0;
/* Check if representor has been already freed in FW */
- if (!vfr->vfr_tx_cfa_action && !vfr->rx_cfa_code)
+ if (!vfr->vfr_tx_cfa_action)
return 0;
rc = bnxt_tf_vfr_free(vfr);
@@ -419,11 +424,9 @@ static int bnxt_vfr_free(struct bnxt_vf_representor *vfr)
return rc;
}
- parent_bp->cfa_code_map[vfr->rx_cfa_code] = BNXT_VF_IDX_INVALID;
PMD_DRV_LOG(DEBUG, "freed representor %d in FW\n",
vfr->vf_id);
vfr->vfr_tx_cfa_action = 0;
- vfr->rx_cfa_code = 0;
rc = bnxt_hwrm_cfa_vfr_free(parent_bp, vfr->vf_id);
@@ -456,7 +459,6 @@ int bnxt_vf_rep_dev_info_get_op(struct rte_eth_dev *eth_dev,
{
struct bnxt_vf_representor *rep_bp = eth_dev->data->dev_private;
struct bnxt *parent_bp;
- uint16_t max_vnics, i, j, vpool, vrxq;
unsigned int max_rx_rings;
int rc = 0;
@@ -476,7 +478,6 @@ int bnxt_vf_rep_dev_info_get_op(struct rte_eth_dev *eth_dev,
dev_info->max_tx_queues = max_rx_rings;
dev_info->reta_size = bnxt_rss_hash_tbl_size(parent_bp);
dev_info->hash_key_size = 40;
- max_vnics = parent_bp->max_vnics;
/* MTU specifics */
dev_info->min_mtu = RTE_ETHER_MIN_MTU;
@@ -492,68 +493,6 @@ int bnxt_vf_rep_dev_info_get_op(struct rte_eth_dev
*eth_dev,
dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT;
dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT;
- /* *INDENT-OFF* */
- dev_info->default_rxconf = (struct rte_eth_rxconf) {
- .rx_thresh = {
- .pthresh = 8,
- .hthresh = 8,
- .wthresh = 0,
- },
- .rx_free_thresh = 32,
- /* If no descriptors available, pkts are dropped by default */
- .rx_drop_en = 1,
- };
-
- dev_info->default_txconf = (struct rte_eth_txconf) {
- .tx_thresh = {
- .pthresh = 32,
- .hthresh = 0,
- .wthresh = 0,
- },
- .tx_free_thresh = 32,
- .tx_rs_thresh = 32,
- };
- eth_dev->data->dev_conf.intr_conf.lsc = 1;
-
- eth_dev->data->dev_conf.intr_conf.rxq = 1;
- dev_info->rx_desc_lim.nb_min = BNXT_MIN_RING_DESC;
- dev_info->rx_desc_lim.nb_max = BNXT_MAX_RX_RING_DESC;
- dev_info->tx_desc_lim.nb_min = BNXT_MIN_RING_DESC;
- dev_info->tx_desc_lim.nb_max = BNXT_MAX_TX_RING_DESC;
-
- /* *INDENT-ON* */
-
- /*
-* TODO: default_rxconf, default_txconf, rx_desc_lim, and tx_desc_lim
-* need further investigation.
-*/
-
- /* VMDq resources */
- vpool = 64; /* ETH_64_POOLS */
- vrxq = 128; /* ETH_VMDQ_DCB_NUM_QUEUES */
- for (i = 0; i < 4; vpool >>= 1, i++) {
- if (max_vnics > vpool) {
- for (j = 0; j < 5; vrxq >>= 1, j++)
[dpdk-dev] [PATCH v3 21/22] net/bnxt: fix if condition
The if condition in bnxt_restore_mac_filters needs to check for
the result of logical AND. But it was not doing it resulting in
an incorrect check.
Fixes: b02f1573cd07 ("net/bnxt: restore MAC filters during reset recovery")
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index dfc4b4190..510a0d9e0 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4372,7 +4372,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp)
uint16_t i;
int rc;
- if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp))
+ if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
return 0;
rc = bnxt_dev_info_get_op(dev, &dev_info);
--
2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH v3 22/22] net/bnxt: fix build error with extra cflags
When we compile PMD with CFLAGS set to -O -g, build fails because of
uninitialized error. This patch fixes it.
Fixes: 1e46b3962620 ("net/bnxt: fill cfa action in Tx descriptor")
Bugzilla ID: 509
Cc: step...@networkplumber.org
Signed-off-by: Ajit Khaparde
Reviewed-by: Somnath Kotur
Reviewed-by: Venkat Duvvuru
---
drivers/net/bnxt/bnxt_txr.c | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 1113aca44..c7a2de67c 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -111,7 +111,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
uint32_t outer_tpid_bd = 0;
struct tx_bd_long *txbd;
struct tx_bd_long_hi *txbd1 = NULL;
- uint32_t vlan_tag_flags, cfa_action;
+ uint32_t vlan_tag_flags;
bool long_bd = false;
unsigned short nr_bds = 0;
struct rte_mbuf *m_seg;
@@ -187,13 +187,6 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;
vlan_tag_flags = 0;
- if (BNXT_TRUFLOW_EN(txq->bp)) {
- if (txq->vfr_tx_cfa_action)
- cfa_action = txq->vfr_tx_cfa_action;
- else
- cfa_action = txq->bp->tx_cfa_action;
- }
-
/* HW can accelerate only outer vlan in QinQ mode */
if (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) {
vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |
@@ -222,8 +215,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
txbd1->lflags = 0;
txbd1->cfa_meta = vlan_tag_flags;
- if (BNXT_TRUFLOW_EN(txq->bp))
- txbd1->cfa_action = cfa_action;
+ if (txq->vfr_tx_cfa_action)
+ txbd1->cfa_action = txq->vfr_tx_cfa_action;
+ else
+ txbd1->cfa_action = txq->bp->tx_cfa_action;
if (tx_pkt->ol_flags & PKT_TX_TCP_SEG) {
uint16_t hdr_size;
--
2.21.1 (Apple Git-122.3)
[dpdk-dev] [PATCH] common/qat: fix uninitialized variable bug
This patch fixes the uninitialized variable bug in QAT PMD.
Fixes: 9f27a860dc16 ("crypto/qat: move generic qp function to qp file")
Signed-off-by: Adam Dybkowski
---
drivers/common/qat/qat_qp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index aacd4ab21..0ee713955 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -582,7 +582,7 @@ qat_enqueue_op_burst(void *qp, void **ops, uint16_t nb_ops)
register struct qat_queue *queue;
struct qat_qp *tmp_qp = (struct qat_qp *)qp;
register uint32_t nb_ops_sent = 0;
- register int ret;
+ register int ret = -1;
uint16_t nb_ops_possible = nb_ops;
register uint8_t *base_addr;
register uint32_t tail;
--
2.25.1
[dpdk-dev] [PATCH v6] net/i40e: fix incorrect hash look up table
The hash look up table (LUT) is managed by global register but it is not
initialized when RSS is disabled. Once user wants to enable RSS during
runtime, the LUT will not be initialized.
This patch fixes the issue by initializing the LUT whatever RSS enabled
or not.
Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow")
Cc: sta...@dpdk.org
Signed-off-by: Shougang Wang
Tested-by: Zhang, XiX
---
v6:
-Remove useless comment.
drivers/net/i40e/i40e_ethdev.c | 25 +
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f2861..890f05d90 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -302,7 +302,6 @@ static int i40e_dev_init_vlan(struct rte_eth_dev *dev);
static int i40e_veb_release(struct i40e_veb *veb);
static struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,
struct i40e_vsi *vsi);
-static int i40e_pf_config_mq_rx(struct i40e_pf *pf);
static int i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on);
static inline int i40e_find_all_mac_for_vlan(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
@@ -398,6 +397,7 @@ static void i40e_ethertype_filter_restore(struct i40e_pf
*pf);
static void i40e_tunnel_filter_restore(struct i40e_pf *pf);
static void i40e_filter_restore(struct i40e_pf *pf);
static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
+static int i40e_pf_config_rss(struct i40e_pf *pf);
static const char *const valid_keys[] = {
ETH_I40E_FLOATING_VEB_ARG,
@@ -1954,8 +1954,6 @@ i40e_dev_configure(struct rte_eth_dev *dev)
goto err;
/* VMDQ setup.
-* Needs to move VMDQ setting out of i40e_pf_config_mq_rx() as VMDQ and
-* RSS setting have different requirements.
* General PMD driver call sequence are NIC init, configure,
* rx/tx_queue_setup and dev_start. In rx/tx_queue_setup() function, it
* will try to lookup the VSI that specific queue belongs to if VMDQ
@@ -6478,7 +6476,7 @@ i40e_dev_rx_init(struct i40e_pf *pf)
uint16_t i;
struct i40e_rx_queue *rxq;
- i40e_pf_config_mq_rx(pf);
+ i40e_pf_config_rss(pf);
for (i = 0; i < data->nb_rx_queues; i++) {
rxq = data->rx_queues[i];
if (!rxq || !rxq->q_set)
@@ -8984,6 +8982,7 @@ i40e_pf_calc_configured_queues_num(struct i40e_pf *pf)
static int
i40e_pf_config_rss(struct i40e_pf *pf)
{
+ enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct rte_eth_rss_conf rss_conf;
uint32_t i, lut = 0;
@@ -9022,7 +9021,8 @@ i40e_pf_config_rss(struct i40e_pf *pf)
}
rss_conf = pf->dev_data->dev_conf.rx_adv_conf.rss_conf;
- if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0) {
+ if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0 ||
+ !(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
i40e_pf_disable_rss(pf);
return 0;
}
@@ -9195,21 +9195,6 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev,
return ret;
}
-static int
-i40e_pf_config_mq_rx(struct i40e_pf *pf)
-{
- int ret = 0;
- enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
-
- /* RSS setup */
- if (mq_mode & ETH_MQ_RX_RSS_FLAG)
- ret = i40e_pf_config_rss(pf);
- else
- i40e_pf_disable_rss(pf);
-
- return ret;
-}
-
/* Get the symmetric hash enable configurations per port */
static void
i40e_get_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t *enable)
--
2.17.1
Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
hi, ferruh
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Thanks for your info, the above fixed line should be added, and need I sent a
new version or you could help to add it when merge it?
Best regards,
Jeff Guo
-Original Message-
From: Ferruh Yigit
Sent: Friday, July 24, 2020 5:37 PM
To: Guo, Jia ; Zhang, Qi Z ; Xing,
Beilei ; Wu, Jingjing
Cc: dev@dpdk.org; Guo, Junfeng ; Su, Simei
Subject: Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
On 7/24/2020 5:07 AM, Jeff Guo wrote:
> The combined hash type should be bound with prefix protocol when
> configure it, so delete some useless and unsupported part for rss
> types mapping.
>
> Signed-off-by: Jeff Guo
Hi Jeff,
Can you please add the fixes line as reference? There is a refactoring in the
middle, so I assume patch wouldn't be candidate for backport, but still good to
document the fixed commit.
<...>
Re: [dpdk-dev] [PATCH v6] net/i40e: fix incorrect hash look up table
Acked-by: Jeff Guo
On 7/24/2020 5:38 PM, Shougang Wang wrote:
The hash look up table (LUT) is managed by global register but it is not
initialized when RSS is disabled. Once user wants to enable RSS during
runtime, the LUT will not be initialized.
This patch fixes the issue by initializing the LUT whatever RSS enabled
or not.
Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow")
Cc: sta...@dpdk.org
Signed-off-by: Shougang Wang
Tested-by: Zhang, XiX
---
v6:
-Remove useless comment.
drivers/net/i40e/i40e_ethdev.c | 25 +
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 05d5f2861..890f05d90 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -302,7 +302,6 @@ static int i40e_dev_init_vlan(struct rte_eth_dev *dev);
static int i40e_veb_release(struct i40e_veb *veb);
static struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,
struct i40e_vsi *vsi);
-static int i40e_pf_config_mq_rx(struct i40e_pf *pf);
static int i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on);
static inline int i40e_find_all_mac_for_vlan(struct i40e_vsi *vsi,
struct i40e_macvlan_filter *mv_f,
@@ -398,6 +397,7 @@ static void i40e_ethertype_filter_restore(struct i40e_pf
*pf);
static void i40e_tunnel_filter_restore(struct i40e_pf *pf);
static void i40e_filter_restore(struct i40e_pf *pf);
static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
+static int i40e_pf_config_rss(struct i40e_pf *pf);
static const char *const valid_keys[] = {
ETH_I40E_FLOATING_VEB_ARG,
@@ -1954,8 +1954,6 @@ i40e_dev_configure(struct rte_eth_dev *dev)
goto err;
/* VMDQ setup.
-* Needs to move VMDQ setting out of i40e_pf_config_mq_rx() as VMDQ and
-* RSS setting have different requirements.
* General PMD driver call sequence are NIC init, configure,
* rx/tx_queue_setup and dev_start. In rx/tx_queue_setup() function, it
* will try to lookup the VSI that specific queue belongs to if VMDQ
@@ -6478,7 +6476,7 @@ i40e_dev_rx_init(struct i40e_pf *pf)
uint16_t i;
struct i40e_rx_queue *rxq;
- i40e_pf_config_mq_rx(pf);
+ i40e_pf_config_rss(pf);
for (i = 0; i < data->nb_rx_queues; i++) {
rxq = data->rx_queues[i];
if (!rxq || !rxq->q_set)
@@ -8984,6 +8982,7 @@ i40e_pf_calc_configured_queues_num(struct i40e_pf *pf)
static int
i40e_pf_config_rss(struct i40e_pf *pf)
{
+ enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct rte_eth_rss_conf rss_conf;
uint32_t i, lut = 0;
@@ -9022,7 +9021,8 @@ i40e_pf_config_rss(struct i40e_pf *pf)
}
rss_conf = pf->dev_data->dev_conf.rx_adv_conf.rss_conf;
- if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0) {
+ if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0 ||
+ !(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
i40e_pf_disable_rss(pf);
return 0;
}
@@ -9195,21 +9195,6 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev,
return ret;
}
-static int
-i40e_pf_config_mq_rx(struct i40e_pf *pf)
-{
- int ret = 0;
- enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
-
- /* RSS setup */
- if (mq_mode & ETH_MQ_RX_RSS_FLAG)
- ret = i40e_pf_config_rss(pf);
- else
- i40e_pf_disable_rss(pf);
-
- return ret;
-}
-
/* Get the symmetric hash enable configurations per port */
static void
i40e_get_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t *enable)
Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
> -Original Message-
> From: Guo, Jia
> Sent: Friday, July 24, 2020 5:52 PM
> To: Yigit, Ferruh ; Zhang, Qi Z
> ;
> Xing, Beilei ; Wu, Jingjing
> Cc: dev@dpdk.org; Guo, Junfeng ; Su, Simei
>
> Subject: RE: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
>
> hi, ferruh
>
> Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Added this fix line in dpdk-next-net-intel.
Thanks
Qi
>
> Thanks for your info, the above fixed line should be added, and need I sent a
> new version or you could help to add it when merge it?
>
> Best regards,
> Jeff Guo
>
> -Original Message-
> From: Ferruh Yigit
> Sent: Friday, July 24, 2020 5:37 PM
> To: Guo, Jia ; Zhang, Qi Z ; Xing,
> Beilei ; Wu, Jingjing
> Cc: dev@dpdk.org; Guo, Junfeng ; Su, Simei
>
> Subject: Re: [dpdk-dev] [dpdk-dev v1] net/iavf: delete unsupported rss types
>
> On 7/24/2020 5:07 AM, Jeff Guo wrote:
> > The combined hash type should be bound with prefix protocol when
> > configure it, so delete some useless and unsupported part for rss
> > types mapping.
> >
> > Signed-off-by: Jeff Guo
>
> Hi Jeff,
>
> Can you please add the fixes line as reference? There is a refactoring in the
> middle, so I assume patch wouldn't be candidate for backport, but still good
> to
> document the fixed commit.
>
> <...>
Re: [dpdk-dev] [PATCH v6] net/i40e: fix incorrect hash look up table
> -Original Message-
> From: dev On Behalf Of Jeff Guo
> Sent: Friday, July 24, 2020 5:55 PM
> To: Wang, ShougangX ; dev@dpdk.org
> Cc: Xing, Beilei ; Yang, Qiming
> ; sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v6] net/i40e: fix incorrect hash look up table
>
> Acked-by: Jeff Guo
>
> On 7/24/2020 5:38 PM, Shougang Wang wrote:
> > The hash look up table (LUT) is managed by global register but it is
> > not initialized when RSS is disabled. Once user wants to enable RSS
> > during runtime, the LUT will not be initialized.
> > This patch fixes the issue by initializing the LUT whatever RSS
> > enabled or not.
> >
> > Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS
> > flow")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Shougang Wang
> > Tested-by: Zhang, XiX
Applied to dpdk-next-net-intel.
Thanks
Qi
[dpdk-dev] [PATCH v3 0/6] qede: SR-IOV PF driver support
Hi, This series adds SR-IOV PF pmd driver support to have VF pmd driver work over PF pmd driver instances in order to run the adapter completely under DPDK environment for one of the use cases like ovs-dpdk. This is very initial bring-up with following testing covered - * Enable/Disable SR-IOV VFs through igb_uio sysfs hook. * Load VFs, run fastpath, teardown VFs in hypervisor and guest VM. * VF FLR flow (in case of VF PCI passthrough to the guest VM) * Bulletin mechanism tested to communicate link changes to the VFs. Note that this series is intended for upcoming DPDK release (20.08) Please consider applying this series to dpdk-next-net-mrvl.git V2->V3: === * Instead of adding complete pci_regs.h file from linux, define handful PCI symbols (prefixed with RTE_) in dpdk which are required to implement generic rte_pci_find_next_ext_capability() API (patch #1) and to enable various other qede driver's OSAL_* defines (patch #2) (essentially, removed the patch #1 in v2) * Fixed meson/ninja compilation issues reported * Incorporated comments by Gaetan for rte_pci_find_next_ext_capability() V1->V2: (Incorporated comments from Jerin Jacob) * Added rte_pci_regs.h file (copy of linux/pci_regs.h) under lib/librte_pci to remove the dependency of dpdk on user headers * Added generic API to find PCI extended capability and use that in the drivers, removed individual functions implemented by the drivers Thanks, Manish Manish Chopra (6): drivers: add generic API to find PCI extended cap net/qede: define PCI config space specific osals net/qede: configure VFs on hardware net/qede: add infrastructure support for VF load net/qede: initialize VF MAC and link net/qede: add VF FLR support doc/guides/nics/features/qede.ini | 1 + doc/guides/nics/qede.rst | 7 +- drivers/bus/pci/pci_common.c | 42 drivers/bus/pci/rte_bus_pci.h | 19 ++ drivers/bus/pci/rte_bus_pci_version.map| 6 + drivers/net/ice/ice_ethdev.c | 51 + drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 48 + drivers/net/qede/Makefile | 1 + drivers/net/qede/base/bcm_osal.c | 31 +++ drivers/net/qede/base/bcm_osal.h | 29 ++- drivers/net/qede/base/ecore.h | 7 + drivers/net/qede/base/ecore_dev.c | 6 +- drivers/net/qede/base/ecore_iov_api.h | 3 + drivers/net/qede/base/ecore_sriov.c| 28 +-- drivers/net/qede/base/meson.build | 2 +- drivers/net/qede/meson.build | 1 + drivers/net/qede/qede_ethdev.c | 37 +++- drivers/net/qede/qede_ethdev.h | 1 + drivers/net/qede/qede_if.h | 1 + drivers/net/qede/qede_main.c | 13 +- drivers/net/qede/qede_sriov.c | 219 + drivers/net/qede/qede_sriov.h | 22 +++ drivers/raw/ifpga/ifpga_rawdev.c | 6 - lib/librte_pci/rte_pci.h | 35 24 files changed, 480 insertions(+), 136 deletions(-) create mode 100644 drivers/net/qede/qede_sriov.c create mode 100644 drivers/net/qede/qede_sriov.h -- 2.17.1
[dpdk-dev] [PATCH v3 2/6] net/qede: define PCI config space specific osals
This patch defines various PCI config space access APIs
in order to read and find IOV specific PCI capabilities.
With these definitions implemented, it enables the base
driver to do SR-IOV specific initialization and HW specific
configuration required from PF-PMD driver instance.
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/bcm_osal.h| 14 +-
drivers/net/qede/base/ecore.h | 3 +++
drivers/net/qede/base/ecore_dev.c | 6 +++---
drivers/net/qede/base/ecore_sriov.c | 28 +++-
drivers/net/qede/base/meson.build | 2 +-
drivers/net/qede/qede_main.c| 1 +
lib/librte_pci/rte_pci.h| 23 +--
7 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 5d4df5907..5f55cc2ee 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
/* Forward declaration */
struct ecore_dev;
@@ -286,11 +287,14 @@ typedef struct osal_list_t {
OSAL_LIST_PUSH_HEAD(new_entry, list)
/* PCI config space */
-
-#define OSAL_PCI_READ_CONFIG_BYTE(dev, address, dst) nothing
-#define OSAL_PCI_READ_CONFIG_WORD(dev, address, dst) nothing
-#define OSAL_PCI_READ_CONFIG_DWORD(dev, address, dst) nothing
-#define OSAL_PCI_FIND_EXT_CAPABILITY(dev, pcie_id) 0
+#define OSAL_PCI_READ_CONFIG_BYTE(dev, address, dst) \
+ rte_pci_read_config((dev)->pci_dev, dst, 1, address)
+#define OSAL_PCI_READ_CONFIG_WORD(dev, address, dst) \
+ rte_pci_read_config((dev)->pci_dev, dst, 2, address)
+#define OSAL_PCI_READ_CONFIG_DWORD(dev, address, dst) \
+ rte_pci_read_config((dev)->pci_dev, dst, 4, address)
+#define OSAL_PCI_FIND_EXT_CAPABILITY(dev, cap) \
+ rte_pci_find_next_ext_capability((dev)->pci_dev, cap)
#define OSAL_PCI_FIND_CAPABILITY(dev, pcie_id) 0
#define OSAL_PCI_WRITE_CONFIG_WORD(dev, address, val) nothing
#define OSAL_BAR_SIZE(dev, bar_id) 0
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 63bd7466a..750e99a8f 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -937,6 +937,9 @@ struct ecore_dev {
struct ecore_dbg_featuredbg_features[DBG_FEATURE_NUM];
struct ecore_dbg_params dbg_params;
osal_mutex_tdbg_lock;
+
+ /* DPDK specific ecore field */
+ struct rte_pci_device *pci_dev;
};
enum ecore_hsi_def_type {
diff --git a/drivers/net/qede/base/ecore_dev.c
b/drivers/net/qede/base/ecore_dev.c
index 35a8394de..e895dee40 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2787,7 +2787,7 @@ static enum _ecore_status_t ecore_hw_init_chip(struct
ecore_dev *p_dev,
return ECORE_IO;
}
- OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + PCI_EXP_DEVCTL, &ctrl);
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + RTE_PCI_EXP_DEVCTL, &ctrl);
wr_mbs = (ctrl & PCI_EXP_DEVCTL_PAYLOAD) >> 5;
ecore_wr(p_hwfn, p_ptt, PSWRQ2_REG_WR_MBS0, wr_mbs);
@@ -5499,9 +5499,9 @@ static enum _ecore_status_t ecore_get_dev_info(struct
ecore_hwfn *p_hwfn,
u32 tmp;
/* Read Vendor Id / Device Id */
- OSAL_PCI_READ_CONFIG_WORD(p_dev, PCICFG_VENDOR_ID_OFFSET,
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, RTE_PCI_VENDOR_ID,
&p_dev->vendor_id);
- OSAL_PCI_READ_CONFIG_WORD(p_dev, PCICFG_DEVICE_ID_OFFSET,
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, RTE_PCI_DEVICE_ID,
&p_dev->device_id);
/* Determine type */
diff --git a/drivers/net/qede/base/ecore_sriov.c
b/drivers/net/qede/base/ecore_sriov.c
index e60257e19..dac4cbee8 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -417,15 +417,16 @@ static enum _ecore_status_t ecore_iov_pci_cfg_info(struct
ecore_dev *p_dev)
int pos = iov->pos;
DP_VERBOSE(p_dev, ECORE_MSG_IOV, "sriov ext pos %d\n", pos);
- OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + PCI_SRIOV_CTRL, &iov->ctrl);
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + RTE_PCI_SRIOV_CTRL, &iov->ctrl);
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + RTE_PCI_SRIOV_TOTAL_VF,
+ &iov->total_vfs);
OSAL_PCI_READ_CONFIG_WORD(p_dev,
- pos + PCI_SRIOV_TOTAL_VF, &iov->total_vfs);
- OSAL_PCI_READ_CONFIG_WORD(p_dev,
- pos + PCI_SRIOV_INITIAL_VF,
+ pos + RTE_PCI_SRIOV_INITIAL_VF,
&iov->initial_vfs);
- OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + PCI_SRIOV_NUM_VF, &iov->num_vfs);
+ OSAL_PCI_READ_CONFIG_WORD(p_dev, pos + RTE_PCI_SRIOV_NUM_VF,
+ &iov->num_vfs);
if (i
[dpdk-dev] [PATCH v3 1/6] drivers: add generic API to find PCI extended cap
By adding generic API, this patch removes individual
functions/defines implemented by drivers to find PCI
extended capability.
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
---
drivers/bus/pci/pci_common.c | 42 ++
drivers/bus/pci/rte_bus_pci.h | 19
drivers/bus/pci/rte_bus_pci_version.map| 6 +++
drivers/net/ice/ice_ethdev.c | 51 +-
drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 48 +---
drivers/raw/ifpga/ifpga_rawdev.c | 6 ---
lib/librte_pci/rte_pci.h | 16 +++
7 files changed, 87 insertions(+), 101 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index a8e5fd52c..b877d10e9 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -665,6 +665,48 @@ rte_pci_get_iommu_class(void)
return iova_mode;
}
+off_t rte_pci_find_next_ext_capability(struct rte_pci_device *dev, uint32_t
cap)
+{
+ off_t offset = RTE_PCI_CFG_SPACE_SIZE;
+ uint32_t header;
+ int ttl;
+
+ /* minimum 8 bytes per capability */
+ ttl = (RTE_PCI_CFG_SPACE_EXP_SIZE - RTE_PCI_CFG_SPACE_SIZE) / 8;
+
+ if (rte_pci_read_config(dev, &header, 4, offset) < 0) {
+ RTE_LOG(ERR, EAL, "error in reading extended capabilities\n");
+ return -1;
+ }
+
+ /*
+* If we have no capabilities, this is indicated by cap ID,
+* cap version and next pointer all being 0.
+*/
+ if (header == 0)
+ return 0;
+
+ while (ttl != 0) {
+ if (RTE_PCI_EXT_CAP_ID(header) == cap)
+ return offset;
+
+ offset = RTE_PCI_EXT_CAP_NEXT(header);
+
+ if (offset < RTE_PCI_CFG_SPACE_SIZE)
+ break;
+
+ if (rte_pci_read_config(dev, &header, 4, offset) < 0) {
+ RTE_LOG(ERR, EAL,
+ "error in reading extended capabilities\n");
+ return -1;
+ }
+
+ ttl--;
+ }
+
+ return 0;
+}
+
struct rte_pci_bus rte_pci_bus = {
.bus = {
.scan = rte_pci_scan,
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 29bea6d70..de1ed9807 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -224,6 +224,25 @@ void rte_pci_unmap_device(struct rte_pci_device *dev);
*/
void rte_pci_dump(FILE *f);
+/**
+ * Find device's extended capability
+ *
+ * @param dev
+ *A pointer to rte_pci_device structure
+ *
+ * @param cap
+ *Extended capability to find
+ *
+ * @return
+ * > 0: The offset of the next matching extended capability structure
+ * within the device's PCI configuration space
+ * < 0: An error in PCI config space read
+ * = 0: Device does not support it
+ */
+__rte_experimental
+off_t rte_pci_find_next_ext_capability(struct rte_pci_device *dev,
+ uint32_t cap);
+
/**
* Register a PCI driver.
*
diff --git a/drivers/bus/pci/rte_bus_pci_version.map
b/drivers/bus/pci/rte_bus_pci_version.map
index 012d817e1..b5322660d 100644
--- a/drivers/bus/pci/rte_bus_pci_version.map
+++ b/drivers/bus/pci/rte_bus_pci_version.map
@@ -16,3 +16,9 @@ DPDK_20.0 {
local: *;
};
+
+EXPERIMENTAL {
+ global:
+
+ rte_pci_find_next_ext_capability;
+};
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 7dd3fcd27..6c8cbea5c 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1730,53 +1730,6 @@ ice_pf_setup(struct ice_pf *pf)
return 0;
}
-/* PCIe configuration space setting */
-#define PCI_CFG_SPACE_SIZE 256
-#define PCI_CFG_SPACE_EXP_SIZE 4096
-#define PCI_EXT_CAP_ID(header) (int)((header) & 0x)
-#define PCI_EXT_CAP_NEXT(header)(((header) >> 20) & 0xffc)
-#define PCI_EXT_CAP_ID_DSN 0x03
-
-static int
-ice_pci_find_next_ext_capability(struct rte_pci_device *dev, int cap)
-{
- uint32_t header;
- int ttl;
- int pos = PCI_CFG_SPACE_SIZE;
-
- /* minimum 8 bytes per capability */
- ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8;
-
- if (rte_pci_read_config(dev, &header, 4, pos) < 0) {
- PMD_INIT_LOG(ERR, "ice error reading extended capabilities\n");
- return -1;
- }
-
- /*
-* If we have no capabilities, this is indicated by cap ID,
-* cap version and next pointer all being 0.
-*/
- if (header == 0)
- return 0;
-
- while (ttl-- > 0) {
- if (PCI_EXT_CAP_ID(header) == cap)
- return pos;
-
- pos = PCI_EXT_CAP_NEXT(header);
-
- if (pos < PCI_CFG_SPACE_SIZE)
- break;
-
- if (rte_pci_read_config(dev, &he
[dpdk-dev] [PATCH v3 3/6] net/qede: configure VFs on hardware
Based on number of VFs enabled at PCI, PF-PMD driver instance
enables/configures those VFs from hardware perspective, such
that in later patches they could get required HW access to
communicate with PFs for slowpath configuration and run the
fastpath themsleves.
This patch also add two new qede IOV files [qede_sriov(.c|.h)]
under qede directory to add non-base driver IOV APIs/contents there.
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
Signed-off-by: Rasesh Mody
---
drivers/net/qede/Makefile | 1 +
drivers/net/qede/meson.build | 1 +
drivers/net/qede/qede_ethdev.c | 1 +
drivers/net/qede/qede_ethdev.h | 1 +
drivers/net/qede/qede_if.h | 1 +
drivers/net/qede/qede_main.c | 1 +
drivers/net/qede/qede_sriov.c | 85 ++
drivers/net/qede/qede_sriov.h | 9
8 files changed, 100 insertions(+)
create mode 100644 drivers/net/qede/qede_sriov.c
create mode 100644 drivers/net/qede/qede_sriov.h
diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile
index 0e8a67b0d..c57bef0e3 100644
--- a/drivers/net/qede/Makefile
+++ b/drivers/net/qede/Makefile
@@ -105,5 +105,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c
SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c
SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_sriov.c
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 05c9bff73..ff0ac0b03 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -11,6 +11,7 @@ sources = files(
'qede_rxtx.c',
'qede_debug.c',
'qede_regs.c',
+ 'qede_sriov.c',
)
if cc.has_argument('-Wno-format-nonliteral')
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 70d48e48e..0235c0798 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2700,6 +2700,7 @@ static int qede_common_dev_init(struct rte_eth_dev
*eth_dev, bool is_vf)
adapter->vxlan.enable = false;
adapter->geneve.enable = false;
adapter->ipgre.enable = false;
+ qed_ops->sriov_configure(edev, pci_dev->max_vfs);
}
DP_INFO(edev, "MAC address : %02x:%02x:%02x:%02x:%02x:%02x\n",
diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index 76c5dae3b..4fb77b05c 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -34,6 +34,7 @@
#include "base/ecore_l2.h"
#include "base/ecore_vf.h"
+#include "qede_sriov.h"
#include "qede_logs.h"
#include "qede_if.h"
#include "qede_rxtx.h"
diff --git a/drivers/net/qede/qede_if.h b/drivers/net/qede/qede_if.h
index c5ae3fb2e..1693a243f 100644
--- a/drivers/net/qede/qede_if.h
+++ b/drivers/net/qede/qede_if.h
@@ -82,6 +82,7 @@ struct qed_eth_ops {
const struct qed_common_ops *common;
int (*fill_dev_info)(struct ecore_dev *edev,
struct qed_dev_eth_info *info);
+ void (*sriov_configure)(struct ecore_dev *edev, int num_vfs);
};
struct qed_link_params {
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index d919f9f11..c37e8ebe0 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -822,6 +822,7 @@ const struct qed_common_ops qed_common_ops_pass = {
const struct qed_eth_ops qed_eth_ops_pass = {
INIT_STRUCT_FIELD(common, &qed_common_ops_pass),
INIT_STRUCT_FIELD(fill_dev_info, &qed_fill_eth_dev_info),
+ INIT_STRUCT_FIELD(sriov_configure, &qed_sriov_configure),
};
const struct qed_eth_ops *qed_get_eth_ops(void)
diff --git a/drivers/net/qede/qede_sriov.c b/drivers/net/qede/qede_sriov.c
new file mode 100644
index 0..ba4384e90
--- /dev/null
+++ b/drivers/net/qede/qede_sriov.c
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell.
+ * All rights reserved.
+ * www.marvell.com
+ */
+
+#include "qede_sriov.h"
+
+static void qed_sriov_enable_qid_config(struct ecore_hwfn *hwfn,
+ u16 vfid,
+ struct ecore_iov_vf_init_params *params)
+{
+ u16 num_pf_l2_queues, base, i;
+
+ /* Since we have an equal resource distribution per-VF, and we assume
+* PF has acquired its first queues, we start setting sequentially from
+* there.
+*/
+ num_pf_l2_queues = (u16)FEAT_NUM(hwfn, ECORE_PF_L2_QUE);
+
+ base = num_pf_l2_queues + vfid * params->num_queues;
+ params->rel_vf_id = vfid;
+
+ for (i = 0; i < params->num_queues; i++) {
+ params->req_rx_queue[i] = base + i;
+ params->req_tx_queue[i] = base + i;
+ }
+
+ /* PF uses indices 0 for itself; Set vport/RSS afterwards */
+ params->vport_id = vfid + 1;
+ params->rss_eng_id = vfid + 1;
+}
+
[dpdk-dev] [PATCH v3 4/6] net/qede: add infrastructure support for VF load
This patch adds necessary infrastructure support (required to handle
messages from VF and sending ramrod on behalf of VF's configuration
request from alarm handler context) to start/load the VF-PMD driver
instance on top of PF-PMD driver instance.
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
Signed-off-by: Rasesh Mody
---
drivers/net/qede/base/bcm_osal.c | 26
drivers/net/qede/base/bcm_osal.h | 11 +++--
drivers/net/qede/base/ecore.h | 4 ++
drivers/net/qede/base/ecore_iov_api.h | 3 ++
drivers/net/qede/qede_ethdev.c| 2 +
drivers/net/qede/qede_main.c | 4 +-
drivers/net/qede/qede_sriov.c | 61 +++
drivers/net/qede/qede_sriov.h | 16 ++-
8 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 65837b53d..ef47339df 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -14,6 +14,32 @@
#include "ecore_iov_api.h"
#include "ecore_mcp_api.h"
#include "ecore_l2_api.h"
+#include "../qede_sriov.h"
+
+int osal_pf_vf_msg(struct ecore_hwfn *p_hwfn)
+{
+ int rc;
+
+ rc = qed_schedule_iov(p_hwfn, QED_IOV_WQ_MSG_FLAG);
+ if (rc) {
+ DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+ "Failed to schedule alarm handler rc=%d\n", rc);
+ }
+
+ return rc;
+}
+
+void osal_poll_mode_dpc(osal_int_ptr_t hwfn_cookie)
+{
+ struct ecore_hwfn *p_hwfn = (struct ecore_hwfn *)hwfn_cookie;
+
+ if (!p_hwfn)
+ return;
+
+ OSAL_SPIN_LOCK(&p_hwfn->spq_lock);
+ ecore_int_sp_dpc((osal_int_ptr_t)(p_hwfn));
+ OSAL_SPIN_UNLOCK(&p_hwfn->spq_lock);
+}
/* Array of memzone pointers */
static const struct rte_memzone *ecore_mz_mapping[RTE_MAX_MEMZONE];
diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 5f55cc2ee..cf58db8bf 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -178,9 +178,12 @@ typedef pthread_mutex_t osal_mutex_t;
/* DPC */
+void osal_poll_mode_dpc(osal_int_ptr_t hwfn_cookie);
#define OSAL_DPC_ALLOC(hwfn) OSAL_ALLOC(hwfn, GFP, sizeof(osal_dpc_t))
-#define OSAL_DPC_INIT(dpc, hwfn) nothing
-#define OSAL_POLL_MODE_DPC(hwfn) nothing
+#define OSAL_DPC_INIT(dpc, hwfn) \
+ OSAL_SPIN_LOCK_INIT(&(hwfn)->spq_lock)
+#define OSAL_POLL_MODE_DPC(hwfn) \
+ osal_poll_mode_dpc((osal_int_ptr_t)(p_hwfn))
#define OSAL_DPC_SYNC(hwfn) nothing
/* Lists */
@@ -345,10 +348,12 @@ u32 qede_find_first_zero_bit(u32 *bitmap, u32 length);
/* SR-IOV channel */
+int osal_pf_vf_msg(struct ecore_hwfn *p_hwfn);
#define OSAL_VF_FLR_UPDATE(hwfn) nothing
#define OSAL_VF_SEND_MSG2PF(dev, done, msg, reply_addr, msg_size, reply_size) 0
#define OSAL_VF_CQE_COMPLETION(_dev_p, _cqe, _protocol)(0)
-#define OSAL_PF_VF_MSG(hwfn, vfid) 0
+#define OSAL_PF_VF_MSG(hwfn, vfid) \
+ osal_pf_vf_msg(hwfn)
#define OSAL_PF_VF_MALICIOUS(hwfn, vfid) nothing
#define OSAL_IOV_CHK_UCAST(hwfn, vfid, params) 0
#define OSAL_IOV_POST_START_VPORT(hwfn, vf, vport_id, opaque_fid) nothing
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 750e99a8f..6c8e6d407 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -714,6 +714,10 @@ struct ecore_hwfn {
/* @DPDK */
struct ecore_ptt*p_arfs_ptt;
+
+ /* DPDK specific, not the part of vanilla ecore */
+ osal_spinlock_t spq_lock;
+ u32 iov_task_flags;
};
enum ecore_mf_mode {
diff --git a/drivers/net/qede/base/ecore_iov_api.h
b/drivers/net/qede/base/ecore_iov_api.h
index 545001812..bd7c5703f 100644
--- a/drivers/net/qede/base/ecore_iov_api.h
+++ b/drivers/net/qede/base/ecore_iov_api.h
@@ -14,6 +14,9 @@
#define ECORE_ETH_VF_NUM_VLAN_FILTERS 2
#define ECORE_VF_ARRAY_LENGTH (3)
+#define ECORE_VF_ARRAY_GET_VFID(arr, vfid) \
+ (((arr)[(vfid) / 64]) & (1ULL << ((vfid) % 64)))
+
#define IS_VF(p_dev) ((p_dev)->b_is_vf)
#define IS_PF(p_dev) (!((p_dev)->b_is_vf))
#ifdef CONFIG_ECORE_SRIOV
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 0235c0798..210a3b10f 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -281,7 +281,9 @@ qede_fw_version_get(struct rte_eth_dev *dev, char *fw_ver,
size_t fw_size)
static void qede_interrupt_action(struct ecore_hwfn *p_hwfn)
{
+ OSAL_SPIN_LOCK(&p_hwfn->spq_lock);
ecore_int_sp_dpc((osal_int_ptr_t)(p_hwfn));
+ OSAL_SPIN_UNLOCK(&p_hwfn->spq_lock);
}
static void
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index c37e8ebe0..0afacc064 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -221,7 +221,9 @@ static void qed_stop_iov_task(struct ecore_dev *edev)
for_each_hwfn(edev, i) {
p_
[dpdk-dev] [PATCH v3 5/6] net/qede: initialize VF MAC and link
This patch configures VFs with random mac if no MAC is
provided by the PF/bulletin. This also adds required bulletin
APIs by PF-PMD driver to communicate LINK properties/changes to
the VFs through bulletin update mechanism.
With these changes, VF-PMD instance is able to run
fastpath over PF-PMD driver instance.
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
Signed-off-by: Rasesh Mody
---
drivers/net/qede/qede_ethdev.c | 34 -
drivers/net/qede/qede_main.c | 7 -
drivers/net/qede/qede_sriov.c | 55 ++
drivers/net/qede/qede_sriov.h | 1 +
4 files changed, 95 insertions(+), 2 deletions(-)
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 210a3b10f..e785f3fb0 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2479,6 +2479,24 @@ static void qede_update_pf_params(struct ecore_dev *edev)
qed_ops->common->update_pf_params(edev, &pf_params);
}
+static void qede_generate_random_mac_addr(struct rte_ether_addr *mac_addr)
+{
+ uint64_t random;
+
+ /* Set Organizationally Unique Identifier (OUI) prefix. */
+ mac_addr->addr_bytes[0] = 0x00;
+ mac_addr->addr_bytes[1] = 0x09;
+ mac_addr->addr_bytes[2] = 0xC0;
+
+ /* Force indication of locally assigned MAC address. */
+ mac_addr->addr_bytes[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR;
+
+ /* Generate the last 3 bytes of the MAC address with a random number. */
+ random = rte_rand();
+
+ memcpy(&mac_addr->addr_bytes[3], &random, 3);
+}
+
static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
{
struct rte_pci_device *pci_dev;
@@ -2491,7 +2509,7 @@ static int qede_common_dev_init(struct rte_eth_dev
*eth_dev, bool is_vf)
uint8_t bulletin_change;
uint8_t vf_mac[RTE_ETHER_ADDR_LEN];
uint8_t is_mac_forced;
- bool is_mac_exist;
+ bool is_mac_exist = false;
/* Fix up ecore debug level */
uint32_t dp_module = ~0 & ~ECORE_MSG_HW;
uint8_t dp_level = ECORE_LEVEL_VERBOSE;
@@ -2669,6 +2687,20 @@ static int qede_common_dev_init(struct rte_eth_dev
*eth_dev, bool is_vf)
DP_ERR(edev, "No VF macaddr assigned\n");
}
}
+
+ /* If MAC doesn't exist from PF, generate random one */
+ if (!is_mac_exist) {
+ struct rte_ether_addr *mac_addr;
+
+ mac_addr = (struct rte_ether_addr *)&vf_mac;
+ qede_generate_random_mac_addr(mac_addr);
+
+ rte_ether_addr_copy(mac_addr,
+ ð_dev->data->mac_addrs[0]);
+
+ rte_ether_addr_copy(ð_dev->data->mac_addrs[0],
+ &adapter->primary_mac);
+ }
}
eth_dev->dev_ops = (is_vf) ? &qede_eth_vf_dev_ops : &qede_eth_dev_ops;
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 0afacc064..805a95e3c 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -651,10 +651,15 @@ void qed_link_update(struct ecore_hwfn *hwfn)
struct ecore_dev *edev = hwfn->p_dev;
struct qede_dev *qdev = (struct qede_dev *)edev;
struct rte_eth_dev *dev = (struct rte_eth_dev *)qdev->ethdev;
+ int rc;
+
+ rc = qede_link_update(dev, 0);
+ qed_inform_vf_link_state(hwfn);
- if (!qede_link_update(dev, 0))
+ if (!rc) {
_rte_eth_dev_callback_process(dev,
RTE_ETH_EVENT_INTR_LSC, NULL);
+ }
}
static int qed_drain(struct ecore_dev *edev)
diff --git a/drivers/net/qede/qede_sriov.c b/drivers/net/qede/qede_sriov.c
index 6d620dde8..93f7a2a55 100644
--- a/drivers/net/qede/qede_sriov.c
+++ b/drivers/net/qede/qede_sriov.c
@@ -126,6 +126,28 @@ static void qed_handle_vf_msg(struct ecore_hwfn *hwfn)
ecore_ptt_release(hwfn, ptt);
}
+static void qed_handle_bulletin_post(struct ecore_hwfn *hwfn)
+{
+ struct ecore_ptt *ptt;
+ int i;
+
+ ptt = ecore_ptt_acquire(hwfn);
+ if (!ptt) {
+ DP_NOTICE(hwfn, true, "PTT acquire failed\n");
+ qed_schedule_iov(hwfn, QED_IOV_WQ_BULLETIN_UPDATE_FLAG);
+ return;
+ }
+
+ /* TODO - at the moment update bulletin board of all VFs.
+* if this proves to costly, we can mark VFs that need their
+* bulletins updated.
+*/
+ ecore_for_each_vf(hwfn, i)
+ ecore_iov_post_vf_bulletin(hwfn, i, ptt);
+
+ ecore_ptt_release(hwfn, ptt);
+}
+
void qed_iov_pf_task(void *arg)
{
struct ecore_hwfn *p_hwfn = arg;
@@ -134,6 +156,13 @@ void qed_iov_pf_task(void *arg)
OSAL_CLEAR_BIT(QED_IOV_WQ_MSG_FLAG, &p_hwfn->iov_task_flags);
qed_handle_vf_msg(p_hwfn);
}
[dpdk-dev] [PATCH v3 6/6] net/qede: add VF FLR support
This patch adds required bit to handle VF FLR
indication from Management FW (MFW) of the device
With that VFs were able to load in VM (VF attached as PCI
passthrough to the guest VM) followed by FLR successfully
Updated the docs/guides with the feature support
Signed-off-by: Manish Chopra
Signed-off-by: Igor Russkikh
Signed-off-by: Rasesh Mody
---
doc/guides/nics/features/qede.ini | 1 +
doc/guides/nics/qede.rst | 7 +--
drivers/net/qede/base/bcm_osal.c | 5 +
drivers/net/qede/base/bcm_osal.h | 4 +++-
drivers/net/qede/qede_sriov.c | 18 ++
5 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/doc/guides/nics/features/qede.ini
b/doc/guides/nics/features/qede.ini
index f8716523e..46fba8e6c 100644
--- a/doc/guides/nics/features/qede.ini
+++ b/doc/guides/nics/features/qede.ini
@@ -32,6 +32,7 @@ Basic stats = Y
Extended stats = Y
Stats per queue = Y
Registers dump = Y
+SR-IOV = Y
Multiprocess aware = Y
Linux UIO= Y
Linux VFIO = Y
diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst
index 5b2f86895..e874915c2 100644
--- a/doc/guides/nics/qede.rst
+++ b/doc/guides/nics/qede.rst
@@ -34,18 +34,13 @@ Supported Features
- VLAN offload - Filtering and stripping
- N-tuple filter and flow director (limited support)
- NPAR (NIC Partitioning)
-- SR-IOV VF
+- SR-IOV PF and VF
- GRE Tunneling offload
- GENEVE Tunneling offload
- VXLAN Tunneling offload
- MPLSoUDP Tx Tunneling offload
- Generic flow API
-Non-supported Features
---
-
-- SR-IOV PF
-
Co-existence considerations
---
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index ef47339df..44a8692f5 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -29,6 +29,11 @@ int osal_pf_vf_msg(struct ecore_hwfn *p_hwfn)
return rc;
}
+void osal_vf_flr_update(struct ecore_hwfn *p_hwfn)
+{
+ qed_schedule_iov(p_hwfn, QED_IOV_WQ_FLR_FLAG);
+}
+
void osal_poll_mode_dpc(osal_int_ptr_t hwfn_cookie)
{
struct ecore_hwfn *p_hwfn = (struct ecore_hwfn *)hwfn_cookie;
diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index cf58db8bf..c137004ba 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -349,7 +349,9 @@ u32 qede_find_first_zero_bit(u32 *bitmap, u32 length);
/* SR-IOV channel */
int osal_pf_vf_msg(struct ecore_hwfn *p_hwfn);
-#define OSAL_VF_FLR_UPDATE(hwfn) nothing
+void osal_vf_flr_update(struct ecore_hwfn *p_hwfn);
+#define OSAL_VF_FLR_UPDATE(hwfn) \
+ osal_vf_flr_update(hwfn)
#define OSAL_VF_SEND_MSG2PF(dev, done, msg, reply_addr, msg_size, reply_size) 0
#define OSAL_VF_CQE_COMPLETION(_dev_p, _cqe, _protocol)(0)
#define OSAL_PF_VF_MSG(hwfn, vfid) \
diff --git a/drivers/net/qede/qede_sriov.c b/drivers/net/qede/qede_sriov.c
index 93f7a2a55..0b99a8d6f 100644
--- a/drivers/net/qede/qede_sriov.c
+++ b/drivers/net/qede/qede_sriov.c
@@ -151,6 +151,7 @@ static void qed_handle_bulletin_post(struct ecore_hwfn
*hwfn)
void qed_iov_pf_task(void *arg)
{
struct ecore_hwfn *p_hwfn = arg;
+ int rc;
if (OSAL_GET_BIT(QED_IOV_WQ_MSG_FLAG, &p_hwfn->iov_task_flags)) {
OSAL_CLEAR_BIT(QED_IOV_WQ_MSG_FLAG, &p_hwfn->iov_task_flags);
@@ -163,6 +164,23 @@ void qed_iov_pf_task(void *arg)
&p_hwfn->iov_task_flags);
qed_handle_bulletin_post(p_hwfn);
}
+
+ if (OSAL_GET_BIT(QED_IOV_WQ_FLR_FLAG, &p_hwfn->iov_task_flags)) {
+ struct ecore_ptt *p_ptt = ecore_ptt_acquire(p_hwfn);
+
+ OSAL_CLEAR_BIT(QED_IOV_WQ_FLR_FLAG, &p_hwfn->iov_task_flags);
+
+ if (!p_ptt) {
+ qed_schedule_iov(p_hwfn, QED_IOV_WQ_FLR_FLAG);
+ return;
+ }
+
+ rc = ecore_iov_vf_flr_cleanup(p_hwfn, p_ptt);
+ if (rc)
+ qed_schedule_iov(p_hwfn, QED_IOV_WQ_FLR_FLAG);
+
+ ecore_ptt_release(p_hwfn, p_ptt);
+ }
}
int qed_schedule_iov(struct ecore_hwfn *p_hwfn, enum qed_iov_wq_flag flag)
--
2.17.1
Re: [dpdk-dev] [PATCH v8 02/10] drivers: fix indent of directory list
On Thu, Jul 23, 2020 at 11:09:02PM +0300, Parav Pandit wrote: > From: Thomas Monjalon > > Define each sub-directory on its own line ended with a comma, > and use a simple indent. > > Signed-off-by: Thomas Monjalon > --- > drivers/meson.build | 24 +--- > 1 file changed, 13 insertions(+), 11 deletions(-) > Thanks. Although we normally don't like doing cleanups for whitespace, this is a small-enough change and worth doing, since the existing indentation was just weird. Acked-by: Bruce Richardson
[dpdk-dev] [PATCH 1/3] test/crypto: replace NITROX PMD specific test suite
Replace NITROX PMD specific tests with generic test suite.
Signed-off-by: Nagadheeraj Rottela
---
app/test/test_cryptodev.c | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c..162134a5c 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -12665,22 +12665,6 @@ static struct unit_test_suite cryptodev_ccp_testsuite
= {
}
};
-static struct unit_test_suite cryptodev_nitrox_testsuite = {
- .suite_name = "Crypto NITROX Unit Test Suite",
- .setup = testsuite_setup,
- .teardown = testsuite_teardown,
- .unit_test_cases = {
- TEST_CASE_ST(ut_setup, ut_teardown,
-test_device_configure_invalid_dev_id),
- TEST_CASE_ST(ut_setup, ut_teardown,
- test_device_configure_invalid_queue_pair_ids),
- TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
- TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-
- TEST_CASES_END() /**< NULL terminate unit test array */
- }
-};
-
static int
test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
{
@@ -13038,7 +13022,7 @@ test_cryptodev_nitrox(void)
return TEST_FAILED;
}
- return unit_test_suite_runner(&cryptodev_nitrox_testsuite);
+ return unit_test_suite_runner(&cryptodev_testsuite);
}
REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
--
2.20.1
[dpdk-dev] [PATCH 3/3] crypto/nitrox: support cipher only crypto operations
This patch adds cipher only crypto operation support.
Signed-off-by: Nagadheeraj Rottela
---
doc/guides/cryptodevs/nitrox.rst | 2 -
drivers/crypto/nitrox/nitrox_sym.c| 3 +
drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 189 --
3 files changed, 143 insertions(+), 51 deletions(-)
diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst
index 91fca905a..095e545c6 100644
--- a/doc/guides/cryptodevs/nitrox.rst
+++ b/doc/guides/cryptodevs/nitrox.rst
@@ -33,8 +33,6 @@ Supported AEAD algorithms:
Limitations
---
-* AES_CBC Cipher Only combination is not supported.
-* 3DES Cipher Only combination is not supported.
* Session-less APIs are not supported.
Installation
diff --git a/drivers/crypto/nitrox/nitrox_sym.c
b/drivers/crypto/nitrox/nitrox_sym.c
index fe3ee6e23..2768bdd2e 100644
--- a/drivers/crypto/nitrox/nitrox_sym.c
+++ b/drivers/crypto/nitrox/nitrox_sym.c
@@ -550,6 +550,9 @@ nitrox_sym_dev_sess_configure(struct rte_cryptodev *cdev,
ctx = mp_obj;
ctx->nitrox_chain = get_crypto_chain_order(xform);
switch (ctx->nitrox_chain) {
+ case NITROX_CHAIN_CIPHER_ONLY:
+ cipher_xform = &xform->cipher;
+ break;
case NITROX_CHAIN_CIPHER_AUTH:
cipher_xform = &xform->cipher;
auth_xform = &xform->next->auth;
diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
index 93d59b048..b5bbd1fd2 100644
--- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
+++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c
@@ -247,38 +247,6 @@ softreq_copy_iv(struct nitrox_softreq *sr, uint8_t
salt_size)
sr->iv.len = sr->ctx->iv.length - salt_size;
}
-static int
-extract_cipher_auth_digest(struct nitrox_softreq *sr,
- struct nitrox_sglist *digest)
-{
- struct rte_crypto_op *op = sr->op;
- struct rte_mbuf *mdst = op->sym->m_dst ? op->sym->m_dst :
- op->sym->m_src;
-
- if (sr->ctx->req_op == NITROX_OP_DECRYPT &&
- unlikely(!op->sym->auth.digest.data))
- return -EINVAL;
-
- digest->len = sr->ctx->digest_length;
- if (op->sym->auth.digest.data) {
- digest->iova = op->sym->auth.digest.phys_addr;
- digest->virt = op->sym->auth.digest.data;
- return 0;
- }
-
- if (unlikely(rte_pktmbuf_data_len(mdst) < op->sym->auth.data.offset +
- op->sym->auth.data.length + digest->len))
- return -EINVAL;
-
- digest->iova = rte_pktmbuf_mtophys_offset(mdst,
- op->sym->auth.data.offset +
- op->sym->auth.data.length);
- digest->virt = rte_pktmbuf_mtod_offset(mdst, uint8_t *,
- op->sym->auth.data.offset +
- op->sym->auth.data.length);
- return 0;
-}
-
static void
fill_sglist(struct nitrox_sgtable *sgtbl, uint16_t len, rte_iova_t iova,
void *virt)
@@ -340,6 +308,143 @@ create_sglist_from_mbuf(struct nitrox_sgtable *sgtbl,
struct rte_mbuf *mbuf,
return 0;
}
+static void
+create_sgcomp(struct nitrox_sgtable *sgtbl)
+{
+ int i, j, nr_sgcomp;
+ struct nitrox_sgcomp *sgcomp = sgtbl->sgcomp;
+ struct nitrox_sglist *sglist = sgtbl->sglist;
+
+ nr_sgcomp = RTE_ALIGN_MUL_CEIL(sgtbl->map_bufs_cnt, 4) / 4;
+ sgtbl->nr_sgcomp = nr_sgcomp;
+ for (i = 0; i < nr_sgcomp; i++, sgcomp++) {
+ for (j = 0; j < 4; j++, sglist++) {
+ sgcomp->len[j] = rte_cpu_to_be_16(sglist->len);
+ sgcomp->iova[j] = rte_cpu_to_be_64(sglist->iova);
+ }
+ }
+}
+
+static int
+create_cipher_inbuf(struct nitrox_softreq *sr)
+{
+ int err;
+ struct rte_crypto_op *op = sr->op;
+
+ fill_sglist(&sr->in, sr->iv.len, sr->iv.iova, sr->iv.virt);
+ err = create_sglist_from_mbuf(&sr->in, op->sym->m_src,
+ op->sym->cipher.data.offset,
+ op->sym->cipher.data.length);
+ if (unlikely(err))
+ return err;
+
+ create_sgcomp(&sr->in);
+ sr->dptr = sr->iova + offsetof(struct nitrox_softreq, in.sgcomp);
+
+ return 0;
+}
+
+static int
+create_cipher_outbuf(struct nitrox_softreq *sr)
+{
+ struct rte_crypto_op *op = sr->op;
+ int err, cnt = 0;
+ struct rte_mbuf *m_dst = op->sym->m_dst ? op->sym->m_dst :
+ op->sym->m_src;
+
+ sr->resp.orh = PENDING_SIG;
+ sr->out.sglist[cnt].len = sizeof(sr->resp.orh);
+ sr->out.sglist[cnt].iova = sr->iova + offsetof(struct nitrox_softreq,
+ resp.orh);
+ sr->out.sglist[cnt].virt = &sr->resp.orh;
+ cnt++;
+
+ sr->out.map_bufs_cnt = cnt;
+
[dpdk-dev] [PATCH 2/3] crypto/nitrox: support AES-GCM
This patch adds AES-GCM AEAD algorithm.
Signed-off-by: Nagadheeraj Rottela
---
doc/guides/cryptodevs/features/nitrox.ini | 3 +
doc/guides/cryptodevs/nitrox.rst | 4 +
drivers/crypto/nitrox/nitrox_sym.c| 82 +++-
.../crypto/nitrox/nitrox_sym_capabilities.c | 30 +++
drivers/crypto/nitrox/nitrox_sym_ctx.h| 5 +-
drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 182 +++---
6 files changed, 268 insertions(+), 38 deletions(-)
diff --git a/doc/guides/cryptodevs/features/nitrox.ini
b/doc/guides/cryptodevs/features/nitrox.ini
index 183494731..a1d6bcb4f 100644
--- a/doc/guides/cryptodevs/features/nitrox.ini
+++ b/doc/guides/cryptodevs/features/nitrox.ini
@@ -34,6 +34,9 @@ SHA256 HMAC = Y
; Supported AEAD algorithms of the 'nitrox' crypto driver.
;
[AEAD]
+AES GCM (128) = Y
+AES GCM (192) = Y
+AES GCM (256) = Y
;
; Supported Asymmetric algorithms of the 'nitrox' crypto driver.
diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst
index 85f5212b6..91fca905a 100644
--- a/doc/guides/cryptodevs/nitrox.rst
+++ b/doc/guides/cryptodevs/nitrox.rst
@@ -26,6 +26,10 @@ Hash algorithms:
* ``RTE_CRYPTO_AUTH_SHA224_HMAC``
* ``RTE_CRYPTO_AUTH_SHA256_HMAC``
+Supported AEAD algorithms:
+
+* ``RTE_CRYPTO_AEAD_AES_GCM``
+
Limitations
---
diff --git a/drivers/crypto/nitrox/nitrox_sym.c
b/drivers/crypto/nitrox/nitrox_sym.c
index fad4a7a48..fe3ee6e23 100644
--- a/drivers/crypto/nitrox/nitrox_sym.c
+++ b/drivers/crypto/nitrox/nitrox_sym.c
@@ -20,6 +20,7 @@
#define NPS_PKT_IN_INSTR_SIZE 64
#define IV_FROM_DPTR 1
#define FLEXI_CRYPTO_ENCRYPT_HMAC 0x33
+#define FLEXI_CRYPTO_MAX_AAD_LEN 512
#define AES_KEYSIZE_128 16
#define AES_KEYSIZE_192 24
#define AES_KEYSIZE_256 32
@@ -297,6 +298,9 @@ get_crypto_chain_order(const struct rte_crypto_sym_xform
*xform)
}
}
break;
+ case RTE_CRYPTO_SYM_XFORM_AEAD:
+ res = NITROX_CHAIN_COMBINED;
+ break;
default:
break;
}
@@ -431,17 +435,17 @@ get_flexi_auth_type(enum rte_crypto_auth_algorithm algo)
}
static bool
-auth_key_digest_is_valid(struct rte_crypto_auth_xform *xform,
-struct flexi_crypto_context *fctx)
+auth_key_is_valid(const uint8_t *data, uint16_t length,
+ struct flexi_crypto_context *fctx)
{
- if (unlikely(!xform->key.data && xform->key.length)) {
+ if (unlikely(!data && length)) {
NITROX_LOG(ERR, "Invalid auth key\n");
return false;
}
- if (unlikely(xform->key.length > sizeof(fctx->auth.opad))) {
+ if (unlikely(length > sizeof(fctx->auth.opad))) {
NITROX_LOG(ERR, "Invalid auth key length %d\n",
- xform->key.length);
+ length);
return false;
}
@@ -459,11 +463,10 @@ configure_auth_ctx(struct rte_crypto_auth_xform *xform,
if (unlikely(type == AUTH_INVALID))
return -ENOTSUP;
- if (unlikely(!auth_key_digest_is_valid(xform, fctx)))
+ if (unlikely(!auth_key_is_valid(xform->key.data, xform->key.length,
+ fctx)))
return -EINVAL;
- ctx->auth_op = xform->op;
- ctx->auth_algo = xform->algo;
ctx->digest_length = xform->digest_length;
fctx->flags = rte_be_to_cpu_64(fctx->flags);
@@ -476,6 +479,56 @@ configure_auth_ctx(struct rte_crypto_auth_xform *xform,
return 0;
}
+static int
+configure_aead_ctx(struct rte_crypto_aead_xform *xform,
+ struct nitrox_crypto_ctx *ctx)
+{
+ int aes_keylen;
+ struct flexi_crypto_context *fctx = &ctx->fctx;
+
+ if (unlikely(xform->aad_length > FLEXI_CRYPTO_MAX_AAD_LEN)) {
+ NITROX_LOG(ERR, "AAD length %d not supported\n",
+ xform->aad_length);
+ return -ENOTSUP;
+ }
+
+ if (unlikely(xform->algo != RTE_CRYPTO_AEAD_AES_GCM))
+ return -ENOTSUP;
+
+ aes_keylen = flexi_aes_keylen(xform->key.length, true);
+ if (unlikely(aes_keylen < 0))
+ return -EINVAL;
+
+ if (unlikely(!auth_key_is_valid(xform->key.data, xform->key.length,
+ fctx)))
+ return -EINVAL;
+
+ if (unlikely(xform->iv.length > MAX_IV_LEN))
+ return -EINVAL;
+
+ fctx->flags = rte_be_to_cpu_64(fctx->flags);
+ fctx->w0.cipher_type = CIPHER_AES_GCM;
+ fctx->w0.aes_keylen = aes_keylen;
+ fctx->w0.iv_source = IV_FROM_DPTR;
+ fctx->w0.hash_type = AUTH_NULL;
+ fctx->w0.auth_input_type = 1;
+ fctx->w0.mac_len = xform->digest_length;
+ fctx->flags = rte_cpu_to_be_64(fctx->flags);
+ memset(fctx->crypto.key, 0, sizeof(fctx->crypto.key));
+ memcpy(fctx->crypto.key, xform->key.data, xform
[dpdk-dev] [PATCH 0/3] Add AES-GCM and cipher only offload support
This patch set replaces the NITROX PMD specific test suite with generic test suite and adds support for AES-GCM and cipher only offload. Nagadheeraj Rottela (3): test/crypto: replace NITROX PMD specific test suite crypto/nitrox: support AES-GCM crypto/nitrox: support cipher only crypto operations app/test/test_cryptodev.c | 18 +- doc/guides/cryptodevs/features/nitrox.ini | 3 + doc/guides/cryptodevs/nitrox.rst | 6 +- drivers/crypto/nitrox/nitrox_sym.c| 85 - .../crypto/nitrox/nitrox_sym_capabilities.c | 30 ++ drivers/crypto/nitrox/nitrox_sym_ctx.h| 5 +- drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 357 ++ 7 files changed, 405 insertions(+), 99 deletions(-) -- 2.20.1
Re: [dpdk-dev] [PATCH v8 03/10] drivers: relax dependency order
On Thu, Jul 23, 2020 at 11:09:03PM +0300, Parav Pandit wrote: > From: Thomas Monjalon > > Drivers dependencies are evaluated in the order defined per > their parent directory (also called class). > This strict ordering prevent from having 2 different drivers > of the same class with different dependencies ordering. > This problem occurs if drivers/common/mlx5 depends on drivers/bus/pci, > while drivers/bus/dpaa depends on drivers/common/dpaax. > Having a strict ordering between directories bus and common > is too much restrictive. > > That's why it is made possible to have a more fine-grain directory list, > adding a driver sub-directory in the list. > In this case, the isolated driver must be removed from its class list, > and added directly in drivers/meson.build. > Also, the per-class variables must be duplicated in the isolated driver, > because the call "subdir(class)" is skipped in the isolated driver case. > > Signed-off-by: Thomas Monjalon The commit log above has some strange word-wrapping, and occasionally strange phrasing. I think it could be slightly reworded, perhaps as: Drivers dependencies are evaluated in the order defined per their parent directory (also called class). This strict ordering prevents from us from having pairs of drivers from two classes with different dependency ordering. For example, if the mlx5 common code depends on the pci bus driver, while the dpaax common code is itself a dependency of the dpaa bus driver. Having a strict ordering between directories bus and common is too restrictive, as processing either common drivers or bus drivers first leads us to missing dependencies in this scenario. This patch makes it possible to have a more fine-grain directory list, adding a specific driver sub-directory in the top-level drivers subdirectory list. In this case, the isolated driver must also be removed from its class list, and the per-class variables must be duplicated in the isolated driver, because the call "subdir(class)" is skipped in the isolated driver case. Apart from that, I think this is a good idea to give us some flexibility in managing driver ordering which should help other drivers too - perhaps QAT? Ideally, though, I'd like if we can limit the flexible ordering to *only* common code, in which case we could move the per-class variables for common to the top-level to prevent duplication, and maybe even get rid of common/meson.build completely. That, however, will depend on how much this feature gets used and by whom. Therefore: Review-by: Bruce Richardson Acked-by: Bruce Richardson
[dpdk-dev] [PATCH v3] doc: add more detail to telemetry guides
This patch adds examples to the Telemetry HowTo guide, to demonstrate
commands that use parameters. The programmer's guide is also modified to
include details on writing a callback function for a new command.
Signed-off-by: Ciara Power
---
v3:
- Replaced direct code examples with generic examples.
- Replaced ref label with :doc: syntax to link guides.
- Replaced console code-block label with :: on previous lines.
- Added links to API doc.
- Modified some formatting.
v2:
- Replaced examples of using commands in the programmer's guide with
a link to the HowTo guide.
- Added an example showing the use of a single string value.
- Replaced inline functions with a synthetic example function below
the list of parameters.
---
doc/guides/howto/telemetry.rst | 67 ++
doc/guides/prog_guide/telemetry_lib.rst | 160 +++-
2 files changed, 172 insertions(+), 55 deletions(-)
diff --git a/doc/guides/howto/telemetry.rst b/doc/guides/howto/telemetry.rst
index b4a34ed674..e7b5434152 100644
--- a/doc/guides/howto/telemetry.rst
+++ b/doc/guides/howto/telemetry.rst
@@ -29,17 +29,13 @@ Telemetry Initialization
The library is enabled by default, however an EAL flag to enable the library
exists, to provide backward compatibility for the previous telemetry library
-interface.
+interface::
-.. code-block:: console
+ --telemetry
- --telemetry
+A flag exists to disable Telemetry also::
-A flag exists to disable Telemetry also.
-
-.. code-block:: console
-
- --no-telemetry
+ --no-telemetry
Running Telemetry
@@ -48,33 +44,50 @@ Running Telemetry
The following steps show how to run an application with telemetry support,
and query information using the telemetry client python script.
-#. Launch testpmd as the primary application with telemetry.
-
- .. code-block:: console
+#. Launch testpmd as the primary application with telemetry::
./app/dpdk-testpmd
-#. Launch the telemetry client script.
-
- .. code-block:: console
+#. Launch the telemetry client script::
python usertools/dpdk-telemetry.py
-#. When connected, the script displays the following, waiting for user input.
+#. When connected, the script displays the following, waiting for user input::
- .. code-block:: console
-
- Connecting to /var/run/dpdk/rte/dpdk_telemetry.v2
- {"version": "DPDK 20.05.0-rc0", "pid": 60285, "max_output_len": 16384}
- -->
+ Connecting to /var/run/dpdk/rte/dpdk_telemetry.v2
+ {"version": "DPDK 20.05.0-rc2", "pid": 60285, "max_output_len": 16384}
+ -->
#. The user can now input commands to send across the socket, and receive the
- response.
+ response. Some available commands are shown below.
+
+ * List all commands::
+
+ --> /
+ {"/": ["/", "/eal/app_params", "/eal/params", "/ethdev/list",
+ "/ethdev/link_status", "/ethdev/xstats", "/help", "/info"]}
+
+ * Get the list of ethdev ports::
+
+ --> /ethdev/list
+ {"/ethdev/list": [0, 1]}
+
+ .. Note::
+
+ For commands that expect a parameter, use "," to separate the command
+ and parameter. See examples below.
+
+ * Get extended statistics for an ethdev port::
+
+ --> /ethdev/xstats,0
+ {"/ethdev/xstats": {"rx_good_packets": 0, "tx_good_packets": 0,
+ "rx_good_bytes": 0, "tx_good_bytes": 0, "rx_missed_errors": 0,
+ ...
+ "tx_priority7_xon_to_xoff_packets": 0}}
- .. code-block:: console
+ * Get the help text for a command. This will indicate what parameters are
+ required. Pass the command as a parameter::
- --> /
- {"/": ["/", "/eal/app_params", "/eal/params", "/ethdev/list",
- "/ethdev/link_status", "/ethdev/xstats", "/help", "/info"]}
- --> /ethdev/list
- {"/ethdev/list": [0, 1]}
+ --> /help,/ethdev/xstats
+ {"/help": {"/ethdev/xstats": "Returns the extended stats for a port.
+ Parameters: int port_id"}}
diff --git a/doc/guides/prog_guide/telemetry_lib.rst
b/doc/guides/prog_guide/telemetry_lib.rst
index 8563a7200e..c01e2480ce 100644
--- a/doc/guides/prog_guide/telemetry_lib.rst
+++ b/doc/guides/prog_guide/telemetry_lib.rst
@@ -16,47 +16,151 @@ function that will format the library specific stats into
the correct data
format, when requested.
-Registering Commands
-
+Creating Callback Functions
+---
-Libraries and applications must register commands to make their information
-available via the Telemetry library. This involves providing a string command
-in the required format ("/library/command"), the callback function that
-will handle formatting the information when required, and help text for the
-command. An example showing ethdev commands being registered is shown below:
+
+Function Type
+~
+
+When creating a callback function in a library/app, it must be of the
following type:
.. code-block:: c
-rte_telemetry_register_cmd("/ethdev/list", handle_por
Re: [dpdk-dev] [PATCH v2] doc: add more detail to telemetry guides
Hi Thomas, Thanks for the review. I have addressed your comments in the v3 patch, with one exception mentioned below. >[...] >> + * List all commands. >> + >> + .. code-block:: console > >I think you can achieve the same result as code-block with adding double >colons (::) at the end of the previous line: > * List all commands:: > I have added this in the v3 for all console code-blocks. I left the C code-blocks as they were to ensure C syntax highlighting is maintained. Thanks, Ciara
Re: [dpdk-dev] [PATCH v3] doc: add more detail to telemetry guides
>-Original Message- >From: Power, Ciara >Sent: Friday 24 July 2020 12:21 >To: Laatz, Kevin >Cc: dev@dpdk.org; Richardson, Bruce ; >tho...@monjalon.net; Power, Ciara >Subject: [PATCH v3] doc: add more detail to telemetry guides > >This patch adds examples to the Telemetry HowTo guide, to demonstrate >commands that use parameters. The programmer's guide is also modified to >include details on writing a callback function for a new command. > >Signed-off-by: Ciara Power > >--- >v3: > - Replaced direct code examples with generic examples. > - Replaced ref label with :doc: syntax to link guides. > - Replaced console code-block label with :: on previous lines. > - Added links to API doc. > - Modified some formatting. >v2: > - Replaced examples of using commands in the programmer's guide with >a link to the HowTo guide. > - Added an example showing the use of a single string value. > - Replaced inline functions with a synthetic example function below >the list of parameters. >--- > doc/guides/howto/telemetry.rst | 67 ++ > doc/guides/prog_guide/telemetry_lib.rst | 160 +++- > 2 files changed, 172 insertions(+), 55 deletions(-) > >diff --git a/doc/guides/howto/telemetry.rst >b/doc/guides/howto/telemetry.rst index b4a34ed674..e7b5434152 100644 >--- a/doc/guides/howto/telemetry.rst >+++ b/doc/guides/howto/telemetry.rst >@@ -29,17 +29,13 @@ Telemetry Initialization > I forgot to preserve the Ack from v2. Acked-by: Bruce Richardson
Re: [dpdk-dev] [PATCH] common/qat: fix uninitialized variable bug
> -Original Message-
> From: Dybkowski, AdamX
> Sent: Friday, July 24, 2020 10:40 AM
> To: dev@dpdk.org; Trahe, Fiona ; akhil.go...@nxp.com
> Cc: Dybkowski, AdamX
> Subject: [PATCH] common/qat: fix uninitialized variable bug
>
> This patch fixes the uninitialized variable bug in QAT PMD.
>
> Fixes: 9f27a860dc16 ("crypto/qat: move generic qp function to qp file")
>
> Signed-off-by: Adam Dybkowski
> ---
> drivers/common/qat/qat_qp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
> index aacd4ab21..0ee713955 100644
> --- a/drivers/common/qat/qat_qp.c
> +++ b/drivers/common/qat/qat_qp.c
> @@ -582,7 +582,7 @@ qat_enqueue_op_burst(void *qp, void **ops, uint16_t
> nb_ops)
> register struct qat_queue *queue;
> struct qat_qp *tmp_qp = (struct qat_qp *)qp;
> register uint32_t nb_ops_sent = 0;
> - register int ret;
> + register int ret = -1;
Nack - this fn returns an unsigned. So the correct option is to default to 0
Re: [dpdk-dev] [PATCH] common/qat: fix uninitialized variable bug
> -Original Message-
> From: Trahe, Fiona
> Sent: Friday, 24 July, 2020 13:55
> To: Dybkowski, AdamX ; dev@dpdk.org;
> akhil.go...@nxp.com
> Cc: Trahe, Fiona
> Subject: RE: [PATCH] common/qat: fix uninitialized variable bug
>
>
>
> > -Original Message-
> > From: Dybkowski, AdamX
> > Sent: Friday, July 24, 2020 10:40 AM
> > To: dev@dpdk.org; Trahe, Fiona ;
> > akhil.go...@nxp.com
> > Cc: Dybkowski, AdamX
> > Subject: [PATCH] common/qat: fix uninitialized variable bug
> >
> > This patch fixes the uninitialized variable bug in QAT PMD.
> >
> > Fixes: 9f27a860dc16 ("crypto/qat: move generic qp function to qp
> > file")
> >
> > Signed-off-by: Adam Dybkowski
> > ---
> > drivers/common/qat/qat_qp.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
> > index aacd4ab21..0ee713955 100644
> > --- a/drivers/common/qat/qat_qp.c
> > +++ b/drivers/common/qat/qat_qp.c
> > @@ -582,7 +582,7 @@ qat_enqueue_op_burst(void *qp, void **ops,
> uint16_t nb_ops)
> > register struct qat_queue *queue;
> > struct qat_qp *tmp_qp = (struct qat_qp *)qp;
> > register uint32_t nb_ops_sent = 0;
> > - register int ret;
> > + register int ret = -1;
> Nack - this fn returns an unsigned. So the correct option is to default to 0
[Adam] The ret variable value (signed) is not returned directly, please check
the rest of this function in src code. This is just checked to calculate how
many ops were enqueued. And if all checks skip (meaning the op was not
processed by sym crypto, asym crypto nor compression), we should note the user
that the actual op was NOT enqueued. That's why ret is set to -1.
Adam
[dpdk-dev] [PATCH] vdpa/mlx5: fix live migration termination
There are a lot of per virtq operations in the live migration
handling.
Before the driver support for queue update, when a virtq was not valid,
all the LM handling was terminated.
But now, when the driver supports queue update, the virtq can be invalid
as legal stage.
Skip invalid virtq in LM handling.
Fixes: c47d6e83334e ("vdpa/mlx5: support queue update")
Signed-off-by: Matan Azrad
Acked-by: Xueming Li
---
drivers/vdpa/mlx5/mlx5_vdpa_lm.c | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c
index 460e01d..273c46f 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c
@@ -19,9 +19,13 @@
for (i = 0; i < priv->nr_virtqs; ++i) {
attr.queue_index = i;
- if (!priv->virtqs[i].virtq ||
- mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) {
- DRV_LOG(ERR, "Failed to modify virtq %d logging.", i);
+ if (!priv->virtqs[i].virtq) {
+ DRV_LOG(DEBUG, "virtq %d is invalid for dirty bitmap "
+ "enabling.", i);
+ } else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
+ &attr)) {
+ DRV_LOG(ERR, "Failed to modify virtq %d for dirty "
+ "bitmap enabling.", i);
return -1;
}
}
@@ -69,9 +73,11 @@
attr.dirty_bitmap_mkey = mr->mkey->id;
for (i = 0; i < priv->nr_virtqs; ++i) {
attr.queue_index = i;
- if (!priv->virtqs[i].virtq ||
- mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) {
- DRV_LOG(ERR, "Failed to modify virtq %d for lm.", i);
+ if (!priv->virtqs[i].virtq) {
+ DRV_LOG(DEBUG, "virtq %d is invalid for LM.", i);
+ } else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
+ &attr)) {
+ DRV_LOG(ERR, "Failed to modify virtq %d for LM.", i);
goto err;
}
}
@@ -104,15 +110,15 @@
if (!RTE_VHOST_NEED_LOG(features))
return 0;
for (i = 0; i < priv->nr_virtqs; ++i) {
- if (priv->virtqs[i].virtq) {
+ if (!priv->virtqs[i].virtq) {
+ DRV_LOG(DEBUG, "virtq %d is invalid for LM log.", i);
+ } else {
ret = mlx5_vdpa_virtq_stop(priv, i);
if (ret) {
- DRV_LOG(ERR, "Failed to stop virtq %d.", i);
+ DRV_LOG(ERR, "Failed to stop virtq %d for LM "
+ "log.", i);
return -1;
}
- } else {
- DRV_LOG(ERR, "virtq %d is not created.", i);
- return -1;
}
rte_vhost_log_used_vring(priv->vid, i, 0,
MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size));
--
1.8.3.1
Re: [dpdk-dev] [PATCH] common/qat: fix uninitialized variable bug
> -Original Message-
> From: Dybkowski, AdamX
> Sent: Friday, July 24, 2020 12:58 PM
> To: Trahe, Fiona ; dev@dpdk.org; akhil.go...@nxp.com
> Subject: RE: [PATCH] common/qat: fix uninitialized variable bug
>
> > -Original Message-
> > From: Trahe, Fiona
> > Sent: Friday, 24 July, 2020 13:55
> > To: Dybkowski, AdamX ; dev@dpdk.org;
> > akhil.go...@nxp.com
> > Cc: Trahe, Fiona
> > Subject: RE: [PATCH] common/qat: fix uninitialized variable bug
> >
> >
> >
> > > -Original Message-
> > > From: Dybkowski, AdamX
> > > Sent: Friday, July 24, 2020 10:40 AM
> > > To: dev@dpdk.org; Trahe, Fiona ;
> > > akhil.go...@nxp.com
> > > Cc: Dybkowski, AdamX
> > > Subject: [PATCH] common/qat: fix uninitialized variable bug
> > >
> > > This patch fixes the uninitialized variable bug in QAT PMD.
> > >
> > > Fixes: 9f27a860dc16 ("crypto/qat: move generic qp function to qp
> > > file")
> > >
> > > Signed-off-by: Adam Dybkowski
> > > ---
> > > drivers/common/qat/qat_qp.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
> > > index aacd4ab21..0ee713955 100644
> > > --- a/drivers/common/qat/qat_qp.c
> > > +++ b/drivers/common/qat/qat_qp.c
> > > @@ -582,7 +582,7 @@ qat_enqueue_op_burst(void *qp, void **ops,
> > uint16_t nb_ops)
> > > register struct qat_queue *queue;
> > > struct qat_qp *tmp_qp = (struct qat_qp *)qp;
> > > register uint32_t nb_ops_sent = 0;
> > > - register int ret;
> > > + register int ret = -1;
> > Nack - this fn returns an unsigned. So the correct option is to default to 0
>
> [Adam] The ret variable value (signed) is not returned directly, please check
> the rest of this function in src
> code. This is just checked to calculate how many ops were enqueued. And if
> all checks skip (meaning the
> op was not processed by sym crypto, asym crypto nor compression), we should
> note the user that the
> actual op was NOT enqueued. That's why ret is set to -1.
[Fiona] ok. makes sense thanks. In that case
Acked-by: Fiona Trahe
Re: [dpdk-dev] [PATCH 0/2] Fix vhost performance regression
On Fri, Jul 24, 2020 at 9:06 AM Maxime Coquelin wrote: > On 7/24/20 6:55 AM, Wang, Yinan wrote: > > Hi Maxime, > > > > The performance drop issue can be fixed, thanks! > > The multi-queues interrupt issue still exist w/ this patch set. > > Thanks for the test report, so that's only half good. > I'm setting up the multi-queues interrupt test case to further debug it. - We wasted time trying to understand why we could not start the l3fwd-power application like in the test report. I created a bz for dts. https://bugs.dpdk.org/show_bug.cgi?id=515 - There are also changes on the default configuration + recompilation of dpdk with make in DTS. DTS should use the default configuration. make will be dropped in 20.11. Thanks. -- David Marchand
[dpdk-dev] [PATCH v4 1/2] service: add API to retrieve service core active
This commit adds a new experimental API which allows the user
to retrieve the active state of an lcore. Knowing when the service
lcore is completed its polling loop can be useful to applications
to avoid race conditions when e.g. finalizing statistics.
The service thread itself now has a variable to indicate if its
thread is active. When zero the service thread has completed its
service, and has returned from the service_runner_func() function.
Suggested-by: Lukasz Wojciechowski
Signed-off-by: Harry van Haaren
Reviewed-by: Phil Yang
Reviewed-by: Honnappa Nagarahalli
---
v4:
- Use _may_be_ style API for lcore_active (Honnappa)
- Fix missing tab indent (Honnappa)
- Add 'lcore' to doxygen retval description (Honnappa)
@Honnappa: Please note i did not update the doxygen title of the
lcore_may_be_active() function, as the current description is more
accurate than making it more consistent with other functions. The
function returns core active state - and I don't want to confuse
mappings of services to lcores with what the function returns.
v3:
- Change service lcore stores to SEQ_CST (Honnappa, David)
- Change control thread load to ACQ (Honnappa, David)
- Comment reasons for SEQ_CST/ACQ (Honnappa, David)
- Add comments to Doxygen for _stop() and _lcore_active() (Honnappa, David)
- Add Phil's review tag from ML
---
lib/librte_eal/common/rte_service.c | 21 +
lib/librte_eal/include/rte_service.h | 22 +-
lib/librte_eal/rte_eal_version.map | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/rte_service.c
b/lib/librte_eal/common/rte_service.c
index 6a0e0ff65..35f1887fd 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -65,6 +65,7 @@ struct core_state {
/* map of services IDs are run on this core */
uint64_t service_mask;
uint8_t runstate; /* running or stopped */
+ uint8_t thread_active; /* indicates when thread is in service_run() */
uint8_t is_service_core; /* set if core is currently a service core */
uint8_t service_active_on_lcore[RTE_SERVICE_NUM_MAX];
uint64_t loops;
@@ -457,6 +458,8 @@ service_runner_func(void *arg)
const int lcore = rte_lcore_id();
struct core_state *cs = &lcore_states[lcore];
+ __atomic_store_n(&cs->thread_active, 1, __ATOMIC_SEQ_CST);
+
/* runstate act as the guard variable. Use load-acquire
* memory order here to synchronize with store-release
* in runstate update functions.
@@ -475,9 +478,27 @@ service_runner_func(void *arg)
cs->loops++;
}
+ /* Use SEQ CST memory ordering to avoid any re-ordering around
+* this store, ensuring that once this store is visible, the service
+* lcore thread really is done in service cores code.
+*/
+ __atomic_store_n(&cs->thread_active, 0, __ATOMIC_SEQ_CST);
return 0;
}
+int32_t
+rte_service_lcore_may_be_active(uint32_t lcore)
+{
+ if (lcore >= RTE_MAX_LCORE || !lcore_states[lcore].is_service_core)
+ return -EINVAL;
+
+ /* Load thread_active using ACQUIRE to avoid instructions dependant on
+* the result being re-ordered before this load completes.
+*/
+ return __atomic_load_n(&lcore_states[lcore].thread_active,
+ __ATOMIC_ACQUIRE);
+}
+
int32_t
rte_service_lcore_count(void)
{
diff --git a/lib/librte_eal/include/rte_service.h
b/lib/librte_eal/include/rte_service.h
index e2d0a6dd3..09f0d08b1 100644
--- a/lib/librte_eal/include/rte_service.h
+++ b/lib/librte_eal/include/rte_service.h
@@ -249,7 +249,11 @@ int32_t rte_service_lcore_start(uint32_t lcore_id);
* Stop a service core.
*
* Stopping a core makes the core become idle, but remains assigned as a
- * service core.
+ * service core. Note that the serivce lcore thread may not have returned from
+ * the service it is running when this API returns.
+ *
+ * The *rte_service_lcore_may_be_active* API can be used to check if the
+ * service lcore is * still active.
*
* @retval 0 Success
* @retval -EINVAL Invalid *lcore_id* provided
@@ -261,6 +265,22 @@ int32_t rte_service_lcore_start(uint32_t lcore_id);
*/
int32_t rte_service_lcore_stop(uint32_t lcore_id);
+/**
+ * Reports if a service lcore is currently running.
+ *
+ * This function returns if the core has finished service cores code, and has
+ * returned to EAL control. If *rte_service_lcore_stop* has been called but
+ * the lcore has not returned to EAL yet, it might be required to wait and call
+ * this function again. The amount of time to wait before the core returns
+ * depends on the duration of the services being run.
+ *
+ * @retval 0 Service thread is not active, and lcore has been returned to EAL.
+ * @retval 1 Service thread is in the service core polling loop.
+ * @retval -EINVAL Invalid *lcore_id* provided.
+ */
+__rte_experimental
+int32_
[dpdk-dev] [PATCH v4 2/2] test/service: fix race condition on stopping lcore
This commit fixes a potential race condition in the tests
where the lcore running a service would increment a counter
that was already reset by the test-suite thread. The resulting
race-condition incremented value could cause CI failures, as
indicated by DPDK's CI.
This patch fixes the race-condition by making use of the
added rte_service_lcore_active() API, which indicates when
a service-core is no longer in the service-core polling loop.
The unit test makes use of the above function to detect when
all statistics increments are done in the service-core thread,
and then the unit test continues finalizing and checking state.
Fixes: f28f3594ded2 ("service: add attribute API")
Reported-by: David Marchand
Signed-off-by: Harry van Haaren
Reviewed-by: Phil Yang
Reviewed-by: Honnappa Nagarahalli
---
v4:
- Update test to new _may_be_ style API (Honnappa)
- Add reviewed by from ML
v3:
- Refactor while() to for() to simplify (Harry)
- Use SERVICE_DELAY instead of magic const 1 (Phil)
- Add Phil's reviewed by tag from ML
v2:
Thanks for discussion on v1, this v2 fixup for the CI
including previous feedback on ML.
---
app/test/test_service_cores.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
index ef1d8fcb9..8bc1d9913 100644
--- a/app/test/test_service_cores.c
+++ b/app/test/test_service_cores.c
@@ -362,6 +362,9 @@ service_lcore_attr_get(void)
"Service core add did not return zero");
TEST_ASSERT_EQUAL(0, rte_service_map_lcore_set(id, slcore_id, 1),
"Enabling valid service and core failed");
+ /* Ensure service is not active before starting */
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_may_be_active(slcore_id),
+ "Not-active service core reported as active");
TEST_ASSERT_EQUAL(0, rte_service_lcore_start(slcore_id),
"Starting service core failed");
@@ -382,7 +385,22 @@ service_lcore_attr_get(void)
lcore_attr_id, &lcore_attr_value),
"Invalid lcore attr didn't return -EINVAL");
- rte_service_lcore_stop(slcore_id);
+ /* Ensure service is active */
+ TEST_ASSERT_EQUAL(1, rte_service_lcore_may_be_active(slcore_id),
+ "Active service core reported as not-active");
+
+ TEST_ASSERT_EQUAL(0, rte_service_map_lcore_set(id, slcore_id, 0),
+ "Disabling valid service and core failed");
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_stop(slcore_id),
+ "Failed to stop service lcore");
+
+ /* Wait until service lcore not active, or for 100x SERVICE_DELAY */
+ for (int i = 0; rte_service_lcore_may_be_active(slcore_id) == 1 &&
+ i < 100; i++)
+ rte_delay_ms(SERVICE_DELAY);
+
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_may_be_active(slcore_id),
+ "Service lcore not stopped after waiting.");
TEST_ASSERT_EQUAL(0, rte_service_lcore_attr_reset_all(slcore_id),
"Valid lcore_attr_reset_all() didn't return success");
--
2.17.1
Re: [dpdk-dev] [PATCH v2] eal/linux: do not create user mem map repeatedly when it exists
On 23-Jul-20 3:48 PM, wangyunjian wrote:
From: Yunjian Wang
Currently, we will create new user mem map entry for the same memory
segment, but in fact it has already been added to the user mem maps.
It's not necessary to create it twice.
To resolve the issue, add support to remove the same entry in the
function compact_user_maps().
Fixes: 0cbce3a167f1 ("vfio: skip DMA map failure if already mapped")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
v2:
* Remove the same entry in the function compact_user_maps()
---
lib/librte_eal/linux/eal_vfio.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c
index abb12a354..df99307b7 100644
--- a/lib/librte_eal/linux/eal_vfio.c
+++ b/lib/librte_eal/linux/eal_vfio.c
@@ -167,6 +167,10 @@ adjust_map(struct user_mem_map *src, struct user_mem_map
*end,
static int
merge_map(struct user_mem_map *left, struct user_mem_map *right)
{
+ /* merge the same maps into one */
+ if (memcmp(left, right, sizeof(struct user_mem_map)) == 0)
+ goto out;
+
merge_map looks for adjacent maps only, but does not handle maps that
are wholly contained within one another ("the same map" also matches
this definition). wouldn't it be better to check for that instead of
*just* handling identical maps?
if (left->addr + left->len != right->addr)
return 0;
if (left->iova + left->len != right->iova)
@@ -174,6 +178,7 @@ merge_map(struct user_mem_map *left, struct user_mem_map
*right)
left->len += right->len;
+out:
memset(right, 0, sizeof(*right));
return 1;
--
Thanks,
Anatoly
Re: [dpdk-dev] [PATCH v8 02/10] drivers: fix indent of directory list
On Thu, Jul 23, 2020 at 10:10 PM Parav Pandit wrote:
>
> From: Thomas Monjalon
>
> Define each sub-directory on its own line ended with a comma,
> and use a simple indent.
>
> Signed-off-by: Thomas Monjalon
> ---
> drivers/meson.build | 24 +---
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/meson.build b/drivers/meson.build
> index e76ebddfa..e2aeba931 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -2,17 +2,19 @@
> # Copyright(c) 2017-2019 Intel Corporation
>
> # Defines the order in which the drivers are buit.
> -dpdk_driver_classes = ['common',
> - 'bus',
> - 'mempool', # depends on common and bus.
> - 'net', # depends on common, bus, mempool
> - 'raw', # depends on common, bus and net.
> - 'crypto', # depends on common, bus and mempool (net in
> future).
> - 'compress', # depends on common, bus, mempool.
> - 'regex', # depends on common, bus, regexdev.
> - 'vdpa',# depends on common, bus and mempool.
> - 'event', # depends on common, bus, mempool and net.
> - 'baseband'] # depends on common and bus.
> +dpdk_driver_classes = [
> + 'common',
> + 'bus',
> + 'mempool', # depends on common and bus.
> + 'net', # depends on common, bus, mempool
> + 'raw', # depends on common, bus and net.
> + 'crypto', # depends on common, bus and mempool (net in future).
> + 'compress', # depends on common, bus, mempool.
> + 'regex', # depends on common, bus, regexdev.
> + 'vdpa',# depends on common, bus and mempool.
> + 'event', # depends on common, bus, mempool and net.
> + 'baseband', # depends on common and bus.
> +]
>
> disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
> ).stdout().split()
> --
> 2.25.4
>
Reviewed-by: David Marchand
--
David Marchand
Re: [dpdk-dev] [PATCH v4] usertools/dpdk-setup.sh: fix dpdk-setup's behaviour on non-alphanumeric inputs
23/07/2020 19:00, Stephen Hemminger: > On Thu, 23 Jul 2020 17:13:17 +0500 > Sarosh Arif wrote: > > > Since this script has no maintainer who is responsible for providing ACK or > > NAK on the patches related to this script? > > > > On Tue, Jun 2, 2020 at 12:39 PM Sarosh Arif wrote: > > > > > Combine https://patches.dpdk.org/patch/67855/ with v2 of this patch to fix > > > the overall behaviour of dpdk-setup.sh on non-alphanumeric inputs. > > > Instead of crashing the script will prompt the user to re-enter the input > > > in case of non-alphanumeric input. > > > > > > Bugzilla ID: 419 > > > Signed-off-by: Sarosh Arif > > > Signed-off-by: Muhammad Bilal > > If no maintainer is defined for a subtree, it should be responsiblity > of the core maintainers to handle it. > > > PS: dpdk-setup has out grown its welcome, and a better version with > a real UI is needed. I don't like this script. It works only for few cases. I would like to remove it.
Re: [dpdk-dev] [PATCH v8 03/10] drivers: relax dependency order
On Thu, Jul 23, 2020 at 10:10 PM Parav Pandit wrote:
>
> From: Thomas Monjalon
>
> Drivers dependencies are evaluated in the order defined per
> their parent directory (also called class).
> This strict ordering prevent from having 2 different drivers
> of the same class with different dependencies ordering.
> This problem occurs if drivers/common/mlx5 depends on drivers/bus/pci,
> while drivers/bus/dpaa depends on drivers/common/dpaax.
> Having a strict ordering between directories bus and common
> is too much restrictive.
>
> That's why it is made possible to have a more fine-grain directory list,
> adding a driver sub-directory in the list.
> In this case, the isolated driver must be removed from its class list,
> and added directly in drivers/meson.build.
> Also, the per-class variables must be duplicated in the isolated driver,
> because the call "subdir(class)" is skipped in the isolated driver case.
>
> Signed-off-by: Thomas Monjalon
> ---
> drivers/meson.build | 28 +---
> 1 file changed, 21 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/meson.build b/drivers/meson.build
> index e2aeba931..e6d0409aa 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -1,8 +1,8 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2017-2019 Intel Corporation
>
> -# Defines the order in which the drivers are buit.
> -dpdk_driver_classes = [
> +# Defines the order of dependencies evaluation
> +subdirs = [
> 'common',
> 'bus',
> 'mempool', # depends on common and bus.
> @@ -27,7 +27,7 @@ if cc.has_argument('-Wno-format-truncation')
> default_cflags += '-Wno-format-truncation'
> endif
>
> -foreach class:dpdk_driver_classes
> +foreach subpath:subdirs
> drivers = []
> std_deps = []
> config_flag_fmt = '' # format string used to set the value in
> dpdk_conf
> @@ -35,8 +35,22 @@ foreach class:dpdk_driver_classes
> # the library, the dependency and to find the
> # version file for linking
>
> - subdir(class)
> - class_drivers = []
> + # subpath can be either "class" or "class/driver"
> + if subpath.contains('/')
> + driver_path = subpath.split('/')
> + class = driver_path[0]
> + drivers += driver_path[1]
> + else
> + class = subpath
> + subdir(class)
> + endif
> +
> + # save class name on first occurence
> + if not dpdk_driver_classes.contains(class)
> + dpdk_driver_classes += class
> + endif
> + # get already enabled drivers of the same class
> + enabled_drivers = get_variable(class + '_drivers', [])
>
> foreach drv:drivers
> drv_path = join_paths(class, drv)
> @@ -96,7 +110,7 @@ foreach class:dpdk_driver_classes
> '_disable_reason', reason)
> endif
> else
> - class_drivers += name
> + enabled_drivers += name
>
> if fmt_name == ''
> fmt_name = name
> @@ -203,5 +217,5 @@ foreach class:dpdk_driver_classes
> endif # build
> endforeach
>
> - set_variable(class + '_drivers', class_drivers)
> + set_variable(class + '_drivers', enabled_drivers)
> endforeach
> --
> 2.25.4
>
Reviewed-by: David Marchand
--
David Marchand
[dpdk-dev] [PATCH] net/af_xdp: don't free the mempool on umem destruction
Other PMDs may be using the mempool, so don't free it when destroying the
UMEM.
Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")
Cc: sta...@dpdk.org
Signed-off-by: Ciara Loftus
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index d62144fa8d..936d4a7d5f 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -688,7 +688,6 @@ static void
xdp_umem_destroy(struct xsk_umem_info *umem)
{
#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
- rte_mempool_free(umem->mb_pool);
umem->mb_pool = NULL;
#else
rte_memzone_free(umem->mz);
--
2.17.1
[dpdk-dev] [PATCH v5 1/2] service: add API to retrieve service core active
This commit adds a new experimental API which allows the user
to retrieve the active state of an lcore. Knowing when the service
lcore is completed its polling loop can be useful to applications
to avoid race conditions when e.g. finalizing statistics.
The service thread itself now has a variable to indicate if its
thread is active. When zero the service thread has completed its
service, and has returned from the service_runner_func() function.
Suggested-by: Lukasz Wojciechowski
Signed-off-by: Harry van Haaren
Reviewed-by: Phil Yang
Reviewed-by: Honnappa Nagarahalli
---
v5:
- Fix typos (robot)
v4:
- Use _may_be_ style API for lcore_active (Honnappa)
- Fix missing tab indent (Honnappa)
- Add 'lcore' to doxygen retval description (Honnappa)
@Honnappa: Please note i did not update the doxygen title of the
lcore_may_be_active() function, as the current description is more
accurate than making it more consistent with other functions.
v3:
- Change service lcore stores to SEQ_CST (Honnappa, David)
- Change control thread load to ACQ (Honnappa, David)
- Comment reasons for SEQ_CST/ACQ (Honnappa, David)
- Add comments to Doxygen for _stop() and _lcore_active() (Honnappa, David)
- Add Phil's review tag from ML
---
lib/librte_eal/common/rte_service.c | 21 +
lib/librte_eal/include/rte_service.h | 22 +-
lib/librte_eal/rte_eal_version.map | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/rte_service.c
b/lib/librte_eal/common/rte_service.c
index 6a0e0ff65..98565bbef 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -65,6 +65,7 @@ struct core_state {
/* map of services IDs are run on this core */
uint64_t service_mask;
uint8_t runstate; /* running or stopped */
+ uint8_t thread_active; /* indicates when thread is in service_run() */
uint8_t is_service_core; /* set if core is currently a service core */
uint8_t service_active_on_lcore[RTE_SERVICE_NUM_MAX];
uint64_t loops;
@@ -457,6 +458,8 @@ service_runner_func(void *arg)
const int lcore = rte_lcore_id();
struct core_state *cs = &lcore_states[lcore];
+ __atomic_store_n(&cs->thread_active, 1, __ATOMIC_SEQ_CST);
+
/* runstate act as the guard variable. Use load-acquire
* memory order here to synchronize with store-release
* in runstate update functions.
@@ -475,9 +478,27 @@ service_runner_func(void *arg)
cs->loops++;
}
+ /* Use SEQ CST memory ordering to avoid any re-ordering around
+* this store, ensuring that once this store is visible, the service
+* lcore thread really is done in service cores code.
+*/
+ __atomic_store_n(&cs->thread_active, 0, __ATOMIC_SEQ_CST);
return 0;
}
+int32_t
+rte_service_lcore_may_be_active(uint32_t lcore)
+{
+ if (lcore >= RTE_MAX_LCORE || !lcore_states[lcore].is_service_core)
+ return -EINVAL;
+
+ /* Load thread_active using ACQUIRE to avoid instructions dependent on
+* the result being re-ordered before this load completes.
+*/
+ return __atomic_load_n(&lcore_states[lcore].thread_active,
+ __ATOMIC_ACQUIRE);
+}
+
int32_t
rte_service_lcore_count(void)
{
diff --git a/lib/librte_eal/include/rte_service.h
b/lib/librte_eal/include/rte_service.h
index e2d0a6dd3..ca9950d09 100644
--- a/lib/librte_eal/include/rte_service.h
+++ b/lib/librte_eal/include/rte_service.h
@@ -249,7 +249,11 @@ int32_t rte_service_lcore_start(uint32_t lcore_id);
* Stop a service core.
*
* Stopping a core makes the core become idle, but remains assigned as a
- * service core.
+ * service core. Note that the service lcore thread may not have returned from
+ * the service it is running when this API returns.
+ *
+ * The *rte_service_lcore_may_be_active* API can be used to check if the
+ * service lcore is * still active.
*
* @retval 0 Success
* @retval -EINVAL Invalid *lcore_id* provided
@@ -261,6 +265,22 @@ int32_t rte_service_lcore_start(uint32_t lcore_id);
*/
int32_t rte_service_lcore_stop(uint32_t lcore_id);
+/**
+ * Reports if a service lcore is currently running.
+ *
+ * This function returns if the core has finished service cores code, and has
+ * returned to EAL control. If *rte_service_lcore_stop* has been called but
+ * the lcore has not returned to EAL yet, it might be required to wait and call
+ * this function again. The amount of time to wait before the core returns
+ * depends on the duration of the services being run.
+ *
+ * @retval 0 Service thread is not active, and lcore has been returned to EAL.
+ * @retval 1 Service thread is in the service core polling loop.
+ * @retval -EINVAL Invalid *lcore_id* provided.
+ */
+__rte_experimental
+int32_t rte_service_lcore_may_be_active(uint32_t lcore_id);
+
/**
* Adds lcore to the list of service cores.
[dpdk-dev] [PATCH v5 2/2] test/service: fix race condition on stopping lcore
This commit fixes a potential race condition in the tests
where the lcore running a service would increment a counter
that was already reset by the test-suite thread. The resulting
race-condition incremented value could cause CI failures, as
indicated by DPDK's CI.
This patch fixes the race-condition by making use of the
added rte_service_lcore_active() API, which indicates when
a service-core is no longer in the service-core polling loop.
The unit test makes use of the above function to detect when
all statistics increments are done in the service-core thread,
and then the unit test continues finalizing and checking state.
Fixes: f28f3594ded2 ("service: add attribute API")
Reported-by: David Marchand
Signed-off-by: Harry van Haaren
Reviewed-by: Phil Yang
Reviewed-by: Honnappa Nagarahalli
---
v4:
- Update test to new _may_be_ style API (Honnappa)
- Add reviewed by from ML
v3:
- Refactor while() to for() to simplify (Harry)
- Use SERVICE_DELAY instead of magic const 1 (Phil)
- Add Phil's reviewed by tag from ML
v2:
Thanks for discussion on v1, this v2 fixup for the CI
including previous feedback on ML.
---
app/test/test_service_cores.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
index ef1d8fcb9..8bc1d9913 100644
--- a/app/test/test_service_cores.c
+++ b/app/test/test_service_cores.c
@@ -362,6 +362,9 @@ service_lcore_attr_get(void)
"Service core add did not return zero");
TEST_ASSERT_EQUAL(0, rte_service_map_lcore_set(id, slcore_id, 1),
"Enabling valid service and core failed");
+ /* Ensure service is not active before starting */
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_may_be_active(slcore_id),
+ "Not-active service core reported as active");
TEST_ASSERT_EQUAL(0, rte_service_lcore_start(slcore_id),
"Starting service core failed");
@@ -382,7 +385,22 @@ service_lcore_attr_get(void)
lcore_attr_id, &lcore_attr_value),
"Invalid lcore attr didn't return -EINVAL");
- rte_service_lcore_stop(slcore_id);
+ /* Ensure service is active */
+ TEST_ASSERT_EQUAL(1, rte_service_lcore_may_be_active(slcore_id),
+ "Active service core reported as not-active");
+
+ TEST_ASSERT_EQUAL(0, rte_service_map_lcore_set(id, slcore_id, 0),
+ "Disabling valid service and core failed");
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_stop(slcore_id),
+ "Failed to stop service lcore");
+
+ /* Wait until service lcore not active, or for 100x SERVICE_DELAY */
+ for (int i = 0; rte_service_lcore_may_be_active(slcore_id) == 1 &&
+ i < 100; i++)
+ rte_delay_ms(SERVICE_DELAY);
+
+ TEST_ASSERT_EQUAL(0, rte_service_lcore_may_be_active(slcore_id),
+ "Service lcore not stopped after waiting.");
TEST_ASSERT_EQUAL(0, rte_service_lcore_attr_reset_all(slcore_id),
"Valid lcore_attr_reset_all() didn't return success");
--
2.17.1
Re: [dpdk-dev] [PATCH v8 06/10] common/mlx5: avoid using class constructor priority
On Thu, Jul 23, 2020 at 10:10 PM Parav Pandit wrote:
>
> mlx5_common is shared library between mlx5 net, VDPA and regex PMD.
> It is better to use common initialization helper instead of using
> RTE_INIT_CLASS priority.
RTE_INIT_CLASS does not exist, I suppose you meant RTE_PRIORITY_CLASS.
Suggested-by: David Marchand
> Signed-off-by: Parav Pandit
> ---
> drivers/common/mlx5/mlx5_common.c | 13 +++--
> drivers/common/mlx5/mlx5_common.h | 3 +++
> drivers/common/mlx5/rte_common_mlx5_version.map | 1 +
> drivers/net/mlx5/mlx5.c | 1 +
> drivers/regex/mlx5/mlx5_regex.c | 1 +
> drivers/vdpa/mlx5/mlx5_vdpa.c | 1 +
> 6 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/common/mlx5/mlx5_common.c
> b/drivers/common/mlx5/mlx5_common.c
> index 1a67a1b16..2b336bb2d 100644
> --- a/drivers/common/mlx5/mlx5_common.c
> +++ b/drivers/common/mlx5/mlx5_common.c
> @@ -86,12 +86,21 @@ RTE_INIT_PRIO(mlx5_log_init, LOG)
> rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE);
> }
>
> +static bool mlx5_common_initialized;
> +
> /**
> - * Initialization routine for run-time dependency on glue library.
> + * One time innitialization routine for run-time dependency on glue library
> + * for multiple PMDs. Each mlx5 PMD that depends on mlx5_common module,
> + * must invoke in its constructor.
> */
> -RTE_INIT_PRIO(mlx5_glue_init, CLASS)
> +void
> +mlx5_common_init(void)
> {
> + if (mlx5_common_initialized)
> + return;
> +
> mlx5_glue_constructor();
> + mlx5_common_initialized = true;
> }
>
> /**
> diff --git a/drivers/common/mlx5/mlx5_common.h
> b/drivers/common/mlx5/mlx5_common.h
> index a811eb6c9..ebe4e9ced 100644
> --- a/drivers/common/mlx5/mlx5_common.h
> +++ b/drivers/common/mlx5/mlx5_common.h
> @@ -260,4 +260,7 @@ int32_t mlx5_release_dbr(struct mlx5_dbr_page_list *head,
> uint32_t umem_id,
> uint64_t offset);
> extern uint8_t haswell_broadwell_cpu;
>
> +__rte_internal
> +void mlx5_common_init(void);
> +
> #endif /* RTE_PMD_MLX5_COMMON_H_ */
> diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map
> b/drivers/common/mlx5/rte_common_mlx5_version.map
> index 132a0695f..65f25252a 100644
> --- a/drivers/common/mlx5/rte_common_mlx5_version.map
> +++ b/drivers/common/mlx5/rte_common_mlx5_version.map
> @@ -3,6 +3,7 @@ INTERNAL {
>
> mlx5_class_get;
>
> + mlx5_common_init;
> mlx5_common_verbs_reg_mr;
> mlx5_common_verbs_dereg_mr;
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 647ada339..037703d2e 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -2111,6 +2111,7 @@ RTE_LOG_REGISTER(mlx5_logtype, pmd.net.mlx5, NOTICE)
> */
> RTE_INIT(rte_mlx5_pmd_init)
> {
> + mlx5_common_init();
> /* Build the static tables for Verbs conversion. */
> mlx5_set_ptype_table();
> mlx5_set_cksum_table();
> diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
> index 36ae9f809..4e0367052 100644
> --- a/drivers/regex/mlx5/mlx5_regex.c
> +++ b/drivers/regex/mlx5/mlx5_regex.c
> @@ -258,6 +258,7 @@ static struct rte_pci_driver mlx5_regex_driver = {
>
> RTE_INIT(rte_mlx5_regex_init)
> {
> + mlx5_common_init();
> if (mlx5_glue)
> rte_pci_register(&mlx5_regex_driver);
> }
> diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
> index 67e77b11a..85dbcf956 100644
> --- a/drivers/vdpa/mlx5/mlx5_vdpa.c
> +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
> @@ -846,6 +846,7 @@ RTE_LOG_REGISTER(mlx5_vdpa_logtype, pmd.vdpa.mlx5, NOTICE)
> */
> RTE_INIT(rte_mlx5_vdpa_init)
> {
> + mlx5_common_init();
> if (mlx5_glue)
> rte_pci_register(&mlx5_vdpa_driver);
> }
> --
> 2.25.4
>
Reviewed-by: David Marchand
--
David Marchand
Re: [dpdk-dev] [PATCH v8 06/10] common/mlx5: avoid using class constructor priority
> From: David Marchand
> Sent: Friday, July 24, 2020 7:15 PM
> To: Parav Pandit
> Cc: dev ; Gaetan Rivet ; Yigit, Ferruh
> ; Thomas Monjalon ;
> Raslan Darawsheh ; Ori Kam
> ; Matan Azrad ; Joyce Kong
>
> Subject: Re: [dpdk-dev] [PATCH v8 06/10] common/mlx5: avoid using class
> constructor priority
>
> On Thu, Jul 23, 2020 at 10:10 PM Parav Pandit wrote:
> >
> > mlx5_common is shared library between mlx5 net, VDPA and regex PMD.
> > It is better to use common initialization helper instead of using
> > RTE_INIT_CLASS priority.
>
> RTE_INIT_CLASS does not exist, I suppose you meant RTE_PRIORITY_CLASS.
>
You are right.
Correcting it and adding below tags.
> Suggested-by: David Marchand
>
> > Signed-off-by: Parav Pandit
> > ---
> > drivers/common/mlx5/mlx5_common.c | 13 +++--
> > drivers/common/mlx5/mlx5_common.h | 3 +++
> > drivers/common/mlx5/rte_common_mlx5_version.map | 1 +
> > drivers/net/mlx5/mlx5.c | 1 +
> > drivers/regex/mlx5/mlx5_regex.c | 1 +
> > drivers/vdpa/mlx5/mlx5_vdpa.c | 1 +
> > 6 files changed, 18 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/common/mlx5/mlx5_common.c
> > b/drivers/common/mlx5/mlx5_common.c
> > index 1a67a1b16..2b336bb2d 100644
> > --- a/drivers/common/mlx5/mlx5_common.c
> > +++ b/drivers/common/mlx5/mlx5_common.c
> > @@ -86,12 +86,21 @@ RTE_INIT_PRIO(mlx5_log_init, LOG)
> > rte_log_set_level(mlx5_common_logtype,
> > RTE_LOG_NOTICE); }
> >
> > +static bool mlx5_common_initialized;
> > +
> > /**
> > - * Initialization routine for run-time dependency on glue library.
> > + * One time innitialization routine for run-time dependency on glue
> > + library
> > + * for multiple PMDs. Each mlx5 PMD that depends on mlx5_common
> > + module,
> > + * must invoke in its constructor.
> > */
> > -RTE_INIT_PRIO(mlx5_glue_init, CLASS)
> > +void
> > +mlx5_common_init(void)
> > {
> > + if (mlx5_common_initialized)
> > + return;
> > +
> > mlx5_glue_constructor();
> > + mlx5_common_initialized = true;
> > }
> >
> > /**
> > diff --git a/drivers/common/mlx5/mlx5_common.h
> > b/drivers/common/mlx5/mlx5_common.h
> > index a811eb6c9..ebe4e9ced 100644
> > --- a/drivers/common/mlx5/mlx5_common.h
> > +++ b/drivers/common/mlx5/mlx5_common.h
> > @@ -260,4 +260,7 @@ int32_t mlx5_release_dbr(struct
> mlx5_dbr_page_list *head, uint32_t umem_id,
> > uint64_t offset); extern uint8_t
> > haswell_broadwell_cpu;
> >
> > +__rte_internal
> > +void mlx5_common_init(void);
> > +
> > #endif /* RTE_PMD_MLX5_COMMON_H_ */
> > diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map
> > b/drivers/common/mlx5/rte_common_mlx5_version.map
> > index 132a0695f..65f25252a 100644
> > --- a/drivers/common/mlx5/rte_common_mlx5_version.map
> > +++ b/drivers/common/mlx5/rte_common_mlx5_version.map
> > @@ -3,6 +3,7 @@ INTERNAL {
> >
> > mlx5_class_get;
> >
> > + mlx5_common_init;
> > mlx5_common_verbs_reg_mr;
> > mlx5_common_verbs_dereg_mr;
> >
> > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> > 647ada339..037703d2e 100644
> > --- a/drivers/net/mlx5/mlx5.c
> > +++ b/drivers/net/mlx5/mlx5.c
> > @@ -2111,6 +2111,7 @@ RTE_LOG_REGISTER(mlx5_logtype,
> pmd.net.mlx5, NOTICE)
> > */
> > RTE_INIT(rte_mlx5_pmd_init)
> > {
> > + mlx5_common_init();
> > /* Build the static tables for Verbs conversion. */
> > mlx5_set_ptype_table();
> > mlx5_set_cksum_table();
> > diff --git a/drivers/regex/mlx5/mlx5_regex.c
> > b/drivers/regex/mlx5/mlx5_regex.c index 36ae9f809..4e0367052 100644
> > --- a/drivers/regex/mlx5/mlx5_regex.c
> > +++ b/drivers/regex/mlx5/mlx5_regex.c
> > @@ -258,6 +258,7 @@ static struct rte_pci_driver mlx5_regex_driver = {
> >
> > RTE_INIT(rte_mlx5_regex_init)
> > {
> > + mlx5_common_init();
> > if (mlx5_glue)
> > rte_pci_register(&mlx5_regex_driver);
> > }
> > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c
> > b/drivers/vdpa/mlx5/mlx5_vdpa.c index 67e77b11a..85dbcf956 100644
> > --- a/drivers/vdpa/mlx5/mlx5_vdpa.c
> > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
> > @@ -846,6 +846,7 @@ RTE_LOG_REGISTER(mlx5_vdpa_logtype,
> pmd.vdpa.mlx5, NOTICE)
> > */
> > RTE_INIT(rte_mlx5_vdpa_init)
> > {
> > + mlx5_common_init();
> > if (mlx5_glue)
> > rte_pci_register(&mlx5_vdpa_driver);
> > }
> > --
> > 2.25.4
> >
>
> Reviewed-by: David Marchand
>
>
> --
> David Marchand
Re: [dpdk-dev] [PATCH v8 03/10] drivers: relax dependency order
Hi Bruce, > From: Bruce Richardson > Sent: Friday, July 24, 2020 4:37 PM > > On Thu, Jul 23, 2020 at 11:09:03PM +0300, Parav Pandit wrote: > > From: Thomas Monjalon > > > > Drivers dependencies are evaluated in the order defined per their > > parent directory (also called class). > > This strict ordering prevent from having 2 different drivers of the > > same class with different dependencies ordering. > > This problem occurs if drivers/common/mlx5 depends on drivers/bus/pci, > > while drivers/bus/dpaa depends on drivers/common/dpaax. > > Having a strict ordering between directories bus and common is too > > much restrictive. > > > > That's why it is made possible to have a more fine-grain directory > > list, adding a driver sub-directory in the list. > > In this case, the isolated driver must be removed from its class list, > > and added directly in drivers/meson.build. > > Also, the per-class variables must be duplicated in the isolated > > driver, because the call "subdir(class)" is skipped in the isolated driver > > case. > > > > Signed-off-by: Thomas Monjalon > > The commit log above has some strange word-wrapping, and occasionally > strange phrasing. I think it could be slightly reworded, perhaps as: > I updated the commit log as you suggested below along with RB, ack tag. Thank you. > Drivers dependencies are evaluated in the order defined per their parent > directory (also called class). This strict ordering prevents from us > from having pairs of drivers from two classes with different dependency > ordering. For example, if the mlx5 common code depends on the pci bus > driver, while the dpaax common code is itself a dependency of the dpaa > bus driver. Having a strict ordering between directories bus and common > is too restrictive, as processing either common drivers or bus drivers > first leads us to missing dependencies in this scenario. > > This patch makes it possible to have a more fine-grain directory list, > adding a specific driver sub-directory in the top-level drivers > subdirectory list. In this case, the isolated driver must also be removed > from its class list, and the per-class variables must be duplicated in > the isolated driver, because the call "subdir(class)" is skipped in the > isolated driver case. > > > Apart from that, I think this is a good idea to give us some flexibility in > managing driver ordering which should help other drivers too - perhaps QAT? > Ideally, though, I'd like if we can limit the flexible ordering to *only* > common > code, in which case we could move the per-class variables for common to the > top-level to prevent duplication, and maybe even get rid of > common/meson.build completely. That, however, will depend on how much > this feature gets used and by whom. > > Therefore: > Review-by: Bruce Richardson > Acked-by: Bruce Richardson
[dpdk-dev] [PATCH v2] vhost: fix async copy fail on multi-page buffers
From: Patrick Fu
Async copy fails when single ring buffer vector is splited on multiple
physical pages. This happens because current hpa address translation
function doesn't handle multi-page buffers. A new gpa to hpa address
conversion function, which returns the hpa on the first hitting host
pages, is implemented in this patch. Async data path recursively calls
this new function to construct a multi-segments async copy descriptor
for ring buffers crossing physical page boundaries.
Signed-off-by: Patrick Fu
---
v2:
- change commit message and title
- v1 patch used CPU to copy multi-page buffers; v2 patch split the
copy into multiple async copy segments whenever possible
lib/librte_vhost/vhost.h | 50 +++
lib/librte_vhost/virtio_net.c | 40 +---
2 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 0f7212f88..05c202a57 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -616,6 +616,56 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t
size)
return 0;
}
+static __rte_always_inline rte_iova_t
+gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,
+ uint64_t gpa_size, uint64_t *hpa_size)
+{
+ uint32_t i;
+ struct guest_page *page;
+ struct guest_page key;
+
+ *hpa_size = gpa_size;
+ if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) {
+ key.guest_phys_addr = gpa & ~(dev->guest_pages[0].size - 1);
+ page = bsearch(&key, dev->guest_pages, dev->nr_guest_pages,
+ sizeof(struct guest_page), guest_page_addrcmp);
+ if (page) {
+ if (gpa + gpa_size <=
+ page->guest_phys_addr + page->size) {
+ return gpa - page->guest_phys_addr +
+ page->host_phys_addr;
+ } else if (gpa < page->guest_phys_addr +
+ page->size) {
+ *hpa_size = page->guest_phys_addr +
+ page->size - gpa;
+ return gpa - page->guest_phys_addr +
+ page->host_phys_addr;
+ }
+ }
+ } else {
+ for (i = 0; i < dev->nr_guest_pages; i++) {
+ page = &dev->guest_pages[i];
+
+ if (gpa >= page->guest_phys_addr) {
+ if (gpa + gpa_size <
+ page->guest_phys_addr + page->size) {
+ return gpa - page->guest_phys_addr +
+ page->host_phys_addr;
+ } else if (gpa < page->guest_phys_addr +
+ page->size) {
+ *hpa_size = page->guest_phys_addr +
+ page->size - gpa;
+ return gpa - page->guest_phys_addr +
+ page->host_phys_addr;
+ }
+ }
+ }
+ }
+
+ *hpa_size = 0;
+ return 0;
+}
+
static __rte_always_inline uint64_t
hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len)
{
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 95a0bc19f..124a33a10 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -980,6 +980,7 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue *vq,
struct batch_copy_elem *batch_copy = vq->batch_copy_elems;
struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr = NULL;
int error = 0;
+ uint64_t mapped_len;
uint32_t tlen = 0;
int tvec_idx = 0;
@@ -1072,24 +1073,31 @@ async_mbuf_to_desc(struct virtio_net *dev, struct
vhost_virtqueue *vq,
cpy_len = RTE_MIN(buf_avail, mbuf_avail);
- if (unlikely(cpy_len >= cpy_threshold)) {
- hpa = (void *)(uintptr_t)gpa_to_hpa(dev,
- buf_iova + buf_offset, cpy_len);
+ while (unlikely(cpy_len && cpy_len >= cpy_threshold)) {
+ hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev,
+ buf_iova + buf_offset,
+ cpy_len, &mapped_len);
- if (unlikely(!hpa)) {
- error = -1;
- goto out;
- }
+ if (unlikely(!hpa || mapped_len < cpy_threshold))
+ break;
async_fill
Re: [dpdk-dev] [PATCH v8 03/10] drivers: relax dependency order
24/07/2020 15:48, Parav Pandit: > Hi Bruce, > > > From: Bruce Richardson > > Sent: Friday, July 24, 2020 4:37 PM > > > > On Thu, Jul 23, 2020 at 11:09:03PM +0300, Parav Pandit wrote: > > > From: Thomas Monjalon > > > > > > Drivers dependencies are evaluated in the order defined per their > > > parent directory (also called class). > > > This strict ordering prevent from having 2 different drivers of the > > > same class with different dependencies ordering. > > > This problem occurs if drivers/common/mlx5 depends on drivers/bus/pci, > > > while drivers/bus/dpaa depends on drivers/common/dpaax. > > > Having a strict ordering between directories bus and common is too > > > much restrictive. > > > > > > That's why it is made possible to have a more fine-grain directory > > > list, adding a driver sub-directory in the list. > > > In this case, the isolated driver must be removed from its class list, > > > and added directly in drivers/meson.build. > > > Also, the per-class variables must be duplicated in the isolated > > > driver, because the call "subdir(class)" is skipped in the isolated > > > driver case. > > > > > > Signed-off-by: Thomas Monjalon > > > > The commit log above has some strange word-wrapping, and occasionally > > strange phrasing. I think it could be slightly reworded, perhaps as: > > > I updated the commit log as you suggested below along with RB, ack tag. > Thank you. > > > Drivers dependencies are evaluated in the order defined per their parent > > directory (also called class). This strict ordering prevents from us Is "from us" too much? > > from having pairs of drivers from two classes with different dependency > > ordering. For example, if the mlx5 common code depends on the pci bus > > driver, while the dpaax common code is itself a dependency of the dpaa > > bus driver. Having a strict ordering between directories bus and common > > is too restrictive, as processing either common drivers or bus drivers > > first leads us to missing dependencies in this scenario. > > > > This patch makes it possible to have a more fine-grain directory list, > > adding a specific driver sub-directory in the top-level drivers > > subdirectory list. In this case, the isolated driver must also be removed > > from its class list, and the per-class variables must be duplicated in > > the isolated driver, because the call "subdir(class)" is skipped in the > > isolated driver case. > > > > > > Apart from that, I think this is a good idea to give us some flexibility in > > managing driver ordering which should help other drivers too - perhaps QAT? > > Ideally, though, I'd like if we can limit the flexible ordering to *only* > > common > > code, in which case we could move the per-class variables for common to the > > top-level to prevent duplication, and maybe even get rid of > > common/meson.build completely. That, however, will depend on how much > > this feature gets used and by whom. For now it is used only to have common/mlx5 isolated of the rest of common drivers, as an exception. I think it is good to keep common/meson.build until there are more exceptions than the rest.
Re: [dpdk-dev] [PATCH v4] usertools/dpdk-setup.sh: fix dpdk-setup's behaviour on non-alphanumeric inputs
On Fri, Jul 24, 2020 at 7:00 PM Thomas Monjalon wrote: > > 23/07/2020 19:00, Stephen Hemminger: > > On Thu, 23 Jul 2020 17:13:17 +0500 > > Sarosh Arif wrote: > > > > > Since this script has no maintainer who is responsible for providing ACK > > > or > > > NAK on the patches related to this script? > > > > > > On Tue, Jun 2, 2020 at 12:39 PM Sarosh Arif > > > wrote: > > > > > > > Combine https://patches.dpdk.org/patch/67855/ with v2 of this patch to > > > > fix > > > > the overall behaviour of dpdk-setup.sh on non-alphanumeric inputs. > > > > Instead of crashing the script will prompt the user to re-enter the > > > > input > > > > in case of non-alphanumeric input. > > > > > > > > Bugzilla ID: 419 > > > > Signed-off-by: Sarosh Arif > > > > Signed-off-by: Muhammad Bilal > > > > If no maintainer is defined for a subtree, it should be responsiblity > > of the core maintainers to handle it. > > > > > > PS: dpdk-setup has out grown its welcome, and a better version with > > a real UI is needed. > > I don't like this script. > It works only for few cases. > I would like to remove it. +1 > >
Re: [dpdk-dev] [PATCH] net/ice: fix GTPU down/uplink and extension conflict
Hi, Guojia
> -Original Message-
> From: Guo, Jia
> Sent: Friday, July 24, 2020 3:13 PM
> To: Su, Simei ; Zhang, Qi Z ; Xing,
> Beilei
> Cc: dev@dpdk.org
> Subject: Re: [PATCH] net/ice: fix GTPU down/uplink and extension conflict
>
> hi, simei
>
> On 7/24/2020 10:10 AM, Simei Su wrote:
> > When adding a RSS rule with GTPU_DWN/UP, it will search profile table
> > from the top index. If a RSS rule with GTPU_EH already exists, then
> > GTPU_DWN/UP packet will match GTPU_EH profile. This patch solves this
> > issue by removing existed GTPU_EH rule before creating a new
> > GTPU_DWN/UP rule.
>
>
> Suggest interpret the relation ship bettween GTPU_EH_UPLINK/DWNLINK with
> GTPU_EH to help knowledge the reason.
Ok, I will refine the commit message.
>
>
> > Fixes: 2e2810fc1868 ("net/ice: fix GTPU RSS")
> >
> > Signed-off-by: Simei Su
> > ---
> > drivers/net/ice/ice_ethdev.c | 47 +++
> > drivers/net/ice/ice_ethdev.h | 15 +
> > drivers/net/ice/ice_hash.c | 139
> +++
> > 3 files changed, 201 insertions(+)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> > index a4a0390..8839146 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -2538,6 +2538,11 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4 rss flow fail %d",
> > __func__, ret);
>
>
> A blank line need.
Ok.
>
>
> > + /* Store hash field and header for gtpu_eh ipv4 */
> > + pf->gtpu_eh.ipv4.hash_fld = ICE_FLOW_HASH_IPV4;
> > + pf->gtpu_eh.ipv4.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
> > + ICE_FLOW_SEG_HDR_IPV4 |
> > + ICE_FLOW_SEG_HDR_IPV_OTHER;
> >
> > ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4,
> > ICE_FLOW_SEG_HDR_PPPOE |
> > @@ -2564,6 +2569,11 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6 rss flow fail %d",
> > __func__, ret);
> > + /* Store hash field and header for gtpu_eh ipv6 */
> > + pf->gtpu_eh.ipv6.hash_fld = ICE_FLOW_HASH_IPV6;
> > + pf->gtpu_eh.ipv6.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
> > + ICE_FLOW_SEG_HDR_IPV6 |
> > + ICE_FLOW_SEG_HDR_IPV_OTHER;
> >
> > ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV6,
> > ICE_FLOW_SEG_HDR_PPPOE |
> > @@ -2586,6 +2596,9 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_UDP rss flow fail %d",
> > __func__, ret);
> > + /* Store hash field and header for gtpu_eh ipv4_udp */
> > + pf->gtpu_eh.ipv4_udp.hash_fld = ICE_HASH_UDP_IPV4;
> > + pf->gtpu_eh.ipv4_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
> >
> > ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV4,
> > ICE_FLOW_SEG_HDR_PPPOE, 0);
> > @@ -2606,6 +2619,9 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_UDP rss flow fail %d",
> > __func__, ret);
> > + /* Store hash field and header for gtpu_eh ipv6_udp */
> > + pf->gtpu_eh.ipv6_udp.hash_fld = ICE_HASH_UDP_IPV6;
> > + pf->gtpu_eh.ipv6_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
> >
> > ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV6,
> > ICE_FLOW_SEG_HDR_PPPOE, 0);
> > @@ -2626,6 +2642,9 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_TCP rss flow fail %d",
> > __func__, ret);
> > + /* Store hash field and header for gtpu_eh ipv4_tcp */
> > + pf->gtpu_eh.ipv4_tcp.hash_fld = ICE_HASH_TCP_IPV4;
> > + pf->gtpu_eh.ipv4_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
> >
> > ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV4,
> > ICE_FLOW_SEG_HDR_PPPOE, 0);
> > @@ -2646,6 +2665,9 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
> > if (ret)
> > PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_TCP rss flow fail %d",
> > __func__, ret);
> > + /* Store hash field and header for gtpu_eh ipv6_tcp */
> > + pf->gtpu_eh.ipv6_tcp.hash_fld = ICE_HASH_TCP_IPV6;
> > + pf->gtpu_eh.ipv6_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
> >
> > ret = ice_add_rss_cfg(
[dpdk-dev] [PATCH v9 02/10] drivers: fix indent of directory list
From: Thomas Monjalon
Define each sub-directory on its own line ended with a comma,
and use a simple indent.
Acked-by: Bruce Richardson
Reviewed-by: David Marchand
Signed-off-by: Thomas Monjalon
---
Changelog:
v7->8:
- new patch
---
drivers/meson.build | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index e76ebddfa..e2aeba931 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -2,17 +2,19 @@
# Copyright(c) 2017-2019 Intel Corporation
# Defines the order in which the drivers are buit.
-dpdk_driver_classes = ['common',
- 'bus',
- 'mempool', # depends on common and bus.
- 'net', # depends on common, bus, mempool
- 'raw', # depends on common, bus and net.
- 'crypto', # depends on common, bus and mempool (net in future).
- 'compress', # depends on common, bus, mempool.
- 'regex', # depends on common, bus, regexdev.
- 'vdpa',# depends on common, bus and mempool.
- 'event', # depends on common, bus, mempool and net.
- 'baseband'] # depends on common and bus.
+dpdk_driver_classes = [
+ 'common',
+ 'bus',
+ 'mempool', # depends on common and bus.
+ 'net', # depends on common, bus, mempool
+ 'raw', # depends on common, bus and net.
+ 'crypto', # depends on common, bus and mempool (net in future).
+ 'compress', # depends on common, bus, mempool.
+ 'regex', # depends on common, bus, regexdev.
+ 'vdpa',# depends on common, bus and mempool.
+ 'event', # depends on common, bus, mempool and net.
+ 'baseband', # depends on common and bus.
+]
disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
).stdout().split()
--
2.26.2
[dpdk-dev] [PATCH v9 00/10] Improve mlx5 PMD driver framework for multiple classes
This series introduces mlx5 common driver layer to support multiple class of devices for a single PCI device. Motivation and example -- mlx5 PCI device supports multiple class of devices such as net, vdpa and regex devices. Currently only one pmd (either net or vdpa) can bind to this device. This design limits use of PCI device only for single device class. To support multiple classes simultaneously for a mlx5 PCI device, mlx5 common module is extended as generic PCI PMD. This PMD enables multiple class PMDS (net, regex, vdpa) to be loaded on a single PCI Device. Change description -- Patch-1 Introduces RTE_BIT() macro Patch-2 Fixed indentation for directory listing Patch-3 Relax dependency order Patch-4 Fixes compilation error Patch-5 Fixes segmentation fault in regex probe error unwind path Patch-6 Avoid using class constructor priority Patch-7 Change class values as bits Patch-8 Introduce mlx5 layer to support multiple class drivers Patch-9 Migrates mlx5 net and vdpa driver to use mlx5 PCI driver API instead of rte PCI bus API Patch-10 Removed class check code from class drivers Design overview --- ---- | mlx5 || mlx5 || mlx5| | net pmd || vdpa pmd || regex pmd | ---- \ |/ \ | / \ --- / \__| mlx5 common |/ |pmd | --- | --- | mlx5 | | pci dev | --- - mlx5 common driver binds to mlx5 PCI devices defined by PCI ID table of all related mlx5 PCI devices. - mlx5 class driver such as net, vdpa, regex PMD define their specific PCI ID tables. mlx5 common driver probes each individual class driver(s) for maching and enabled classes. - mlx5 pci layer is cental place that validates supported class combinations. - In future as code evolves, more device setup/cleanup and resource creation code moves to mlx5 PCI common driver. Alternatives considered --- 1. Instead of creating mlx5 pci common PMD, a common driver is implemented which exposes class registration API. However, common PMD model fits better with existing DPDK design similar to ifpga driver. Class registration API need to create a new callbacks and ID signature; instead it is better to utilize current well defined methods. 2. Enhance pci core to allow multiple driver binding to single rte PCI device. This approach is not taken, because peer drivers using one PCI device won't be aware of other's presence. This requires cross-driver syncronization of who initializes common resources (such as irq, eq and more). This also requires refcounting common objects etc among peer drivers. Instead of layered approach delivers and allows putting common resource sharing, setup code in common driver. It also eliminates peer blind zone problem as bottom pci layer provides necessary setup without any reference counting. 3. In future mlx5 prefers to use RDMA MR cache of the mbuf used between net and regex pmd so that same mbuf use across multiple device can be possible. Examples: A user who wish to use a specific class(es) provides list of classes at command line such as, ./testpmd -w ,class=net:regex ./testpmd -w ,class=vdpa Changelog: v8->v9: - Updated commit message - Fixed LD_FLAGS - Fixed white space to tab - Fixed Makefile to have dependency on common/mlx5 for parallel builds v7->v8: - Instead of dedicated mlx5 bus driver, merged the PMD to common_mlx5 - Avoided new RTE PRIORITY - Removed mlx5 common to use RTE_PRIORITY_CLASS v6->v7: - Updated release notes v5->v6: - Fixed compilation failure in parallel build for shared lib v4->v5: - Squash the maintainers update path with other patch which adds the bus - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v3->v4: - Fixed dma_map error unwinding flow to follow same order for unmap v2->v3: - Added RTE priority for common driver initialization - Addressed comments from Thomas and Asaf - Fixed compilation error in glue wrapper - Moved pci_driver structure instance as first in driver - Removed white spaces at the end of line in diagram - Address commnts from Matan - Removed CONFIG_RTE_LIBRTE_MLX5_PCI_BUS from config files - Renamed mlx5_valid_class_combo to mlx5_class_combinations - Added cross check for class drivers to support only 3 flags for now - Added full stop at the end of comment block - Using full names in function names - Added new line before function name in multiple functions - Added example string to parse for multiple classes - Dropped mlx5 prefix from static function - Removed empty lines - Fixed issue to remo
[dpdk-dev] [PATCH v9 01/10] eal: introduce macro for bit definition
There are several drivers which duplicate bit generation macro. Introduce a generic bit macros so that such drivers avoid redefining same in multiple drivers. Signed-off-by: Parav Pandit Acked-by: Matan Azrad Acked-by: Morten Brørup --- Changelog: v4->v5: - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v1->v2: - Addressed comments from Thomas and Gaten. - Avoided new file, added macro to rte_bitops.h --- lib/librte_eal/include/rte_bitops.h | 8 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/librte_eal/include/rte_bitops.h index 740927f3b..ca46a110f 100644 --- a/lib/librte_eal/include/rte_bitops.h +++ b/lib/librte_eal/include/rte_bitops.h @@ -17,6 +17,14 @@ #include #include +/** + * Get the uint64_t value for a specified bit set. + * + * @param nr + * The bit number in range of 0 to 63. + */ +#define RTE_BIT64(nr) (UINT64_C(1) << (nr)) + /* 32-bit relaxed operations */ /** -- 2.26.2
[dpdk-dev] [PATCH v9 03/10] drivers: relax dependency order
From: Thomas Monjalon
Drivers dependencies are evaluated in the order defined per their parent
directory (also called class). This strict ordering prevents from
having pairs of drivers from two classes with different dependency
ordering. For example, if the mlx5 common code depends on the pci bus
driver, while the dpaax common code is itself a dependency of the dpaa
bus driver. Having a strict ordering between directories bus and common
is too restrictive, as processing either common drivers or bus drivers
first leads us to missing dependencies in this scenario.
This patch makes it possible to have a more fine-grain directory list,
adding a specific driver sub-directory in the top-level drivers
subdirectory list. In this case, the isolated driver must also be removed
from its class list, and the per-class variables must be duplicated in
the isolated driver, because the call "subdir(class)" is skipped in the
isolated driver case.
Review-by: Bruce Richardson
Acked-by: Bruce Richardson
Signed-off-by: Thomas Monjalon
---
Changelog:
v8->v9:
- Updated commit message
- Fixed typo
---
drivers/meson.build | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index e2aeba931..e6d0409aa 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
-# Defines the order in which the drivers are buit.
-dpdk_driver_classes = [
+# Defines the order of dependencies evaluation
+subdirs = [
'common',
'bus',
'mempool', # depends on common and bus.
@@ -27,7 +27,7 @@ if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
endif
-foreach class:dpdk_driver_classes
+foreach subpath:subdirs
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
@@ -35,8 +35,22 @@ foreach class:dpdk_driver_classes
# the library, the dependency and to find the
# version file for linking
- subdir(class)
- class_drivers = []
+ # subpath can be either "class" or "class/driver"
+ if subpath.contains('/')
+ driver_path = subpath.split('/')
+ class = driver_path[0]
+ drivers += driver_path[1]
+ else
+ class = subpath
+ subdir(class)
+ endif
+
+ # save class name on first occurence
+ if not dpdk_driver_classes.contains(class)
+ dpdk_driver_classes += class
+ endif
+ # get already enabled drivers of the same class
+ enabled_drivers = get_variable(class + '_drivers', [])
foreach drv:drivers
drv_path = join_paths(class, drv)
@@ -96,7 +110,7 @@ foreach class:dpdk_driver_classes
'_disable_reason', reason)
endif
else
- class_drivers += name
+ enabled_drivers += name
if fmt_name == ''
fmt_name = name
@@ -203,5 +217,5 @@ foreach class:dpdk_driver_classes
endif # build
endforeach
- set_variable(class + '_drivers', class_drivers)
+ set_variable(class + '_drivers', enabled_drivers)
endforeach
--
2.26.2
[dpdk-dev] [PATCH v9 04/10] common/mlx5: fix void parameters in glue wrappers
Following two errors are reported when compiled with
gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5).
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
Fix them by adding void data type in empty argument list.
Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue")
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v2->v3:
- new patch
---
drivers/common/mlx5/linux/mlx5_glue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_glue.h
b/drivers/common/mlx5/linux/mlx5_glue.h
index c4f9b006a..734ace2a3 100644
--- a/drivers/common/mlx5/linux/mlx5_glue.h
+++ b/drivers/common/mlx5/linux/mlx5_glue.h
@@ -185,11 +185,11 @@ struct mlx5_glue {
void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
void *(*dr_create_flow_action_dest_port)(void *domain,
uint32_t port);
- void *(*dr_create_flow_action_drop)();
+ void *(*dr_create_flow_action_drop)(void);
void *(*dr_create_flow_action_push_vlan)
(struct mlx5dv_dr_domain *domain,
rte_be32_t vlan_tag);
- void *(*dr_create_flow_action_pop_vlan)();
+ void *(*dr_create_flow_action_pop_vlan)(void);
void *(*dr_create_flow_tbl)(void *domain, uint32_t level);
int (*dr_destroy_flow_tbl)(void *tbl);
void *(*dr_create_domain)(struct ibv_context *ctx,
--
2.26.2
[dpdk-dev] [PATCH v9 05/10] regex/mlx5: fix segmentation fault during error unwinding
When fail to initialize the device, avoid segmentation fault while
accessing unintialized priv.
Fixes: cfc672a90b74 ("regex/mlx5: support probing")
Signed-off-by: Parav Pandit
---
Changelog:
v7->v8:
- Rebased
- new patch
---
drivers/regex/mlx5/mlx5_regex.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 1ca5bfe9b..36ae9f809 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -137,17 +137,17 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
if (ret) {
DRV_LOG(ERR, "Unable to read HCA capabilities.");
rte_errno = ENOTSUP;
- goto error;
+ goto dev_error;
} else if (!attr.regex || attr.regexp_num_of_engines == 0) {
DRV_LOG(ERR, "Not enough capabilities to support RegEx, maybe "
"old FW/OFED version?");
rte_errno = ENOTSUP;
- goto error;
+ goto dev_error;
}
if (mlx5_regex_engines_status(ctx, 2)) {
DRV_LOG(ERR, "RegEx engine error.");
rte_errno = ENOMEM;
- goto error;
+ goto dev_error;
}
priv = rte_zmalloc("mlx5 regex device private", sizeof(*priv),
RTE_CACHE_LINE_SIZE);
@@ -200,6 +200,7 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
mlx5_glue->devx_free_uar(priv->uar);
if (priv->regexdev)
rte_regexdev_unregister(priv->regexdev);
+dev_error:
if (ctx)
mlx5_glue->close_device(ctx);
if (priv)
--
2.26.2
[dpdk-dev] [PATCH v9 07/10] common/mlx5: change class values as bits
mlx5 PCI Device supports multiple classes of devices such as net, vdpa,
and/or regex.
To support these multiple classes, change mlx5_class to a
bitmap values so that if users asks to enable multiple of them, all
supported classes can be parsed.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v7->v8:
- updated commit message
---
drivers/common/mlx5/mlx5_common.h | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index ebe4e9ced..864e82ff0 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include "mlx5_prm.h"
#include "mlx5_devx_cmds.h"
@@ -208,10 +209,10 @@ int mlx5_get_ifname_sysfs(const char *ibdev_path, char
*ifname);
#define MLX5_CLASS_ARG_NAME "class"
enum mlx5_class {
- MLX5_CLASS_NET,
- MLX5_CLASS_VDPA,
- MLX5_CLASS_REGEX,
MLX5_CLASS_INVALID,
+ MLX5_CLASS_NET = RTE_BIT64(0),
+ MLX5_CLASS_VDPA = RTE_BIT64(1),
+ MLX5_CLASS_REGEX = RTE_BIT64(2),
};
#define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE
--
2.26.2
[dpdk-dev] [PATCH v9 08/10] common/mlx5: introduce layer to support multiple class drivers
Add generic mlx5 PCI PMD layer as part of existing common_mlx5 module. This enables multiple classes (net, regex, vdpa) PMDs to be supported at same time. Signed-off-by: Parav Pandit Acked-by: Matan Azrad --- Changelog: v8->v9: - Added missing LDFLAG for pci bus - Fixed white spaces at start of the line --- drivers/Makefile | 10 +- drivers/common/Makefile | 4 - drivers/common/meson.build| 2 +- drivers/common/mlx5/Makefile | 2 + drivers/common/mlx5/meson.build | 9 +- drivers/common/mlx5/mlx5_common.c | 2 + drivers/common/mlx5/mlx5_common_pci.c | 541 ++ drivers/common/mlx5/mlx5_common_pci.h | 77 +++ .../common/mlx5/rte_common_mlx5_version.map | 2 + drivers/meson.build | 1 + 10 files changed, 639 insertions(+), 11 deletions(-) create mode 100644 drivers/common/mlx5/mlx5_common_pci.c create mode 100644 drivers/common/mlx5/mlx5_common_pci.h diff --git a/drivers/Makefile b/drivers/Makefile index 1551272ef..7f06162dc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -8,8 +8,12 @@ DIRS-y += bus DEPDIRS-bus := common DIRS-y += mempool DEPDIRS-mempool := common bus +ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) +DIRS-y += common/mlx5 +DEPDIRS-common/mlx5 := bus +endif DIRS-y += net -DEPDIRS-net := common bus mempool +DEPDIRS-net := common bus mempool common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband DEPDIRS-baseband := common bus mempool DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto @@ -19,9 +23,9 @@ DEPDIRS-common/qat := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress DEPDIRS-compress := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus +DEPDIRS-regex := common bus common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool +DEPDIRS-vdpa := common bus mempool common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event DEPDIRS-event := common bus mempool net crypto DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw diff --git a/drivers/common/Makefile b/drivers/common/Makefile index cbc71077c..cfb6b4dc8 100644 --- a/drivers/common/Makefile +++ b/drivers/common/Makefile @@ -36,8 +36,4 @@ ifneq (,$(findstring y,$(IAVF-y))) DIRS-y += iavf endif -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += mlx5 -endif - include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 5db7e29b1..9ed4c04ba 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -6,6 +6,6 @@ if is_windows endif std_deps = ['eal'] -drivers = ['cpt', 'dpaax', 'iavf', 'mlx5', 'mvep', 'octeontx', 'octeontx2', 'qat'] +drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'qat'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' driver_name_fmt = 'rte_common_@0@' diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile index 6b89a6c85..4edd54104 100644 --- a/drivers/common/mlx5/Makefile +++ b/drivers/common/mlx5/Makefile @@ -22,6 +22,7 @@ SRCS-y += linux/mlx5_common_verbs.c SRCS-y += mlx5_common_mp.c SRCS-y += mlx5_common_mr.c SRCS-y += mlx5_malloc.c +SRCS-y += mlx5_common_pci.c ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) INSTALL-y-lib += $(LIB_GLUE) endif @@ -51,6 +52,7 @@ LDLIBS += -libverbs -lmlx5 endif LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net +LDLIBS += -lrte_bus_pci # A few warnings cannot be avoided in external headers. CFLAGS += -Wno-error=cast-qual -UPEDANTIC diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 70e2c1c32..8e5608703 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -1,19 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 Mellanox Technologies, Ltd -if not (is_linux or is_windows) +if not is_linux build = false - reason = 'only supported on Linux and Windows' + reason = 'only supported on Linux' subdir_done() endif -deps += ['hash', 'pci', 'net', 'eal', 'kvargs'] +config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' +driver_name_fmt = 'rte_common_@0@' +deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs'] sources += files( 'mlx5_devx_cmds.c', 'mlx5_common.c', 'mlx5_common_mp.c', 'mlx5_common_mr.c', 'mlx5_malloc.c', + 'mlx5_common_pci.c', ) cflags_options = [ diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 2b336bb2d..fd818ef24 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -14,6 +14,7 @@ #include "mlx5_common_os.h" #include "mlx5_common_utils.h" #include "mlx5_malloc.h" +#include "mlx5_common_pci.h" int mlx5_co
[dpdk-dev] [PATCH v9 09/10] common/mlx5: register class drivers through common layer
Migrate mlx5 net, vdpa and regex PMD to start using mlx5 common class
driver.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v8->v9:
- Removed leftover inclusion of mlx5_pci bus include directory
---
drivers/common/mlx5/mlx5_common_pci.c | 6 ++
drivers/net/mlx5/Makefile | 1 -
drivers/net/mlx5/linux/mlx5_os.c | 1 -
drivers/net/mlx5/mlx5.c | 24 ++--
drivers/net/mlx5/mlx5.h | 1 -
drivers/regex/mlx5/meson.build| 2 +-
drivers/regex/mlx5/mlx5_regex.c | 21 -
drivers/vdpa/mlx5/Makefile| 2 +-
drivers/vdpa/mlx5/meson.build | 2 +-
drivers/vdpa/mlx5/mlx5_vdpa.c | 23 +--
10 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common_pci.c
b/drivers/common/mlx5/mlx5_common_pci.c
index adb3f707d..b5fcc16b1 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -34,10 +34,8 @@ static const unsigned int mlx5_class_combinations[] = {
MLX5_CLASS_NET,
MLX5_CLASS_VDPA,
MLX5_CLASS_REGEX,
- /* New class combination should be added here.
-* For example a new multi class device combination
-* can be MLX5_CLASS_FOO | MLX5_CLASS_BAR.
-*/
+ MLX5_CLASS_NET | MLX5_CLASS_REGEX,
+ /* New class combination should be added here. */
};
static int
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 253faf909..568c77241 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -55,7 +55,6 @@ LDLIBS += -lrte_common_mlx5
LDLIBS += -lm
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
# A few warnings cannot be avoided in external headers.
CFLAGS += -Wno-error=cast-qual
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index fa3b02787..97d7b0e7b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1537,7 +1537,6 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
strerror(rte_errno));
return -rte_errno;
}
- MLX5_ASSERT(pci_drv == &mlx5_driver);
errno = 0;
ibv_list = mlx5_glue->get_device_list(&ret);
if (!ibv_list) {
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 037703d2e..1e4c695f8 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include "mlx5_defs.h"
@@ -2091,16 +2092,19 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
}
};
-struct rte_pci_driver mlx5_driver = {
- .driver = {
- .name = MLX5_DRIVER_NAME
+static struct mlx5_pci_driver mlx5_driver = {
+ .driver_class = MLX5_CLASS_NET,
+ .pci_driver = {
+ .driver = {
+ .name = MLX5_DRIVER_NAME,
+ },
+ .id_table = mlx5_pci_id_map,
+ .probe = mlx5_os_pci_probe,
+ .remove = mlx5_pci_remove,
+ .dma_map = mlx5_dma_map,
+ .dma_unmap = mlx5_dma_unmap,
+ .drv_flags = PCI_DRV_FLAGS,
},
- .id_table = mlx5_pci_id_map,
- .probe = mlx5_os_pci_probe,
- .remove = mlx5_pci_remove,
- .dma_map = mlx5_dma_map,
- .dma_unmap = mlx5_dma_unmap,
- .drv_flags = PCI_DRV_FLAGS,
};
/* Initialize driver log type. */
@@ -2117,7 +2121,7 @@ RTE_INIT(rte_mlx5_pmd_init)
mlx5_set_cksum_table();
mlx5_set_swp_types_table();
if (mlx5_glue)
- rte_pci_register(&mlx5_driver);
+ mlx5_pci_driver_register(&mlx5_driver);
}
RTE_PMD_EXPORT_NAME(net_mlx5, __COUNTER__);
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index a92194d2d..78d6eb728 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -119,7 +119,6 @@ struct mlx5_local_data {
};
extern struct mlx5_shared_data *mlx5_shared_data;
-extern struct rte_pci_driver mlx5_driver;
/* Dev ops structs */
extern const struct eth_dev_ops mlx5_os_dev_ops;
diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build
index 7f800f2e3..d7cb2c572 100644
--- a/drivers/regex/mlx5/meson.build
+++ b/drivers/regex/mlx5/meson.build
@@ -8,7 +8,7 @@ if not is_linux
endif
fmt_name = 'mlx5_regex'
-deps += ['common_mlx5', 'bus_pci', 'eal', 'regexdev']
+deps += ['common_mlx5', 'eal', 'regexdev']
sources = files(
'mlx5_regex.c',
'mlx5_rxp.c',
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 4e0367052..ae9f00189 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -5,12 +5,12 @@
#include
#include
#include
-#include
#include
#include
#include
#include
+#
[dpdk-dev] [PATCH v9 06/10] common/mlx5: avoid using class constructor priority
mlx5_common is shared library between mlx5 net, VDPA and regex PMD.
It is better to use common initialization helper instead of using
RTE_PRIORITY_CLASS priority.
Reviewed-by: David Marchand
Suggested-by: David Marchand
Signed-off-by: Parav Pandit
---
Changelog:
v7->v8:
- new patch
---
drivers/common/mlx5/mlx5_common.c | 13 +++--
drivers/common/mlx5/mlx5_common.h | 3 +++
drivers/common/mlx5/rte_common_mlx5_version.map | 1 +
drivers/net/mlx5/mlx5.c | 1 +
drivers/regex/mlx5/mlx5_regex.c | 1 +
drivers/vdpa/mlx5/mlx5_vdpa.c | 1 +
6 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 1a67a1b16..2b336bb2d 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -86,12 +86,21 @@ RTE_INIT_PRIO(mlx5_log_init, LOG)
rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE);
}
+static bool mlx5_common_initialized;
+
/**
- * Initialization routine for run-time dependency on glue library.
+ * One time innitialization routine for run-time dependency on glue library
+ * for multiple PMDs. Each mlx5 PMD that depends on mlx5_common module,
+ * must invoke in its constructor.
*/
-RTE_INIT_PRIO(mlx5_glue_init, CLASS)
+void
+mlx5_common_init(void)
{
+ if (mlx5_common_initialized)
+ return;
+
mlx5_glue_constructor();
+ mlx5_common_initialized = true;
}
/**
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index a811eb6c9..ebe4e9ced 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -260,4 +260,7 @@ int32_t mlx5_release_dbr(struct mlx5_dbr_page_list *head,
uint32_t umem_id,
uint64_t offset);
extern uint8_t haswell_broadwell_cpu;
+__rte_internal
+void mlx5_common_init(void);
+
#endif /* RTE_PMD_MLX5_COMMON_H_ */
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map
b/drivers/common/mlx5/rte_common_mlx5_version.map
index 132a0695f..65f25252a 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -3,6 +3,7 @@ INTERNAL {
mlx5_class_get;
+ mlx5_common_init;
mlx5_common_verbs_reg_mr;
mlx5_common_verbs_dereg_mr;
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 647ada339..037703d2e 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2111,6 +2111,7 @@ RTE_LOG_REGISTER(mlx5_logtype, pmd.net.mlx5, NOTICE)
*/
RTE_INIT(rte_mlx5_pmd_init)
{
+ mlx5_common_init();
/* Build the static tables for Verbs conversion. */
mlx5_set_ptype_table();
mlx5_set_cksum_table();
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 36ae9f809..4e0367052 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -258,6 +258,7 @@ static struct rte_pci_driver mlx5_regex_driver = {
RTE_INIT(rte_mlx5_regex_init)
{
+ mlx5_common_init();
if (mlx5_glue)
rte_pci_register(&mlx5_regex_driver);
}
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 67e77b11a..85dbcf956 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -846,6 +846,7 @@ RTE_LOG_REGISTER(mlx5_vdpa_logtype, pmd.vdpa.mlx5, NOTICE)
*/
RTE_INIT(rte_mlx5_vdpa_init)
{
+ mlx5_common_init();
if (mlx5_glue)
rte_pci_register(&mlx5_vdpa_driver);
}
--
2.26.2
[dpdk-dev] [PATCH v9 10/10] common/mlx5: remove class check from class drivers
Now that mlx5_pci PMD checks for enabled classes and performs
probe(), remove() of associated classes, individual class driver
does not need to check if other driver is enabled.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_common.c | 37 ---
drivers/common/mlx5/mlx5_common.h | 2 -
.../common/mlx5/rte_common_mlx5_version.map | 3 +-
drivers/net/mlx5/linux/mlx5_os.c | 5 ---
drivers/vdpa/mlx5/mlx5_vdpa.c | 5 ---
5 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index fd818ef24..06f0a6400 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -20,43 +20,6 @@ int mlx5_common_logtype;
uint8_t haswell_broadwell_cpu;
-static int
-mlx5_class_check_handler(__rte_unused const char *key, const char *value,
-void *opaque)
-{
- enum mlx5_class *ret = opaque;
-
- if (strcmp(value, "vdpa") == 0) {
- *ret = MLX5_CLASS_VDPA;
- } else if (strcmp(value, "net") == 0) {
- *ret = MLX5_CLASS_NET;
- } else {
- DRV_LOG(ERR, "Invalid mlx5 class %s. Maybe typo in device"
- " class argument setting?", value);
- *ret = MLX5_CLASS_INVALID;
- }
- return 0;
-}
-
-enum mlx5_class
-mlx5_class_get(struct rte_devargs *devargs)
-{
- struct rte_kvargs *kvlist;
- const char *key = MLX5_CLASS_ARG_NAME;
- enum mlx5_class ret = MLX5_CLASS_NET;
-
- if (devargs == NULL)
- return ret;
- kvlist = rte_kvargs_parse(devargs->args, NULL);
- if (kvlist == NULL)
- return ret;
- if (rte_kvargs_count(kvlist, key))
- rte_kvargs_process(kvlist, key, mlx5_class_check_handler, &ret);
- rte_kvargs_free(kvlist);
- return ret;
-}
-
-
/* In case this is an x86_64 intel processor to check if
* we should use relaxed ordering.
*/
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 864e82ff0..2cdb226f3 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -247,8 +247,6 @@ struct mlx5_klm {
LIST_HEAD(mlx5_dbr_page_list, mlx5_devx_dbr_page);
-__rte_internal
-enum mlx5_class mlx5_class_get(struct rte_devargs *devargs);
__rte_internal
void mlx5_translate_port_name(const char *port_name_in,
struct mlx5_switch_info *port_info_out);
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map
b/drivers/common/mlx5/rte_common_mlx5_version.map
index 73cf72548..7729d0dd0 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -1,9 +1,8 @@
INTERNAL {
global:
- mlx5_class_get;
-
mlx5_common_init;
+
mlx5_common_verbs_reg_mr;
mlx5_common_verbs_dereg_mr;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 97d7b0e7b..fc339affa 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1524,11 +1524,6 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
unsigned int dev_config_vf;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_NET) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
mlx5_pmd_socket_init();
ret = mlx5_init_once();
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index ffe2f00ac..c0b87bcc0 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -680,11 +680,6 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
struct mlx5_hca_attr attr;
int ret;
- if (mlx5_class_get(pci_dev->device.devargs) != MLX5_CLASS_VDPA) {
- DRV_LOG(DEBUG, "Skip probing - should be probed by other mlx5"
- " driver.");
- return 1;
- }
ibv = mlx5_vdpa_get_ib_device_match(&pci_dev->addr);
if (!ibv) {
DRV_LOG(ERR, "No matching IB device for PCI slot "
--
2.26.2
Re: [dpdk-dev] [PATCH v9 00/10] Improve mlx5 PMD driver framework for multiple classes
> From: Parav Pandit > Sent: Friday, July 24, 2020 7:54 PM > > This series introduces mlx5 common driver layer to support multiple class of > devices for a single PCI device. > [..] > > Changelog: > v8->v9: > - Updated commit message > - Fixed LD_FLAGS > - Fixed white space to tab > - Fixed Makefile to have dependency on common/mlx5 for parallel builds Sorry for missing out the checkpatch warnings. I missed to address them. Sending v10.
[dpdk-dev] [PATCH v10 02/10] drivers: fix indent of directory list
From: Thomas Monjalon
Define each sub-directory on its own line ended with a comma,
and use a simple indent.
Acked-by: Bruce Richardson
Reviewed-by: David Marchand
Signed-off-by: Thomas Monjalon
---
Changelog:
v7->8:
- new patch
---
drivers/meson.build | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index e76ebddfa..e2aeba931 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -2,17 +2,19 @@
# Copyright(c) 2017-2019 Intel Corporation
# Defines the order in which the drivers are buit.
-dpdk_driver_classes = ['common',
- 'bus',
- 'mempool', # depends on common and bus.
- 'net', # depends on common, bus, mempool
- 'raw', # depends on common, bus and net.
- 'crypto', # depends on common, bus and mempool (net in future).
- 'compress', # depends on common, bus, mempool.
- 'regex', # depends on common, bus, regexdev.
- 'vdpa',# depends on common, bus and mempool.
- 'event', # depends on common, bus, mempool and net.
- 'baseband'] # depends on common and bus.
+dpdk_driver_classes = [
+ 'common',
+ 'bus',
+ 'mempool', # depends on common and bus.
+ 'net', # depends on common, bus, mempool
+ 'raw', # depends on common, bus and net.
+ 'crypto', # depends on common, bus and mempool (net in future).
+ 'compress', # depends on common, bus, mempool.
+ 'regex', # depends on common, bus, regexdev.
+ 'vdpa',# depends on common, bus and mempool.
+ 'event', # depends on common, bus, mempool and net.
+ 'baseband', # depends on common and bus.
+]
disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
).stdout().split()
--
2.26.2
[dpdk-dev] [PATCH v10 00/10] Improve mlx5 PMD driver framework for multiple classes
This series introduces mlx5 common driver layer to support multiple class of devices for a single PCI device. Motivation and example -- mlx5 PCI device supports multiple class of devices such as net, vdpa and regex devices. Currently only one pmd (either net or vdpa) can bind to this device. This design limits use of PCI device only for single device class. To support multiple classes simultaneously for a mlx5 PCI device, mlx5 common module is extended as generic PCI PMD. This PMD enables multiple class PMDS (net, regex, vdpa) to be loaded on a single PCI Device. Change description -- Patch-1 Introduces RTE_BIT() macro Patch-2 Fixed indentation for directory listing Patch-3 Relax dependency order Patch-4 Fixes compilation error Patch-5 Fixes segmentation fault in regex probe error unwind path Patch-6 Avoid using class constructor priority Patch-7 Change class values as bits Patch-8 Introduce mlx5 layer to support multiple class drivers Patch-9 Migrates mlx5 net and vdpa driver to use mlx5 PCI driver API instead of rte PCI bus API Patch-10 Removed class check code from class drivers Design overview --- ---- | mlx5 || mlx5 || mlx5| | net pmd || vdpa pmd || regex pmd | ---- \ |/ \ | / \ --- / \__| mlx5 common |/ |pmd | --- | --- | mlx5 | | pci dev | --- - mlx5 common driver binds to mlx5 PCI devices defined by PCI ID table of all related mlx5 PCI devices. - mlx5 class driver such as net, vdpa, regex PMD define their specific PCI ID tables. mlx5 common driver probes each individual class driver(s) for maching and enabled classes. - mlx5 pci layer is cental place that validates supported class combinations. - In future as code evolves, more device setup/cleanup and resource creation code moves to mlx5 PCI common driver. Alternatives considered --- 1. Instead of creating mlx5 pci common PMD, a common driver is implemented which exposes class registration API. However, common PMD model fits better with existing DPDK design similar to ifpga driver. Class registration API need to create a new callbacks and ID signature; instead it is better to utilize current well defined methods. 2. Enhance pci core to allow multiple driver binding to single rte PCI device. This approach is not taken, because peer drivers using one PCI device won't be aware of other's presence. This requires cross-driver syncronization of who initializes common resources (such as irq, eq and more). This also requires refcounting common objects etc among peer drivers. Instead of layered approach delivers and allows putting common resource sharing, setup code in common driver. It also eliminates peer blind zone problem as bottom pci layer provides necessary setup without any reference counting. 3. In future mlx5 prefers to use RDMA MR cache of the mbuf used between net and regex pmd so that same mbuf use across multiple device can be possible. Examples: A user who wish to use a specific class(es) provides list of classes at command line such as, ./testpmd -w ,class=net:regex ./testpmd -w ,class=vdpa Changelog: v9->v10: - Fixed checkpatch warnings related to spelling mistakes and alignment v8->v9: - Updated commit message - Fixed LD_FLAGS - Fixed white space to tab - Fixed Makefile to have dependency on common/mlx5 for parallel builds v7->v8: - Instead of dedicated mlx5 bus driver, merged the PMD to common_mlx5 - Avoided new RTE PRIORITY - Removed mlx5 common to use RTE_PRIORITY_CLASS v6->v7: - Updated release notes v5->v6: - Fixed compilation failure in parallel build for shared lib v4->v5: - Squash the maintainers update path with other patch which adds the bus - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v3->v4: - Fixed dma_map error unwinding flow to follow same order for unmap v2->v3: - Added RTE priority for common driver initialization - Addressed comments from Thomas and Asaf - Fixed compilation error in glue wrapper - Moved pci_driver structure instance as first in driver - Removed white spaces at the end of line in diagram - Address commnts from Matan - Removed CONFIG_RTE_LIBRTE_MLX5_PCI_BUS from config files - Renamed mlx5_valid_class_combo to mlx5_class_combinations - Added cross check for class drivers to support only 3 flags for now - Added full stop at the end of comment block - Using full names in function names - Added new line before function name in multiple functions - Added example string to parse for multiple classes - Dropp
[dpdk-dev] [PATCH v10 01/10] eal: introduce macro for bit definition
There are several drivers which duplicate bit generation macro. Introduce a generic bit macros so that such drivers avoid redefining same in multiple drivers. Signed-off-by: Parav Pandit Acked-by: Matan Azrad Acked-by: Morten Brørup --- Changelog: v4->v5: - Addressed comments from Morten Brørup - Renamed newly added macro to RTE_BIT64 - Added doxygen comment section for the macro v1->v2: - Addressed comments from Thomas and Gaten. - Avoided new file, added macro to rte_bitops.h --- lib/librte_eal/include/rte_bitops.h | 8 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/include/rte_bitops.h b/lib/librte_eal/include/rte_bitops.h index 740927f3b..ca46a110f 100644 --- a/lib/librte_eal/include/rte_bitops.h +++ b/lib/librte_eal/include/rte_bitops.h @@ -17,6 +17,14 @@ #include #include +/** + * Get the uint64_t value for a specified bit set. + * + * @param nr + * The bit number in range of 0 to 63. + */ +#define RTE_BIT64(nr) (UINT64_C(1) << (nr)) + /* 32-bit relaxed operations */ /** -- 2.26.2
[dpdk-dev] [PATCH v10 03/10] drivers: relax dependency order
From: Thomas Monjalon
Drivers dependencies are evaluated in the order defined per their parent
directory (also called class). This strict ordering prevents from
having pairs of drivers from two classes with different dependency
ordering. For example, if the mlx5 common code depends on the pci bus
driver, while the dpaax common code is itself a dependency of the dpaa
bus driver. Having a strict ordering between directories bus and common
is too restrictive, as processing either common drivers or bus drivers
first leads us to missing dependencies in this scenario.
This patch makes it possible to have a more fine-grain directory list,
adding a specific driver sub-directory in the top-level drivers
subdirectory list. In this case, the isolated driver must also be removed
from its class list, and the per-class variables must be duplicated in
the isolated driver, because the call "subdir(class)" is skipped in the
isolated driver case.
Review-by: Bruce Richardson
Acked-by: Bruce Richardson
Signed-off-by: Thomas Monjalon
---
Changelog:
v8->v9:
- Updated commit message
- Fixed typo
---
drivers/meson.build | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index e2aeba931..038957460 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
-# Defines the order in which the drivers are buit.
-dpdk_driver_classes = [
+# Defines the order of dependencies evaluation
+subdirs = [
'common',
'bus',
'mempool', # depends on common and bus.
@@ -27,7 +27,7 @@ if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
endif
-foreach class:dpdk_driver_classes
+foreach subpath:subdirs
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
@@ -35,8 +35,22 @@ foreach class:dpdk_driver_classes
# the library, the dependency and to find the
# version file for linking
- subdir(class)
- class_drivers = []
+ # subpath can be either "class" or "class/driver"
+ if subpath.contains('/')
+ driver_path = subpath.split('/')
+ class = driver_path[0]
+ drivers += driver_path[1]
+ else
+ class = subpath
+ subdir(class)
+ endif
+
+ # save class name on first occurrence
+ if not dpdk_driver_classes.contains(class)
+ dpdk_driver_classes += class
+ endif
+ # get already enabled drivers of the same class
+ enabled_drivers = get_variable(class + '_drivers', [])
foreach drv:drivers
drv_path = join_paths(class, drv)
@@ -96,7 +110,7 @@ foreach class:dpdk_driver_classes
'_disable_reason', reason)
endif
else
- class_drivers += name
+ enabled_drivers += name
if fmt_name == ''
fmt_name = name
@@ -203,5 +217,5 @@ foreach class:dpdk_driver_classes
endif # build
endforeach
- set_variable(class + '_drivers', class_drivers)
+ set_variable(class + '_drivers', enabled_drivers)
endforeach
--
2.26.2
[dpdk-dev] [PATCH v10 05/10] regex/mlx5: fix segmentation fault during error unwinding
When fail to initialize the device, avoid segmentation fault while
accessing unintialized priv.
Fixes: cfc672a90b74 ("regex/mlx5: support probing")
Signed-off-by: Parav Pandit
---
Changelog:
v9->v10:
- Corrected type in commit log
v7->v8:
- Rebased
- new patch
---
drivers/regex/mlx5/mlx5_regex.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 1ca5bfe9b..36ae9f809 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -137,17 +137,17 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
if (ret) {
DRV_LOG(ERR, "Unable to read HCA capabilities.");
rte_errno = ENOTSUP;
- goto error;
+ goto dev_error;
} else if (!attr.regex || attr.regexp_num_of_engines == 0) {
DRV_LOG(ERR, "Not enough capabilities to support RegEx, maybe "
"old FW/OFED version?");
rte_errno = ENOTSUP;
- goto error;
+ goto dev_error;
}
if (mlx5_regex_engines_status(ctx, 2)) {
DRV_LOG(ERR, "RegEx engine error.");
rte_errno = ENOMEM;
- goto error;
+ goto dev_error;
}
priv = rte_zmalloc("mlx5 regex device private", sizeof(*priv),
RTE_CACHE_LINE_SIZE);
@@ -200,6 +200,7 @@ mlx5_regex_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
mlx5_glue->devx_free_uar(priv->uar);
if (priv->regexdev)
rte_regexdev_unregister(priv->regexdev);
+dev_error:
if (ctx)
mlx5_glue->close_device(ctx);
if (priv)
--
2.26.2
[dpdk-dev] [PATCH v10 04/10] common/mlx5: fix void parameters in glue wrappers
Following two errors are reported when compiled with
gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5).
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
drivers/common/mlx5/linux/mlx5_glue.h:188:2:
error: function declaration isn't a prototype [-Werror=strict-prototypes]
Fix them by adding void data type in empty argument list.
Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue")
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v2->v3:
- new patch
---
drivers/common/mlx5/linux/mlx5_glue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_glue.h
b/drivers/common/mlx5/linux/mlx5_glue.h
index c4f9b006a..734ace2a3 100644
--- a/drivers/common/mlx5/linux/mlx5_glue.h
+++ b/drivers/common/mlx5/linux/mlx5_glue.h
@@ -185,11 +185,11 @@ struct mlx5_glue {
void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
void *(*dr_create_flow_action_dest_port)(void *domain,
uint32_t port);
- void *(*dr_create_flow_action_drop)();
+ void *(*dr_create_flow_action_drop)(void);
void *(*dr_create_flow_action_push_vlan)
(struct mlx5dv_dr_domain *domain,
rte_be32_t vlan_tag);
- void *(*dr_create_flow_action_pop_vlan)();
+ void *(*dr_create_flow_action_pop_vlan)(void);
void *(*dr_create_flow_tbl)(void *domain, uint32_t level);
int (*dr_destroy_flow_tbl)(void *tbl);
void *(*dr_create_domain)(struct ibv_context *ctx,
--
2.26.2
[dpdk-dev] [PATCH v10 07/10] common/mlx5: change class values as bits
mlx5 PCI Device supports multiple classes of devices such as net, vdpa,
and/or regex.
To support these multiple classes, change mlx5_class to a
bitmap values so that if users asks to enable multiple of them, all
supported classes can be parsed.
Signed-off-by: Parav Pandit
Acked-by: Matan Azrad
---
Changelog:
v7->v8:
- updated commit message
---
drivers/common/mlx5/mlx5_common.h | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index ebe4e9ced..864e82ff0 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include "mlx5_prm.h"
#include "mlx5_devx_cmds.h"
@@ -208,10 +209,10 @@ int mlx5_get_ifname_sysfs(const char *ibdev_path, char
*ifname);
#define MLX5_CLASS_ARG_NAME "class"
enum mlx5_class {
- MLX5_CLASS_NET,
- MLX5_CLASS_VDPA,
- MLX5_CLASS_REGEX,
MLX5_CLASS_INVALID,
+ MLX5_CLASS_NET = RTE_BIT64(0),
+ MLX5_CLASS_VDPA = RTE_BIT64(1),
+ MLX5_CLASS_REGEX = RTE_BIT64(2),
};
#define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE
--
2.26.2
[dpdk-dev] [PATCH v10 08/10] common/mlx5: introduce layer to support multiple class drivers
Add generic mlx5 PCI PMD layer as part of existing common_mlx5 module. This enables multiple classes (net, regex, vdpa) PMDs to be supported at same time. Signed-off-by: Parav Pandit Acked-by: Matan Azrad --- Changelog: v9->v10: - Fixed alignment v8->v9: - Added missing LDFLAG for pci bus - Fixed white spaces at start of the line --- drivers/Makefile | 10 +- drivers/common/Makefile | 4 - drivers/common/meson.build| 2 +- drivers/common/mlx5/Makefile | 2 + drivers/common/mlx5/meson.build | 9 +- drivers/common/mlx5/mlx5_common.c | 2 + drivers/common/mlx5/mlx5_common_pci.c | 541 ++ drivers/common/mlx5/mlx5_common_pci.h | 77 +++ .../common/mlx5/rte_common_mlx5_version.map | 2 + drivers/meson.build | 1 + 10 files changed, 639 insertions(+), 11 deletions(-) create mode 100644 drivers/common/mlx5/mlx5_common_pci.c create mode 100644 drivers/common/mlx5/mlx5_common_pci.h diff --git a/drivers/Makefile b/drivers/Makefile index 1551272ef..7f06162dc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -8,8 +8,12 @@ DIRS-y += bus DEPDIRS-bus := common DIRS-y += mempool DEPDIRS-mempool := common bus +ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) +DIRS-y += common/mlx5 +DEPDIRS-common/mlx5 := bus +endif DIRS-y += net -DEPDIRS-net := common bus mempool +DEPDIRS-net := common bus mempool common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband DEPDIRS-baseband := common bus mempool DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto @@ -19,9 +23,9 @@ DEPDIRS-common/qat := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress DEPDIRS-compress := bus mempool DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus +DEPDIRS-regex := common bus common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool +DEPDIRS-vdpa := common bus mempool common/mlx5 DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event DEPDIRS-event := common bus mempool net crypto DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw diff --git a/drivers/common/Makefile b/drivers/common/Makefile index cbc71077c..cfb6b4dc8 100644 --- a/drivers/common/Makefile +++ b/drivers/common/Makefile @@ -36,8 +36,4 @@ ifneq (,$(findstring y,$(IAVF-y))) DIRS-y += iavf endif -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += mlx5 -endif - include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 5db7e29b1..9ed4c04ba 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -6,6 +6,6 @@ if is_windows endif std_deps = ['eal'] -drivers = ['cpt', 'dpaax', 'iavf', 'mlx5', 'mvep', 'octeontx', 'octeontx2', 'qat'] +drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'qat'] config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' driver_name_fmt = 'rte_common_@0@' diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile index 6b89a6c85..4edd54104 100644 --- a/drivers/common/mlx5/Makefile +++ b/drivers/common/mlx5/Makefile @@ -22,6 +22,7 @@ SRCS-y += linux/mlx5_common_verbs.c SRCS-y += mlx5_common_mp.c SRCS-y += mlx5_common_mr.c SRCS-y += mlx5_malloc.c +SRCS-y += mlx5_common_pci.c ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) INSTALL-y-lib += $(LIB_GLUE) endif @@ -51,6 +52,7 @@ LDLIBS += -libverbs -lmlx5 endif LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net +LDLIBS += -lrte_bus_pci # A few warnings cannot be avoided in external headers. CFLAGS += -Wno-error=cast-qual -UPEDANTIC diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 70e2c1c32..8e5608703 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -1,19 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 Mellanox Technologies, Ltd -if not (is_linux or is_windows) +if not is_linux build = false - reason = 'only supported on Linux and Windows' + reason = 'only supported on Linux' subdir_done() endif -deps += ['hash', 'pci', 'net', 'eal', 'kvargs'] +config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' +driver_name_fmt = 'rte_common_@0@' +deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs'] sources += files( 'mlx5_devx_cmds.c', 'mlx5_common.c', 'mlx5_common_mp.c', 'mlx5_common_mr.c', 'mlx5_malloc.c', + 'mlx5_common_pci.c', ) cflags_options = [ diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 2b336bb2d..fd818ef24 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -14,6 +14,7 @@ #include "mlx5_common_os.h" #include "mlx5_common_utils.h" #include "mlx5_malloc.h" +#include "mlx5_
