Re: [PATCH] devtools: extend check on compiler builtin atomics
On Tue, Oct 17, 2023 at 1:34 PM Tyler Retzlaff wrote: > > On Tue, Oct 17, 2023 at 01:31:25PM +0200, David Marchand wrote: > > rte_memory_order_* should be used when calling the new stdatomic API. > > Add a check on __ATOMIC_* tokens. > > > > Signed-off-by: David Marchand > Acked-by: Tyler Retzlaff > [snip] > > -v RET_ON_FAIL=1 \ > > - -v MESSAGE='Using __atomic_xxx built-ins, prefer > > rte_atomic_xxx' \ > > + -v MESSAGE='Using __atomic_xxx/__ATOMIC_XXX built-ins, prefer > > rte_atomic_xxx' \ > > Not sure if it should say prefer rte_atomic_xxx/rte_memory_order_xxx ? Looks ok to me, I did this small change while applying. Applied, thanks. -- David Marchand
Re: [PATCH v3] app/dma-perf: fix physical address seg-fault
Acked-by: Chengwen Feng
On 2023/10/19 12:16, Vipin Varghese wrote:
> do_cpu_mem_copy uses DPDK API rte_mbuf_data_iova to return
> the start of the virtual address for both src and dst.
> But in case of iova mode set as PA, this results in seg-fault.
> This is because rte_memcpy uses VA address and not PA.
>
> This fix invokes `rte_pktmbuf_mtod` for both src and dst.
>
> Bugzilla ID: 1269
> Fixes: 623dc9364dc6 ("app/dma-perf: introduce DMA performance test")
> Cc: cheng1.ji...@intel.com
>
> Cc: sta...@dpdk.org
>
> Signed-off-by: Vipin Varghese
> Suggested-by: Anoob Joseph
> Suggested-by: Jerin Jacob
>
> ---
...
Re: [PATCH 1/7] vhost: fix missing vring call check on virtqueue access
On Mon, Sep 25, 2023 at 6:36 PM Maxime Coquelin
wrote:
>
> Acquiring the access lock is not enough to ensure
> virtqueue's metadata such as vring pointers are valid.
>
> The access status must also be checked.
Even if adding the lock was not enough, I would flag Fixes:
6c299bb7322f ("vhost: introduce vring call API")
>
> Fixes: c5736998305d ("vhost: fix missing virtqueue lock protection")
> Fixes: 830f7e790732 ("vhost: add non-blocking API for posting interrupt")
> Cc: sta...@dpdk.org
>
> Reported-by: Li Feng
> Signed-off-by: Maxime Coquelin
--
David Marchand
RE: [PATCH v1 06/11] test/bbdev: assert failed test for queue configure
Hi Maxime, Do we really want to make these kind of changes on to the stable release, it tends to artificially increase the amount of churn on the stable release which can be counterproductive for such changes which don't add much value if any to user/developper. Happy to follow your suggestion but a general feedback is lack of appetite for very large amount of changes in stable patches which inhibit adoption, so would expect to put things there that we would genuinely flag as a bug. Kindly share your thoughts. Thanks Nic > -Original Message- > From: Maxime Coquelin > Sent: Tuesday, October 17, 2023 9:43 PM > To: Vargas, Hernan ; dev@dpdk.org; > gak...@marvell.com; Rix, Tom > Cc: Chautru, Nicolas ; Zhang, Qi Z > > Subject: Re: [PATCH v1 06/11] test/bbdev: assert failed test for queue > configure > > > > On 9/29/23 20:13, Hernan Vargas wrote: > > Stop test if rte_bbdev_queue_configure fails to configure queue. > > > > Signed-off-by: Hernan Vargas > > --- > > app/test-bbdev/test_bbdev.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c > > index 65805977aead..cf224dca5d04 100644 > > --- a/app/test-bbdev/test_bbdev.c > > +++ b/app/test-bbdev/test_bbdev.c > > @@ -366,7 +366,8 @@ test_bbdev_configure_stop_queue(void) > > * - queue should be started if deferred_start == > > */ > > ts_params->qconf.deferred_start = 0; > > - rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf); > > + TEST_ASSERT_SUCCESS(rte_bbdev_queue_configure(dev_id, queue_id, > &ts_params->qconf), > > + "Failed test for rte_bbdev_queue_configure"); > > rte_bbdev_start(dev_id); > > > > TEST_ASSERT_SUCCESS(return_value = > rte_bbdev_queue_info_get(dev_id, > > If should be a fix IMO. > With fixes tag added and stable cc'ed: > > Reviewed-by: Maxime Coquelin > > Thanks, > Maxime
Re: [PATCH v1 06/11] test/bbdev: assert failed test for queue configure
Hi Nicolas, On 10/19/23 10:41, Chautru, Nicolas wrote: Hi Maxime, Do we really want to make these kind of changes on to the stable release, it tends to artificially increase the amount of churn on the stable release which can be counterproductive for such changes which don't add much value if any to user/developper. Happy to follow your suggestion but a general feedback is lack of appetite for very large amount of changes in stable patches which inhibit adoption, so would expect to put things there that we would genuinely flag as a bug. Kindly share your thoughts. Checking for configuration failure in a test application is quite useful in my opinion, as it can help catching regressions, isn't it? Maxime Thanks Nic -Original Message- From: Maxime Coquelin Sent: Tuesday, October 17, 2023 9:43 PM To: Vargas, Hernan ; dev@dpdk.org; gak...@marvell.com; Rix, Tom Cc: Chautru, Nicolas ; Zhang, Qi Z Subject: Re: [PATCH v1 06/11] test/bbdev: assert failed test for queue configure On 9/29/23 20:13, Hernan Vargas wrote: Stop test if rte_bbdev_queue_configure fails to configure queue. Signed-off-by: Hernan Vargas --- app/test-bbdev/test_bbdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c index 65805977aead..cf224dca5d04 100644 --- a/app/test-bbdev/test_bbdev.c +++ b/app/test-bbdev/test_bbdev.c @@ -366,7 +366,8 @@ test_bbdev_configure_stop_queue(void) * - queue should be started if deferred_start == */ ts_params->qconf.deferred_start = 0; - rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf); + TEST_ASSERT_SUCCESS(rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf), + "Failed test for rte_bbdev_queue_configure"); rte_bbdev_start(dev_id); TEST_ASSERT_SUCCESS(return_value = rte_bbdev_queue_info_get(dev_id, If should be a fix IMO. With fixes tag added and stable cc'ed: Reviewed-by: Maxime Coquelin Thanks, Maxime
RE: [PATCH v1 02/11] test/bbdev: update python script parameters
Hi Maxime,
I believe there was some historical discrepancy, even in doc both appeared but
none of the 2 -t options with the cap.
https://doc.dpdk.org/guides/tools/testbbdev.html
Resolving this historical issue here.
Thanks
Nic
> -Original Message-
> From: Maxime Coquelin
> Sent: Tuesday, October 17, 2023 9:08 PM
> To: Vargas, Hernan ; dev@dpdk.org;
> gak...@marvell.com; Rix, Tom
> Cc: Chautru, Nicolas ; Zhang, Qi Z
>
> Subject: Re: [PATCH v1 02/11] test/bbdev: update python script parameters
>
>
>
> On 9/29/23 20:13, Hernan Vargas wrote:
> > Update the timeout argument and default values.
> > Update EAL help message and default value.
> > Add iter_max and snr arguments.
> >
> > Signed-off-by: Hernan Vargas
> > ---
> > app/test-bbdev/test-bbdev.py | 22 ++
> > app/test-bbdev/test_bbdev_perf.c | 2 +-
> > 2 files changed, 19 insertions(+), 5 deletions(-)
> >
> > diff --git a/app/test-bbdev/test-bbdev.py
> > b/app/test-bbdev/test-bbdev.py index 9cdb4659724d..8d0145076e4d 100755
> > --- a/app/test-bbdev/test-bbdev.py
> > +++ b/app/test-bbdev/test-bbdev.py
> > @@ -25,12 +25,12 @@ def kill(process):
> > help="specifies path to the bbdev test app",
> > default=dpdk_path + "/" + dpdk_target +
> > "/app/dpdk-test-bbdev")
> > parser.add_argument("-e", "--eal-params",
> > -help="EAL arguments which are passed to the test app",
> > -default="--vdev=baseband_null0")
> > -parser.add_argument("-t", "--timeout",
> > +help="EAL arguments which must be passed to the test
> > app",
> > +default="--vdev=baseband_null0 -a00:00.0")
> > +parser.add_argument("-T", "--timeout",
> > type=int,
> > help="Timeout in seconds",
> > -default=300)
> > +default=600)
> > parser.add_argument("-c", "--test-cases",
> > nargs="+",
> > help="Defines test cases to run. Run all if not
> > specified") @@ -48,6 +48,14 @@ def kill(process):
> > type=int,
> > help="Operations enqueue/dequeue burst size.",
> > default=[32])
> > +parser.add_argument("-s", "--snr",
> > +type=int,
> > +help="SNR in dB for BLER tests",
> > +default=0)
> > +parser.add_argument("-t", "--iter-max",
>
> We shouldn't change parameters meaning, it will silently break existing
> scripts
> making use of it.
>
> > +type=int,
> > +help="Max iterations",
> > +default=6)
> > parser.add_argument("-l", "--num-lcores",
> > type=int,
> > help="Number of lcores to run.", @@ -68,6 +76,12
> > @@ def kill(process):
> >
> > params.extend(["--"])
> >
> > +if args.snr:
> > +params.extend(["-s", str(args.snr)])
> > +
> > +if args.iter_max:
> > +params.extend(["-t", str(args.iter_max)])
> > +
> > if args.num_ops:
> > params.extend(["-n", str(args.num_ops)])
> >
> > diff --git a/app/test-bbdev/test_bbdev_perf.c
> > b/app/test-bbdev/test_bbdev_perf.c
> > index 276bbf0a2e6d..faea26c10eed 100644
> > --- a/app/test-bbdev/test_bbdev_perf.c
> > +++ b/app/test-bbdev/test_bbdev_perf.c
> > @@ -26,7 +26,7 @@
> >
> > #define MAX_QUEUES RTE_MAX_LCORE
> > #define TEST_REPETITIONS 100
> > -#define TIME_OUT_POLL 1e8
> > +#define TIME_OUT_POLL 1e9
> > #define WAIT_OFFLOAD_US 1000
> >
> > #ifdef RTE_BASEBAND_FPGA_LTE_FEC
[PATCH v5] net/iavf: data paths support no-polling mode
In a scenario involving a hot firmware upgrade, the network device on
the host side need to be reset, potentially causing the hardware queues
to become unreachable. In a VM, continuing to run VF PMD Rx/Tx during
this process can lead to application crash.
The solution is to implement a 'no-polling' Rx and Tx wrapper. This
wrapper will check the link status and return immediately if the link
is down. This is especially important because the link down events will
continue to be sent from the PF to the VF during firmware hot upgrades,
and the event will always occur before the RESET IMPENDING event.
The no-polling rx/tx mechanism will only be active when the
devarg "no-poll-on-link-down" is enabled. This devarg is typically
recommended for use in this specific hot upgrade scenario.
Ideally, "no-poll-on-link-down" should be used in conjunction with
the devarg "auto-reset" to provide a seamless and user-friendly
experience within the VM.
Signed-off-by: Mingjin Ye
---
V3: Remove redundant code.
---
v4: Delete the git log note.
---
v5: Optimize the commit log
---
doc/guides/nics/intel_vf.rst | 3 ++
drivers/net/iavf/iavf.h| 4 +++
drivers/net/iavf/iavf_ethdev.c | 16 +-
drivers/net/iavf/iavf_rxtx.c | 53 ++
drivers/net/iavf/iavf_rxtx.h | 1 +
drivers/net/iavf/iavf_vchnl.c | 20 +
6 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index e06d62a873..df298c6086 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -107,6 +107,9 @@ For more detail on SR-IOV, please refer to the following
documents:
when IAVF is backed by an Intel\ |reg| E810 device
or an Intel\ |reg| 700 Series Ethernet device.
+Enable vf no-poll-on-link-down by setting the ``devargs`` parameter like
``-a 18:01.0,no-poll-on-link-down=1`` when IAVF is backed
+by an Intel® E810 device or an Intel® 700 Series Ethernet device.
+
The PCIE host-interface of Intel Ethernet Switch FM1 Series VF
infrastructure
^
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 04774ce124..c115f3444e 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -308,6 +308,7 @@ struct iavf_devargs {
uint16_t quanta_size;
uint32_t watchdog_period;
uint8_t auto_reset;
+ uint16_t no_poll_on_link_down;
};
struct iavf_security_ctx;
@@ -326,6 +327,9 @@ struct iavf_adapter {
uint32_t ptype_tbl[IAVF_MAX_PKT_TYPE] __rte_cache_min_aligned;
bool stopped;
bool closed;
+ bool no_poll;
+ eth_rx_burst_t rx_pkt_burst;
+ eth_tx_burst_t tx_pkt_burst;
uint16_t fdir_ref_cnt;
struct iavf_devargs devargs;
};
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 5b2634a4e3..98cc5c8ea8 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -38,7 +38,7 @@
#define IAVF_QUANTA_SIZE_ARG "quanta_size"
#define IAVF_RESET_WATCHDOG_ARG"watchdog_period"
#define IAVF_ENABLE_AUTO_RESET_ARG "auto_reset"
-
+#define IAVF_NO_POLL_ON_LINK_DOWN_ARG "no-poll-on-link-down"
uint64_t iavf_timestamp_dynflag;
int iavf_timestamp_dynfield_offset = -1;
@@ -47,6 +47,7 @@ static const char * const iavf_valid_args[] = {
IAVF_QUANTA_SIZE_ARG,
IAVF_RESET_WATCHDOG_ARG,
IAVF_ENABLE_AUTO_RESET_ARG,
+ IAVF_NO_POLL_ON_LINK_DOWN_ARG,
NULL
};
@@ -2291,6 +2292,7 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
struct rte_kvargs *kvlist;
int ret;
int watchdog_period = -1;
+ uint16_t no_poll_on_link_down;
if (!devargs)
return 0;
@@ -2324,6 +2326,15 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
else
ad->devargs.watchdog_period = watchdog_period;
+ ret = rte_kvargs_process(kvlist, IAVF_NO_POLL_ON_LINK_DOWN_ARG,
+&parse_u16, &no_poll_on_link_down);
+ if (ret)
+ goto bail;
+ if (no_poll_on_link_down == 0)
+ ad->devargs.no_poll_on_link_down = 0;
+ else
+ ad->devargs.no_poll_on_link_down = 1;
+
if (ad->devargs.quanta_size != 0 &&
(ad->devargs.quanta_size < 256 || ad->devargs.quanta_size > 4096 ||
ad->devargs.quanta_size & 0x40)) {
@@ -2337,6 +2348,9 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)
if (ret)
goto bail;
+ if (ad->devargs.auto_reset != 0)
+ ad->devargs.no_poll_on_link_down = 1;
+
bail:
rte_kvargs_free(kvlist);
return ret;
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index c6ef6af1d8..72263870a4 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -777,6 +777,7 @@ iav
Re: [PATCH v1 02/11] test/bbdev: update python script parameters
On 10/19/23 11:01, Chautru, Nicolas wrote:
Hi Maxime,
I believe there was some historical discrepancy, even in doc both appeared but
none of the 2 -t options with the cap.
https://doc.dpdk.org/guides/tools/testbbdev.html
Resolving this historical issue here.
Ok, then we should fix the doc, not the code.
Thanks,
Maxime
Thanks
Nic
-Original Message-
From: Maxime Coquelin
Sent: Tuesday, October 17, 2023 9:08 PM
To: Vargas, Hernan ; dev@dpdk.org;
gak...@marvell.com; Rix, Tom
Cc: Chautru, Nicolas ; Zhang, Qi Z
Subject: Re: [PATCH v1 02/11] test/bbdev: update python script parameters
On 9/29/23 20:13, Hernan Vargas wrote:
Update the timeout argument and default values.
Update EAL help message and default value.
Add iter_max and snr arguments.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test-bbdev.py | 22 ++
app/test-bbdev/test_bbdev_perf.c | 2 +-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/app/test-bbdev/test-bbdev.py
b/app/test-bbdev/test-bbdev.py index 9cdb4659724d..8d0145076e4d 100755
--- a/app/test-bbdev/test-bbdev.py
+++ b/app/test-bbdev/test-bbdev.py
@@ -25,12 +25,12 @@ def kill(process):
help="specifies path to the bbdev test app",
default=dpdk_path + "/" + dpdk_target +
"/app/dpdk-test-bbdev")
parser.add_argument("-e", "--eal-params",
-help="EAL arguments which are passed to the test app",
-default="--vdev=baseband_null0")
-parser.add_argument("-t", "--timeout",
+help="EAL arguments which must be passed to the test app",
+default="--vdev=baseband_null0 -a00:00.0")
+parser.add_argument("-T", "--timeout",
type=int,
help="Timeout in seconds",
-default=300)
+default=600)
parser.add_argument("-c", "--test-cases",
nargs="+",
help="Defines test cases to run. Run all if not
specified") @@ -48,6 +48,14 @@ def kill(process):
type=int,
help="Operations enqueue/dequeue burst size.",
default=[32])
+parser.add_argument("-s", "--snr",
+type=int,
+help="SNR in dB for BLER tests",
+default=0)
+parser.add_argument("-t", "--iter-max",
We shouldn't change parameters meaning, it will silently break existing scripts
making use of it.
+type=int,
+help="Max iterations",
+default=6)
parser.add_argument("-l", "--num-lcores",
type=int,
help="Number of lcores to run.", @@ -68,6 +76,12
@@ def kill(process):
params.extend(["--"])
+if args.snr:
+params.extend(["-s", str(args.snr)])
+
+if args.iter_max:
+params.extend(["-t", str(args.iter_max)])
+
if args.num_ops:
params.extend(["-n", str(args.num_ops)])
diff --git a/app/test-bbdev/test_bbdev_perf.c
b/app/test-bbdev/test_bbdev_perf.c
index 276bbf0a2e6d..faea26c10eed 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -26,7 +26,7 @@
#define MAX_QUEUES RTE_MAX_LCORE
#define TEST_REPETITIONS 100
-#define TIME_OUT_POLL 1e8
+#define TIME_OUT_POLL 1e9
#define WAIT_OFFLOAD_US 1000
#ifdef RTE_BASEBAND_FPGA_LTE_FEC
[PATCH] net/cpfl: fix coverity issue 403269, 403270 and 403272
From: Wenjing Qiao
Fix logically dead code and dereference before null check
issues reported in coverity scan.
Coverity issue: 403269
Coverity issue: 403270
Coverity issue: 403272
Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON")
Fixes: 6cc97c9971d7 ("net/cpfl: build action mapping rules from JSON")
Signed-off-by: Wenjing Qiao
---
drivers/net/cpfl/cpfl_ethdev.h | 3 +--
drivers/net/cpfl/cpfl_flow_parser.c | 4
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h
index efb0eb5251..6f5af4f7f3 100644
--- a/drivers/net/cpfl/cpfl_ethdev.h
+++ b/drivers/net/cpfl/cpfl_ethdev.h
@@ -280,7 +280,6 @@ cpfl_get_port_id(struct cpfl_itf *itf)
static inline uint16_t
cpfl_get_vsi_id(struct cpfl_itf *itf)
{
- struct cpfl_adapter_ext *adapter = itf->adapter;
struct cpfl_vport_info *info;
uint32_t vport_id;
int ret;
@@ -301,7 +300,7 @@ cpfl_get_vsi_id(struct cpfl_itf *itf)
vport_identity.pf_id = CPFL_ACC_CPF_ID;
vport_identity.vf_id = 0;
vport_identity.vport_id = vport_id;
- ret = rte_hash_lookup_data(adapter->vport_map_hash,
+ ret = rte_hash_lookup_data(itf->adapter->vport_map_hash,
&vport_identity,
(void **)&info);
if (ret < 0) {
diff --git a/drivers/net/cpfl/cpfl_flow_parser.c
b/drivers/net/cpfl/cpfl_flow_parser.c
index 0e623494a2..412f7feed0 100644
--- a/drivers/net/cpfl/cpfl_flow_parser.c
+++ b/drivers/net/cpfl/cpfl_flow_parser.c
@@ -844,8 +844,6 @@ cpfl_parser_destroy(struct cpfl_flow_js_parser *parser)
for (i = 0; i < parser->pr_size; i++) {
struct cpfl_flow_js_pr *pattern = &parser->patterns[i];
- if (!pattern)
- continue;
for (j = 0; j < pattern->key.proto_size; j++)
rte_free(pattern->key.protocols[j].fields);
rte_free(pattern->key.protocols);
@@ -863,8 +861,6 @@ cpfl_parser_destroy(struct cpfl_flow_js_parser *parser)
for (i = 0; i < parser->mr_size; i++) {
struct cpfl_flow_js_mr *mr = &parser->modifications[i];
- if (!mr)
- continue;
rte_free(mr->key.actions);
rte_free(mr->action.mod.layout);
}
--
2.34.1
Re: [PATCH 0/7] vhost: ensure vitqueue access status is checked
Hello Maxime, On Mon, Sep 25, 2023 at 6:36 PM Maxime Coquelin wrote: > > Li Feng initially reported segmentation fault in rte_vhost_vring_call() > because of not checking the virtqueue metadata can be accessed. > > This should be achieved by checking the access_ok status field of > the virtqueue. > > This series also takes the opportunity to fix the other APIs. > This is split in multiple patches to ease LTS maintainers backports, > but could be squashed if preferred. > > Maxime Coquelin (7): > vhost: fix missing vring call check on virtqueue access > vhost: fix missing check on virtqueue access > vhost: fix checking virtqueue access when notifying guest > vhost: fix check on virtqueue access in async registration > vhost: Fix check on virtqueue access in in-flight getter Nit: fix* > vhost: fix missing lock protection in power monitor API > vhost: fix checking virtqueue access ins stats API This series needs some rebasing, and I had a small comment on a first patch Fixes: tag, but otherwise it lgtm. -- David Marchand
[PATCH v10 00/12] add CLI based graph application
From: Sunil Kumar Kori In the continuation of following feedback https://patches.dpdk.org/project/dpdk/patch/20230425131516.3308612-5-vattun...@marvell.com/ this patch series adds dpdk-graph application to exercise various usecases using graph. 1. Each use case is defined in terms of .cli file which will contain set of commands to configure the system and to create a graph for that use case. 2. Each module like ethdev, mempool, route etc exposes its set of commands to do global and node specific configuration. 3. Command parsing is backed by command line library. Rakesh Kudurumalla (5): app/graph: support mempool command line interfaces app/graph: support IPv6 lookup command line interfaces app/graph: support ethdev Rx command line interfaces app/graph: support graph command line interfaces app/graph: support l3fwd use case Sunil Kumar Kori (7): app/graph: support application CLI framework app/graph: support telnet connectivity framework app/graph: support parser utility APIs app/graph: support ethdev command line interfaces app/graph: support IPv4 lookup command line interfaces app/graph: support neigh command line interfaces app/graph: support CLI option to enable graph stats MAINTAINERS | 7 + app/graph/cli.c | 138 +++ app/graph/cli.h | 32 + app/graph/conn.c | 284 ++ app/graph/conn.h | 46 + app/graph/ethdev.c | 885 +++ app/graph/ethdev.h | 40 + app/graph/ethdev_priv.h | 112 +++ app/graph/ethdev_rx.c| 165 app/graph/ethdev_rx.h| 37 + app/graph/ethdev_rx_priv.h | 39 + app/graph/examples/l3fwd.cli | 73 ++ app/graph/examples/l3fwd_pcap.cli| 71 ++ app/graph/graph.c| 550 app/graph/graph.h| 21 + app/graph/graph_priv.h | 70 ++ app/graph/ip4_route.c| 224 + app/graph/ip6_route.c| 229 + app/graph/l3fwd.c| 136 +++ app/graph/l3fwd.h| 11 + app/graph/main.c | 237 + app/graph/mempool.c | 140 +++ app/graph/mempool.h | 24 + app/graph/mempool_priv.h | 34 + app/graph/meson.build| 25 + app/graph/module_api.h | 31 + app/graph/neigh.c| 364 app/graph/neigh.h| 17 + app/graph/neigh_priv.h | 49 + app/graph/route.h| 40 + app/graph/route_priv.h | 44 + app/graph/utils.c| 156 app/graph/utils.h| 14 + app/meson.build | 1 + doc/guides/rel_notes/release_23_11.rst | 7 + doc/guides/tools/graph.rst | 334 +++ doc/guides/tools/img/graph-usecase-l3fwd.svg | 210 + doc/guides/tools/index.rst | 1 + 38 files changed, 4898 insertions(+) create mode 100644 app/graph/cli.c create mode 100644 app/graph/cli.h create mode 100644 app/graph/conn.c create mode 100644 app/graph/conn.h create mode 100644 app/graph/ethdev.c create mode 100644 app/graph/ethdev.h create mode 100644 app/graph/ethdev_priv.h create mode 100644 app/graph/ethdev_rx.c create mode 100644 app/graph/ethdev_rx.h create mode 100644 app/graph/ethdev_rx_priv.h create mode 100644 app/graph/examples/l3fwd.cli create mode 100644 app/graph/examples/l3fwd_pcap.cli create mode 100644 app/graph/graph.c create mode 100644 app/graph/graph.h create mode 100644 app/graph/graph_priv.h create mode 100644 app/graph/ip4_route.c create mode 100644 app/graph/ip6_route.c create mode 100644 app/graph/l3fwd.c create mode 100644 app/graph/l3fwd.h create mode 100644 app/graph/main.c create mode 100644 app/graph/mempool.c create mode 100644 app/graph/mempool.h create mode 100644 app/graph/mempool_priv.h create mode 100644 app/graph/meson.build create mode 100644 app/graph/module_api.h create mode 100644 app/graph/neigh.c create mode 100644 app/graph/neigh.h create mode 100644 app/graph/neigh_priv.h create mode 100644 app/graph/route.h create mode 100644 app/graph/route_priv.h create mode 100644 app/graph/utils.c create mode 100644 app/graph/utils.h create mode 100644 doc/guides/tools/graph.rst create mode 100644 doc/guides/tools/img/graph-usecase-l3fwd.svg -- 2.25.1
[PATCH v10 01/12] app/graph: support application CLI framework
From: Sunil Kumar Kori
Adds base framework to read a given .cli file as a command line
parameter "-s".
Example:
# ./dpdk-graph -c 0xff -- -s ./app/graph/examples/dummy.cli
Each .cli file will contain commands to configure different module like
mempool, ethdev, lookup tables, graph etc. Command parsing is backed by
commandline library.
Each module needs to expose its supported commands & corresponding
callback functions to commandline library to get them parsed.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
v9..v10
- Add l3fwd_pcap.cli for pcap devices.
- Update table generation mechanism user guide document
v8..v9:
- Replace strcpy() to rte_strscpy()
- Update release note.
- Update user guide
v7..v8:
- Fix klocwork issues.
v6..v7:
- Fix FreeBSD build error.
- Make route and neigh runtime configuration too.
v5..v6:
- Fix build errors.
- Fix checkpatch errors.
- Fix individual patch build errors.
v4..v5:
- Fix application exit issue.
- Enable graph packet capture feature.
- Fix graph coremask synchronization with eal coremask.
- Update user guide.
https://patches.dpdk.org/project/dpdk/patch/20230919160455.1678716-1-sk...@marvell.com/
v3..v4:
- Use commandline library to parse command tokens.
- Split to multiple smaller patches.
- Make neigh and route as dynamic database.
- add ethdev and graph stats command via telnet.
- Update user guide.
https://patches.dpdk.org/project/dpdk/patch/20230908104907.4060511-1-sk...@marvell.com/
MAINTAINERS| 7 ++
app/graph/cli.c| 115 ++
app/graph/cli.h| 32 +++
app/graph/main.c | 128 +
app/graph/meson.build | 15 +++
app/graph/module_api.h | 16
app/meson.build| 1 +
doc/guides/rel_notes/release_23_11.rst | 7 ++
doc/guides/tools/graph.rst | 75 +++
doc/guides/tools/index.rst | 1 +
10 files changed, 397 insertions(+)
create mode 100644 app/graph/cli.c
create mode 100644 app/graph/cli.h
create mode 100644 app/graph/main.c
create mode 100644 app/graph/meson.build
create mode 100644 app/graph/module_api.h
create mode 100644 doc/guides/tools/graph.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index 4083658697..88a71d5455 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1818,6 +1818,13 @@ F: dts/
F: devtools/dts-check-format.sh
F: doc/guides/tools/dts.rst
+Graph application
+M: Sunil Kumar Kori
+M: Rakesh Kudurumalla
+F: app/graph/
+F: doc/guides/tools/graph.rst
+F: doc/guides/tools/img/graph-usecase-l3fwd.svg
+
Other Example Applications
--
diff --git a/app/graph/cli.c b/app/graph/cli.c
new file mode 100644
index 00..df4f8fcbb8
--- /dev/null
+++ b/app/graph/cli.c
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "module_api.h"
+
+#define CMD_MAX_TOKENS 256
+#define MAX_LINE_SIZE 2048
+
+cmdline_parse_ctx_t modules_ctx[] = {
+ NULL,
+};
+
+static struct cmdline *cl;
+
+static int
+is_comment(char *in)
+{
+ if ((strlen(in) && index("!#%;", in[0])) ||
+ (strncmp(in, "//", 2) == 0) ||
+ (strncmp(in, "--", 2) == 0))
+ return 1;
+
+ return 0;
+}
+
+void
+cli_init(void)
+{
+ cl = cmdline_stdin_new(modules_ctx, "");
+}
+
+void
+cli_exit(void)
+{
+ cmdline_stdin_exit(cl);
+}
+
+void
+cli_process(char *in, char *out, size_t out_size, __rte_unused void *obj)
+{
+ int rc;
+
+ if (is_comment(in))
+ return;
+
+ rc = cmdline_parse(cl, in);
+ if (rc == CMDLINE_PARSE_AMBIGUOUS)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Ambiguous command");
+ else if (rc == CMDLINE_PARSE_NOMATCH)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Command mismatch");
+ else if (rc == CMDLINE_PARSE_BAD_ARGS)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Bad arguments");
+
+ return;
+
+}
+
+int
+cli_script_process(const char *file_name, size_t msg_in_len_max, size_t
msg_out_len_max, void *obj)
+{
+ char *msg_in = NULL, *msg_out = NULL;
+ int rc = -EINVAL;
+ FILE *f = NULL;
+
+ /* Check input arguments */
+ if ((file_name == NULL) || (strlen(file_name) == 0) || (msg_in_len_max
== 0) ||
+ (msg_out_len_max == 0))
+ return rc;
+
+ msg_in = malloc(msg_in_len_max + 1);
+ msg_out = malloc(msg_out_len_max + 1);
+ if ((msg_in == NULL) || (msg_out == NULL)) {
+ rc = -ENOMEM;
+ goto exit;
+ }
+
+ /* Open input file */
+ f = fopen(file_name, "r");
+ if (f == NULL) {
+ rc = -EIO;
+ goto exit;
+
[PATCH v10 02/12] app/graph: support telnet connectivity framework
From: Sunil Kumar Kori
Adds framework to initiate a telnet session with application.
Some configurations and debug commands are exposed as runtime APIs.
Those commands can be invoked using telnet session.
Application initiates a telnet server with host address 0.0.0.0
and port number 8086 by default.
To make it configurable, "-h" and "-p" options are provided.
Using them user can pass host address and port number on which
application will start telnet server.
Using same host address and port number, telnet client can connect
to application.
Syntax to connect with application:
# telnet
Once session is connected, "graph> " prompt will be available.
Example:
# telnet 10.28.35.207 5
Trying 10.28.35.207...
Connected to 10.28.35.207.
Escape character is '^]'.
Welcome!
graph>
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/conn.c | 284 +
app/graph/conn.h | 46 ++
app/graph/main.c | 103 +-
app/graph/meson.build | 1 +
app/graph/module_api.h | 3 +
doc/guides/tools/graph.rst | 38 +
6 files changed, 470 insertions(+), 5 deletions(-)
create mode 100644 app/graph/conn.c
create mode 100644 app/graph/conn.h
diff --git a/app/graph/conn.c b/app/graph/conn.c
new file mode 100644
index 00..44934602c7
--- /dev/null
+++ b/app/graph/conn.c
@@ -0,0 +1,284 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+
+#define MSG_CMD_TOO_LONG "Command too long."
+
+static int
+data_event_handle(struct conn *conn, int fd_client)
+{
+ ssize_t len, i, rc = 0;
+
+ /* Read input message */
+ len = read(fd_client, conn->buf, conn->buf_size);
+ if (len == -1) {
+ if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+ return 0;
+
+ return -1;
+ }
+
+ if (len == 0)
+ return rc;
+
+ /* Handle input messages */
+ for (i = 0; i < len; i++) {
+ if (conn->buf[i] == '\n') {
+ size_t n;
+
+ conn->msg_in[conn->msg_in_len] = 0;
+ conn->msg_out[0] = 0;
+
+ conn->msg_handle(conn->msg_in, conn->msg_out,
conn->msg_out_len_max,
+conn->msg_handle_arg);
+
+ n = strlen(conn->msg_out);
+ if (n) {
+ rc = write(fd_client, conn->msg_out, n);
+ if (rc == -1)
+ goto exit;
+ }
+
+ conn->msg_in_len = 0;
+ } else if (conn->msg_in_len < conn->msg_in_len_max) {
+ conn->msg_in[conn->msg_in_len] = conn->buf[i];
+ conn->msg_in_len++;
+ } else {
+ rc = write(fd_client, MSG_CMD_TOO_LONG,
strlen(MSG_CMD_TOO_LONG));
+ if (rc == -1)
+ goto exit;
+
+ conn->msg_in_len = 0;
+ }
+ }
+
+ /* Write prompt */
+ rc = write(fd_client, conn->prompt, strlen(conn->prompt));
+ rc = (rc == -1) ? -1 : 0;
+
+exit:
+ return rc;
+}
+
+static int
+control_event_handle(struct conn *conn, int fd_client)
+{
+ int rc;
+
+ rc = epoll_ctl(conn->fd_client_group, EPOLL_CTL_DEL, fd_client, NULL);
+ if (rc == -1)
+ goto exit;
+
+ rc = close(fd_client);
+ if (rc == -1)
+ goto exit;
+
+ rc = 0;
+
+exit:
+ return rc;
+}
+
+struct conn *
+conn_init(struct conn_params *p)
+{
+ int fd_server, fd_client_group, rc;
+ struct sockaddr_in server_address;
+ struct conn *conn = NULL;
+ int reuse = 1;
+
+ memset(&server_address, 0, sizeof(server_address));
+
+ /* Check input arguments */
+ if ((p == NULL) || (p->welcome == NULL) || (p->prompt == NULL) ||
(p->addr == NULL) ||
+ (p->buf_size == 0) || (p->msg_in_len_max == 0) ||
(p->msg_out_len_max == 0) ||
+ (p->msg_handle == NULL))
+ goto exit;
+
+ rc = inet_aton(p->addr, &server_address.sin_addr);
+ if (rc == 0)
+ goto exit;
+
+ /* Memory allocation */
+ conn = calloc(1, sizeof(struct conn));
+ if (conn == NULL)
+ goto exit;
+
+ conn->welcome = calloc(1, CONN_WELCOME_LEN_MAX + 1);
+ conn->prompt = calloc(1, CONN_PROMPT_LEN_MAX + 1);
+ conn->buf = calloc(1, p->buf_size);
+ conn->msg_in = calloc(1, p->msg_in_len_max + 1);
+ conn->msg_out = calloc(1, p->msg_out_len_max + 1);
+
+
[PATCH v10 03/12] app/graph: support parser utility APIs
From: Sunil Kumar Kori
Adds some helper functions to parse IPv4, IPv6 and MAC addresses
string into respective datatype.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/utils.c | 156 +
app/graph/utils.h | 14
4 files changed, 172 insertions(+)
create mode 100644 app/graph/utils.c
create mode 100644 app/graph/utils.h
diff --git a/app/graph/meson.build b/app/graph/meson.build
index c8d2b41b69..fd71036a95 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -13,4 +13,5 @@ sources = files(
'cli.c',
'conn.c',
'main.c',
+'utils.c',
)
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index 9826303f0c..ad4fb50989 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -10,6 +10,7 @@
#include "cli.h"
#include "conn.h"
+#include "utils.h"
/*
* Externs
*/
diff --git a/app/graph/utils.c b/app/graph/utils.c
new file mode 100644
index 00..c7b6ae83cf
--- /dev/null
+++ b/app/graph/utils.c
@@ -0,0 +1,156 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+
+#define white_spaces_skip(pos) \
+({ \
+ __typeof__(pos) _p = (pos); \
+ for ( ; isspace(*_p); _p++) \
+ ; \
+ _p; \
+})
+
+static void
+hex_string_to_uint64(uint64_t *dst, const char *hexs)
+{
+ char buf[2] = {0};
+ uint8_t shift = 4;
+ int iter = 0;
+ char c;
+
+ while ((c = *hexs++)) {
+ buf[0] = c;
+ *dst |= (strtol(buf, NULL, 16) << shift);
+ shift -= 4;
+ iter++;
+ if (iter == 2) {
+ iter = 0;
+ shift = 4;
+ dst++;
+ }
+ }
+}
+
+int
+parser_uint64_read(uint64_t *value, const char *p)
+{
+ char *next;
+ uint64_t val;
+
+ p = white_spaces_skip(p);
+ if (!isdigit(*p))
+ return -EINVAL;
+
+ val = strtoul(p, &next, 0);
+ if (p == next)
+ return -EINVAL;
+
+ p = next;
+ switch (*p) {
+ case 'T':
+ val *= 1024ULL;
+ /* fall through */
+ case 'G':
+ val *= 1024ULL;
+ /* fall through */
+ case 'M':
+ val *= 1024ULL;
+ /* fall through */
+ case 'k':
+ case 'K':
+ val *= 1024ULL;
+ p++;
+ break;
+ }
+
+ p = white_spaces_skip(p);
+ if (*p != '\0')
+ return -EINVAL;
+
+ *value = val;
+ return 0;
+}
+
+int
+parser_uint32_read(uint32_t *value, const char *p)
+{
+ uint64_t val = 0;
+ int rc = parser_uint64_read(&val, p);
+
+ if (rc < 0)
+ return rc;
+
+ if (val > UINT32_MAX)
+ return -ERANGE;
+
+ *value = val;
+ return 0;
+}
+
+int
+parser_ip4_read(uint32_t *value, char *p)
+{
+ uint8_t shift = 24;
+ uint32_t ip = 0;
+ char *token;
+
+ token = strtok(p, ".");
+ while (token != NULL) {
+ ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
+ token = strtok(NULL, ".");
+ shift -= 8;
+ }
+
+ *value = ip;
+
+ return 0;
+}
+
+int
+parser_ip6_read(uint8_t *value, char *p)
+{
+ uint64_t val = 0;
+ char *token;
+
+ token = strtok(p, ":");
+ while (token != NULL) {
+ hex_string_to_uint64(&val, token);
+ *value = val;
+ token = strtok(NULL, ":");
+ value++;
+ val = 0;
+ }
+
+ return 0;
+}
+
+int
+parser_mac_read(uint64_t *value, char *p)
+{
+ uint64_t mac = 0, val = 0;
+ uint8_t shift = 40;
+ char *token;
+
+ token = strtok(p, ":");
+ while (token != NULL) {
+ hex_string_to_uint64(&val, token);
+ mac |= val << shift;
+ token = strtok(NULL, ":");
+ shift -= 8;
+ val = 0;
+ }
+
+ *value = mac;
+
+ return 0;
+}
diff --git a/app/graph/utils.h b/app/graph/utils.h
new file mode 100644
index 00..0ebb5de55a
--- /dev/null
+++ b/app/graph/utils.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#ifndef APP_GRAPH_UTILS_H
+#define APP_GRAPH_UTILS_H
+
+int parser_uint64_read(uint64_t *value, const char *p);
+int parser_uint32_read(uint32_t *value, const char *p);
+int parser_ip4_read(uint32_t *value, char *p);
+int parser_ip6_read(uint8_t *value, ch
[PATCH v10 04/12] app/graph: support mempool command line interfaces
From: Rakesh Kudurumalla
Adds mempool module which will be creating mempools.
Following commands are exposed:
- mempool size buffers \
cache numa
- help mempool
User will add this command in .cli file according to its need.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/cli.c| 2 +
app/graph/mempool.c| 140 +
app/graph/mempool.h| 24 +++
app/graph/mempool_priv.h | 34 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 2 +
doc/guides/tools/graph.rst | 7 ++
7 files changed, 210 insertions(+)
create mode 100644 app/graph/mempool.c
create mode 100644 app/graph/mempool.h
create mode 100644 app/graph/mempool_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index df4f8fcbb8..cf544d5f8f 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -20,6 +20,8 @@
#define MAX_LINE_SIZE 2048
cmdline_parse_ctx_t modules_ctx[] = {
+ (cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
+ (cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/mempool.c b/app/graph/mempool.c
new file mode 100644
index 00..9fd3f8460b
--- /dev/null
+++ b/app/graph/mempool.c
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "mempool_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_mempool_help[] = "mempool size buffers
"
+"cache numa ";
+
+struct mempools mpconfig;
+
+int
+mempool_process(struct mempool_config *config)
+{
+ struct rte_mempool *mp;
+ uint8_t nb_pools;
+
+ nb_pools = mpconfig.nb_pools;
+ rte_strscpy(mpconfig.config[nb_pools].name, config->name,
RTE_MEMPOOL_NAMESIZE);
+ mpconfig.config[nb_pools].pool_size = config->pool_size;
+ mpconfig.config[nb_pools].buffer_size = config->buffer_size;
+ mpconfig.config[nb_pools].cache_size = config->cache_size;
+ mpconfig.config[nb_pools].numa_node = config->numa_node;
+
+ mp = rte_pktmbuf_pool_create(config->name, config->pool_size,
config->cache_size,
+ 128, config->buffer_size, config->numa_node);
+ if (!mp)
+ return -EINVAL;
+
+ mpconfig.mp[nb_pools] = mp;
+ nb_pools++;
+ mpconfig.nb_pools = nb_pools;
+
+ return 0;
+}
+
+static void
+cli_mempool_help(__rte_unused void *parsed_result, __rte_unused struct cmdline
*cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"- mempool command help
-",
+cmd_mempool_help);
+
+ len = strlen(conn->msg_out);
+ conn->msg_out_len_max -= len;
+}
+
+static void
+cli_mempool(void *parsed_result, __rte_unused struct cmdline *cl, __rte_unused
void *data)
+{
+ struct mempool_config_cmd_tokens *res = parsed_result;
+ struct mempool_config config;
+ int rc = -EINVAL;
+
+
+ rte_strscpy(config.name, res->name, RTE_MEMPOOL_NAMESIZE);
+ config.name[strlen(res->name)] = '\0';
+ config.pool_size = res->nb_bufs;
+ config.buffer_size = res->buf_sz;
+ config.cache_size = res->cache_size;
+ config.numa_node = res->node;
+
+ rc = mempool_process(&config);
+ if (rc < 0)
+ printf(MSG_CMD_FAIL, "mempool");
+}
+
+cmdline_parse_token_string_t mempool_config_add_mempool =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, mempool,
"mempool");
+cmdline_parse_token_string_t mempool_config_add_name =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, name, NULL);
+cmdline_parse_token_string_t mempool_config_add_size =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, size,
"size");
+cmdline_parse_token_num_t mempool_config_add_buf_sz =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, buf_sz,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_buffers =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, buffers,
"buffers");
+cmdline_parse_token_num_t mempool_config_add_nb_bufs =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, nb_bufs,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_cache =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, cache,
"cache");
+cmdline_parse_token_num_t mempool_config_add_cache_size =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, cache_size,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_numa =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, numa,
"numa");
+cmdline_parse_token_num_t mempool_
[PATCH v10 05/12] app/graph: support ethdev command line interfaces
From: Sunil Kumar Kori
Adds ethdev module to configure ethernet devices.
Following commands are exposed:
- ethdev rxq txq
- ethdev mtu
- ethdev promiscuous
- ethdev show
- ethdev stats
- ethdev ip4 addr add netmask
- ethdev ip6 addr add netmask
- help ethdev
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/cli.c| 8 +
app/graph/ethdev.c | 882 +
app/graph/ethdev.h | 40 ++
app/graph/ethdev_priv.h| 112 +
app/graph/main.c | 1 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
doc/guides/tools/graph.rst | 45 +-
8 files changed, 1089 insertions(+), 1 deletion(-)
create mode 100644 app/graph/ethdev.c
create mode 100644 app/graph/ethdev.h
create mode 100644 app/graph/ethdev_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index cf544d5f8f..fa394fade6 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -22,6 +22,14 @@
cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_show_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_stats_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_mtu_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
new file mode 100644
index 00..74e80679d9
--- /dev/null
+++ b/app/graph/ethdev.c
@@ -0,0 +1,882 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ethdev_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_ethdev_mtu_help[] = "ethdev mtu ";
+
+static const char
+cmd_ethdev_prom_mode_help[] = "ethdev promiscuous ";
+
+static const char
+cmd_ethdev_help[] = "ethdev rxq txq
";
+static const char
+cmd_ethdev_show_help[] = "ethdev show";
+
+static const char
+cmd_ethdev_ip4_addr_help[] = "ethdev ip4 addr add netmask
";
+
+static const char
+cmd_ethdev_ip6_addr_help[] = "ethdev ip6 addr add netmask
";
+
+static struct rte_eth_conf port_conf_default = {
+ .link_speeds = 0,
+ .rxmode = {
+ .mq_mode = RTE_ETH_MQ_RX_NONE,
+ .mtu = 9000 - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN), /* Jumbo
frame MTU */
+ },
+ .rx_adv_conf = {
+ .rss_conf = {
+ .rss_key = NULL,
+ .rss_key_len = 40,
+ .rss_hf = 0,
+ },
+ },
+ .txmode = {
+ .mq_mode = RTE_ETH_MQ_TX_NONE,
+ },
+ .lpbk_mode = 0,
+};
+
+uint32_t enabled_port_mask;
+static struct ethdev_head eth_node = TAILQ_HEAD_INITIALIZER(eth_node);
+
+
+static struct ethdev*
+ethdev_port_by_id(uint16_t port_id)
+{
+ struct ethdev *port;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ if (port->config.port_id == port_id)
+ return port;
+ }
+ return NULL;
+}
+
+void *
+ethdev_mempool_list_by_portid(uint16_t portid)
+{
+ struct ethdev *port;
+
+ if (portid >= RTE_MAX_ETHPORTS)
+ return NULL;
+
+ port = ethdev_port_by_id(portid);
+ if (port)
+ return &(port->config.rx.mp);
+ else
+ return NULL;
+}
+
+int16_t
+ethdev_portid_by_ip4(uint32_t ip, uint32_t mask)
+{
+ int portid = -EINVAL;
+ struct ethdev *port;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ if (mask == 0) {
+ if ((port->ip4_addr.ip & port->ip4_addr.mask) == (ip &
port->ip4_addr.mask))
+ return port->config.port_id;
+ } else {
+ if ((port->ip4_addr.ip & port->ip4_addr.mask) == (ip &
mask))
+ return port->config.port_id;
+ }
+ }
+
+ return portid;
+}
+
+int16_t
+ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask)
+{
+ int portid = -EINVAL;
+ struct ethdev *port;
+ int j;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ for (j = 0; j < ETHDEV_IPV6_ADDR_LEN; j++) {
+ if (mask == NULL) {
+ if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
+ (ip[j] & port->ip6_addr.mask[j]))
+ break;
+
+ } else {
+ if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
+ (ip[j] & mask[j]))
+
[PATCH v10 06/12] app/graph: support IPv4 lookup command line interfaces
From: Sunil Kumar Kori
Adds ipv4_lookup module to configure LPM table. This LPM table
will be used for IPv4 lookup and forwarding.
Following commands are exposed:
- ipv4_lookup route add ipv4 netmask via
- help ipv4_lookup
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev.c | 2 +-
app/graph/ip4_route.c | 221 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/route.h | 26 +
app/graph/route_priv.h | 44
doc/guides/tools/graph.rst | 9 ++
8 files changed, 305 insertions(+), 1 deletion(-)
create mode 100644 app/graph/ip4_route.c
create mode 100644 app/graph/route.h
create mode 100644 app/graph/route_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index fa394fade6..25785ea4dc 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -30,6 +30,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 74e80679d9..4d2bc73e7c 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -160,7 +160,7 @@ ethdev_stop(void)
}
ethdev_list_clean();
- rte_eal_cleanup();
+ route_ip4_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/ip4_route.c b/app/graph/ip4_route.c
new file mode 100644
index 00..db3354c270
--- /dev/null
+++ b/app/graph/ip4_route.c
@@ -0,0 +1,221 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "module_api.h"
+#include "route_priv.h"
+
+static const char
+cmd_ipv4_lookup_help[] = "ipv4_lookup route add ipv4 netmask via
";
+
+struct ip4_route route4 = TAILQ_HEAD_INITIALIZER(route4);
+
+
+void
+route_ip4_list_clean(void)
+{
+ struct route_ipv4_config *route;
+
+ while (!TAILQ_EMPTY(&route4)) {
+ route = TAILQ_FIRST(&route4);
+ TAILQ_REMOVE(&route4, route, next);
+ }
+}
+
+static struct route_ipv4_config *
+find_route4_entry(struct route_ipv4_config *route)
+{
+ struct route_ipv4_config *ipv4route;
+
+ TAILQ_FOREACH(ipv4route, &route4, next) {
+ if (!memcmp(ipv4route, route, sizeof(*route)))
+ return ipv4route;
+ }
+ return NULL;
+
+}
+
+static uint8_t
+convert_netmask_to_depth(uint32_t netmask)
+{
+ uint8_t zerobits = 0;
+
+ while ((netmask & 0x1) == 0) {
+ netmask = netmask >> 1;
+ zerobits++;
+ }
+
+ return (32 - zerobits);
+}
+
+static int
+route4_rewirte_table_update(struct route_ipv4_config *ipv4route)
+{
+ uint8_t depth;
+ int portid;
+
+ portid = ethdev_portid_by_ip4(ipv4route->via, ipv4route->netmask);
+ if (portid < 0) {
+ printf("Invalid portid found to install the route\n");
+ return portid;
+ }
+
+ depth = convert_netmask_to_depth(ipv4route->netmask);
+
+ return rte_node_ip4_route_add(ipv4route->ip, depth, portid,
+ RTE_NODE_IP4_LOOKUP_NEXT_REWRITE);
+}
+
+static int
+route_ip4_add(struct route_ipv4_config *route)
+{
+ struct route_ipv4_config *ipv4route;
+ int rc = -EINVAL;
+
+ ipv4route = find_route4_entry(route);
+
+ if (!ipv4route) {
+ ipv4route = malloc(sizeof(struct route_ipv4_config));
+ if (!ipv4route)
+ return -ENOMEM;
+ } else {
+ return 0;
+ }
+
+ ipv4route->ip = route->ip;
+ ipv4route->netmask = route->netmask;
+ ipv4route->via = route->via;
+ ipv4route->is_used = true;
+
+ /* FIXME: Get graph status here and then update table */
+ rc = route4_rewirte_table_update(ipv4route);
+ if (rc)
+ goto free;
+
+ TAILQ_INSERT_TAIL(&route4, ipv4route, next);
+ return 0;
+free:
+ free(ipv4route);
+ return rc;
+}
+
+int
+route_ip4_add_to_lookup(void)
+{
+ struct route_ipv4_config *route = NULL;
+ int rc = -EINVAL;
+
+ TAILQ_FOREACH(route, &route4, next) {
+ rc = route4_rewirte_table_update(route);
+ if (rc < 0)
+ return rc;
+ }
+
+ return 0;
+}
+
+static void
+cli_ipv4_lookup_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"---
[PATCH v10 07/12] app/graph: support IPv6 lookup command line interfaces
From: Rakesh Kudurumalla
Adds ipv6_lookup module to configure LPM6 table. This LPM6 table
will be used for IPv6 lookup and forwarding.
Following commands are exposed:
- ipv6_lookup route add ipv6 netmask via
- help ipv6_lookup
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev.c | 1 +
app/graph/ip6_route.c | 226 +
app/graph/meson.build | 1 +
app/graph/route.h | 14 +++
doc/guides/tools/graph.rst | 9 ++
6 files changed, 253 insertions(+)
create mode 100644 app/graph/ip6_route.c
diff --git a/app/graph/cli.c b/app/graph/cli.c
index 25785ea4dc..1280422388 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -32,6 +32,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv6_lookup_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 4d2bc73e7c..4c70953b99 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -161,6 +161,7 @@ ethdev_stop(void)
ethdev_list_clean();
route_ip4_list_clean();
+ route_ip6_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/ip6_route.c b/app/graph/ip6_route.c
new file mode 100644
index 00..e793cde830
--- /dev/null
+++ b/app/graph/ip6_route.c
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+#include "route_priv.h"
+
+static const char
+cmd_ipv6_lookup_help[] = "ipv6_lookup route add ipv6 netmask via
";
+
+struct ip6_route route6 = TAILQ_HEAD_INITIALIZER(route6);
+
+void
+route_ip6_list_clean(void)
+{
+ struct route_ipv6_config *route;
+
+ while (!TAILQ_EMPTY(&route6)) {
+ route = TAILQ_FIRST(&route6);
+ TAILQ_REMOVE(&route6, route, next);
+ }
+}
+
+static struct route_ipv6_config *
+find_route6_entry(struct route_ipv6_config *route)
+{
+ struct route_ipv6_config *ipv6route;
+
+ TAILQ_FOREACH(ipv6route, &route6, next) {
+ if (!memcmp(ipv6route, route, sizeof(*route)))
+ return ipv6route;
+ }
+ return NULL;
+}
+
+static uint8_t
+convert_ip6_netmask_to_depth(uint8_t *netmask)
+{
+ uint8_t setbits = 0;
+ uint8_t mask;
+ int i;
+
+ for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++) {
+ mask = netmask[i];
+ while (mask & 0x80) {
+ mask = mask << 1;
+ setbits++;
+ }
+ }
+
+ return setbits;
+}
+
+static int
+route6_rewirte_table_update(struct route_ipv6_config *ipv6route)
+{
+ uint8_t depth;
+ int portid;
+
+ portid = ethdev_portid_by_ip6(ipv6route->gateway, ipv6route->mask);
+ if (portid < 0) {
+ printf("Invalid portid found to install the route\n");
+ return portid;
+ }
+ depth = convert_ip6_netmask_to_depth(ipv6route->mask);
+
+ return rte_node_ip6_route_add(ipv6route->ip, depth, portid,
+ RTE_NODE_IP6_LOOKUP_NEXT_REWRITE);
+
+}
+
+static int
+route_ip6_add(struct route_ipv6_config *route)
+{
+ struct route_ipv6_config *ipv6route;
+ int rc = -EINVAL;
+ int j;
+
+ ipv6route = find_route6_entry(route);
+ if (!ipv6route) {
+ ipv6route = malloc(sizeof(struct route_ipv6_config));
+ if (!ipv6route)
+ return -ENOMEM;
+ } else {
+ return 0;
+ }
+
+ for (j = 0; j < ETHDEV_IPV6_ADDR_LEN; j++) {
+ ipv6route->ip[j] = route->ip[j];
+ ipv6route->mask[j] = route->mask[j];
+ ipv6route->gateway[j] = route->gateway[j];
+ }
+ ipv6route->is_used = true;
+
+ /* FIXME: Get graph status here and then update table */
+ rc = route6_rewirte_table_update(ipv6route);
+ if (rc)
+ goto free;
+
+ TAILQ_INSERT_TAIL(&route6, ipv6route, next);
+ return 0;
+free:
+ free(ipv6route);
+ return rc;
+}
+
+int
+route_ip6_add_to_lookup(void)
+{
+ struct route_ipv6_config *route = NULL;
+ int rc = -EINVAL;
+
+ TAILQ_FOREACH(route, &route6, next) {
+ rc = route6_rewirte_table_update(route);
+ if (rc < 0)
+ return rc;
+ }
+
+ return 0;
+}
+
+static void
+cli_ipv6_lookup_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
[PATCH v10 08/12] app/graph: support neigh command line interfaces
From: Sunil Kumar Kori
Adds neigh module to configure arp/neigh. This module uses
ipv4_rewrite and ipv6_rewrite node to write neigh information.
Following commands are exposed:
- neigh add ipv4
- neigh add ipv6
- help neigh
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 3 +
app/graph/ethdev.c | 2 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 2 +
app/graph/neigh.c | 358 +
app/graph/neigh.h | 17 ++
app/graph/neigh_priv.h | 49 +
doc/guides/tools/graph.rst | 11 ++
8 files changed, 443 insertions(+)
create mode 100644 app/graph/neigh.c
create mode 100644 app/graph/neigh.h
create mode 100644 app/graph/neigh_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index 1280422388..f564362da1 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -34,6 +34,9 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_v4_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_v6_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 4c70953b99..b43b16c300 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -162,6 +162,8 @@ ethdev_stop(void)
ethdev_list_clean();
route_ip4_list_clean();
route_ip6_list_clean();
+ neigh4_list_clean();
+ neigh6_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/meson.build b/app/graph/meson.build
index 413bbefc4e..8fa9d605b9 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -17,5 +17,6 @@ sources = files(
'ip6_route.c',
'main.c',
'mempool.c',
+'neigh.c',
'utils.c',
)
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index bd4d245c75..e9e42da7cc 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -12,8 +12,10 @@
#include "conn.h"
#include "ethdev.h"
#include "mempool.h"
+#include "neigh.h"
#include "route.h"
#include "utils.h"
+
/*
* Externs
*/
diff --git a/app/graph/neigh.c b/app/graph/neigh.c
new file mode 100644
index 00..0cee502719
--- /dev/null
+++ b/app/graph/neigh.c
@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "neigh_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_neigh_v4_help[] = "neigh add ipv4 ";
+
+static const char
+cmd_neigh_v6_help[] = "neigh add ipv6 ";
+
+struct neigh4_head neigh4 = TAILQ_HEAD_INITIALIZER(neigh4);
+struct neigh6_head neigh6 = TAILQ_HEAD_INITIALIZER(neigh6);
+
+void
+neigh4_list_clean(void)
+{
+ struct neigh_ipv4_config *v4_config;
+
+ while (!TAILQ_EMPTY(&neigh4)) {
+ v4_config = TAILQ_FIRST(&neigh4);
+ TAILQ_REMOVE(&neigh4, v4_config, next);
+ }
+}
+
+void
+neigh6_list_clean(void)
+{
+ struct neigh_ipv6_config *v6_config;
+
+ while (!TAILQ_EMPTY(&neigh6)) {
+ v6_config = TAILQ_FIRST(&neigh6);
+ TAILQ_REMOVE(&neigh6, v6_config, next);
+ }
+}
+
+static struct neigh_ipv4_config *
+find_neigh4_entry(uint32_t ip, uint64_t mac)
+{
+ struct neigh_ipv4_config *v4_config;
+
+ TAILQ_FOREACH(v4_config, &neigh4, next) {
+ if ((v4_config->ip == ip) && (v4_config->mac == mac))
+ return v4_config;
+ }
+ return NULL;
+}
+
+static struct neigh_ipv6_config *
+find_neigh6_entry(uint8_t *ip, uint64_t mac)
+{
+ struct neigh_ipv6_config *v6_config;
+
+ TAILQ_FOREACH(v6_config, &neigh6, next) {
+ if (!(memcmp(v6_config->ip, ip, 16)) && (v6_config->mac == mac))
+ return v6_config;
+ }
+ return NULL;
+}
+
+static int
+ip6_rewrite_node_add(struct neigh_ipv6_config *v6_config)
+{
+ uint8_t data[2 * RTE_ETHER_ADDR_LEN];
+ uint8_t len = 2 * RTE_ETHER_ADDR_LEN;
+ struct rte_ether_addr smac;
+ int16_t portid = 0;
+ int rc;
+
+ portid = ethdev_portid_by_ip6(v6_config->ip, NULL);
+ if (portid < 0) {
+ printf("Invalid portid found to add neigh\n");
+ return -EINVAL;
+ }
+
+ memset(data, 0, len);
+
+ /* Copy dst mac */
+ rte_memcpy((void *)&data[0], (void *)&v6_config->mac,
RTE_ETHER_ADDR_LEN);
+
+ /* Copy src mac */
+ rc = rte_eth_macaddr_get(portid, &smac);
+ if (rc < 0)
+ return rc;
+
+ rte_memcpy(&data[RTE_ETHER_ADDR_LEN], smac.addr_bytes,
RTE_ETHER_ADDR_LEN);
+
+ return rte_node_ip6_rewrite_add(portid, data, len, portid);
+}
+
+static int
[PATCH v10 09/12] app/graph: support ethdev Rx command line interfaces
From: Rakesh Kudurumalla
Adds ethdev_rx module to create port-queue-core mapping.
Mapping will be used to launch graph worker thread and dequeue
packets on mentioned core from desired port/queue.
Following commands are exposed:
- ethdev_rx map port queue core
- help ethdev_rx
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev_rx.c | 165 +
app/graph/ethdev_rx.h | 37 +
app/graph/ethdev_rx_priv.h | 39 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
doc/guides/tools/graph.rst | 10 +++
7 files changed, 255 insertions(+)
create mode 100644 app/graph/ethdev_rx.c
create mode 100644 app/graph/ethdev_rx.h
create mode 100644 app/graph/ethdev_rx_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index f564362da1..ad7d7deadf 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -30,6 +30,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_rx_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
diff --git a/app/graph/ethdev_rx.c b/app/graph/ethdev_rx.c
new file mode 100644
index 00..f2cb8cf9a5
--- /dev/null
+++ b/app/graph/ethdev_rx.c
@@ -0,0 +1,165 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "ethdev_rx_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_ethdev_rx_help[] = "ethdev_rx map port queue core
";
+
+static struct lcore_params lcore_params_array[ETHDEV_RX_LCORE_PARAMS_MAX];
+struct rte_node_ethdev_config ethdev_conf[RTE_MAX_ETHPORTS];
+struct lcore_params *lcore_params = lcore_params_array;
+struct lcore_conf lcore_conf[RTE_MAX_LCORE];
+uint16_t nb_lcore_params;
+
+static void
+rx_map_configure(uint8_t port_id, uint32_t queue, uint32_t core)
+{
+ uint8_t n_rx_queue;
+
+ n_rx_queue = lcore_conf[core].n_rx_queue;
+ lcore_conf[core].rx_queue_list[n_rx_queue].port_id = port_id;
+ lcore_conf[core].rx_queue_list[n_rx_queue].queue_id = queue;
+ lcore_conf[core].n_rx_queue++;
+}
+
+uint8_t
+ethdev_rx_num_rx_queues_get(uint16_t port)
+{
+ int queue = -1;
+ uint16_t i;
+
+ for (i = 0; i < nb_lcore_params; ++i) {
+ if (lcore_params[i].port_id == port) {
+ if (lcore_params[i].queue_id == queue + 1)
+ queue = lcore_params[i].queue_id;
+ else
+ rte_exit(EXIT_FAILURE,
+"Queue ids of the port %d must be"
+" in sequence and must start with 0\n",
+lcore_params[i].port_id);
+ }
+ }
+
+ return (uint8_t)(++queue);
+}
+
+static int
+ethdev_rx_map_add(char *name, uint32_t queue, uint32_t core)
+{
+ uint64_t coremask;
+ uint16_t port_id;
+ int rc;
+
+ if (nb_lcore_params >= ETHDEV_RX_LCORE_PARAMS_MAX)
+ return -EINVAL;
+
+ rc = rte_eth_dev_get_port_by_name(name, &port_id);
+ if (rc)
+ return -EINVAL;
+
+ coremask = 0xff; /* FIXME: Read from graph configuration */
+
+ if (!(coremask & (1 << core)))
+ return -EINVAL;
+
+ rx_map_configure(port_id, queue, core);
+
+ lcore_params_array[nb_lcore_params].port_id = port_id;
+ lcore_params_array[nb_lcore_params].queue_id = queue;
+ lcore_params_array[nb_lcore_params].lcore_id = core;
+ nb_lcore_params++;
+ return 0;
+}
+
+static void
+cli_ethdev_rx_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+ __rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"- ethdev_rx command help
-",
+cmd_ethdev_rx_help);
+
+ len = strlen(conn->msg_out);
+ conn->msg_out_len_max -= len;
+}
+
+static void
+cli_ethdev_rx(void *parsed_result, __rte_unused struct cmdline *cl, void *data
__rte_unused)
+{
+ struct ethdev_rx_cmd_tokens *res = parsed_result;
+ int rc = -EINVAL;
+
+ rc = ethdev_rx_map_add(res->dev, res->qid, res->core_id);
+ if (rc < 0) {
+ cli_exit();
+ printf(MSG_CMD_FAIL, res->cmd);
+ rte_exit(EXIT_FAILURE, "input core is Invalid\n");
+ }
+
+}
+
+cmdline_pars
[PATCH v10 10/12] app/graph: support graph command line interfaces
From: Rakesh Kudurumalla
Adds graph module to create a graph for a given use case like
l3fwd.
Following commands are exposed:
- graph [bsz ] [tmo ] [coremask ] \
model pcap_enable <0 | 1> num_pcap_pkts \
pcap_file
- graph start
- graph stats show
- help graph
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 4 +
app/graph/ethdev_rx.c | 2 +-
app/graph/graph.c | 550 +
app/graph/graph.h | 21 ++
app/graph/graph_priv.h | 70 +
app/graph/ip4_route.c | 5 +-
app/graph/ip6_route.c | 5 +-
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/neigh.c | 10 +-
doc/guides/tools/graph.rst | 19 ++
11 files changed, 683 insertions(+), 5 deletions(-)
create mode 100644 app/graph/graph.c
create mode 100644 app/graph/graph.h
create mode 100644 app/graph/graph_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index ad7d7deadf..30b12312d6 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -20,6 +20,10 @@
#define MAX_LINE_SIZE 2048
cmdline_parse_ctx_t modules_ctx[] = {
+ (cmdline_parse_inst_t *)&graph_config_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_start_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_stats_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_help_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_show_cmd_ctx,
diff --git a/app/graph/ethdev_rx.c b/app/graph/ethdev_rx.c
index f2cb8cf9a5..03f8effcca 100644
--- a/app/graph/ethdev_rx.c
+++ b/app/graph/ethdev_rx.c
@@ -69,7 +69,7 @@ ethdev_rx_map_add(char *name, uint32_t queue, uint32_t core)
if (rc)
return -EINVAL;
- coremask = 0xff; /* FIXME: Read from graph configuration */
+ coremask = graph_coremask_get();
if (!(coremask & (1 << core)))
return -EINVAL;
diff --git a/app/graph/graph.c b/app/graph/graph.c
new file mode 100644
index 00..4396f02da5
--- /dev/null
+++ b/app/graph/graph.c
@@ -0,0 +1,550 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "graph_priv.h"
+#include "module_api.h"
+
+#define RTE_LOGTYPE_APP_GRAPH RTE_LOGTYPE_USER1
+
+static const char
+cmd_graph_help[] = "graph bsz tmo coremask "
+ "model pcap_enable <0 | 1>
num_pcap_pkts "
+ "pcap_file ";
+
+static const char * const supported_usecases[] = {"l3fwd"};
+struct graph_config graph_config;
+bool graph_started;
+
+/* Check the link rc of all ports in up to 9s, and print them finally */
+static void
+check_all_ports_link_status(uint32_t port_mask)
+{
+#define CHECK_INTERVAL 100 /* 100ms */
+#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
+ char link_rc_text[RTE_ETH_LINK_MAX_STR_LEN];
+ uint8_t count, all_ports_up, print_flag = 0;
+ struct rte_eth_link link;
+ uint16_t portid;
+ int rc;
+
+ printf("\nChecking link status...");
+ fflush(stdout);
+ for (count = 0; count <= MAX_CHECK_TIME; count++) {
+ if (force_quit)
+ return;
+
+ all_ports_up = 1;
+ RTE_ETH_FOREACH_DEV(portid)
+ {
+ if (force_quit)
+ return;
+
+ if ((port_mask & (1 << portid)) == 0)
+ continue;
+
+ memset(&link, 0, sizeof(link));
+ rc = rte_eth_link_get_nowait(portid, &link);
+ if (rc < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-rc));
+ continue;
+ }
+
+ /* Print link rc if flag set */
+ if (print_flag == 1) {
+ rte_eth_link_to_str(link_rc_text,
sizeof(link_rc_text),
+ &link);
+ printf("Port %d %s\n", portid, link_rc_text);
+ continue;
+ }
+
+ /* Clear all_ports_up flag if any link down */
+ if (link.link_status == RTE_ETH_LINK_DOWN) {
+ all_ports_up = 0;
+ break;
+ }
+ }
+
+ /* After finally printing all link rc, get out */
+ if (print_flag == 1)
+ break;
+
+ if (all_ports_up == 0
[PATCH v10 11/12] app/graph: support CLI option to enable graph stats
From: Sunil Kumar Kori
Adds application's command line parameter "--enable-graph-stats"
to enable dumping graph stats on console.
By default, no graph stats will be printed on console but same can
be dumped via telnet session using "graph stats show" command.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/main.c | 17 -
app/graph/module_api.h | 2 ++
doc/guides/tools/graph.rst | 4
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/app/graph/main.c b/app/graph/main.c
index c1cb435588..465376425c 100644
--- a/app/graph/main.c
+++ b/app/graph/main.c
@@ -21,12 +21,13 @@
volatile bool force_quit;
struct conn *conn;
-static const char usage[] = "%s EAL_ARGS -- -s SCRIPT [-h HOST] [-p PORT] "
+static const char usage[] = "%s EAL_ARGS -- -s SCRIPT [-h HOST] [-p PORT]
[--enable-graph-stats] "
"[--help]\n";
static struct app_params {
struct conn_params conn;
char *script_name;
+ bool enable_graph_stats;
} app = {
.conn = {
.welcome = "\nWelcome!\n\n",
@@ -40,6 +41,7 @@ static struct app_params {
.msg_handle_arg = NULL, /* set later. */
},
.script_name = NULL,
+ .enable_graph_stats = false,
};
static void
@@ -56,6 +58,7 @@ app_args_parse(int argc, char **argv)
{
struct option lgopts[] = {
{"help", 0, 0, 'H'},
+ {"enable-graph-stats", 0, 0, 'g'},
};
int h_present, p_present, s_present, n_args, i;
char *app_name = argv[0];
@@ -133,6 +136,12 @@ app_args_parse(int argc, char **argv)
}
break;
+ case 'g':
+ app.enable_graph_stats = true;
+ printf("WARNING! Telnet session can not be accessed
with"
+ "--enable-graph-stats");
+ break;
+
case 'H':
default:
printf(usage, app_name);
@@ -144,6 +153,12 @@ app_args_parse(int argc, char **argv)
return 0;
}
+bool
+app_graph_stats_enabled(void)
+{
+ return app.enable_graph_stats;
+}
+
bool
app_graph_exit(void)
{
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index 392dcfb222..a7d287f5c8 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -24,5 +24,7 @@
extern volatile bool force_quit;
extern struct conn *conn;
+bool app_graph_stats_enabled(void);
bool app_graph_exit(void);
+
#endif
diff --git a/doc/guides/tools/graph.rst b/doc/guides/tools/graph.rst
index c861ae8eb5..0be4a09a9a 100644
--- a/doc/guides/tools/graph.rst
+++ b/doc/guides/tools/graph.rst
@@ -55,6 +55,10 @@ Following are the application command-line options:
a mandatory parameter which will be used to create desired graph
for a given use case.
+* ``--enable-graph-stats``
+
+ Enable graph statistics printing on console. By default graph
statistics are disabled.
+
* ``--help``
Dumps application usage
--
2.25.1
[PATCH v10 12/12] app/graph: support l3fwd use case
From: Rakesh Kudurumalla Adds an use case l3fwd. It contains a dedicated l3fwd.cli file mentioning commands to configure the required resources. Once application successfully parses the l3fwd.cli then a graph is created having below nodes: - ethdev_rx -> pkt_cls - pkt_cls -> ip4_lookup - pkt_cls -> ip6_lookup - pkt_cls -> pkt_drop - ip4_lookup -> ip4_rewrite - ip4_lookup -> pkt_drop - ip6_lookup -> ip6_rewrite - ip6_lookup -> pkt_drop - ip4_rewrite -> ethdev_tx - ip4_rewrite -> pkt_drop - ip6_rewrite -> ethdev_tx - ip6_rewrite -> pkt_drop - ethdev_tx -> pkt_drop Signed-off-by: Sunil Kumar Kori Signed-off-by: Rakesh Kudurumalla --- app/graph/examples/l3fwd.cli | 73 +++ app/graph/examples/l3fwd_pcap.cli| 71 +++ app/graph/graph.c| 2 +- app/graph/l3fwd.c| 136 app/graph/l3fwd.h| 11 + app/graph/meson.build| 1 + app/graph/module_api.h | 1 + doc/guides/tools/graph.rst | 109 ++ doc/guides/tools/img/graph-usecase-l3fwd.svg | 210 +++ 9 files changed, 613 insertions(+), 1 deletion(-) create mode 100644 app/graph/examples/l3fwd.cli create mode 100644 app/graph/examples/l3fwd_pcap.cli create mode 100644 app/graph/l3fwd.c create mode 100644 app/graph/l3fwd.h create mode 100644 doc/guides/tools/img/graph-usecase-l3fwd.svg diff --git a/app/graph/examples/l3fwd.cli b/app/graph/examples/l3fwd.cli new file mode 100644 index 00..c4977d4322 --- /dev/null +++ b/app/graph/examples/l3fwd.cli @@ -0,0 +1,73 @@ +; SPDX-License-Identifier: BSD-3-Clause +; Copyright(c) 2023 Marvell. + +; +; Graph configuration for given usecase +; +graph l3fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 num_pcap_pkts 10 pcap_file /tmp/output.pcap + +; +; Mempools to be attached with ethdev +; +mempool mempool0 size 8192 buffers 4000 cache 256 numa 0 + +; +; DPDK devices and configuration. +; +; Note: Customize the parameters below to match your setup. +; +ethdev 0002:02:00.0 rxq 1 txq 8 mempool0 +ethdev 0002:03:00.0 rxq 1 txq 8 mempool0 +ethdev 0002:02:00.0 mtu 1700 +ethdev 0002:03:00.0 mtu 1700 +ethdev 0002:02:00.0 promiscuous on +ethdev 0002:03:00.0 promiscuous on + +; +; IPv4 addresses assigned to DPDK devices +; +ethdev 0002:02:00.0 ip4 addr add 10.0.2.1 netmask 255.255.255.0 +ethdev 0002:03:00.0 ip4 addr add 20.0.2.1 netmask 255.255.255.0 + +; +; IPv6 addresses assigned to DPDK devices +; +ethdev 0002:02:00.0 ip6 addr add 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 +ethdev 0002:03:00.0 ip6 addr add 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 + +; +; IPv4 routes which are installed to ipv4_lookup node for LPM processing +; +ipv4_lookup route add ipv4 10.0.2.0 netmask 255.255.255.0 via 10.0.2.1 +ipv4_lookup route add ipv4 20.0.2.0 netmask 255.255.255.0 via 20.0.2.1 + +; +; IPv6 routes which are installed to ipv6_lookup node for LPM processing +; +ipv6_lookup route add ipv6 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 via 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A +ipv6_lookup route add ipv6 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 via 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B + +; +; Peer MAC and IPv4 address mapping +; +neigh add ipv4 10.0.2.2 52:20:DA:4F:68:70 +neigh add ipv4 20.0.2.2 62:20:DA:4F:68:70 + +; +; Peer MAC and IPv6 address mapping +; +neigh add ipv6 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A 52:20:DA:4F:68:70 +neigh add ipv6 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B 62:20:DA:4F:68:70 + +; +; Port-Queue-Core mapping for ethdev_rx node +; +ethdev_rx map port 0002:02:00.0 queue 0 core 1 +ethdev_rx map port 0002:03:00.0 queue 0 core 2 + +; +; Graph start command to create graph. +; +; Note: No more command should come after this. +; +graph start diff --git a/app/graph/examples/l3fwd_pcap.cli b/app/graph/examples/l3fwd_pcap.cli new file mode 100644 index 00..30dde74a65 --- /dev/null +++ b/app/graph/examples/l3fwd_pcap.cli @@ -0,0 +1,71 @@ +; SPDX-License-Identifier: BSD-3-Clause +; Copyright(c) 2023 Marvell. + +; +; Graph configuration for given usecase +; +graph l3fwd coremask 0x03 bsz 32 tmo 10 model default pcap_enable 1 num_pcap_pkts 10 pcap_file /tmp/output.pcap + +; +; Mempools to be attached with ethdev +; +mempool mempool0 size 8192 buffers 4000 cache 256 numa 0 + +; +; DPDK devices and configuration. +; +; Note: Customize the parameters below to match your setup. +; +ethdev net_pcap0 rxq 1 txq 1 mempool0 +ethdev net_pcap1 rxq 1 txq 1 mempool0 +ethdev net_pcap0 promiscuous on +ethdev net_pcap1 promiscuous on + +; +; IPv4 addresses assigned to DPDK devices +;
[Bug 1302] dpdk-pcapdump regression
https://bugs.dpdk.org/show_bug.cgi?id=1302 Bug ID: 1302 Summary: dpdk-pcapdump regression Product: DPDK Version: 23.03 Hardware: x86 OS: Linux Status: UNCONFIRMED Severity: normal Priority: Normal Component: testpmd Assignee: dev@dpdk.org Reporter: nick.hedb...@gmail.com Target Milestone: --- Created attachment 262 --> https://bugs.dpdk.org/attachment.cgi?id=262&action=edit testpmd output for the two commits Commit 6026bfa breaks dumpcap on CX6 DX, the previous commit. 742be6a, didn't show this issue. The error with this commit is: > ~/dpdk/build-6026bfa$ sudo ./app/dpdk-testpmd -c 0xf0 -n 4 -a :03:00.0 -- > -i --port-topology=chained ... > testpmd> start > Packet forwarding already started > testpmd> pdump_register_rx_callbacks(): rx callback for port=0 queue=0, > already exists and: >~/dpdk/build-6026bfa$ sudo ./app/dpdk-dumpcap -i 0 -c 6 -i 0 -w >/tmp/sample.pcapng File: /tmp/sample.pcapng >pdump_prepare_client_request(): client request for pdump enable/disable failed >EAL: Error - exiting with code: 1 > Cause: Packet dump enable on 0::03:00.0 failed Operation not permitted -- You are receiving this mail because: You are the assignee for the bug.
RE: [PATCH v1 02/11] test/bbdev: update python script parameters
Hi Maxime,
In practice anyone using that API is already using the one defined in the patch
below and not using -t for time out. So not a concern to do it properly through
that patch.
Heman, any concern on your side with this change?
> -Original Message-
> From: Maxime Coquelin
> Sent: Thursday, October 19, 2023 11:19 AM
> To: Chautru, Nicolas ; Vargas, Hernan
> ; dev@dpdk.org; gak...@marvell.com; Rix, Tom
>
> Cc: Zhang, Qi Z
> Subject: Re: [PATCH v1 02/11] test/bbdev: update python script parameters
>
>
>
> On 10/19/23 11:01, Chautru, Nicolas wrote:
> > Hi Maxime,
> >
> > I believe there was some historical discrepancy, even in doc both appeared
> but none of the 2 -t options with the cap.
> > https://doc.dpdk.org/guides/tools/testbbdev.html
> > Resolving this historical issue here.
>
> Ok, then we should fix the doc, not the code.
>
> Thanks,
> Maxime
>
> > Thanks
> > Nic
> >
> >> -Original Message-
> >> From: Maxime Coquelin
> >> Sent: Tuesday, October 17, 2023 9:08 PM
> >> To: Vargas, Hernan ; dev@dpdk.org;
> >> gak...@marvell.com; Rix, Tom
> >> Cc: Chautru, Nicolas ; Zhang, Qi Z
> >>
> >> Subject: Re: [PATCH v1 02/11] test/bbdev: update python script
> >> parameters
> >>
> >>
> >>
> >> On 9/29/23 20:13, Hernan Vargas wrote:
> >>> Update the timeout argument and default values.
> >>> Update EAL help message and default value.
> >>> Add iter_max and snr arguments.
> >>>
> >>> Signed-off-by: Hernan Vargas
> >>> ---
> >>>app/test-bbdev/test-bbdev.py | 22 ++
> >>>app/test-bbdev/test_bbdev_perf.c | 2 +-
> >>>2 files changed, 19 insertions(+), 5 deletions(-)
> >>>
> >>> diff --git a/app/test-bbdev/test-bbdev.py
> >>> b/app/test-bbdev/test-bbdev.py index 9cdb4659724d..8d0145076e4d
> >>> 100755
> >>> --- a/app/test-bbdev/test-bbdev.py
> >>> +++ b/app/test-bbdev/test-bbdev.py
> >>> @@ -25,12 +25,12 @@ def kill(process):
> >>>help="specifies path to the bbdev test app",
> >>>default=dpdk_path + "/" + dpdk_target +
> >>> "/app/dpdk-test-
> bbdev")
> >>>parser.add_argument("-e", "--eal-params",
> >>> -help="EAL arguments which are passed to the test
> >>> app",
> >>> -default="--vdev=baseband_null0")
> >>> -parser.add_argument("-t", "--timeout",
> >>> +help="EAL arguments which must be passed to the test
> >>> app",
> >>> +default="--vdev=baseband_null0 -a00:00.0")
> >>> +parser.add_argument("-T", "--timeout",
> >>>type=int,
> >>>help="Timeout in seconds",
> >>> -default=300)
> >>> +default=600)
> >>>parser.add_argument("-c", "--test-cases",
> >>>nargs="+",
> >>>help="Defines test cases to run. Run all if
> >>> not
> >>> specified") @@ -48,6 +48,14 @@ def kill(process):
> >>>type=int,
> >>>help="Operations enqueue/dequeue burst size.",
> >>>default=[32])
> >>> +parser.add_argument("-s", "--snr",
> >>> +type=int,
> >>> +help="SNR in dB for BLER tests",
> >>> +default=0)
> >>> +parser.add_argument("-t", "--iter-max",
> >>
> >> We shouldn't change parameters meaning, it will silently break
> >> existing scripts making use of it.
> >>
> >>> +type=int,
> >>> +help="Max iterations",
> >>> +default=6)
> >>>parser.add_argument("-l", "--num-lcores",
> >>>type=int,
> >>>help="Number of lcores to run.", @@ -68,6
> >>> +76,12 @@ def kill(process):
> >>>
> >>>params.extend(["--"])
> >>>
> >>> +if args.snr:
> >>> +params.extend(["-s", str(args.snr)])
> >>> +
> >>> +if args.iter_max:
> >>> +params.extend(["-t", str(args.iter_max)])
> >>> +
> >>>if args.num_ops:
> >>>params.extend(["-n", str(args.num_ops)])
> >>>
> >>> diff --git a/app/test-bbdev/test_bbdev_perf.c
> >>> b/app/test-bbdev/test_bbdev_perf.c
> >>> index 276bbf0a2e6d..faea26c10eed 100644
> >>> --- a/app/test-bbdev/test_bbdev_perf.c
> >>> +++ b/app/test-bbdev/test_bbdev_perf.c
> >>> @@ -26,7 +26,7 @@
> >>>
> >>>#define MAX_QUEUES RTE_MAX_LCORE
> >>>#define TEST_REPETITIONS 100
> >>> -#define TIME_OUT_POLL 1e8
> >>> +#define TIME_OUT_POLL 1e9
> >>>#define WAIT_OFFLOAD_US 1000
> >>>
> >>>#ifdef RTE_BASEBAND_FPGA_LTE_FEC
> >
RE: [PATCH v1 06/11] test/bbdev: assert failed test for queue configure
Hi Maxime, > -Original Message- > From: Maxime Coquelin > Sent: Thursday, October 19, 2023 10:47 AM > To: Chautru, Nicolas ; Vargas, Hernan > ; dev@dpdk.org; gak...@marvell.com; Rix, Tom > > Cc: Zhang, Qi Z > Subject: Re: [PATCH v1 06/11] test/bbdev: assert failed test for queue > configure > > Hi Nicolas, > > On 10/19/23 10:41, Chautru, Nicolas wrote: > > Hi Maxime, > > > > Do we really want to make these kind of changes on to the stable release, it > tends to artificially increase the amount of churn on the stable release which > can be counterproductive for such changes which don't add much value if any > to user/developper. > > Happy to follow your suggestion but a general feedback is lack of appetite > > for > very large amount of changes in stable patches which inhibit adoption, so > would expect to put things there that we would genuinely flag as a bug. > > Kindly share your thoughts. > > Checking for configuration failure in a test application is quite useful in my > opinion, as it can help catching regressions, isn't it? I don’t personally think this (or for other commit on that serie) hits that bar for being required in stable release. This ends up being counterproductive having stable release with a huge amount of commits that are not really required, and it ends up being a reason for people not to move to stable release. But if you are really convinced, ok to follow your reco. > > Maxime > > Thanks > > Nic > > > > > >> -Original Message- > >> From: Maxime Coquelin > >> Sent: Tuesday, October 17, 2023 9:43 PM > >> To: Vargas, Hernan ; dev@dpdk.org; > >> gak...@marvell.com; Rix, Tom > >> Cc: Chautru, Nicolas ; Zhang, Qi Z > >> > >> Subject: Re: [PATCH v1 06/11] test/bbdev: assert failed test for > >> queue configure > >> > >> > >> > >> On 9/29/23 20:13, Hernan Vargas wrote: > >>> Stop test if rte_bbdev_queue_configure fails to configure queue. > >>> > >>> Signed-off-by: Hernan Vargas > >>> --- > >>>app/test-bbdev/test_bbdev.c | 3 ++- > >>>1 file changed, 2 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/app/test-bbdev/test_bbdev.c > >>> b/app/test-bbdev/test_bbdev.c index 65805977aead..cf224dca5d04 > >>> 100644 > >>> --- a/app/test-bbdev/test_bbdev.c > >>> +++ b/app/test-bbdev/test_bbdev.c > >>> @@ -366,7 +366,8 @@ test_bbdev_configure_stop_queue(void) > >>>* - queue should be started if deferred_start == > >>>*/ > >>> ts_params->qconf.deferred_start = 0; > >>> - rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf); > >>> + TEST_ASSERT_SUCCESS(rte_bbdev_queue_configure(dev_id, queue_id, > >> &ts_params->qconf), > >>> + "Failed test for rte_bbdev_queue_configure"); > >>> rte_bbdev_start(dev_id); > >>> > >>> TEST_ASSERT_SUCCESS(return_value = > >> rte_bbdev_queue_info_get(dev_id, > >> > >> If should be a fix IMO. > >> With fixes tag added and stable cc'ed: > >> > >> Reviewed-by: Maxime Coquelin > >> > >> Thanks, > >> Maxime > >
Re: [PATCH v1 02/11] test/bbdev: update python script parameters
Hi Nicolas,
On 10/19/23 14:09, Chautru, Nicolas wrote:
Hi Maxime,
In practice anyone using that API is already using the one defined in the patch
below and not using -t for time out. So not a concern to do it properly through
that patch.
Sorry, I'm not sure to follow you.
For example in RHEL, we use this script for BBDEV validation for our
downstream packages.
Maxime
Heman, any concern on your side with this change?
-Original Message-
From: Maxime Coquelin
Sent: Thursday, October 19, 2023 11:19 AM
To: Chautru, Nicolas ; Vargas, Hernan
; dev@dpdk.org; gak...@marvell.com; Rix, Tom
Cc: Zhang, Qi Z
Subject: Re: [PATCH v1 02/11] test/bbdev: update python script parameters
On 10/19/23 11:01, Chautru, Nicolas wrote:
Hi Maxime,
I believe there was some historical discrepancy, even in doc both appeared
but none of the 2 -t options with the cap.
https://doc.dpdk.org/guides/tools/testbbdev.html
Resolving this historical issue here.
Ok, then we should fix the doc, not the code.
Thanks,
Maxime
Thanks
Nic
-Original Message-
From: Maxime Coquelin
Sent: Tuesday, October 17, 2023 9:08 PM
To: Vargas, Hernan ; dev@dpdk.org;
gak...@marvell.com; Rix, Tom
Cc: Chautru, Nicolas ; Zhang, Qi Z
Subject: Re: [PATCH v1 02/11] test/bbdev: update python script
parameters
On 9/29/23 20:13, Hernan Vargas wrote:
Update the timeout argument and default values.
Update EAL help message and default value.
Add iter_max and snr arguments.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test-bbdev.py | 22 ++
app/test-bbdev/test_bbdev_perf.c | 2 +-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/app/test-bbdev/test-bbdev.py
b/app/test-bbdev/test-bbdev.py index 9cdb4659724d..8d0145076e4d
100755
--- a/app/test-bbdev/test-bbdev.py
+++ b/app/test-bbdev/test-bbdev.py
@@ -25,12 +25,12 @@ def kill(process):
help="specifies path to the bbdev test app",
default=dpdk_path + "/" + dpdk_target + "/app/dpdk-test-
bbdev")
parser.add_argument("-e", "--eal-params",
-help="EAL arguments which are passed to the test app",
-default="--vdev=baseband_null0")
-parser.add_argument("-t", "--timeout",
+help="EAL arguments which must be passed to the test app",
+default="--vdev=baseband_null0 -a00:00.0")
+parser.add_argument("-T", "--timeout",
type=int,
help="Timeout in seconds",
-default=300)
+default=600)
parser.add_argument("-c", "--test-cases",
nargs="+",
help="Defines test cases to run. Run all if
not
specified") @@ -48,6 +48,14 @@ def kill(process):
type=int,
help="Operations enqueue/dequeue burst size.",
default=[32])
+parser.add_argument("-s", "--snr",
+type=int,
+help="SNR in dB for BLER tests",
+default=0)
+parser.add_argument("-t", "--iter-max",
We shouldn't change parameters meaning, it will silently break
existing scripts making use of it.
+type=int,
+help="Max iterations",
+default=6)
parser.add_argument("-l", "--num-lcores",
type=int,
help="Number of lcores to run.", @@ -68,6
+76,12 @@ def kill(process):
params.extend(["--"])
+if args.snr:
+params.extend(["-s", str(args.snr)])
+
+if args.iter_max:
+params.extend(["-t", str(args.iter_max)])
+
if args.num_ops:
params.extend(["-n", str(args.num_ops)])
diff --git a/app/test-bbdev/test_bbdev_perf.c
b/app/test-bbdev/test_bbdev_perf.c
index 276bbf0a2e6d..faea26c10eed 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -26,7 +26,7 @@
#define MAX_QUEUES RTE_MAX_LCORE
#define TEST_REPETITIONS 100
-#define TIME_OUT_POLL 1e8
+#define TIME_OUT_POLL 1e9
#define WAIT_OFFLOAD_US 1000
#ifdef RTE_BASEBAND_FPGA_LTE_FEC
RE: [EXT] [PATCH v10 12/12] app/graph: support l3fwd use case
> -Original Message- > From: sk...@marvell.com > Sent: Thursday, October 19, 2023 4:20 PM > To: Sunil Kumar Kori ; Rakesh Kudurumalla > > Cc: dev@dpdk.org > Subject: [EXT] [PATCH v10 12/12] app/graph: support l3fwd use case > > External Email > > -- > From: Rakesh Kudurumalla > > Adds an use case l3fwd. It contains a dedicated l3fwd.cli file mentioning > commands to configure the required resources. > > Once application successfully parses the l3fwd.cli then a graph is created > having > below nodes: > - ethdev_rx -> pkt_cls > > - pkt_cls -> ip4_lookup > - pkt_cls -> ip6_lookup > - pkt_cls -> pkt_drop > > - ip4_lookup -> ip4_rewrite > - ip4_lookup -> pkt_drop > > - ip6_lookup -> ip6_rewrite > - ip6_lookup -> pkt_drop > > - ip4_rewrite -> ethdev_tx > - ip4_rewrite -> pkt_drop > > - ip6_rewrite -> ethdev_tx > - ip6_rewrite -> pkt_drop > > - ethdev_tx -> pkt_drop > > Signed-off-by: Sunil Kumar Kori > Signed-off-by: Rakesh Kudurumalla > --- > +Supported Use cases > +--- > + * l3fwd > + > +This use case is supported for both PF and PCAP network devices. To Both HW and PCAP vdev network device. Remove PF instance form doc. > +demonstrate, corresponding .cli files are available at > + > +named as ``l3fwd.cli`` and ``l3fwd_pcap.cli`` respectively. > + > Running the Application > --- > > @@ -63,6 +71,26 @@ Following are the application command-line options: > > Dumps application usage > > +Examples > + In order to have continuity, Please move "16.1. Supported Use cases" here and remove "Examples" 16.x Supported Use case 16.x.1 L3fwd 16.x.1.1 Example commands 16.x.1.2 Verifying traffic > + > +For PF devices > + > +.. code-block:: console > + > + ./dpdk-graph -c 0xff -a 0002:02:00.0 -a 0002:03:00.0 -- > + -s /app/graph/examples/l3fwd.cli > + > +For net_pcapX devices > + > +.. code-block:: console > + > + ./dpdk-graph -c 0xff -- > vdev=net_pcap0,rx_pcap=in_net_pcap0.pcap,tx_pcap=out_net_pcap1.pcap > +-- > vdev=net_pcap1,rx_pcap=in_net_pcap1.pcap,tx_pcap=out_net_pcap0.pcap > +-- -s > + /app/graph/examples/l3fwd_pcap.cli > + > +Refer section :ref:`verifying_traffic` to create .pcap file used here. > + > Supported CLI commands > -- > > @@ -223,3 +251,84 @@ Created graph for use case > > On the successful execution of ``.cli`` file, corresponding graph > will > be created. > This section mentions the created graph for each use case. > + > +l3fwd > +~ > + > +.. _figure_l3fwd_graph: > + > +.. figure:: img/graph-usecase-l3fwd.* > + > +.. _verifying_traffic: > + > +Verifying traffic > +~ > + > +``l3fwd.cli`` and ``l3fwd_pcap.cli`` creates setup with two network > +ports. Routing between these ports are done by lookup node routing > +information. For current use case, following routing table is used: > + > +.. code-block:: console > + > + DIPport > + 10.0.2.21 > + 20.0.2.20 > + > +On the successful execution of ``l3fwd.cli`` or ``l3fwd_pcap.cli``, > +user needs to send traffic with mentioned DIP. > + > +For net_pcapX devices, required pcap file should be created and passed > +to application. These pcap files can be created in several ways. Scapy is > one of > the method to get the same: > + > +.. code-block:: console > + > + # scapy > + > + aSPY//YASa > + apCY//YCa | > +sY//YSpcs scpCY//Pp | Welcome to Scapy > +ayp ayyySCP//Pp syY//C| Version 2.4.3 > +AYAsA///Ps cY//S | > + pY//p cSSps y//Y | > https://urldefense.proofpoint.com/v2/url?u=https- > 3A__github.com_secdev_scapy&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r= > 1DGob4H4rxz6H8uITozGOCa0s5f4wCNtTa4UUKvcsvI&m=V_QcQyFL- > NxiuHEAdNEZlQ379HvK37suZH_8Yfuuz-HwEKmVw5Iy-SbtS95- > brBb&s=XR2R_CEDkRJPhayLXSY1ZRnzrZsuR-UDaSSDHELwAnQ&e= > + S///a pP///AC//Y | > + A//AcyPC | Have fun! > + p///AcsC///a | > + PYCpc A//A | We are in France, we say Skappee. > + scp///pSP///p p//Y | OK? Merci. > + sY/y caa S//P | -- Sebastien Chabal > + cayCyayP//Ya pY/Ya | > +sY/PsYYCc aC//Yp > + sc sccaCY//PCypaapyCP//YSs > + spCPY//YPSps > + ccaacs > + using IPython 7.13.0 This graphics can be removed in the doc > + >>> > + >>> Remove this > + >>> pkts=[Ether(dst="FA:09:F9:D7:E0:9D", > src="10:70:1d:2f:42:2d")/IP(src="28.0.0.1", dst="10.0.2.2"), > + Ether(dst="FA:09:F9:D7:E0:9D", > src="10:70:1d:2f:42:2d")/IP(src="28.0.0.1", dst="10.0.2.2"), >
[PATCH 0/2] small cleanup - use PCI lib
Some drivers could use more the PCI lib facilities. Thomas Monjalon (2): drivers: use macro for PCI address format drivers: use function to compare PCI addresses drivers/event/skeleton/skeleton_eventdev.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enic/enic.h| 3 +-- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/enic/enic_vf_representor.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 4 ++-- drivers/net/mana/mana.c| 6 ++ drivers/net/mlx4/mlx4.c| 5 + drivers/net/mlx5/linux/mlx5_os.c | 7 ++- drivers/net/thunderx/nicvf_ethdev.c| 2 +- 10 files changed, 13 insertions(+), 22 deletions(-) -- 2.42.0
[PATCH 1/2] drivers: use macro for PCI address format
Some places were not using the macro PCI_PRI_FMT
as print format of a PCI address.
Note: RTE prefix is missing in the name of some PCI macros.
Signed-off-by: Thomas Monjalon
---
drivers/event/skeleton/skeleton_eventdev.c | 2 +-
drivers/net/ena/ena_ethdev.c | 2 +-
drivers/net/enic/enic.h| 3 +--
drivers/net/enic/enic_ethdev.c | 2 +-
drivers/net/enic/enic_vf_representor.c | 2 +-
drivers/net/hinic/hinic_pmd_ethdev.c | 4 ++--
drivers/net/mlx5/linux/mlx5_os.c | 2 +-
drivers/net/thunderx/nicvf_ethdev.c| 2 +-
8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/event/skeleton/skeleton_eventdev.c
b/drivers/event/skeleton/skeleton_eventdev.c
index dc9b131641..dd2dab2e27 100644
--- a/drivers/event/skeleton/skeleton_eventdev.c
+++ b/drivers/event/skeleton/skeleton_eventdev.c
@@ -373,7 +373,7 @@ skeleton_eventdev_init(struct rte_eventdev *eventdev)
skel->subsystem_device_id = pci_dev->id.subsystem_device_id;
skel->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id;
- PMD_DRV_LOG(DEBUG, "pci device (%x:%x) %u:%u:%u:%u",
+ PMD_DRV_LOG(DEBUG, "PCI device (%x:%x) " PCI_PRI_FMT,
pci_dev->id.vendor_id, pci_dev->id.device_id,
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 7345e480f8..b39ec629e7 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -2125,7 +2125,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
- PMD_INIT_LOG(INFO, "Initializing %x:%x:%x.%d\n",
+ PMD_INIT_LOG(INFO, "Initializing " PCI_PRI_FMT "\n",
pci_dev->addr.domain,
pci_dev->addr.bus,
pci_dev->addr.devid,
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 163a1f037e..78778704f2 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,6 @@
#define ENICPMD_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
-#define ENICPMD_BDF_LENGTH 13 /* :00:00.0'\0' */
#define ENIC_CALC_IP_CKSUM 1
#define ENIC_CALC_TCP_UDP_CKSUM 2
#define ENIC_MAX_MTU9000
@@ -101,7 +100,7 @@ struct enic {
bool overlay_offload;
struct rte_eth_dev *rte_dev;
struct rte_eth_dev_data *dev_data;
- char bdf_name[ENICPMD_BDF_LENGTH];
+ char bdf_name[PCI_PRI_STR_SIZE];
int dev_fd;
int iommu_group_fd;
int iommu_groupid;
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index a487256fa1..b04b6c9aa1 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -1274,7 +1274,7 @@ static int eth_enic_dev_init(struct rte_eth_dev *eth_dev,
enic->pdev = pdev;
addr = &pdev->addr;
- snprintf(enic->bdf_name, ENICPMD_BDF_LENGTH, "%04x:%02x:%02x.%x",
+ snprintf(enic->bdf_name, PCI_PRI_STR_SIZE, PCI_PRI_FMT,
addr->domain, addr->bus, addr->devid, addr->function);
err = enic_check_devargs(eth_dev);
diff --git a/drivers/net/enic/enic_vf_representor.c
b/drivers/net/enic/enic_vf_representor.c
index 46f85964e9..5d8d29135c 100644
--- a/drivers/net/enic/enic_vf_representor.c
+++ b/drivers/net/enic/enic_vf_representor.c
@@ -707,7 +707,7 @@ int enic_vf_representor_init(struct rte_eth_dev *eth_dev,
void *init_params)
LIST_INIT(&vf_enic->memzone_list);
rte_spinlock_init(&vf_enic->memzone_list_lock);
addr = &vf->bdf;
- snprintf(vf_enic->bdf_name, ENICPMD_BDF_LENGTH, "%04x:%02x:%02x.%x",
+ snprintf(vf_enic->bdf_name, PCI_PRI_STR_SIZE, PCI_PRI_FMT,
addr->domain, addr->bus, addr->devid, addr->function);
return 0;
}
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c
b/drivers/net/hinic/hinic_pmd_ethdev.c
index adc9f75c81..d4978e0649 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -3086,7 +3086,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
snprintf(nic_dev->proc_dev_name,
sizeof(nic_dev->proc_dev_name),
-"hinic-%.4x:%.2x:%.2x.%x",
+"hinic-" PCI_PRI_FMT,
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
@@ -3202,7 +3202,7 @@ static int hinic_dev_init(struct rte_eth_dev *eth_dev)
pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
- PMD_DRV_LOG(INFO, "Initializing pf hinic-%.4x:%.2x:%.2x.%x in %s
process",
+ PMD_DRV_LOG(INFO, "Initializing pf hinic-" PCI_PRI_FMT " in %s process",
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function,
(rte_eal_p
[PATCH 2/2] drivers: use function to compare PCI addresses
Some places were not using the function rte_pci_addr_cmp()
to compare 2 PCI addresses.
Signed-off-by: Thomas Monjalon
---
drivers/net/mana/mana.c | 6 ++
drivers/net/mlx4/mlx4.c | 5 +
drivers/net/mlx5/linux/mlx5_os.c | 5 +
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c
index 41c3cf2595..781ed76139 100644
--- a/drivers/net/mana/mana.c
+++ b/drivers/net/mana/mana.c
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1464,10 +1465,7 @@ mana_pci_probe_mac(struct rte_pci_device *pci_dev,
continue;
/* Ignore if this IB device is not this PCI device */
- if (pci_dev->addr.domain != pci_addr.domain ||
- pci_dev->addr.bus != pci_addr.bus ||
- pci_dev->addr.devid != pci_addr.devid ||
- pci_dev->addr.function != pci_addr.function)
+ if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0)
continue;
ctx = ibv_open_device(ibdev);
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 1389b606cc..a1a7e93288 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -817,10 +817,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct
rte_pci_device *pci_dev)
DEBUG("checking device \"%s\"", list[i]->name);
if (mlx4_ibv_device_to_pci_addr(list[i], &pci_addr))
continue;
- if ((pci_dev->addr.domain != pci_addr.domain) ||
- (pci_dev->addr.bus != pci_addr.bus) ||
- (pci_dev->addr.devid != pci_addr.devid) ||
- (pci_dev->addr.function != pci_addr.function))
+ if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0)
continue;
vf = (pci_dev->id.device_id ==
PCI_DEVICE_ID_MELLANOX_CONNECTX3VF);
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 0706e9e9b2..922490ff97 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2065,10 +2065,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
if (mlx5_get_pci_addr(ibv_list[ret]->ibdev_path,
&pci_addr))
continue;
- if (owner_pci.domain != pci_addr.domain ||
- owner_pci.bus != pci_addr.bus ||
- owner_pci.devid != pci_addr.devid ||
- owner_pci.function != pci_addr.function)
+ if (rte_pci_addr_cmp(&owner_pci, &pci_addr) != 0)
continue;
DRV_LOG(INFO, "PCI information matches for device
\"%s\"",
ibv_list[ret]->name);
--
2.42.0
RE: [PATCH 2/2] drivers: use function to compare PCI addresses
> Subject: [PATCH 2/2] drivers: use function to compare PCI addresses
>
> Some places were not using the function rte_pci_addr_cmp() to compare 2 PCI
> addresses.
>
> Signed-off-by: Thomas Monjalon
For MANA,
Acked-by: Long Li
> ---
> drivers/net/mana/mana.c | 6 ++
> drivers/net/mlx4/mlx4.c | 5 +
> drivers/net/mlx5/linux/mlx5_os.c | 5 +
> 3 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c index
> 41c3cf2595..781ed76139 100644
> --- a/drivers/net/mana/mana.c
> +++ b/drivers/net/mana/mana.c
> @@ -13,6 +13,7 @@
> #include
> #include
> #include
> +#include
>
> #include
> #include
> @@ -1464,10 +1465,7 @@ mana_pci_probe_mac(struct rte_pci_device
> *pci_dev,
> continue;
>
> /* Ignore if this IB device is not this PCI device */
> - if (pci_dev->addr.domain != pci_addr.domain ||
> - pci_dev->addr.bus != pci_addr.bus ||
> - pci_dev->addr.devid != pci_addr.devid ||
> - pci_dev->addr.function != pci_addr.function)
> + if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0)
> continue;
>
> ctx = ibv_open_device(ibdev);
> diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index
> 1389b606cc..a1a7e93288 100644
> --- a/drivers/net/mlx4/mlx4.c
> +++ b/drivers/net/mlx4/mlx4.c
> @@ -817,10 +817,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct
> rte_pci_device *pci_dev)
> DEBUG("checking device \"%s\"", list[i]->name);
> if (mlx4_ibv_device_to_pci_addr(list[i], &pci_addr))
> continue;
> - if ((pci_dev->addr.domain != pci_addr.domain) ||
> - (pci_dev->addr.bus != pci_addr.bus) ||
> - (pci_dev->addr.devid != pci_addr.devid) ||
> - (pci_dev->addr.function != pci_addr.function))
> + if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0)
> continue;
> vf = (pci_dev->id.device_id ==
> PCI_DEVICE_ID_MELLANOX_CONNECTX3VF);
> diff --git a/drivers/net/mlx5/linux/mlx5_os.c
> b/drivers/net/mlx5/linux/mlx5_os.c
> index 0706e9e9b2..922490ff97 100644
> --- a/drivers/net/mlx5/linux/mlx5_os.c
> +++ b/drivers/net/mlx5/linux/mlx5_os.c
> @@ -2065,10 +2065,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device
> *cdev,
> if (mlx5_get_pci_addr(ibv_list[ret]->ibdev_path,
> &pci_addr))
> continue;
> - if (owner_pci.domain != pci_addr.domain ||
> - owner_pci.bus != pci_addr.bus ||
> - owner_pci.devid != pci_addr.devid ||
> - owner_pci.function != pci_addr.function)
> + if (rte_pci_addr_cmp(&owner_pci, &pci_addr) != 0)
> continue;
> DRV_LOG(INFO, "PCI information matches for device
> \"%s\"",
> ibv_list[ret]->name);
> --
> 2.42.0
[PATCH] ice: Increase L1 check interval to account for lengthier link time
For edge cases where the transceiver is physically inserted first and
immediately afterwards the DPDK PF is started the LSC event may occur outside
the current setting for the maximum check interval window. This change
lengthens the check interval to account for this along with other reported
cases where the link event be longer than 1 second.
Cc: sta...@dpdk.org
Reported-by: Timothy Miskell
Suggested-by: Timothy Miskell
Signed-off-by: Timothy Miskell
Reviewed-by: Larry Wang
Tested-by: Jonathan Tsai
---
.mailmap | 2 ++
drivers/net/ice/ice_ethdev.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 3f5bab26a8..93c09a23ee 100644
--- a/.mailmap
+++ b/.mailmap
@@ -674,6 +674,7 @@ John Romein
John W. Linville
Jonas Pfefferle
Jonathan Erb
+Jonathan Tsai
Jon DeVree
Jon Loeliger
Joongi Kim
@@ -1414,6 +1415,7 @@ Tianli Lai
Tianyu Li
Timmons C. Player
Timothy McDaniel
+Timothy Miskell
Timothy Redaelli
Tim Shearer
Ting Xu
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 305077e74e..6ef06b9926 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3992,8 +3992,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,
static int
ice_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
-#define CHECK_INTERVAL 100 /* 100ms */
-#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
+#define CHECK_INTERVAL 50 /* 50ms */
+#define MAX_REPEAT_TIME 40 /* 2s (40 * 50ms) in total */
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ice_link_status link_status;
struct rte_eth_link link, old;
--
2.25.1
[PATCH v3 00/29] Promote experimental API's to stable.
Since 23.11 is an LTS release it is time to remove the experimental bandaid off many API's. There are about 890 API's marked with experimental on current main branch. This addresses the easy to remove ones and gets it down to about 510 places. The rule is any API that has been in since 22.11 needs to have experimental removed (or have API deleted). The experimental flag is not a "get out of ABI stability for free" card. In a couple places experimental was being used where internal would have been more appropriate. v3 - rebase and skip cryptodev Stephen Hemminger (29): bpf: make rte_bpf_dump and rte_bpf_convert stable API's cmdline: make experimental API's stable ethdev: mark rte_mtr API's as stable ethdev: mark rte_tm API's as stable pdump: make API's stable pcapng: mark API's as stable net: remove experimental from functions rcu: remove experimental from rte_rcu_qbsr lpm: remove experimental mbuf: remove experimental from create_extbuf hash: remove experimental from toeplitz hash timer: remove experimental from rte_timer_next_ticks sched: remove experimental dmadev: mark API's as not experimental meter: remove experimental warning from comments power: remove experimental from API's kvargs: remove experimental flag ip_frag: mark a couple of functions stable member: remove experimental tag power fix security: remove experimental flag from macsec vhost: remove experimental from some API's bbdev: remove experimental tag ipsec: remove experimental from SA API compressdev: remove experimental flag regexdev: remove experimental tag node: remove some of the experimental tags table: remove experimental from API port: make API's stable MAINTAINERS | 10 +- doc/guides/rel_notes/deprecation.rst | 6 -- lib/bbdev/rte_bbdev.h | 4 - lib/bbdev/rte_bbdev_op.h | 2 - lib/bbdev/version.map | 15 ++- lib/bpf/rte_bpf.h | 2 - lib/bpf/version.map | 9 +- lib/cmdline/cmdline.h | 1 - lib/cmdline/cmdline_parse.h | 4 - lib/cmdline/cmdline_rdline.h | 4 - lib/cmdline/version.map | 26 ++--- lib/compressdev/rte_comp.h| 6 -- lib/compressdev/rte_compressdev.h | 26 - lib/compressdev/rte_compressdev_pmd.h | 6 -- lib/compressdev/version.map | 2 +- lib/dmadev/rte_dmadev.h | 85 lib/dmadev/version.map| 2 +- lib/ethdev/rte_mtr.h | 25 + lib/ethdev/rte_tm.h | 34 --- lib/ethdev/version.map| 88 lib/hash/rte_thash.h | 44 lib/hash/rte_thash_gfni.h | 8 -- lib/hash/rte_thash_x86_gfni.h | 8 -- lib/hash/version.map | 16 +-- lib/ip_frag/rte_ip_frag.h | 2 - lib/ip_frag/version.map | 9 +- lib/ipsec/rte_ipsec.h | 2 - lib/ipsec/version.map | 9 +- lib/kvargs/rte_kvargs.h | 4 - lib/kvargs/version.map| 8 +- lib/lpm/rte_lpm.h | 4 - lib/lpm/version.map | 7 +- lib/mbuf/rte_mbuf.h | 1 - lib/mbuf/version.map | 8 +- lib/member/rte_member.h | 54 -- lib/member/version.map| 12 +-- lib/meter/rte_meter.h | 12 --- lib/net/rte_ip.h | 19 lib/node/rte_node_eth_api.h | 1 - lib/node/rte_node_ip4_api.h | 2 - lib/node/version.map | 16 ++- lib/pcapng/rte_pcapng.h | 11 -- lib/pcapng/version.map| 6 +- lib/pdump/rte_pdump.h | 12 --- lib/pdump/version.map | 11 +- lib/pipeline/rte_port_in_action.h | 8 -- lib/pipeline/rte_swx_ctl.h| 57 --- lib/pipeline/rte_swx_pipeline.h | 29 -- lib/pipeline/rte_table_action.h | 16 --- lib/pipeline/version.map | 140 -- lib/port/version.map | 24 ++--- lib/power/rte_power.h | 4 - lib/power/rte_power_guest_channel.h | 4 - lib/power/rte_power_pmd_mgmt.h| 40 lib/power/rte_power_uncore.h | 5 - lib/power/version.map | 40 +++- lib/rcu/rte_rcu_qsbr.h| 20 lib/rcu/version.map | 15 +-- lib/regexdev/rte_regexdev.h | 92 - lib/regexdev/version.map | 2 +- lib/sched/rte_pie.h | 8 -- lib/sched/rte_sched.h | 5 - lib/sched/version.map | 18 +--- lib/security/rte_security.h | 28 +- lib/security/version.map | 18 ++-- lib/table/rte_swx_table_learner.h
[PATCH v3 01/29] bpf: make rte_bpf_dump and rte_bpf_convert stable API's
These two API's were introduced in 23.11 and can now be
made not experimental.
Signed-off-by: Stephen Hemminger
Acked-by: Konstantin Ananyev
---
lib/bpf/rte_bpf.h | 2 --
lib/bpf/version.map | 9 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
index 4d71120dbd9d..f70d8dacd0d3 100644
--- a/lib/bpf/rte_bpf.h
+++ b/lib/bpf/rte_bpf.h
@@ -209,7 +209,6 @@ rte_bpf_get_jit(const struct rte_bpf *bpf, struct
rte_bpf_jit *jit);
* @param len
* Number of BPF instructions to dump.
*/
-__rte_experimental
void
rte_bpf_dump(FILE *f, const struct ebpf_insn *buf, uint32_t len);
@@ -229,7 +228,6 @@ struct bpf_program;
* - ENOMEM - can't reserve enough memory
* - ENOTSUP - operation not supported
*/
-__rte_experimental
struct rte_bpf_prm *
rte_bpf_convert(const struct bpf_program *prog);
diff --git a/lib/bpf/version.map b/lib/bpf/version.map
index c49bf1701f0a..2e957494e9df 100644
--- a/lib/bpf/version.map
+++ b/lib/bpf/version.map
@@ -1,7 +1,9 @@
DPDK_24 {
global:
+ rte_bpf_convert;
rte_bpf_destroy;
+ rte_bpf_dump;
rte_bpf_elf_load;
rte_bpf_eth_rx_elf_load;
rte_bpf_eth_rx_unload;
@@ -14,10 +16,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_bpf_convert;
- rte_bpf_dump;
-};
--
2.39.2
[PATCH v3 02/29] cmdline: make experimental API's stable
These API's have all ben around for several releases.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/cmdline/cmdline.h| 1 -
lib/cmdline/cmdline_parse.h | 4
lib/cmdline/cmdline_rdline.h | 4
lib/cmdline/version.map | 26 --
4 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index 992c84591456..dd41e1054378 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -39,7 +39,6 @@ void cmdline_printf(const struct cmdline *cl, const char
*fmt, ...)
int cmdline_in(struct cmdline *cl, const char *buf, int size);
int cmdline_write_char(struct rdline *rdl, char c);
-__rte_experimental
struct rdline *
cmdline_get_rdline(struct cmdline *cl);
diff --git a/lib/cmdline/cmdline_parse.h b/lib/cmdline/cmdline_parse.h
index a852ac411c59..41b4db1f76f9 100644
--- a/lib/cmdline/cmdline_parse.h
+++ b/lib/cmdline/cmdline_parse.h
@@ -155,9 +155,6 @@ typedef cmdline_parse_inst_t *cmdline_parse_ctx_t;
int cmdline_parse(struct cmdline *cl, const char *buf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Try to parse a buffer according to the specified context, but do not
* perform any function calls if parse is successful.
*
@@ -166,7 +163,6 @@ int cmdline_parse(struct cmdline *cl, const char *buf);
* CMDLINE_PARSE_BAD_ARGS on error and returns the parsed line length (>=0)
* on successful parse.
*/
-__rte_experimental
int cmdline_parse_check(struct cmdline *cl, const char *buf);
/**
diff --git a/lib/cmdline/cmdline_rdline.h b/lib/cmdline/cmdline_rdline.h
index 1b4cc7ce5773..c6bb636a 100644
--- a/lib/cmdline/cmdline_rdline.h
+++ b/lib/cmdline/cmdline_rdline.h
@@ -58,7 +58,6 @@ typedef int (rdline_complete_t)(struct rdline *rdl, const
char *buf,
*
* \return New rdline object on success, NULL on failure.
*/
-__rte_experimental
struct rdline *rdline_new(rdline_write_char_t *write_char,
rdline_validate_t *validate,
rdline_complete_t *complete,
@@ -70,7 +69,6 @@ struct rdline *rdline_new(rdline_write_char_t *write_char,
* \param rdl A pointer to an initialized struct rdline.
*If NULL, this function is a no-op.
*/
-__rte_experimental
void rdline_free(struct rdline *rdl);
/**
@@ -163,13 +161,11 @@ char *rdline_get_history_item(struct rdline *rdl,
unsigned int i);
/**
* Get maximum history buffer size.
*/
-__rte_experimental
size_t rdline_get_history_buffer_size(struct rdline *rdl);
/**
* Get the opaque pointer supplied on struct rdline creation.
*/
-__rte_experimental
void *rdline_get_opaque(struct rdline *rdl);
#ifdef __cplusplus
diff --git a/lib/cmdline/version.map b/lib/cmdline/version.map
index 97166789016c..88174e39bcb7 100644
--- a/lib/cmdline/version.map
+++ b/lib/cmdline/version.map
@@ -30,11 +30,13 @@ DPDK_24 {
cmdline_get_help_num;
cmdline_get_help_portlist;
cmdline_get_help_string;
+ cmdline_get_rdline;
cmdline_in;
cmdline_interact;
cmdline_isendoftoken;
cmdline_new;
cmdline_parse;
+ cmdline_parse_check;
cmdline_parse_etheraddr;
cmdline_parse_ipaddr;
cmdline_parse_num;
@@ -51,37 +53,25 @@ DPDK_24 {
cmdline_token_portlist_ops;
cmdline_token_string_ops;
cmdline_write_char;
+
rdline_add_history;
rdline_char_in;
rdline_clear_history;
+ rdline_free;
rdline_get_buffer;
+ rdline_get_history_buffer_size;
rdline_get_history_item;
+ rdline_get_opaque;
+ rdline_new;
rdline_newline;
rdline_quit;
rdline_redisplay;
rdline_reset;
rdline_restart;
rdline_stop;
+
vt100_init;
vt100_parser;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 20.11
- cmdline_get_rdline;
-
- # added in 21.11
- rdline_new;
- rdline_free;
- rdline_get_history_buffer_size;
- rdline_get_opaque;
-
- # added in 22.07
- cmdline_parse_check;
-
- local: *;
-};
--
2.39.2
[PATCH v3 03/29] ethdev: mark rte_mtr API's as stable
These haven't changed in a while, time has come to make them
not experimental.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS| 2 +-
lib/ethdev/rte_mtr.h | 25 +
lib/ethdev/version.map | 34 --
3 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4083658697fb..ea03d35dbe5a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -427,7 +427,7 @@ T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_tm*
F: app/test-pmd/cmdline_tm.*
-Traffic Metering and Policing API - EXPERIMENTAL
+Traffic Metering and Policing API
M: Cristian Dumitrescu
T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_mtr*
diff --git a/lib/ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h
index 30e6c6b12e6e..9a20e974bdad 100644
--- a/lib/ethdev/rte_mtr.h
+++ b/lib/ethdev/rte_mtr.h
@@ -41,10 +41,8 @@
*A) Whether an MTR object is private to a flow or potentially shared by
* several flows has to be specified at creation time.
*B) Several meter actions can be potentially registered for the same flow.
- *
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
*/
+
#include
#include
#include
@@ -569,7 +567,6 @@ struct rte_mtr_error {
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_capabilities_get(uint16_t port_id,
struct rte_mtr_capabilities *cap,
@@ -593,7 +590,6 @@ rte_mtr_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_add(uint16_t port_id,
uint32_t meter_profile_id,
@@ -615,7 +611,6 @@ rte_mtr_meter_profile_add(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_delete(uint16_t port_id,
uint32_t meter_profile_id,
@@ -635,7 +630,6 @@ rte_mtr_meter_profile_delete(uint16_t port_id,
* @return
* A valid handle in case of success, NULL otherwise.
*/
-__rte_experimental
struct rte_flow_meter_profile *
rte_mtr_meter_profile_get(uint16_t port_id,
uint32_t meter_profile_id,
@@ -663,7 +657,6 @@ rte_mtr_meter_profile_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_validate(uint16_t port_id,
struct rte_mtr_meter_policy_params *policy,
@@ -690,7 +683,6 @@ rte_mtr_meter_policy_validate(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_add(uint16_t port_id,
uint32_t policy_id,
@@ -711,7 +703,6 @@ rte_mtr_meter_policy_add(uint16_t port_id,
* @return
* A valid handle in case of success, NULL otherwise.
*/
-__rte_experimental
struct rte_flow_meter_policy *
rte_mtr_meter_policy_get(uint16_t port_id,
uint32_t policy_id,
@@ -793,7 +784,6 @@ struct rte_mtr_meter_policy_params policy = \
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_delete(uint16_t port_id,
uint32_t policy_id,
@@ -822,7 +812,6 @@ rte_mtr_meter_policy_delete(uint16_t port_id,
*
* @see enum rte_flow_action_type::RTE_FLOW_ACTION_TYPE_METER
*/
-__rte_experimental
int
rte_mtr_create(uint16_t port_id,
uint32_t mtr_id,
@@ -846,7 +835,6 @@ rte_mtr_create(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_destroy(uint16_t port_id,
uint32_t mtr_id,
@@ -874,7 +862,6 @@ rte_mtr_destroy(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_disable(uint16_t port_id,
uint32_t mtr_id,
@@ -896,7 +883,6 @@ rte_mtr_meter_disable(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_enable(uint16_t port_id,
uint32_t mtr_id,
@@ -916,7 +902,6 @@ rte_mtr_meter_enable(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_update(uint16_t port_id,
uint32_t mtr_id,
@@ -937,7 +922,6 @@ rte_mtr_meter_profile_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_update(uint16_t port_id,
uint32_t mtr_id,
@@ -964,7 +948,6 @@ rte_mtr_meter_policy_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_dscp_table_update(uint16_t port_id,
uint32_t mtr_id, enum rte_mtr_color_in_protocol proto,
@@ -991,7 +974,6 @@ rte_mtr_meter_dscp_table_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_vlan_table_update(uint16_t port_id, uint32_
[PATCH v3 04/29] ethdev: mark rte_tm API's as stable
These API's have been around since 20.11, mark them as not
experimental.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS| 2 +-
lib/ethdev/rte_tm.h| 34 ---
lib/ethdev/version.map | 62 --
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index ea03d35dbe5a..f77597571633 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -421,7 +421,7 @@ F: app/test-pmd/cmdline_flow.c
F: doc/guides/prog_guide/rte_flow.rst
F: lib/ethdev/rte_flow*
-Traffic Management API - EXPERIMENTAL
+Traffic Management API
M: Cristian Dumitrescu
T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_tm*
diff --git a/lib/ethdev/rte_tm.h b/lib/ethdev/rte_tm.h
index 08c5fafecdf3..799b92aadaa9 100644
--- a/lib/ethdev/rte_tm.h
+++ b/lib/ethdev/rte_tm.h
@@ -14,10 +14,6 @@
* This interface provides the ability to configure the traffic manager in a
* generic way. It includes features such as: hierarchical scheduling,
* traffic shaping, congestion management, packet marking, etc.
- *
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
*/
#include
@@ -1242,7 +1238,6 @@ struct rte_tm_error {
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_get_number_of_leaf_nodes(uint16_t port_id,
uint32_t *n_leaf_nodes,
@@ -1267,7 +1262,6 @@ rte_tm_get_number_of_leaf_nodes(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_node_type_get(uint16_t port_id,
uint32_t node_id,
@@ -1286,7 +1280,6 @@ rte_tm_node_type_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_capabilities_get(uint16_t port_id,
struct rte_tm_capabilities *cap,
@@ -1307,7 +1300,6 @@ rte_tm_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_level_capabilities_get(uint16_t port_id,
uint32_t level_id,
@@ -1328,7 +1320,6 @@ rte_tm_level_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_node_capabilities_get(uint16_t port_id,
uint32_t node_id,
@@ -1354,7 +1345,6 @@ rte_tm_node_capabilities_get(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_n_max
*/
-__rte_experimental
int
rte_tm_wred_profile_add(uint16_t port_id,
uint32_t wred_profile_id,
@@ -1378,7 +1368,6 @@ rte_tm_wred_profile_add(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_n_max
*/
-__rte_experimental
int
rte_tm_wred_profile_delete(uint16_t port_id,
uint32_t wred_profile_id,
@@ -1410,7 +1399,6 @@ rte_tm_wred_profile_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_wred_context_add_update(uint16_t port_id,
uint32_t shared_wred_context_id,
@@ -1435,7 +1423,6 @@ rte_tm_shared_wred_context_add_update(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_wred_context_delete(uint16_t port_id,
uint32_t shared_wred_context_id,
@@ -1460,7 +1447,6 @@ rte_tm_shared_wred_context_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_n_max
*/
-__rte_experimental
int
rte_tm_shaper_profile_add(uint16_t port_id,
uint32_t shaper_profile_id,
@@ -1484,7 +1470,6 @@ rte_tm_shaper_profile_add(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_n_max
*/
-__rte_experimental
int
rte_tm_shaper_profile_delete(uint16_t port_id,
uint32_t shaper_profile_id,
@@ -1514,7 +1499,6 @@ rte_tm_shaper_profile_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_shaper_add_update(uint16_t port_id,
uint32_t shared_shaper_id,
@@ -1538,7 +1522,6 @@ rte_tm_shared_shaper_add_update(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_shaper_delete(uint16_t port_id,
uint32_t shared_shaper_id,
@@ -1607,7 +1590,6 @@ rte_tm_shared_shaper_delete(uint16_t port_id,
* @see RTE_TM_NODE_LEVEL_ID_ANY
* @see struct rte_tm_capabilities
*/
-__rte_experimental
int
rte_tm_node_add(uint16_t port_id,
uint32_t node_id,
@@ -1641,7 +1623,6 @@ rte_tm_node_add(uint16_t port_id,
*
* @see RTE_TM_UPDATE_NODE_ADD_DELETE
*/
-__rte_experimental
int
rte_tm_node_delete(uint16_t port_id,
uint32_t node_id,
@@ -1666,7 +1647,6 @@ rte_tm_node_delete(uint16_t port_id,
* @see rte_tm_node_resume()
* @see RTE_TM_UPDATE_NODE_SUSPEND_RESUME
*/
-__rte_experimental
int
rte_tm_node_suspend(uint16_t port_id,
uint3
[PATCH v3 05/29] pdump: make API's stable
The filtering API's were added in 23.11 and can now be marked
as not experimental.
Signed-off-by: Stephen Hemminger
---
lib/pdump/rte_pdump.h | 12
lib/pdump/version.map | 11 +++
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/lib/pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
index b1a391830c1d..414931a12cce 100644
--- a/lib/pdump/rte_pdump.h
+++ b/lib/pdump/rte_pdump.h
@@ -83,9 +83,6 @@ rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t
flags,
void *filter);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Enables packet capturing on given port and queue with filtering.
*
* @param port_id
@@ -109,7 +106,6 @@ rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t
flags,
* @return
*0 on success, -1 on error, rte_errno is set accordingly.
*/
-__rte_experimental
int
rte_pdump_enable_bpf(uint16_t port_id, uint16_t queue,
uint32_t flags, uint32_t snaplen,
@@ -169,9 +165,6 @@ rte_pdump_enable_by_deviceid(char *device_id, uint16_t
queue,
void *filter);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Enables packet capturing on given device id and queue with filtering.
* device_id can be name or pci address of device.
*
@@ -196,7 +189,6 @@ rte_pdump_enable_by_deviceid(char *device_id, uint16_t
queue,
* @return
*0 on success, -1 on error, rte_errno is set accordingly.
*/
-__rte_experimental
int
rte_pdump_enable_bpf_by_deviceid(const char *device_id, uint16_t queue,
uint32_t flags, uint32_t snaplen,
@@ -242,9 +234,6 @@ struct rte_pdump_stats {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Retrieve the packet capture statistics for a queue.
*
* @param port_id
@@ -254,7 +243,6 @@ struct rte_pdump_stats {
* @return
* Zero if successful. -1 on error and rte_errno is set.
*/
-__rte_experimental
int
rte_pdump_stats(uint16_t port_id, struct rte_pdump_stats *stats);
diff --git a/lib/pdump/version.map b/lib/pdump/version.map
index 225830dc85a7..ea5bd157cdb1 100644
--- a/lib/pdump/version.map
+++ b/lib/pdump/version.map
@@ -4,17 +4,12 @@ DPDK_24 {
rte_pdump_disable;
rte_pdump_disable_by_deviceid;
rte_pdump_enable;
+ rte_pdump_enable_bpf;
+ rte_pdump_enable_bpf_by_deviceid;
rte_pdump_enable_by_deviceid;
rte_pdump_init;
+ rte_pdump_stats;
rte_pdump_uninit;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_pdump_enable_bpf;
- rte_pdump_enable_bpf_by_deviceid;
- rte_pdump_stats;
-};
--
2.39.2
[PATCH v3 06/29] pcapng: mark API's as stable
This API was added in 23.11 and can now be marked as not
experimental.
Signed-off-by: Stephen Hemminger
---
lib/pcapng/rte_pcapng.h | 11 ---
lib/pcapng/version.map | 6 ++
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h
index d93cc9f73ad5..c96c8994f38b 100644
--- a/lib/pcapng/rte_pcapng.h
+++ b/lib/pcapng/rte_pcapng.h
@@ -6,10 +6,6 @@
* @file
* RTE pcapng
*
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
- *
* Pcapng is an evolution from the pcap format, created to address some of
* its deficiencies. Namely, the lack of extensibility and inability to store
* additional information.
@@ -54,7 +50,6 @@ typedef struct rte_pcapng rte_pcapng_t;
* @return
* handle to library, or NULL in case of error (and rte_errno is set).
*/
-__rte_experimental
rte_pcapng_t *
rte_pcapng_fdopen(int fd,
const char *osname, const char *hardware,
@@ -66,7 +61,6 @@ rte_pcapng_fdopen(int fd,
* @param self
* handle to library
*/
-__rte_experimental
void
rte_pcapng_close(rte_pcapng_t *self);
@@ -89,7 +83,6 @@ rte_pcapng_close(rte_pcapng_t *self);
* and before any packet record. All ports used in packet capture
* must be added.
*/
-__rte_experimental
int
rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port,
const char *ifname, const char *ifdescr,
@@ -132,7 +125,6 @@ enum rte_pcapng_direction {
* - The pointer to the new mbuf formatted for pcapng_write
* - NULL if allocation fails.
*/
-__rte_experimental
struct rte_mbuf *
rte_pcapng_copy(uint16_t port_id, uint32_t queue,
const struct rte_mbuf *m, struct rte_mempool *mp,
@@ -149,7 +141,6 @@ rte_pcapng_copy(uint16_t port_id, uint32_t queue,
* The minimum size of mbuf data to handle packet with length bytes.
* Accounting for required header and trailer fields
*/
-__rte_experimental
uint32_t
rte_pcapng_mbuf_size(uint32_t length);
@@ -174,7 +165,6 @@ rte_pcapng_mbuf_size(uint32_t length);
* The number of bytes written to file, -1 on failure to write file.
* The mbuf's in *pkts* are always freed.
*/
-__rte_experimental
ssize_t
rte_pcapng_write_packets(rte_pcapng_t *self,
struct rte_mbuf *pkts[], uint16_t nb_pkts);
@@ -205,7 +195,6 @@ rte_pcapng_write_packets(rte_pcapng_t *self,
* @return
* number of bytes written to file, -1 on failure to write file
*/
-__rte_experimental
ssize_t
rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port,
const char *comment,
diff --git a/lib/pcapng/version.map b/lib/pcapng/version.map
index 36393914d97c..81c9652ad6b5 100644
--- a/lib/pcapng/version.map
+++ b/lib/pcapng/version.map
@@ -1,6 +1,7 @@
-EXPERIMENTAL {
+DPDK_24 {
global:
+ rte_pcapng_add_interface;
rte_pcapng_close;
rte_pcapng_copy;
rte_pcapng_fdopen;
@@ -8,8 +9,5 @@ EXPERIMENTAL {
rte_pcapng_write_packets;
rte_pcapng_write_stats;
- # added in 23.03
- rte_pcapng_add_interface;
-
local: *;
};
--
2.39.2
[PATCH v3 07/29] net: remove experimental from functions
These functions have been around long enough should no
longer be experimental.
Signed-off-by: Stephen Hemminger
---
lib/net/rte_ip.h | 19 ---
1 file changed, 19 deletions(-)
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index 7f58dc6f6a9c..2cb5be222cdd 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -435,9 +435,6 @@ __rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Compute the IPv4 UDP/TCP checksum of a packet.
*
* @param m
@@ -449,7 +446,6 @@ __rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* The complemented checksum to set in the L4 header.
*/
-__rte_experimental
static inline uint16_t
rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
const struct rte_ipv4_hdr *ipv4_hdr, uint16_t l4_off)
@@ -482,7 +478,6 @@ rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr *ipv4_hdr,
const void *l4_hdr)
@@ -496,9 +491,6 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr
*ipv4_hdr,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Verify the IPv4 UDP/TCP checksum of a packet.
*
* In case of UDP, the caller must first check if udp_hdr->dgram_cksum is 0
@@ -513,7 +505,6 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr
*ipv4_hdr,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv4_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m,
const struct rte_ipv4_hdr *ipv4_hdr,
@@ -687,9 +678,6 @@ __rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Process the IPv6 UDP or TCP checksum of a packet.
*
* The IPv6 header must not be followed by extension headers. The layer 4
@@ -704,7 +692,6 @@ __rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* The complemented checksum to set in the L4 header.
*/
-__rte_experimental
static inline uint16_t
rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
const struct rte_ipv6_hdr *ipv6_hdr, uint16_t l4_off)
@@ -738,7 +725,6 @@ rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr *ipv6_hdr,
const void *l4_hdr)
@@ -752,9 +738,6 @@ rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr
*ipv6_hdr,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Validate the IPv6 UDP or TCP checksum of a packet.
*
* In case of UDP, the caller must first check if udp_hdr->dgram_cksum is 0:
@@ -770,7 +753,6 @@ rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr
*ipv6_hdr,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv6_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m,
const struct rte_ipv6_hdr *ipv6_hdr,
@@ -825,7 +807,6 @@ struct rte_ipv6_fragment_ext {
* @return
* next protocol number if proto is an IPv6 extension, -EINVAL otherwise
*/
-__rte_experimental
static inline int
rte_ipv6_get_next_ext(const uint8_t *p, int proto, size_t *ext_len)
{
--
2.39.2
[PATCH v3 08/29] rcu: remove experimental from rte_rcu_qbsr
These functions were added back in 2020.
Remove experimental flag.
Signed-off-by: Stephen Hemminger
Reviewed-by: Honnappa Nagarahalli
---
lib/rcu/rte_rcu_qsbr.h | 20
lib/rcu/version.map| 15 ---
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 87e1b55153b5..74ef41e0fac1 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -10,10 +10,6 @@
*
* RTE Quiescent State Based Reclamation (QSBR).
*
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
- *
* Quiescent State (QS) is any point in the thread execution
* where the thread does not hold a reference to a data structure
* in shared memory. While using lock-less data structures, the writer
@@ -727,9 +723,6 @@ int
rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create a queue used to store the data structure elements that can
* be freed later. This queue is referred to as 'defer queue'.
*
@@ -742,14 +735,10 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v);
* - EINVAL - NULL parameters are passed
* - ENOMEM - Not enough memory
*/
-__rte_experimental
struct rte_rcu_qsbr_dq *
rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Enqueue one resource to the defer queue and start the grace period.
* The resource will be freed later after at least one grace period
* is over.
@@ -777,14 +766,10 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params);
* if the defer queue size is equal (or larger) than the
* number of elements in the data structure.
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Free resources from the defer queue.
*
* This API is multi-thread safe.
@@ -806,15 +791,11 @@ rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void
*e);
* On error - 1 with rte_errno set to
* - EINVAL - NULL parameters are passed
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n,
unsigned int *freed, unsigned int *pending, unsigned int *available);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Delete a defer queue.
*
* It tries to reclaim all the resources on the defer queue.
@@ -832,7 +813,6 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
* - EAGAIN - Some of the resources have not completed at least 1 grace
* period, try again.
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_delete(struct rte_rcu_qsbr_dq *dq);
diff --git a/lib/rcu/version.map b/lib/rcu/version.map
index 9218ed1f3399..982ffd59d9cd 100644
--- a/lib/rcu/version.map
+++ b/lib/rcu/version.map
@@ -2,6 +2,10 @@ DPDK_24 {
global:
rte_rcu_log_type;
+ rte_rcu_qsbr_dq_create;
+ rte_rcu_qsbr_dq_delete;
+ rte_rcu_qsbr_dq_enqueue;
+ rte_rcu_qsbr_dq_reclaim;
rte_rcu_qsbr_dump;
rte_rcu_qsbr_get_memsize;
rte_rcu_qsbr_init;
@@ -11,14 +15,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_rcu_qsbr_dq_create;
- rte_rcu_qsbr_dq_enqueue;
- rte_rcu_qsbr_dq_reclaim;
- rte_rcu_qsbr_dq_delete;
-
- local: *;
-};
--
2.39.2
[PATCH v3 09/29] lpm: remove experimental
The function to associate RCU with LPM was added several releases ago.
Remove experimental.
Signed-off-by: Stephen Hemminger
---
lib/lpm/rte_lpm.h | 4
lib/lpm/version.map | 7 +--
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 75e27ff164ab..40825c5b8038 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -186,9 +186,6 @@ void
rte_lpm_free(struct rte_lpm *lpm);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Associate RCU QSBR variable with an LPM object.
*
* @param lpm
@@ -203,7 +200,6 @@ rte_lpm_free(struct rte_lpm *lpm);
* - EEXIST - already added QSBR
* - ENOMEM - memory allocation failure
*/
-__rte_experimental
int rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg);
/**
diff --git a/lib/lpm/version.map b/lib/lpm/version.map
index 9ba73b2f938b..b6bee8c18b8a 100644
--- a/lib/lpm/version.map
+++ b/lib/lpm/version.map
@@ -18,12 +18,7 @@ DPDK_24 {
rte_lpm_find_existing;
rte_lpm_free;
rte_lpm_is_rule_present;
+ rte_lpm_rcu_qsbr_add;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_lpm_rcu_qsbr_add;
-};
--
2.39.2
[PATCH v3 10/29] mbuf: remove experimental from create_extbuf
This API was added in 2020 and should no longer be experimental.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/mbuf/rte_mbuf.h | 1 -
lib/mbuf/version.map | 8 +---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index 913c459b1cc6..30fa3df85f53 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -800,7 +800,6 @@ struct rte_pktmbuf_extmem {
*- EEXIST - a memzone with the same name already exists
*- ENOMEM - no appropriate memory area found in which to create memzone
*/
-__rte_experimental
struct rte_mempool *
rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size,
diff --git a/lib/mbuf/version.map b/lib/mbuf/version.map
index f010d4692e3e..daa65e2bbdb2 100644
--- a/lib/mbuf/version.map
+++ b/lib/mbuf/version.map
@@ -38,14 +38,8 @@ DPDK_24 {
rte_pktmbuf_init;
rte_pktmbuf_pool_create;
rte_pktmbuf_pool_create_by_ops;
+ rte_pktmbuf_pool_create_extbuf;
rte_pktmbuf_pool_init;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_pktmbuf_pool_create_extbuf;
-
-};
--
2.39.2
[PATCH v3 11/29] hash: remove experimental from toeplitz hash
The rte_thash_ functions have been around since 2020. Remove experimental tag. Signed-off-by: Stephen Hemminger --- lib/hash/rte_thash.h | 44 --- lib/hash/rte_thash_gfni.h | 8 --- lib/hash/rte_thash_x86_gfni.h | 8 --- lib/hash/version.map | 16 - 4 files changed, 4 insertions(+), 72 deletions(-) diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h index da06cd53c0e0..071730c7bab9 100644 --- a/lib/hash/rte_thash.h +++ b/lib/hash/rte_thash.h @@ -221,14 +221,10 @@ rte_softrss_be(uint32_t *input_tuple, uint32_t input_len, /** * Indicates if GFNI implementations of the Toeplitz hash are supported. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @return * 1 if GFNI is supported * 0 otherwise */ -__rte_experimental int rte_thash_gfni_supported(void); @@ -236,9 +232,6 @@ rte_thash_gfni_supported(void); * Converts Toeplitz hash key (RSS key) into matrixes required * for GFNI implementation * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param matrixes * pointer to the memory where matrices will be written. * Note: the size of this memory must be equal to size * 8 @@ -247,7 +240,6 @@ rte_thash_gfni_supported(void); * @param size * Size of the rss_key in bytes. */ -__rte_experimental void rte_thash_complete_matrix(uint64_t *matrixes, const uint8_t *rss_key, int size); @@ -276,9 +268,6 @@ struct rte_thash_subtuple_helper; /** * Create a new thash context. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param name * Context name * @param key_len @@ -298,7 +287,6 @@ struct rte_thash_subtuple_helper; * A pointer to the created context on success * NULL otherwise */ -__rte_experimental struct rte_thash_ctx * rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, uint8_t *key, uint32_t flags); @@ -306,9 +294,6 @@ rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, /** * Find an existing thash context and return a pointer to it. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param name * Name of the thash context * @return @@ -316,20 +301,15 @@ rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, * set appropriately. Possible rte_errno values include: * - ENOENT - required entry not available to return. */ -__rte_experimental struct rte_thash_ctx * rte_thash_find_existing(const char *name); /** * Free a thash context object * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context */ -__rte_experimental void rte_thash_free_ctx(struct rte_thash_ctx *ctx); @@ -339,9 +319,6 @@ rte_thash_free_ctx(struct rte_thash_ctx *ctx); * to calculate toeplitz hash collisions. * This function is not multi-thread safe. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @param name @@ -355,7 +332,6 @@ rte_thash_free_ctx(struct rte_thash_ctx *ctx); * 0 on success * negative on error */ -__rte_experimental int rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, uint32_t offset); @@ -363,9 +339,6 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, /** * Find a helper in the context by the given name * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @param name @@ -373,7 +346,6 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, * @return * Pointer to the thash helper or NULL if it was not found. */ -__rte_experimental struct rte_thash_subtuple_helper * rte_thash_get_helper(struct rte_thash_ctx *ctx, const char *name); @@ -392,7 +364,6 @@ rte_thash_get_helper(struct rte_thash_ctx *ctx, const char *name); * @return * A complementary value which must be xored with the corresponding subtuple */ -__rte_experimental uint32_t rte_thash_get_complement(struct rte_thash_subtuple_helper *h, uint32_t hash, uint32_t desired_hash); @@ -402,15 +373,11 @@ rte_thash_get_complement(struct rte_thash_subtuple_helper *h, * It changes after each addition of a helper. It should be installed to * the NIC. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @return * A pointer to the toeplitz hash key */ -__rte_experimental const uint8_t * rte_thash_get_key(struct rte_thash_ctx *ctx); @@ -420,16 +387,12 @@ rte_thash_get_key(struct rte_thash_ctx *ctx); * CPU supports GFNI. * Matrices changes after each addition of a helper. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context
[PATCH v3 12/29] timer: remove experimental from rte_timer_next_ticks
Function was added in 20.11, remove experimental flag.
Signed-off-by: Stephen Hemminger
---
lib/timer/rte_timer.h | 4
lib/timer/version.map | 7 +--
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/timer/rte_timer.h b/lib/timer/rte_timer.h
index d3927d5b6bac..153d1993573f 100644
--- a/lib/timer/rte_timer.h
+++ b/lib/timer/rte_timer.h
@@ -331,9 +331,6 @@ void rte_timer_stop_sync(struct rte_timer *tim);
int rte_timer_pending(struct rte_timer *tim);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Time until the next timer on the current lcore
* This function gives the ticks until the next timer will be active.
*
@@ -343,7 +340,6 @@ int rte_timer_pending(struct rte_timer *tim);
* - 0: a timer is pending and will run at next rte_timer_manage()
* - >0: ticks until the next timer is ready
*/
-__rte_experimental
int64_t rte_timer_next_ticks(void);
/**
diff --git a/lib/timer/version.map b/lib/timer/version.map
index e3d5a043034c..b180708e2488 100644
--- a/lib/timer/version.map
+++ b/lib/timer/version.map
@@ -10,6 +10,7 @@ DPDK_24 {
rte_timer_dump_stats;
rte_timer_init;
rte_timer_manage;
+ rte_timer_next_ticks;
rte_timer_pending;
rte_timer_reset;
rte_timer_reset_sync;
@@ -21,9 +22,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_timer_next_ticks;
-};
--
2.39.2
[PATCH v3 13/29] sched: remove experimental
The overcommit and PIE support was added back in 2020.
Remove experimental tag.
Signed-off-by: Stephen Hemminger
---
lib/sched/rte_pie.h | 8
lib/sched/rte_sched.h | 5 -
lib/sched/version.map | 18 --
3 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/lib/sched/rte_pie.h b/lib/sched/rte_pie.h
index e0d6d5a3cdcd..631c657980eb 100644
--- a/lib/sched/rte_pie.h
+++ b/lib/sched/rte_pie.h
@@ -78,7 +78,6 @@ struct rte_pie {
* @retval !0 error
*/
int
-__rte_experimental
rte_pie_rt_data_init(struct rte_pie *pie);
/**
@@ -95,7 +94,6 @@ rte_pie_rt_data_init(struct rte_pie *pie);
* @retval !0 error
*/
int
-__rte_experimental
rte_pie_config_init(struct rte_pie_config *pie_cfg,
const uint16_t qdelay_ref,
const uint16_t dp_update_interval,
@@ -116,7 +114,6 @@ rte_pie_config_init(struct rte_pie_config *pie_cfg,
* @retval !0 drop the packet
*/
static int
-__rte_experimental
rte_pie_enqueue_empty(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
uint32_t pkt_len)
@@ -148,7 +145,6 @@ rte_pie_enqueue_empty(const struct rte_pie_config *pie_cfg,
* @param time [in] current time (measured in cpu cycles)
*/
static void
-__rte_experimental
_calc_drop_probability(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie, uint64_t time)
{
@@ -212,7 +208,6 @@ _calc_drop_probability(const struct rte_pie_config *pie_cfg,
* @retval 1 drop the packet
*/
static inline int
-__rte_experimental
_rte_pie_drop(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie)
{
@@ -261,7 +256,6 @@ _rte_pie_drop(const struct rte_pie_config *pie_cfg,
* @retval 2 drop the packet based on mark probability criterion
*/
static inline int
-__rte_experimental
rte_pie_enqueue_nonempty(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
uint32_t pkt_len,
@@ -329,7 +323,6 @@ rte_pie_enqueue_nonempty(const struct rte_pie_config
*pie_cfg,
* @retval 1 drop the packet based on drop probability criteria
*/
static inline int
-__rte_experimental
rte_pie_enqueue(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
const unsigned int qlen,
@@ -354,7 +347,6 @@ rte_pie_enqueue(const struct rte_pie_config *pie_cfg,
* @param time [in] current time stamp in cpu cycles
*/
static inline void
-__rte_experimental
rte_pie_dequeue(struct rte_pie *pie,
uint32_t pkt_len,
uint64_t time)
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index a9ac5909ad0c..77fc78ce2fe9 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -353,9 +353,6 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port
*port,
uint32_t *pipe_profile_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Hierarchical scheduler subport bandwidth profile add
* Note that this function is safe to use in runtime for adding new
* subport bandwidth profile as it doesn't have any impact on hierarchical
@@ -369,7 +366,6 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port
*port,
* @return
* 0 upon success, error code otherwise
*/
-__rte_experimental
int
rte_sched_port_subport_profile_add(struct rte_sched_port *port,
struct rte_sched_subport_profile_params *profile,
@@ -592,7 +588,6 @@ rte_sched_port_dequeue(struct rte_sched_port *port, struct
rte_mbuf **pkts, uint
* @return
* 0 upon success, error code otherwise
*/
-__rte_experimental
int
rte_sched_subport_tc_ov_config(struct rte_sched_port *port, uint32_t
subport_id, bool tc_ov_enable);
diff --git a/lib/sched/version.map b/lib/sched/version.map
index d9ce68be1449..be1decaeee46 100644
--- a/lib/sched/version.map
+++ b/lib/sched/version.map
@@ -2,6 +2,8 @@ DPDK_24 {
global:
rte_approx;
+ rte_pie_config_init;
+ rte_pie_rt_data_init;
rte_red_config_init;
rte_red_log2_1_minus_Wq;
rte_red_pow2_frac_inv;
@@ -17,24 +19,12 @@ DPDK_24 {
rte_sched_port_pkt_read_color;
rte_sched_port_pkt_read_tree_path;
rte_sched_port_pkt_write;
+ rte_sched_port_subport_profile_add;
rte_sched_queue_read_stats;
rte_sched_subport_config;
rte_sched_subport_pipe_profile_add;
rte_sched_subport_read_stats;
+ rte_sched_subport_tc_ov_config;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 20.11
- rte_sched_port_subport_profile_add;
-
- # added in 21.11
- rte_pie_rt_data_init;
- rte_pie_config_init;
-
- # added in 22.07
- rte_sched_subport_tc_ov_config;
-};
--
2.39.2
[PATCH v3 14/29] dmadev: mark API's as not experimental
These were added in 20.11 time now to remove experimental flag.
Signed-off-by: Stephen Hemminger
Acked-by: Chengwen Feng
Acked-by: Bruce Richardson
---
MAINTAINERS | 2 +-
lib/dmadev/rte_dmadev.h | 85 -
lib/dmadev/version.map | 2 +-
3 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index f77597571633..1534a414f754 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -483,7 +483,7 @@ F: doc/guides/prog_guide/mldev.rst
F: app/test-mldev/
F: doc/guides/tools/testmldev.rst
-DMA device API - EXPERIMENTAL
+DMA device API
M: Chengwen Feng
F: lib/dmadev/
F: drivers/dma/skeleton/
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index 493263a5d627..2c09939ff6c5 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -158,9 +158,6 @@ extern "C" {
#define RTE_DMADEV_DEFAULT_MAX 64
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Configure the maximum number of dmadevs.
* @note This function can be invoked before the primary process rte_eal_init()
* to change the maximum number of dmadevs. If not invoked, the maximum number
@@ -172,13 +169,9 @@ extern "C" {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_dev_max(size_t dev_max);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the device identifier for the named DMA device.
*
* @param name
@@ -188,13 +181,9 @@ int rte_dma_dev_max(size_t dev_max);
* Returns DMA device identifier on success.
* - <0: Failure to find named DMA device.
*/
-__rte_experimental
int rte_dma_get_dev_id_by_name(const char *name);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Check whether the dev_id is valid.
*
* @param dev_id
@@ -203,20 +192,15 @@ int rte_dma_get_dev_id_by_name(const char *name);
* @return
* - If the device index is valid (true) or not (false).
*/
-__rte_experimental
bool rte_dma_is_valid(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the total number of DMA devices that have been successfully
* initialised.
*
* @return
* The total number of usable DMA devices.
*/
-__rte_experimental
uint16_t rte_dma_count_avail(void);
/**
@@ -227,7 +211,6 @@ uint16_t rte_dma_count_avail(void);
* @return
* Next valid dmadev, UINT16_MAX if there is none.
*/
-__rte_experimental
int16_t rte_dma_next_dev(int16_t start_dev_id);
/** Utility macro to iterate over all available dmadevs */
@@ -318,9 +301,6 @@ struct rte_dma_info {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Retrieve information of a DMA device.
*
* @param dev_id
@@ -332,7 +312,6 @@ struct rte_dma_info {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info);
/**
@@ -357,9 +336,6 @@ struct rte_dma_conf {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Configure a DMA device.
*
* This function must be invoked first before any other function in the
@@ -375,13 +351,9 @@ struct rte_dma_conf {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Start a DMA device.
*
* The device start step is the last one and consists of setting the DMA
@@ -393,13 +365,9 @@ int rte_dma_configure(int16_t dev_id, const struct
rte_dma_conf *dev_conf);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_start(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Stop a DMA device.
*
* The device can be restarted with a call to rte_dma_start().
@@ -410,13 +378,9 @@ int rte_dma_start(int16_t dev_id);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_stop(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Close a DMA device.
*
* The device cannot be restarted after this call.
@@ -427,7 +391,6 @@ int rte_dma_stop(int16_t dev_id);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_close(int16_t dev_id);
/**
@@ -620,9 +583,6 @@ struct rte_dma_vchan_conf {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Allocate and set up a virtual DMA channel.
*
* @param dev_id
@@ -637,7 +597,6 @@ struct rte_dma_vchan_conf {
* @return
* 0 on success. Otherwise negative value
[PATCH v3 15/29] meter: remove experimental warning from comments
The API's for rte_meter_trtcm were never properly flagged as experimental; missing __rte_experimental but there was an experimental comment in the docbook comment. Remove the comment. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- lib/meter/rte_meter.h | 12 1 file changed, 12 deletions(-) diff --git a/lib/meter/rte_meter.h b/lib/meter/rte_meter.h index 6ba99674361a..bd68cbe38903 100644 --- a/lib/meter/rte_meter.h +++ b/lib/meter/rte_meter.h @@ -124,9 +124,6 @@ int rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 profile configuration * * @param p @@ -170,9 +167,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_profile *p); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 configuration per metered traffic flow * * @param m @@ -273,9 +267,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, enum rte_color pkt_color); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color blind traffic metering * * @param m @@ -297,9 +288,6 @@ rte_meter_trtcm_rfc4115_color_blind_check( uint32_t pkt_len); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color aware traffic metering * * @param m -- 2.39.2
[PATCH v3 16/29] power: remove experimental from API's
The power management API's were last changed in 22.11 release.
Therefore remove experimental for 23.11 release.
Signed-off-by: Stephen Hemminger
---
lib/power/rte_power.h | 4 ---
lib/power/rte_power_guest_channel.h | 4 ---
lib/power/rte_power_pmd_mgmt.h | 40 -
lib/power/rte_power_uncore.h| 5
lib/power/version.map | 38 ---
5 files changed, 11 insertions(+), 80 deletions(-)
diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h
index e79bf1c4dd0c..4b624a01c5d7 100644
--- a/lib/power/rte_power.h
+++ b/lib/power/rte_power.h
@@ -25,9 +25,6 @@ enum power_management_env {PM_ENV_NOT_SET,
PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM,
PM_ENV_AMD_PSTATE_CPUFREQ};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Check if a specific power management environment type is supported on a
* currently running system.
*
@@ -39,7 +36,6 @@ enum power_management_env {PM_ENV_NOT_SET,
PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM,
* - 0 if unsupported
* - -1 if error, with rte_errno indicating reason for error.
*/
-__rte_experimental
int rte_power_check_env_supported(enum power_management_env env);
/**
diff --git a/lib/power/rte_power_guest_channel.h
b/lib/power/rte_power_guest_channel.h
index b5de1bd24318..55b76dfc4c08 100644
--- a/lib/power/rte_power_guest_channel.h
+++ b/lib/power/rte_power_guest_channel.h
@@ -135,9 +135,6 @@ int rte_power_guest_channel_send_msg(struct
rte_power_channel_packet *pkt,
unsigned int lcore_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Receive a message contained in pkt over the Virtio-Serial
* from the host endpoint.
*
@@ -155,7 +152,6 @@ int rte_power_guest_channel_send_msg(struct
rte_power_channel_packet *pkt,
* - 0 on success.
* - Negative on error.
*/
-__rte_experimental
int rte_power_guest_channel_receive_msg(void *pkt,
size_t pkt_len,
unsigned int lcore_id);
diff --git a/lib/power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h
index 0f1a2eb22eb4..456145661917 100644
--- a/lib/power/rte_power_pmd_mgmt.h
+++ b/lib/power/rte_power_pmd_mgmt.h
@@ -33,9 +33,6 @@ enum rte_power_pmd_mgmt_type {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Enable power management on a specified Ethernet device Rx queue and lcore.
*
* @note This function is not thread-safe.
@@ -55,16 +52,12 @@ enum rte_power_pmd_mgmt_type {
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
uint16_t port_id, uint16_t queue_id,
enum rte_power_pmd_mgmt_type mode);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Disable power management on a specified Ethernet device Rx queue and lcore.
*
* @note This function is not thread-safe.
@@ -82,42 +75,30 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
uint16_t port_id, uint16_t queue_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set a emptypoll_max to specified value. Used to specify the number of empty
* polls to wait before entering sleep state.
*
* @param max
* The value to set emptypoll_max to.
*/
-__rte_experimental
void
rte_power_pmd_mgmt_set_emptypoll_max(unsigned int max);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Get the current value of emptypoll_max.
*
* @return
* The current emptypoll_max value
*/
-__rte_experimental
unsigned int
rte_power_pmd_mgmt_get_emptypoll_max(void);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set the pause_duration. Used to adjust the pause mode callback duration.
*
* @note Duration must be greater than zero.
@@ -128,27 +109,19 @@ rte_power_pmd_mgmt_get_emptypoll_max(void);
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_pmd_mgmt_set_pause_duration(unsigned int duration);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Get the current value of pause_duration.
*
* @return
* The current pause_duration value.
*/
-__rte_experimental
unsigned int
rte_power_pmd_mgmt_get_pause_duration(void);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set the min frequency to be used for frequency scaling or zero to use
defaults.
*
* @note Supported by: Pstate mode.
@@ -161,14 +134,10 @@ rte_power_p
[PATCH v3 17/29] kvargs: remove experimental flag
The function rte_kvargs_get_with_value was added in 21.11
so experimental flag can be removed.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/kvargs/rte_kvargs.h | 4
lib/kvargs/version.map | 8 +---
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
index 4900b750bc0b..36804cfb1543 100644
--- a/lib/kvargs/rte_kvargs.h
+++ b/lib/kvargs/rte_kvargs.h
@@ -145,9 +145,6 @@ void rte_kvargs_free(struct rte_kvargs *kvlist);
const char *rte_kvargs_get(const struct rte_kvargs *kvlist, const char *key);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get the value associated with a given key and value.
*
* Find the first entry in the kvlist whose key and value match the
@@ -167,7 +164,6 @@ const char *rte_kvargs_get(const struct rte_kvargs *kvlist,
const char *key);
* NULL if no key matches the input,
* a value associated with a matching key otherwise.
*/
-__rte_experimental
const char *rte_kvargs_get_with_value(const struct rte_kvargs *kvlist,
const char *key, const char *value);
diff --git a/lib/kvargs/version.map b/lib/kvargs/version.map
index 387a94e725cf..cda85d171f32 100644
--- a/lib/kvargs/version.map
+++ b/lib/kvargs/version.map
@@ -4,16 +4,10 @@ DPDK_24 {
rte_kvargs_count;
rte_kvargs_free;
rte_kvargs_get;
+ rte_kvargs_get_with_value;
rte_kvargs_parse;
rte_kvargs_parse_delim;
rte_kvargs_process;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 21.11
- rte_kvargs_get_with_value;
-};
--
2.39.2
[PATCH v3 18/29] ip_frag: mark a couple of functions stable
There were two functions added in 22.11 which were
marked as experimental. Remove the experimental tag.
Signed-off-by: Stephen Hemminger
Acked-by: Konstantin Ananyev
---
lib/ip_frag/rte_ip_frag.h | 2 --
lib/ip_frag/version.map | 9 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
index feab72ae64b9..cd3a3e143ee7 100644
--- a/lib/ip_frag/rte_ip_frag.h
+++ b/lib/ip_frag/rte_ip_frag.h
@@ -205,7 +205,6 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
* in the pkts_out array.
* Otherwise - (-1) * errno.
*/
-__rte_experimental
int32_t
rte_ipv4_fragment_copy_nonseg_packet(struct rte_mbuf *pkt_in,
struct rte_mbuf **pkts_out,
@@ -289,7 +288,6 @@ rte_ip_frag_table_statistics_dump(FILE * f, const struct
rte_ip_frag_tbl *tbl);
* @param tms
* Current timestamp
*/
-__rte_experimental
void
rte_ip_frag_table_del_expired_entries(struct rte_ip_frag_tbl *tbl,
struct rte_ip_frag_death_row *dr, uint64_t tms);
diff --git a/lib/ip_frag/version.map b/lib/ip_frag/version.map
index 7ba446c9938b..3e7e573dc412 100644
--- a/lib/ip_frag/version.map
+++ b/lib/ip_frag/version.map
@@ -3,19 +3,14 @@ DPDK_24 {
rte_ip_frag_free_death_row;
rte_ip_frag_table_create;
+ rte_ip_frag_table_del_expired_entries;
rte_ip_frag_table_destroy;
rte_ip_frag_table_statistics_dump;
rte_ipv4_frag_reassemble_packet;
+ rte_ipv4_fragment_copy_nonseg_packet;
rte_ipv4_fragment_packet;
rte_ipv6_frag_reassemble_packet;
rte_ipv6_fragment_packet;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_ip_frag_table_del_expired_entries;
- rte_ipv4_fragment_copy_nonseg_packet;
-};
--
2.39.2
[PATCH v3 19/29] member: remove experimental tag
The member library last received new API's in 22.11.
All the API's should be marked stable by now.
Signed-off-by: Stephen Hemminger
---
lib/member/rte_member.h | 54 -
lib/member/version.map | 12 +++--
2 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index a15e0d69e696..a6bf22651700 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -15,9 +15,6 @@
* bloom filter (vBF). For HT setsummary, two subtypes or modes are available,
* cache and non-cache modes. The table below summarize some properties of
* the different implementations.
- *
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
*/
/**
@@ -117,17 +114,11 @@ extern int librte_member_logtype;
struct rte_member_setsum;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Parameter struct used to create set summary
*/
struct rte_member_parameters;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Define different set summary types
*/
enum rte_member_setsum_type {
@@ -207,9 +198,6 @@ struct rte_member_setsum {
} __rte_cache_aligned;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Parameters used when create the set summary table. Currently user can
* specify two types of setsummary: HT based and vBF. For HT based, user can
* specify cache or non-cache mode. Here is a table to describe some
differences
@@ -351,9 +339,6 @@ struct rte_member_parameters {
} __rte_cache_aligned;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Find an existing set-summary and return a pointer to it.
*
* @param name
@@ -367,9 +352,6 @@ struct rte_member_setsum *
rte_member_find_existing(const char *name);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create set-summary (SS).
*
* @param params
@@ -382,9 +364,6 @@ struct rte_member_setsum *
rte_member_create(const struct rte_member_parameters *params);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup key in set-summary (SS).
* Single key lookup and return as soon as the first match found
*
@@ -402,9 +381,6 @@ rte_member_lookup(const struct rte_member_setsum *setsum,
const void *key,
member_set_t *set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup bulk of keys in set-summary (SS).
* Each key lookup returns as soon as the first match found
*
@@ -427,9 +403,6 @@ rte_member_lookup_bulk(const struct rte_member_setsum
*setsum,
member_set_t *set_ids);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup a key in set-summary (SS) for multiple matches.
* The key lookup will find all matched entries (multiple match).
* Note that for cache mode of HT, each key can have at most one match. This is
@@ -456,9 +429,6 @@ rte_member_lookup_multi(const struct rte_member_setsum
*setsum,
member_set_t *set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup a bulk of keys in set-summary (SS) for multiple matches each key.
* Each key lookup will find all matched entries (multiple match).
* Note that for cache mode HT, each key can have at most one match. So
@@ -489,9 +459,6 @@ rte_member_lookup_multi_bulk(const struct rte_member_setsum
*setsum,
member_set_t *set_ids);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Insert key into set-summary (SS).
*
* @param setsum
@@ -522,9 +489,6 @@ rte_member_add(const struct rte_member_setsum *setsum,
const void *key,
member_set_t set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Add the packet byte size into the sketch.
*
* @param setsum
@@ -536,15 +500,11 @@ rte_member_add(const struct rte_member_setsum *setsum,
const void *key,
* @return
* Return -EINVAL for invalid parameters, otherwise return 0.
*/
-__rte_experimental
int
rte_member_add_byte_count(const struct rte_member_setsum *setsum,
const void *key, uint32_t byte_count);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Query packet count for a certain flow-key.
*
* @param setsum
@@ -556,16 +516,12 @@ rte_member_add_byte_count(const struct rte_member_setsum
*setsum,
* @return
* Return -EINVAL for invalid parameters.
*/
-__rte_experimental
int
rte_member_query_count(const struct rte_member_setsum *setsum,
const void *key, uint64_t *count);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Report heavyhitt
[PATCH v3 20/29] power fix
---
lib/power/version.map | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/power/version.map b/lib/power/version.map
index 8dd154bb0609..177ef3e2dd54 100644
--- a/lib/power/version.map
+++ b/lib/power/version.map
@@ -42,4 +42,6 @@ DPDK_24 {
rte_power_uncore_get_num_pkgs;
rte_power_uncore_init;
rte_power_unset_uncore_env;
+
+ local: *;
};
--
2.39.2
[PATCH v3 21/29] security: remove experimental flag from macsec
The rte_security API's for macsec were added in 22.11.
Therefore remove the experimental tag.
There is also one helper function for setting packet
metadata that should have been marked internal.
Signed-off-by: Stephen Hemminger
---
lib/security/rte_security.h | 28 +---
lib/security/version.map| 18 +-
2 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index d2d2af23d5d2..ca78627ec7d2 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -815,7 +815,6 @@ rte_security_session_create(void *instance,
* - On success returns 0
* - On failure returns a negative errno value.
*/
-__rte_experimental
int
rte_security_session_update(void *instance,
void *sess,
@@ -851,9 +850,6 @@ int
rte_security_session_destroy(void *instance, void *sess);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create MACsec security channel (SC).
*
* @param instance security instance
@@ -865,15 +861,11 @@ rte_security_session_destroy(void *instance, void *sess);
* - -ENOMEM if PMD is not capable to create more SC.
* - other negative value for other errors.
*/
-__rte_experimental
int
rte_security_macsec_sc_create(void *instance,
struct rte_security_macsec_sc *conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Destroy MACsec security channel (SC).
*
* @param instance security instance
@@ -884,15 +876,11 @@ rte_security_macsec_sc_create(void *instance,
* - -EINVAL if sc_id is invalid or instance is NULL.
* - -EBUSY if sc is being used by some session.
*/
-__rte_experimental
int
rte_security_macsec_sc_destroy(void *instance, uint16_t sc_id,
enum rte_security_macsec_direction dir);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create MACsec security association (SA).
*
* @param instance security instance
@@ -904,15 +892,11 @@ rte_security_macsec_sc_destroy(void *instance, uint16_t
sc_id,
* - -ENOMEM if PMD is not capable to create more SAs.
* - other negative value for other errors.
*/
-__rte_experimental
int
rte_security_macsec_sa_create(void *instance,
struct rte_security_macsec_sa *conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Destroy MACsec security association (SA).
*
* @param instance security instance
@@ -923,7 +907,6 @@ rte_security_macsec_sa_create(void *instance,
* - -EINVAL if sa_id is invalid or instance is NULL.
* - -EBUSY if sa is being used by some session.
*/
-__rte_experimental
int
rte_security_macsec_sa_destroy(void *instance, uint16_t sa_id,
enum rte_security_macsec_direction dir);
@@ -1059,7 +1042,7 @@ rte_security_session_fast_mdata_set(void *sess, uint64_t
fdata)
}
/** Function to call PMD specific function pointer set_pkt_metadata() */
-__rte_experimental
+__rte_internal
int __rte_security_set_pkt_metadata(void *instance,
void *sess,
struct rte_mbuf *m, void *params);
@@ -1230,16 +1213,12 @@ struct rte_security_stats {
* - On success, return 0
* - On failure, a negative value
*/
-__rte_experimental
int
rte_security_session_stats_get(void *instance,
void *sess,
struct rte_security_stats *stats);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get MACsec SA statistics.
*
* @param instancesecurity instance
@@ -1250,16 +1229,12 @@ rte_security_session_stats_get(void *instance,
* - On success, return 0.
* - On failure, a negative value.
*/
-__rte_experimental
int
rte_security_macsec_sa_stats_get(void *instance,
uint16_t sa_id, enum
rte_security_macsec_direction dir,
struct rte_security_macsec_sa_stats *stats);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get MACsec SC statistics.
*
* @param instancesecurity instance
@@ -1270,7 +1245,6 @@ rte_security_macsec_sa_stats_get(void *instance,
* - On success, return 0.
* - On failure, a negative value.
*/
-__rte_experimental
int
rte_security_macsec_sc_stats_get(void *instance,
uint16_t sc_id, enum
rte_security_macsec_direction dir,
diff --git a/lib/security/version.map b/lib/security/version.map
index e07fca33a1e6..487822147fd3 100644
--- a/lib/security/version.map
+++ b/lib/security/version.map
@@ -6,14 +6,6 @@ DPDK_24 {
rte_security_session_create;
rte_security_session_destroy;
rte_security_session_get_size;
-
- local:
[PATCH v3 22/29] vhost: remove experimental from some API's
All API's that before 22.11 release should have experimental
tag removed.
Signed-off-by: Stephen Hemminger
---
lib/vhost/rte_vhost.h| 5
lib/vhost/rte_vhost_async.h | 19 --
lib/vhost/rte_vhost_crypto.h | 1 -
lib/vhost/version.map| 51 ++--
4 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h
index fec650b1dbba..db92f0534431 100644
--- a/lib/vhost/rte_vhost.h
+++ b/lib/vhost/rte_vhost.h
@@ -509,7 +509,6 @@ rte_vhost_driver_get_vdpa_device(const char *path);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_driver_get_vdpa_dev_type(const char *path, uint32_t *type);
@@ -648,7 +647,6 @@ int rte_vhost_get_negotiated_features(int vid, uint64_t
*features);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_get_negotiated_protocol_features(int vid,
uint64_t *protocol_features);
@@ -960,7 +958,6 @@ int rte_vhost_vring_call(int vid, uint16_t vring_idx);
* @return
* 0 on success, -1 on failure, -EAGAIN for another retry
*/
-__rte_experimental
int rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx);
/**
@@ -987,7 +984,6 @@ uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_get_monitor_addr(int vid, uint16_t queue_id,
struct rte_vhost_power_monitor_cond *pmc);
@@ -1102,7 +1098,6 @@ rte_vhost_get_vdpa_device(int vid);
* @return
* 0 on success, < 0 on failure
*/
-__rte_experimental
int
rte_vhost_backend_config_change(int vid, bool need_reply);
diff --git a/lib/vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h
index 8f190dd44b1b..3370026415fb 100644
--- a/lib/vhost/rte_vhost_async.h
+++ b/lib/vhost/rte_vhost_async.h
@@ -24,7 +24,6 @@ extern "C" {
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_register(int vid, uint16_t queue_id);
/**
@@ -37,7 +36,6 @@ int rte_vhost_async_channel_register(int vid, uint16_t
queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_unregister(int vid, uint16_t queue_id);
/**
@@ -54,7 +52,6 @@ int rte_vhost_async_channel_unregister(int vid, uint16_t
queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_register_thread_unsafe(int vid, uint16_t queue_id);
/**
@@ -71,7 +68,6 @@ int rte_vhost_async_channel_register_thread_unsafe(int vid,
uint16_t queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_unregister_thread_unsafe(int vid,
uint16_t queue_id);
@@ -95,7 +91,6 @@ int rte_vhost_async_channel_unregister_thread_unsafe(int vid,
* @return
* num of packets enqueued
*/
-__rte_experimental
uint16_t rte_vhost_submit_enqueue_burst(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -120,7 +115,6 @@ uint16_t rte_vhost_submit_enqueue_burst(int vid, uint16_t
queue_id,
* @return
* num of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -136,7 +130,6 @@ uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t
queue_id,
* @return
* the amount of in-flight packets on success; -1 on failure
*/
-__rte_experimental
int rte_vhost_async_get_inflight(int vid, uint16_t queue_id);
/**
@@ -153,7 +146,6 @@ int rte_vhost_async_get_inflight(int vid, uint16_t
queue_id);
* @return
* the amount of in-flight packets on success; -1 on failure
*/
-__rte_experimental
int rte_vhost_async_get_inflight_thread_unsafe(int vid, uint16_t queue_id);
/**
@@ -178,7 +170,6 @@ int rte_vhost_async_get_inflight_thread_unsafe(int vid,
uint16_t queue_id);
* @return
* Number of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -203,7 +194,6 @@ uint16_t rte_vhost_clear_queue_thread_unsafe(int vid,
uint16_t queue_id,
* @return
* Number of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_clear_queue(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -226,13 +216,9 @@ uint16_t rte_vhost_clear_queue(int vid, uint16_t queue_id,
* @return
* 0 on success, and -1 on failure
*/
-__rte_experimental
int rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be r
[PATCH v3 23/29] bbdev: remove experimental tag
The API's for bbdev were last added to in 22.11.
Remove experimental flag now.
Signed-off-by: Stephen Hemminger
---
lib/bbdev/rte_bbdev.h| 4
lib/bbdev/rte_bbdev_op.h | 2 --
lib/bbdev/version.map| 15 +++
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
index d12e2e7fbcf3..b43e98ef9d1b 100644
--- a/lib/bbdev/rte_bbdev.h
+++ b/lib/bbdev/rte_bbdev.h
@@ -675,7 +675,6 @@ rte_bbdev_enqueue_ldpc_dec_ops(uint16_t dev_id, uint16_t
queue_id,
* The number of operations actually enqueued.
* (This is the number of processed entries in the @p ops array.)
*/
-__rte_experimental
static inline uint16_t
rte_bbdev_enqueue_fft_ops(uint16_t dev_id, uint16_t queue_id,
struct rte_bbdev_fft_op **ops, uint16_t num_ops)
@@ -860,7 +859,6 @@ rte_bbdev_dequeue_ldpc_dec_ops(uint16_t dev_id, uint16_t
queue_id,
* The number of operations actually dequeued (this is the number of entries
* copied into the @p ops array).
*/
-__rte_experimental
static inline uint16_t
rte_bbdev_dequeue_fft_ops(uint16_t dev_id, uint16_t queue_id,
struct rte_bbdev_fft_op **ops, uint16_t num_ops)
@@ -1042,7 +1040,6 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t
queue_id, int epfd, int op,
* @returns
* Device status as string or NULL if invalid.
*/
-__rte_experimental
const char*
rte_bbdev_device_status_str(enum rte_bbdev_device_status status);
@@ -1055,7 +1052,6 @@ rte_bbdev_device_status_str(enum rte_bbdev_device_status
status);
* @returns
* Queue status as string or NULL if op_type is invalid.
*/
-__rte_experimental
const char*
rte_bbdev_enqueue_status_str(enum rte_bbdev_enqueue_status status);
diff --git a/lib/bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
index 369ac331bf9b..459631d0d0b7 100644
--- a/lib/bbdev/rte_bbdev_op.h
+++ b/lib/bbdev/rte_bbdev_op.h
@@ -1130,7 +1130,6 @@ rte_bbdev_dec_op_alloc_bulk(struct rte_mempool *mempool,
* - 0 on success.
* - EINVAL if invalid mempool is provided.
*/
-__rte_experimental
static inline int
rte_bbdev_fft_op_alloc_bulk(struct rte_mempool *mempool,
struct rte_bbdev_fft_op **ops, unsigned int num_ops)
@@ -1220,7 +1219,6 @@ rte_bbdev_enc_op_free_bulk(struct rte_bbdev_enc_op **ops,
unsigned int num_ops)
* @param num_ops
* Number of structures.
*/
-__rte_experimental
static inline void
rte_bbdev_fft_op_free_bulk(struct rte_bbdev_fft_op **ops, unsigned int num_ops)
{
diff --git a/lib/bbdev/version.map b/lib/bbdev/version.map
index eeb7ed475a6c..1840d2b2a491 100644
--- a/lib/bbdev/version.map
+++ b/lib/bbdev/version.map
@@ -10,11 +10,17 @@ DPDK_24 {
rte_bbdev_dec_op_free_bulk;
rte_bbdev_dequeue_dec_ops;
rte_bbdev_dequeue_enc_ops;
+ rte_bbdev_dequeue_fft_ops;
+ rte_bbdev_device_status_str;
rte_bbdev_devices;
rte_bbdev_enc_op_alloc_bulk;
rte_bbdev_enc_op_free_bulk;
rte_bbdev_enqueue_dec_ops;
rte_bbdev_enqueue_enc_ops;
+ rte_bbdev_enqueue_fft_ops;
+ rte_bbdev_enqueue_status_str;
+ rte_bbdev_fft_op_alloc_bulk;
+ rte_bbdev_fft_op_free_bulk;
rte_bbdev_find_next;
rte_bbdev_get_named_dev;
rte_bbdev_info_get;
@@ -43,14 +49,7 @@ DPDK_24 {
EXPERIMENTAL {
global:
- # added in 22.11
- rte_bbdev_dequeue_fft_ops;
- rte_bbdev_device_status_str;
- rte_bbdev_enqueue_fft_ops;
- rte_bbdev_enqueue_status_str;
- rte_bbdev_fft_op_alloc_bulk;
- rte_bbdev_fft_op_free_bulk;
- #added in 23.11
+ # added in 23.11
rte_bbdev_dequeue_mldts_ops;
rte_bbdev_enqueue_mldts_ops;
rte_bbdev_mldts_op_alloc_bulk;
--
2.39.2
[PATCH v3 24/29] ipsec: remove experimental from SA API
These API's were added in 21.11, remove experimental flag.
Signed-off-by: Stephen Hemminger
Acked-by: Konstantin Ananyev
---
lib/ipsec/rte_ipsec.h | 2 --
lib/ipsec/version.map | 9 +
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h
index 04129926b69f..81624f909192 100644
--- a/lib/ipsec/rte_ipsec.h
+++ b/lib/ipsec/rte_ipsec.h
@@ -168,7 +168,6 @@ rte_ipsec_pkt_process(const struct rte_ipsec_session *ss,
struct rte_mbuf *mb[],
* @return
* 0 on success, negative value otherwise.
*/
-__rte_experimental
int
rte_ipsec_telemetry_sa_add(const struct rte_ipsec_sa *sa);
@@ -178,7 +177,6 @@ rte_ipsec_telemetry_sa_add(const struct rte_ipsec_sa *sa);
* @param sa
* Pointer to the *rte_ipsec_sa* object that will have telemetry disabled.
*/
-__rte_experimental
void
rte_ipsec_telemetry_sa_del(const struct rte_ipsec_sa *sa);
diff --git a/lib/ipsec/version.map b/lib/ipsec/version.map
index f0063af354f0..9d01ebeadc4c 100644
--- a/lib/ipsec/version.map
+++ b/lib/ipsec/version.map
@@ -16,15 +16,8 @@ DPDK_24 {
rte_ipsec_sad_lookup;
rte_ipsec_ses_from_crypto;
rte_ipsec_session_prepare;
-
- local: *;
-};
-
-EXPERIMENTAL {
- global:
-
- # added in 21.11
rte_ipsec_telemetry_sa_add;
rte_ipsec_telemetry_sa_del;
+ local: *;
};
--
2.39.2
[PATCH v3 25/29] compressdev: remove experimental flag
The compressdev can not hide under the experimental flag.
Remove the experimental flag and require ABI to be stable.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS | 2 +-
lib/compressdev/rte_comp.h| 6 --
lib/compressdev/rte_compressdev.h | 26 --
lib/compressdev/rte_compressdev_pmd.h | 6 --
lib/compressdev/version.map | 2 +-
5 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1534a414f754..a1d4d57107a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -459,7 +459,7 @@ F: lib/security/
F: doc/guides/prog_guide/rte_security.rst
F: app/test/test_security*
-Compression API - EXPERIMENTAL
+Compression API
M: Fan Zhang
M: Ashish Gupta
T: git://dpdk.org/next/dpdk-next-crypto
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index bf896d07223c..232564cf5e9a 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -499,7 +499,6 @@ struct rte_comp_op {
* - On success pointer to mempool
* - On failure NULL
*/
-__rte_experimental
struct rte_mempool *
rte_comp_op_pool_create(const char *name,
unsigned int nb_elts, unsigned int cache_size,
@@ -515,7 +514,6 @@ rte_comp_op_pool_create(const char *name,
* - On success returns a valid rte_comp_op structure
* - On failure returns NULL
*/
-__rte_experimental
struct rte_comp_op *
rte_comp_op_alloc(struct rte_mempool *mempool);
@@ -532,7 +530,6 @@ rte_comp_op_alloc(struct rte_mempool *mempool);
* - nb_ops: Success, the nb_ops requested was allocated
* - 0: Not enough entries in the mempool; no ops are retrieved.
*/
-__rte_experimental
int
rte_comp_op_bulk_alloc(struct rte_mempool *mempool,
struct rte_comp_op **ops, uint16_t nb_ops);
@@ -546,7 +543,6 @@ rte_comp_op_bulk_alloc(struct rte_mempool *mempool,
* Compress operation pointer allocated from rte_comp_op_alloc()
* If op is NULL, no operation is performed.
*/
-__rte_experimental
void
rte_comp_op_free(struct rte_comp_op *op);
@@ -561,7 +557,6 @@ rte_comp_op_free(struct rte_comp_op *op);
* @param nb_ops
* Number of operations to free
*/
-__rte_experimental
void
rte_comp_op_bulk_free(struct rte_comp_op **ops, uint16_t nb_ops);
@@ -574,7 +569,6 @@ rte_comp_op_bulk_free(struct rte_comp_op **ops, uint16_t
nb_ops);
* @return
* The name of this flag, or NULL if it's not a valid feature flag.
*/
-__rte_experimental
const char *
rte_comp_get_feature_name(uint64_t flag);
diff --git a/lib/compressdev/rte_compressdev.h
b/lib/compressdev/rte_compressdev.h
index 13a418631893..8cb5db0e3f7d 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -10,10 +10,6 @@
*
* RTE Compression Device APIs.
*
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
- *
* Defines comp device APIs for the provisioning of compression operations.
*/
@@ -54,7 +50,6 @@ struct rte_compressdev_capabilities {
#define RTE_COMP_END_OF_CAPABILITIES_LIST() \
{ RTE_COMP_ALGO_UNSPECIFIED }
-__rte_experimental
const struct rte_compressdev_capabilities *
rte_compressdev_capability_get(uint8_t dev_id,
enum rte_comp_algorithm algo);
@@ -94,7 +89,6 @@ rte_compressdev_capability_get(uint8_t dev_id,
* @return
* The name of this flag, or NULL if it's not a valid feature flag.
*/
-__rte_experimental
const char *
rte_compressdev_get_feature_name(uint64_t flag);
@@ -133,7 +127,6 @@ struct rte_compressdev_stats {
* - Returns compress device identifier on success.
* - Return -1 on failure to find named compress device.
*/
-__rte_experimental
int
rte_compressdev_get_dev_id(const char *name);
@@ -146,7 +139,6 @@ rte_compressdev_get_dev_id(const char *name);
* - Returns compress device name.
* - Returns NULL if compress device is not present.
*/
-__rte_experimental
const char *
rte_compressdev_name_get(uint8_t dev_id);
@@ -157,7 +149,6 @@ rte_compressdev_name_get(uint8_t dev_id);
* @return
* - The total number of usable compress devices.
*/
-__rte_experimental
uint8_t
rte_compressdev_count(void);
@@ -175,7 +166,6 @@ rte_compressdev_count(void);
* @return
* Returns number of attached compress devices.
*/
-__rte_experimental
uint8_t
rte_compressdev_devices_get(const char *driver_name, uint8_t *devices,
uint8_t nb_devices);
@@ -190,7 +180,6 @@ rte_compressdev_devices_get(const char *driver_name,
uint8_t *devices,
* a default of zero if the socket could not be determined.
* -1 if returned is the dev_id value is out of range.
*/
-__rte_experimental
int
rte_compressdev_socket_id(uint8_t dev_id);
@@ -221,7 +210,6 @@ struct rte_compressdev_config {
* - 0: Success, device configured.
* - <0: Error code returned by the driver configuration function.
*/
-__rte_experimental
in
[PATCH v3 26/29] regexdev: remove experimental tag
This library was added in 22.11.
Time to make it not experimental.
Signed-off-by: Stephen Hemminger
---
lib/regexdev/rte_regexdev.h | 92 -
lib/regexdev/version.map| 2 +-
2 files changed, 1 insertion(+), 93 deletions(-)
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index d50af775b551..3ea1f0c061a0 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -226,9 +226,6 @@ extern int rte_regexdev_logtype;
} while (0)
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Check if dev_id is ready.
*
* @param dev_id
@@ -238,27 +235,19 @@ extern int rte_regexdev_logtype;
* - 0 if device state is not in ready state.
* - 1 if device state is ready state.
*/
-__rte_experimental
int rte_regexdev_is_valid_dev(uint16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the total number of RegEx devices that have been successfully
* initialised.
*
* @return
* The total number of usable RegEx devices.
*/
-__rte_experimental
uint8_t
rte_regexdev_count(void);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the device identifier for the named RegEx device.
*
* @param name
@@ -268,7 +257,6 @@ rte_regexdev_count(void);
* Returns RegEx device identifier on success.
* - <0: Failure to find named RegEx device.
*/
-__rte_experimental
int
rte_regexdev_get_dev_id(const char *name);
@@ -628,9 +616,6 @@ struct rte_regexdev_info {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Retrieve the contextual information of a RegEx device.
*
* @param dev_id
@@ -644,7 +629,6 @@ struct rte_regexdev_info {
* - 0: Success, driver updates the contextual information of the RegEx
device
* - <0: Error code returned by the driver info get function.
*/
-__rte_experimental
int
rte_regexdev_info_get(uint8_t dev_id, struct rte_regexdev_info *dev_info);
@@ -723,9 +707,6 @@ struct rte_regexdev_config {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Configure a RegEx device.
*
* This function must be invoked first before any other function in the
@@ -743,7 +724,6 @@ struct rte_regexdev_config {
* @return
* - 0: Success, device configured. Otherwise negative errno is returned.
*/
-__rte_experimental
int
rte_regexdev_configure(uint8_t dev_id, const struct rte_regexdev_config *cfg);
@@ -782,9 +762,6 @@ struct rte_regexdev_qp_conf {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Allocate and set up a RegEx queue pair for a RegEx device.
*
* @param dev_id
@@ -799,15 +776,11 @@ struct rte_regexdev_qp_conf {
* @return
* 0 on success. Otherwise negative errno is returned.
*/
-__rte_experimental
int
rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
const struct rte_regexdev_qp_conf *qp_conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Start a RegEx device.
*
* The device start step is the last one and consists of setting the RegEx
@@ -822,14 +795,10 @@ rte_regexdev_queue_pair_setup(uint8_t dev_id, uint16_t
queue_pair_id,
* @return
* 0 on success. Otherwise negative errno is returned.
*/
-__rte_experimental
int
rte_regexdev_start(uint8_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Stop a RegEx device.
*
* Stop a RegEx device. The device can be restarted with a call to
@@ -845,14 +814,10 @@ rte_regexdev_start(uint8_t dev_id);
* @return
* 0 on success. Otherwise negative errno is returned.
*/
-__rte_experimental
int
rte_regexdev_stop(uint8_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Close a RegEx device. The device cannot be restarted!
*
* @param dev_id
@@ -861,7 +826,6 @@ rte_regexdev_stop(uint8_t dev_id);
* @return
* 0 on success. Otherwise negative errno is returned.
*/
-__rte_experimental
int
rte_regexdev_close(uint8_t dev_id);
@@ -897,9 +861,6 @@ enum rte_regexdev_attr_id {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get an attribute from a RegEx device.
*
* @param dev_id
@@ -915,15 +876,11 @@ enum rte_regexdev_attr_id {
* - -EINVAL: Invalid device or *attr_id* provided, or *attr_value* is NULL.
* - -ENOTSUP: if the device doesn't support specific *attr_id*.
*/
-__rte_experimental
int
rte_regexdev_attr_get(uint8_t dev_id, enum rte_regexdev_attr_id attr_id,
void *attr_value);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Set an attribute to a RegEx device.
*
* @param dev_id
@@ -939,7 +896,6 @@ rte_regexdev_attr_get(ui
[PATCH v3 27/29] node: remove some of the experimental tags
The node library has been around long enough that experimental
tag should be removed. The IPv6 support was added in 23.03
but that is still enough time that it can be marked stable.
The logtype variable should have been marked internal
since it is not intended to be used outside of library.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS | 2 +-
lib/node/rte_node_eth_api.h | 1 -
lib/node/rte_node_ip4_api.h | 2 --
lib/node/version.map| 16
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index a1d4d57107a3..fff979cb939d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1735,7 +1735,7 @@ F: app/test/test_graph*
F: examples/l3fwd-graph/
F: doc/guides/sample_app_ug/l3_forward_graph.rst
-Nodes - EXPERIMENTAL
+Nodes
M: Nithin Dabilpuram
M: Pavan Nikhilesh
F: lib/node/
diff --git a/lib/node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
index 40b2021f01f9..eaae50772dbe 100644
--- a/lib/node/rte_node_eth_api.h
+++ b/lib/node/rte_node_eth_api.h
@@ -55,7 +55,6 @@ struct rte_node_ethdev_config {
* @return
* 0 on successful initialization, negative otherwise.
*/
-__rte_experimental
int rte_node_eth_config(struct rte_node_ethdev_config *cfg,
uint16_t cnt, uint16_t nb_graphs);
#ifdef __cplusplus
diff --git a/lib/node/rte_node_ip4_api.h b/lib/node/rte_node_ip4_api.h
index a84dbb3b5499..24f8ec843a27 100644
--- a/lib/node/rte_node_ip4_api.h
+++ b/lib/node/rte_node_ip4_api.h
@@ -82,7 +82,6 @@ struct rte_node_ip4_reassembly_cfg {
* @return
* 0 on success, negative otherwise.
*/
-__rte_experimental
int rte_node_ip4_route_add(uint32_t ip, uint8_t depth, uint16_t next_hop,
enum rte_node_ip4_lookup_next next_node);
@@ -101,7 +100,6 @@ int rte_node_ip4_route_add(uint32_t ip, uint8_t depth,
uint16_t next_hop,
* @return
* 0 on success, negative otherwise.
*/
-__rte_experimental
int rte_node_ip4_rewrite_add(uint16_t next_hop, uint8_t *rewrite_data,
uint8_t rewrite_len, uint16_t dst_port);
diff --git a/lib/node/version.map b/lib/node/version.map
index 3855569228e3..59c72ca76fd3 100644
--- a/lib/node/version.map
+++ b/lib/node/version.map
@@ -1,11 +1,15 @@
-EXPERIMENTAL {
+DPDK_24 {
global:
- # added in 20.05
rte_node_eth_config;
rte_node_ip4_route_add;
rte_node_ip4_rewrite_add;
- rte_node_logtype;
+
+ local: *;
+};
+
+EXPERIMENTAL {
+ global:
# added in 23.07
rte_node_ip6_rewrite_add;
@@ -15,6 +19,10 @@ EXPERIMENTAL {
rte_node_ip4_reassembly_configure;
rte_node_udp4_dst_port_add;
rte_node_udp4_usr_node_add;
+};
- local: *;
+INTERNAL {
+ global:
+
+ rte_node_logtype;
};
--
2.39.2
[PATCH v3 28/29] table: remove experimental from API
Though this library is marked for deprecation in future.
This patch follows the guideline in deprecation notice which
states the experimental API's will become stable.
Signed-off-by: Stephen Hemminger
---
doc/guides/rel_notes/deprecation.rst | 2 --
lib/table/rte_swx_table_learner.h| 10 --
lib/table/rte_swx_table_selector.h | 6 --
lib/table/rte_table_hash_func.h | 9 -
lib/table/version.map| 18 ++
5 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 81b93515cbd9..2526040e44f9 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -139,8 +139,6 @@ Deprecation Notices
* table: The table library legacy API (functions rte_table_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
- Before this, the new table library API (functions rte_swx_table_*)
- will gradually transition from experimental to stable status.
* port: The port library legacy API (functions rte_port_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
diff --git a/lib/table/rte_swx_table_learner.h
b/lib/table/rte_swx_table_learner.h
index c5ea015b8dcf..66be5fd7d032 100644
--- a/lib/table/rte_swx_table_learner.h
+++ b/lib/table/rte_swx_table_learner.h
@@ -107,7 +107,6 @@ struct rte_swx_table_learner_params {
* @return
* Table memory footprint in bytes.
*/
-__rte_experimental
uint64_t
rte_swx_table_learner_footprint_get(struct rte_swx_table_learner_params
*params);
@@ -121,7 +120,6 @@ rte_swx_table_learner_footprint_get(struct
rte_swx_table_learner_params *params)
* @return
* Table mailbox footprint in bytes.
*/
-__rte_experimental
uint64_t
rte_swx_table_learner_mailbox_size_get(void);
@@ -135,7 +133,6 @@ rte_swx_table_learner_mailbox_size_get(void);
* @return
* Table handle, on success, or NULL, on error.
*/
-__rte_experimental
void *
rte_swx_table_learner_create(struct rte_swx_table_learner_params *params, int
numa_node);
@@ -152,7 +149,6 @@ rte_swx_table_learner_create(struct
rte_swx_table_learner_params *params, int nu
* 0 on success or the following error codes otherwise:
* -EINVAL: Invalid argument(s).
*/
-__rte_experimental
int
rte_swx_table_learner_timeout_update(void *table,
uint32_t key_timeout_id,
@@ -206,7 +202,6 @@ rte_swx_table_learner_timeout_update(void *table,
* 0 when the table lookup operation is not yet completed, and 1 when the
table lookup operation
* is completed. No other return values are allowed.
*/
-__rte_experimental
int
rte_swx_table_learner_lookup(void *table,
void *mailbox,
@@ -239,7 +234,6 @@ rte_swx_table_learner_lookup(void *table,
* @return
* 0 on success, 1 or error (table full).
*/
-__rte_experimental
uint32_t
rte_swx_table_learner_add(void *table,
void *mailbox,
@@ -261,7 +255,6 @@ rte_swx_table_learner_add(void *table,
* @param[in] time
* Current time measured in CPU clock cycles.
*/
-__rte_experimental
void
rte_swx_table_learner_rearm(void *table,
void *mailbox,
@@ -282,7 +275,6 @@ rte_swx_table_learner_rearm(void *table,
* @param[in] key_timeout_id
* Key timeout ID.
*/
-__rte_experimental
void
rte_swx_table_learner_rearm_new(void *table,
void *mailbox,
@@ -301,7 +293,6 @@ rte_swx_table_learner_rearm_new(void *table,
* @param[in] mailbox
* Mailbox for the current operation.
*/
-__rte_experimental
void
rte_swx_table_learner_delete(void *table,
void *mailbox);
@@ -312,7 +303,6 @@ rte_swx_table_learner_delete(void *table,
* @param[in] table
* Table handle.
*/
-__rte_experimental
void
rte_swx_table_learner_free(void *table);
diff --git a/lib/table/rte_swx_table_selector.h
b/lib/table/rte_swx_table_selector.h
index 05863cc90b0a..1f9b93640b1f 100644
--- a/lib/table/rte_swx_table_selector.h
+++ b/lib/table/rte_swx_table_selector.h
@@ -83,7 +83,6 @@ struct rte_swx_table_selector_group {
* @return
* Selector table memory footprint in bytes.
*/
-__rte_experimental
uint64_t
rte_swx_table_selector_footprint_get(uint32_t n_groups_max, uint32_t
n_members_per_group_max);
@@ -97,7 +96,6 @@ rte_swx_table_selector_footprint_get(uint32_t n_groups_max,
uint32_t n_members_p
* @return
* Selector table mailbox footprint in bytes.
*/
-__rte_experimental
uint64_t
rte_swx_table_selector_mailbox_size_get(void);
@@ -115,7 +113,6 @@ rte_swx_table_selector_mailbox_size_get(void);
* @return
* Table handle, on success, or NULL, on error.
*/
-__rte_experimental
void *
rte_swx_table_selector_create(struct rte_swx_table_selector_params *params,
struct rte_swx_table_selector_group **groups,
@@ -135,7 +132,6 @@ rte_swx_table_selector_
[PATCH v3 29/29] port: make API's stable
Follow the guidelines already in deprecation.rst and
make the API's stable, even though they are marked as deprecated.
Note: this library never properly marked its experimental API's.
The API's were in the EXPERIMENTAL section but the macro
__rte_experimental was missing.
Signed-off-by: Stephen Hemminger
---
doc/guides/rel_notes/deprecation.rst | 4 -
lib/pipeline/rte_port_in_action.h| 8 --
lib/pipeline/rte_swx_ctl.h | 57 ---
lib/pipeline/rte_swx_pipeline.h | 29 --
lib/pipeline/rte_table_action.h | 16 ---
lib/pipeline/version.map | 140 ---
lib/port/version.map | 24 ++---
7 files changed, 69 insertions(+), 209 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 2526040e44f9..601a9044e3d8 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -134,13 +134,9 @@ Deprecation Notices
* pipeline: The pipeline library legacy API (functions rte_pipeline_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
- Before this, the new pipeline library API (functions rte_swx_pipeline_*)
- will gradually transition from experimental to stable status.
* table: The table library legacy API (functions rte_table_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
* port: The port library legacy API (functions rte_port_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
- Before this, the new port library API (functions rte_swx_port_*)
- will gradually transition from experimental to stable status.
diff --git a/lib/pipeline/rte_port_in_action.h
b/lib/pipeline/rte_port_in_action.h
index ec2994599f61..884c45bbd683 100644
--- a/lib/pipeline/rte_port_in_action.h
+++ b/lib/pipeline/rte_port_in_action.h
@@ -172,7 +172,6 @@ struct rte_port_in_action_profile;
* @return
* Input port action profile handle on success, NULL otherwise.
*/
-__rte_experimental
struct rte_port_in_action_profile *
rte_port_in_action_profile_create(uint32_t socket_id);
@@ -185,7 +184,6 @@ rte_port_in_action_profile_create(uint32_t socket_id);
* @return
* Always zero.
*/
-__rte_experimental
int
rte_port_in_action_profile_free(struct rte_port_in_action_profile *profile);
@@ -204,7 +202,6 @@ rte_port_in_action_profile_free(struct
rte_port_in_action_profile *profile);
* @return
* Zero on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_port_in_action_profile_action_register(
struct rte_port_in_action_profile *profile,
@@ -227,7 +224,6 @@ rte_port_in_action_profile_action_register(
*
* @see rte_port_in_action_create()
*/
-__rte_experimental
int
rte_port_in_action_profile_freeze(struct rte_port_in_action_profile *profile);
@@ -250,7 +246,6 @@ struct rte_port_in_action;
* @return
* Handle to input port action object on success, NULL on error.
*/
-__rte_experimental
struct rte_port_in_action *
rte_port_in_action_create(struct rte_port_in_action_profile *profile,
uint32_t socket_id);
@@ -264,7 +259,6 @@ rte_port_in_action_create(struct rte_port_in_action_profile
*profile,
* @return
* Always zero.
*/
-__rte_experimental
int
rte_port_in_action_free(struct rte_port_in_action *action);
@@ -278,7 +272,6 @@ rte_port_in_action_free(struct rte_port_in_action *action);
* @return
* Zero on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_port_in_action_params_get(struct rte_port_in_action *action,
struct rte_pipeline_port_in_params *params);
@@ -298,7 +291,6 @@ rte_port_in_action_params_get(struct rte_port_in_action
*action,
* @return
* Zero on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_port_in_action_apply(struct rte_port_in_action *action,
enum rte_port_in_action_type type,
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 6ef2551ab534..28b68d48e753 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -83,7 +83,6 @@ struct rte_swx_ctl_pipeline_info {
* 0 on success or the following error codes otherwise:
* -EINVAL: Invalid argument.
*/
-__rte_experimental
int
rte_swx_ctl_pipeline_info_get(struct rte_swx_pipeline *p,
struct rte_swx_ctl_pipeline_info *pipeline);
@@ -99,7 +98,6 @@ rte_swx_ctl_pipeline_info_get(struct rte_swx_pipeline *p,
* 0 on success or the following error codes otherwise:
* -EINVAL: Invalid argument.
*/
-__rte_experimental
int
rte_swx_ctl_pipeline_numa_node_get(struct rte_swx_pipeline *p,
int *numa_node);
@@ -121,7 +119,6 @@ rte_swx_ctl_pipeline_numa_node_get(struct rte_swx_pipeline
*p,
* 0 on success or the following error codes otherwise:
* -EINVAL: Invalid argument.
*/
-__rte_experimental
int
rte_swx_ctl_pipeline_port_in_stats_read(struct rte_swx_p
[PATCH v2] net/ice: fix L1 check interval to account for longer link times
For edge cases where the transceiver is physically inserted first and
immediately afterwards the DPDK PF is started the LSC event may occur
outside the current setting for the maximum check interval window. This
change lengthens the check interval to account for this along with other
reported cases where the link event may be longer than 1 second.
Signed-off-by: Timothy Miskell
Tested-by: Jonathan Tsai
---
.mailmap | 2 ++
drivers/net/ice/ice_ethdev.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 3f5bab26a8..93c09a23ee 100644
--- a/.mailmap
+++ b/.mailmap
@@ -674,6 +674,7 @@ John Romein
John W. Linville
Jonas Pfefferle
Jonathan Erb
+Jonathan Tsai
Jon DeVree
Jon Loeliger
Joongi Kim
@@ -1414,6 +1415,7 @@ Tianli Lai
Tianyu Li
Timmons C. Player
Timothy McDaniel
+Timothy Miskell
Timothy Redaelli
Tim Shearer
Ting Xu
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 305077e74e..6ef06b9926 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3992,8 +3992,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,
static int
ice_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
-#define CHECK_INTERVAL 100 /* 100ms */
-#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
+#define CHECK_INTERVAL 50 /* 50ms */
+#define MAX_REPEAT_TIME 40 /* 2s (40 * 50ms) in total */
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ice_link_status link_status;
struct rte_eth_link link, old;
--
2.25.1
[PATCH v11 00/12] add CLI based graph application
From: Sunil Kumar Kori In the continuation of following feedback https://patches.dpdk.org/project/dpdk/patch/20230425131516.3308612-5-vattun...@marvell.com/ this patch series adds dpdk-graph application to exercise various usecases using graph. 1. Each use case is defined in terms of .cli file which will contain set of commands to configure the system and to create a graph for that use case. 2. Each module like ethdev, mempool, route etc exposes its set of commands to do global and node specific configuration. 3. Command parsing is backed by command line library. Rakesh Kudurumalla (5): app/graph: support mempool command line interfaces app/graph: support IPv6 lookup command line interfaces app/graph: support ethdev Rx command line interfaces app/graph: support graph command line interfaces app/graph: support l3fwd use case Sunil Kumar Kori (7): app/graph: support application CLI framework app/graph: support telnet connectivity framework app/graph: support parser utility APIs app/graph: support ethdev command line interfaces app/graph: support IPv4 lookup command line interfaces app/graph: support neigh command line interfaces app/graph: support CLI option to enable graph stats MAINTAINERS | 7 + app/graph/cli.c | 138 +++ app/graph/cli.h | 32 + app/graph/conn.c | 284 ++ app/graph/conn.h | 46 + app/graph/ethdev.c | 890 +++ app/graph/ethdev.h | 40 + app/graph/ethdev_priv.h | 112 +++ app/graph/ethdev_rx.c| 165 app/graph/ethdev_rx.h| 37 + app/graph/ethdev_rx_priv.h | 39 + app/graph/examples/l3fwd.cli | 73 ++ app/graph/examples/l3fwd_pcap.cli| 71 ++ app/graph/graph.c| 550 app/graph/graph.h| 21 + app/graph/graph_priv.h | 70 ++ app/graph/ip4_route.c| 224 + app/graph/ip6_route.c| 229 + app/graph/l3fwd.c| 136 +++ app/graph/l3fwd.h| 11 + app/graph/main.c | 237 + app/graph/mempool.c | 140 +++ app/graph/mempool.h | 24 + app/graph/mempool_priv.h | 34 + app/graph/meson.build| 25 + app/graph/module_api.h | 31 + app/graph/neigh.c| 364 app/graph/neigh.h| 17 + app/graph/neigh_priv.h | 49 + app/graph/route.h| 40 + app/graph/route_priv.h | 44 + app/graph/utils.c| 156 app/graph/utils.h| 14 + app/meson.build | 1 + doc/guides/rel_notes/release_23_11.rst | 7 + doc/guides/tools/graph.rst | 314 +++ doc/guides/tools/img/graph-usecase-l3fwd.svg | 210 + doc/guides/tools/index.rst | 1 + 38 files changed, 4883 insertions(+) create mode 100644 app/graph/cli.c create mode 100644 app/graph/cli.h create mode 100644 app/graph/conn.c create mode 100644 app/graph/conn.h create mode 100644 app/graph/ethdev.c create mode 100644 app/graph/ethdev.h create mode 100644 app/graph/ethdev_priv.h create mode 100644 app/graph/ethdev_rx.c create mode 100644 app/graph/ethdev_rx.h create mode 100644 app/graph/ethdev_rx_priv.h create mode 100644 app/graph/examples/l3fwd.cli create mode 100644 app/graph/examples/l3fwd_pcap.cli create mode 100644 app/graph/graph.c create mode 100644 app/graph/graph.h create mode 100644 app/graph/graph_priv.h create mode 100644 app/graph/ip4_route.c create mode 100644 app/graph/ip6_route.c create mode 100644 app/graph/l3fwd.c create mode 100644 app/graph/l3fwd.h create mode 100644 app/graph/main.c create mode 100644 app/graph/mempool.c create mode 100644 app/graph/mempool.h create mode 100644 app/graph/mempool_priv.h create mode 100644 app/graph/meson.build create mode 100644 app/graph/module_api.h create mode 100644 app/graph/neigh.c create mode 100644 app/graph/neigh.h create mode 100644 app/graph/neigh_priv.h create mode 100644 app/graph/route.h create mode 100644 app/graph/route_priv.h create mode 100644 app/graph/utils.c create mode 100644 app/graph/utils.h create mode 100644 doc/guides/tools/graph.rst create mode 100644 doc/guides/tools/img/graph-usecase-l3fwd.svg -- 2.25.1
[PATCH v11 01/12] app/graph: support application CLI framework
From: Sunil Kumar Kori
Adds base framework to read a given .cli file as a command line
parameter "-s".
Example:
# ./dpdk-graph -c 0xff -- -s ./app/graph/examples/dummy.cli
Each .cli file will contain commands to configure different module like
mempool, ethdev, lookup tables, graph etc. Command parsing is backed by
commandline library.
Each module needs to expose its supported commands & corresponding
callback functions to commandline library to get them parsed.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
v10..v11
- Add information to kill telnet session in user guide.
- Merge l3fwd related information in a single section in user guide.
- Fix spellings.
v9..v10
- Add l3fwd_pcap.cli for pcap devices.
- Update table generation mechanism user guide document
v8..v9:
- Replace strcpy() to rte_strscpy()
- Update release note.
- Update user guide
v7..v8:
- Fix klocwork issues.
v6..v7:
- Fix FreeBSD build error.
- Make route and neigh runtime configuration too.
v5..v6:
- Fix build errors.
- Fix checkpatch errors.
- Fix individual patch build errors.
v4..v5:
- Fix application exit issue.
- Enable graph packet capture feature.
- Fix graph coremask synchronization with eal coremask.
- Update user guide.
https://patches.dpdk.org/project/dpdk/patch/20230919160455.1678716-1-sk...@marvell.com/
v3..v4:
- Use commandline library to parse command tokens.
- Split to multiple smaller patches.
- Make neigh and route as dynamic database.
- add ethdev and graph stats command via telnet.
- Update user guide.
https://patches.dpdk.org/project/dpdk/patch/20230908104907.4060511-1-sk...@marvell.com/
MAINTAINERS| 7 ++
app/graph/cli.c| 115 ++
app/graph/cli.h| 32 +++
app/graph/main.c | 128 +
app/graph/meson.build | 15 +++
app/graph/module_api.h | 16
app/meson.build| 1 +
doc/guides/rel_notes/release_23_11.rst | 7 ++
doc/guides/tools/graph.rst | 75 +++
doc/guides/tools/index.rst | 1 +
10 files changed, 397 insertions(+)
create mode 100644 app/graph/cli.c
create mode 100644 app/graph/cli.h
create mode 100644 app/graph/main.c
create mode 100644 app/graph/meson.build
create mode 100644 app/graph/module_api.h
create mode 100644 doc/guides/tools/graph.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index 4083658697..88a71d5455 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1818,6 +1818,13 @@ F: dts/
F: devtools/dts-check-format.sh
F: doc/guides/tools/dts.rst
+Graph application
+M: Sunil Kumar Kori
+M: Rakesh Kudurumalla
+F: app/graph/
+F: doc/guides/tools/graph.rst
+F: doc/guides/tools/img/graph-usecase-l3fwd.svg
+
Other Example Applications
--
diff --git a/app/graph/cli.c b/app/graph/cli.c
new file mode 100644
index 00..df4f8fcbb8
--- /dev/null
+++ b/app/graph/cli.c
@@ -0,0 +1,115 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "module_api.h"
+
+#define CMD_MAX_TOKENS 256
+#define MAX_LINE_SIZE 2048
+
+cmdline_parse_ctx_t modules_ctx[] = {
+ NULL,
+};
+
+static struct cmdline *cl;
+
+static int
+is_comment(char *in)
+{
+ if ((strlen(in) && index("!#%;", in[0])) ||
+ (strncmp(in, "//", 2) == 0) ||
+ (strncmp(in, "--", 2) == 0))
+ return 1;
+
+ return 0;
+}
+
+void
+cli_init(void)
+{
+ cl = cmdline_stdin_new(modules_ctx, "");
+}
+
+void
+cli_exit(void)
+{
+ cmdline_stdin_exit(cl);
+}
+
+void
+cli_process(char *in, char *out, size_t out_size, __rte_unused void *obj)
+{
+ int rc;
+
+ if (is_comment(in))
+ return;
+
+ rc = cmdline_parse(cl, in);
+ if (rc == CMDLINE_PARSE_AMBIGUOUS)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Ambiguous command");
+ else if (rc == CMDLINE_PARSE_NOMATCH)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Command mismatch");
+ else if (rc == CMDLINE_PARSE_BAD_ARGS)
+ snprintf(out, out_size, MSG_CMD_FAIL, "Bad arguments");
+
+ return;
+
+}
+
+int
+cli_script_process(const char *file_name, size_t msg_in_len_max, size_t
msg_out_len_max, void *obj)
+{
+ char *msg_in = NULL, *msg_out = NULL;
+ int rc = -EINVAL;
+ FILE *f = NULL;
+
+ /* Check input arguments */
+ if ((file_name == NULL) || (strlen(file_name) == 0) || (msg_in_len_max
== 0) ||
+ (msg_out_len_max == 0))
+ return rc;
+
+ msg_in = malloc(msg_in_len_max + 1);
+ msg_out = malloc(msg_out_len_max + 1);
+ if ((msg_in == NULL) || (msg_out == NULL)) {
+ rc = -ENOMEM;
+ goto exit;
+ }
[PATCH v11 02/12] app/graph: support telnet connectivity framework
From: Sunil Kumar Kori
Adds framework to initiate a telnet session with application.
Some configurations and debug commands are exposed as runtime APIs.
Those commands can be invoked using telnet session.
Application initiates a telnet server with host address 0.0.0.0
and port number 8086 by default.
To make it configurable, "-h" and "-p" options are provided.
Using them user can pass host address and port number on which
application will start telnet server.
Using same host address and port number, telnet client can connect
to application.
Syntax to connect with application:
# telnet
Once session is connected, "graph> " prompt will be available.
Example:
# telnet 10.28.35.207 5
Trying 10.28.35.207...
Connected to 10.28.35.207.
Escape character is '^]'.
Welcome!
graph>
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/conn.c | 284 +
app/graph/conn.h | 46 ++
app/graph/main.c | 103 +-
app/graph/meson.build | 1 +
app/graph/module_api.h | 3 +
doc/guides/tools/graph.rst | 38 +
6 files changed, 470 insertions(+), 5 deletions(-)
create mode 100644 app/graph/conn.c
create mode 100644 app/graph/conn.h
diff --git a/app/graph/conn.c b/app/graph/conn.c
new file mode 100644
index 00..44934602c7
--- /dev/null
+++ b/app/graph/conn.c
@@ -0,0 +1,284 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+
+#define MSG_CMD_TOO_LONG "Command too long."
+
+static int
+data_event_handle(struct conn *conn, int fd_client)
+{
+ ssize_t len, i, rc = 0;
+
+ /* Read input message */
+ len = read(fd_client, conn->buf, conn->buf_size);
+ if (len == -1) {
+ if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+ return 0;
+
+ return -1;
+ }
+
+ if (len == 0)
+ return rc;
+
+ /* Handle input messages */
+ for (i = 0; i < len; i++) {
+ if (conn->buf[i] == '\n') {
+ size_t n;
+
+ conn->msg_in[conn->msg_in_len] = 0;
+ conn->msg_out[0] = 0;
+
+ conn->msg_handle(conn->msg_in, conn->msg_out,
conn->msg_out_len_max,
+conn->msg_handle_arg);
+
+ n = strlen(conn->msg_out);
+ if (n) {
+ rc = write(fd_client, conn->msg_out, n);
+ if (rc == -1)
+ goto exit;
+ }
+
+ conn->msg_in_len = 0;
+ } else if (conn->msg_in_len < conn->msg_in_len_max) {
+ conn->msg_in[conn->msg_in_len] = conn->buf[i];
+ conn->msg_in_len++;
+ } else {
+ rc = write(fd_client, MSG_CMD_TOO_LONG,
strlen(MSG_CMD_TOO_LONG));
+ if (rc == -1)
+ goto exit;
+
+ conn->msg_in_len = 0;
+ }
+ }
+
+ /* Write prompt */
+ rc = write(fd_client, conn->prompt, strlen(conn->prompt));
+ rc = (rc == -1) ? -1 : 0;
+
+exit:
+ return rc;
+}
+
+static int
+control_event_handle(struct conn *conn, int fd_client)
+{
+ int rc;
+
+ rc = epoll_ctl(conn->fd_client_group, EPOLL_CTL_DEL, fd_client, NULL);
+ if (rc == -1)
+ goto exit;
+
+ rc = close(fd_client);
+ if (rc == -1)
+ goto exit;
+
+ rc = 0;
+
+exit:
+ return rc;
+}
+
+struct conn *
+conn_init(struct conn_params *p)
+{
+ int fd_server, fd_client_group, rc;
+ struct sockaddr_in server_address;
+ struct conn *conn = NULL;
+ int reuse = 1;
+
+ memset(&server_address, 0, sizeof(server_address));
+
+ /* Check input arguments */
+ if ((p == NULL) || (p->welcome == NULL) || (p->prompt == NULL) ||
(p->addr == NULL) ||
+ (p->buf_size == 0) || (p->msg_in_len_max == 0) ||
(p->msg_out_len_max == 0) ||
+ (p->msg_handle == NULL))
+ goto exit;
+
+ rc = inet_aton(p->addr, &server_address.sin_addr);
+ if (rc == 0)
+ goto exit;
+
+ /* Memory allocation */
+ conn = calloc(1, sizeof(struct conn));
+ if (conn == NULL)
+ goto exit;
+
+ conn->welcome = calloc(1, CONN_WELCOME_LEN_MAX + 1);
+ conn->prompt = calloc(1, CONN_PROMPT_LEN_MAX + 1);
+ conn->buf = calloc(1, p->buf_size);
+ conn->msg_in = calloc(1, p->msg_in_len_max + 1);
+ conn->msg_out = calloc(1, p->msg_out_len_max + 1);
+
+
[PATCH v11 03/12] app/graph: support parser utility APIs
From: Sunil Kumar Kori
Adds some helper functions to parse IPv4, IPv6 and MAC addresses
string into respective datatype.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/utils.c | 156 +
app/graph/utils.h | 14
4 files changed, 172 insertions(+)
create mode 100644 app/graph/utils.c
create mode 100644 app/graph/utils.h
diff --git a/app/graph/meson.build b/app/graph/meson.build
index c8d2b41b69..fd71036a95 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -13,4 +13,5 @@ sources = files(
'cli.c',
'conn.c',
'main.c',
+'utils.c',
)
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index 9826303f0c..ad4fb50989 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -10,6 +10,7 @@
#include "cli.h"
#include "conn.h"
+#include "utils.h"
/*
* Externs
*/
diff --git a/app/graph/utils.c b/app/graph/utils.c
new file mode 100644
index 00..c7b6ae83cf
--- /dev/null
+++ b/app/graph/utils.c
@@ -0,0 +1,156 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+
+#define white_spaces_skip(pos) \
+({ \
+ __typeof__(pos) _p = (pos); \
+ for ( ; isspace(*_p); _p++) \
+ ; \
+ _p; \
+})
+
+static void
+hex_string_to_uint64(uint64_t *dst, const char *hexs)
+{
+ char buf[2] = {0};
+ uint8_t shift = 4;
+ int iter = 0;
+ char c;
+
+ while ((c = *hexs++)) {
+ buf[0] = c;
+ *dst |= (strtol(buf, NULL, 16) << shift);
+ shift -= 4;
+ iter++;
+ if (iter == 2) {
+ iter = 0;
+ shift = 4;
+ dst++;
+ }
+ }
+}
+
+int
+parser_uint64_read(uint64_t *value, const char *p)
+{
+ char *next;
+ uint64_t val;
+
+ p = white_spaces_skip(p);
+ if (!isdigit(*p))
+ return -EINVAL;
+
+ val = strtoul(p, &next, 0);
+ if (p == next)
+ return -EINVAL;
+
+ p = next;
+ switch (*p) {
+ case 'T':
+ val *= 1024ULL;
+ /* fall through */
+ case 'G':
+ val *= 1024ULL;
+ /* fall through */
+ case 'M':
+ val *= 1024ULL;
+ /* fall through */
+ case 'k':
+ case 'K':
+ val *= 1024ULL;
+ p++;
+ break;
+ }
+
+ p = white_spaces_skip(p);
+ if (*p != '\0')
+ return -EINVAL;
+
+ *value = val;
+ return 0;
+}
+
+int
+parser_uint32_read(uint32_t *value, const char *p)
+{
+ uint64_t val = 0;
+ int rc = parser_uint64_read(&val, p);
+
+ if (rc < 0)
+ return rc;
+
+ if (val > UINT32_MAX)
+ return -ERANGE;
+
+ *value = val;
+ return 0;
+}
+
+int
+parser_ip4_read(uint32_t *value, char *p)
+{
+ uint8_t shift = 24;
+ uint32_t ip = 0;
+ char *token;
+
+ token = strtok(p, ".");
+ while (token != NULL) {
+ ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
+ token = strtok(NULL, ".");
+ shift -= 8;
+ }
+
+ *value = ip;
+
+ return 0;
+}
+
+int
+parser_ip6_read(uint8_t *value, char *p)
+{
+ uint64_t val = 0;
+ char *token;
+
+ token = strtok(p, ":");
+ while (token != NULL) {
+ hex_string_to_uint64(&val, token);
+ *value = val;
+ token = strtok(NULL, ":");
+ value++;
+ val = 0;
+ }
+
+ return 0;
+}
+
+int
+parser_mac_read(uint64_t *value, char *p)
+{
+ uint64_t mac = 0, val = 0;
+ uint8_t shift = 40;
+ char *token;
+
+ token = strtok(p, ":");
+ while (token != NULL) {
+ hex_string_to_uint64(&val, token);
+ mac |= val << shift;
+ token = strtok(NULL, ":");
+ shift -= 8;
+ val = 0;
+ }
+
+ *value = mac;
+
+ return 0;
+}
diff --git a/app/graph/utils.h b/app/graph/utils.h
new file mode 100644
index 00..0ebb5de55a
--- /dev/null
+++ b/app/graph/utils.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#ifndef APP_GRAPH_UTILS_H
+#define APP_GRAPH_UTILS_H
+
+int parser_uint64_read(uint64_t *value, const char *p);
+int parser_uint32_read(uint32_t *value, const char *p);
+int parser_ip4_read(uint32_t *value, char *p);
+int parser_ip6_read(uint8_t *value, ch
[PATCH v11 04/12] app/graph: support mempool command line interfaces
From: Rakesh Kudurumalla
Adds mempool module which will be creating mempools.
Following commands are exposed:
- mempool size buffers \
cache numa
- help mempool
User will add this command in .cli file according to its need.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/cli.c| 2 +
app/graph/mempool.c| 140 +
app/graph/mempool.h| 24 +++
app/graph/mempool_priv.h | 34 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 2 +
doc/guides/tools/graph.rst | 7 ++
7 files changed, 210 insertions(+)
create mode 100644 app/graph/mempool.c
create mode 100644 app/graph/mempool.h
create mode 100644 app/graph/mempool_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index df4f8fcbb8..cf544d5f8f 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -20,6 +20,8 @@
#define MAX_LINE_SIZE 2048
cmdline_parse_ctx_t modules_ctx[] = {
+ (cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
+ (cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/mempool.c b/app/graph/mempool.c
new file mode 100644
index 00..9fd3f8460b
--- /dev/null
+++ b/app/graph/mempool.c
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "mempool_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_mempool_help[] = "mempool size buffers
"
+"cache numa ";
+
+struct mempools mpconfig;
+
+int
+mempool_process(struct mempool_config *config)
+{
+ struct rte_mempool *mp;
+ uint8_t nb_pools;
+
+ nb_pools = mpconfig.nb_pools;
+ rte_strscpy(mpconfig.config[nb_pools].name, config->name,
RTE_MEMPOOL_NAMESIZE);
+ mpconfig.config[nb_pools].pool_size = config->pool_size;
+ mpconfig.config[nb_pools].buffer_size = config->buffer_size;
+ mpconfig.config[nb_pools].cache_size = config->cache_size;
+ mpconfig.config[nb_pools].numa_node = config->numa_node;
+
+ mp = rte_pktmbuf_pool_create(config->name, config->pool_size,
config->cache_size,
+ 128, config->buffer_size, config->numa_node);
+ if (!mp)
+ return -EINVAL;
+
+ mpconfig.mp[nb_pools] = mp;
+ nb_pools++;
+ mpconfig.nb_pools = nb_pools;
+
+ return 0;
+}
+
+static void
+cli_mempool_help(__rte_unused void *parsed_result, __rte_unused struct cmdline
*cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"- mempool command help
-",
+cmd_mempool_help);
+
+ len = strlen(conn->msg_out);
+ conn->msg_out_len_max -= len;
+}
+
+static void
+cli_mempool(void *parsed_result, __rte_unused struct cmdline *cl, __rte_unused
void *data)
+{
+ struct mempool_config_cmd_tokens *res = parsed_result;
+ struct mempool_config config;
+ int rc = -EINVAL;
+
+
+ rte_strscpy(config.name, res->name, RTE_MEMPOOL_NAMESIZE);
+ config.name[strlen(res->name)] = '\0';
+ config.pool_size = res->nb_bufs;
+ config.buffer_size = res->buf_sz;
+ config.cache_size = res->cache_size;
+ config.numa_node = res->node;
+
+ rc = mempool_process(&config);
+ if (rc < 0)
+ printf(MSG_CMD_FAIL, "mempool");
+}
+
+cmdline_parse_token_string_t mempool_config_add_mempool =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, mempool,
"mempool");
+cmdline_parse_token_string_t mempool_config_add_name =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, name, NULL);
+cmdline_parse_token_string_t mempool_config_add_size =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, size,
"size");
+cmdline_parse_token_num_t mempool_config_add_buf_sz =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, buf_sz,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_buffers =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, buffers,
"buffers");
+cmdline_parse_token_num_t mempool_config_add_nb_bufs =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, nb_bufs,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_cache =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, cache,
"cache");
+cmdline_parse_token_num_t mempool_config_add_cache_size =
+ TOKEN_NUM_INITIALIZER(struct mempool_config_cmd_tokens, cache_size,
RTE_UINT16);
+cmdline_parse_token_string_t mempool_config_add_numa =
+ TOKEN_STRING_INITIALIZER(struct mempool_config_cmd_tokens, numa,
"numa");
+cmdline_parse_token_num_t mempool_
[PATCH v11 05/12] app/graph: support ethdev command line interfaces
From: Sunil Kumar Kori
Adds ethdev module to configure ethernet devices.
Following commands are exposed:
- ethdev rxq txq
- ethdev mtu
- ethdev promiscuous
- ethdev show
- ethdev stats
- ethdev ip4 addr add netmask
- ethdev ip6 addr add netmask
- help ethdev
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/cli.c| 8 +
app/graph/ethdev.c | 887 +
app/graph/ethdev.h | 40 ++
app/graph/ethdev_priv.h| 112 +
app/graph/main.c | 1 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
doc/guides/tools/graph.rst | 50 ++-
8 files changed, 1099 insertions(+), 1 deletion(-)
create mode 100644 app/graph/ethdev.c
create mode 100644 app/graph/ethdev.h
create mode 100644 app/graph/ethdev_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index cf544d5f8f..fa394fade6 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -22,6 +22,14 @@
cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_show_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_stats_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_mtu_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
new file mode 100644
index 00..8df55b4b12
--- /dev/null
+++ b/app/graph/ethdev.c
@@ -0,0 +1,887 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ethdev_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_ethdev_mtu_help[] = "ethdev mtu ";
+
+static const char
+cmd_ethdev_prom_mode_help[] = "ethdev promiscuous ";
+
+static const char
+cmd_ethdev_help[] = "ethdev rxq txq
";
+
+static const char
+cmd_ethdev_stats_help[] = "ethdev stats";
+
+static const char
+cmd_ethdev_show_help[] = "ethdev show";
+
+static const char
+cmd_ethdev_ip4_addr_help[] = "ethdev ip4 addr add netmask
";
+
+static const char
+cmd_ethdev_ip6_addr_help[] = "ethdev ip6 addr add netmask
";
+
+static struct rte_eth_conf port_conf_default = {
+ .link_speeds = 0,
+ .rxmode = {
+ .mq_mode = RTE_ETH_MQ_RX_NONE,
+ .mtu = 9000 - (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN), /* Jumbo
frame MTU */
+ },
+ .rx_adv_conf = {
+ .rss_conf = {
+ .rss_key = NULL,
+ .rss_key_len = 40,
+ .rss_hf = 0,
+ },
+ },
+ .txmode = {
+ .mq_mode = RTE_ETH_MQ_TX_NONE,
+ },
+ .lpbk_mode = 0,
+};
+
+uint32_t enabled_port_mask;
+static struct ethdev_head eth_node = TAILQ_HEAD_INITIALIZER(eth_node);
+
+
+static struct ethdev*
+ethdev_port_by_id(uint16_t port_id)
+{
+ struct ethdev *port;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ if (port->config.port_id == port_id)
+ return port;
+ }
+ return NULL;
+}
+
+void *
+ethdev_mempool_list_by_portid(uint16_t portid)
+{
+ struct ethdev *port;
+
+ if (portid >= RTE_MAX_ETHPORTS)
+ return NULL;
+
+ port = ethdev_port_by_id(portid);
+ if (port)
+ return &(port->config.rx.mp);
+ else
+ return NULL;
+}
+
+int16_t
+ethdev_portid_by_ip4(uint32_t ip, uint32_t mask)
+{
+ int portid = -EINVAL;
+ struct ethdev *port;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ if (mask == 0) {
+ if ((port->ip4_addr.ip & port->ip4_addr.mask) == (ip &
port->ip4_addr.mask))
+ return port->config.port_id;
+ } else {
+ if ((port->ip4_addr.ip & port->ip4_addr.mask) == (ip &
mask))
+ return port->config.port_id;
+ }
+ }
+
+ return portid;
+}
+
+int16_t
+ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask)
+{
+ int portid = -EINVAL;
+ struct ethdev *port;
+ int j;
+
+ TAILQ_FOREACH(port, ð_node, next) {
+ for (j = 0; j < ETHDEV_IPV6_ADDR_LEN; j++) {
+ if (mask == NULL) {
+ if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
+ (ip[j] & port->ip6_addr.mask[j]))
+ break;
+
+ } else {
+ if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
+
[PATCH v11 06/12] app/graph: support IPv4 lookup command line interfaces
From: Sunil Kumar Kori
Adds ipv4_lookup module to configure LPM table. This LPM table
will be used for IPv4 lookup and forwarding.
Following commands are exposed:
- ipv4_lookup route add ipv4 netmask via
- help ipv4_lookup
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev.c | 2 +-
app/graph/ip4_route.c | 221 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/route.h | 26 +
app/graph/route_priv.h | 44
doc/guides/tools/graph.rst | 9 ++
8 files changed, 305 insertions(+), 1 deletion(-)
create mode 100644 app/graph/ip4_route.c
create mode 100644 app/graph/route.h
create mode 100644 app/graph/route_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index fa394fade6..25785ea4dc 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -30,6 +30,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 8df55b4b12..4e4d23b692 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -164,7 +164,7 @@ ethdev_stop(void)
}
ethdev_list_clean();
- rte_eal_cleanup();
+ route_ip4_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/ip4_route.c b/app/graph/ip4_route.c
new file mode 100644
index 00..db3354c270
--- /dev/null
+++ b/app/graph/ip4_route.c
@@ -0,0 +1,221 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "module_api.h"
+#include "route_priv.h"
+
+static const char
+cmd_ipv4_lookup_help[] = "ipv4_lookup route add ipv4 netmask via
";
+
+struct ip4_route route4 = TAILQ_HEAD_INITIALIZER(route4);
+
+
+void
+route_ip4_list_clean(void)
+{
+ struct route_ipv4_config *route;
+
+ while (!TAILQ_EMPTY(&route4)) {
+ route = TAILQ_FIRST(&route4);
+ TAILQ_REMOVE(&route4, route, next);
+ }
+}
+
+static struct route_ipv4_config *
+find_route4_entry(struct route_ipv4_config *route)
+{
+ struct route_ipv4_config *ipv4route;
+
+ TAILQ_FOREACH(ipv4route, &route4, next) {
+ if (!memcmp(ipv4route, route, sizeof(*route)))
+ return ipv4route;
+ }
+ return NULL;
+
+}
+
+static uint8_t
+convert_netmask_to_depth(uint32_t netmask)
+{
+ uint8_t zerobits = 0;
+
+ while ((netmask & 0x1) == 0) {
+ netmask = netmask >> 1;
+ zerobits++;
+ }
+
+ return (32 - zerobits);
+}
+
+static int
+route4_rewirte_table_update(struct route_ipv4_config *ipv4route)
+{
+ uint8_t depth;
+ int portid;
+
+ portid = ethdev_portid_by_ip4(ipv4route->via, ipv4route->netmask);
+ if (portid < 0) {
+ printf("Invalid portid found to install the route\n");
+ return portid;
+ }
+
+ depth = convert_netmask_to_depth(ipv4route->netmask);
+
+ return rte_node_ip4_route_add(ipv4route->ip, depth, portid,
+ RTE_NODE_IP4_LOOKUP_NEXT_REWRITE);
+}
+
+static int
+route_ip4_add(struct route_ipv4_config *route)
+{
+ struct route_ipv4_config *ipv4route;
+ int rc = -EINVAL;
+
+ ipv4route = find_route4_entry(route);
+
+ if (!ipv4route) {
+ ipv4route = malloc(sizeof(struct route_ipv4_config));
+ if (!ipv4route)
+ return -ENOMEM;
+ } else {
+ return 0;
+ }
+
+ ipv4route->ip = route->ip;
+ ipv4route->netmask = route->netmask;
+ ipv4route->via = route->via;
+ ipv4route->is_used = true;
+
+ /* FIXME: Get graph status here and then update table */
+ rc = route4_rewirte_table_update(ipv4route);
+ if (rc)
+ goto free;
+
+ TAILQ_INSERT_TAIL(&route4, ipv4route, next);
+ return 0;
+free:
+ free(ipv4route);
+ return rc;
+}
+
+int
+route_ip4_add_to_lookup(void)
+{
+ struct route_ipv4_config *route = NULL;
+ int rc = -EINVAL;
+
+ TAILQ_FOREACH(route, &route4, next) {
+ rc = route4_rewirte_table_update(route);
+ if (rc < 0)
+ return rc;
+ }
+
+ return 0;
+}
+
+static void
+cli_ipv4_lookup_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"---
[PATCH v11 07/12] app/graph: support IPv6 lookup command line interfaces
From: Rakesh Kudurumalla
Adds ipv6_lookup module to configure LPM6 table. This LPM6 table
will be used for IPv6 lookup and forwarding.
Following commands are exposed:
- ipv6_lookup route add ipv6 netmask via
- help ipv6_lookup
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev.c | 1 +
app/graph/ip6_route.c | 226 +
app/graph/meson.build | 1 +
app/graph/route.h | 14 +++
doc/guides/tools/graph.rst | 9 ++
6 files changed, 253 insertions(+)
create mode 100644 app/graph/ip6_route.c
diff --git a/app/graph/cli.c b/app/graph/cli.c
index 25785ea4dc..1280422388 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -32,6 +32,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
+ (cmdline_parse_inst_t *)&ipv6_lookup_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 4e4d23b692..e3f9ee3e0c 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -165,6 +165,7 @@ ethdev_stop(void)
ethdev_list_clean();
route_ip4_list_clean();
+ route_ip6_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/ip6_route.c b/app/graph/ip6_route.c
new file mode 100644
index 00..e793cde830
--- /dev/null
+++ b/app/graph/ip6_route.c
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "module_api.h"
+#include "route_priv.h"
+
+static const char
+cmd_ipv6_lookup_help[] = "ipv6_lookup route add ipv6 netmask via
";
+
+struct ip6_route route6 = TAILQ_HEAD_INITIALIZER(route6);
+
+void
+route_ip6_list_clean(void)
+{
+ struct route_ipv6_config *route;
+
+ while (!TAILQ_EMPTY(&route6)) {
+ route = TAILQ_FIRST(&route6);
+ TAILQ_REMOVE(&route6, route, next);
+ }
+}
+
+static struct route_ipv6_config *
+find_route6_entry(struct route_ipv6_config *route)
+{
+ struct route_ipv6_config *ipv6route;
+
+ TAILQ_FOREACH(ipv6route, &route6, next) {
+ if (!memcmp(ipv6route, route, sizeof(*route)))
+ return ipv6route;
+ }
+ return NULL;
+}
+
+static uint8_t
+convert_ip6_netmask_to_depth(uint8_t *netmask)
+{
+ uint8_t setbits = 0;
+ uint8_t mask;
+ int i;
+
+ for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++) {
+ mask = netmask[i];
+ while (mask & 0x80) {
+ mask = mask << 1;
+ setbits++;
+ }
+ }
+
+ return setbits;
+}
+
+static int
+route6_rewirte_table_update(struct route_ipv6_config *ipv6route)
+{
+ uint8_t depth;
+ int portid;
+
+ portid = ethdev_portid_by_ip6(ipv6route->gateway, ipv6route->mask);
+ if (portid < 0) {
+ printf("Invalid portid found to install the route\n");
+ return portid;
+ }
+ depth = convert_ip6_netmask_to_depth(ipv6route->mask);
+
+ return rte_node_ip6_route_add(ipv6route->ip, depth, portid,
+ RTE_NODE_IP6_LOOKUP_NEXT_REWRITE);
+
+}
+
+static int
+route_ip6_add(struct route_ipv6_config *route)
+{
+ struct route_ipv6_config *ipv6route;
+ int rc = -EINVAL;
+ int j;
+
+ ipv6route = find_route6_entry(route);
+ if (!ipv6route) {
+ ipv6route = malloc(sizeof(struct route_ipv6_config));
+ if (!ipv6route)
+ return -ENOMEM;
+ } else {
+ return 0;
+ }
+
+ for (j = 0; j < ETHDEV_IPV6_ADDR_LEN; j++) {
+ ipv6route->ip[j] = route->ip[j];
+ ipv6route->mask[j] = route->mask[j];
+ ipv6route->gateway[j] = route->gateway[j];
+ }
+ ipv6route->is_used = true;
+
+ /* FIXME: Get graph status here and then update table */
+ rc = route6_rewirte_table_update(ipv6route);
+ if (rc)
+ goto free;
+
+ TAILQ_INSERT_TAIL(&route6, ipv6route, next);
+ return 0;
+free:
+ free(ipv6route);
+ return rc;
+}
+
+int
+route_ip6_add_to_lookup(void)
+{
+ struct route_ipv6_config *route = NULL;
+ int rc = -EINVAL;
+
+ TAILQ_FOREACH(route, &route6, next) {
+ rc = route6_rewirte_table_update(route);
+ if (rc < 0)
+ return rc;
+ }
+
+ return 0;
+}
+
+static void
+cli_ipv6_lookup_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+__rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
[PATCH v11 08/12] app/graph: support neigh command line interfaces
From: Sunil Kumar Kori
Adds neigh module to configure arp/neigh. This module uses
ipv4_rewrite and ipv6_rewrite node to write neigh information.
Following commands are exposed:
- neigh add ipv4
- neigh add ipv6
- help neigh
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 3 +
app/graph/ethdev.c | 2 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 2 +
app/graph/neigh.c | 358 +
app/graph/neigh.h | 17 ++
app/graph/neigh_priv.h | 49 +
doc/guides/tools/graph.rst | 11 ++
8 files changed, 443 insertions(+)
create mode 100644 app/graph/neigh.c
create mode 100644 app/graph/neigh.h
create mode 100644 app/graph/neigh_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index 1280422388..f564362da1 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -34,6 +34,9 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_help_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_v4_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_v6_cmd_ctx,
+ (cmdline_parse_inst_t *)&neigh_help_cmd_ctx,
NULL,
};
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index e3f9ee3e0c..c9b09168c1 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -166,6 +166,8 @@ ethdev_stop(void)
ethdev_list_clean();
route_ip4_list_clean();
route_ip6_list_clean();
+ neigh4_list_clean();
+ neigh6_list_clean();
printf("Bye...\n");
}
diff --git a/app/graph/meson.build b/app/graph/meson.build
index 413bbefc4e..8fa9d605b9 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -17,5 +17,6 @@ sources = files(
'ip6_route.c',
'main.c',
'mempool.c',
+'neigh.c',
'utils.c',
)
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index bd4d245c75..e9e42da7cc 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -12,8 +12,10 @@
#include "conn.h"
#include "ethdev.h"
#include "mempool.h"
+#include "neigh.h"
#include "route.h"
#include "utils.h"
+
/*
* Externs
*/
diff --git a/app/graph/neigh.c b/app/graph/neigh.c
new file mode 100644
index 00..0cee502719
--- /dev/null
+++ b/app/graph/neigh.c
@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "neigh_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_neigh_v4_help[] = "neigh add ipv4 ";
+
+static const char
+cmd_neigh_v6_help[] = "neigh add ipv6 ";
+
+struct neigh4_head neigh4 = TAILQ_HEAD_INITIALIZER(neigh4);
+struct neigh6_head neigh6 = TAILQ_HEAD_INITIALIZER(neigh6);
+
+void
+neigh4_list_clean(void)
+{
+ struct neigh_ipv4_config *v4_config;
+
+ while (!TAILQ_EMPTY(&neigh4)) {
+ v4_config = TAILQ_FIRST(&neigh4);
+ TAILQ_REMOVE(&neigh4, v4_config, next);
+ }
+}
+
+void
+neigh6_list_clean(void)
+{
+ struct neigh_ipv6_config *v6_config;
+
+ while (!TAILQ_EMPTY(&neigh6)) {
+ v6_config = TAILQ_FIRST(&neigh6);
+ TAILQ_REMOVE(&neigh6, v6_config, next);
+ }
+}
+
+static struct neigh_ipv4_config *
+find_neigh4_entry(uint32_t ip, uint64_t mac)
+{
+ struct neigh_ipv4_config *v4_config;
+
+ TAILQ_FOREACH(v4_config, &neigh4, next) {
+ if ((v4_config->ip == ip) && (v4_config->mac == mac))
+ return v4_config;
+ }
+ return NULL;
+}
+
+static struct neigh_ipv6_config *
+find_neigh6_entry(uint8_t *ip, uint64_t mac)
+{
+ struct neigh_ipv6_config *v6_config;
+
+ TAILQ_FOREACH(v6_config, &neigh6, next) {
+ if (!(memcmp(v6_config->ip, ip, 16)) && (v6_config->mac == mac))
+ return v6_config;
+ }
+ return NULL;
+}
+
+static int
+ip6_rewrite_node_add(struct neigh_ipv6_config *v6_config)
+{
+ uint8_t data[2 * RTE_ETHER_ADDR_LEN];
+ uint8_t len = 2 * RTE_ETHER_ADDR_LEN;
+ struct rte_ether_addr smac;
+ int16_t portid = 0;
+ int rc;
+
+ portid = ethdev_portid_by_ip6(v6_config->ip, NULL);
+ if (portid < 0) {
+ printf("Invalid portid found to add neigh\n");
+ return -EINVAL;
+ }
+
+ memset(data, 0, len);
+
+ /* Copy dst mac */
+ rte_memcpy((void *)&data[0], (void *)&v6_config->mac,
RTE_ETHER_ADDR_LEN);
+
+ /* Copy src mac */
+ rc = rte_eth_macaddr_get(portid, &smac);
+ if (rc < 0)
+ return rc;
+
+ rte_memcpy(&data[RTE_ETHER_ADDR_LEN], smac.addr_bytes,
RTE_ETHER_ADDR_LEN);
+
+ return rte_node_ip6_rewrite_add(portid, data, len, portid);
+}
+
+static int
[PATCH v11 09/12] app/graph: support ethdev Rx command line interfaces
From: Rakesh Kudurumalla
Adds ethdev_rx module to create port-queue-core mapping.
Mapping will be used to launch graph worker thread and dequeue
packets on mentioned core from desired port/queue.
Following commands are exposed:
- ethdev_rx map port queue core
- help ethdev_rx
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 2 +
app/graph/ethdev_rx.c | 165 +
app/graph/ethdev_rx.h | 37 +
app/graph/ethdev_rx_priv.h | 39 +
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
doc/guides/tools/graph.rst | 10 +++
7 files changed, 255 insertions(+)
create mode 100644 app/graph/ethdev_rx.c
create mode 100644 app/graph/ethdev_rx.h
create mode 100644 app/graph/ethdev_rx_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index f564362da1..ad7d7deadf 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -30,6 +30,8 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
+ (cmdline_parse_inst_t *)ðdev_rx_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
(cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
(cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
diff --git a/app/graph/ethdev_rx.c b/app/graph/ethdev_rx.c
new file mode 100644
index 00..f2cb8cf9a5
--- /dev/null
+++ b/app/graph/ethdev_rx.c
@@ -0,0 +1,165 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "ethdev_rx_priv.h"
+#include "module_api.h"
+
+static const char
+cmd_ethdev_rx_help[] = "ethdev_rx map port queue core
";
+
+static struct lcore_params lcore_params_array[ETHDEV_RX_LCORE_PARAMS_MAX];
+struct rte_node_ethdev_config ethdev_conf[RTE_MAX_ETHPORTS];
+struct lcore_params *lcore_params = lcore_params_array;
+struct lcore_conf lcore_conf[RTE_MAX_LCORE];
+uint16_t nb_lcore_params;
+
+static void
+rx_map_configure(uint8_t port_id, uint32_t queue, uint32_t core)
+{
+ uint8_t n_rx_queue;
+
+ n_rx_queue = lcore_conf[core].n_rx_queue;
+ lcore_conf[core].rx_queue_list[n_rx_queue].port_id = port_id;
+ lcore_conf[core].rx_queue_list[n_rx_queue].queue_id = queue;
+ lcore_conf[core].n_rx_queue++;
+}
+
+uint8_t
+ethdev_rx_num_rx_queues_get(uint16_t port)
+{
+ int queue = -1;
+ uint16_t i;
+
+ for (i = 0; i < nb_lcore_params; ++i) {
+ if (lcore_params[i].port_id == port) {
+ if (lcore_params[i].queue_id == queue + 1)
+ queue = lcore_params[i].queue_id;
+ else
+ rte_exit(EXIT_FAILURE,
+"Queue ids of the port %d must be"
+" in sequence and must start with 0\n",
+lcore_params[i].port_id);
+ }
+ }
+
+ return (uint8_t)(++queue);
+}
+
+static int
+ethdev_rx_map_add(char *name, uint32_t queue, uint32_t core)
+{
+ uint64_t coremask;
+ uint16_t port_id;
+ int rc;
+
+ if (nb_lcore_params >= ETHDEV_RX_LCORE_PARAMS_MAX)
+ return -EINVAL;
+
+ rc = rte_eth_dev_get_port_by_name(name, &port_id);
+ if (rc)
+ return -EINVAL;
+
+ coremask = 0xff; /* FIXME: Read from graph configuration */
+
+ if (!(coremask & (1 << core)))
+ return -EINVAL;
+
+ rx_map_configure(port_id, queue, core);
+
+ lcore_params_array[nb_lcore_params].port_id = port_id;
+ lcore_params_array[nb_lcore_params].queue_id = queue;
+ lcore_params_array[nb_lcore_params].lcore_id = core;
+ nb_lcore_params++;
+ return 0;
+}
+
+static void
+cli_ethdev_rx_help(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+ __rte_unused void *data)
+{
+ size_t len;
+
+ len = strlen(conn->msg_out);
+ conn->msg_out += len;
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n%s\n",
+"- ethdev_rx command help
-",
+cmd_ethdev_rx_help);
+
+ len = strlen(conn->msg_out);
+ conn->msg_out_len_max -= len;
+}
+
+static void
+cli_ethdev_rx(void *parsed_result, __rte_unused struct cmdline *cl, void *data
__rte_unused)
+{
+ struct ethdev_rx_cmd_tokens *res = parsed_result;
+ int rc = -EINVAL;
+
+ rc = ethdev_rx_map_add(res->dev, res->qid, res->core_id);
+ if (rc < 0) {
+ cli_exit();
+ printf(MSG_CMD_FAIL, res->cmd);
+ rte_exit(EXIT_FAILURE, "input core is Invalid\n");
+ }
+
+}
+
+cmdline_pars
[PATCH v11 10/12] app/graph: support graph command line interfaces
From: Rakesh Kudurumalla
Adds graph module to create a graph for a given use case like
l3fwd.
Following commands are exposed:
- graph [bsz ] [tmo ] [coremask ] \
model pcap_enable <0 | 1> num_pcap_pkts \
pcap_file
- graph start
- graph stats show
- help graph
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
---
app/graph/cli.c| 4 +
app/graph/ethdev_rx.c | 2 +-
app/graph/graph.c | 550 +
app/graph/graph.h | 21 ++
app/graph/graph_priv.h | 70 +
app/graph/ip4_route.c | 5 +-
app/graph/ip6_route.c | 5 +-
app/graph/meson.build | 1 +
app/graph/module_api.h | 1 +
app/graph/neigh.c | 10 +-
doc/guides/tools/graph.rst | 19 ++
11 files changed, 683 insertions(+), 5 deletions(-)
create mode 100644 app/graph/graph.c
create mode 100644 app/graph/graph.h
create mode 100644 app/graph/graph_priv.h
diff --git a/app/graph/cli.c b/app/graph/cli.c
index ad7d7deadf..30b12312d6 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -20,6 +20,10 @@
#define MAX_LINE_SIZE 2048
cmdline_parse_ctx_t modules_ctx[] = {
+ (cmdline_parse_inst_t *)&graph_config_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_start_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_stats_cmd_ctx,
+ (cmdline_parse_inst_t *)&graph_help_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
(cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_show_cmd_ctx,
diff --git a/app/graph/ethdev_rx.c b/app/graph/ethdev_rx.c
index f2cb8cf9a5..03f8effcca 100644
--- a/app/graph/ethdev_rx.c
+++ b/app/graph/ethdev_rx.c
@@ -69,7 +69,7 @@ ethdev_rx_map_add(char *name, uint32_t queue, uint32_t core)
if (rc)
return -EINVAL;
- coremask = 0xff; /* FIXME: Read from graph configuration */
+ coremask = graph_coremask_get();
if (!(coremask & (1 << core)))
return -EINVAL;
diff --git a/app/graph/graph.c b/app/graph/graph.c
new file mode 100644
index 00..74a99dd68e
--- /dev/null
+++ b/app/graph/graph.c
@@ -0,0 +1,550 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Marvell.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "graph_priv.h"
+#include "module_api.h"
+
+#define RTE_LOGTYPE_APP_GRAPH RTE_LOGTYPE_USER1
+
+static const char
+cmd_graph_help[] = "graph bsz tmo coremask "
+ "model pcap_enable <0 | 1>
num_pcap_pkts "
+ "pcap_file ";
+
+static const char * const supported_usecases[] = {"l3fwd"};
+struct graph_config graph_config;
+bool graph_started;
+
+/* Check the link rc of all ports in up to 9s, and print them finally */
+static void
+check_all_ports_link_status(uint32_t port_mask)
+{
+#define CHECK_INTERVAL 100 /* 100ms */
+#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
+ char link_rc_text[RTE_ETH_LINK_MAX_STR_LEN];
+ uint8_t count, all_ports_up, print_flag = 0;
+ struct rte_eth_link link;
+ uint16_t portid;
+ int rc;
+
+ printf("\nChecking link status...");
+ fflush(stdout);
+ for (count = 0; count <= MAX_CHECK_TIME; count++) {
+ if (force_quit)
+ return;
+
+ all_ports_up = 1;
+ RTE_ETH_FOREACH_DEV(portid)
+ {
+ if (force_quit)
+ return;
+
+ if ((port_mask & (1 << portid)) == 0)
+ continue;
+
+ memset(&link, 0, sizeof(link));
+ rc = rte_eth_link_get_nowait(portid, &link);
+ if (rc < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-rc));
+ continue;
+ }
+
+ /* Print link rc if flag set */
+ if (print_flag == 1) {
+ rte_eth_link_to_str(link_rc_text,
sizeof(link_rc_text),
+ &link);
+ printf("Port %d %s\n", portid, link_rc_text);
+ continue;
+ }
+
+ /* Clear all_ports_up flag if any link down */
+ if (link.link_status == RTE_ETH_LINK_DOWN) {
+ all_ports_up = 0;
+ break;
+ }
+ }
+
+ /* After finally printing all link rc, get out */
+ if (print_flag == 1)
+ break;
+
+ if (all_ports_up == 0
[PATCH v11 11/12] app/graph: support CLI option to enable graph stats
From: Sunil Kumar Kori
Adds application's command line parameter "--enable-graph-stats"
to enable dumping graph stats on console.
By default, no graph stats will be printed on console but same can
be dumped via telnet session using "graph stats show" command.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Rakesh Kudurumalla
Acked-by: Jerin Jacob
---
app/graph/main.c | 17 -
app/graph/module_api.h | 2 ++
doc/guides/tools/graph.rst | 4
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/app/graph/main.c b/app/graph/main.c
index c1cb435588..465376425c 100644
--- a/app/graph/main.c
+++ b/app/graph/main.c
@@ -21,12 +21,13 @@
volatile bool force_quit;
struct conn *conn;
-static const char usage[] = "%s EAL_ARGS -- -s SCRIPT [-h HOST] [-p PORT] "
+static const char usage[] = "%s EAL_ARGS -- -s SCRIPT [-h HOST] [-p PORT]
[--enable-graph-stats] "
"[--help]\n";
static struct app_params {
struct conn_params conn;
char *script_name;
+ bool enable_graph_stats;
} app = {
.conn = {
.welcome = "\nWelcome!\n\n",
@@ -40,6 +41,7 @@ static struct app_params {
.msg_handle_arg = NULL, /* set later. */
},
.script_name = NULL,
+ .enable_graph_stats = false,
};
static void
@@ -56,6 +58,7 @@ app_args_parse(int argc, char **argv)
{
struct option lgopts[] = {
{"help", 0, 0, 'H'},
+ {"enable-graph-stats", 0, 0, 'g'},
};
int h_present, p_present, s_present, n_args, i;
char *app_name = argv[0];
@@ -133,6 +136,12 @@ app_args_parse(int argc, char **argv)
}
break;
+ case 'g':
+ app.enable_graph_stats = true;
+ printf("WARNING! Telnet session can not be accessed
with"
+ "--enable-graph-stats");
+ break;
+
case 'H':
default:
printf(usage, app_name);
@@ -144,6 +153,12 @@ app_args_parse(int argc, char **argv)
return 0;
}
+bool
+app_graph_stats_enabled(void)
+{
+ return app.enable_graph_stats;
+}
+
bool
app_graph_exit(void)
{
diff --git a/app/graph/module_api.h b/app/graph/module_api.h
index 392dcfb222..a7d287f5c8 100644
--- a/app/graph/module_api.h
+++ b/app/graph/module_api.h
@@ -24,5 +24,7 @@
extern volatile bool force_quit;
extern struct conn *conn;
+bool app_graph_stats_enabled(void);
bool app_graph_exit(void);
+
#endif
diff --git a/doc/guides/tools/graph.rst b/doc/guides/tools/graph.rst
index 08ec57b7f8..bd8611a3d0 100644
--- a/doc/guides/tools/graph.rst
+++ b/doc/guides/tools/graph.rst
@@ -55,6 +55,10 @@ Following are the application command-line options:
a mandatory parameter which will be used to create desired graph
for a given use case.
+* ``--enable-graph-stats``
+
+ Enable graph statistics printing on console. By default graph
statistics are disabled.
+
* ``--help``
Dumps application usage
--
2.25.1
[PATCH v11 12/12] app/graph: support l3fwd use case
From: Rakesh Kudurumalla Adds an use case l3fwd. It contains a dedicated l3fwd.cli file mentioning commands to configure the required resources. Once application successfully parses the l3fwd.cli then a graph is created having below nodes: - ethdev_rx -> pkt_cls - pkt_cls -> ip4_lookup - pkt_cls -> ip6_lookup - pkt_cls -> pkt_drop - ip4_lookup -> ip4_rewrite - ip4_lookup -> pkt_drop - ip6_lookup -> ip6_rewrite - ip6_lookup -> pkt_drop - ip4_rewrite -> ethdev_tx - ip4_rewrite -> pkt_drop - ip6_rewrite -> ethdev_tx - ip6_rewrite -> pkt_drop - ethdev_tx -> pkt_drop Signed-off-by: Sunil Kumar Kori Signed-off-by: Rakesh Kudurumalla Acked-by: Jerin Jacob --- app/graph/examples/l3fwd.cli | 73 +++ app/graph/examples/l3fwd_pcap.cli| 71 +++ app/graph/graph.c| 2 +- app/graph/l3fwd.c| 136 app/graph/l3fwd.h| 11 + app/graph/meson.build| 1 + app/graph/module_api.h | 1 + doc/guides/tools/graph.rst | 84 doc/guides/tools/img/graph-usecase-l3fwd.svg | 210 +++ 9 files changed, 588 insertions(+), 1 deletion(-) create mode 100644 app/graph/examples/l3fwd.cli create mode 100644 app/graph/examples/l3fwd_pcap.cli create mode 100644 app/graph/l3fwd.c create mode 100644 app/graph/l3fwd.h create mode 100644 doc/guides/tools/img/graph-usecase-l3fwd.svg diff --git a/app/graph/examples/l3fwd.cli b/app/graph/examples/l3fwd.cli new file mode 100644 index 00..c4977d4322 --- /dev/null +++ b/app/graph/examples/l3fwd.cli @@ -0,0 +1,73 @@ +; SPDX-License-Identifier: BSD-3-Clause +; Copyright(c) 2023 Marvell. + +; +; Graph configuration for given usecase +; +graph l3fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 num_pcap_pkts 10 pcap_file /tmp/output.pcap + +; +; Mempools to be attached with ethdev +; +mempool mempool0 size 8192 buffers 4000 cache 256 numa 0 + +; +; DPDK devices and configuration. +; +; Note: Customize the parameters below to match your setup. +; +ethdev 0002:02:00.0 rxq 1 txq 8 mempool0 +ethdev 0002:03:00.0 rxq 1 txq 8 mempool0 +ethdev 0002:02:00.0 mtu 1700 +ethdev 0002:03:00.0 mtu 1700 +ethdev 0002:02:00.0 promiscuous on +ethdev 0002:03:00.0 promiscuous on + +; +; IPv4 addresses assigned to DPDK devices +; +ethdev 0002:02:00.0 ip4 addr add 10.0.2.1 netmask 255.255.255.0 +ethdev 0002:03:00.0 ip4 addr add 20.0.2.1 netmask 255.255.255.0 + +; +; IPv6 addresses assigned to DPDK devices +; +ethdev 0002:02:00.0 ip6 addr add 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 +ethdev 0002:03:00.0 ip6 addr add 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 + +; +; IPv4 routes which are installed to ipv4_lookup node for LPM processing +; +ipv4_lookup route add ipv4 10.0.2.0 netmask 255.255.255.0 via 10.0.2.1 +ipv4_lookup route add ipv4 20.0.2.0 netmask 255.255.255.0 via 20.0.2.1 + +; +; IPv6 routes which are installed to ipv6_lookup node for LPM processing +; +ipv6_lookup route add ipv6 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 via 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A +ipv6_lookup route add ipv6 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B netmask FF:FF:FF:FF:FF:FF:FF:FF:FF:00:00:00:00:00:00:00 via 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B + +; +; Peer MAC and IPv4 address mapping +; +neigh add ipv4 10.0.2.2 52:20:DA:4F:68:70 +neigh add ipv4 20.0.2.2 62:20:DA:4F:68:70 + +; +; Peer MAC and IPv6 address mapping +; +neigh add ipv6 52:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4A 52:20:DA:4F:68:70 +neigh add ipv6 62:20:DA:4F:68:70:52:20:DA:4F:68:70:52:20:DA:4B 62:20:DA:4F:68:70 + +; +; Port-Queue-Core mapping for ethdev_rx node +; +ethdev_rx map port 0002:02:00.0 queue 0 core 1 +ethdev_rx map port 0002:03:00.0 queue 0 core 2 + +; +; Graph start command to create graph. +; +; Note: No more command should come after this. +; +graph start diff --git a/app/graph/examples/l3fwd_pcap.cli b/app/graph/examples/l3fwd_pcap.cli new file mode 100644 index 00..30dde74a65 --- /dev/null +++ b/app/graph/examples/l3fwd_pcap.cli @@ -0,0 +1,71 @@ +; SPDX-License-Identifier: BSD-3-Clause +; Copyright(c) 2023 Marvell. + +; +; Graph configuration for given usecase +; +graph l3fwd coremask 0x03 bsz 32 tmo 10 model default pcap_enable 1 num_pcap_pkts 10 pcap_file /tmp/output.pcap + +; +; Mempools to be attached with ethdev +; +mempool mempool0 size 8192 buffers 4000 cache 256 numa 0 + +; +; DPDK devices and configuration. +; +; Note: Customize the parameters below to match your setup. +; +ethdev net_pcap0 rxq 1 txq 1 mempool0 +ethdev net_pcap1 rxq 1 txq 1 mempool0 +ethdev net_pcap0 promiscuous on +ethdev net_pcap1 promiscuous on + +; +; IPv4 addresses assigne
RE: [EXT] [PATCH v3 21/29] security: remove experimental flag from macsec
> The rte_security API's for macsec were added in 22.11. > Therefore remove the experimental tag. > > There is also one helper function for setting packet > metadata that should have been marked internal. > > Signed-off-by: Stephen Hemminger Acked-by: Akhil Goyal However, only one PMD supports it right now.
[PATCH v4 00/28] Promote many experimental API's to stable
Since 23.11 is an LTS release it is time to remove the experimental bandaid off many API's. There are about 890 API's marked with experimental on current main branch. This addresses the easy to remove ones and gets it down to about 510 places. The rule is any API that has been in since 22.11 needs to have experimental removed (or have API deleted). The experimental flag is not a "get out of ABI stability for free" card v4 - fix build in security and squash one fixup v3 - rebase and skip cryptodev Stephen Hemminger (28): bpf: make rte_bpf_dump and rte_bpf_convert stable API's cmdline: make experimental API's stable ethdev: mark rte_mtr API's as stable ethdev: mark rte_tm API's as stable pdump: make API's stable pcapng: mark API's as stable net: remove experimental from functions rcu: remove experimental from rte_rcu_qbsr lpm: remove experimental mbuf: remove experimental from create_extbuf hash: remove experimental from toeplitz hash timer: remove experimental from rte_timer_next_ticks sched: remove experimental dmadev: mark API's as not experimental meter: remove experimental warning from comments power: remove experimental from API's kvargs: remove experimental flag ip_frag: mark a couple of functions stable member: remove experimental tag security: remove experimental flag from macsec vhost: remove experimental from some API's bbdev: remove experimental tag ipsec: remove experimental from SA API compressdev: remove experimental flag regexdev: remove experimental tag node: remove some of the experimental tags table: remove experimental from API port: make API's stable MAINTAINERS | 10 +- doc/guides/rel_notes/deprecation.rst | 6 -- lib/bbdev/rte_bbdev.h | 4 - lib/bbdev/rte_bbdev_op.h | 2 - lib/bbdev/version.map | 15 ++- lib/bpf/rte_bpf.h | 2 - lib/bpf/version.map | 9 +- lib/cmdline/cmdline.h | 1 - lib/cmdline/cmdline_parse.h | 4 - lib/cmdline/cmdline_rdline.h | 4 - lib/cmdline/version.map | 26 ++--- lib/compressdev/rte_comp.h| 6 -- lib/compressdev/rte_compressdev.h | 26 - lib/compressdev/rte_compressdev_pmd.h | 6 -- lib/compressdev/version.map | 2 +- lib/dmadev/rte_dmadev.h | 85 lib/dmadev/version.map| 2 +- lib/ethdev/rte_mtr.h | 25 + lib/ethdev/rte_tm.h | 34 --- lib/ethdev/version.map| 88 lib/hash/rte_thash.h | 44 lib/hash/rte_thash_gfni.h | 8 -- lib/hash/rte_thash_x86_gfni.h | 8 -- lib/hash/version.map | 16 +-- lib/ip_frag/rte_ip_frag.h | 2 - lib/ip_frag/version.map | 9 +- lib/ipsec/rte_ipsec.h | 2 - lib/ipsec/version.map | 9 +- lib/kvargs/rte_kvargs.h | 4 - lib/kvargs/version.map| 8 +- lib/lpm/rte_lpm.h | 4 - lib/lpm/version.map | 7 +- lib/mbuf/rte_mbuf.h | 1 - lib/mbuf/version.map | 8 +- lib/member/rte_member.h | 54 -- lib/member/version.map| 12 +-- lib/meter/rte_meter.h | 12 --- lib/net/rte_ip.h | 19 lib/node/rte_node_eth_api.h | 1 - lib/node/rte_node_ip4_api.h | 2 - lib/node/version.map | 16 ++- lib/pcapng/rte_pcapng.h | 11 -- lib/pcapng/version.map| 6 +- lib/pdump/rte_pdump.h | 12 --- lib/pdump/version.map | 11 +- lib/pipeline/rte_port_in_action.h | 8 -- lib/pipeline/rte_swx_ctl.h| 57 --- lib/pipeline/rte_swx_pipeline.h | 29 -- lib/pipeline/rte_table_action.h | 16 --- lib/pipeline/version.map | 140 -- lib/port/version.map | 24 ++--- lib/power/rte_power.h | 4 - lib/power/rte_power_guest_channel.h | 4 - lib/power/rte_power_pmd_mgmt.h| 40 lib/power/rte_power_uncore.h | 5 - lib/power/version.map | 40 +++- lib/rcu/rte_rcu_qsbr.h| 20 lib/rcu/version.map | 15 +-- lib/regexdev/rte_regexdev.h | 92 - lib/regexdev/version.map | 2 +- lib/sched/rte_pie.h | 8 -- lib/sched/rte_sched.h | 5 - lib/sched/version.map | 18 +--- lib/security/rte_security.h | 27 - lib/security/version.map | 18 ++-- lib/table/rte_swx_table_learner.h | 10 -- lib/table/rte_swx_table_selector.h| 6 -- l
[PATCH v4 01/28] bpf: make rte_bpf_dump and rte_bpf_convert stable API's
These two API's were introduced in 23.11 and can now be
made not experimental.
Signed-off-by: Stephen Hemminger
Acked-by: Konstantin Ananyev
---
lib/bpf/rte_bpf.h | 2 --
lib/bpf/version.map | 9 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
index 4d71120dbd9d..f70d8dacd0d3 100644
--- a/lib/bpf/rte_bpf.h
+++ b/lib/bpf/rte_bpf.h
@@ -209,7 +209,6 @@ rte_bpf_get_jit(const struct rte_bpf *bpf, struct
rte_bpf_jit *jit);
* @param len
* Number of BPF instructions to dump.
*/
-__rte_experimental
void
rte_bpf_dump(FILE *f, const struct ebpf_insn *buf, uint32_t len);
@@ -229,7 +228,6 @@ struct bpf_program;
* - ENOMEM - can't reserve enough memory
* - ENOTSUP - operation not supported
*/
-__rte_experimental
struct rte_bpf_prm *
rte_bpf_convert(const struct bpf_program *prog);
diff --git a/lib/bpf/version.map b/lib/bpf/version.map
index c49bf1701f0a..2e957494e9df 100644
--- a/lib/bpf/version.map
+++ b/lib/bpf/version.map
@@ -1,7 +1,9 @@
DPDK_24 {
global:
+ rte_bpf_convert;
rte_bpf_destroy;
+ rte_bpf_dump;
rte_bpf_elf_load;
rte_bpf_eth_rx_elf_load;
rte_bpf_eth_rx_unload;
@@ -14,10 +16,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_bpf_convert;
- rte_bpf_dump;
-};
--
2.39.2
[PATCH v4 02/28] cmdline: make experimental API's stable
These API's have all ben around for several releases.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/cmdline/cmdline.h| 1 -
lib/cmdline/cmdline_parse.h | 4
lib/cmdline/cmdline_rdline.h | 4
lib/cmdline/version.map | 26 --
4 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index 992c84591456..dd41e1054378 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -39,7 +39,6 @@ void cmdline_printf(const struct cmdline *cl, const char
*fmt, ...)
int cmdline_in(struct cmdline *cl, const char *buf, int size);
int cmdline_write_char(struct rdline *rdl, char c);
-__rte_experimental
struct rdline *
cmdline_get_rdline(struct cmdline *cl);
diff --git a/lib/cmdline/cmdline_parse.h b/lib/cmdline/cmdline_parse.h
index a852ac411c59..41b4db1f76f9 100644
--- a/lib/cmdline/cmdline_parse.h
+++ b/lib/cmdline/cmdline_parse.h
@@ -155,9 +155,6 @@ typedef cmdline_parse_inst_t *cmdline_parse_ctx_t;
int cmdline_parse(struct cmdline *cl, const char *buf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Try to parse a buffer according to the specified context, but do not
* perform any function calls if parse is successful.
*
@@ -166,7 +163,6 @@ int cmdline_parse(struct cmdline *cl, const char *buf);
* CMDLINE_PARSE_BAD_ARGS on error and returns the parsed line length (>=0)
* on successful parse.
*/
-__rte_experimental
int cmdline_parse_check(struct cmdline *cl, const char *buf);
/**
diff --git a/lib/cmdline/cmdline_rdline.h b/lib/cmdline/cmdline_rdline.h
index 1b4cc7ce5773..c6bb636a 100644
--- a/lib/cmdline/cmdline_rdline.h
+++ b/lib/cmdline/cmdline_rdline.h
@@ -58,7 +58,6 @@ typedef int (rdline_complete_t)(struct rdline *rdl, const
char *buf,
*
* \return New rdline object on success, NULL on failure.
*/
-__rte_experimental
struct rdline *rdline_new(rdline_write_char_t *write_char,
rdline_validate_t *validate,
rdline_complete_t *complete,
@@ -70,7 +69,6 @@ struct rdline *rdline_new(rdline_write_char_t *write_char,
* \param rdl A pointer to an initialized struct rdline.
*If NULL, this function is a no-op.
*/
-__rte_experimental
void rdline_free(struct rdline *rdl);
/**
@@ -163,13 +161,11 @@ char *rdline_get_history_item(struct rdline *rdl,
unsigned int i);
/**
* Get maximum history buffer size.
*/
-__rte_experimental
size_t rdline_get_history_buffer_size(struct rdline *rdl);
/**
* Get the opaque pointer supplied on struct rdline creation.
*/
-__rte_experimental
void *rdline_get_opaque(struct rdline *rdl);
#ifdef __cplusplus
diff --git a/lib/cmdline/version.map b/lib/cmdline/version.map
index 97166789016c..88174e39bcb7 100644
--- a/lib/cmdline/version.map
+++ b/lib/cmdline/version.map
@@ -30,11 +30,13 @@ DPDK_24 {
cmdline_get_help_num;
cmdline_get_help_portlist;
cmdline_get_help_string;
+ cmdline_get_rdline;
cmdline_in;
cmdline_interact;
cmdline_isendoftoken;
cmdline_new;
cmdline_parse;
+ cmdline_parse_check;
cmdline_parse_etheraddr;
cmdline_parse_ipaddr;
cmdline_parse_num;
@@ -51,37 +53,25 @@ DPDK_24 {
cmdline_token_portlist_ops;
cmdline_token_string_ops;
cmdline_write_char;
+
rdline_add_history;
rdline_char_in;
rdline_clear_history;
+ rdline_free;
rdline_get_buffer;
+ rdline_get_history_buffer_size;
rdline_get_history_item;
+ rdline_get_opaque;
+ rdline_new;
rdline_newline;
rdline_quit;
rdline_redisplay;
rdline_reset;
rdline_restart;
rdline_stop;
+
vt100_init;
vt100_parser;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 20.11
- cmdline_get_rdline;
-
- # added in 21.11
- rdline_new;
- rdline_free;
- rdline_get_history_buffer_size;
- rdline_get_opaque;
-
- # added in 22.07
- cmdline_parse_check;
-
- local: *;
-};
--
2.39.2
[PATCH v4 03/28] ethdev: mark rte_mtr API's as stable
These haven't changed in a while, time has come to make them
not experimental.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS| 2 +-
lib/ethdev/rte_mtr.h | 25 +
lib/ethdev/version.map | 34 --
3 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4083658697fb..ea03d35dbe5a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -427,7 +427,7 @@ T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_tm*
F: app/test-pmd/cmdline_tm.*
-Traffic Metering and Policing API - EXPERIMENTAL
+Traffic Metering and Policing API
M: Cristian Dumitrescu
T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_mtr*
diff --git a/lib/ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h
index 30e6c6b12e6e..9a20e974bdad 100644
--- a/lib/ethdev/rte_mtr.h
+++ b/lib/ethdev/rte_mtr.h
@@ -41,10 +41,8 @@
*A) Whether an MTR object is private to a flow or potentially shared by
* several flows has to be specified at creation time.
*B) Several meter actions can be potentially registered for the same flow.
- *
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
*/
+
#include
#include
#include
@@ -569,7 +567,6 @@ struct rte_mtr_error {
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_capabilities_get(uint16_t port_id,
struct rte_mtr_capabilities *cap,
@@ -593,7 +590,6 @@ rte_mtr_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_add(uint16_t port_id,
uint32_t meter_profile_id,
@@ -615,7 +611,6 @@ rte_mtr_meter_profile_add(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_delete(uint16_t port_id,
uint32_t meter_profile_id,
@@ -635,7 +630,6 @@ rte_mtr_meter_profile_delete(uint16_t port_id,
* @return
* A valid handle in case of success, NULL otherwise.
*/
-__rte_experimental
struct rte_flow_meter_profile *
rte_mtr_meter_profile_get(uint16_t port_id,
uint32_t meter_profile_id,
@@ -663,7 +657,6 @@ rte_mtr_meter_profile_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_validate(uint16_t port_id,
struct rte_mtr_meter_policy_params *policy,
@@ -690,7 +683,6 @@ rte_mtr_meter_policy_validate(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_add(uint16_t port_id,
uint32_t policy_id,
@@ -711,7 +703,6 @@ rte_mtr_meter_policy_add(uint16_t port_id,
* @return
* A valid handle in case of success, NULL otherwise.
*/
-__rte_experimental
struct rte_flow_meter_policy *
rte_mtr_meter_policy_get(uint16_t port_id,
uint32_t policy_id,
@@ -793,7 +784,6 @@ struct rte_mtr_meter_policy_params policy = \
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_delete(uint16_t port_id,
uint32_t policy_id,
@@ -822,7 +812,6 @@ rte_mtr_meter_policy_delete(uint16_t port_id,
*
* @see enum rte_flow_action_type::RTE_FLOW_ACTION_TYPE_METER
*/
-__rte_experimental
int
rte_mtr_create(uint16_t port_id,
uint32_t mtr_id,
@@ -846,7 +835,6 @@ rte_mtr_create(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_destroy(uint16_t port_id,
uint32_t mtr_id,
@@ -874,7 +862,6 @@ rte_mtr_destroy(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_disable(uint16_t port_id,
uint32_t mtr_id,
@@ -896,7 +883,6 @@ rte_mtr_meter_disable(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_enable(uint16_t port_id,
uint32_t mtr_id,
@@ -916,7 +902,6 @@ rte_mtr_meter_enable(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_profile_update(uint16_t port_id,
uint32_t mtr_id,
@@ -937,7 +922,6 @@ rte_mtr_meter_profile_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_policy_update(uint16_t port_id,
uint32_t mtr_id,
@@ -964,7 +948,6 @@ rte_mtr_meter_policy_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_dscp_table_update(uint16_t port_id,
uint32_t mtr_id, enum rte_mtr_color_in_protocol proto,
@@ -991,7 +974,6 @@ rte_mtr_meter_dscp_table_update(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_mtr_meter_vlan_table_update(uint16_t port_id, uint32_
[PATCH v4 04/28] ethdev: mark rte_tm API's as stable
These API's have been around since 20.11, mark them as not
experimental.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS| 2 +-
lib/ethdev/rte_tm.h| 34 ---
lib/ethdev/version.map | 62 --
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index ea03d35dbe5a..f77597571633 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -421,7 +421,7 @@ F: app/test-pmd/cmdline_flow.c
F: doc/guides/prog_guide/rte_flow.rst
F: lib/ethdev/rte_flow*
-Traffic Management API - EXPERIMENTAL
+Traffic Management API
M: Cristian Dumitrescu
T: git://dpdk.org/next/dpdk-next-net
F: lib/ethdev/rte_tm*
diff --git a/lib/ethdev/rte_tm.h b/lib/ethdev/rte_tm.h
index 08c5fafecdf3..799b92aadaa9 100644
--- a/lib/ethdev/rte_tm.h
+++ b/lib/ethdev/rte_tm.h
@@ -14,10 +14,6 @@
* This interface provides the ability to configure the traffic manager in a
* generic way. It includes features such as: hierarchical scheduling,
* traffic shaping, congestion management, packet marking, etc.
- *
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
*/
#include
@@ -1242,7 +1238,6 @@ struct rte_tm_error {
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_get_number_of_leaf_nodes(uint16_t port_id,
uint32_t *n_leaf_nodes,
@@ -1267,7 +1262,6 @@ rte_tm_get_number_of_leaf_nodes(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_node_type_get(uint16_t port_id,
uint32_t node_id,
@@ -1286,7 +1280,6 @@ rte_tm_node_type_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_capabilities_get(uint16_t port_id,
struct rte_tm_capabilities *cap,
@@ -1307,7 +1300,6 @@ rte_tm_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_level_capabilities_get(uint16_t port_id,
uint32_t level_id,
@@ -1328,7 +1320,6 @@ rte_tm_level_capabilities_get(uint16_t port_id,
* @return
* 0 on success, non-zero error code otherwise.
*/
-__rte_experimental
int
rte_tm_node_capabilities_get(uint16_t port_id,
uint32_t node_id,
@@ -1354,7 +1345,6 @@ rte_tm_node_capabilities_get(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_n_max
*/
-__rte_experimental
int
rte_tm_wred_profile_add(uint16_t port_id,
uint32_t wred_profile_id,
@@ -1378,7 +1368,6 @@ rte_tm_wred_profile_add(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_n_max
*/
-__rte_experimental
int
rte_tm_wred_profile_delete(uint16_t port_id,
uint32_t wred_profile_id,
@@ -1410,7 +1399,6 @@ rte_tm_wred_profile_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_wred_context_add_update(uint16_t port_id,
uint32_t shared_wred_context_id,
@@ -1435,7 +1423,6 @@ rte_tm_shared_wred_context_add_update(uint16_t port_id,
*
* @see struct rte_tm_capabilities::cman_wred_context_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_wred_context_delete(uint16_t port_id,
uint32_t shared_wred_context_id,
@@ -1460,7 +1447,6 @@ rte_tm_shared_wred_context_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_n_max
*/
-__rte_experimental
int
rte_tm_shaper_profile_add(uint16_t port_id,
uint32_t shaper_profile_id,
@@ -1484,7 +1470,6 @@ rte_tm_shaper_profile_add(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_n_max
*/
-__rte_experimental
int
rte_tm_shaper_profile_delete(uint16_t port_id,
uint32_t shaper_profile_id,
@@ -1514,7 +1499,6 @@ rte_tm_shaper_profile_delete(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_shaper_add_update(uint16_t port_id,
uint32_t shared_shaper_id,
@@ -1538,7 +1522,6 @@ rte_tm_shared_shaper_add_update(uint16_t port_id,
*
* @see struct rte_tm_capabilities::shaper_shared_n_max
*/
-__rte_experimental
int
rte_tm_shared_shaper_delete(uint16_t port_id,
uint32_t shared_shaper_id,
@@ -1607,7 +1590,6 @@ rte_tm_shared_shaper_delete(uint16_t port_id,
* @see RTE_TM_NODE_LEVEL_ID_ANY
* @see struct rte_tm_capabilities
*/
-__rte_experimental
int
rte_tm_node_add(uint16_t port_id,
uint32_t node_id,
@@ -1641,7 +1623,6 @@ rte_tm_node_add(uint16_t port_id,
*
* @see RTE_TM_UPDATE_NODE_ADD_DELETE
*/
-__rte_experimental
int
rte_tm_node_delete(uint16_t port_id,
uint32_t node_id,
@@ -1666,7 +1647,6 @@ rte_tm_node_delete(uint16_t port_id,
* @see rte_tm_node_resume()
* @see RTE_TM_UPDATE_NODE_SUSPEND_RESUME
*/
-__rte_experimental
int
rte_tm_node_suspend(uint16_t port_id,
uint3
[PATCH v4 05/28] pdump: make API's stable
The filtering API's were added in 23.11 and can now be marked
as not experimental.
Signed-off-by: Stephen Hemminger
---
lib/pdump/rte_pdump.h | 12
lib/pdump/version.map | 11 +++
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/lib/pdump/rte_pdump.h b/lib/pdump/rte_pdump.h
index b1a391830c1d..414931a12cce 100644
--- a/lib/pdump/rte_pdump.h
+++ b/lib/pdump/rte_pdump.h
@@ -83,9 +83,6 @@ rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t
flags,
void *filter);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Enables packet capturing on given port and queue with filtering.
*
* @param port_id
@@ -109,7 +106,6 @@ rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t
flags,
* @return
*0 on success, -1 on error, rte_errno is set accordingly.
*/
-__rte_experimental
int
rte_pdump_enable_bpf(uint16_t port_id, uint16_t queue,
uint32_t flags, uint32_t snaplen,
@@ -169,9 +165,6 @@ rte_pdump_enable_by_deviceid(char *device_id, uint16_t
queue,
void *filter);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Enables packet capturing on given device id and queue with filtering.
* device_id can be name or pci address of device.
*
@@ -196,7 +189,6 @@ rte_pdump_enable_by_deviceid(char *device_id, uint16_t
queue,
* @return
*0 on success, -1 on error, rte_errno is set accordingly.
*/
-__rte_experimental
int
rte_pdump_enable_bpf_by_deviceid(const char *device_id, uint16_t queue,
uint32_t flags, uint32_t snaplen,
@@ -242,9 +234,6 @@ struct rte_pdump_stats {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Retrieve the packet capture statistics for a queue.
*
* @param port_id
@@ -254,7 +243,6 @@ struct rte_pdump_stats {
* @return
* Zero if successful. -1 on error and rte_errno is set.
*/
-__rte_experimental
int
rte_pdump_stats(uint16_t port_id, struct rte_pdump_stats *stats);
diff --git a/lib/pdump/version.map b/lib/pdump/version.map
index 225830dc85a7..ea5bd157cdb1 100644
--- a/lib/pdump/version.map
+++ b/lib/pdump/version.map
@@ -4,17 +4,12 @@ DPDK_24 {
rte_pdump_disable;
rte_pdump_disable_by_deviceid;
rte_pdump_enable;
+ rte_pdump_enable_bpf;
+ rte_pdump_enable_bpf_by_deviceid;
rte_pdump_enable_by_deviceid;
rte_pdump_init;
+ rte_pdump_stats;
rte_pdump_uninit;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_pdump_enable_bpf;
- rte_pdump_enable_bpf_by_deviceid;
- rte_pdump_stats;
-};
--
2.39.2
[PATCH v4 06/28] pcapng: mark API's as stable
This API was added in 23.11 and can now be marked as not
experimental.
Signed-off-by: Stephen Hemminger
---
lib/pcapng/rte_pcapng.h | 11 ---
lib/pcapng/version.map | 6 ++
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h
index d93cc9f73ad5..c96c8994f38b 100644
--- a/lib/pcapng/rte_pcapng.h
+++ b/lib/pcapng/rte_pcapng.h
@@ -6,10 +6,6 @@
* @file
* RTE pcapng
*
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
- *
* Pcapng is an evolution from the pcap format, created to address some of
* its deficiencies. Namely, the lack of extensibility and inability to store
* additional information.
@@ -54,7 +50,6 @@ typedef struct rte_pcapng rte_pcapng_t;
* @return
* handle to library, or NULL in case of error (and rte_errno is set).
*/
-__rte_experimental
rte_pcapng_t *
rte_pcapng_fdopen(int fd,
const char *osname, const char *hardware,
@@ -66,7 +61,6 @@ rte_pcapng_fdopen(int fd,
* @param self
* handle to library
*/
-__rte_experimental
void
rte_pcapng_close(rte_pcapng_t *self);
@@ -89,7 +83,6 @@ rte_pcapng_close(rte_pcapng_t *self);
* and before any packet record. All ports used in packet capture
* must be added.
*/
-__rte_experimental
int
rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port,
const char *ifname, const char *ifdescr,
@@ -132,7 +125,6 @@ enum rte_pcapng_direction {
* - The pointer to the new mbuf formatted for pcapng_write
* - NULL if allocation fails.
*/
-__rte_experimental
struct rte_mbuf *
rte_pcapng_copy(uint16_t port_id, uint32_t queue,
const struct rte_mbuf *m, struct rte_mempool *mp,
@@ -149,7 +141,6 @@ rte_pcapng_copy(uint16_t port_id, uint32_t queue,
* The minimum size of mbuf data to handle packet with length bytes.
* Accounting for required header and trailer fields
*/
-__rte_experimental
uint32_t
rte_pcapng_mbuf_size(uint32_t length);
@@ -174,7 +165,6 @@ rte_pcapng_mbuf_size(uint32_t length);
* The number of bytes written to file, -1 on failure to write file.
* The mbuf's in *pkts* are always freed.
*/
-__rte_experimental
ssize_t
rte_pcapng_write_packets(rte_pcapng_t *self,
struct rte_mbuf *pkts[], uint16_t nb_pkts);
@@ -205,7 +195,6 @@ rte_pcapng_write_packets(rte_pcapng_t *self,
* @return
* number of bytes written to file, -1 on failure to write file
*/
-__rte_experimental
ssize_t
rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port,
const char *comment,
diff --git a/lib/pcapng/version.map b/lib/pcapng/version.map
index 36393914d97c..81c9652ad6b5 100644
--- a/lib/pcapng/version.map
+++ b/lib/pcapng/version.map
@@ -1,6 +1,7 @@
-EXPERIMENTAL {
+DPDK_24 {
global:
+ rte_pcapng_add_interface;
rte_pcapng_close;
rte_pcapng_copy;
rte_pcapng_fdopen;
@@ -8,8 +9,5 @@ EXPERIMENTAL {
rte_pcapng_write_packets;
rte_pcapng_write_stats;
- # added in 23.03
- rte_pcapng_add_interface;
-
local: *;
};
--
2.39.2
[PATCH v4 07/28] net: remove experimental from functions
These functions have been around long enough should no
longer be experimental.
Signed-off-by: Stephen Hemminger
---
lib/net/rte_ip.h | 19 ---
1 file changed, 19 deletions(-)
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index 7f58dc6f6a9c..2cb5be222cdd 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -435,9 +435,6 @@ __rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Compute the IPv4 UDP/TCP checksum of a packet.
*
* @param m
@@ -449,7 +446,6 @@ __rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* The complemented checksum to set in the L4 header.
*/
-__rte_experimental
static inline uint16_t
rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
const struct rte_ipv4_hdr *ipv4_hdr, uint16_t l4_off)
@@ -482,7 +478,6 @@ rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr *ipv4_hdr,
const void *l4_hdr)
@@ -496,9 +491,6 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr
*ipv4_hdr,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Verify the IPv4 UDP/TCP checksum of a packet.
*
* In case of UDP, the caller must first check if udp_hdr->dgram_cksum is 0
@@ -513,7 +505,6 @@ rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr
*ipv4_hdr,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv4_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m,
const struct rte_ipv4_hdr *ipv4_hdr,
@@ -687,9 +678,6 @@ __rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Process the IPv6 UDP or TCP checksum of a packet.
*
* The IPv6 header must not be followed by extension headers. The layer 4
@@ -704,7 +692,6 @@ __rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* The complemented checksum to set in the L4 header.
*/
-__rte_experimental
static inline uint16_t
rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
const struct rte_ipv6_hdr *ipv6_hdr, uint16_t l4_off)
@@ -738,7 +725,6 @@ rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf *m,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr *ipv6_hdr,
const void *l4_hdr)
@@ -752,9 +738,6 @@ rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr
*ipv6_hdr,
}
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Validate the IPv6 UDP or TCP checksum of a packet.
*
* In case of UDP, the caller must first check if udp_hdr->dgram_cksum is 0:
@@ -770,7 +753,6 @@ rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr
*ipv6_hdr,
* @return
* Return 0 if the checksum is correct, else -1.
*/
-__rte_experimental
static inline int
rte_ipv6_udptcp_cksum_mbuf_verify(const struct rte_mbuf *m,
const struct rte_ipv6_hdr *ipv6_hdr,
@@ -825,7 +807,6 @@ struct rte_ipv6_fragment_ext {
* @return
* next protocol number if proto is an IPv6 extension, -EINVAL otherwise
*/
-__rte_experimental
static inline int
rte_ipv6_get_next_ext(const uint8_t *p, int proto, size_t *ext_len)
{
--
2.39.2
[PATCH v4 08/28] rcu: remove experimental from rte_rcu_qbsr
These functions were added back in 2020.
Remove experimental flag.
Signed-off-by: Stephen Hemminger
Reviewed-by: Honnappa Nagarahalli
---
lib/rcu/rte_rcu_qsbr.h | 20
lib/rcu/version.map| 15 ---
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 87e1b55153b5..74ef41e0fac1 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -10,10 +10,6 @@
*
* RTE Quiescent State Based Reclamation (QSBR).
*
- * @warning
- * @b EXPERIMENTAL:
- * All functions in this file may be changed or removed without prior notice.
- *
* Quiescent State (QS) is any point in the thread execution
* where the thread does not hold a reference to a data structure
* in shared memory. While using lock-less data structures, the writer
@@ -727,9 +723,6 @@ int
rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create a queue used to store the data structure elements that can
* be freed later. This queue is referred to as 'defer queue'.
*
@@ -742,14 +735,10 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v);
* - EINVAL - NULL parameters are passed
* - ENOMEM - Not enough memory
*/
-__rte_experimental
struct rte_rcu_qsbr_dq *
rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Enqueue one resource to the defer queue and start the grace period.
* The resource will be freed later after at least one grace period
* is over.
@@ -777,14 +766,10 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params);
* if the defer queue size is equal (or larger) than the
* number of elements in the data structure.
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Free resources from the defer queue.
*
* This API is multi-thread safe.
@@ -806,15 +791,11 @@ rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void
*e);
* On error - 1 with rte_errno set to
* - EINVAL - NULL parameters are passed
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n,
unsigned int *freed, unsigned int *pending, unsigned int *available);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Delete a defer queue.
*
* It tries to reclaim all the resources on the defer queue.
@@ -832,7 +813,6 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
* - EAGAIN - Some of the resources have not completed at least 1 grace
* period, try again.
*/
-__rte_experimental
int
rte_rcu_qsbr_dq_delete(struct rte_rcu_qsbr_dq *dq);
diff --git a/lib/rcu/version.map b/lib/rcu/version.map
index 9218ed1f3399..982ffd59d9cd 100644
--- a/lib/rcu/version.map
+++ b/lib/rcu/version.map
@@ -2,6 +2,10 @@ DPDK_24 {
global:
rte_rcu_log_type;
+ rte_rcu_qsbr_dq_create;
+ rte_rcu_qsbr_dq_delete;
+ rte_rcu_qsbr_dq_enqueue;
+ rte_rcu_qsbr_dq_reclaim;
rte_rcu_qsbr_dump;
rte_rcu_qsbr_get_memsize;
rte_rcu_qsbr_init;
@@ -11,14 +15,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_rcu_qsbr_dq_create;
- rte_rcu_qsbr_dq_enqueue;
- rte_rcu_qsbr_dq_reclaim;
- rte_rcu_qsbr_dq_delete;
-
- local: *;
-};
--
2.39.2
[PATCH v4 09/28] lpm: remove experimental
The function to associate RCU with LPM was added several releases ago.
Remove experimental.
Signed-off-by: Stephen Hemminger
---
lib/lpm/rte_lpm.h | 4
lib/lpm/version.map | 7 +--
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 75e27ff164ab..40825c5b8038 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -186,9 +186,6 @@ void
rte_lpm_free(struct rte_lpm *lpm);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Associate RCU QSBR variable with an LPM object.
*
* @param lpm
@@ -203,7 +200,6 @@ rte_lpm_free(struct rte_lpm *lpm);
* - EEXIST - already added QSBR
* - ENOMEM - memory allocation failure
*/
-__rte_experimental
int rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg);
/**
diff --git a/lib/lpm/version.map b/lib/lpm/version.map
index 9ba73b2f938b..b6bee8c18b8a 100644
--- a/lib/lpm/version.map
+++ b/lib/lpm/version.map
@@ -18,12 +18,7 @@ DPDK_24 {
rte_lpm_find_existing;
rte_lpm_free;
rte_lpm_is_rule_present;
+ rte_lpm_rcu_qsbr_add;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_lpm_rcu_qsbr_add;
-};
--
2.39.2
[PATCH v4 10/28] mbuf: remove experimental from create_extbuf
This API was added in 2020 and should no longer be experimental.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/mbuf/rte_mbuf.h | 1 -
lib/mbuf/version.map | 8 +---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index 913c459b1cc6..30fa3df85f53 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -800,7 +800,6 @@ struct rte_pktmbuf_extmem {
*- EEXIST - a memzone with the same name already exists
*- ENOMEM - no appropriate memory area found in which to create memzone
*/
-__rte_experimental
struct rte_mempool *
rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,
unsigned int cache_size, uint16_t priv_size,
diff --git a/lib/mbuf/version.map b/lib/mbuf/version.map
index f010d4692e3e..daa65e2bbdb2 100644
--- a/lib/mbuf/version.map
+++ b/lib/mbuf/version.map
@@ -38,14 +38,8 @@ DPDK_24 {
rte_pktmbuf_init;
rte_pktmbuf_pool_create;
rte_pktmbuf_pool_create_by_ops;
+ rte_pktmbuf_pool_create_extbuf;
rte_pktmbuf_pool_init;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_pktmbuf_pool_create_extbuf;
-
-};
--
2.39.2
[PATCH v4 11/28] hash: remove experimental from toeplitz hash
The rte_thash_ functions have been around since 2020. Remove experimental tag. Signed-off-by: Stephen Hemminger --- lib/hash/rte_thash.h | 44 --- lib/hash/rte_thash_gfni.h | 8 --- lib/hash/rte_thash_x86_gfni.h | 8 --- lib/hash/version.map | 16 - 4 files changed, 4 insertions(+), 72 deletions(-) diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h index da06cd53c0e0..071730c7bab9 100644 --- a/lib/hash/rte_thash.h +++ b/lib/hash/rte_thash.h @@ -221,14 +221,10 @@ rte_softrss_be(uint32_t *input_tuple, uint32_t input_len, /** * Indicates if GFNI implementations of the Toeplitz hash are supported. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @return * 1 if GFNI is supported * 0 otherwise */ -__rte_experimental int rte_thash_gfni_supported(void); @@ -236,9 +232,6 @@ rte_thash_gfni_supported(void); * Converts Toeplitz hash key (RSS key) into matrixes required * for GFNI implementation * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param matrixes * pointer to the memory where matrices will be written. * Note: the size of this memory must be equal to size * 8 @@ -247,7 +240,6 @@ rte_thash_gfni_supported(void); * @param size * Size of the rss_key in bytes. */ -__rte_experimental void rte_thash_complete_matrix(uint64_t *matrixes, const uint8_t *rss_key, int size); @@ -276,9 +268,6 @@ struct rte_thash_subtuple_helper; /** * Create a new thash context. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param name * Context name * @param key_len @@ -298,7 +287,6 @@ struct rte_thash_subtuple_helper; * A pointer to the created context on success * NULL otherwise */ -__rte_experimental struct rte_thash_ctx * rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, uint8_t *key, uint32_t flags); @@ -306,9 +294,6 @@ rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, /** * Find an existing thash context and return a pointer to it. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param name * Name of the thash context * @return @@ -316,20 +301,15 @@ rte_thash_init_ctx(const char *name, uint32_t key_len, uint32_t reta_sz, * set appropriately. Possible rte_errno values include: * - ENOENT - required entry not available to return. */ -__rte_experimental struct rte_thash_ctx * rte_thash_find_existing(const char *name); /** * Free a thash context object * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context */ -__rte_experimental void rte_thash_free_ctx(struct rte_thash_ctx *ctx); @@ -339,9 +319,6 @@ rte_thash_free_ctx(struct rte_thash_ctx *ctx); * to calculate toeplitz hash collisions. * This function is not multi-thread safe. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @param name @@ -355,7 +332,6 @@ rte_thash_free_ctx(struct rte_thash_ctx *ctx); * 0 on success * negative on error */ -__rte_experimental int rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, uint32_t offset); @@ -363,9 +339,6 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, /** * Find a helper in the context by the given name * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @param name @@ -373,7 +346,6 @@ rte_thash_add_helper(struct rte_thash_ctx *ctx, const char *name, uint32_t len, * @return * Pointer to the thash helper or NULL if it was not found. */ -__rte_experimental struct rte_thash_subtuple_helper * rte_thash_get_helper(struct rte_thash_ctx *ctx, const char *name); @@ -392,7 +364,6 @@ rte_thash_get_helper(struct rte_thash_ctx *ctx, const char *name); * @return * A complementary value which must be xored with the corresponding subtuple */ -__rte_experimental uint32_t rte_thash_get_complement(struct rte_thash_subtuple_helper *h, uint32_t hash, uint32_t desired_hash); @@ -402,15 +373,11 @@ rte_thash_get_complement(struct rte_thash_subtuple_helper *h, * It changes after each addition of a helper. It should be installed to * the NIC. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context * @return * A pointer to the toeplitz hash key */ -__rte_experimental const uint8_t * rte_thash_get_key(struct rte_thash_ctx *ctx); @@ -420,16 +387,12 @@ rte_thash_get_key(struct rte_thash_ctx *ctx); * CPU supports GFNI. * Matrices changes after each addition of a helper. * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * @param ctx * Thash context
[PATCH v4 12/28] timer: remove experimental from rte_timer_next_ticks
Function was added in 20.11, remove experimental flag.
Signed-off-by: Stephen Hemminger
---
lib/timer/rte_timer.h | 4
lib/timer/version.map | 7 +--
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/timer/rte_timer.h b/lib/timer/rte_timer.h
index d3927d5b6bac..153d1993573f 100644
--- a/lib/timer/rte_timer.h
+++ b/lib/timer/rte_timer.h
@@ -331,9 +331,6 @@ void rte_timer_stop_sync(struct rte_timer *tim);
int rte_timer_pending(struct rte_timer *tim);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Time until the next timer on the current lcore
* This function gives the ticks until the next timer will be active.
*
@@ -343,7 +340,6 @@ int rte_timer_pending(struct rte_timer *tim);
* - 0: a timer is pending and will run at next rte_timer_manage()
* - >0: ticks until the next timer is ready
*/
-__rte_experimental
int64_t rte_timer_next_ticks(void);
/**
diff --git a/lib/timer/version.map b/lib/timer/version.map
index e3d5a043034c..b180708e2488 100644
--- a/lib/timer/version.map
+++ b/lib/timer/version.map
@@ -10,6 +10,7 @@ DPDK_24 {
rte_timer_dump_stats;
rte_timer_init;
rte_timer_manage;
+ rte_timer_next_ticks;
rte_timer_pending;
rte_timer_reset;
rte_timer_reset_sync;
@@ -21,9 +22,3 @@ DPDK_24 {
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_timer_next_ticks;
-};
--
2.39.2
[PATCH v4 13/28] sched: remove experimental
The overcommit and PIE support was added back in 2020.
Remove experimental tag.
Signed-off-by: Stephen Hemminger
---
lib/sched/rte_pie.h | 8
lib/sched/rte_sched.h | 5 -
lib/sched/version.map | 18 --
3 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/lib/sched/rte_pie.h b/lib/sched/rte_pie.h
index e0d6d5a3cdcd..631c657980eb 100644
--- a/lib/sched/rte_pie.h
+++ b/lib/sched/rte_pie.h
@@ -78,7 +78,6 @@ struct rte_pie {
* @retval !0 error
*/
int
-__rte_experimental
rte_pie_rt_data_init(struct rte_pie *pie);
/**
@@ -95,7 +94,6 @@ rte_pie_rt_data_init(struct rte_pie *pie);
* @retval !0 error
*/
int
-__rte_experimental
rte_pie_config_init(struct rte_pie_config *pie_cfg,
const uint16_t qdelay_ref,
const uint16_t dp_update_interval,
@@ -116,7 +114,6 @@ rte_pie_config_init(struct rte_pie_config *pie_cfg,
* @retval !0 drop the packet
*/
static int
-__rte_experimental
rte_pie_enqueue_empty(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
uint32_t pkt_len)
@@ -148,7 +145,6 @@ rte_pie_enqueue_empty(const struct rte_pie_config *pie_cfg,
* @param time [in] current time (measured in cpu cycles)
*/
static void
-__rte_experimental
_calc_drop_probability(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie, uint64_t time)
{
@@ -212,7 +208,6 @@ _calc_drop_probability(const struct rte_pie_config *pie_cfg,
* @retval 1 drop the packet
*/
static inline int
-__rte_experimental
_rte_pie_drop(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie)
{
@@ -261,7 +256,6 @@ _rte_pie_drop(const struct rte_pie_config *pie_cfg,
* @retval 2 drop the packet based on mark probability criterion
*/
static inline int
-__rte_experimental
rte_pie_enqueue_nonempty(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
uint32_t pkt_len,
@@ -329,7 +323,6 @@ rte_pie_enqueue_nonempty(const struct rte_pie_config
*pie_cfg,
* @retval 1 drop the packet based on drop probability criteria
*/
static inline int
-__rte_experimental
rte_pie_enqueue(const struct rte_pie_config *pie_cfg,
struct rte_pie *pie,
const unsigned int qlen,
@@ -354,7 +347,6 @@ rte_pie_enqueue(const struct rte_pie_config *pie_cfg,
* @param time [in] current time stamp in cpu cycles
*/
static inline void
-__rte_experimental
rte_pie_dequeue(struct rte_pie *pie,
uint32_t pkt_len,
uint64_t time)
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index a9ac5909ad0c..77fc78ce2fe9 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -353,9 +353,6 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port
*port,
uint32_t *pipe_profile_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Hierarchical scheduler subport bandwidth profile add
* Note that this function is safe to use in runtime for adding new
* subport bandwidth profile as it doesn't have any impact on hierarchical
@@ -369,7 +366,6 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port
*port,
* @return
* 0 upon success, error code otherwise
*/
-__rte_experimental
int
rte_sched_port_subport_profile_add(struct rte_sched_port *port,
struct rte_sched_subport_profile_params *profile,
@@ -592,7 +588,6 @@ rte_sched_port_dequeue(struct rte_sched_port *port, struct
rte_mbuf **pkts, uint
* @return
* 0 upon success, error code otherwise
*/
-__rte_experimental
int
rte_sched_subport_tc_ov_config(struct rte_sched_port *port, uint32_t
subport_id, bool tc_ov_enable);
diff --git a/lib/sched/version.map b/lib/sched/version.map
index d9ce68be1449..be1decaeee46 100644
--- a/lib/sched/version.map
+++ b/lib/sched/version.map
@@ -2,6 +2,8 @@ DPDK_24 {
global:
rte_approx;
+ rte_pie_config_init;
+ rte_pie_rt_data_init;
rte_red_config_init;
rte_red_log2_1_minus_Wq;
rte_red_pow2_frac_inv;
@@ -17,24 +19,12 @@ DPDK_24 {
rte_sched_port_pkt_read_color;
rte_sched_port_pkt_read_tree_path;
rte_sched_port_pkt_write;
+ rte_sched_port_subport_profile_add;
rte_sched_queue_read_stats;
rte_sched_subport_config;
rte_sched_subport_pipe_profile_add;
rte_sched_subport_read_stats;
+ rte_sched_subport_tc_ov_config;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 20.11
- rte_sched_port_subport_profile_add;
-
- # added in 21.11
- rte_pie_rt_data_init;
- rte_pie_config_init;
-
- # added in 22.07
- rte_sched_subport_tc_ov_config;
-};
--
2.39.2
[PATCH v4 14/28] dmadev: mark API's as not experimental
These were added in 20.11 time now to remove experimental flag.
Signed-off-by: Stephen Hemminger
Acked-by: Chengwen Feng
Acked-by: Bruce Richardson
---
MAINTAINERS | 2 +-
lib/dmadev/rte_dmadev.h | 85 -
lib/dmadev/version.map | 2 +-
3 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index f77597571633..1534a414f754 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -483,7 +483,7 @@ F: doc/guides/prog_guide/mldev.rst
F: app/test-mldev/
F: doc/guides/tools/testmldev.rst
-DMA device API - EXPERIMENTAL
+DMA device API
M: Chengwen Feng
F: lib/dmadev/
F: drivers/dma/skeleton/
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index 493263a5d627..2c09939ff6c5 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -158,9 +158,6 @@ extern "C" {
#define RTE_DMADEV_DEFAULT_MAX 64
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Configure the maximum number of dmadevs.
* @note This function can be invoked before the primary process rte_eal_init()
* to change the maximum number of dmadevs. If not invoked, the maximum number
@@ -172,13 +169,9 @@ extern "C" {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_dev_max(size_t dev_max);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the device identifier for the named DMA device.
*
* @param name
@@ -188,13 +181,9 @@ int rte_dma_dev_max(size_t dev_max);
* Returns DMA device identifier on success.
* - <0: Failure to find named DMA device.
*/
-__rte_experimental
int rte_dma_get_dev_id_by_name(const char *name);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Check whether the dev_id is valid.
*
* @param dev_id
@@ -203,20 +192,15 @@ int rte_dma_get_dev_id_by_name(const char *name);
* @return
* - If the device index is valid (true) or not (false).
*/
-__rte_experimental
bool rte_dma_is_valid(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Get the total number of DMA devices that have been successfully
* initialised.
*
* @return
* The total number of usable DMA devices.
*/
-__rte_experimental
uint16_t rte_dma_count_avail(void);
/**
@@ -227,7 +211,6 @@ uint16_t rte_dma_count_avail(void);
* @return
* Next valid dmadev, UINT16_MAX if there is none.
*/
-__rte_experimental
int16_t rte_dma_next_dev(int16_t start_dev_id);
/** Utility macro to iterate over all available dmadevs */
@@ -318,9 +301,6 @@ struct rte_dma_info {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Retrieve information of a DMA device.
*
* @param dev_id
@@ -332,7 +312,6 @@ struct rte_dma_info {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info);
/**
@@ -357,9 +336,6 @@ struct rte_dma_conf {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Configure a DMA device.
*
* This function must be invoked first before any other function in the
@@ -375,13 +351,9 @@ struct rte_dma_conf {
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Start a DMA device.
*
* The device start step is the last one and consists of setting the DMA
@@ -393,13 +365,9 @@ int rte_dma_configure(int16_t dev_id, const struct
rte_dma_conf *dev_conf);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_start(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Stop a DMA device.
*
* The device can be restarted with a call to rte_dma_start().
@@ -410,13 +378,9 @@ int rte_dma_start(int16_t dev_id);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_stop(int16_t dev_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Close a DMA device.
*
* The device cannot be restarted after this call.
@@ -427,7 +391,6 @@ int rte_dma_stop(int16_t dev_id);
* @return
* 0 on success. Otherwise negative value is returned.
*/
-__rte_experimental
int rte_dma_close(int16_t dev_id);
/**
@@ -620,9 +583,6 @@ struct rte_dma_vchan_conf {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Allocate and set up a virtual DMA channel.
*
* @param dev_id
@@ -637,7 +597,6 @@ struct rte_dma_vchan_conf {
* @return
* 0 on success. Otherwise negative value
[PATCH v4 15/28] meter: remove experimental warning from comments
The API's for rte_meter_trtcm were never properly flagged as experimental; missing __rte_experimental but there was an experimental comment in the docbook comment. Remove the comment. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- lib/meter/rte_meter.h | 12 1 file changed, 12 deletions(-) diff --git a/lib/meter/rte_meter.h b/lib/meter/rte_meter.h index 6ba99674361a..bd68cbe38903 100644 --- a/lib/meter/rte_meter.h +++ b/lib/meter/rte_meter.h @@ -124,9 +124,6 @@ int rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 profile configuration * * @param p @@ -170,9 +167,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_profile *p); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 configuration per metered traffic flow * * @param m @@ -273,9 +267,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, enum rte_color pkt_color); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color blind traffic metering * * @param m @@ -297,9 +288,6 @@ rte_meter_trtcm_rfc4115_color_blind_check( uint32_t pkt_len); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color aware traffic metering * * @param m -- 2.39.2
[PATCH v4 16/28] power: remove experimental from API's
The power management API's were last changed in 22.11 release.
Therefore remove experimental for 23.11 release.
Signed-off-by: Stephen Hemminger
---
lib/power/rte_power.h | 4 ---
lib/power/rte_power_guest_channel.h | 4 ---
lib/power/rte_power_pmd_mgmt.h | 40 -
lib/power/rte_power_uncore.h| 5
lib/power/version.map | 40 ++---
5 files changed, 13 insertions(+), 80 deletions(-)
diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h
index e79bf1c4dd0c..4b624a01c5d7 100644
--- a/lib/power/rte_power.h
+++ b/lib/power/rte_power.h
@@ -25,9 +25,6 @@ enum power_management_env {PM_ENV_NOT_SET,
PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM,
PM_ENV_AMD_PSTATE_CPUFREQ};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
- *
* Check if a specific power management environment type is supported on a
* currently running system.
*
@@ -39,7 +36,6 @@ enum power_management_env {PM_ENV_NOT_SET,
PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM,
* - 0 if unsupported
* - -1 if error, with rte_errno indicating reason for error.
*/
-__rte_experimental
int rte_power_check_env_supported(enum power_management_env env);
/**
diff --git a/lib/power/rte_power_guest_channel.h
b/lib/power/rte_power_guest_channel.h
index b5de1bd24318..55b76dfc4c08 100644
--- a/lib/power/rte_power_guest_channel.h
+++ b/lib/power/rte_power_guest_channel.h
@@ -135,9 +135,6 @@ int rte_power_guest_channel_send_msg(struct
rte_power_channel_packet *pkt,
unsigned int lcore_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
* Receive a message contained in pkt over the Virtio-Serial
* from the host endpoint.
*
@@ -155,7 +152,6 @@ int rte_power_guest_channel_send_msg(struct
rte_power_channel_packet *pkt,
* - 0 on success.
* - Negative on error.
*/
-__rte_experimental
int rte_power_guest_channel_receive_msg(void *pkt,
size_t pkt_len,
unsigned int lcore_id);
diff --git a/lib/power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h
index 0f1a2eb22eb4..456145661917 100644
--- a/lib/power/rte_power_pmd_mgmt.h
+++ b/lib/power/rte_power_pmd_mgmt.h
@@ -33,9 +33,6 @@ enum rte_power_pmd_mgmt_type {
};
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Enable power management on a specified Ethernet device Rx queue and lcore.
*
* @note This function is not thread-safe.
@@ -55,16 +52,12 @@ enum rte_power_pmd_mgmt_type {
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
uint16_t port_id, uint16_t queue_id,
enum rte_power_pmd_mgmt_type mode);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Disable power management on a specified Ethernet device Rx queue and lcore.
*
* @note This function is not thread-safe.
@@ -82,42 +75,30 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
uint16_t port_id, uint16_t queue_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set a emptypoll_max to specified value. Used to specify the number of empty
* polls to wait before entering sleep state.
*
* @param max
* The value to set emptypoll_max to.
*/
-__rte_experimental
void
rte_power_pmd_mgmt_set_emptypoll_max(unsigned int max);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Get the current value of emptypoll_max.
*
* @return
* The current emptypoll_max value
*/
-__rte_experimental
unsigned int
rte_power_pmd_mgmt_get_emptypoll_max(void);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set the pause_duration. Used to adjust the pause mode callback duration.
*
* @note Duration must be greater than zero.
@@ -128,27 +109,19 @@ rte_power_pmd_mgmt_get_emptypoll_max(void);
* 0 on success
* <0 on error
*/
-__rte_experimental
int
rte_power_pmd_mgmt_set_pause_duration(unsigned int duration);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Get the current value of pause_duration.
*
* @return
* The current pause_duration value.
*/
-__rte_experimental
unsigned int
rte_power_pmd_mgmt_get_pause_duration(void);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be removed, without prior notice.
- *
* Set the min frequency to be used for frequency scaling or zero to use
defaults.
*
* @note Supported by: Pstate mode.
@@ -161,14 +134,10 @@ rte_power
[PATCH v4 17/28] kvargs: remove experimental flag
The function rte_kvargs_get_with_value was added in 21.11
so experimental flag can be removed.
Signed-off-by: Stephen Hemminger
Acked-by: Bruce Richardson
---
lib/kvargs/rte_kvargs.h | 4
lib/kvargs/version.map | 8 +---
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/lib/kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h
index 4900b750bc0b..36804cfb1543 100644
--- a/lib/kvargs/rte_kvargs.h
+++ b/lib/kvargs/rte_kvargs.h
@@ -145,9 +145,6 @@ void rte_kvargs_free(struct rte_kvargs *kvlist);
const char *rte_kvargs_get(const struct rte_kvargs *kvlist, const char *key);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get the value associated with a given key and value.
*
* Find the first entry in the kvlist whose key and value match the
@@ -167,7 +164,6 @@ const char *rte_kvargs_get(const struct rte_kvargs *kvlist,
const char *key);
* NULL if no key matches the input,
* a value associated with a matching key otherwise.
*/
-__rte_experimental
const char *rte_kvargs_get_with_value(const struct rte_kvargs *kvlist,
const char *key, const char *value);
diff --git a/lib/kvargs/version.map b/lib/kvargs/version.map
index 387a94e725cf..cda85d171f32 100644
--- a/lib/kvargs/version.map
+++ b/lib/kvargs/version.map
@@ -4,16 +4,10 @@ DPDK_24 {
rte_kvargs_count;
rte_kvargs_free;
rte_kvargs_get;
+ rte_kvargs_get_with_value;
rte_kvargs_parse;
rte_kvargs_parse_delim;
rte_kvargs_process;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 21.11
- rte_kvargs_get_with_value;
-};
--
2.39.2
[PATCH v4 18/28] ip_frag: mark a couple of functions stable
There were two functions added in 22.11 which were
marked as experimental. Remove the experimental tag.
Signed-off-by: Stephen Hemminger
Acked-by: Konstantin Ananyev
---
lib/ip_frag/rte_ip_frag.h | 2 --
lib/ip_frag/version.map | 9 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
index feab72ae64b9..cd3a3e143ee7 100644
--- a/lib/ip_frag/rte_ip_frag.h
+++ b/lib/ip_frag/rte_ip_frag.h
@@ -205,7 +205,6 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
* in the pkts_out array.
* Otherwise - (-1) * errno.
*/
-__rte_experimental
int32_t
rte_ipv4_fragment_copy_nonseg_packet(struct rte_mbuf *pkt_in,
struct rte_mbuf **pkts_out,
@@ -289,7 +288,6 @@ rte_ip_frag_table_statistics_dump(FILE * f, const struct
rte_ip_frag_tbl *tbl);
* @param tms
* Current timestamp
*/
-__rte_experimental
void
rte_ip_frag_table_del_expired_entries(struct rte_ip_frag_tbl *tbl,
struct rte_ip_frag_death_row *dr, uint64_t tms);
diff --git a/lib/ip_frag/version.map b/lib/ip_frag/version.map
index 7ba446c9938b..3e7e573dc412 100644
--- a/lib/ip_frag/version.map
+++ b/lib/ip_frag/version.map
@@ -3,19 +3,14 @@ DPDK_24 {
rte_ip_frag_free_death_row;
rte_ip_frag_table_create;
+ rte_ip_frag_table_del_expired_entries;
rte_ip_frag_table_destroy;
rte_ip_frag_table_statistics_dump;
rte_ipv4_frag_reassemble_packet;
+ rte_ipv4_fragment_copy_nonseg_packet;
rte_ipv4_fragment_packet;
rte_ipv6_frag_reassemble_packet;
rte_ipv6_fragment_packet;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- rte_ip_frag_table_del_expired_entries;
- rte_ipv4_fragment_copy_nonseg_packet;
-};
--
2.39.2
[PATCH v4 19/28] member: remove experimental tag
The member library last received new API's in 22.11.
All the API's should be marked stable by now.
Signed-off-by: Stephen Hemminger
---
lib/member/rte_member.h | 54 -
lib/member/version.map | 12 +++--
2 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index a15e0d69e696..a6bf22651700 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -15,9 +15,6 @@
* bloom filter (vBF). For HT setsummary, two subtypes or modes are available,
* cache and non-cache modes. The table below summarize some properties of
* the different implementations.
- *
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
*/
/**
@@ -117,17 +114,11 @@ extern int librte_member_logtype;
struct rte_member_setsum;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Parameter struct used to create set summary
*/
struct rte_member_parameters;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Define different set summary types
*/
enum rte_member_setsum_type {
@@ -207,9 +198,6 @@ struct rte_member_setsum {
} __rte_cache_aligned;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Parameters used when create the set summary table. Currently user can
* specify two types of setsummary: HT based and vBF. For HT based, user can
* specify cache or non-cache mode. Here is a table to describe some
differences
@@ -351,9 +339,6 @@ struct rte_member_parameters {
} __rte_cache_aligned;
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Find an existing set-summary and return a pointer to it.
*
* @param name
@@ -367,9 +352,6 @@ struct rte_member_setsum *
rte_member_find_existing(const char *name);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create set-summary (SS).
*
* @param params
@@ -382,9 +364,6 @@ struct rte_member_setsum *
rte_member_create(const struct rte_member_parameters *params);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup key in set-summary (SS).
* Single key lookup and return as soon as the first match found
*
@@ -402,9 +381,6 @@ rte_member_lookup(const struct rte_member_setsum *setsum,
const void *key,
member_set_t *set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup bulk of keys in set-summary (SS).
* Each key lookup returns as soon as the first match found
*
@@ -427,9 +403,6 @@ rte_member_lookup_bulk(const struct rte_member_setsum
*setsum,
member_set_t *set_ids);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup a key in set-summary (SS) for multiple matches.
* The key lookup will find all matched entries (multiple match).
* Note that for cache mode of HT, each key can have at most one match. This is
@@ -456,9 +429,6 @@ rte_member_lookup_multi(const struct rte_member_setsum
*setsum,
member_set_t *set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Lookup a bulk of keys in set-summary (SS) for multiple matches each key.
* Each key lookup will find all matched entries (multiple match).
* Note that for cache mode HT, each key can have at most one match. So
@@ -489,9 +459,6 @@ rte_member_lookup_multi_bulk(const struct rte_member_setsum
*setsum,
member_set_t *set_ids);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Insert key into set-summary (SS).
*
* @param setsum
@@ -522,9 +489,6 @@ rte_member_add(const struct rte_member_setsum *setsum,
const void *key,
member_set_t set_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Add the packet byte size into the sketch.
*
* @param setsum
@@ -536,15 +500,11 @@ rte_member_add(const struct rte_member_setsum *setsum,
const void *key,
* @return
* Return -EINVAL for invalid parameters, otherwise return 0.
*/
-__rte_experimental
int
rte_member_add_byte_count(const struct rte_member_setsum *setsum,
const void *key, uint32_t byte_count);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Query packet count for a certain flow-key.
*
* @param setsum
@@ -556,16 +516,12 @@ rte_member_add_byte_count(const struct rte_member_setsum
*setsum,
* @return
* Return -EINVAL for invalid parameters.
*/
-__rte_experimental
int
rte_member_query_count(const struct rte_member_setsum *setsum,
const void *key, uint64_t *count);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Report heavyhitt
[PATCH v4 20/28] security: remove experimental flag from macsec
The rte_security API's for macsec were added in 22.11.
Therefore remove the experimental tag.
There is also one helper function for setting packet
metadata that should have been marked internal.
Signed-off-by: Stephen Hemminger
---
lib/security/rte_security.h | 27 ---
lib/security/version.map| 18 +-
2 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index d2d2af23d5d2..a19544906f21 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -815,7 +815,6 @@ rte_security_session_create(void *instance,
* - On success returns 0
* - On failure returns a negative errno value.
*/
-__rte_experimental
int
rte_security_session_update(void *instance,
void *sess,
@@ -851,9 +850,6 @@ int
rte_security_session_destroy(void *instance, void *sess);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create MACsec security channel (SC).
*
* @param instance security instance
@@ -865,15 +861,11 @@ rte_security_session_destroy(void *instance, void *sess);
* - -ENOMEM if PMD is not capable to create more SC.
* - other negative value for other errors.
*/
-__rte_experimental
int
rte_security_macsec_sc_create(void *instance,
struct rte_security_macsec_sc *conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Destroy MACsec security channel (SC).
*
* @param instance security instance
@@ -884,15 +876,11 @@ rte_security_macsec_sc_create(void *instance,
* - -EINVAL if sc_id is invalid or instance is NULL.
* - -EBUSY if sc is being used by some session.
*/
-__rte_experimental
int
rte_security_macsec_sc_destroy(void *instance, uint16_t sc_id,
enum rte_security_macsec_direction dir);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Create MACsec security association (SA).
*
* @param instance security instance
@@ -904,15 +892,11 @@ rte_security_macsec_sc_destroy(void *instance, uint16_t
sc_id,
* - -ENOMEM if PMD is not capable to create more SAs.
* - other negative value for other errors.
*/
-__rte_experimental
int
rte_security_macsec_sa_create(void *instance,
struct rte_security_macsec_sa *conf);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Destroy MACsec security association (SA).
*
* @param instance security instance
@@ -923,7 +907,6 @@ rte_security_macsec_sa_create(void *instance,
* - -EINVAL if sa_id is invalid or instance is NULL.
* - -EBUSY if sa is being used by some session.
*/
-__rte_experimental
int
rte_security_macsec_sa_destroy(void *instance, uint16_t sa_id,
enum rte_security_macsec_direction dir);
@@ -1059,7 +1042,6 @@ rte_security_session_fast_mdata_set(void *sess, uint64_t
fdata)
}
/** Function to call PMD specific function pointer set_pkt_metadata() */
-__rte_experimental
int __rte_security_set_pkt_metadata(void *instance,
void *sess,
struct rte_mbuf *m, void *params);
@@ -1230,16 +1212,12 @@ struct rte_security_stats {
* - On success, return 0
* - On failure, a negative value
*/
-__rte_experimental
int
rte_security_session_stats_get(void *instance,
void *sess,
struct rte_security_stats *stats);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get MACsec SA statistics.
*
* @param instancesecurity instance
@@ -1250,16 +1228,12 @@ rte_security_session_stats_get(void *instance,
* - On success, return 0.
* - On failure, a negative value.
*/
-__rte_experimental
int
rte_security_macsec_sa_stats_get(void *instance,
uint16_t sa_id, enum
rte_security_macsec_direction dir,
struct rte_security_macsec_sa_stats *stats);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
* Get MACsec SC statistics.
*
* @param instancesecurity instance
@@ -1270,7 +1244,6 @@ rte_security_macsec_sa_stats_get(void *instance,
* - On success, return 0.
* - On failure, a negative value.
*/
-__rte_experimental
int
rte_security_macsec_sc_stats_get(void *instance,
uint16_t sc_id, enum
rte_security_macsec_direction dir,
diff --git a/lib/security/version.map b/lib/security/version.map
index e07fca33a1e6..54c9a556798d 100644
--- a/lib/security/version.map
+++ b/lib/security/version.map
@@ -1,19 +1,12 @@
DPDK_24 {
global:
+ __rte_security_set_pkt_metadata;
rte_security_capabilities_get;
rte_security_capability_get;
rte
[PATCH v4 21/28] vhost: remove experimental from some API's
All API's that before 22.11 release should have experimental
tag removed.
Signed-off-by: Stephen Hemminger
---
lib/vhost/rte_vhost.h| 5
lib/vhost/rte_vhost_async.h | 19 --
lib/vhost/rte_vhost_crypto.h | 1 -
lib/vhost/version.map| 51 ++--
4 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h
index fec650b1dbba..db92f0534431 100644
--- a/lib/vhost/rte_vhost.h
+++ b/lib/vhost/rte_vhost.h
@@ -509,7 +509,6 @@ rte_vhost_driver_get_vdpa_device(const char *path);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_driver_get_vdpa_dev_type(const char *path, uint32_t *type);
@@ -648,7 +647,6 @@ int rte_vhost_get_negotiated_features(int vid, uint64_t
*features);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_get_negotiated_protocol_features(int vid,
uint64_t *protocol_features);
@@ -960,7 +958,6 @@ int rte_vhost_vring_call(int vid, uint16_t vring_idx);
* @return
* 0 on success, -1 on failure, -EAGAIN for another retry
*/
-__rte_experimental
int rte_vhost_vring_call_nonblock(int vid, uint16_t vring_idx);
/**
@@ -987,7 +984,6 @@ uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid);
* @return
* 0 on success, -1 on failure
*/
-__rte_experimental
int
rte_vhost_get_monitor_addr(int vid, uint16_t queue_id,
struct rte_vhost_power_monitor_cond *pmc);
@@ -1102,7 +1098,6 @@ rte_vhost_get_vdpa_device(int vid);
* @return
* 0 on success, < 0 on failure
*/
-__rte_experimental
int
rte_vhost_backend_config_change(int vid, bool need_reply);
diff --git a/lib/vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h
index 8f190dd44b1b..3370026415fb 100644
--- a/lib/vhost/rte_vhost_async.h
+++ b/lib/vhost/rte_vhost_async.h
@@ -24,7 +24,6 @@ extern "C" {
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_register(int vid, uint16_t queue_id);
/**
@@ -37,7 +36,6 @@ int rte_vhost_async_channel_register(int vid, uint16_t
queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_unregister(int vid, uint16_t queue_id);
/**
@@ -54,7 +52,6 @@ int rte_vhost_async_channel_unregister(int vid, uint16_t
queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_register_thread_unsafe(int vid, uint16_t queue_id);
/**
@@ -71,7 +68,6 @@ int rte_vhost_async_channel_register_thread_unsafe(int vid,
uint16_t queue_id);
* @return
* 0 on success, -1 on failures
*/
-__rte_experimental
int rte_vhost_async_channel_unregister_thread_unsafe(int vid,
uint16_t queue_id);
@@ -95,7 +91,6 @@ int rte_vhost_async_channel_unregister_thread_unsafe(int vid,
* @return
* num of packets enqueued
*/
-__rte_experimental
uint16_t rte_vhost_submit_enqueue_burst(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -120,7 +115,6 @@ uint16_t rte_vhost_submit_enqueue_burst(int vid, uint16_t
queue_id,
* @return
* num of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -136,7 +130,6 @@ uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t
queue_id,
* @return
* the amount of in-flight packets on success; -1 on failure
*/
-__rte_experimental
int rte_vhost_async_get_inflight(int vid, uint16_t queue_id);
/**
@@ -153,7 +146,6 @@ int rte_vhost_async_get_inflight(int vid, uint16_t
queue_id);
* @return
* the amount of in-flight packets on success; -1 on failure
*/
-__rte_experimental
int rte_vhost_async_get_inflight_thread_unsafe(int vid, uint16_t queue_id);
/**
@@ -178,7 +170,6 @@ int rte_vhost_async_get_inflight_thread_unsafe(int vid,
uint16_t queue_id);
* @return
* Number of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -203,7 +194,6 @@ uint16_t rte_vhost_clear_queue_thread_unsafe(int vid,
uint16_t queue_id,
* @return
* Number of packets returned
*/
-__rte_experimental
uint16_t rte_vhost_clear_queue(int vid, uint16_t queue_id,
struct rte_mbuf **pkts, uint16_t count, int16_t dma_id,
uint16_t vchan_id);
@@ -226,13 +216,9 @@ uint16_t rte_vhost_clear_queue(int vid, uint16_t queue_id,
* @return
* 0 on success, and -1 on failure
*/
-__rte_experimental
int rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id);
/**
- * @warning
- * @b EXPERIMENTAL: this API may change, or be r
