RE: 20.11.8 patches review and test
Update the test status for Intel part. Till now dpdk20.11.8-rc1 validation test rate is 80%. No critical issue is found. 2 new bugs are found, These 2 issues are being confirmed by Intel Dev. New bugs: bug1. softnic and metering_and_policing: create rule failed -- Intel dev is under investigating. bug2. some of the unit tests are failing: -- Intel dev is under investigating # Basic Intel(R) NIC testing * Build & CFLAG compile: cover the build test combination with latest GCC/Clang version and the popular OS revision such as Ubuntu20.04, Fedora36, RHEL8.4, etc. - All test done. No new dpdk issue is found. * PF(i40e, ixgbe): test scenarios including RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - Execution rate is 80%. No new dpdk issue is found. * VF(i40e, ixgbe): test scenarios including VF-RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - All test done. No new dpdk issue is found. * PF/VF(ice): test scenarios including Switch features/Package Management/Flow Director/Advanced Tx/Advanced RSS/ACL/DCF/Flexible Descriptor, etc. - Execution rate is 70%. No new dpdk issue is found. * Intel NIC single core/NIC performance: test scenarios including PF/VF single core performance test, etc. - Execution rate is 80%. No new dpdk issue is found. * IPsec: test scenarios including ipsec/ipsec-gw/ipsec library basic test - QAT&SW/FIB library, etc. - on going. # Basic cryptodev and virtio testing * Virtio: both function and performance test are covered. Such as PVP/Virtio_loopback/virtio-user loopback/virtio-net VM2VM perf testing/VMAWARE ESXI 7.0u3, etc. - Execution rate is 95%. No new dpdk issue is found. * Cryptodev: *Function test: test scenarios including Cryptodev API testing/CompressDev ISA-L/QAT/ZLIB PMD Testing/FIPS, etc. - Execution rate is 95%. bug2 was found. *Performance test: test scenarios including Thoughput Performance/Cryptodev Latency, etc. - All test done. No new dpdk issue is found. Regards, Xu, Hailin > -Original Message- > From: luca.bocca...@gmail.com > Sent: Saturday, April 1, 2023 2:20 AM > To: sta...@dpdk.org > Cc: dev@dpdk.org; Abhishek Marathe ; > Ali Alnubani ; Walker, Benjamin > ; David Christensen ; > Hemant Agrawal ; Stokes, Ian > ; Jerin Jacob ; Mcnamara, John > ; Ju-Hyoung Lee ; Kevin > Traynor ; Luca Boccassi ; Pei > Zhang ; Xu, Qian Q ; Raslan > Darawsheh ; Thomas Monjalon > ; Yanghang Liu ; Peng, Yuan > ; Chen, Zhaoyan > Subject: 20.11.8 patches review and test > > Hi all, > > Here is a list of patches targeted for stable release 20.11.8. > > The planned date for the final release is April 17th. > > Please help with testing and validation of your use cases and report any > issues/results with reply-all to this mail. For the final release the fixes > and > reported validations will be added to the release notes. > > A release candidate tarball can be found at: > > https://dpdk.org/browse/dpdk-stable/tag/?id=v20.11.8-rc1 > > These patches are located at branch 20.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Luca Boccassi > > --- > Akhil Goyal (1): > doc: fix code blocks in cryptodev guide > > Alexander Kozyrev (4): > net/mlx5: fix error CQE dumping for vectorized Rx > net/mlx5: ignore non-critical syndromes for Rx queue > net/mlx5: check compressed CQE opcode in vectorized Rx > net/mlx5: fix CQE dump for Tx > > Andy Pei (2): > vdpa/ifc: fix argument compatibility check > vdpa/ifc: fix reconnection in SW-assisted live migration > > Anoob Joseph (1): > app/crypto-perf: fix number of segments > > Arkadiusz Kusztal (1): > app/compress-perf: fix remaining data for ops > > Bing Zhao (2): > net/mlx5: fix hairpin Tx queue reference count > net/mlx5: fix sysfs port name translation > > Boleslav Stankevich (1): > net/virtio: deduce IP length for TSO checksum > > Bruce Richardson (4): > build: fix toolchain definition > examples/cmdline: fix build with GCC 12 > examples/qos_sched: fix Tx port config when link down > examples/qos_sched: fix config entries in wrong sections > > Chengwen Feng (9): > mem: fix hugepage info mapping > raw/ifpga/base: fix init with multi-process > telemetry: fix repeat display when callback don't init dict > eal/freebsd: fix lock in alarm callback > kvargs: add API documentation for process callback > compressdev: fix empty devargs parsing > cryptodev: fix empty devargs parsing > net/virtio: fix empty devargs parsing > raw/skeleton: fix empty devargs parsing > > Ciara Power (2): > crypto/qat: fix stream cipher direction > app/crypto-perf: fix test file memory leak > > David Christensen (1): > acl: fix crash on PPC64 with GCC 11 > > David Marchand (17): > fbarray: fix metadata dump > graph: fix node shrink > crypto/ccp: remove s
RE: [PATCH v2] eventdev/eth_rx: fix invalid memory access
Hi,
> -Original Message-
> From: pbhagavat...@marvell.com
> Sent: Wednesday, April 5, 2023 3:14 PM
> To: jer...@marvell.com; Naga Harish K, S V
> Cc: dev@dpdk.org; Pavan Nikhilesh
> Subject: [PATCH v2] eventdev/eth_rx: fix invalid memory access
>
Which invalid memory access are you referring to?
> From: Pavan Nikhilesh
>
> Rx adapter internal service structures are only initialized when non-internal
> port is added to the adapter.
> Check if Rx adapter service is initialized to determine if runtime set/get
> parameters are supported.
>
> Fixes: 3716f52186af ("eventdev/eth_rx: support runtime set/get
> parameters")
>
> Signed-off-by: Pavan Nikhilesh
> ---
> v2 Changes:
> --
> - Remove unused variables.
> - Fix spell check.
>
> app/test/test_event_eth_rx_adapter.c| 2 ++
> lib/eventdev/rte_event_eth_rx_adapter.c | 24
> 2 files changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/app/test/test_event_eth_rx_adapter.c
> b/app/test/test_event_eth_rx_adapter.c
> index cfe6052d7e..b1775e6af1 100644
> --- a/app/test/test_event_eth_rx_adapter.c
> +++ b/app/test/test_event_eth_rx_adapter.c
> @@ -1230,6 +1230,8 @@ adapter_get_set_params(void)
> /* Case 1: Get the default value of mbufs processed by Rx adapter */
> err =
> rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID,
> &out_params);
> + if (err == -ENOTSUP)
The queue needs to be deleted from the adapter instance before
returning, otherwise
teardown fails as adapter_free fails because all the queues are not
deleted.
> + return TEST_SKIPPED;
> TEST_ASSERT(err == 0, "Expected 0 got %d", err);
>
> /* Case 2: Set max_nb_rx = 32 (=BATCH_SEIZE) */ diff --git
> a/lib/eventdev/rte_event_eth_rx_adapter.c
> b/lib/eventdev/rte_event_eth_rx_adapter.c
> index c1cd124002..a8a5564b65 100644
> --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> @@ -3466,30 +3466,14 @@
> rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, static int
> rxa_caps_check(struct event_eth_rx_adapter *rxa) {
> - uint16_t eth_dev_id;
> - uint32_t caps = 0;
> - int ret;
> -
> if (!rxa->nb_queues)
> return -EINVAL;
>
> - /* The eth_dev used is always of same type.
> - * Hence eth_dev_id is taken from first entry of poll array.
> - */
> - eth_dev_id = rxa->eth_rx_poll[0].eth_dev_id;
> - ret = rte_event_eth_rx_adapter_caps_get(rxa->eventdev_id,
> - eth_dev_id,
> - &caps);
> - if (ret) {
> - RTE_EDEV_LOG_ERR("Failed to get adapter caps edev %"
> PRIu8
> - "eth port %" PRIu16, rxa->eventdev_id, eth_dev_id);
> - return ret;
> - }
> -
> - if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT)
> - return -ENOTSUP;
> + /* Check if there is at least one non-internal ethernet port. */
> + if (rxa->service_inited)
> + return 0;
>
> - return 0;
> + return -ENOTSUP;
> }
>
> int
> --
> 2.25.1
Re: [PATCH v2] version: 23.07-rc0
On Mon, Apr 3, 2023 at 11:45 AM David Marchand wrote: > > Start a new release cycle with empty release notes. > Bump version and ABI minor. > > Signed-off-by: David Marchand Applied! -- David Marchand
[PATCH v4 0/2] refine common module
From: Beilei Xing Refine common module to support different configuration for different PMDs. V4 changes: - No need to require PTP CAP for CPFL. V3 changes: - refine capability get. Beilei Xing (2): common/idpf: move PF specific functions from common init common/idpf: refine capability get drivers/common/idpf/idpf_common_device.c | 72 - drivers/common/idpf/idpf_common_device.h | 11 +++ drivers/common/idpf/idpf_common_virtchnl.c | 45 +-- drivers/common/idpf/version.map| 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 91 ++ drivers/net/idpf/idpf_ethdev.c | 91 ++ 6 files changed, 214 insertions(+), 101 deletions(-) -- 2.26.2
[PATCH v4 1/2] common/idpf: move PF specific functions from common init
From: Beilei Xing
Move PF reset and PF mailbox initialization functions from
idpf_adapter_init function to _adapter_ext_init function,
since they're different between PF and VF support.
Signed-off-by: Beilei Xing
---
drivers/common/idpf/idpf_common_device.c | 72 +---
drivers/common/idpf/idpf_common_device.h | 11
drivers/common/idpf/version.map | 5 ++
drivers/net/cpfl/cpfl_ethdev.c | 51 +
drivers/net/idpf/idpf_ethdev.c | 51 +
5 files changed, 131 insertions(+), 59 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_device.c
b/drivers/common/idpf/idpf_common_device.c
index c5e7bbf66c..3b58bdd41e 100644
--- a/drivers/common/idpf/idpf_common_device.c
+++ b/drivers/common/idpf/idpf_common_device.c
@@ -6,8 +6,8 @@
#include
#include
-static void
-idpf_reset_pf(struct idpf_hw *hw)
+void
+idpf_hw_pf_reset(struct idpf_hw *hw)
{
uint32_t reg;
@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)
IDPF_WRITE_REG(hw, PFGEN_CTRL, (reg | PFGEN_CTRL_PFSWR));
}
-#define IDPF_RESET_WAIT_CNT 100
-static int
-idpf_check_pf_reset_done(struct idpf_hw *hw)
+int
+idpf_hw_pf_reset_check(struct idpf_hw *hw)
{
uint32_t reg;
int i;
@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)
return -EBUSY;
}
-#define CTLQ_NUM 2
-static int
-idpf_init_mbx(struct idpf_hw *hw)
+int
+idpf_hw_mbx_init(struct idpf_hw *hw, struct idpf_ctlq_create_info *ctlq_info)
{
- struct idpf_ctlq_create_info ctlq_info[CTLQ_NUM] = {
- {
- .type = IDPF_CTLQ_TYPE_MAILBOX_TX,
- .id = IDPF_CTLQ_ID,
- .len = IDPF_CTLQ_LEN,
- .buf_size = IDPF_DFLT_MBX_BUF_SIZE,
- .reg = {
- .head = PF_FW_ATQH,
- .tail = PF_FW_ATQT,
- .len = PF_FW_ATQLEN,
- .bah = PF_FW_ATQBAH,
- .bal = PF_FW_ATQBAL,
- .len_mask = PF_FW_ATQLEN_ATQLEN_M,
- .len_ena_mask = PF_FW_ATQLEN_ATQENABLE_M,
- .head_mask = PF_FW_ATQH_ATQH_M,
- }
- },
- {
- .type = IDPF_CTLQ_TYPE_MAILBOX_RX,
- .id = IDPF_CTLQ_ID,
- .len = IDPF_CTLQ_LEN,
- .buf_size = IDPF_DFLT_MBX_BUF_SIZE,
- .reg = {
- .head = PF_FW_ARQH,
- .tail = PF_FW_ARQT,
- .len = PF_FW_ARQLEN,
- .bah = PF_FW_ARQBAH,
- .bal = PF_FW_ARQBAL,
- .len_mask = PF_FW_ARQLEN_ARQLEN_M,
- .len_ena_mask = PF_FW_ARQLEN_ARQENABLE_M,
- .head_mask = PF_FW_ARQH_ARQH_M,
- }
- }
- };
struct idpf_ctlq_info *ctlq;
int ret;
- ret = idpf_ctlq_init(hw, CTLQ_NUM, ctlq_info);
+ ret = idpf_ctlq_init(hw, IDPF_CTLQ_NUM, ctlq_info);
if (ret != 0)
return ret;
@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)
return ret;
}
+void
+idpf_hw_mbx_deinit(struct idpf_hw *hw)
+{
+ idpf_ctlq_deinit(hw);
+}
+
static int
idpf_get_pkt_type(struct idpf_adapter *adapter)
{
@@ -312,19 +282,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)
struct idpf_hw *hw = &adapter->hw;
int ret;
- idpf_reset_pf(hw);
- ret = idpf_check_pf_reset_done(hw);
- if (ret != 0) {
- DRV_LOG(ERR, "IDPF is still resetting");
- goto err_check_reset;
- }
-
- ret = idpf_init_mbx(hw);
- if (ret != 0) {
- DRV_LOG(ERR, "Failed to init mailbox");
- goto err_check_reset;
- }
-
adapter->mbx_resp = rte_zmalloc("idpf_adapter_mbx_resp",
IDPF_DFLT_MBX_BUF_SIZE, 0);
if (adapter->mbx_resp == NULL) {
@@ -357,8 +314,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)
rte_free(adapter->mbx_resp);
adapter->mbx_resp = NULL;
err_mbx_resp:
- idpf_ctlq_deinit(hw);
-err_check_reset:
return ret;
}
@@ -367,7 +322,6 @@ idpf_adapter_deinit(struct idpf_adapter *adapter)
{
struct idpf_hw *hw = &adapter->hw;
- idpf_ctlq_deinit(hw);
rte_free(adapter->mbx_resp);
adapter->mbx_resp = NULL;
diff --git a/drivers/common/idpf/idpf_common_device.h
b/drivers/common/idpf/idpf_common_device.h
index c2dc2f16b9..7cf2355bc9 100644
--- a/drivers/common/idpf/idpf_common_device.h
+++ b/drivers/common/idpf/idpf_common_device.h
@@ -10,8 +10,11 @@
#include
#include
+#define IDPF_RESET_WAIT
[PATCH v4 2/2] common/idpf: refine capability get
From: Beilei Xing
Initialize required capability in PMD, and refine
idpf_vc_caps_get function. Then different PMDs can
require different capability.
Signed-off-by: Beilei Xing
---
drivers/common/idpf/idpf_common_virtchnl.c | 45 ++
drivers/net/cpfl/cpfl_ethdev.c | 40 +++
drivers/net/idpf/idpf_ethdev.c | 40 +++
3 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_virtchnl.c
b/drivers/common/idpf/idpf_common_virtchnl.c
index 9ee7259539..a4e129062e 100644
--- a/drivers/common/idpf/idpf_common_virtchnl.c
+++ b/drivers/common/idpf/idpf_common_virtchnl.c
@@ -278,51 +278,12 @@ idpf_vc_api_version_check(struct idpf_adapter *adapter)
int
idpf_vc_caps_get(struct idpf_adapter *adapter)
{
- struct virtchnl2_get_capabilities caps_msg;
struct idpf_cmd_info args;
int err;
- memset(&caps_msg, 0, sizeof(struct virtchnl2_get_capabilities));
-
- caps_msg.csum_caps =
- VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP |
- VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP |
- VIRTCHNL2_CAP_TX_CSUM_GENERIC |
- VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP |
- VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP |
- VIRTCHNL2_CAP_RX_CSUM_GENERIC;
-
- caps_msg.rss_caps =
- VIRTCHNL2_CAP_RSS_IPV4_TCP |
- VIRTCHNL2_CAP_RSS_IPV4_UDP |
- VIRTCHNL2_CAP_RSS_IPV4_SCTP|
- VIRTCHNL2_CAP_RSS_IPV4_OTHER |
- VIRTCHNL2_CAP_RSS_IPV6_TCP |
- VIRTCHNL2_CAP_RSS_IPV6_UDP |
- VIRTCHNL2_CAP_RSS_IPV6_SCTP|
- VIRTCHNL2_CAP_RSS_IPV6_OTHER |
- VIRTCHNL2_CAP_RSS_IPV4_AH |
- VIRTCHNL2_CAP_RSS_IPV4_ESP |
- VIRTCHNL2_CAP_RSS_IPV4_AH_ESP |
- VIRTCHNL2_CAP_RSS_IPV6_AH |
- VIRTCHNL2_CAP_RSS_IPV6_ESP |
- VIRTCHNL2_CAP_RSS_IPV6_AH_ESP;
-
- caps_msg.other_caps = VIRTCHNL2_CAP_WB_ON_ITR;
-
args.ops = VIRTCHNL2_OP_GET_CAPS;
- args.in_args = (uint8_t *)&caps_msg;
- args.in_args_size = sizeof(caps_msg);
+ args.in_args = (uint8_t *)&adapter->caps;
+ args.in_args_size = sizeof(struct virtchnl2_get_capabilities);
args.out_buffer = adapter->mbx_resp;
args.out_size = IDPF_DFLT_MBX_BUF_SIZE;
@@ -333,7 +294,7 @@ idpf_vc_caps_get(struct idpf_adapter *adapter)
return err;
}
- rte_memcpy(&adapter->caps, args.out_buffer, sizeof(caps_msg));
+ rte_memcpy(&adapter->caps, args.out_buffer, sizeof(struct
virtchnl2_get_capabilities));
return 0;
}
diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c
index d3c50619ea..306b8ad769 100644
--- a/drivers/net/cpfl/cpfl_ethdev.c
+++ b/drivers/net/cpfl/cpfl_ethdev.c
@@ -1200,6 +1200,44 @@ static struct idpf_ctlq_create_info
ctlq_info[IDPF_CTLQ_NUM] = {
}
};
+static struct virtchnl2_get_capabilities req_caps = {
+ .csum_caps =
+ VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP |
+ VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP |
+ VIRTCHNL2_CAP_TX_CSUM_GENERIC |
+ VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP |
+ VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP |
+ VIRTCHNL2_CAP_RX_CSUM_GENERIC,
+
+ .rss_caps =
+ VIRTCHNL2_CAP_RSS_IPV4_TCP |
+ VIRTCHNL2_CAP_RSS_IPV4_UDP |
+ VIRTCHNL2_CAP_RSS_IPV4_SCTP|
+ VIRTCHNL2_CAP_RSS_IPV4_OTHER |
+ VIRTCHNL2_CAP_RSS_IPV6_TCP |
+ VIRTCHNL2_CAP_RSS_IPV6_UDP |
+ VIRTCHNL2_CAP_RSS_IPV6_SCTP|
+ VIRTCHNL2_CAP_RSS_IPV6_OTHER
RE: [PATCH v2] eventdev/eth_rx: fix invalid memory access
> -Original Message-
> From: Naga Harish K, S V
> Sent: Thursday, April 6, 2023 1:06 PM
> To: Pavan Nikhilesh Bhagavatula ; Jerin Jacob
> Kollanukkaran
> Cc: dev@dpdk.org
> Subject: [EXT] RE: [PATCH v2] eventdev/eth_rx: fix invalid memory access
>
> External Email
>
> --
> Hi,
>
> > -Original Message-
> > From: pbhagavat...@marvell.com
> > Sent: Wednesday, April 5, 2023 3:14 PM
> > To: jer...@marvell.com; Naga Harish K, S V
> > Cc: dev@dpdk.org; Pavan Nikhilesh
> > Subject: [PATCH v2] eventdev/eth_rx: fix invalid memory access
> >
>
> Which invalid memory access are you referring to?
rxa->eth_rx_poll[0] is NULL when internal port is used.
Also, currently it doesn't account for case where the same Rx adapter is used
for
both internal and non-internal ports, this patch fixes that case too.
>
> > From: Pavan Nikhilesh
> >
> > Rx adapter internal service structures are only initialized when
> > non-internal
> > port is added to the adapter.
> > Check if Rx adapter service is initialized to determine if runtime set/get
> > parameters are supported.
> >
> > Fixes: 3716f52186af ("eventdev/eth_rx: support runtime set/get
> > parameters")
> >
> > Signed-off-by: Pavan Nikhilesh
> > ---
> > v2 Changes:
> > --
> > - Remove unused variables.
> > - Fix spell check.
> >
> > app/test/test_event_eth_rx_adapter.c| 2 ++
> > lib/eventdev/rte_event_eth_rx_adapter.c | 24
> > 2 files changed, 6 insertions(+), 20 deletions(-)
> >
> > diff --git a/app/test/test_event_eth_rx_adapter.c
> > b/app/test/test_event_eth_rx_adapter.c
> > index cfe6052d7e..b1775e6af1 100644
> > --- a/app/test/test_event_eth_rx_adapter.c
> > +++ b/app/test/test_event_eth_rx_adapter.c
> > @@ -1230,6 +1230,8 @@ adapter_get_set_params(void)
> > /* Case 1: Get the default value of mbufs processed by Rx adapter */
> > err =
> > rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID,
> > &out_params);
> > + if (err == -ENOTSUP)
>
> The queue needs to be deleted from the adapter instance before
> returning, otherwise
> teardown fails as adapter_free fails because all the queues are not
> deleted.
I will add teardown in next version.
Thanks.
>
> > + return TEST_SKIPPED;
> > TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> >
> > /* Case 2: Set max_nb_rx = 32 (=BATCH_SEIZE) */ diff --git
> > a/lib/eventdev/rte_event_eth_rx_adapter.c
> > b/lib/eventdev/rte_event_eth_rx_adapter.c
> > index c1cd124002..a8a5564b65 100644
> > --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> > @@ -3466,30 +3466,14 @@
> > rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, static int
> > rxa_caps_check(struct event_eth_rx_adapter *rxa) {
> > - uint16_t eth_dev_id;
> > - uint32_t caps = 0;
> > - int ret;
> > -
> > if (!rxa->nb_queues)
> > return -EINVAL;
> >
> > - /* The eth_dev used is always of same type.
> > -* Hence eth_dev_id is taken from first entry of poll array.
> > -*/
> > - eth_dev_id = rxa->eth_rx_poll[0].eth_dev_id;
> > - ret = rte_event_eth_rx_adapter_caps_get(rxa->eventdev_id,
> > - eth_dev_id,
> > - &caps);
> > - if (ret) {
> > - RTE_EDEV_LOG_ERR("Failed to get adapter caps edev %"
> > PRIu8
> > - "eth port %" PRIu16, rxa->eventdev_id, eth_dev_id);
> > - return ret;
> > - }
> > -
> > - if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT)
> > - return -ENOTSUP;
> > + /* Check if there is at least one non-internal ethernet port. */
> > + if (rxa->service_inited)
> > + return 0;
> >
> > - return 0;
> > + return -ENOTSUP;
> > }
> >
> > int
> > --
> > 2.25.1
[PATCH] app/crypto-perf: change buffer size based on optype
Adding digest size to buffer size in auth-then-cipher
mode with auth_op set to generate as cipher length
includes digest size also.
Signed-off-by: Tejasree Kondoj
---
app/test-crypto-perf/cperf_options_parsing.c | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-crypto-perf/cperf_options_parsing.c
b/app/test-crypto-perf/cperf_options_parsing.c
index 8c9f632590..849a5d6bb4 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -1064,6 +1064,10 @@ check_cipher_buffer_length(struct cperf_options *options)
else
buffer_size = options->buffer_size_list[0];
+ if ((options->auth_op == RTE_CRYPTO_AUTH_OP_GENERATE) &&
+ (options->op_type == CPERF_AUTH_THEN_CIPHER))
+ buffer_size += options->digest_sz;
+
while (buffer_size <= options->max_buffer_size) {
if ((buffer_size % AES_BLOCK_SIZE) != 0) {
RTE_LOG(ERR, USER1, "Some of the buffer sizes
are "
@@ -1090,6 +1094,10 @@ check_cipher_buffer_length(struct cperf_options *options)
else
buffer_size = options->buffer_size_list[0];
+ if ((options->auth_op == RTE_CRYPTO_AUTH_OP_GENERATE) &&
+ (options->op_type == CPERF_AUTH_THEN_CIPHER))
+ buffer_size += options->digest_sz;
+
while (buffer_size <= options->max_buffer_size) {
if ((buffer_size % DES_BLOCK_SIZE) != 0) {
RTE_LOG(ERR, USER1, "Some of the buffer sizes
are "
--
2.25.1
Re: [RFC 00/27] Add VDUSE support to Vhost library
Hi Yongji,
On 4/6/23 05:44, Yongji Xie wrote:
Hi Maxime,
On Fri, Mar 31, 2023 at 11:43 PM Maxime Coquelin
wrote:
This series introduces a new type of backend, VDUSE,
to the Vhost library.
VDUSE stands for vDPA device in Userspace, it enables
implementing a Virtio device in userspace and have it
attached to the Kernel vDPA bus.
Once attached to the vDPA bus, it can be used either by
Kernel Virtio drivers, like virtio-net in our case, via
the virtio-vdpa driver. Doing that, the device is visible
to the Kernel networking stack and is exposed to userspace
as a regular netdev.
It can also be exposed to userspace thanks to the
vhost-vdpa driver, via a vhost-vdpa chardev that can be
passed to QEMU or Virtio-user PMD.
While VDUSE support is already available in upstream
Kernel, a couple of patches are required to support
network device type:
https://gitlab.com/mcoquelin/linux/-/tree/vduse_networking_poc
In order to attach the created VDUSE device to the vDPA
bus, a recent iproute2 version containing the vdpa tool is
required.
Usage:
==
1. Probe required Kernel modules
# modprobe vdpa
# modprobe vduse
# modprobe virtio-vdpa
2. Build (require vduse kernel headers to be available)
# meson build
# ninja -C build
3. Create a VDUSE device (vduse0) using Vhost PMD with
testpmd (with 4 queue pairs in this example)
# ./build/app/dpdk-testpmd --no-pci
--vdev=net_vhost0,iface=/dev/vduse/vduse0,queues=4 --log-level=*:9 -- -i
--txq=4 --rxq=4
4. Attach the VDUSE device to the vDPA bus
# vdpa dev add name vduse0 mgmtdev vduse
=> The virtio-net netdev shows up (eth0 here)
# ip l show eth0
21: eth0: mtu 1500 qdisc mq state UP mode
DEFAULT group default qlen 1000
link/ether c2:73:ea:a7:68:6d brd ff:ff:ff:ff:ff:ff
5. Start/stop traffic in testpmd
testpmd> start
testpmd> show port stats 0
NIC statistics for port 0
RX-packets: 11 RX-missed: 0 RX-bytes: 1482
RX-errors: 0
RX-nombuf: 0
TX-packets: 1 TX-errors: 0 TX-bytes: 62
Throughput (since last show)
Rx-pps:0 Rx-bps:0
Tx-pps:0 Tx-bps:0
testpmd> stop
6. Detach the VDUSE device from the vDPA bus
# vdpa dev del vduse0
7. Quit testpmd
testpmd> quit
Known issues & remaining work:
==
- Fix issue in FD manager (still polling while FD has been removed)
- Add Netlink support in Vhost library
- Support device reconnection
- Support packed ring
- Enable & test more Virtio features
- Provide performance benchmark results
Nice work! Thanks for bringing VDUSE to the network area. I wonder if
you have some plan to support userspace memory registration [1]? I
think this feature can benefit the performance since an extra data
copy could be eliminated in our case.
I plan to have a closer look later, once VDUSE support will be added.
I think it will be difficult to support it in the case of DPDK for
networking:
- For dequeue path it would be basically re-introducing dequeue zero-
copy support that we removed some time ago. It was a hack where we
replaced the regular mbuf buffer with the descriptor one, increased the
reference counter, and at next dequeue API calls checked if the former
mbufs ref counter is 1 and restore the mbuf. Issue is that physical NIC
drivers usually release sent mbufs by pool, once a certain threshold is
met. So it can cause draining of the virtqueue as the descs are not
written back into the used ring for quite some time, depending on the
NIC/traffic/...
- For enqueue path, I don't think this is possible with virtual switches
by design, as when a mbuf is received on a physical port, we don't know
in which Vhost/VDUSE port it will be switched to. And for VM to VM
communication, should it use the src VM buffer or the dest VM one?
Only case it could work is if you had a simple forwarder between a VDUSE
device and a physical port. But I don't think there is much interest in
such use-case.
Any thoughts?
Thanks,
Maxime
[1] https://lwn.net/Articles/902809/
Thanks,
Yongji
[PATCH] net: fix return type of IPv6 L4 packet checksum
From: Elena Agostini Function returns 0 or -1 but the return type is uint16_t. Signed-off-by: Elena Agostini --- lib/net/rte_ip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h index a310e9d498..e7106256aa 100644 --- a/lib/net/rte_ip.h +++ b/lib/net/rte_ip.h @@ -514,7 +514,7 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr *ipv4_hdr, * Return 0 if the checksum is correct, else -1. */ __rte_experimental -static inline uint16_t +static inline int rte_ipv4_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m, const struct rte_ipv4_hdr *ipv4_hdr, uint16_t l4_off) -- 2.34.1
Re: [PATCH v3 10/11] telemetry: disable json print formatting with msvc
On Wed, Apr 05, 2023 at 05:45:18PM -0700, Tyler Retzlaff wrote: > VLAs are unsafe and will never be implemented in MSVC. When compiling > with MSVC just return immediately indicating 0 output characters > formatted. > > For now telemetry doesn't work on Windows, we will revisit support for > the telemetry library sometime after we establish the DPDK unit tests. > > Signed-off-by: Tyler Retzlaff > --- > lib/telemetry/telemetry_json.h | 6 ++ > 1 file changed, 6 insertions(+) > I'm guessing this patch can be dropped if patchset [1] is merged, right? /Bruce [1] http://patches.dpdk.org/project/dpdk/list/?series=27629
RE: [PATCH] net: fix return type of IPv6 L4 packet checksum
Hi Elena, Maybe it is better to add a fixline here. BR. Bing > -Original Message- > From: eagost...@nvidia.com > Sent: Thursday, April 6, 2023 5:21 PM > To: dev@dpdk.org > Cc: stat...@dpdk.org; Elena Agostini > Subject: [PATCH] net: fix return type of IPv6 L4 packet checksum > > External email: Use caution opening links or attachments > > > From: Elena Agostini > > Function returns 0 or -1 but the return type is uint16_t. > > Signed-off-by: Elena Agostini > --- > lib/net/rte_ip.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h index a310e9d498..e7106256aa > 100644 > --- a/lib/net/rte_ip.h > +++ b/lib/net/rte_ip.h > @@ -514,7 +514,7 @@ rte_ipv4_udptcp_cksum_verify(const struct > rte_ipv4_hdr *ipv4_hdr, > * Return 0 if the checksum is correct, else -1. > */ > __rte_experimental > -static inline uint16_t > +static inline int > rte_ipv4_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m, > const struct rte_ipv4_hdr *ipv4_hdr, > uint16_t l4_off) > -- > 2.34.1
[PATCH v2] net: fix return type of IPv6 L4 packet checksum
From: Elena Agostini
Function returns 0 or -1 but the return type is uint16_t.
Fixes: d178f693bbfe ("net: add UDP/TCP checksum in mbuf segments")
Cc: xiaoyun...@intel.com
Signed-off-by: Elena Agostini
---
V2:
added fixline and fixed cc address
---
---
lib/net/rte_ip.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index a310e9d498..e7106256aa 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -514,7 +514,7 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr
*ipv4_hdr,
* Return 0 if the checksum is correct, else -1.
*/
__rte_experimental
-static inline uint16_t
+static inline int
rte_ipv4_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m,
const struct rte_ipv4_hdr *ipv4_hdr,
uint16_t l4_off)
--
2.34.1
RE: [PATCH v10 1/2] mempool cache: add zero-copy get and put functions
> From: Kamalakshitha Aligeri [mailto:kamalakshitha.alig...@arm.com]
> Sent: Friday, 24 February 2023 19.11
>
> From: = Morten Brørup
This should be:
From: Morten Brørup
It could be fixed while merging. This is the only complaint in patchwork.
>
> Zero-copy access to mempool caches is beneficial for PMD performance,
> and
> must be provided by the mempool library to fix [Bug 1052] without a
> performance regression.
>
> [Bug 1052]: https://bugs.dpdk.org/show_bug.cgi?id=1052
>
> Bugzilla ID: 1052
>
> Signed-off-by: Morten Brørup
> Signed-off-by: Kamalakshitha Aligeri
Can we get some reviews/acks on this please? I would like to see mempool
zero-copy go into DPDK before 23.11.
Please also note that the warnings and errors in patchwork regarding patch 2/2
are bogus or unrelated.
> ---
> v10:
> * Added mempool test cases with zero-copy API's
For the parts not provided by myself, i.e. the test cases:
Acked-by: Morten Brørup
[...]
> diff --git a/lib/mempool/version.map b/lib/mempool/version.map
> index dff2d1cb55..06cb83ad9d 100644
> --- a/lib/mempool/version.map
> +++ b/lib/mempool/version.map
> @@ -49,6 +49,15 @@ EXPERIMENTAL {
> __rte_mempool_trace_get_contig_blocks;
> __rte_mempool_trace_default_cache;
> __rte_mempool_trace_cache_flush;
> + __rte_mempool_trace_ops_populate;
> + __rte_mempool_trace_ops_alloc;
> + __rte_mempool_trace_ops_free;
> + __rte_mempool_trace_set_ops_byname;
> +
> + # added in 23.03
Time is passing, so now this should be updated to 23.07
It could be fixed while merging.
> + __rte_mempool_trace_cache_zc_put_bulk;
> + __rte_mempool_trace_cache_zc_put_rewind;
> + __rte_mempool_trace_cache_zc_get_bulk;
> };
>
> INTERNAL {
Re: [RFC 00/27] Add VDUSE support to Vhost library
On Thu, Apr 6, 2023 at 4:17 PM Maxime Coquelin wrote: > > Hi Yongji, > > On 4/6/23 05:44, Yongji Xie wrote: > > Hi Maxime, > > > > On Fri, Mar 31, 2023 at 11:43 PM Maxime Coquelin > > wrote: > >> > >> This series introduces a new type of backend, VDUSE, > >> to the Vhost library. > >> > >> VDUSE stands for vDPA device in Userspace, it enables > >> implementing a Virtio device in userspace and have it > >> attached to the Kernel vDPA bus. > >> > >> Once attached to the vDPA bus, it can be used either by > >> Kernel Virtio drivers, like virtio-net in our case, via > >> the virtio-vdpa driver. Doing that, the device is visible > >> to the Kernel networking stack and is exposed to userspace > >> as a regular netdev. > >> > >> It can also be exposed to userspace thanks to the > >> vhost-vdpa driver, via a vhost-vdpa chardev that can be > >> passed to QEMU or Virtio-user PMD. > >> > >> While VDUSE support is already available in upstream > >> Kernel, a couple of patches are required to support > >> network device type: > >> > >> https://gitlab.com/mcoquelin/linux/-/tree/vduse_networking_poc > >> > >> In order to attach the created VDUSE device to the vDPA > >> bus, a recent iproute2 version containing the vdpa tool is > >> required. > >> > >> Usage: > >> == > >> > >> 1. Probe required Kernel modules > >> # modprobe vdpa > >> # modprobe vduse > >> # modprobe virtio-vdpa > >> > >> 2. Build (require vduse kernel headers to be available) > >> # meson build > >> # ninja -C build > >> > >> 3. Create a VDUSE device (vduse0) using Vhost PMD with > >> testpmd (with 4 queue pairs in this example) > >> # ./build/app/dpdk-testpmd --no-pci > >> --vdev=net_vhost0,iface=/dev/vduse/vduse0,queues=4 --log-level=*:9 -- -i > >> --txq=4 --rxq=4 > >> > >> 4. Attach the VDUSE device to the vDPA bus > >> # vdpa dev add name vduse0 mgmtdev vduse > >> => The virtio-net netdev shows up (eth0 here) > >> # ip l show eth0 > >> 21: eth0: mtu 1500 qdisc mq state UP > >> mode DEFAULT group default qlen 1000 > >> link/ether c2:73:ea:a7:68:6d brd ff:ff:ff:ff:ff:ff > >> > >> 5. Start/stop traffic in testpmd > >> testpmd> start > >> testpmd> show port stats 0 > >> NIC statistics for port 0 > >> > >>RX-packets: 11 RX-missed: 0 RX-bytes: 1482 > >>RX-errors: 0 > >>RX-nombuf: 0 > >>TX-packets: 1 TX-errors: 0 TX-bytes: 62 > >> > >>Throughput (since last show) > >>Rx-pps:0 Rx-bps:0 > >>Tx-pps:0 Tx-bps:0 > >> > >> > >> testpmd> stop > >> > >> 6. Detach the VDUSE device from the vDPA bus > >> # vdpa dev del vduse0 > >> > >> 7. Quit testpmd > >> testpmd> quit > >> > >> Known issues & remaining work: > >> == > >> - Fix issue in FD manager (still polling while FD has been removed) > >> - Add Netlink support in Vhost library > >> - Support device reconnection > >> - Support packed ring > >> - Enable & test more Virtio features > >> - Provide performance benchmark results > >> > > > > Nice work! Thanks for bringing VDUSE to the network area. I wonder if > > you have some plan to support userspace memory registration [1]? I > > think this feature can benefit the performance since an extra data > > copy could be eliminated in our case. > > I plan to have a closer look later, once VDUSE support will be added. > I think it will be difficult to support it in the case of DPDK for > networking: > > - For dequeue path it would be basically re-introducing dequeue zero- > copy support that we removed some time ago. It was a hack where we > replaced the regular mbuf buffer with the descriptor one, increased the > reference counter, and at next dequeue API calls checked if the former > mbufs ref counter is 1 and restore the mbuf. Issue is that physical NIC > drivers usually release sent mbufs by pool, once a certain threshold is > met. So it can cause draining of the virtqueue as the descs are not > written back into the used ring for quite some time, depending on the > NIC/traffic/... > OK, I see. Could this issue be mitigated by releasing sent mbufs one by one once we sent it out or simply increasing the virtqueue size? > - For enqueue path, I don't think this is possible with virtual switches > by design, as when a mbuf is received on a physical port, we don't know > in which Vhost/VDUSE port it will be switched to. And for VM to VM > communication, should it use the src VM buffer or the dest VM one? > Yes, I agree that it's hard to achieve that in the enqueue path. > Only case it could work is if you had a simple forwarder between a VDUSE > device and a physical port. But I don't think there is much interest in > such use-case. > OK, I get it. Thanks, Yongji
21.11.4 patches review and test
Hi all, Here is a list of patches targeted for stable release 21.11.4. The planned date for the final release is 25th April. Please help with testing and validation of your use cases and report any issues/results with reply-all to this mail. For the final release the fixes and reported validations will be added to the release notes. A release candidate tarball can be found at: https://dpdk.org/browse/dpdk-stable/tag/?id=v21.11.4-rc1 These patches are located at branch 21.11 of dpdk-stable repo: https://dpdk.org/browse/dpdk-stable/ Thanks. Kevin --- Akhil Goyal (1): examples/ipsec-secgw: fix auth IV length Alexander Kozyrev (4): net/mlx5: fix error CQE dumping for vectorized Rx net/mlx5: ignore non-critical syndromes for Rx queue net/mlx5: check compressed CQE opcode in vectorized Rx net/mlx5: fix CQE dump for Tx Andy Pei (2): vdpa/ifc: fix argument compatibility check vdpa/ifc: fix reconnection in SW-assisted live migration Anoob Joseph (3): app/crypto-perf: fix number of segments app/crypto-perf: fix SPI zero app/crypto-perf: fix IPsec direction Arkadiusz Kusztal (1): app/compress-perf: fix remaining data for ops Ashish Sadanandan (1): eal/linux: fix hugetlbfs sub-directories discovery Ben Magistro (1): app/dumpcap: fix storing port identifier Bing Zhao (2): net/mlx5: fix hairpin Tx queue reference count net/mlx5: fix sysfs port name translation Boleslav Stankevich (1): net/virtio: deduce IP length for TSO checksum Bruce Richardson (8): dma/ioat: fix device stop if no copies done dma/ioat: fix indexes after restart dma/ioat: fix error reporting on restart build: fix toolchain definition examples/cmdline: fix build with GCC 12 examples/qos_sched: fix Tx port config when link down mailmap: add list of contributors examples/qos_sched: fix config entries in wrong sections Chengwen Feng (13): mem: fix hugepage info mapping raw/ifpga/base: fix init with multi-process telemetry: fix repeat display when callback don't init dict net/hns3: declare flow rule keeping capability eal/freebsd: fix lock in alarm callback kvargs: add API documentation for process callback compressdev: fix empty devargs parsing cryptodev: fix empty devargs parsing net/hns3: fix empty devargs parsing net/virtio: fix empty devargs parsing dma/skeleton: fix empty devargs parsing raw/skeleton: fix empty devargs parsing net/hns3: remove unused structures Ciara Power (4): crypto/qat: fix stream cipher direction app/crypto-perf: fix test file memory leak test/crypto: fix ZUC digest length in comparison test/crypto: fix capability check for ZUC cipher-auth David Christensen (1): acl: fix crash on PPC64 with GCC 11 David Marchand (21): hash: fix GFNI implementation build with GCC 12 fbarray: fix metadata dump gpudev: fix deadlocks when registering callback graph: fix node shrink crypto/ccp: remove some printf crypto/ccp: remove some dead code for UIO crypto/ccp: fix IOVA handling net/iavf: protect insertion in flow list app/testpmd: fix crash on cleanup doc: fix reference to event timer header vhost: fix OOB access for invalid vhost ID app/testpmd: fix Tx preparation in checksum engine app/testpmd: fix packet count in IEEE 1588 engine app/testpmd: fix packet transmission in noisy VNF engine raw/skeleton: fix selftest net/vhost: add missing newline in logs net/vhost: fix leak in interrupt handle setup net/vhost: fix Rx interrupt net/virtio: remove address width limit for modern devices net/mlx5: fix build with GCC 12 and ASan ci: switch to Ubuntu 20.04 Edwin Brossette (1): net/bnxt: fix link state change interrupt config Erik Gabriel Carrillo (1): eventdev/timer: fix overflow Fengnan Chang (1): eal: cleanup alarm and hotplug before memory detach Ferruh Yigit (4): kni: fix build on RHEL 9.1 app/testpmd: fix forwarding stats for Tx dropped app/testpmd: fix link check condition on port start ethdev: remove telemetry Rx mbuf alloc failed field Gerry Gribbon (2): regex/mlx5: utilize all available queue pairs regex/mlx5: fix doorbell record Gowrishankar Muthukrishnan (1): common/cnxk: fix auth key length Gregory Etelson (1): app/testpmd: fix interactive mode with no ports Harshad Narayane (1): doc: fix pipeline example path in user guide Hernan Vargas (6): baseband/acc: fix memory leak on acc100 close baseband/acc: fix acc100 iteration counter in TB test/bbdev: fix crash for non supported HARQ length test/bbdev: extend HARQ tolerance test/bbdev: remove check for invalid opaque data app/bbdev: check statistics failure Honnappa Nagarahalli (
Re: [PATCH] test/crypto: add cryptodev reconfig test
Hi Aakash,
I really like the idea to create a test for device reconfiguration.
I am wondering if we need to test all PMDs against this patch first.
Regards,
Fan
On 4/5/2023 8:41 AM, Aakash Sasidharan wrote:
Add cryptodev tests to verify that the device supports
reconfiguration any number of times via
rte_cryptodev_configure API.
Signed-off-by: Aakash Sasidharan
---
app/test/test_cryptodev.c | 81 +++
1 file changed, 81 insertions(+)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 9c670e9a35..3376ed91a3 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -12368,6 +12368,85 @@ test_stats(void)
return TEST_SUCCESS;
}
+static int
+test_device_reconfigure(void)
+{
+ struct crypto_testsuite_params *ts_params = &testsuite_params;
+ uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs;
+ struct rte_cryptodev_qp_conf qp_conf = {
+ .nb_descriptors = MAX_NUM_OPS_INFLIGHT,
+ .mp_session = ts_params->session_mpool
+ };
+ uint16_t qp_id, dev_id, num_devs = 0;
+
+ TEST_ASSERT((num_devs = rte_cryptodev_count()) >= 1,
+ "Need at least %d devices for test", 1);
+
+ dev_id = ts_params->valid_devs[0];
+
+ /* Stop the device in case it's started so it can be configured */
+ rte_cryptodev_stop(dev_id);
+
+ TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
+ "Failed test for rte_cryptodev_configure: "
+ "dev_num %u", dev_id);
+
+ /* Reconfigure with same configure params */
+ TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
+ "Failed test for rte_cryptodev_configure: "
+ "dev_num %u", dev_id);
+
+ /* Reconfigure with just one queue pair */
+ ts_params->conf.nb_queue_pairs = 1;
+
+ TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+ &ts_params->conf),
+ "Failed to configure cryptodev: dev_id %u, qp_id %u",
+ ts_params->valid_devs[0],
ts_params->conf.nb_queue_pairs);
+
+ for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+ TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+ ts_params->valid_devs[0], qp_id, &qp_conf,
+ rte_cryptodev_socket_id(
+ ts_params->valid_devs[0])),
+ "Failed test for "
+ "rte_cryptodev_queue_pair_setup: num_inflights "
+ "%u on qp %u on cryptodev %u",
+ qp_conf.nb_descriptors, qp_id,
+ ts_params->valid_devs[0]);
+ }
+
+ /* Reconfigure with max number of queue pairs */
+ ts_params->conf.nb_queue_pairs = orig_nb_qps;
+
+ TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
+ &ts_params->conf),
+ "Failed to configure cryptodev: dev_id %u, qp_id %u",
+ ts_params->valid_devs[0],
ts_params->conf.nb_queue_pairs);
+
+ qp_conf.mp_session = ts_params->session_mpool;
+
+ for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
+ TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
+ ts_params->valid_devs[0], qp_id, &qp_conf,
+ rte_cryptodev_socket_id(
+ ts_params->valid_devs[0])),
+ "Failed test for "
+ "rte_cryptodev_queue_pair_setup: num_inflights "
+ "%u on qp %u on cryptodev %u",
+ qp_conf.nb_descriptors, qp_id,
+ ts_params->valid_devs[0]);
+ }
+
+ /* Start the device */
+ TEST_ASSERT_SUCCESS(rte_cryptodev_start(ts_params->valid_devs[0]),
+ "Failed to start cryptodev %u",
+ ts_params->valid_devs[0]);
+
+ /* Test expected values */
+ return test_AES_CBC_HMAC_SHA1_encrypt_digest();
+}
+
static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
struct crypto_unittest_params *ut_params,
enum rte_crypto_auth_operation op,
@@ -16022,6 +16101,8 @@ static struct unit_test_suite cryptodev_gen_testsuite
= {
.suite_name = "Crypto General Unit Test Suite",
.setup = crypto_gen_testsuite_setup,
.unit_test_cases = {
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_device_reconfigure),
TEST_CASE_ST(ut_setup, ut_teardown,
Re: [PATCH v3 10/11] telemetry: disable json print formatting with msvc
On Thu, Apr 06, 2023 at 10:25:07AM +0100, Bruce Richardson wrote: > On Wed, Apr 05, 2023 at 05:45:18PM -0700, Tyler Retzlaff wrote: > > VLAs are unsafe and will never be implemented in MSVC. When compiling > > with MSVC just return immediately indicating 0 output characters > > formatted. > > > > For now telemetry doesn't work on Windows, we will revisit support for > > the telemetry library sometime after we establish the DPDK unit tests. > > > > Signed-off-by: Tyler Retzlaff > > --- > > lib/telemetry/telemetry_json.h | 6 ++ > > 1 file changed, 6 insertions(+) > > > I'm guessing this patch can be dropped if patchset [1] is merged, right? Absolutely. I'll take a look at the referenced series soon. > > /Bruce > > [1] http://patches.dpdk.org/project/dpdk/list/?series=27629
[PATCH 0/6] add support for CDX bus
Support AMD CDX bus, for FPGA based CDX devices. The CDX devices are memory mapped on system bus for embedded CPUs. It uses sysfs interface and the vfio-cdx driver to discover and initialize the CDX devices. The patches are intended for DPDK 23.07 release, and have been sent as an RFC as patches are yet to be merged in Linux. Linux CDX bus patches has been added into linux next: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/cdx VFIO patches are also submitted in upstream: https://www.spinics.net/lists/kvm/msg310623.html CDX is a Hardware Architecture designed for AMD FPGA devices. It consists of mechanism for interaction between FPGA, Firmware and the APUs (Application CPUs). Firmware resides on RPU (Realtime CPUs) which interacts with the FPGA program manager and the APUs. The RPU provides memory-mapped interface (RPU if) which is used to communicate with APUs. VFIO CDX driver provides the CDX device resources like MMIO and interrupts to map to user-space. DPDK CDX bus uses sysfs interface and the vfio-cdx driver to discover and initialize the CDX devices for user-space applications. RFC patches in DPDK were submitted at: http://patches.dpdk.org/project/dpdk/patch/20230124140746.594066-2-nipun.gu...@amd.com/ Changes RFC->v1: - Marked few API's as internal which were not required to be provided to user. Nipun Gupta (6): bus/cdx: introduce cdx bus bus/cdx: add dma map and unmap support bus/cdx: add support for MSI bus/cdx: support plug unplug and dev iterator bus: enable cdx bus config/arm: add AMD CDX MAINTAINERS| 5 + config/arm/arm64_cdx_linux_gcc | 17 + config/arm/meson.build | 14 + drivers/bus/cdx/cdx.c | 743 + drivers/bus/cdx/cdx.h | 54 ++ drivers/bus/cdx/cdx_logs.h | 37 ++ drivers/bus/cdx/cdx_vfio.c | 598 drivers/bus/cdx/meson.build| 13 + drivers/bus/cdx/rte_bus_cdx.h | 245 drivers/bus/cdx/version.map| 21 + drivers/bus/meson.build| 1 + lib/eal/common/eal_common_interrupts.c | 21 + lib/eal/common/eal_interrupts.h| 1 + lib/eal/include/rte_interrupts.h | 32 ++ lib/eal/version.map| 2 + 15 files changed, 1804 insertions(+) create mode 100644 config/arm/arm64_cdx_linux_gcc create mode 100644 drivers/bus/cdx/cdx.c create mode 100644 drivers/bus/cdx/cdx.h create mode 100644 drivers/bus/cdx/cdx_logs.h create mode 100644 drivers/bus/cdx/cdx_vfio.c create mode 100644 drivers/bus/cdx/meson.build create mode 100644 drivers/bus/cdx/rte_bus_cdx.h create mode 100644 drivers/bus/cdx/version.map -- 2.17.1
[PATCH 1/6] bus/cdx: introduce cdx bus
CDX bus supports multiple type of devices, which can be
exposed to user-space via vfio-cdx.
vfio-cdx provides the MMIO IO_MEMORY regions as well as the
DMA interface for the device (IOMMU).
This support aims to enable the DPDK to support the cdx
devices in user-space using VFIO interface.
Signed-off-by: Nipun Gupta
---
MAINTAINERS | 5 +
drivers/bus/cdx/cdx.c | 570 ++
drivers/bus/cdx/cdx.h | 54
drivers/bus/cdx/cdx_logs.h| 37 +++
drivers/bus/cdx/cdx_vfio.c| 420 +
drivers/bus/cdx/meson.build | 13 +
drivers/bus/cdx/rte_bus_cdx.h | 219 +
drivers/bus/cdx/version.map | 19 ++
8 files changed, 1337 insertions(+)
create mode 100644 drivers/bus/cdx/cdx.c
create mode 100644 drivers/bus/cdx/cdx.h
create mode 100644 drivers/bus/cdx/cdx_logs.h
create mode 100644 drivers/bus/cdx/cdx_vfio.c
create mode 100644 drivers/bus/cdx/meson.build
create mode 100644 drivers/bus/cdx/rte_bus_cdx.h
create mode 100644 drivers/bus/cdx/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 8df23e5099..1f9b6af9b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -569,6 +569,11 @@ M: Parav Pandit
M: Xueming Li
F: drivers/bus/auxiliary/
+CDX bus driver
+M: Nipun Gupta
+M: Nikhil Agarwal
+F: drivers/bus/cdx/
+
Intel FPGA bus
M: Rosen Xu
F: drivers/bus/ifpga/
diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c
new file mode 100644
index 00..c5f8e37a2f
--- /dev/null
+++ b/drivers/bus/cdx/cdx.c
@@ -0,0 +1,570 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
+ */
+
+/*
+ * Architecture Overview
+ * =
+ * CDX is a Hardware Architecture designed for AMD FPGA devices. It
+ * consists of sophisticated mechanism for interaction between FPGA,
+ * Firmware and the APUs (Application CPUs).
+ *
+ * Firmware resides on RPU (Realtime CPUs) which interacts with
+ * the FPGA program manager and the APUs. The RPU provides memory-mapped
+ * interface (RPU if) which is used to communicate with APUs.
+ *
+ * The diagram below shows an overview of the CDX architecture:
+ *
+ * +--+
+ * | DPDK |
+ * |DPDK CDX drivers |
+ * | ||
+ * | DPDK CDX bus|
+ * | ||
+ * +-|+
+ *|
+ * +-|+
+ * |Application CPUs (APU) ||
+ * | ||
+ * | VFIO CDX driver |
+ * | Linux OS||
+ * | Linux CDX bus |
+ * | ||
+ * +-|+
+ *|
+ *|
+ * +| RPU if |+
+ * | ||
+ * | V|
+ * | Realtime CPUs (RPU) |
+ * | |
+ * +--+
+ *|
+ * +-|+
+ * | FPGA ||
+ * | +---+ |
+ * | | | | |
+ * | +---++---+ +---+ |
+ * | | dev 1 || dev 2 | | dev 3 | |
+ * | +---++---+ +---+ |
+ * +--+
+ *
+ * The RPU firmware extracts the device information from the loaded FPGA
+ * image and implements a mechanism that allows the APU drivers to
+ * enumerate such devices (device personality and resource details) via
+ * a dedicated communication channel.
+ *
+ * VFIO CDX driver provides the CDX device resources like MMIO and interrupts
+ * to map to user-space. DPDK CDX bus uses sysfs interface and the vfio-cdx
+ * driver to discover and initialize the CDX devices for user-space
+ * applications.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "cdx.h"
+#include "cdx_logs.h"
+
+#define SYSFS_CDX_DEVICES "/sys/bus/cdx/devices"
+#define CDX_BUS_NAME cdx
+#define CDX_DEV_PREFIX "cdx-"
+
+/**
+ * @file
+ * CDX probing using Linux sysfs.
+ */
+
+/* Add a device to CDX bus */
+static void
+rte_cdx_add_device(struct rte_cdx_device *cdx_dev)
+{
+ TAILQ_INSERT_TAIL(&rte_cdx_bus.device_list, cdx_dev, next);
+}
+
+static int
+cdx_get_kernel_driver_
[PATCH 2/6] bus/cdx: add dma map and unmap support
CDX bus can use VFIO interface for mapping and unmapping
of DMA addresses in the IOMMU. This change adds the callback
support for map and unmap APIs as well as fetching the IOMMU
class.
Signed-off-by: Nipun Gupta
---
drivers/bus/cdx/cdx.c | 40
1 file changed, 40 insertions(+)
diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c
index c5f8e37a2f..fa6bfe3bc2 100644
--- a/drivers/bus/cdx/cdx.c
+++ b/drivers/bus/cdx/cdx.c
@@ -555,12 +555,52 @@ cdx_find_device(const struct rte_device *start,
rte_dev_cmp_t cmp,
return NULL;
}
+static int
+cdx_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+ struct rte_cdx_device *cdx_dev = RTE_DEV_TO_CDX_DEV(dev);
+
+ if (!cdx_dev) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ return rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
+ (uintptr_t)addr, iova, len);
+}
+
+static int
+cdx_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+ struct rte_cdx_device *cdx_dev = RTE_DEV_TO_CDX_DEV(dev);
+
+ if (!cdx_dev) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ return rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
+ (uintptr_t)addr, iova, len);
+}
+
+static enum rte_iova_mode
+rte_cdx_get_iommu_class(void)
+{
+ if (TAILQ_EMPTY(&rte_cdx_bus.device_list))
+ return RTE_IOVA_DC;
+
+ return RTE_IOVA_VA;
+}
+
struct rte_cdx_bus rte_cdx_bus = {
.bus = {
.scan = rte_cdx_scan,
.probe = cdx_probe,
.find_device = cdx_find_device,
.parse = cdx_parse,
+ .dma_map = cdx_dma_map,
+ .dma_unmap = cdx_dma_unmap,
+ .get_iommu_class = rte_cdx_get_iommu_class,
},
.device_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.device_list),
.driver_list = TAILQ_HEAD_INITIALIZER(rte_cdx_bus.driver_list),
--
2.17.1
[PATCH 3/6] bus/cdx: add support for MSI
MSI's are exposed to the devices using VFIO (vfio-cdx). This
patch uses the same to add support for MSI for the devices on
the cdx bus.
Signed-off-by: Nipun Gupta
---
drivers/bus/cdx/cdx.c | 11 ++
drivers/bus/cdx/cdx_vfio.c | 182 -
drivers/bus/cdx/rte_bus_cdx.h | 25
drivers/bus/cdx/version.map| 2 +
lib/eal/common/eal_common_interrupts.c | 21 +++
lib/eal/common/eal_interrupts.h| 1 +
lib/eal/include/rte_interrupts.h | 32 +
lib/eal/version.map| 2 +
8 files changed, 274 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c
index fa6bfe3bc2..9732a32eb1 100644
--- a/drivers/bus/cdx/cdx.c
+++ b/drivers/bus/cdx/cdx.c
@@ -225,6 +225,15 @@ cdx_scan_one(const char *dirname, const char *dev_name)
goto err;
}
+ /* Allocate interrupt instance for cdx device */
+ dev->intr_handle =
+ rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);
+ if (dev->intr_handle == NULL) {
+ CDX_BUS_ERR("Failed to create interrupt instance for %s\n",
+ dev->device.name);
+ return -ENOMEM;
+ }
+
/*
* Check if device is bound to 'vfio-cdx' driver, so that user-space
* can gracefully access the device.
@@ -416,6 +425,8 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,
return ret;
error_probe:
+ rte_intr_instance_free(dev->intr_handle);
+ dev->intr_handle = NULL;
cdx_vfio_unmap_resource(dev);
error_map_device:
return ret;
diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c
index a53137c416..93c2ad0221 100644
--- a/drivers/bus/cdx/cdx_vfio.c
+++ b/drivers/bus/cdx/cdx_vfio.c
@@ -60,6 +60,10 @@ struct mapped_cdx_resource {
/** mapped cdx device list */
TAILQ_HEAD(mapped_cdx_res_list, mapped_cdx_resource);
+/* irq set buffer length for MSI interrupts */
+#define MSI_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))
+
static struct rte_tailq_elem cdx_vfio_tailq = {
.name = "VFIO_CDX_RESOURCE_LIST",
};
@@ -108,6 +112,27 @@ cdx_vfio_unmap_resource_primary(struct rte_cdx_device *dev)
char cdx_addr[PATH_MAX] = {0};
struct mapped_cdx_resource *vfio_res = NULL;
struct mapped_cdx_res_list *vfio_res_list;
+ int ret, vfio_dev_fd;
+
+ if (rte_intr_fd_get(dev->intr_handle) < 0)
+ return -1;
+
+ if (close(rte_intr_fd_get(dev->intr_handle)) < 0) {
+ CDX_BUS_ERR("Error when closing eventfd file descriptor for %s",
+ dev->device.name);
+ return -1;
+ }
+
+ vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+ if (vfio_dev_fd < 0)
+ return -1;
+
+ ret = rte_vfio_release_device(rte_cdx_get_sysfs_path(),
dev->device.name,
+ vfio_dev_fd);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot release VFIO device");
+ return ret;
+ }
vfio_res_list =
RTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);
@@ -130,6 +155,18 @@ cdx_vfio_unmap_resource_secondary(struct rte_cdx_device
*dev)
{
struct mapped_cdx_resource *vfio_res = NULL;
struct mapped_cdx_res_list *vfio_res_list;
+ int ret, vfio_dev_fd;
+
+ vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+ if (vfio_dev_fd < 0)
+ return -1;
+
+ ret = rte_vfio_release_device(rte_cdx_get_sysfs_path(),
dev->device.name,
+ vfio_dev_fd);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot release VFIO device");
+ return ret;
+ }
vfio_res_list =
RTE_TAILQ_CAST(cdx_vfio_tailq.head, mapped_cdx_res_list);
@@ -154,9 +191,80 @@ cdx_vfio_unmap_resource(struct rte_cdx_device *dev)
return cdx_vfio_unmap_resource_secondary(dev);
}
+/* set up interrupt support (but not enable interrupts) */
static int
-cdx_rte_vfio_setup_device(int vfio_dev_fd)
+cdx_vfio_setup_interrupts(struct rte_cdx_device *dev, int vfio_dev_fd,
+ int num_irqs)
{
+ int i, ret;
+
+ if (num_irqs == 0)
+ return 0;
+
+ /* start from MSI interrupt type */
+ for (i = 0; i < num_irqs; i++) {
+ struct vfio_irq_info irq = { .argsz = sizeof(irq) };
+ int fd = -1;
+
+ irq.index = i;
+
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);
+ if (ret < 0) {
+ CDX_BUS_ERR("Cannot get VFIO IRQ info, error %i (%s)",
+ errno, strerror(errno));
+ return -1;
+ }
+
+ /* if this vector cannot be used with eventfd,
[PATCH 4/6] bus/cdx: support plug unplug and dev iterator
This change adds support for plugging and unplugging
CDX devices on the CDX bus. Also, CDX dev iterator support
has been added for the CDX bus.
Signed-off-by: Nipun Gupta
---
drivers/bus/cdx/cdx.c | 142 +++---
drivers/bus/cdx/rte_bus_cdx.h | 1 +
2 files changed, 133 insertions(+), 10 deletions(-)
diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c
index 9732a32eb1..8c72de9fe4 100644
--- a/drivers/bus/cdx/cdx.c
+++ b/drivers/bus/cdx/cdx.c
@@ -69,6 +69,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -82,6 +83,15 @@
#define CDX_BUS_NAME cdx
#define CDX_DEV_PREFIX "cdx-"
+enum cdx_params {
+ RTE_CDX_PARAM_NAME,
+};
+
+static const char * const cdx_params_keys[] = {
+ [RTE_CDX_PARAM_NAME] = "name",
+ NULL,
+};
+
/**
* @file
* CDX probing using Linux sysfs.
@@ -89,7 +99,7 @@
/* Add a device to CDX bus */
static void
-rte_cdx_add_device(struct rte_cdx_device *cdx_dev)
+cdx_add_device(struct rte_cdx_device *cdx_dev)
{
TAILQ_INSERT_TAIL(&rte_cdx_bus.device_list, cdx_dev, next);
}
@@ -259,7 +269,7 @@ cdx_scan_one(const char *dirname, const char *dev_name)
}
dev->id.device_id = (uint16_t)tmp;
- rte_cdx_add_device(dev);
+ cdx_add_device(dev);
return 0;
@@ -276,7 +286,7 @@ cdx_scan_one(const char *dirname, const char *dev_name)
* list.
*/
static int
-rte_cdx_scan(void)
+cdx_scan(void)
{
struct dirent *e;
DIR *dir;
@@ -356,7 +366,7 @@ cdx_unmap_resource(void *requested_addr, size_t size)
* Match the CDX Driver and Device using device id and vendor id.
*/
static int
-rte_cdx_match(const struct rte_cdx_driver *cdx_drv,
+cdx_match(const struct rte_cdx_driver *cdx_drv,
const struct rte_cdx_device *cdx_dev)
{
const struct rte_cdx_id *id_table;
@@ -382,7 +392,7 @@ rte_cdx_match(const struct rte_cdx_driver *cdx_drv,
* driver.
*/
static int
-rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,
+cdx_probe_one_driver(struct rte_cdx_driver *dr,
struct rte_cdx_device *dev)
{
const char *dev_name = dev->device.name;
@@ -393,7 +403,7 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,
return -EINVAL;
/* The device is not blocked; Check if driver supports it */
- if (!rte_cdx_match(dr, dev))
+ if (!cdx_match(dr, dev))
/* Match of device and driver failed */
return 1;
@@ -421,6 +431,7 @@ rte_cdx_probe_one_driver(struct rte_cdx_driver *dr,
} else {
dev->device.driver = &dr->driver;
}
+ dev->driver = dr;
return ret;
@@ -447,7 +458,7 @@ cdx_probe_all_drivers(struct rte_cdx_device *dev)
return -EINVAL;
FOREACH_DRIVER_ON_CDXBUS(dr) {
- rc = rte_cdx_probe_one_driver(dr, dev);
+ rc = cdx_probe_one_driver(dr, dev);
if (rc < 0)
/* negative value is an error */
return rc;
@@ -566,6 +577,71 @@ cdx_find_device(const struct rte_device *start,
rte_dev_cmp_t cmp,
return NULL;
}
+/* Remove a device from CDX bus */
+static void
+cdx_remove_device(struct rte_cdx_device *cdx_dev)
+{
+ TAILQ_REMOVE(&rte_cdx_bus.device_list, cdx_dev, next);
+}
+
+/*
+ * If vendor/device ID match, call the remove() function of the
+ * driver.
+ */
+static int
+cdx_detach_dev(struct rte_cdx_device *dev)
+{
+ struct rte_cdx_driver *dr;
+ int ret = 0;
+
+ if (dev == NULL)
+ return -EINVAL;
+
+ dr = dev->driver;
+
+ CDX_BUS_DEBUG("detach device %s using driver: %s",
+ dev->device.name, dr->driver.name);
+
+ if (dr->remove) {
+ ret = dr->remove(dev);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* clear driver structure */
+ dev->driver = NULL;
+ dev->device.driver = NULL;
+
+ rte_cdx_unmap_device(dev);
+
+ rte_intr_instance_free(dev->intr_handle);
+ dev->intr_handle = NULL;
+
+ return 0;
+}
+
+static int
+cdx_plug(struct rte_device *dev)
+{
+ return cdx_probe_all_drivers(RTE_DEV_TO_CDX_DEV(dev));
+}
+
+static int
+cdx_unplug(struct rte_device *dev)
+{
+ struct rte_cdx_device *cdx_dev;
+ int ret;
+
+ cdx_dev = RTE_DEV_TO_CDX_DEV(dev);
+ ret = cdx_detach_dev(cdx_dev);
+ if (ret == 0) {
+ cdx_remove_device(cdx_dev);
+ rte_devargs_remove(dev->devargs);
+ free(cdx_dev);
+ }
+ return ret;
+}
+
static int
cdx_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
{
@@ -595,7 +671,7 @@ cdx_dma_unmap(struct rte_device *dev, void *addr, uint64_t
iova, size_t len)
}
static enum rte_iova_mode
-rte_cdx_get_iommu_class(void)
+cdx_get_iommu_class(void)
{
if (TAILQ_EMPTY(&rte_cdx_bus.device_list))
ret
[PATCH 5/6] bus: enable cdx bus
enable the compilation of cdx bus Signed-off-by: Nipun Gupta --- drivers/bus/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index 6d2520c543..a78b4283bf 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -3,6 +3,7 @@ drivers = [ 'auxiliary', +'cdx', 'dpaa', 'fslmc', 'ifpga', -- 2.17.1
[PATCH 6/6] config/arm: add AMD CDX
Adding support for AMD CDX devices
Signed-off-by: Nipun Gupta
---
config/arm/arm64_cdx_linux_gcc | 17 +
config/arm/meson.build | 14 ++
2 files changed, 31 insertions(+)
create mode 100644 config/arm/arm64_cdx_linux_gcc
diff --git a/config/arm/arm64_cdx_linux_gcc b/config/arm/arm64_cdx_linux_gcc
new file mode 100644
index 00..8e6d619dae
--- /dev/null
+++ b/config/arm/arm64_cdx_linux_gcc
@@ -0,0 +1,17 @@
+[binaries]
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ar = 'aarch64-linux-gnu-ar'
+as = 'aarch64-linux-gnu-as'
+strip = 'aarch64-linux-gnu-strip'
+pkgconfig = 'aarch64-linux-gnu-pkg-config'
+pcap-config = ''
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'armv8-a'
+endian = 'little'
+
+[properties]
+platform = 'cdx'
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 5213434ca4..39b8929534 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -305,6 +305,18 @@ soc_bluefield = {
'numa': false
}
+soc_cdx = {
+'description': 'AMD CDX',
+'implementer': '0x41',
+'part_number': '0xd42',
+'flags': [
+['RTE_MACHINE', '"cdx"'],
+['RTE_MAX_LCORE', 16],
+['RTE_MAX_NUMA_NODES', 1]
+],
+'numa': false
+}
+
soc_centriq2400 = {
'description': 'Qualcomm Centriq 2400',
'implementer': '0x51',
@@ -463,6 +475,7 @@ generic_aarch32: Generic un-optimized build for armv8
aarch32 execution mode.
armada: Marvell ARMADA
bluefield: NVIDIA BlueField
bluefield3: NVIDIA BlueField-3
+cdx: AMD CDX
centriq2400: Qualcomm Centriq 2400
cn9k:Marvell OCTEON 9
cn10k: Marvell OCTEON 10
@@ -490,6 +503,7 @@ socs = {
'armada': soc_armada,
'bluefield': soc_bluefield,
'bluefield3': soc_bluefield3,
+'cdx': soc_cdx,
'centriq2400': soc_centriq2400,
'cn9k': soc_cn9k,
'cn10k' : soc_cn10k,
--
2.17.1
Re: [PATCH v2] vfio: do not coalesce DMA mappings
On 4/4/2023 8:43 PM, Burakov, Anatoly wrote: Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. On 2/7/2023 8:56 AM, Gupta, Nipun wrote: [AMD Official Use Only - General] Hi David, I agree that change is not straightforward to review, but it should not cause any functional issue as we are still creating all the memory mappings, but one by one for each segment. For hot plug case this causes issue as mentioned, that VFIO does not allow unmap of the individual segments in case mapping was created of a single coalesced segment. But yes, I am not sure why this code was added, which Anatoly may have more understanding on. The motivation behind this code was that Linux allows limited amount of page mappings, so we were trying to save on those. However, since then there have been a few changes related to partial unmaps that may make it so that this code is not only no longer necessary, but is in fact actively harmful. I agree that this at least warrants a second look. Anatoly, Can you please provide your feedback on this change? The patch probably shouldn't include the mailmap changes :) I see in "git log" that all the mailmap changes are with the patch submitted, probably as it shows checkpatch warning, so it seems this should be fine? Thanks, Nipun Could you please provide some steps to reproduce the hotplug issue you're having? It would be great to have a test case for this patchset to put it in context. -- Thanks, Anatoly
[PATCH v3] eventdev/eth_rx: fix invalid memory access
From: Pavan Nikhilesh
Rx adapter internal service structures are only initialized
when non-internal port is added to the adapter.
Check if Rx adapter service is initialized to determine if
runtime set/get parameters are supported.
Fixes: 3716f52186af ("eventdev/eth_rx: support runtime set/get parameters")
Signed-off-by: Pavan Nikhilesh
---
v3 Changes:
--
- Teardown queue when test is not supported.
v2 Changes:
--
- Remove unused variables.
- Fix spell check.
app/test/test_event_eth_rx_adapter.c| 10 --
lib/eventdev/rte_event_eth_rx_adapter.c | 24
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/app/test/test_event_eth_rx_adapter.c
b/app/test/test_event_eth_rx_adapter.c
index cfe6052d7e..52d146f97c 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -1201,7 +1201,7 @@ adapter_intrq_instance_get(void)
static int
adapter_get_set_params(void)
{
- int err;
+ int err, rc;
struct rte_event_eth_rx_adapter_runtime_params in_params;
struct rte_event_eth_rx_adapter_runtime_params out_params;
struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
@@ -1230,6 +1230,10 @@ adapter_get_set_params(void)
/* Case 1: Get the default value of mbufs processed by Rx adapter */
err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID,
&out_params);
+ if (err == -ENOTSUP) {
+ rc = TEST_SKIPPED;
+ goto skip;
+ }
TEST_ASSERT(err == 0, "Expected 0 got %d", err);
/* Case 2: Set max_nb_rx = 32 (=BATCH_SEIZE) */
@@ -1302,11 +1306,13 @@ adapter_get_set_params(void)
"Expected %u got %u",
in_params.max_nb_rx, out_params.max_nb_rx);
+ rc = TEST_SUCCESS;
+skip:
err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
TEST_ETHDEV_ID, 0);
TEST_ASSERT(err == 0, "Expected 0 got %d", err);
- return TEST_SUCCESS;
+ return rc;
}
static struct unit_test_suite event_eth_rx_tests = {
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c
b/lib/eventdev/rte_event_eth_rx_adapter.c
index c1cd124002..a8a5564b65 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3466,30 +3466,14 @@ rte_event_eth_rx_adapter_instance_get(uint16_t
eth_dev_id,
static int
rxa_caps_check(struct event_eth_rx_adapter *rxa)
{
- uint16_t eth_dev_id;
- uint32_t caps = 0;
- int ret;
-
if (!rxa->nb_queues)
return -EINVAL;
- /* The eth_dev used is always of same type.
-* Hence eth_dev_id is taken from first entry of poll array.
-*/
- eth_dev_id = rxa->eth_rx_poll[0].eth_dev_id;
- ret = rte_event_eth_rx_adapter_caps_get(rxa->eventdev_id,
- eth_dev_id,
- &caps);
- if (ret) {
- RTE_EDEV_LOG_ERR("Failed to get adapter caps edev %" PRIu8
- "eth port %" PRIu16, rxa->eventdev_id, eth_dev_id);
- return ret;
- }
-
- if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT)
- return -ENOTSUP;
+ /* Check if there is at least one non-internal ethernet port. */
+ if (rxa->service_inited)
+ return 0;
- return 0;
+ return -ENOTSUP;
}
int
--
2.25.1
