Re: [dpdk-dev] [PATCH] net/mlx5: update GENEVE TLV option exist bit
Hi, > -Original Message- > From: Raslan Darawsheh > Sent: Thursday, June 24, 2021 2:20 PM > To: Shiri Kuzin ; dev@dpdk.org > Cc: sta...@dpdk.org > Subject: RE: [PATCH] net/mlx5: update GENEVE TLV option exist bit > > Ok dropping this patch from next-net-mlx, > > Kindest regards, > Raslan Darawsheh > > > -Original Message- > > From: Shiri Kuzin > > Sent: Thursday, June 24, 2021 11:55 AM > > To: Raslan Darawsheh ; dev@dpdk.org > > Cc: sta...@dpdk.org > > Subject: RE: [PATCH] net/mlx5: update GENEVE TLV option exist bit > > > > This patch will be removed for now until FW support is fully done and > > be added when the support is completed. > > > > Regards, > > Shiri > > > > > -Original Message- > > > From: Raslan Darawsheh > > > Sent: Sunday, June 6, 2021 2:32 PM > > > To: Shiri Kuzin ; dev@dpdk.org > > > Cc: Matan Azrad ; Slava Ovsiienko > > > ; sta...@dpdk.org > > > Subject: RE: [PATCH] net/mlx5: update GENEVE TLV option exist bit > > > > > > Hi Shiri, > > > > > > > -Original Message- > > > > From: Shiri Kuzin > > > > Sent: Monday, May 31, 2021 2:46 PM > > > > To: dev@dpdk.org > > > > Cc: Matan Azrad ; Raslan Darawsheh > > > > ; Slava Ovsiienko > > > > Subject: [PATCH] net/mlx5: update GENEVE TLV option exist bit > > > > > > > > The GENEVE TLV option matching is done using a flex parser. > > > > > > > > Recent update in firmware, requires that in order to match on the > > > > GENEVE TLV option the "geneve_tlv_option_0_exist" bit should be set. > > > > > > > > Add the new "geneve_tlv_option_0_exist" setting when translating > > > > the GENEVE TLV option item. > > > > > > > > Signed-off-by: Shiri Kuzin > > > > Acked-by: Viacheslav Ovsiienko > > > > --- > > > > > > This is a valid Patch for Stable, so I'll add it during integration > > > Cc:sta...@dpdk.org > > > > > > Patch applied to next-net-mlx, > > > > > > Kindest regards, > > > Raslan Darawsheh FW has prober fix for it, So applying the patch again to next-net-mlx, Kindest regards, Raslan Darawsheh
[dpdk-dev] [PATCH] net/i40e: fix mbuf leak
From: Qiming Chen
A local test found that repeated port start and stop operations during
the continuous SSE vector bufflist receiving process will cause the mbuf
resource to run out. The final positioning is when the port is stopped,
the mbuf of the pkt_first_seg pointer is not released. Resources lead.
The patch scheme is to judge whether the pointer is empty when the port
is stopped, and release the corresponding mbuf if it is not empty.
Fixes: 5c9222058df7 ("i40e: move to drivers/net/")
Cc: sta...@dpdk.org
Signed-off-by: Qiming Chen
---
drivers/net/i40e/i40e_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 026cda948c..e4dfde9171 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2590,6 +2590,10 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq)
#endif /* RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC */
rxq->rx_tail = 0;
rxq->nb_rx_hold = 0;
+
+ if (rxq->pkt_first_seg != NULL)
+ rte_pktmbuf_free(rxq->pkt_first_seg);
+
rxq->pkt_first_seg = NULL;
rxq->pkt_last_seg = NULL;
--
2.30.1.windows.1
Re: [dpdk-dev] [PATCH v2] test/func_reentrancy: free memzones after creating test case
> > > Subject: Re: [dpdk-dev] [PATCH v2] test/func_reentrancy: free
> > > memzones after creating test case
> > >
> > > On Sat, Jul 31, 2021 at 2:04 PM Joyce Kong wrote:
> > > >
> > > > Function reentrancy test limits maximum number of iterations
> > > > simultaneously, however it doesn't free the 'fr_test_once'
> > > > memzones after the fact, so introduce freeing 'fr_test_once'
> > > > in ring/mempool/hash/fbk/lpm_clean.
> > > >
> > > > Meanwhile, add the missing free for test case on main thread.
> > > >
> > > > Fixes: 104a92bd026f ("app: add reentrancy tests")
> > > > Fixes: 995eec619024 ("test: clean up memory for function
> > > > reentrancy
> > > > test")
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Joyce Kong
> > > > Reviewed-by: Ruifeng Wang
> > > > Reviewed-by: Feifei Wang
> > >
> > > This patch actually breaks the test (we are lucky, the failure happens
> often ;)).
> > >
> > > 28/94 DPDK:fast-tests / func_reentrancy_autotest FAIL
> > > 0.22s (exit status 255 or signal 127 SIGinvalid)
> > >
> > > --- command ---
> > > 16:13:45 DPDK_TEST='func_reentrancy_autotest'
> > > /home-local/jenkins-local/jenkins-agent/workspace/Generic-Unit-Test-
> > > DPDK/dpdk/build/app/test/dpdk-test
> > > -l 0-15 --file-prefix=func_reentrancy_autotest
> > > --- stdout ---
> > > RTE>>func_reentrancy_autotest
> > > Func-ReEnt CASE 0: eal init once PASS ring create/lookup: common
> > > object allocated 2 times (should be 1) Func- ReEnt CASE 1: ring
> > > create/lookup FAIL Test Failed
> > > RTE>>
> > > --- stderr ---
> > >
> > >
> > > I guess, this is what happens:
> > >
> > > main lcore worker lcore 1 ...
> > > worker lcore X
> > > enters ring_create_lookup()
> > >
> > > enters ring_create_lookup()
> > > rte_eal_wait_lcore(worker lcore 1);
> > > leaves ring_create_lookup()
> > > ring_clean(worker lcore 1);
> > >
> > > leaves ring_create_lookup()
> > >
> > > There is no synchronisation point for the main lcore to know the
> > > worker lcores are finished invoking the func callback.
> > > With this patch, the "common" object is freed by the main lcore
> > > *potentially* before some workers start trying to create it.
> > > And we end up with multiple workers successfully creating this
> > > object, hence the obj_count being incremented.
> > >
> > >
> > > --
> > > David Marchand
> >
> > I think add rte_eal_mp_wait_lcore() like below can ensure the lcores
> > to free objects after all func callback finished.
> > Shall do the change in next version.
> >
> > RTE_LCORE_FOREACH_WORKER(lcore_id) {
> > if (cores == 1)
> > break;
> > cores--;
> > rte_eal_remote_launch(pt_case->func, pt_case->arg,
> > lcore_id);
> > }
> > rte_atomic32_set(&synchro, 1);
> > if (pt_case->func(pt_case->arg) < 0)
> > ret = -1;
> >
> > + rte_eal_mp_wait_lcore();
> >
> > cores = cores_save;
> > RTE_LCORE_FOREACH_WORKER(lcore_id) {
> > if (cores == 1)
> > break;
> > cores--;
> > - if (rte_eal_wait_lcore(lcore_id) < 0)
> > - ret = -1;
> > if (pt_case->clean != NULL)
> > pt_case->clean(lcore_id);
> > }
>
> Using mp_wait_lcore, the test can't tell if a lcore returned an error after
> executing the passed callback.
>
> An alternative is to split the current loop to first have the per lcore
> rte_eal_wait_lcore() calls + ret code check, and then a second loop calls the
> clean() callback.
>
>
> --
> David Marchand
Hi, David, thanks for your suggestion, will send a new version with this
modification.
--
Joyce
[dpdk-dev] Huawei hns3 Roadmap and DMA engine for DPDK 21.11 release
The following is Huawei hns3 PMD and DMA engine roadmap for DPDK 21.11 release: * Support Tx prepare for bonding * Support multi-process for testpmd * Support DMA device framework * Support DMA engine for Kunpeng 920 * Support refactor for hns3 PMD * Support performance optimization for hns3 PMD
Re: [dpdk-dev] 20.11.3 patches review and test
Hello Luca, The testing with dpdk 20.11.3-rc1 from Red Hat looks good. We tested below 16 scenarios and all got PASS on RHEL8: (1)Guest with device assignment(PF) throughput testing(1G hugepage size): PASS (2)Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS (3)Guest with device assignment(VF) throughput testing: PASS (4)PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS (5)PVP vhost-user 2Q throughput testing: PASS (6)PVP vhost-user 1Q - cross numa node throughput testing: PASS (7)Guest with vhost-user 2 queues throughput testing: PASS (8)vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect: PASS (9)vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect: PASS (10)PVP 1Q live migration testing: PASS (11)PVP 1Q cross numa node live migration testing: PASS (12)Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS (13)Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS (14)Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS (15)Host PF + DPDK testing: PASS (16)Host VF + DPDK testing: PASS Versions: kernel 4.18 qemu 6.0 dpdk: git://dpdk.org/dpdk-stable # git log -1 commit c5f4e9dd155a4c99e219a734315b899d4340d304 (HEAD, tag: v20.11.3-rc1) Author: Luca Boccassi Date: Mon Aug 9 09:25:41 2021 +0100 version: 20.11.3-rc1 Signed-off-by: Luca Boccassi # git branch remotes/origin/20.11 NICs: X540-AT2 NIC(ixgbe, 10G) Best regards, Pei On Mon, Aug 9, 2021 at 4:43 PM wrote: > Hi all, > > Here is a list of patches targeted for stable release 20.11.3. > > The planned date for the final release is August 23rd. > > 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.3-rc1 > > These patches are located at branch 20.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Luca Boccassi > > --- > Abhinandan Gujjar (1): > test/crypto: fix mempool size for session-less > > Ajit Khaparde (3): > doc: fix default burst size in testpmd > net/bnxt: fix Rx interrupt setting > net/bnxt: fix ring allocation and free > > Akhil Goyal (1): > crypto/octeontx: fix freeing after device release > > Alexander Kozyrev (1): > net/mlx5: fix threshold for mbuf replenishment in MPRQ > > Anoob Joseph (1): > crypto/octeontx2: fix IPsec session member overlap > > Arek Kusztal (1): > crypto/qat: disable asymmetric crypto on GEN3 > > Asaf Penso (1): > net/mlx5: fix flow engine type in function name > > Beilei Xing (2): > net/iavf: fix scalar Rx > net/i40e: fix flow director input set conflict > > Bing Zhao (1): > net/mlx5: fix queue leaking in hairpin auto bind check > > Chenbo Xia (1): > net/virtio: fix default duplex mode > > Cheng Jiang (1): > net/virtio: fix refill order in packed ring datapath > > Chengchang Tang (2): > net/hns3: fix VLAN strip log > net/hns3: fix residual MAC address entry > > Chenglian Sun (1): > examples/l2fwd: fix [no-]mac-updating options > > Chengwen Feng (3): > net/hns3: fix Arm SVE build with GCC 8.3 > net/hns3: fix filter parsing comment > net/hns3: fix flow rule list in multi-process > > Christian Ehrhardt (1): > vfio: add stdbool include > > Ciara Power (1): > cryptodev: fix freeing after device release > > Dana Vardi (5): > crypto/mvsam: fix AES-GCM session parameters > crypto/mvsam: fix session data reset > crypto/mvsam: fix options parsing > net/mvpp2: fix port speed overflow > net/mvpp2: fix configured state dependency > > Dapeng Yu (8): > net/ice: fix default RSS key generation > net/i40e: fix use after free in FDIR release > net/i40e: fix multi-process shared data > net/ixgbe: fix flow entry access after freeing > net/softnic: fix connection memory leak > net/softnic: fix memory leak in arguments parsing > net/softnic: fix null dereference in arguments parsing > net/softnic: fix memory leak as profile is freed > > David Christensen (1): > bus/pci: fix IOVA as VA support for PowerNV > > David Hunt (1): > distributor: fix 128-bit write alignment > > David Marchand (6): > malloc: fix size annotation for NUMA-aware realloc > bus/pci: fix leak for unbound devices > drivers/net: fix memzone allocations for DMA memory > ipc: stop mp control thread on cleanup > net/ice: fix memzone leak when firmware is missing > net/octeontx/base: fix debug build with clang > > Dmitry Kozlyuk (6): > doc: add limitation for ConnectX-4 with L2 in mlx5 guide > doc: fix build on Windows with Meson 0.58 > net/mlx5: fix Rx/Tx queue checks > net/mlx5: fix i
Re: [dpdk-dev] [PATCH] eal: remove the deprecated whitelist/blacklist and master/slave API's
> -Original Message-
> From: dev On Behalf Of Stephen Hemminger
> Sent: Friday, August 20, 2021 11:16 AM
> To: dev@dpdk.org
> Cc: Stephen Hemminger
> Subject: [dpdk-dev] [PATCH] eal: remove the deprecated whitelist/blacklist
> and master/slave API's
>
> Remove the compatiability hooks that were added in 20.11 around
> master/slave and blacklist/whitelist.
>
> New API's for these were added in 20.11 and the old API was retained but
> marked deprecated. Since 21.11 is the next LTS, it is time to remove the
> deprecated ones.
>
> Signed-off-by: Stephen Hemminger
> ---
> doc/guides/rel_notes/release_21_11.rst | 7 +++
> lib/eal/common/eal_common_options.c| 14 --
> lib/eal/common/eal_options.h | 10 --
> lib/eal/include/rte_bus.h | 6 --
> lib/eal/include/rte_dev.h | 6 --
> lib/eal/include/rte_devargs.h | 6 --
> lib/eal/include/rte_launch.h | 4
> lib/eal/include/rte_lcore.h| 15 ---
> 8 files changed, 7 insertions(+), 61 deletions(-)
>
> diff --git a/doc/guides/rel_notes/release_21_11.rst
> b/doc/guides/rel_notes/release_21_11.rst
> index d707a554efaf..e34c5aa74ad0 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -68,6 +68,13 @@ Removed Items
> Also, make sure to start the actual text at the margin.
> ===
>
> +* eal: Removed the deprecated function ``rte_get_master_lcore()``
> + and the iterarator macro ``RTE_LCORE_FOREACH_SLAVE``.
> +
> +* eal: The old api arguments that were deprecated for
> + blacklist/whitelist are removed. Users must use the new
> + block/allow list arguments.
> +
>
> API Changes
> ---
> diff --git a/lib/eal/common/eal_common_options.c
> b/lib/eal/common/eal_common_options.c
> index ff5861b5f3ef..8853833b108a 100644
> --- a/lib/eal/common/eal_common_options.c
> +++ b/lib/eal/common/eal_common_options.c
"w" can be removed from eal_short_options.
> @@ -83,7 +83,6 @@ eal_long_options[] = {
> {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM},
> {OPT_TRACE_BUF_SIZE,1, NULL, OPT_TRACE_BUF_SIZE_NUM },
> {OPT_TRACE_MODE,1, NULL, OPT_TRACE_MODE_NUM },
> - {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },
> {OPT_MAIN_LCORE,1, NULL, OPT_MAIN_LCORE_NUM },
> {OPT_MBUF_POOL_OPS_NAME, 1, NULL,
> OPT_MBUF_POOL_OPS_NAME_NUM},
> {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
> @@ -108,10 +107,6 @@ eal_long_options[] = {
> {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
> {OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL,
> OPT_FORCE_MAX_SIMD_BITWIDTH_NUM},
>
> - /* legacy options that will be removed in future */
> - {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM},
> - {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM},
> -
> {0, 0, NULL, 0}
> };
>
> @@ -1521,10 +1516,6 @@ eal_parse_common_option(int opt, const char
> *optarg,
> static int a_used;
>
> switch (opt) {
> - case OPT_PCI_BLACKLIST_NUM:
> - fprintf(stderr,
> - "Option --pci-blacklist is deprecated, use -b, --block
> instead\n");
> - /* fallthrough */
> case 'b':
> if (a_used)
> goto ba_conflict;
case 'w' can be removed as well.
> @@ -1698,11 +1689,6 @@ eal_parse_common_option(int opt, const char
> *optarg,
> conf->process_type = eal_parse_proc_type(optarg);
> break;
>
> - case OPT_MASTER_LCORE_NUM:
> - fprintf(stderr,
> - "Option --" OPT_MASTER_LCORE
> - " is deprecated use " OPT_MAIN_LCORE "\n");
> - /* fallthrough */
> case OPT_MAIN_LCORE_NUM:
> if (eal_parse_main_lcore(optarg) < 0) {
> RTE_LOG(ERR, EAL, "invalid parameter for --"
[dpdk-dev] [PATCH v4] test/func_reentrancy: free memzones after creating test
Function reentrancy test limits maximum number of iterations
simultaneously, however it doesn't free the 'fr_test_once'
memzones after the fact, so introduce freeing 'fr_test_once'
in ring/mempool/hash/fbk/lpm_clean.
Meanwhile, add the missing free for test case on main thread.
Fixes: 104a92bd026f ("app: add reentrancy tests")
Fixes: 995eec619024 ("test: clean up memory for function reentrancy test")
Cc: sta...@dpdk.org
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
Reviewed-by: Feifei Wang
---
v3/v4:
Add the synchronization between the main lcore and worker
lcores to ensure lcores to free "common object" after all
func callback finished.
v2:
Add the discription about adding missing frees for the
main thread in the commit log.
v1:
The initial version.
---
app/test/test_func_reentrancy.c | 30 +++---
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index 231c99a9eb..6bb46c6130 100644
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -89,6 +89,10 @@ ring_clean(unsigned int lcore_id)
char ring_name[MAX_STRING_SIZE];
int i;
+ rp = rte_ring_lookup("fr_test_once");
+ if (rp != NULL)
+ rte_ring_free(rp);
+
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(ring_name, sizeof(ring_name),
"fr_test_%d_%d", lcore_id, i);
@@ -148,7 +152,10 @@ mempool_clean(unsigned int lcore_id)
char mempool_name[MAX_STRING_SIZE];
int i;
- /* verify all ring created successful */
+ mp = rte_mempool_lookup("fr_test_once");
+ if (mp != NULL)
+ rte_mempool_free(mp);
+
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(mempool_name, sizeof(mempool_name), "fr_test_%d_%d",
lcore_id, i);
@@ -208,6 +215,10 @@ hash_clean(unsigned lcore_id)
struct rte_hash *handle;
int i;
+ handle = rte_hash_find_existing("fr_test_once");
+ if (handle != NULL)
+ rte_hash_free(handle);
+
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(hash_name, sizeof(hash_name), "fr_test_%d_%d",
lcore_id, i);
@@ -272,6 +283,10 @@ fbk_clean(unsigned lcore_id)
struct rte_fbk_hash_table *handle;
int i;
+ handle = rte_fbk_hash_find_existing("fr_test_once");
+ if (handle != NULL)
+ rte_fbk_hash_free(handle);
+
for (i = 0; i < MAX_ITER_MULTI; i++) {
snprintf(fbk_name, sizeof(fbk_name), "fr_test_%d_%d",
lcore_id, i);
@@ -338,6 +353,10 @@ lpm_clean(unsigned int lcore_id)
struct rte_lpm *lpm;
int i;
+ lpm = rte_lpm_find_existing("fr_test_once");
+ if (lpm != NULL)
+ rte_lpm_free(lpm);
+
for (i = 0; i < MAX_LPM_ITER_TIMES; i++) {
snprintf(lpm_name, sizeof(lpm_name), "fr_test_%d_%d",
lcore_id, i);
@@ -420,8 +439,7 @@ launch_test(struct test_case *pt_case)
{
int ret = 0;
unsigned lcore_id;
- unsigned cores_save = rte_lcore_count();
- unsigned cores = RTE_MIN(cores_save, MAX_LCORES);
+ unsigned cores = RTE_MIN(rte_lcore_count(), MAX_LCORES);
unsigned count;
if (pt_case->func == NULL)
@@ -442,14 +460,12 @@ launch_test(struct test_case *pt_case)
if (pt_case->func(pt_case->arg) < 0)
ret = -1;
- cores = cores_save;
RTE_LCORE_FOREACH_WORKER(lcore_id) {
- if (cores == 1)
- break;
- cores--;
if (rte_eal_wait_lcore(lcore_id) < 0)
ret = -1;
+ }
+ RTE_LCORE_FOREACH(lcore_id) {
if (pt_case->clean != NULL)
pt_case->clean(lcore_id);
}
--
2.17.1
[dpdk-dev] [PATCH v1] stack: remove duplicated include of atomic
In stack module, remove the duplicated header file rte_atomic.h
as it has been included in rte_spinlock.h/rte_pause.h
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
app/test/test_stack.c | 1 -
lib/stack/rte_stack.c | 1 -
lib/stack/rte_stack.h | 1 -
3 files changed, 3 deletions(-)
diff --git a/app/test/test_stack.c b/app/test/test_stack.c
index 00efb38e2a..bc38961433 100644
--- a/app/test/test_stack.c
+++ b/app/test/test_stack.c
@@ -4,7 +4,6 @@
#include
-#include
#include
#include
#include
diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c
index f1cbb9803f..d3bfc57955 100644
--- a/lib/stack/rte_stack.c
+++ b/lib/stack/rte_stack.c
@@ -5,7 +5,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/lib/stack/rte_stack.h b/lib/stack/rte_stack.h
index 27640f87b2..321f4cec1a 100644
--- a/lib/stack/rte_stack.h
+++ b/lib/stack/rte_stack.h
@@ -19,7 +19,6 @@
extern "C" {
#endif
-#include
#include
#include
#include
--
2.17.1
[dpdk-dev] [PATCH v16 1/9] dmadev: introduce DMA device library public APIs
The 'dmadevice' is a generic type of DMA device.
This patch introduce the 'dmadevice' public APIs which expose generic
operations that can enable configuration and I/O with the DMA devices.
Signed-off-by: Chengwen Feng
Acked-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Jerin Jacob
---
doc/api/doxy-api-index.md | 1 +
doc/api/doxy-api.conf.in | 1 +
lib/dmadev/meson.build| 4 +
lib/dmadev/rte_dmadev.h | 957 ++
lib/dmadev/version.map| 25 ++
lib/meson.build | 1 +
6 files changed, 989 insertions(+)
create mode 100644 lib/dmadev/meson.build
create mode 100644 lib/dmadev/rte_dmadev.h
create mode 100644 lib/dmadev/version.map
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 1992107..ce08250 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -27,6 +27,7 @@ The public API headers are grouped by topics:
[event_timer_adapter](@ref rte_event_timer_adapter.h),
[event_crypto_adapter] (@ref rte_event_crypto_adapter.h),
[rawdev] (@ref rte_rawdev.h),
+ [dmadev] (@ref rte_dmadev.h),
[metrics](@ref rte_metrics.h),
[bitrate](@ref rte_bitrate.h),
[latency](@ref rte_latencystats.h),
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 325a019..a44a92b 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -34,6 +34,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/lib/cmdline \
@TOPDIR@/lib/compressdev \
@TOPDIR@/lib/cryptodev \
+ @TOPDIR@/lib/dmadev \
@TOPDIR@/lib/distributor \
@TOPDIR@/lib/efd \
@TOPDIR@/lib/ethdev \
diff --git a/lib/dmadev/meson.build b/lib/dmadev/meson.build
new file mode 100644
index 000..6d5bd85
--- /dev/null
+++ b/lib/dmadev/meson.build
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 HiSilicon Limited.
+
+headers = files('rte_dmadev.h')
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
new file mode 100644
index 000..a008ee0
--- /dev/null
+++ b/lib/dmadev/rte_dmadev.h
@@ -0,0 +1,957 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ * Copyright(c) 2021 Intel Corporation.
+ * Copyright(c) 2021 Marvell International Ltd.
+ * Copyright(c) 2021 SmartShare Systems.
+ */
+
+#ifndef _RTE_DMADEV_H_
+#define _RTE_DMADEV_H_
+
+/**
+ * @file rte_dmadev.h
+ *
+ * RTE DMA (Direct Memory Access) device APIs.
+ *
+ * The DMA framework is built on the following model:
+ *
+ * --- --- ---
+ * | virtual DMA | | virtual DMA | | virtual DMA |
+ * | channel | | channel | | channel |
+ * --- --- ---
+ *|| |
+ *-- |
+ * | |
+ *
+ * | dmadev || dmadev |
+ *
+ * | |
+ *-- --
+ *| HW-DMA-channel | | HW-DMA-channel |
+ *-- --
+ * | |
+ *
+ * |
+ * -
+ * | HW-DMA-Controller |
+ * -
+ *
+ * The DMA controller could have multiple HW-DMA-channels (aka. HW-DMA-queues),
+ * each HW-DMA-channel should be represented by a dmadev.
+ *
+ * The dmadev could create multiple virtual DMA channels, each virtual DMA
+ * channel represents a different transfer context. The DMA operation request
+ * must be submitted to the virtual DMA channel. e.g. Application could create
+ * virtual DMA channel 0 for memory-to-memory transfer scenario, and create
+ * virtual DMA channel 1 for memory-to-device transfer scenario.
+ *
+ * The dmadev are dynamically allocated by rte_dmadev_pmd_allocate() during the
+ * PCI/SoC device probing phase performed at EAL initialization time. And could
+ * be released by rte_dmadev_pmd_release() during the PCI/SoC device removing
+ * phase.
+ *
+ * This framework uses 'uint16_t dev_id' as the device identifier of a dmadev,
+ * and 'uint16_t vchan' as the virtual DMA channel identifier in one dmadev.
+ *
+ * The functions exported by the dmadev API to setup a device designated by its
+ * device identifie
[dpdk-dev] [PATCH v16 4/9] dmadev: introduce DMA device library implementation
This patch introduce DMA device library implementation which includes
configuration and I/O with the DMA devices.
Signed-off-by: Chengwen Feng
Acked-by: Bruce Richardson
Acked-by: Morten Brørup
---
config/rte_config.h | 3 +
lib/dmadev/meson.build | 1 +
lib/dmadev/rte_dmadev.c | 567 +++
lib/dmadev/rte_dmadev.h | 118 -
lib/dmadev/rte_dmadev_core.h | 2 +
lib/dmadev/version.map | 1 +
6 files changed, 680 insertions(+), 12 deletions(-)
create mode 100644 lib/dmadev/rte_dmadev.c
diff --git a/config/rte_config.h b/config/rte_config.h
index 590903c..331a431 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -81,6 +81,9 @@
/* rawdev defines */
#define RTE_RAWDEV_MAX_DEVS 64
+/* dmadev defines */
+#define RTE_DMADEV_MAX_DEVS 64
+
/* ip_fragmentation defines */
#define RTE_LIBRTE_IP_FRAG_MAX_FRAG 4
#undef RTE_LIBRTE_IP_FRAG_TBL_STAT
diff --git a/lib/dmadev/meson.build b/lib/dmadev/meson.build
index 833baf7..d2fc85e 100644
--- a/lib/dmadev/meson.build
+++ b/lib/dmadev/meson.build
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2021 HiSilicon Limited.
+sources = files('rte_dmadev.c')
headers = files('rte_dmadev.h')
indirect_headers += files('rte_dmadev_core.h')
driver_sdk_headers += files('rte_dmadev_pmd.h')
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
new file mode 100644
index 000..80be485
--- /dev/null
+++ b/lib/dmadev/rte_dmadev.c
@@ -0,0 +1,567 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ * Copyright(c) 2021 Intel Corporation.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "rte_dmadev.h"
+#include "rte_dmadev_pmd.h"
+
+struct rte_dmadev rte_dmadevices[RTE_DMADEV_MAX_DEVS];
+
+static const char *mz_rte_dmadev_data = "rte_dmadev_data";
+/* Shared memory between primary and secondary processes. */
+static struct {
+ struct rte_dmadev_data data[RTE_DMADEV_MAX_DEVS];
+} *dmadev_shared_data;
+
+RTE_LOG_REGISTER_DEFAULT(rte_dmadev_logtype, INFO);
+#define RTE_DMADEV_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, rte_dmadev_logtype, "" __VA_ARGS__)
+
+/* Macros to check for valid device id */
+#define RTE_DMADEV_VALID_DEV_ID_OR_ERR_RET(dev_id, retval) do { \
+ if (!rte_dmadev_is_valid_dev(dev_id)) { \
+ RTE_DMADEV_LOG(ERR, "Invalid dev_id=%u\n", dev_id); \
+ return retval; \
+ } \
+} while (0)
+
+static int
+dmadev_check_name(const char *name)
+{
+ size_t name_len;
+
+ if (name == NULL) {
+ RTE_DMADEV_LOG(ERR, "Name can't be NULL\n");
+ return -EINVAL;
+ }
+
+ name_len = strnlen(name, RTE_DMADEV_NAME_MAX_LEN);
+ if (name_len == 0) {
+ RTE_DMADEV_LOG(ERR, "Zero length DMA device name\n");
+ return -EINVAL;
+ }
+ if (name_len >= RTE_DMADEV_NAME_MAX_LEN) {
+ RTE_DMADEV_LOG(ERR, "DMA device name is too long\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static uint16_t
+dmadev_find_free_dev(void)
+{
+ uint16_t i;
+
+ for (i = 0; i < RTE_DMADEV_MAX_DEVS; i++) {
+ if (dmadev_shared_data->data[i].dev_name[0] == '\0')
+ return i;
+ }
+
+ return RTE_DMADEV_MAX_DEVS;
+}
+
+static struct rte_dmadev*
+dmadev_find(const char *name)
+{
+ uint16_t i;
+
+ for (i = 0; i < RTE_DMADEV_MAX_DEVS; i++) {
+ if ((rte_dmadevices[i].state == RTE_DMADEV_ATTACHED) &&
+ (!strcmp(name, rte_dmadevices[i].data->dev_name)))
+ return &rte_dmadevices[i];
+ }
+
+ return NULL;
+}
+
+static int
+dmadev_shared_data_prepare(void)
+{
+ const struct rte_memzone *mz;
+
+ if (dmadev_shared_data == NULL) {
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ /* Allocate port data and ownership shared memory. */
+ mz = rte_memzone_reserve(mz_rte_dmadev_data,
+sizeof(*dmadev_shared_data),
+rte_socket_id(), 0);
+ } else
+ mz = rte_memzone_lookup(mz_rte_dmadev_data);
+ if (mz == NULL)
+ return -ENOMEM;
+
+ dmadev_shared_data = mz->addr;
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ memset(dmadev_shared_data->data, 0,
+ sizeof(dmadev_shared_data->data));
+ }
+
+ return 0;
+}
+
+static struct rte_dmadev *
+dmadev_allocate(const char *name)
+{
+ struct rte_dmadev *dev;
+ uint16_t dev_id;
+
+ dev = dmadev_find(name);
+ if (dev != NULL) {
+ RTE_D
[dpdk-dev] [PATCH v16 7/9] dma/skeleton: add test cases
Patch introduces dmadev unit testcase for validation against the
skeleton dmadev PMD implementation.
Test cases are added along with the skeleton driver implementation.
It can be enabled by using vdev argument to any DPDK binary:
--vdev="dma_skeleton,selftest=1"
In case 'selftest=1' is not provided, autotest doesn't execute the
test cases but the vdev is still available for application use.
Signed-off-by: Chengwen Feng
---
drivers/dma/skeleton/meson.build| 1 +
drivers/dma/skeleton/skeleton_dmadev.c | 34 +-
drivers/dma/skeleton/skeleton_dmadev.h | 1 +
drivers/dma/skeleton/skeleton_dmadev_test.c | 521
4 files changed, 553 insertions(+), 4 deletions(-)
create mode 100644 drivers/dma/skeleton/skeleton_dmadev_test.c
diff --git a/drivers/dma/skeleton/meson.build b/drivers/dma/skeleton/meson.build
index 27509b1..5d47339 100644
--- a/drivers/dma/skeleton/meson.build
+++ b/drivers/dma/skeleton/meson.build
@@ -4,4 +4,5 @@
deps += ['dmadev', 'kvargs', 'ring', 'bus_vdev']
sources = files(
'skeleton_dmadev.c',
+'skeleton_dmadev_test.c',
)
diff --git a/drivers/dma/skeleton/skeleton_dmadev.c
b/drivers/dma/skeleton/skeleton_dmadev.c
index b3ab4a0..1707e88 100644
--- a/drivers/dma/skeleton/skeleton_dmadev.c
+++ b/drivers/dma/skeleton/skeleton_dmadev.c
@@ -430,6 +430,7 @@ static const struct rte_dmadev_ops skeldma_ops = {
.stats_reset = skeldma_stats_reset,
.dev_dump = skeldma_dump,
+ .dev_selftest = test_dma_skeleton,
};
static int
@@ -503,11 +504,24 @@ skeldma_parse_lcore(const char *key __rte_unused,
return 0;
}
+static int
+skeldma_parse_selftest(const char *key __rte_unused,
+ const char *value,
+ void *opaque)
+{
+ int flag = atoi(value);
+ if (flag == 0 || flag == 1)
+ *(int *)opaque = flag;
+ return 0;
+}
+
static void
-skeldma_parse_vdev_args(struct rte_vdev_device *vdev, int *lcore_id)
+skeldma_parse_vdev_args(struct rte_vdev_device *vdev,
+ int *lcore_id, int *selftest)
{
static const char *const args[] = {
SKELDMA_ARG_LCORE,
+ SKELDMA_ARG_SELFTEST,
NULL
};
@@ -524,8 +538,11 @@ skeldma_parse_vdev_args(struct rte_vdev_device *vdev, int
*lcore_id)
(void)rte_kvargs_process(kvlist, SKELDMA_ARG_LCORE,
skeldma_parse_lcore, lcore_id);
+ (void)rte_kvargs_process(kvlist, SKELDMA_ARG_SELFTEST,
+skeldma_parse_selftest, selftest);
- SKELDMA_INFO("Parse lcore_id = %d\n", *lcore_id);
+ SKELDMA_INFO("Parse lcore_id = %d selftest = %d\n",
+*lcore_id, *selftest);
rte_kvargs_free(kvlist);
}
@@ -535,6 +552,7 @@ skeldma_probe(struct rte_vdev_device *vdev)
{
const char *name;
int lcore_id = -1;
+ int selftest = 0;
int ret;
name = rte_vdev_device_name(vdev);
@@ -552,10 +570,17 @@ skeldma_probe(struct rte_vdev_device *vdev)
return -EINVAL;
}
- skeldma_parse_vdev_args(vdev, &lcore_id);
+ skeldma_parse_vdev_args(vdev, &lcore_id, &selftest);
ret = skeldma_create(name, vdev, lcore_id);
if (ret >= 0) {
+ /* In case command line argument for 'selftest' was passed;
+* if invalid arguments were passed, execution continues but
+* without selftest.
+*/
+ if (selftest)
+ (void)test_dma_skeleton(ret);
+
SKELDMA_INFO("Create %s dmadev lcore-id %d\n", name, lcore_id);
/* Device instance created; Second instance not possible */
skeldma_init_once = 1;
@@ -592,4 +617,5 @@ static struct rte_vdev_driver skeldma_pmd_drv = {
RTE_LOG_REGISTER_DEFAULT(skeldma_logtype, INFO);
RTE_PMD_REGISTER_VDEV(dma_skeleton, skeldma_pmd_drv);
RTE_PMD_REGISTER_PARAM_STRING(dma_skeleton,
- SKELDMA_ARG_LCORE "= ");
+ SKELDMA_ARG_LCORE "= "
+ SKELDMA_ARG_SELFTEST "=<0|1> ");
diff --git a/drivers/dma/skeleton/skeleton_dmadev.h
b/drivers/dma/skeleton/skeleton_dmadev.h
index 6495653..e8a310d 100644
--- a/drivers/dma/skeleton/skeleton_dmadev.h
+++ b/drivers/dma/skeleton/skeleton_dmadev.h
@@ -22,6 +22,7 @@ extern int skeldma_logtype;
SKELDMA_LOG(ERR, fmt, ## args)
#define SKELDMA_ARG_LCORE "lcore"
+#define SKELDMA_ARG_SELFTEST "selftest"
struct skeldma_desc {
void *src;
diff --git a/drivers/dma/skeleton/skeleton_dmadev_test.c
b/drivers/dma/skeleton/skeleton_dmadev_test.c
new file mode 100644
index 000..be56f07
--- /dev/null
+++ b/drivers/dma/skeleton/skeleton_dmadev_test.c
@@ -0,0 +1,521 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+
+/* Using r
[dpdk-dev] [PATCH v16 6/9] dma/skeleton: introduce skeleton dmadev driver
Skeleton dmadevice driver, on the lines of rawdev skeleton, is for
showcasing of the dmadev library. This driver implements cpucopy 'DMA',
so that a test module can be developed.
Design of skeleton involves a virtual device which is plugged into VDEV
bus on initialization.
Also, enable compilation of dmadev skeleton drivers.
Signed-off-by: Chengwen Feng
---
drivers/dma/meson.build| 11 +
drivers/dma/skeleton/meson.build | 7 +
drivers/dma/skeleton/skeleton_dmadev.c | 595 +
drivers/dma/skeleton/skeleton_dmadev.h | 75 +
drivers/dma/skeleton/version.map | 3 +
drivers/meson.build| 1 +
6 files changed, 692 insertions(+)
create mode 100644 drivers/dma/meson.build
create mode 100644 drivers/dma/skeleton/meson.build
create mode 100644 drivers/dma/skeleton/skeleton_dmadev.c
create mode 100644 drivers/dma/skeleton/skeleton_dmadev.h
create mode 100644 drivers/dma/skeleton/version.map
diff --git a/drivers/dma/meson.build b/drivers/dma/meson.build
new file mode 100644
index 000..0c2c34c
--- /dev/null
+++ b/drivers/dma/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 HiSilicon Limited.
+
+if is_windows
+subdir_done()
+endif
+
+drivers = [
+'skeleton',
+]
+std_deps = ['dmadev']
diff --git a/drivers/dma/skeleton/meson.build b/drivers/dma/skeleton/meson.build
new file mode 100644
index 000..27509b1
--- /dev/null
+++ b/drivers/dma/skeleton/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 HiSilicon Limited.
+
+deps += ['dmadev', 'kvargs', 'ring', 'bus_vdev']
+sources = files(
+'skeleton_dmadev.c',
+)
diff --git a/drivers/dma/skeleton/skeleton_dmadev.c
b/drivers/dma/skeleton/skeleton_dmadev.c
new file mode 100644
index 000..b3ab4a0
--- /dev/null
+++ b/drivers/dma/skeleton/skeleton_dmadev.c
@@ -0,0 +1,595 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "skeleton_dmadev.h"
+
+/* Count of instances */
+static uint16_t skeldma_init_once;
+
+static int
+skeldma_info_get(const struct rte_dmadev *dev, struct rte_dmadev_info
*dev_info,
+uint32_t info_sz)
+{
+#define SKELDMA_MAX_DESC 8192
+#define SKELDMA_MIN_DESC 128
+
+ RTE_SET_USED(dev);
+ RTE_SET_USED(info_sz);
+
+ dev_info->dev_capa = RTE_DMADEV_CAPA_MEM_TO_MEM |
+RTE_DMADEV_CAPA_SVA |
+RTE_DMADEV_CAPA_OPS_COPY;
+ dev_info->max_vchans = 1;
+ dev_info->max_desc = SKELDMA_MAX_DESC;
+ dev_info->min_desc = SKELDMA_MIN_DESC;
+
+ return 0;
+}
+
+static int
+skeldma_configure(struct rte_dmadev *dev, const struct rte_dmadev_conf *conf)
+{
+ RTE_SET_USED(dev);
+ RTE_SET_USED(conf);
+ return 0;
+}
+
+static void *
+cpucopy_thread(void *param)
+{
+#define SLEEP_THRESHOLD1
+#define SLEEP_US_VAL 10
+
+ struct rte_dmadev *dev = (struct rte_dmadev *)param;
+ struct skeldma_hw *hw = dev->dev_private;
+ struct skeldma_desc *desc = NULL;
+ int ret;
+
+ while (!hw->exit_flag) {
+ ret = rte_ring_dequeue(hw->desc_running, (void **)&desc);
+ if (ret) {
+ hw->zero_req_count++;
+ if (hw->zero_req_count > SLEEP_THRESHOLD) {
+ if (hw->zero_req_count == 0)
+ hw->zero_req_count = SLEEP_THRESHOLD;
+ rte_delay_us_sleep(SLEEP_US_VAL);
+ }
+ continue;
+ }
+
+ hw->zero_req_count = 0;
+ rte_memcpy(desc->dst, desc->src, desc->len);
+ hw->completed_count++;
+ (void)rte_ring_enqueue(hw->desc_completed, (void *)desc);
+ }
+
+ return NULL;
+}
+
+static void
+fflush_ring(struct skeldma_hw *hw, struct rte_ring *ring)
+{
+ struct skeldma_desc *desc = NULL;
+ while (rte_ring_count(ring) > 0) {
+ (void)rte_ring_dequeue(ring, (void **)&desc);
+ (void)rte_ring_enqueue(hw->desc_empty, (void *)desc);
+ }
+}
+
+static int
+skeldma_start(struct rte_dmadev *dev)
+{
+ struct skeldma_hw *hw = dev->dev_private;
+ rte_cpuset_t cpuset;
+ int ret;
+
+ if (hw->desc_mem == NULL) {
+ SKELDMA_ERR("Vchan was not setup, start fail!\n");
+ return -EINVAL;
+ }
+
+ /* Reset the dmadev to a known state, include:
+* 1) fflush pending/running/completed ring to empty ring.
+* 2) init ring idx to zero.
+* 3) init running statistics.
[dpdk-dev] [PATCH v16 3/9] dmadev: introduce DMA device library PMD header
This patch introduce DMA device library PMD header which was driver
facing APIs for a DMA device.
Signed-off-by: Chengwen Feng
Acked-by: Bruce Richardson
Acked-by: Morten Brørup
---
lib/dmadev/meson.build | 1 +
lib/dmadev/rte_dmadev.h | 2 ++
lib/dmadev/rte_dmadev_pmd.h | 72 +
lib/dmadev/version.map | 10 +++
4 files changed, 85 insertions(+)
create mode 100644 lib/dmadev/rte_dmadev_pmd.h
diff --git a/lib/dmadev/meson.build b/lib/dmadev/meson.build
index f421ec1..833baf7 100644
--- a/lib/dmadev/meson.build
+++ b/lib/dmadev/meson.build
@@ -3,3 +3,4 @@
headers = files('rte_dmadev.h')
indirect_headers += files('rte_dmadev_core.h')
+driver_sdk_headers += files('rte_dmadev_pmd.h')
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index a008ee0..0744afa 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -736,6 +736,8 @@ struct rte_dmadev_sge {
uint32_t length; /**< The DMA operation length. */
};
+#include "rte_dmadev_core.h"
+
/* DMA flags to augment operation preparation. */
#define RTE_DMA_OP_FLAG_FENCE (1ull << 0)
/**< DMA fence flag.
diff --git a/lib/dmadev/rte_dmadev_pmd.h b/lib/dmadev/rte_dmadev_pmd.h
new file mode 100644
index 000..45141f9
--- /dev/null
+++ b/lib/dmadev/rte_dmadev_pmd.h
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ */
+
+#ifndef _RTE_DMADEV_PMD_H_
+#define _RTE_DMADEV_PMD_H_
+
+/**
+ * @file
+ *
+ * RTE DMA Device PMD APIs
+ *
+ * Driver facing APIs for a DMA device. These are not to be called directly by
+ * any application.
+ */
+
+#include "rte_dmadev.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @internal
+ * Allocates a new dmadev slot for an DMA device and returns the pointer
+ * to that slot for the driver to use.
+ *
+ * @param name
+ * DMA device name.
+ *
+ * @return
+ * A pointer to the DMA device slot case of success,
+ * NULL otherwise.
+ */
+__rte_internal
+struct rte_dmadev *
+rte_dmadev_pmd_allocate(const char *name);
+
+/**
+ * @internal
+ * Release the specified dmadev.
+ *
+ * @param dev
+ * Device to be released.
+ *
+ * @return
+ * - 0 on success, negative on error
+ */
+__rte_internal
+int
+rte_dmadev_pmd_release(struct rte_dmadev *dev);
+
+/**
+ * @internal
+ * Return the DMA device based on the device name.
+ *
+ * @param name
+ * DMA device name.
+ *
+ * @return
+ * A pointer to the DMA device slot case of success,
+ * NULL otherwise.
+ */
+__rte_internal
+struct rte_dmadev *
+rte_dmadev_get_device_by_name(const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_DMADEV_PMD_H_ */
diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map
index 02fffe3..408b93c 100644
--- a/lib/dmadev/version.map
+++ b/lib/dmadev/version.map
@@ -23,3 +23,13 @@ EXPERIMENTAL {
local: *;
};
+
+INTERNAL {
+global:
+
+ rte_dmadev_get_device_by_name;
+ rte_dmadev_pmd_allocate;
+ rte_dmadev_pmd_release;
+
+ local: *;
+};
--
2.8.1
[dpdk-dev] [PATCH v16 0/9] support dmadev
This patch set contains nine patch for new add dmadev. Chengwen Feng (9): dmadev: introduce DMA device library public APIs dmadev: introduce DMA device library internal header dmadev: introduce DMA device library PMD header dmadev: introduce DMA device library implementation doc: add DMA device library guide dma/skeleton: introduce skeleton dmadev driver dma/skeleton: add test cases test: enable dmadev skeleton test maintainers: add for dmadev --- v16: * redefine struct rte_dmadev_stats with fields: submitted, completed, errors. * add dma skeleton. * add dmadev ut. v15: * fix typo and readability of prog_guide. * fix some public APIs return value comment inconsistent with the impl. * add return -ENOSPC comment if enqueue fail due to no space. v14: * rte_dmadev_vchan_setup add vchan parameter. * rename max_vchans to nb_vchans of struct rte_dmadev_conf. * fix dmadev programming guide doxygen warning. v13: * add dmadev_i1.svg. * delete one unnecessary comment line of rte_dmadev_info_get. v12: * add max_sges filed for struct rte_dmadev_info. * add more descriptor of dmadev.rst. * replace scatter with scatter gather in code comment. * split to six patch. * fix typo. v11: * rename RTE_DMA_STATUS_UNKNOWN to RTE_DMA_STATUS_ERROR_UNKNOWN. * add RTE_DMA_STATUS_INVALID_ADDR marco. * update release-note. * add acked-by for 1/2 patch. * add dmadev programming guide which is 2/2 patch. MAINTAINERS |7 + app/test/meson.build|3 + app/test/test_dmadev.c | 53 ++ config/rte_config.h |3 + doc/api/doxy-api-index.md |1 + doc/api/doxy-api.conf.in|1 + doc/guides/prog_guide/dmadev.rst| 125 doc/guides/prog_guide/img/dmadev.svg| 283 +++ doc/guides/prog_guide/index.rst |1 + doc/guides/rel_notes/release_21_11.rst |6 + drivers/dma/meson.build | 11 + drivers/dma/skeleton/meson.build|8 + drivers/dma/skeleton/skeleton_dmadev.c | 621 drivers/dma/skeleton/skeleton_dmadev.h | 76 ++ drivers/dma/skeleton/skeleton_dmadev_test.c | 521 + drivers/dma/skeleton/version.map|3 + drivers/meson.build |1 + lib/dmadev/meson.build |7 + lib/dmadev/rte_dmadev.c | 567 +++ lib/dmadev/rte_dmadev.h | 1053 +++ lib/dmadev/rte_dmadev_core.h| 182 + lib/dmadev/rte_dmadev_pmd.h | 72 ++ lib/dmadev/version.map | 36 + lib/meson.build |1 + 24 files changed, 3642 insertions(+) create mode 100644 app/test/test_dmadev.c create mode 100644 doc/guides/prog_guide/dmadev.rst create mode 100644 doc/guides/prog_guide/img/dmadev.svg create mode 100644 drivers/dma/meson.build create mode 100644 drivers/dma/skeleton/meson.build create mode 100644 drivers/dma/skeleton/skeleton_dmadev.c create mode 100644 drivers/dma/skeleton/skeleton_dmadev.h create mode 100644 drivers/dma/skeleton/skeleton_dmadev_test.c create mode 100644 drivers/dma/skeleton/version.map create mode 100644 lib/dmadev/meson.build create mode 100644 lib/dmadev/rte_dmadev.c create mode 100644 lib/dmadev/rte_dmadev.h create mode 100644 lib/dmadev/rte_dmadev_core.h create mode 100644 lib/dmadev/rte_dmadev_pmd.h create mode 100644 lib/dmadev/version.map -- 2.8.1
[dpdk-dev] [PATCH v16 2/9] dmadev: introduce DMA device library internal header
This patch introduce DMA device library internal header, which contains
internal data types that are used by the DMA devices in order to expose
their ops to the class.
Signed-off-by: Chengwen Feng
Acked-by: Bruce Richardson
Acked-by: Morten Brørup
---
lib/dmadev/meson.build | 1 +
lib/dmadev/rte_dmadev_core.h | 180 +++
2 files changed, 181 insertions(+)
create mode 100644 lib/dmadev/rte_dmadev_core.h
diff --git a/lib/dmadev/meson.build b/lib/dmadev/meson.build
index 6d5bd85..f421ec1 100644
--- a/lib/dmadev/meson.build
+++ b/lib/dmadev/meson.build
@@ -2,3 +2,4 @@
# Copyright(c) 2021 HiSilicon Limited.
headers = files('rte_dmadev.h')
+indirect_headers += files('rte_dmadev_core.h')
diff --git a/lib/dmadev/rte_dmadev_core.h b/lib/dmadev/rte_dmadev_core.h
new file mode 100644
index 000..ff7b70a
--- /dev/null
+++ b/lib/dmadev/rte_dmadev_core.h
@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ * Copyright(c) 2021 Intel Corporation.
+ */
+
+#ifndef _RTE_DMADEV_CORE_H_
+#define _RTE_DMADEV_CORE_H_
+
+/**
+ * @file
+ *
+ * RTE DMA Device internal header.
+ *
+ * This header contains internal data types, that are used by the DMA devices
+ * in order to expose their ops to the class.
+ *
+ * Applications should not use these API directly.
+ *
+ */
+
+struct rte_dmadev;
+
+typedef int (*rte_dmadev_info_get_t)(const struct rte_dmadev *dev,
+struct rte_dmadev_info *dev_info,
+uint32_t info_sz);
+/**< @internal Used to get device information of a device. */
+
+typedef int (*rte_dmadev_configure_t)(struct rte_dmadev *dev,
+ const struct rte_dmadev_conf *dev_conf);
+/**< @internal Used to configure a device. */
+
+typedef int (*rte_dmadev_start_t)(struct rte_dmadev *dev);
+/**< @internal Used to start a configured device. */
+
+typedef int (*rte_dmadev_stop_t)(struct rte_dmadev *dev);
+/**< @internal Used to stop a configured device. */
+
+typedef int (*rte_dmadev_close_t)(struct rte_dmadev *dev);
+/**< @internal Used to close a configured device. */
+
+typedef int (*rte_dmadev_vchan_setup_t)(struct rte_dmadev *dev, uint16_t vchan,
+ const struct rte_dmadev_vchan_conf *conf);
+/**< @internal Used to allocate and set up a virtual DMA channel. */
+
+typedef int (*rte_dmadev_stats_get_t)(const struct rte_dmadev *dev,
+ uint16_t vchan, struct rte_dmadev_stats *stats,
+ uint32_t stats_sz);
+/**< @internal Used to retrieve basic statistics. */
+
+typedef int (*rte_dmadev_stats_reset_t)(struct rte_dmadev *dev, uint16_t
vchan);
+/**< @internal Used to reset basic statistics. */
+
+typedef int (*rte_dmadev_dump_t)(const struct rte_dmadev *dev, FILE *f);
+/**< @internal Used to dump internal information. */
+
+typedef int (*rte_dmadev_selftest_t)(uint16_t dev_id);
+/**< @internal Used to start dmadev selftest. */
+
+typedef int (*rte_dmadev_copy_t)(struct rte_dmadev *dev, uint16_t vchan,
+rte_iova_t src, rte_iova_t dst,
+uint32_t length, uint64_t flags);
+/**< @internal Used to enqueue a copy operation. */
+
+typedef int (*rte_dmadev_copy_sg_t)(struct rte_dmadev *dev, uint16_t vchan,
+ const struct rte_dmadev_sge *src,
+ const struct rte_dmadev_sge *dst,
+ uint16_t nb_src, uint16_t nb_dst,
+ uint64_t flags);
+/**< @internal Used to enqueue a scatter-gather list copy operation. */
+
+typedef int (*rte_dmadev_fill_t)(struct rte_dmadev *dev, uint16_t vchan,
+uint64_t pattern, rte_iova_t dst,
+uint32_t length, uint64_t flags);
+/**< @internal Used to enqueue a fill operation. */
+
+typedef int (*rte_dmadev_submit_t)(struct rte_dmadev *dev, uint16_t vchan);
+/**< @internal Used to trigger hardware to begin working. */
+
+typedef uint16_t (*rte_dmadev_completed_t)(struct rte_dmadev *dev,
+ uint16_t vchan, const uint16_t nb_cpls,
+ uint16_t *last_idx, bool *has_error);
+/**< @internal Used to return number of successful completed operations. */
+
+typedef uint16_t (*rte_dmadev_completed_status_t)(struct rte_dmadev *dev,
+ uint16_t vchan, const uint16_t nb_cpls,
+ uint16_t *last_idx, enum rte_dma_status_code *status);
+/**< @internal Used to return number of completed operations. */
+
+/**
+ * Possible states of a DMA device.
+ */
+enum rte_dmadev_state {
+ RTE_DMADEV_UNUSED = 0,
+ /**< Device is unused before being probed. */
+ RTE_DMADEV_ATTACHED,
+ /**< Device is attached when allocated in probing. */
+};
+
+/**
+ * DMA device operations function pointer table
[dpdk-dev] [PATCH v16 8/9] test: enable dmadev skeleton test
Skeleton dmadevice test cases are part of driver layer. This patch
allows test cases to be executed using 'dma_autotest' command in test
framework.
Signed-off-by: Chengwen Feng
---
app/test/meson.build | 3 +++
app/test/test_dmadev.c | 53 ++
2 files changed, 56 insertions(+)
create mode 100644 app/test/test_dmadev.c
diff --git a/app/test/meson.build b/app/test/meson.build
index a761168..881cb4f 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -43,6 +43,7 @@ test_sources = files(
'test_debug.c',
'test_distributor.c',
'test_distributor_perf.c',
+'test_dmadev.c',
'test_eal_flags.c',
'test_eal_fs.c',
'test_efd.c',
@@ -162,6 +163,7 @@ test_deps = [
'cmdline',
'cryptodev',
'distributor',
+'dmadev',
'efd',
'ethdev',
'eventdev',
@@ -333,6 +335,7 @@ driver_test_names = [
'cryptodev_sw_mvsam_autotest',
'cryptodev_sw_snow3g_autotest',
'cryptodev_sw_zuc_autotest',
+'dmadev_autotest',
'eventdev_selftest_octeontx',
'eventdev_selftest_sw',
'rawdev_autotest',
diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
new file mode 100644
index 000..90e8faa
--- /dev/null
+++ b/app/test/test_dmadev.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 HiSilicon Limited.
+ */
+
+#include
+#include
+#include
+#include
+
+#include "test.h"
+
+static int
+test_dmadev_selftest_skeleton(void)
+{
+ const char *pmd = "dma_skeleton";
+ int ret;
+
+ printf("\n### Test dmadev infrastructure using skeleton driver\n");
+ rte_vdev_init(pmd, NULL);
+ ret = rte_dmadev_selftest(rte_dmadev_get_dev_id(pmd));
+ rte_vdev_uninit(pmd);
+
+ return ret;
+}
+
+static int
+test_dmadev_selftests(void)
+{
+ const int count = rte_dmadev_count();
+ int ret = 0;
+ int i;
+
+ /* basic sanity on dmadev infrastructure */
+ if (test_dmadev_selftest_skeleton() < 0)
+ return -1;
+
+ /* now run self-test on all dmadevs */
+ if (count > 0)
+ printf("\n### Run selftest on each available dmadev\n");
+ for (i = 0; i < RTE_DMADEV_MAX_DEVS; i++) {
+ if (rte_dmadevices[i].state != RTE_DMADEV_ATTACHED)
+ continue;
+ int result = rte_dmadev_selftest(i);
+ printf("dmadev %u (%s) selftest: %s\n", i,
+ rte_dmadevices[i].data->dev_name,
+ result == 0 ? "Passed" : "Failed");
+ ret |= result;
+ }
+
+ return ret;
+}
+
+REGISTER_TEST_COMMAND(dmadev_autotest, test_dmadev_selftests);
--
2.8.1
[dpdk-dev] [PATCH v16 5/9] doc: add DMA device library guide
This patch adds dmadev library guide. Signed-off-by: Chengwen Feng Acked-by: Conor Walsh --- doc/guides/prog_guide/dmadev.rst | 125 doc/guides/prog_guide/img/dmadev.svg | 283 +++ doc/guides/prog_guide/index.rst | 1 + 3 files changed, 409 insertions(+) create mode 100644 doc/guides/prog_guide/dmadev.rst create mode 100644 doc/guides/prog_guide/img/dmadev.svg diff --git a/doc/guides/prog_guide/dmadev.rst b/doc/guides/prog_guide/dmadev.rst new file mode 100644 index 000..75bac04 --- /dev/null +++ b/doc/guides/prog_guide/dmadev.rst @@ -0,0 +1,125 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright 2021 HiSilicon Limited + +DMA Device Library + + +The DMA library provides a DMA device framework for management and provisioning +of hardware and software DMA poll mode drivers, defining generic APIs which +support a number of different DMA operations. + + +Design Principles +- + +The DMA library follows the same basic principles as those used in DPDK's +Ethernet Device framework and the RegEx framework. The DMA framework provides +a generic DMA device framework which supports both physical (hardware) +and virtual (software) DMA devices as well as a generic DMA API which allows +DMA devices to be managed and configured and supports DMA operations to be +provisioned on DMA poll mode driver. + +.. _figure_dmadev: + +.. figure:: img/dmadev.* + +The above figure shows the model on which the DMA framework is built on: + + * The DMA controller could have multiple hardware DMA channels (aka. hardware + DMA queues), each hardware DMA channel should be represented by a dmadev. + * The dmadev could create multiple virtual DMA channels, each virtual DMA + channel represents a different transfer context. The DMA operation request + must be submitted to the virtual DMA channel. e.g. Application could create + virtual DMA channel 0 for memory-to-memory transfer scenario, and create + virtual DMA channel 1 for memory-to-device transfer scenario. + + +Device Management +- + +Device Creation +~~~ + +Physical DMA controllers are discovered during the PCI probe/enumeration of the +EAL function which is executed at DPDK initialization, this is based on their +PCI BDF (bus/bridge, device, function). Specific physical DMA controllers, like +other physical devices in DPDK can be listed using the EAL command line options. + +The dmadevs are dynamically allocated by using the API +``rte_dmadev_pmd_allocate`` based on the number of hardware DMA channels. + + +Device Identification +~ + +Each DMA device, whether physical or virtual is uniquely designated by two +identifiers: + +- A unique device index used to designate the DMA device in all functions + exported by the DMA API. + +- A device name used to designate the DMA device in console messages, for + administration or debugging purposes. + + +Device Configuration + + +The rte_dmadev_configure API is used to configure a DMA device. + +.. code-block:: c + + int rte_dmadev_configure(uint16_t dev_id, +const struct rte_dmadev_conf *dev_conf); + +The ``rte_dmadev_conf`` structure is used to pass the configuration parameters +for the DMA device for example the number of virtual DMA channels to set up, +indication of whether to enable silent mode. + + +Configuration of Virtual DMA Channels +~ + +The rte_dmadev_vchan_setup API is used to configure a virtual DMA channel. + +.. code-block:: c + + int rte_dmadev_vchan_setup(uint16_t dev_id, uint16_t vchan, + const struct rte_dmadev_vchan_conf *conf); + +The ``rte_dmadev_vchan_conf`` structure is used to pass the configuration +parameters for the virtual DMA channel for example transfer direction, number of +descriptor for the virtual DMA channel, source device access port parameter, +destination device access port parameter. + + +Device Features and Capabilities + + +DMA devices may support different feature sets. The ``rte_dmadev_info_get`` API +can be used to get the device info and supported features. + +Silent mode is a special device capability which does not require the +application to invoke dequeue APIs. + + +Enqueue / Dequeue APIs +~~ + +Enqueue APIs such as ``rte_dmadev_copy`` and ``rte_dmadev_fill`` can be used to +enqueue operations to hardware. If an enqueue is successful, a ``ring_idx`` is +returned. This ``ring_idx`` can be used by applications to track per-operation +metadata in an application-defined circular ring. + +The ``rte_dmadev_submit`` API is used to issue doorbell to hardware. +Alternatively the ``RTE_DMA_OP_FLAG_SUBMIT`` flag can be passed to the enqueue +APIs to also issue the doorbell to hardware. + +There are two dequeue APIs ``rte_dmadev_completed`` and +``rte_dmadev_completed_s
[dpdk-dev] [PATCH v16 9/9] maintainers: add for dmadev
This patch add myself as dmadev's maintainer and update release notes. Signed-off-by: Chengwen Feng --- MAINTAINERS| 7 +++ doc/guides/rel_notes/release_21_11.rst | 6 ++ 2 files changed, 13 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 266f5ac..1661428 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -496,6 +496,13 @@ F: drivers/raw/skeleton/ F: app/test/test_rawdev.c F: doc/guides/prog_guide/rawdev.rst +DMA device API - EXPERIMENTAL +M: Chengwen Feng +F: lib/dmadev/ +F: drivers/dma/skeleton/ +F: app/test/test_dmadev.c +F: doc/guides/prog_guide/dmadev.rst + Memory Pool Drivers --- diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index d707a55..0d3c38f 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -55,6 +55,12 @@ New Features Also, make sure to start the actual text at the margin. === +* **Added dmadev library support.** + + The dmadev library provides a DMA device framework for management and + provisioning of hardware and software DMA poll mode drivers, defining generic + APIs which support a number of different DMA operations. + Removed Items - -- 2.8.1
Re: [dpdk-dev] [PATCH v15 1/6] dmadev: introduce DMA device library public APIs
Hi Bruce and All,
The v16 use following define, and it also include dma skeleton and ut.
struct rte_dmadev_stats {
uint64_t submitted;
uint64_t completed;
uint64_t errors;
}
Feedback welcome, thanks.
On 2021/8/19 22:52, Bruce Richardson wrote:
> On Fri, Aug 13, 2021 at 05:09:29PM +0800, Chengwen Feng wrote:
>> The 'dmadevice' is a generic type of DMA device.
>>
>> This patch introduce the 'dmadevice' public APIs which expose generic
>> operations that can enable configuration and I/O with the DMA devices.
>>
>> Signed-off-by: Chengwen Feng
>> Acked-by: Bruce Richardson
>> Acked-by: Morten Brørup
>> Acked-by: Jerin Jacob
>> ---
> one minor comment for clarification
>
>> +/**
>> + * rte_dmadev_stats - running statistics.
>> + */
>> +struct rte_dmadev_stats {
>> +uint64_t submitted_count;
>> +/**< Count of operations which were submitted to hardware. */
>> +uint64_t completed_fail_count;
>> +/**< Count of operations which failed to complete. */
>> +uint64_t completed_count;
>> +/**< Count of operations which successfully complete. */
>> +};
>
> The name of the last variable and the comment on it seem mismatched. The
> name implies that it's all completed ops, i.e. to get successful only you
> do "stats.completed_count - stats.completed_fail_count", while the comment
> says that it's successful only. Therefore I suggest:
>
> * We rename the last two vars to "completed_fail" and "completed_success"
> for clarity OR
> * We redefine "completed_count" to be the full completed count of both
> success and failure.
>
> I have a slight preference for the latter option, but either can work.
>
> /Bruce
>
> PS: We probably don't need "count" on any of these values, based on two
> options above suggest structs as:
>
> struct rte_dmadev_stats {
> uint64_t submitted;
> uint64_t failed;
> uint64_t successful;
> };
>
> OR:
>
> struct rte_dmadev_stats {
> uint64_t submitted;
> uint64_t completed;
> uint64_t errors;
> }
> .
>
[dpdk-dev] [PATCH] net/i40e: extend the polling times of vf reset
In the embedded RTOS environment, the x722 controller Ethernet card of the d2146nt chip, the vfio user mode driver takes over 8 vf ports in turn, but i40evf_check_vf_reset_done will probably fail. This issue has been discussed with intel&dpdk experts for 3 rounds before, and the version matching is no problem, and there is no substantial progress. The official website contacted external experts, but there was no response afterwards. Learning from the implementation of the i40evf kernel driver locally, after modifying the polling time from 1 second to 5s, the repeated restart process took over the start port test, and it was found that this probability was reduced to an order of magnitude acceptable to the user. The patch cannot fundamentally solve the failure problem, but it greatly slows down the probability of the problem. The modification is based on the i40evf kernel driver. Signed-off-by: Qiming Chen --- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index f64db72e9a..924da8dfb4 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -42,7 +42,7 @@ /* busy wait delay in msec */ #define I40EVF_BUSY_WAIT_DELAY 10 #define I40EVF_BUSY_WAIT_COUNT 50 -#define MAX_RESET_WAIT_CNT 20 +#define MAX_RESET_WAIT_CNT 100 #define I40EVF_ALARM_INTERVAL 5 /* us */ -- 2.30.1.windows.1
Re: [dpdk-dev] dpdk-pdump prints "EAL: Error: Invalid memory"
Hi,
Any comment for this issue?
Thank you.
Best regards
Yan Xiaoping
From: Yan, Xiaoping (NSB - CN/Hangzhou)
Sent: 2021年8月10日 13:35
To: 'us...@dpdk.org'
Subject: RE: dpdk-pdump prints "EAL: Error: Invalid memory"
Hi,
I modified eal_legacy_hugepage_init and problem is solved.
Should the correction be added to dpdk upstream?
diff --git a/package/dpdk/dpdk-20.11/lib/librte_eal/linux/eal_memory.c
b/package/dpdk/dpdk-20.11/lib/librte_eal/linux/eal_memory.c
index 03a4f2dd..89a13e91 100644
--- a/package/dpdk/dpdk-20.11/lib/librte_eal/linux/eal_memory.c
+++ b/package/dpdk/dpdk-20.11/lib/librte_eal/linux/eal_memory.c
@@ -1458,6 +1458,7 @@ eal_legacy_hugepage_init(void)
mem_sz = msl->len;
munmap(msl->base_va, mem_sz);
msl->base_va = NULL;
+ msl->len = 0;
msl->heap = 0;
/* destroy backing fbarray */
Best regards
Yan Xiaoping
From: Yan, Xiaoping (NSB - CN/Hangzhou)
Sent: 2021年8月4日 15:14
To: 'us...@dpdk.org' mailto:us...@dpdk.org>>
Subject: dpdk-pdump prints "EAL: Error: Invalid memory"
Hi,
After updating dpdk version from 19.11 to 20.11
dpdk-pdump prints such error:
EAL: Error: Invalid memory
Port 7 MAC: 02 70 63 61 70 03
core (2), capture for (1) tuples
- port 0 device ((null)) queue 65535
^C
--legacy-mem is used for both primary primary and dpdk-pdump.
With some debug, I find that mlx5_mem_is_rte incorrectly consider this address
from os memory ((addr=0x4482b80)) as rte address, so mlx5_free
calls rte_free() to free it and caused error.
And this seems to because len of some unused memsegs is not set to 0 (so
rte_mem_virt2memseg_list(0x4482b80) returns a memseg).
Here is memsegs:
(gdb) p mcfg->memsegs
$3 = {{{base_va = 0x2aac000, addr_64 = 2932388921344}, page_sz =
1073741824, socket_id = 0,
version = 0, len = 34359738368, external = 0, heap = 1, memseg_arr = {
name = "memseg-1048576k-0-0", '\000' , count = 5, len =
32,
elt_sz = 48, data = 0x2aaa302e000, rwlock = {cnt = 0}}}, {{base_va = 0x0,
addr_64 = 0},
page_sz = 1073741824, socket_id = 0, version = 0, len = 34359738368,
external = 0,
heap = 0, memseg_arr = {name = '\000' , count = 0, len =
0, elt_sz = 0,
data = 0x0, rwlock = {cnt = 0}}}, {{base_va = 0x0, addr_64 = 0}, page_sz
= 1073741824,
socket_id = 1, version = 0, len = 34359738368, external = 0, heap = 0,
memseg_arr = {
name = '\000' , count = 0, len = 0, elt_sz = 0, data =
0x0, rwlock = {
cnt = 0}}}, {{base_va = 0x0, addr_64 = 0}, page_sz = 1073741824,
socket_id = 1,
version = 0, len = 34359738368, external = 0, heap = 0, memseg_arr = {
name = '\000' , count = 0, len = 0, elt_sz = 0, data =
0x0, rwlock = {
cnt = 0}}}, {{base_va = 0x0, addr_64 = 0}, page_sz = 0, socket_id = 0,
version = 0,
len = 0, external = 0, heap = 0, memseg_arr = {name = '\000' , count = 0,
len = 0, elt_sz = 0, data = 0x0, rwlock = {cnt = 0}}} }
Here is the stack trace
(gdb) bt
#0 mlx5_free (addr=0x4482b80) at
../dpdk-20.11/drivers/common/mlx5/mlx5_malloc.c:260
#1 0x00706f5c in mlx5_mp_req_verbs_cmd_fd
(mp_id=mp_id@entry=0x7ffcdb6d9e50)
at ../dpdk-20.11/drivers/common/mlx5/mlx5_common_mp.c:140
#2 0x0050496f in mlx5_dev_spawn (config=0x7ffcdb6d9d70,
spawn=0x2ab753799c0,
dpdk_dev=0x4491400) at ../dpdk-20.11/drivers/net/mlx5/linux/mlx5_os.c:774
#3 mlx5_os_pci_probe (pci_drv=, pci_dev=)
at ../dpdk-20.11/drivers/net/mlx5/linux/mlx5_os.c:2154
#4 0x00708b5a in drivers_probe (user_classes=1, pci_dev=0x44913f0,
pci_drv=0xe01800 , dev=0x2ab75379a80)
at ../dpdk-20.11/drivers/common/mlx5/mlx5_common_pci.c:246
#5 mlx5_common_pci_probe (pci_drv=0xe01800 ,
pci_dev=0x44913f0)
at ../dpdk-20.11/drivers/common/mlx5/mlx5_common_pci.c:308
#6 0x004268f9 in rte_pci_probe_one_driver (dev=0x44913f0,
dr=0xe01800 ) at
../dpdk-20.11/drivers/bus/pci/pci_common.c:243
#7 pci_probe_all_drivers (dev=0x44913f0) at
../dpdk-20.11/drivers/bus/pci/pci_common.c:318
#8 pci_probe () at ../dpdk-20.11/drivers/bus/pci/pci_common.c:345
#9 0x006bc4d3 in rte_bus_probe ()
at ../dpdk-20.11/lib/librte_eal/common/eal_common_bus.c:72
#10 0x00422304 in rte_eal_init (argc=argc@entry=16,
argv=argv@entry=0x7ffcdb6da530)
at ../dpdk-20.11/lib/librte_eal/linux/eal.c:1210
#11 0x0056fee9 in main (argc=16, argv=0x7ffcdb6da748)
at ../dpdk-20.11/app/pdump/main.c:1118
(gdb) c
Continuing.
Thread 1 "dpdk-pdump" hit Breakpoint 5, rte_free (addr=0x4482b80)
It seems to me that below code piece from eal_legacy_hugepage_init should also
set len to 0?
/* we're not going to allocate more pages, so release VA space for
* unused memseg lists
*/
for (i = 0; i < RTE_MAX_MEMSEG_LISTS; i++) {
struct rte_memseg_list *msl = &mcfg->memsegs[i];
size_t mem_sz;
/* s
[dpdk-dev] [PATCH] net/i40e: solve vf rxq buf size alignment
The RTE_ALIGN macro is aligned upwards. If the buf_size variable is not aligned with 1 << I40E_RXQ_CTX_DBUFF_SHIFT, the rx_buf_len is larger than the actual mbuf memory after the operation. When receiving the packet, if the packet is larger than the configured buf_size, it will cause a memory stepping event. The patch uses the RTE_ALIGN_FLOOR down alignment macro to correct the problem. Signed-off-by: Qiming Chen --- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 924da8dfb4..5b1c8e76ab 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1927,7 +1927,7 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq) RTE_PKTMBUF_HEADROOM); rxq->hs_mode = i40e_header_split_none; rxq->rx_hdr_len = 0; - rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 << I40E_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size, (1 << I40E_RXQ_CTX_DBUFF_SHIFT)); len = rxq->rx_buf_len * I40E_MAX_CHAINED_RX_BUFFERS; rxq->max_pkt_len = RTE_MIN(len, dev_data->dev_conf.rxmode.max_rx_pkt_len); -- 2.30.1.windows.1
[dpdk-dev] remove dpdk-pdump pcap file, disk space is not freed
Hi, Before I run pdump, 21MB is used in /tmp tmpfs63G 21M 63G 1% /tmp Then I run pdump with such command: dpdk-pdump -c 0x4001000400100 -a :03:00.6 -a :03:06.1 --legacy-mem --base-virtaddr 0x2aaa2aa000 --file-prefix l2rt -- --pdump port=1,queue=*,rx-dev=/tmp/l2biprt.pcap,tx-dev=/tmp/l2biprt.pcap,mbuf-size=10240,total-num-mbufs=1 After stop, it generates a 14MB file -rw-rw-r--. 1 14M Aug 23 03:58 l2biprt.pcap And 35M is used in /tmp tmpfs63G 35M 63G 1% /tmp And fuser show there are still several users of this file. (all these pids are of running dpdk primary and secondary processes ) # fuser /tmp/l2biprt.pcap /tmp/l2biprt.pcap: 139 342 347 434 Then after I rm the file (l2biprt.pcap), disk space in tmp is not freed (still 35MB used) rm l2biprt.pcap df -h tmpfs63G 35M 63G 1% /tmp It seems it goes like this: pdump start->pdump send vdev hotplug add request->primary and secondary process calls pmd_pcap_probe() which opens the pcap file-> pdump stop-> pdump send vdev hotplug remove request-> primary and secondary process does not close the pcap file To properly close the pcap file and release disk space, it seems we should: * somehow close the pcap file in "vdev hotplug remove", or * don't open the pcap file in "vdev hotplug add"( pmd_pcap_probe()), it seems pcap eth_dev_start will open the pcap file in case it was not opened. Any comment is appreciated, thank you. Best regards Yan Xiaoping
[dpdk-dev] [PATCH v2 0/8] use compiler atomic builtins for examples
Since atomic operations have been adopted in DPDK now[1], change rte_atomicNN_xxx APIs to compiler's atomic built-ins in examples module[2]. [1] https://www.dpdk.org/blog/2021/03/26/dpdk-adopts-the-c11-memory-model/ [2] https://doc.dpdk.org/guides/rel_notes/deprecation.html v2: Fix the compiling error of performance-thread patch. Joyce Kong (8): examples/bbdev_app: use compiler atomics for flag sync examples/multi_process: use compiler atomics for sync examples/kni: use compiler atomics for status sync examples/performance-thread: use compiler atomics for sync examples/l2fwd-jobstats: use compiler atomics for stats sync examples/vm_power_manager: use compiler atomics for sync examples/server_node_efd: use compiler atomics for sync examples: remove unnecessary include of atomic examples/bbdev_app/main.c | 13 --- examples/bond/main.c | 1 - examples/ip_fragmentation/main.c | 1 - examples/ip_reassembly/main.c | 1 - examples/ipsec-secgw/ipsec-secgw.c| 1 - examples/ipv4_multicast/main.c| 1 - examples/kni/main.c | 27 +++ examples/l2fwd-crypto/main.c | 1 - examples/l2fwd-event/l2fwd_common.h | 1 - examples/l2fwd-event/l2fwd_event.c| 1 - examples/l2fwd-jobstats/main.c| 11 +++--- examples/l2fwd-keepalive/main.c | 1 - examples/l2fwd/main.c | 1 - examples/l3fwd-acl/main.c | 1 - examples/l3fwd-power/main.c | 1 - examples/l3fwd/main.c | 1 - examples/link_status_interrupt/main.c | 1 - .../client_server_mp/mp_client/client.c | 1 - .../client_server_mp/mp_server/init.c | 1 - .../client_server_mp/mp_server/main.c | 7 ++-- examples/multi_process/simple_mp/main.c | 1 - .../multi_process/simple_mp/mp_commands.c | 1 - examples/multi_process/symmetric_mp/main.c| 1 - examples/performance-thread/common/lthread.c | 10 +++--- .../performance-thread/common/lthread_diag.h | 10 +++--- .../performance-thread/common/lthread_int.h | 1 - .../performance-thread/common/lthread_mutex.c | 26 +++--- .../performance-thread/common/lthread_mutex.h | 2 +- .../performance-thread/common/lthread_sched.c | 34 --- .../performance-thread/common/lthread_tls.c | 5 +-- .../performance-thread/l3fwd-thread/main.c| 22 +--- examples/server_node_efd/node/node.c | 1 - examples/server_node_efd/server/init.c| 1 - examples/server_node_efd/server/main.c| 7 ++-- examples/vhost_blk/blk.c | 1 - examples/vhost_blk/vhost_blk.c| 1 - examples/vm_power_manager/channel_manager.c | 1 - examples/vm_power_manager/channel_manager.h | 1 - examples/vm_power_manager/channel_monitor.c | 11 +++--- examples/vmdq/main.c | 1 - examples/vmdq_dcb/main.c | 1 - 41 files changed, 91 insertions(+), 122 deletions(-) -- 2.17.1
[dpdk-dev] [PATCH v2 1/8] examples/bbdev_app: use compiler atomics for flag sync
Convert rte_atomic usages to compiler atomic built-ins
for global_exit_flag sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/bbdev_app/main.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index 5251db0b16..75c620ea75 100644
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -18,7 +18,6 @@
#include
#include
-#include
#include
#include
#include
@@ -167,7 +166,7 @@ static const struct app_config_params def_app_config = {
.num_dec_cores = 1,
};
-static rte_atomic16_t global_exit_flag;
+static uint16_t global_exit_flag;
/* display usage */
static inline void
@@ -279,7 +278,7 @@ static void
signal_handler(int signum)
{
printf("\nSignal %d received\n", signum);
- rte_atomic16_set(&global_exit_flag, 1);
+ __atomic_store_n(&global_exit_flag, 1, __ATOMIC_RELAXED);
}
static void
@@ -328,7 +327,7 @@ check_port_link_status(uint16_t port_id)
fflush(stdout);
for (count = 0; count <= MAX_CHECK_TIME &&
- !rte_atomic16_read(&global_exit_flag); count++) {
+ !__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED);
count++) {
memset(&link, 0, sizeof(link));
link_get_err = rte_eth_link_get_nowait(port_id, &link);
@@ -682,7 +681,7 @@ stats_loop(void *arg)
{
struct stats_lcore_params *stats_lcore = arg;
- while (!rte_atomic16_read(&global_exit_flag)) {
+ while (!__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED)) {
print_stats(stats_lcore);
rte_delay_ms(500);
}
@@ -928,7 +927,7 @@ processing_loop(void *arg)
const bool run_decoder = (lcore_conf->core_type &
(1 << RTE_BBDEV_OP_TURBO_DEC));
- while (!rte_atomic16_read(&global_exit_flag)) {
+ while (!__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED)) {
if (run_encoder)
run_encoding(lcore_conf);
if (run_decoder)
@@ -1062,7 +1061,7 @@ main(int argc, char **argv)
.align = __alignof__(struct rte_mbuf *),
};
- rte_atomic16_init(&global_exit_flag);
+ __atomic_store_n(&global_exit_flag, 0, __ATOMIC_RELAXED);
sigret = signal(SIGTERM, signal_handler);
if (sigret == SIG_ERR)
--
2.17.1
[dpdk-dev] [PATCH v2 2/8] examples/multi_process: use compiler atomics for sync
Convert rte_atomic32_test_and_set usage to compiler atomic
CAS operation for display_stats sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/multi_process/client_server_mp/mp_server/main.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_server/main.c
b/examples/multi_process/client_server_mp/mp_server/main.c
index 9bcee460fd..b4761ebc7b 100644
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -158,10 +157,12 @@ static int
sleep_lcore(__rte_unused void *dummy)
{
/* Used to pick a display thread - static, so zero-initialised */
- static rte_atomic32_t display_stats;
+ static uint32_t display_stats;
+ uint32_t status = 0;
/* Only one core should display stats */
- if (rte_atomic32_test_and_set(&display_stats)) {
+ if (__atomic_compare_exchange_n(&display_stats, &status, 1, 0,
+ __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
const unsigned sleeptime = 1;
printf("Core %u displaying statistics\n", rte_lcore_id());
--
2.17.1
[dpdk-dev] [PATCH v2 3/8] examples/kni: use compiler atomics for status sync
Convert rte_atomic usages to compiler atomic builit-ins
for kni_stop and kni_pause sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/kni/main.c | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/examples/kni/main.c b/examples/kni/main.c
index beabb3c848..ad1f569e18 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -131,8 +130,8 @@ static int kni_change_mtu(uint16_t port_id, unsigned int
new_mtu);
static int kni_config_network_interface(uint16_t port_id, uint8_t if_up);
static int kni_config_mac_address(uint16_t port_id, uint8_t mac_addr[]);
-static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0);
-static rte_atomic32_t kni_pause = RTE_ATOMIC32_INIT(0);
+static uint32_t kni_stop;
+static uint32_t kni_pause;
/* Print out statistics on packets handled */
static void
@@ -185,7 +184,7 @@ signal_handler(int signum)
if (signum == SIGRTMIN || signum == SIGINT || signum == SIGTERM) {
printf("\nSIGRTMIN/SIGINT/SIGTERM received. "
"KNI processing stopping.\n");
- rte_atomic32_inc(&kni_stop);
+ __atomic_fetch_add(&kni_stop, 1, __ATOMIC_RELAXED);
return;
}
}
@@ -311,8 +310,8 @@ main_loop(__rte_unused void *arg)
kni_port_params_array[i]->lcore_rx,
kni_port_params_array[i]->port_id);
while (1) {
- f_stop = rte_atomic32_read(&kni_stop);
- f_pause = rte_atomic32_read(&kni_pause);
+ f_stop = __atomic_load_n(&kni_stop, __ATOMIC_RELAXED);
+ f_pause = __atomic_load_n(&kni_pause, __ATOMIC_RELAXED);
if (f_stop)
break;
if (f_pause)
@@ -324,8 +323,8 @@ main_loop(__rte_unused void *arg)
kni_port_params_array[i]->lcore_tx,
kni_port_params_array[i]->port_id);
while (1) {
- f_stop = rte_atomic32_read(&kni_stop);
- f_pause = rte_atomic32_read(&kni_pause);
+ f_stop = __atomic_load_n(&kni_stop, __ATOMIC_RELAXED);
+ f_pause = __atomic_load_n(&kni_pause, __ATOMIC_RELAXED);
if (f_stop)
break;
if (f_pause)
@@ -856,9 +855,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
{
int ret;
- rte_atomic32_inc(&kni_pause);
+ __atomic_fetch_add(&kni_pause, 1, __ATOMIC_RELAXED);
ret = kni_change_mtu_(port_id, new_mtu);
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
return ret;
}
@@ -877,14 +876,14 @@ kni_config_network_interface(uint16_t port_id, uint8_t
if_up)
RTE_LOG(INFO, APP, "Configure network interface of %d %s\n",
port_id, if_up ? "up" : "down");
- rte_atomic32_inc(&kni_pause);
+ __atomic_fetch_add(&kni_pause, 1, __ATOMIC_RELAXED);
if (if_up != 0) { /* Configure network interface up */
ret = rte_eth_dev_stop(port_id);
if (ret != 0) {
RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
port_id, rte_strerror(-ret));
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
return ret;
}
ret = rte_eth_dev_start(port_id);
@@ -893,12 +892,12 @@ kni_config_network_interface(uint16_t port_id, uint8_t
if_up)
if (ret != 0) {
RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
port_id, rte_strerror(-ret));
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
return ret;
}
}
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
if (ret < 0)
RTE_LOG(ERR, APP, "Failed to start port %d\n", port_id);
--
2.17.1
[dpdk-dev] [PATCH v2 4/8] examples/performance-thread: use compiler atomics for sync
Convert rte_atomic usages to compiler atomic built-ins
for thread sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/performance-thread/common/lthread.c | 10 +++---
.../performance-thread/common/lthread_diag.h | 10 +++---
.../performance-thread/common/lthread_int.h | 1 -
.../performance-thread/common/lthread_mutex.c | 26 +++---
.../performance-thread/common/lthread_mutex.h | 2 +-
.../performance-thread/common/lthread_sched.c | 34 ---
.../performance-thread/common/lthread_tls.c | 5 +--
.../performance-thread/l3fwd-thread/main.c| 22 +---
8 files changed, 53 insertions(+), 57 deletions(-)
diff --git a/examples/performance-thread/common/lthread.c
b/examples/performance-thread/common/lthread.c
index 3f1f48db43..98123f34f8 100644
--- a/examples/performance-thread/common/lthread.c
+++ b/examples/performance-thread/common/lthread.c
@@ -357,9 +357,10 @@ void lthread_exit(void *ptr)
* - if exit before join then we suspend and resume on join
* - if join before exit then we resume the joining thread
*/
+ uint64_t join_initial = LT_JOIN_INITIAL;
if ((lt->join == LT_JOIN_INITIAL)
- && rte_atomic64_cmpset(<->join, LT_JOIN_INITIAL,
- LT_JOIN_EXITING)) {
+ && __atomic_compare_exchange_n(<->join, &join_initial,
+ LT_JOIN_EXITING, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
DIAG_EVENT(lt, LT_DIAG_LTHREAD_EXIT, 1, 0);
_suspend();
@@ -415,9 +416,10 @@ int lthread_join(struct lthread *lt, void **ptr)
* - if join before exit we suspend and will resume when exit is called
* - if exit before join we resume the exiting thread
*/
+ uint64_t join_initial = LT_JOIN_INITIAL;
if ((lt->join == LT_JOIN_INITIAL)
- && rte_atomic64_cmpset(<->join, LT_JOIN_INITIAL,
- LT_JOIN_THREAD_SET)) {
+ && __atomic_compare_exchange_n(<->join, &join_initial,
+ LT_JOIN_THREAD_SET, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
DIAG_EVENT(current, LT_DIAG_LTHREAD_JOIN, lt, 1);
_suspend();
diff --git a/examples/performance-thread/common/lthread_diag.h
b/examples/performance-thread/common/lthread_diag.h
index e876dda6da..7ee89eef38 100644
--- a/examples/performance-thread/common/lthread_diag.h
+++ b/examples/performance-thread/common/lthread_diag.h
@@ -78,11 +78,11 @@ extern uint64_t diag_mask;
} \
} while (0)
-#define DIAG_COUNT_DEFINE(x) rte_atomic64_t count_##x
-#define DIAG_COUNT_INIT(o, x) rte_atomic64_init(&((o)->count_##x))
-#define DIAG_COUNT_INC(o, x) rte_atomic64_inc(&((o)->count_##x))
-#define DIAG_COUNT_DEC(o, x) rte_atomic64_dec(&((o)->count_##x))
-#define DIAG_COUNT(o, x) rte_atomic64_read(&((o)->count_##x))
+#define DIAG_COUNT_DEFINE(x) uint64_t count_##x
+#define DIAG_COUNT_INIT(o, x) __atomic_store_n(&((o)->count_##x), 0,
__ATOMIC_RELAXED)
+#define DIAG_COUNT_INC(o, x) __atomic_fetch_add(&((o)->count_##x), 1,
__ATOMIC_RELAXED)
+#define DIAG_COUNT_DEC(o, x) __atomic_fetch_sub(&((o)->count_##x), 1,
__ATOMIC_RELAXED)
+#define DIAG_COUNT(o, x) __atomic_load_n(&((o)->count_##x), __ATOMIC_RELAXED)
#define DIAG_USED
diff --git a/examples/performance-thread/common/lthread_int.h
b/examples/performance-thread/common/lthread_int.h
index a352f13b75..d010126f16 100644
--- a/examples/performance-thread/common/lthread_int.h
+++ b/examples/performance-thread/common/lthread_int.h
@@ -21,7 +21,6 @@ extern "C" {
#include
#include
#include
-#include
#include
#include
diff --git a/examples/performance-thread/common/lthread_mutex.c
b/examples/performance-thread/common/lthread_mutex.c
index 01da6cad4f..061fc5c19a 100644
--- a/examples/performance-thread/common/lthread_mutex.c
+++ b/examples/performance-thread/common/lthread_mutex.c
@@ -60,7 +60,7 @@ lthread_mutex_init(char *name, struct lthread_mutex **mutex,
m->root_sched = THIS_SCHED;
m->owner = NULL;
- rte_atomic64_init(&m->count);
+ __atomic_store_n(&m->count, 0, __ATOMIC_RELAXED);
DIAG_CREATE_EVENT(m, LT_DIAG_MUTEX_CREATE);
/* success */
@@ -115,10 +115,11 @@ int lthread_mutex_lock(struct lthread_mutex *m)
}
for (;;) {
- rte_atomic64_inc(&m->count);
+ __atomic_fetch_add(&m->count, 1, __ATOMIC_RELAXED);
do {
- if (rte_atomic64_cmpset
- ((uint64_t *) &m->owner, 0, (uint64_t) lt)) {
+ uint64_t lt_init = 0;
+ if (__atomic_compare_exchange_n((uint64_t *) &m->owner,
<_init,
+ (uint64_t) lt, 0, __ATOMIC_RELAXED,
__ATOMIC_RELAXED)) {
/* happy days, we got the lock */
DIAG_EVENT
[dpdk-dev] [PATCH v2 5/8] examples/l2fwd-jobstats: use compiler atomics for stats sync
Convert rte_atomic usages to compiler atomic built-ins
for stats_read_pending sync in l2fwd_jobstats module.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/l2fwd-jobstats/main.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index bbb4a27a6d..99a17de181 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -81,7 +80,7 @@ struct lcore_queue_conf {
struct rte_jobstats idle_job;
struct rte_jobstats_context jobs_context;
- rte_atomic16_t stats_read_pending;
+ uint16_t stats_read_pending;
rte_spinlock_t lock;
} __rte_cache_aligned;
/* >8 End of list of queues to be polled for given lcore. */
@@ -155,9 +154,9 @@ show_lcore_stats(unsigned lcore_id)
uint64_t collection_time = rte_get_timer_cycles();
/* Ask forwarding thread to give us stats. */
- rte_atomic16_set(&qconf->stats_read_pending, 1);
+ __atomic_store_n(&qconf->stats_read_pending, 1, __ATOMIC_RELAXED);
rte_spinlock_lock(&qconf->lock);
- rte_atomic16_set(&qconf->stats_read_pending, 0);
+ __atomic_store_n(&qconf->stats_read_pending, 0, __ATOMIC_RELAXED);
/* Collect context statistics. */
stats_period = ctx->state_time - ctx->start_time;
@@ -526,8 +525,8 @@ l2fwd_main_loop(void)
repeats++;
need_manage = qconf->flush_timer.expire < now;
/* Check if we was esked to give a stats. */
- stats_read_pending =
-
rte_atomic16_read(&qconf->stats_read_pending);
+ stats_read_pending =
__atomic_load_n(&qconf->stats_read_pending,
+ __ATOMIC_RELAXED);
need_manage |= stats_read_pending;
for (i = 0; i < qconf->n_rx_port &&
!need_manage; i++)
--
2.17.1
[dpdk-dev] [PATCH v2 6/8] examples/vm_power_manager: use compiler atomics for sync
Convert rte_atomic32_cmpset to compiler atomic CAS
operation for channel status sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/vm_power_manager/channel_monitor.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/examples/vm_power_manager/channel_monitor.c
b/examples/vm_power_manager/channel_monitor.c
index 99f81544d7..3c20406f7c 100644
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#ifdef RTE_NET_I40E
@@ -829,8 +828,9 @@ process_request(struct rte_power_channel_packet *pkt,
if (chan_info == NULL)
return -1;
- if (rte_atomic32_cmpset(&(chan_info->status),
CHANNEL_MGR_CHANNEL_CONNECTED,
- CHANNEL_MGR_CHANNEL_PROCESSING) == 0)
+ uint32_t channel_connected = CHANNEL_MGR_CHANNEL_CONNECTED;
+ if (__atomic_compare_exchange_n(&(chan_info->status),
&channel_connected,
+ CHANNEL_MGR_CHANNEL_PROCESSING, 0, __ATOMIC_RELAXED,
__ATOMIC_RELAXED) == 0)
return -1;
if (pkt->command == RTE_POWER_CPU_POWER) {
@@ -934,8 +934,9 @@ process_request(struct rte_power_channel_packet *pkt,
* Return is not checked as channel status may have been set to DISABLED
* from management thread
*/
- rte_atomic32_cmpset(&(chan_info->status),
CHANNEL_MGR_CHANNEL_PROCESSING,
- CHANNEL_MGR_CHANNEL_CONNECTED);
+ uint32_t channel_processing = CHANNEL_MGR_CHANNEL_PROCESSING;
+ __atomic_compare_exchange_n(&(chan_info->status), &channel_processing,
+ CHANNEL_MGR_CHANNEL_CONNECTED, 0, __ATOMIC_RELAXED,
__ATOMIC_RELAXED);
return 0;
}
--
2.17.1
[dpdk-dev] [PATCH v2 7/8] examples/server_node_efd: use compiler atomics for sync
Convert rte_atomic32_test_and_set to compiler CAS atomic
operation for display_stats sync.
Signed-off-by: Joyce Kong
Reviewed-by: Ruifeng Wang
---
examples/server_node_efd/server/main.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/server_node_efd/server/main.c
b/examples/server_node_efd/server/main.c
index 7d07131dbf..b69beb012c 100644
--- a/examples/server_node_efd/server/main.c
+++ b/examples/server_node_efd/server/main.c
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -180,10 +179,12 @@ static int
sleep_lcore(__rte_unused void *dummy)
{
/* Used to pick a display thread - static, so zero-initialised */
- static rte_atomic32_t display_stats;
+ static uint32_t display_stats;
/* Only one core should display stats */
- if (rte_atomic32_test_and_set(&display_stats)) {
+ uint32_t display_init = 0;
+ if (__atomic_compare_exchange_n(&display_stats, &display_init, 1, 0,
+ __ATOMIC_RELAXED, __ATOMIC_RELAXED)) {
const unsigned int sleeptime = 1;
printf("Core %u displaying statistics\n", rte_lcore_id());
--
2.17.1
[dpdk-dev] [PATCH v2 8/8] examples: remove unnecessary include of atomic
Remove the unnecessary header file rte_atomic.h included in example module. Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang --- examples/bond/main.c | 1 - examples/ip_fragmentation/main.c | 1 - examples/ip_reassembly/main.c | 1 - examples/ipsec-secgw/ipsec-secgw.c | 1 - examples/ipv4_multicast/main.c | 1 - examples/l2fwd-crypto/main.c | 1 - examples/l2fwd-event/l2fwd_common.h| 1 - examples/l2fwd-event/l2fwd_event.c | 1 - examples/l2fwd-keepalive/main.c| 1 - examples/l2fwd/main.c | 1 - examples/l3fwd-acl/main.c | 1 - examples/l3fwd-power/main.c| 1 - examples/l3fwd/main.c | 1 - examples/link_status_interrupt/main.c | 1 - examples/multi_process/client_server_mp/mp_client/client.c | 1 - examples/multi_process/client_server_mp/mp_server/init.c | 1 - examples/multi_process/simple_mp/main.c| 1 - examples/multi_process/simple_mp/mp_commands.c | 1 - examples/multi_process/symmetric_mp/main.c | 1 - examples/server_node_efd/node/node.c | 1 - examples/server_node_efd/server/init.c | 1 - examples/vhost_blk/blk.c | 1 - examples/vhost_blk/vhost_blk.c | 1 - examples/vm_power_manager/channel_manager.c| 1 - examples/vm_power_manager/channel_manager.h| 1 - examples/vmdq/main.c | 1 - examples/vmdq_dcb/main.c | 1 - 27 files changed, 27 deletions(-) diff --git a/examples/bond/main.c b/examples/bond/main.c index f48400e211..de1e995a8a 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index f245369720..f965624c8b 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 8645ac790b..6a8e91673d 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index f252d34985..012b908410 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index cc527d7f6b..5830ad61c1 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 5f539c458c..e302ad022c 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/examples/l2fwd-event/l2fwd_common.h b/examples/l2fwd-event/l2fwd_common.h index 939221d45a..1a418e6a22 100644 --- a/examples/l2fwd-event/l2fwd_common.h +++ b/examples/l2fwd-event/l2fwd_common.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/l2fwd-event/l2fwd_event.c b/examples/l2fwd-event/l2fwd_event.c index 7ba5311d66..acfacfa4fb 100644 --- a/examples/l2fwd-event/l2fwd_event.c +++ b/examples/l2fwd-event/l2fwd_event.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 4e1a17cfe4..cb7f267259 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 911e40c66e..56a0663111 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index a1f457b564..2a942731bc 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff
