RSS on L2TP, Teredo, PPPoE Tunnels
Hello DPDK Team, Hope you guys are doing great !! We are developing application with dpdk 22.03 & Mellanox Connectx-6 adapter, Want to use IP-Port tuples (Inner in case of tunnels) to RSS traffic to multiple queues. We need to handle L2TPv2/3, Teredo, PPPoE etc, but adapter have limited tunnels support. Is there a way/possibility in DPDK to support mentioned or define user specific tunnels & achieve RSS on inner tuples ? >From documentation, we came across these approaches: 1. Rte flow Flex item: a. This is not supported by adapter. 2. testpmd> flow tunnel create 0 type "": a.Not getting documentation to check. Please suggest. Environment: * OS: Ubuntu 20.04 * Driver: MLNX_OFED_LINUX-5.5-1.0.3.2 * Firmware: 22.32.2004 Regards, Tarun Badnora
[PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
rte_mempool_create put tailq entry into rte_mempool_tailq list before
populate, and pool_data set when populate. So in multi process, if
process A create mempool, and process B can get mempool through
rte_mempool_lookup before pool_data set, if B call rte_mempool_lookup,
it will cause segment fault.
Fix this by put tailq entry into rte_mempool_tailq after populate.
Signed-off-by: changfengnan
---
lib/mempool/rte_mempool.c | 40 +++
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 4c78071a34..b23d6138ff 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -798,9 +798,7 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
int socket_id, unsigned flags)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
- struct rte_mempool_list *mempool_list;
struct rte_mempool *mp = NULL;
- struct rte_tailq_entry *te = NULL;
const struct rte_memzone *mz = NULL;
size_t mempool_size;
unsigned int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
@@ -820,8 +818,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
RTE_CACHE_LINE_MASK) != 0);
#endif
- mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
-
/* asked for zero items */
if (n == 0) {
rte_errno = EINVAL;
@@ -866,14 +862,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
private_data_size = (private_data_size +
RTE_MEMPOOL_ALIGN_MASK) &
(~RTE_MEMPOOL_ALIGN_MASK);
-
- /* try to allocate tailq entry */
- te = rte_zmalloc("MEMPOOL_TAILQ_ENTRY", sizeof(*te), 0);
- if (te == NULL) {
- RTE_LOG(ERR, MEMPOOL, "Cannot allocate tailq entry!\n");
- goto exit_unlock;
- }
-
mempool_size = RTE_MEMPOOL_HEADER_SIZE(mp, cache_size);
mempool_size += private_data_size;
mempool_size = RTE_ALIGN_CEIL(mempool_size, RTE_MEMPOOL_ALIGN);
@@ -908,7 +896,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
mp->private_data_size = private_data_size;
STAILQ_INIT(&mp->elt_list);
STAILQ_INIT(&mp->mem_list);
-
/*
* local_cache pointer is set even if cache_size is zero.
* The local_cache points to just past the elt_pa[] array.
@@ -922,12 +909,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
mempool_cache_init(&mp->local_cache[lcore_id],
cache_size);
}
-
- te->data = mp;
-
- rte_mcfg_tailq_write_lock();
- TAILQ_INSERT_TAIL(mempool_list, te, next);
- rte_mcfg_tailq_write_unlock();
rte_mcfg_mempool_write_unlock();
rte_mempool_trace_create_empty(name, n, elt_size, cache_size,
@@ -936,7 +917,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
unsigned elt_size,
exit_unlock:
rte_mcfg_mempool_write_unlock();
- rte_free(te);
rte_mempool_free(mp);
return NULL;
}
@@ -951,11 +931,22 @@ rte_mempool_create(const char *name, unsigned n, unsigned
elt_size,
{
int ret;
struct rte_mempool *mp;
+ struct rte_mempool_list *mempool_list;
+ struct rte_tailq_entry *te = NULL;
+
+ /* try to allocate tailq entry */
+ te = rte_zmalloc("MEMPOOL_TAILQ_ENTRY", sizeof(*te), 0);
+ if (te == NULL) {
+ RTE_LOG(ERR, MEMPOOL, "Cannot allocate tailq entry!\n");
+ return NULL;
+ }
mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
private_data_size, socket_id, flags);
- if (mp == NULL)
+ if (mp == NULL) {
+ rte_free(te);
return NULL;
+ }
/*
* Since we have 4 combinations of the SP/SC/MP/MC examine the flags to
@@ -984,12 +975,19 @@ rte_mempool_create(const char *name, unsigned n, unsigned
elt_size,
if (obj_init)
rte_mempool_obj_iter(mp, obj_init, obj_init_arg);
+ te->data = mp;
+ mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list);
+ rte_mcfg_tailq_write_lock();
+ TAILQ_INSERT_TAIL(mempool_list, te, next);
+ rte_mcfg_tailq_write_unlock();
+
rte_mempool_trace_create(name, n, elt_size, cache_size,
private_data_size, mp_init, mp_init_arg, obj_init,
obj_init_arg, flags, mp);
return mp;
fail:
+ rte_free(te);
rte_mempool_free(mp);
return NULL;
}
--
2.37.0 (Apple Git-136)
[PATCH v6] ethdev: add special flags when creating async transfer table
In case flow rules match only one kind of traffic in a flow table,
then optimization can be done via allocation of this table.
Such optimization is possible only if the application gives a hint
about its usage of the table during initial configuration.
The transfer domain rules may process traffic from wire or vport,
which may correspond to two kinds of underlayer resources.
That's why the first two hints introduced in this patch are about
wire and vport traffic specialization.
Wire means traffic arrives from the uplink port while vport means
traffic initiated from VF/SF.
There are two possible approaches for providing the hints.
Using IPv4 as an example:
1. Use pattern item in both template table and flow rules.
pattern_template: pattern ANY_VPORT / eth / ipv4 is 1.1.1.1 / end
async flow create: pattern ANY_VPORT / eth / ipv4 is 1.1.1.2 / end
"ANY_VPORT" needs to be present in each flow rule even if it's
just a hint. No value to match because matching is already done by
IPv4 item.
2. Add special flags into table_attr.
template_table 0 create table_id 0 group 1 transfer vport_orig
Approach 1 needs to specify the pattern in each flow rule which wastes
memory and is not user friendly.
This patch takes the 2nd approach and introduces one new member
"specialize" into rte_flow_table_attr to indicate possible flow table
optimization.
By default, there is no hint, so the behavior of the transfer domain
doesn't change.
There is no guarantee that the hint will be used by the PMD.
Signed-off-by: Rongwei Liu
Acked-by: Ori Kam
v2: Move the new field to template table attribute.
v4: Mark it as optional and clear the concept.
v5: Change specialize type to uint32_t.
v6: Change the flags to macros and re-construct the commit log.
---
app/test-pmd/cmdline_flow.c | 26 +++
doc/guides/prog_guide/rte_flow.rst | 15 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 ++-
lib/ethdev/rte_flow.h | 28 +
4 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 88108498e0..15f2af9b40 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -184,6 +184,8 @@ enum index {
TABLE_INGRESS,
TABLE_EGRESS,
TABLE_TRANSFER,
+ TABLE_TRANSFER_WIRE_ORIG,
+ TABLE_TRANSFER_VPORT_ORIG,
TABLE_RULES_NUMBER,
TABLE_PATTERN_TEMPLATE,
TABLE_ACTIONS_TEMPLATE,
@@ -1158,6 +1160,8 @@ static const enum index next_table_attr[] = {
TABLE_INGRESS,
TABLE_EGRESS,
TABLE_TRANSFER,
+ TABLE_TRANSFER_WIRE_ORIG,
+ TABLE_TRANSFER_VPORT_ORIG,
TABLE_RULES_NUMBER,
TABLE_PATTERN_TEMPLATE,
TABLE_ACTIONS_TEMPLATE,
@@ -2933,6 +2937,18 @@ static const struct token token_list[] = {
.next = NEXT(next_table_attr),
.call = parse_table,
},
+ [TABLE_TRANSFER_WIRE_ORIG] = {
+ .name = "wire_orig",
+ .help = "affect rule direction to transfer",
+ .next = NEXT(next_table_attr),
+ .call = parse_table,
+ },
+ [TABLE_TRANSFER_VPORT_ORIG] = {
+ .name = "vport_orig",
+ .help = "affect rule direction to transfer",
+ .next = NEXT(next_table_attr),
+ .call = parse_table,
+ },
[TABLE_RULES_NUMBER] = {
.name = "rules_number",
.help = "number of rules in table",
@@ -8993,6 +9009,16 @@ parse_table(struct context *ctx, const struct token
*token,
case TABLE_TRANSFER:
out->args.table.attr.flow_attr.transfer = 1;
return len;
+ case TABLE_TRANSFER_WIRE_ORIG:
+ if (!out->args.table.attr.flow_attr.transfer)
+ return -1;
+ out->args.table.attr.specialize = RTE_FLOW_TRANSFER_WIRE_ORIG;
+ return len;
+ case TABLE_TRANSFER_VPORT_ORIG:
+ if (!out->args.table.attr.flow_attr.transfer)
+ return -1;
+ out->args.table.attr.specialize = RTE_FLOW_TRANSFER_VPORT_ORIG;
+ return len;
default:
return -1;
}
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 3e6242803d..d9ca041ae4 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -3605,6 +3605,21 @@ and pattern and actions templates are created.
&actions_templates, nb_actions_templ,
&error);
+Table Attribute: Specialize
+^^^
+
+Application can help optimizing underlayer resources and insertion rate
+by specializing template table.
+Specialization is done by providing hints
+in the template table attribute ``specialize``.
+
+This attribute is not mandatory for each PMD to implemen
Re: [PATCH] app/testpmd: flush flow templates when port is removed
On 11/11/22 19:22, Singh, Aman Deep wrote: On 11/8/2022 3:00 PM, Dariusz Sosnowski wrote: From: Suanming Mou This patch adds explicit flushing of template tables, pattern and actions templates, when a port is closed or detached. Signed-off-by: Suanming Mou Acked-by: Aman Singh Applied to dpdk-next-net/main, thanks.
Re: [PATCH v3] netdev-dpdk: add control plane protection support
Fixing To: to add back in OVS ML. +cc Ori, as mlx5 operation discussed below. On 11/11/2022 18:15, Kevin Traynor wrote: Hi Robin, On 21/10/2022 15:53, Robin Jarry wrote: Some control protocols are used to maintain link status between forwarding engines (e.g. LACP). When the system is not sized properly, the PMD threads may not be able to process all incoming traffic from the configured Rx queues. When a signaling packet of such protocols is dropped, it can cause link flapping, worsening the situation. Use the RTE flow API to redirect these protocols into a dedicated Rx queue. The assumption is made that the ratio between control protocol traffic and user data traffic is very low and thus this dedicated Rx queue will never get full. The RSS redirection table is re-programmed to only use the other Rx queues. The RSS table size is stored in the netdev_dpdk structure at port initialization to avoid requesting the information again when changing the port configuration. The additional Rx queue will be assigned a PMD core like any other Rx queue. Polling that extra queue may introduce increased latency and a slight performance penalty at the benefit of preventing link flapping. This feature must be enabled per port on specific protocols via the cp-protection option. This option takes a coma-separated list of protocol names. It is only supported on ethernet ports. If the user has already configured multiple Rx queues on the port, an additional one will be allocated for control plane packets. If the hardware cannot satisfy the requested number of requested Rx queues, the last Rx queue will be assigned for control plane. If only one Rx queue is available, the cp-protection feature will be disabled. If the hardware does not support the RTE flow matchers/actions, the feature will be disabled. It cannot be enabled when other_config:hw-offload=true as it may conflict with the offloaded RTE flows. Similarly, if hw-offload is enabled while some ports already have cp-protection enabled, the RTE flow offloading will be disabled on these ports. Example use: ovs-vsctl add-bond br-phy bond0 phy0 phy1 -- \ set interface phy0 type=dpdk options:dpdk-devargs=:ca:00.0 -- \ set interface phy0 options:cp-protection=lacp -- \ set interface phy1 type=dpdk options:dpdk-devargs=:ca:00.1 -- \ set interface phy1 options:cp-protection=lacp As a starting point, only one protocol is supported: LACP. Other protocols can be added in the future. NIC compatibility should be checked. To validate that this works as intended, I used a traffic generator to generate random traffic slightly above the machine capacity at line rate on a two ports bond interface. OVS is configured to receive traffic on two VLANs and pop/push them in a br-int bridge based on tags set on patch ports. +--+ | DUT | |++| || br-int || default flow, action=NORMAL |||| || patch10patch11 || |+---|---|+| || | | |+---|---|+| || patch00patch01 || || tag:10tag:20 || |||| || br-phy || default flow, action=NORMAL |||| || bond0|| balance-slb, lacp=passive, lacp-time=fast ||phy0 phy1 || |+--|-|---+| +---|-|+ | | +---|-|+ | port0 port1 | balance L3/L4, lacp=active, lacp-time=fast | lag | mode trunk VLANs 10, 20 | | |switch| | | | vlan 10vlan 20 | mode access | port2 port3 | +-|--|-+ | | +-|--|-+ | port0 port1 | Random traffic that is properly balanced | | across the bond ports in both directions. | traffic generator | +--+ Without cp-protection, the bond0 links are randomly switching to "defaulted" when one of the LACP packets sent by the switch is dropped because the RX queues are full and the PMD threads did not process them fast enough. When that happens, all traffic must go through a single link which causes above line rate traffic to be dropped. When cp-protection is enabled, no LACP packet is dropped and the bond links remain enabled at all times, maximizing the throughput. This feature may be considered as "QoS". However, it does not work by limiting the rate of traffic explicitly. It only guarantees that some protocols have a lower chance of being dropped because the PMD cores cannot keep up with regular traffic. The choice of protocols is limited on purpose. This is not meant to be configurable by users. Some limited configurability could be considered in the future but it would expose to more
RE: [PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
> From: changfengnan [mailto:changfeng...@bytedance.com] > Sent: Monday, 14 November 2022 08.15 > > rte_mempool_create put tailq entry into rte_mempool_tailq list before > populate, and pool_data set when populate. So in multi process, if > process A create mempool, and process B can get mempool through > rte_mempool_lookup before pool_data set, if B call rte_mempool_lookup, > it will cause segment fault. > Fix this by put tailq entry into rte_mempool_tailq after populate. > > Signed-off-by: changfengnan > --- Good catch. You must use your real name (not your username) before the email address in the sign-off line, or the patch cannot be accepted. Please refer to: https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-body With a proper sign-off line, Acked-by: Morten Brørup
Re: [dpdk-dev] [PATCH] lib: fix doxygen syntax issues
On Wed, Nov 9, 2022 at 3:54 PM wrote:
>
> From: Jerin Jacob
>
> Fix following syntax error reported by doxygen 1.9.5 version.
>
> lib/eal/include/rte_uuid.h:89: error: RTE_UUID_STRLEN
> has @param documentation sections but no arguments
> (warning treated as error, aborting now)
>
> lib/power/rte_power.h:169: error: rte_power_freq_up has
> @param documentation sections but no arguments
> (warning treated as error, aborting now)
>
> Fixes: 6bc67c497a51 ("eal: add uuid API")
> Fixes: d7937e2e3d12 ("power: initial import")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Jerin Jacob
I split the patch in two (as Thomas suggested) and applied it.
Thanks.
--
David Marchand
Re: [PATCH] power: fix double free of opened files
On Mon, Nov 7, 2022 at 10:18 AM Pattan, Reshma wrote:
> > Fix double free of f_min and f_max by reverting the flcose() for f_min and
> > f_max. As f_min and f_max are stored for further use and closed in uncore
> > deinitialization.
> >
> > Fixes: b127e74 ("power: fix open file descriptors leak")
Please, use 12 chars format for commit hash, as documented.
git config alias.fixline "log -1 --abbrev=12 --format='Fixes: %h
(\"%s\")%nCc: %ae'"
> >
> > Signed-off-by: Tadhg Kearney
> > ---
>
> Acked-by: Reshma Pattan
Applied, thanks.
--
David Marchand
Re: [PATCH] hash: fix memory leak of hash_rcu_cfg
On Fri, Nov 4, 2022 at 10:52 AM Jun Qiu wrote:
>
> The memory of h->hash_rcu_cfg which is allocated in
> rte_hash_rcu_qsbr_add was leaked.
>
> Fixes: 769b2de ("hash: implement RCU resources reclamation")
Please, use 12 chars format for commit hash, as documented.
git config alias.fixline "log -1 --abbrev=12 --format='Fixes: %h
(\"%s\")%nCc: %ae'"
> Cc: sta...@dpdk.org
>
> Signed-off-by: Jun Qiu
Reviewed-by: David Marchand
Applied, thanks.
--
David Marchand
Re: [PATCH v3 1/2] test/hash: fix coverity warning
On Thu, Nov 10, 2022 at 4:14 PM Vladimir Medvedkin
wrote:
>
> Remove unnecessary variable assignment
>
> Coverity issue: 336800
> Fixes: 3f9aab961ed3 ("test/hash: check lock-free extendable bucket")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Vladimir Medvedkin
> Reviewed-by: Ruifeng Wang
Series applied, thanks.
--
David Marchand
Re: [PATCH v2] bus/auxiliary: prevent device from being probed again
On Wed, Nov 9, 2022 at 3:54 PM Bing Zhao wrote:
>
> The device on auxiliary bus doesn't support being probed again
> without being removed firstly. The PMD will detect and return error
> for this unsupported operation. Some of the resources would be
> cleared wrongly. When quitting, there will be unexpected error like
> crash.
>
> To prevent this, the device driver will be checked before probing a
> device.
>
> Fixes: 1afce3086cf4 ("bus/auxiliary: introduce auxiliary bus")
> CC: sta...@dpdk.org
>
> Signed-off-by: Bing Zhao
> Reviewed-by: Gregory Etelson
> Reviewed-by: Matan Azrad
> ---
> v2: fix typo
> ---
> drivers/bus/auxiliary/auxiliary_common.c | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/bus/auxiliary/auxiliary_common.c
> b/drivers/bus/auxiliary/auxiliary_common.c
> index 6bb1fe7c96..8bc9f20f1b 100644
> --- a/drivers/bus/auxiliary/auxiliary_common.c
> +++ b/drivers/bus/auxiliary/auxiliary_common.c
> @@ -89,6 +89,7 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver
> *drv,
> {
> enum rte_iova_mode iova_mode;
> int ret;
> + bool already_probed;
>
> if (drv == NULL || dev == NULL)
> return -EINVAL;
> @@ -116,6 +117,13 @@ rte_auxiliary_probe_one_driver(struct
> rte_auxiliary_driver *drv,
> return -EINVAL;
> }
>
> + already_probed = rte_dev_is_probed(&dev->device);
> + if (already_probed) {
No need for this variable, I removed it when applying.
For consistency with other bus code, I also moved this check before
the IOVA validation.
> + RTE_LOG(DEBUG, EAL, "Device %s is already probed on auxiliary
> bus\n",
> + dev->device.name);
> + return -EEXIST;
> + }
> +
> /* Allocate interrupt instance */
> dev->intr_handle =
> rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);
> --
> 2.21.0
>
Applied, thanks.
--
David Marchand
RE: [PATCH v3] net/ice: fix ice_interrupt_handler panic when stop
> -Original Message-
> From: Du, Frank
> Sent: Monday, November 14, 2022 3:03 PM
> To: dev@dpdk.org
> Subject: [PATCH v3] net/ice: fix ice_interrupt_handler panic when stop
>
> rte_intr_callback_unregister may fail when irq cb is in handling, use sync
> version to make sure unregister successfully.
Added:
Fixes: cf911d90e366 ("net/ice: support link update")
Cc: sta...@dpdk.org
>
> Signed-off-by: Du, Frank
Corrected:
s/Du, Frank/Frank Du
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
RE: [dpdk-dev v2] app/test: fix of bitwise and operator in return
Hi Kai,
> -Original Message-
> From: Kai Ji
> Sent: Friday 11 November 2022 16:27
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; gak...@marvell.com; Ji, Kai ;
> Krakowiak, LukaszX
> Subject: [dpdk-dev v2] app/test: fix of bitwise and operator in return
>
> This patch remove incorrect bitwise and operator used in the return function
> of
> sw snow3g testcase
>
> Fixes: 24342ade2c9d ("test/crypto: check SNOW3G when digest is encrypted")
> Cc: lukaszx.krakow...@intel.com
>
> Signed-off-by: Kai Ji
> ---
Acked-by: Ciara Power
Re: [PATCH] common/mlx5: use build configuration dictionary
On Tue, Nov 8, 2022 at 8:51 AM David Marchand wrote:
>
> On Mon, Nov 7, 2022 at 5:37 PM Thomas Monjalon wrote:
> >
> > A recent commit added an explicit dependency check on common/mlx5.
> > For consistency, query dpdk_conf instead of the list of common drivers.
> > The lists *_drivers should be used only for printing.
> >
> > Fixes: 3df380f61797 ("common/mlx5: fix disabling build")
> >
> > Suggested-by: Bruce Richardson
> > Signed-off-by: Thomas Monjalon
>
Acked-by: Bruce Richardson
> Reviewed-by: David Marchand
Applied, thanks.
--
David Marchand
Re: [PATCH] build: list selected applications
On Fri, Oct 28, 2022 at 6:30 PM Markus Theil wrote: > On 10/28/22 14:34, David Marchand wrote: > > With the addition of enable/disable_apps meson options, it is a bit > harder to figure out which application is built, and why. > > Display the list of applications in the same way we do for drivers and > libraries. > > Signed-off-by: David Marchand Acked-by: Bruce Richardson > Reviewed-by: Markus Theil Applied, thanks. -- David Marchand
Re: [PATCH] maintainers: group service cores files
On Tue, Nov 8, 2022 at 9:48 AM Van Haaren, Harry wrote: > > From: Thomas Monjalon > > > > Move example with library files, all with the same maintainer. > > > > Signed-off-by: Thomas Monjalon > Acked-by: Harry van Haaren Applied, thanks. -- David Marchand
Re: [PATCH] maintainers: update for pmdinfo tool
On Tue, Nov 8, 2022 at 3:18 PM David Marchand wrote: > On Mon, Nov 7, 2022 at 6:14 PM Thomas Monjalon wrote: > > > > The original maintainer of pmdinfo/pmdinfogen > > did not send an email for 2 years. > > > > Signed-off-by: Thomas Monjalon > Acked-by: David Marchand Applied, thanks. -- David Marchand
[PATCH] net/idpf: need to stop device when closing device
From: Beilei Xing
This patch stops device at the beginning of idpf_dev_close.
Fixes: 14aa6ed8f2ec ("net/idpf: support device start and stop")
Signed-off-by: Beilei Xing
---
drivers/net/idpf/idpf_ethdev.c | 7 +++
drivers/net/idpf/idpf_ethdev.h | 2 ++
2 files changed, 9 insertions(+)
diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c
index 50aac65daf..5a141ba035 100644
--- a/drivers/net/idpf/idpf_ethdev.c
+++ b/drivers/net/idpf/idpf_ethdev.c
@@ -605,6 +605,9 @@ idpf_dev_stop(struct rte_eth_dev *dev)
{
struct idpf_vport *vport = dev->data->dev_private;
+ if (vport->stopped == 1)
+ return 0;
+
idpf_vc_ena_dis_vport(vport, false);
idpf_stop_queues(dev);
@@ -613,6 +616,8 @@ idpf_dev_stop(struct rte_eth_dev *dev)
idpf_vc_dealloc_vectors(vport);
+ vport->stopped = 1;
+
return 0;
}
@@ -622,6 +627,8 @@ idpf_dev_close(struct rte_eth_dev *dev)
struct idpf_vport *vport = dev->data->dev_private;
struct idpf_adapter *adapter = vport->adapter;
+ idpf_dev_stop(dev);
+
idpf_vc_destroy_vport(vport);
rte_free(vport->rss_lut);
diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h
index ccdf4abe40..bfe27a5267 100644
--- a/drivers/net/idpf/idpf_ethdev.h
+++ b/drivers/net/idpf/idpf_ethdev.h
@@ -127,6 +127,8 @@ struct idpf_vport {
struct idpf_chunks_info chunks_info;
uint16_t devarg_id;
+
+ bool stopped;
};
struct idpf_adapter {
--
2.26.2
Re: [PATCH 0/2] GitHub Actions configuration fixes
On Wed, Oct 12, 2022 at 6:30 PM David Marchand wrote: > > GitHub Actions started to deprecated some part of the workflow syntax > and dependencies of some core actions. > > This series (mostly) fix those warnings. > For reviewers/testers, this is still moving: I got new warnings while > I was testing the first patch... In the end, the series is good to go as is. Unless someone objects quickly, I'll apply the two patches, and mark them as stable material (since we don't know when GHA will make those warnings into errors..). -- David Marchand
[PATCH 1/2] common/cnxk: update IPsec completion codes
Update the IPsec completion codes as per UCODE version
OCPT-04-IE-IPSEC-MC-30-01-28-00
Signed-off-by: Rahul Bhansali
---
drivers/common/cnxk/hw/cpt.h | 2 ++
drivers/common/cnxk/roc_cpt.c | 2 +-
drivers/common/cnxk/roc_ie_ot.h | 21 +++--
drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 2 --
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/drivers/common/cnxk/hw/cpt.h b/drivers/common/cnxk/hw/cpt.h
index 3c87a0d1e4..1ebe49da12 100644
--- a/drivers/common/cnxk/hw/cpt.h
+++ b/drivers/common/cnxk/hw/cpt.h
@@ -15,6 +15,8 @@
#define CPT_COMP_INSTERR (0x5ull)
#define CPT_COMP_WARN(0x6ull) /* [CN10K, .) */
+#define CPT_COMP_HWGOOD_MASK ((1U << CPT_COMP_WARN) | (1U << CPT_COMP_GOOD))
+
#define CPT_LF_INT_VEC_MISC(0x0ull)
#define CPT_LF_INT_VEC_DONE(0x1ull)
#define CPT_LF_CTL (0x10ull)
diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c
index 8fc072b9d0..8defdc8ddf 100644
--- a/drivers/common/cnxk/roc_cpt.c
+++ b/drivers/common/cnxk/roc_cpt.c
@@ -990,7 +990,7 @@ roc_cpt_ctx_write(struct roc_cpt_lf *lf, void *sa_dptr,
void *sa_cptr,
plt_free(dptr);
plt_free(hw_res);
- if (res.cn10k.compcode != CPT_COMP_WARN) {
+ if (res.cn10k.compcode != CPT_COMP_GOOD || res.cn10k.uc_compcode) {
plt_err("Write SA operation timed out");
return -ETIMEDOUT;
}
diff --git a/drivers/common/cnxk/roc_ie_ot.h b/drivers/common/cnxk/roc_ie_ot.h
index 56a1e9f1d6..a1ba60de75 100644
--- a/drivers/common/cnxk/roc_ie_ot.h
+++ b/drivers/common/cnxk/roc_ie_ot.h
@@ -46,14 +46,14 @@ enum roc_ie_ot_ucc_ipsec {
ROC_IE_OT_UCC_ERR_SA_BAD_IP = 0xc7,
ROC_IE_OT_UCC_ERR_PKT_IP_FRAG = 0xc8,
ROC_IE_OT_UCC_ERR_PKT_REPLAY_WINDOW = 0xc9,
+ ROC_IE_OT_UCC_SUCCESS_PKT_IP_BADCSUM = 0xed,
+ ROC_IE_OT_UCC_SUCCESS_PKT_L4_GOODCSUM = 0xee,
+ ROC_IE_OT_UCC_SUCCESS_PKT_L4_BADCSUM = 0xef,
ROC_IE_OT_UCC_SUCCESS_SA_SOFTEXP_FIRST = 0xf0,
- ROC_IE_OT_UCC_SUCCESS_PKT_IP_BADCSUM = 0xf1,
+ ROC_IE_OT_UCC_SUCCESS_PKT_UDPESP_NZCSUM = 0xf1,
ROC_IE_OT_UCC_SUCCESS_SA_SOFTEXP_AGAIN = 0xf2,
- ROC_IE_OT_UCC_SUCCESS_PKT_L4_GOODCSUM = 0xf3,
- ROC_IE_OT_UCC_SUCCESS_PKT_L4_BADCSUM = 0xf4,
- ROC_IE_OT_UCC_SUCCESS_PKT_UDPESP_NZCSUM = 0xf5,
- ROC_IE_OT_UCC_SUCCESS_PKT_UDP_ZEROCSUM = 0xf6,
- ROC_IE_OT_UCC_SUCCESS_PKT_IP_GOODCSUM = 0xf7,
+ ROC_IE_OT_UCC_SUCCESS_PKT_UDP_ZEROCSUM = 0xf3,
+ ROC_IE_OT_UCC_SUCCESS_PKT_IP_GOODCSUM = 0x0,
};
enum {
@@ -161,6 +161,15 @@ enum {
ROC_IE_OT_ERR_CTL_MODE_RING = 2,
};
+static __plt_always_inline bool
+roc_ie_ot_ucc_is_success(uint8_t ucc)
+{
+ uint8_t uc_base = (uint8_t)ROC_IE_OT_UCC_SUCCESS_PKT_IP_BADCSUM - 1u;
+
+ ucc--;
+ return (ucc >= uc_base);
+}
+
/* Context units in bytes */
#define ROC_CTX_UNIT_8B 8
#define ROC_CTX_UNIT_128B128
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
index 1d7a9e2952..68e6a660ea 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
@@ -779,8 +779,6 @@ cn10k_cpt_sec_post_process(struct rte_crypto_op *cop,
struct cpt_cn10k_res_s *re
mbuf->pkt_len = m_len;
switch (res->uc_compcode) {
- case ROC_IE_OT_UCC_SUCCESS:
- break;
case ROC_IE_OT_UCC_SUCCESS_PKT_IP_BADCSUM:
mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
break;
--
2.25.1
[PATCH 2/2] net/cnxk: update IPsec completion code handling
Update IPsec handling with reference from UCODE version
OCPT-04-IE-IPSEC-MC-30-01-28-00
Signed-off-by: Rahul Bhansali
---
drivers/net/cnxk/cn10k_rx.h | 170
1 file changed, 95 insertions(+), 75 deletions(-)
diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 4e22ceda02..ff01c2d8b3 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -42,17 +42,12 @@
(uint64_t *)(((uintptr_t)((uint64_t *)(b))[i]) - (o)) : \
(uint64_t *)(((uintptr_t)(b)) + CQE_SZ(i) - (o)))
-#define NIX_RX_SEC_UCC_CONST
\
- ((RTE_MBUF_F_RX_IP_CKSUM_BAD >> 1) << 8 | \
-((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1)\
-<< 24 | \
-((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1) \
-<< 32 | \
-((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1)\
-<< 40 | \
-((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1)\
-<< 48 | \
-(RTE_MBUF_F_RX_IP_CKSUM_GOOD >> 1) << 56)
+#define NIX_RX_SEC_UCC_CONST
\
+ ((RTE_MBUF_F_RX_IP_CKSUM_BAD >> 1) |
\
+((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1) <<
8 | \
+((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_BAD) >> 1) <<
16 | \
+((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1) <<
32 |\
+((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1) <<
48)
#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
static inline void
@@ -475,16 +470,23 @@ nix_sec_meta_to_mbuf_sc(uint64_t cq_w1, uint64_t cq_w5,
const uint64_t sa_base,
inner->data_len = len;
*(uint64_t *)(&inner->rearm_data) = mbuf_init;
- inner->ol_flags = ((ucc == CPT_COMP_WARN) ?
+ inner->ol_flags = ((CPT_COMP_HWGOOD_MASK & (1U << ucc))
?
RTE_MBUF_F_RX_SEC_OFFLOAD :
(RTE_MBUF_F_RX_SEC_OFFLOAD |
RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED));
ucc = hdr->w3.uc_ccode;
- inner->ol_flags |= ((ucc & 0xF0) == 0xF0) ?
- ((NIX_RX_SEC_UCC_CONST >> ((ucc & 0xF) << 3))
-& 0xFF) << 1 : 0;
- } else if (!(hdr->w0.err_sum) && !(hdr->w0.reas_sts)) {
+
+ if (ucc && ucc < 0xED) {
+ inner->ol_flags |=
RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
+ } else {
+ ucc += 3; /* To make codes in 0xFx series
except 0 */
+ inner->ol_flags |= ((ucc & 0xF0) == 0xF0) ?
+ ((NIX_RX_SEC_UCC_CONST >>
((ucc & 0xF) << 3))
+ & 0xFF) << 1 :
RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+ }
+ } else if ((!(hdr->w0.err_sum) ||
roc_ie_ot_ucc_is_success(hdr->w3.uc_ccode)) &&
+ !(hdr->w0.reas_sts)) {
/* Reassembly success */
inner = nix_sec_reassemble_frags(hdr, cq_w1, cq_w5,
mbuf_init);
@@ -541,15 +543,21 @@ nix_sec_meta_to_mbuf_sc(uint64_t cq_w1, uint64_t cq_w5,
const uint64_t sa_base,
inner->data_len = len;
*(uint64_t *)(&inner->rearm_data) = mbuf_init;
- inner->ol_flags = ((ucc == CPT_COMP_WARN) ?
+ inner->ol_flags = ((CPT_COMP_HWGOOD_MASK & (1U << ucc)) ?
RTE_MBUF_F_RX_SEC_OFFLOAD :
(RTE_MBUF_F_RX_SEC_OFFLOAD |
RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED));
ucc = hdr->w3.uc_ccode;
- inner->ol_flags |= ((ucc & 0xF0) == 0xF0) ?
- ((NIX_RX_SEC_UCC_CONST >> ((ucc & 0xF) << 3))
-& 0xFF) << 1 : 0;
+
+ if (ucc && ucc < 0xED) {
+ inner->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
+ } else {
+ ucc += 3; /* To make codes in 0xFx series except 0 */
+ inner->ol_flags |= ((ucc & 0xF0) == 0xF0) ?
+
Re: [PATCH v1] net/mlx5: fix action flag data type
01/11/2022 11:07, Shun Hao: > This patch fixes this by making all action flags definition as 64-bit > data type. No, it is defining as unsigned long long. [...] > /* Actions */ > -#define MLX5_FLOW_ACTION_DROP (1u << 0) > -#define MLX5_FLOW_ACTION_QUEUE (1u << 1) > -#define MLX5_FLOW_ACTION_RSS (1u << 2) > -#define MLX5_FLOW_ACTION_FLAG (1u << 3) > -#define MLX5_FLOW_ACTION_MARK (1u << 4) > -#define MLX5_FLOW_ACTION_COUNT (1u << 5) > -#define MLX5_FLOW_ACTION_PORT_ID (1u << 6) > -#define MLX5_FLOW_ACTION_OF_POP_VLAN (1u << 7) > -#define MLX5_FLOW_ACTION_OF_PUSH_VLAN (1u << 8) > -#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1u << 9) > -#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1u << 10) > -#define MLX5_FLOW_ACTION_SET_IPV4_SRC (1u << 11) > -#define MLX5_FLOW_ACTION_SET_IPV4_DST (1u << 12) > -#define MLX5_FLOW_ACTION_SET_IPV6_SRC (1u << 13) > -#define MLX5_FLOW_ACTION_SET_IPV6_DST (1u << 14) > -#define MLX5_FLOW_ACTION_SET_TP_SRC (1u << 15) > -#define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16) > -#define MLX5_FLOW_ACTION_JUMP (1u << 17) > -#define MLX5_FLOW_ACTION_SET_TTL (1u << 18) > -#define MLX5_FLOW_ACTION_DEC_TTL (1u << 19) > -#define MLX5_FLOW_ACTION_SET_MAC_SRC (1u << 20) > -#define MLX5_FLOW_ACTION_SET_MAC_DST (1u << 21) > -#define MLX5_FLOW_ACTION_ENCAP (1u << 22) > -#define MLX5_FLOW_ACTION_DECAP (1u << 23) > -#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1u << 24) > -#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1u << 25) > -#define MLX5_FLOW_ACTION_INC_TCP_ACK (1u << 26) > -#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1u << 27) > +#define MLX5_FLOW_ACTION_DROP (1ull << 0) > +#define MLX5_FLOW_ACTION_QUEUE (1ull << 1) > +#define MLX5_FLOW_ACTION_RSS (1ull << 2) > +#define MLX5_FLOW_ACTION_FLAG (1ull << 3) > +#define MLX5_FLOW_ACTION_MARK (1ull << 4) > +#define MLX5_FLOW_ACTION_COUNT (1ull << 5) > +#define MLX5_FLOW_ACTION_PORT_ID (1ull << 6) > +#define MLX5_FLOW_ACTION_OF_POP_VLAN (1ull << 7) > +#define MLX5_FLOW_ACTION_OF_PUSH_VLAN (1ull << 8) > +#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1ull << 9) > +#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1ull << 10) > +#define MLX5_FLOW_ACTION_SET_IPV4_SRC (1ull << 11) > +#define MLX5_FLOW_ACTION_SET_IPV4_DST (1ull << 12) > +#define MLX5_FLOW_ACTION_SET_IPV6_SRC (1ull << 13) > +#define MLX5_FLOW_ACTION_SET_IPV6_DST (1ull << 14) > +#define MLX5_FLOW_ACTION_SET_TP_SRC (1ull << 15) > +#define MLX5_FLOW_ACTION_SET_TP_DST (1ull << 16) > +#define MLX5_FLOW_ACTION_JUMP (1ull << 17) > +#define MLX5_FLOW_ACTION_SET_TTL (1ull << 18) > +#define MLX5_FLOW_ACTION_DEC_TTL (1ull << 19) > +#define MLX5_FLOW_ACTION_SET_MAC_SRC (1ull << 20) > +#define MLX5_FLOW_ACTION_SET_MAC_DST (1ull << 21) > +#define MLX5_FLOW_ACTION_ENCAP (1ull << 22) > +#define MLX5_FLOW_ACTION_DECAP (1ull << 23) > +#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1ull << 24) > +#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1ull << 25) > +#define MLX5_FLOW_ACTION_INC_TCP_ACK (1ull << 26) > +#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1ull << 27) > #define MLX5_FLOW_ACTION_SET_TAG (1ull << 28) > #define MLX5_FLOW_ACTION_MARK_EXT (1ull << 29) > #define MLX5_FLOW_ACTION_SET_META (1ull << 30) The correct fix would be to use the macro RTE_BIT64. Please can you convert the whole mlx5 to avoid using such unclear bit shifts?
[PATCH v7] ethdev: add special flags when creating async transfer table
In case flow rules match only one kind of traffic in a flow table,
then optimization can be done via allocation of this table.
Such optimization is possible only if the application gives a hint
about its usage of the table during initial configuration.
The transfer domain rules may process traffic from wire or vport,
which may correspond to two kinds of underlayer resources.
That's why the first two hints introduced in this patch are about
wire and vport traffic specialization.
Wire means traffic arrives from the uplink port while vport means
traffic initiated from VF/SF.
There are two possible approaches for providing the hints.
Using IPv4 as an example:
1. Use pattern item in both template table and flow rules.
pattern_template: pattern ANY_VPORT / eth / ipv4 is 1.1.1.1 / end
async flow create: pattern ANY_VPORT / eth / ipv4 is 1.1.1.2 / end
"ANY_VPORT" needs to be present in each flow rule even if it's
just a hint. No value to match because matching is already done by
IPv4 item.
2. Add special flags into table_attr.
template_table 0 create table_id 0 group 1 transfer vport_orig
Approach 1 needs to specify the pattern in each flow rule which wastes
memory and is not user friendly.
This patch takes the 2nd approach and introduces one new member
"specialize" into rte_flow_table_attr to indicate possible flow table
optimization.
By default, there is no hint, so the behavior of the transfer domain
doesn't change.
There is no guarantee that the hint will be used by the PMD.
Signed-off-by: Rongwei Liu
Acked-by: Ori Kam
v2: Move the new field to template table attribute.
v4: Mark it as optional and clear the concept.
v5: Change specialize type to uint32_t.
v6: Change the flags to macros and re-construct the commit log.
v7: Fix build failure.
---
app/test-pmd/cmdline_flow.c | 26 +++
doc/guides/prog_guide/rte_flow.rst | 15 +++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 ++-
lib/ethdev/rte_flow.h | 28 +
4 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 88108498e0..62197f2618 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -184,6 +184,8 @@ enum index {
TABLE_INGRESS,
TABLE_EGRESS,
TABLE_TRANSFER,
+ TABLE_TRANSFER_WIRE_ORIG,
+ TABLE_TRANSFER_VPORT_ORIG,
TABLE_RULES_NUMBER,
TABLE_PATTERN_TEMPLATE,
TABLE_ACTIONS_TEMPLATE,
@@ -1158,6 +1160,8 @@ static const enum index next_table_attr[] = {
TABLE_INGRESS,
TABLE_EGRESS,
TABLE_TRANSFER,
+ TABLE_TRANSFER_WIRE_ORIG,
+ TABLE_TRANSFER_VPORT_ORIG,
TABLE_RULES_NUMBER,
TABLE_PATTERN_TEMPLATE,
TABLE_ACTIONS_TEMPLATE,
@@ -2933,6 +2937,18 @@ static const struct token token_list[] = {
.next = NEXT(next_table_attr),
.call = parse_table,
},
+ [TABLE_TRANSFER_WIRE_ORIG] = {
+ .name = "wire_orig",
+ .help = "affect rule direction to transfer",
+ .next = NEXT(next_table_attr),
+ .call = parse_table,
+ },
+ [TABLE_TRANSFER_VPORT_ORIG] = {
+ .name = "vport_orig",
+ .help = "affect rule direction to transfer",
+ .next = NEXT(next_table_attr),
+ .call = parse_table,
+ },
[TABLE_RULES_NUMBER] = {
.name = "rules_number",
.help = "number of rules in table",
@@ -8993,6 +9009,16 @@ parse_table(struct context *ctx, const struct token
*token,
case TABLE_TRANSFER:
out->args.table.attr.flow_attr.transfer = 1;
return len;
+ case TABLE_TRANSFER_WIRE_ORIG:
+ if (!out->args.table.attr.flow_attr.transfer)
+ return -1;
+ out->args.table.attr.specialize =
RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG;
+ return len;
+ case TABLE_TRANSFER_VPORT_ORIG:
+ if (!out->args.table.attr.flow_attr.transfer)
+ return -1;
+ out->args.table.attr.specialize =
RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG;
+ return len;
default:
return -1;
}
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 3e6242803d..d9ca041ae4 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -3605,6 +3605,21 @@ and pattern and actions templates are created.
&actions_templates, nb_actions_templ,
&error);
+Table Attribute: Specialize
+^^^
+
+Application can help optimizing underlayer resources and insertion rate
+by specializing template table.
+Specialization is done by providing hints
+in the template table attribute ``specialize``.
[dpdk-dev] [PATCH v1 00/12] mldev: introduce machine learning device library
From: Jerin Jacob Machine learning inference library == Definition of machine learning inference Inference in machine learning is the process of making an output prediction based on new input data using a pre-trained machine learning model. The scope of the RFC would include only inferencing with pre-trained machine learning models, training and building/compiling the ML models is out of scope for this RFC or DPDK mldev API. Use existing machine learning compiler frameworks for model creation. Motivation for the new library -- Multiple semiconductor vendors are offering accelerator products such as DPU (often called Smart-NIC), FPGA, GPU, etc., which have ML inferencing capabilities integrated as part of the product. Use of ML inferencing is increasing in the domain of packet processing for flow classification, intrusion, malware and anomaly detection. Lack of inferencing support through DPDK APIs will involve complexities and increased latency from moving data across frameworks (i.e, dataplane to non dataplane ML frameworks and vice-versa). Having a standardized DPDK APIs for ML inferencing would enable the dataplane solutions to harness the benefit of inline inferencing supported by the hardware. Contents --- A) API specification for: 1) Discovery of ML capabilities (e.g., device specific features) in a vendor independent fashion 2) Definition of functions to handle ML devices, which includes probing, initialization and termination of the devices. 3) Definition of functions to handle ML models used to perform inference operations. 4) Definition of function to handle quantize and dequantize operations B) Common code for above specification Roadmap --- 1) SW mldev driver based on TVM (https://tvm.apache.org/) 2) HW mldev driver for cn10k 3) Add app/test-mldev application similar to other device class tests rfc..v1: - Added programmer guide documentation - Added implementation for common code Machine learning library framework -- The ML framework is built on the following model: +-+ rte_ml_[en|de]queue_burst() | | | | Machine o--+ ++| | Learning| | | queue ||+--+ | Inference o--+-o|<===o===>|Core 0| | Engine | | | pair 0 | +--+ | o+ | ++ | || | +-+| | ++ ^ | | | queue | +--+ | | +-o|<===>|Core 1| | | | pair 1 | +--+ | | ++ +++| | +-+ || ++ | | Model 0 | || | queue | +--+ | +-+ |+---o|<===>|Core N| | +-+ || pair N | +--+ | | Model 1 | |++ | +-+ | | +-+ |<--- rte_ml_model_load() | | Model .. | |---> rte_ml_model_info() | +-+ |<--- rte_ml_model_start() | +-+ |<--- rte_ml_model_stop() | | Model N | |<--- rte_ml_model_params_update() | +-+ |<--- rte_ml_model_unload() +-+ ML Device: A hardware or software-based implementation of ML device API for running inferences using a pre-trained ML model. ML Model: An ML model is an algorithm trained over a dataset. A model consists of procedure/algorithm and data/pattern required to make predictions on live data. Once the model is created and trained outside of the DPDK scope, the model can be loaded via rte_ml_model_load() and then start it using rte_ml_model_start() API. The rte_ml_model_params_update() can be used to update the model parameters such as weight and bias without unloading the model using rte_ml_model_unload(). ML Inference: ML inference is the process of feeding data to the model via rte_ml_enqueue_burst() API and use rte_ml_dequeue_burst() API to get the calculated outputs/predictions from the started model. In all functions of the ML device API, the ML device is designated by an integer >= 0 named as device identifier *dev_id*. The functions exported by the ML device API to setup a device designated by its device identifier must be invoked in the following order: - rte_ml_dev_configure() - rte_ml_dev_queue_pair_setup() - rte_ml_dev_start() A model is required to run the inference operations with the user specified inputs. Application needs to invoke the ML model API in the following order before queueing inference jobs. - rte_ml_model_load() - rte_ml_model_start()
[dpdk-dev] [PATCH v1 02/12] mldev: add PMD functions for ML device
From: Srikanth Yalavarthi
Added PMD functions to handle ML devices. The rte_mldev_pmd.*
files are for drivers only and should be private to DPDK, and
are not installed for application use.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/meson.build | 9 +++
lib/mldev/rte_mldev.c | 128 +++
lib/mldev/rte_mldev_core.h | 115
lib/mldev/rte_mldev_pmd.c | 61 +++
lib/mldev/rte_mldev_pmd.h | 149 +
lib/mldev/version.map | 11 +++
6 files changed, 473 insertions(+)
create mode 100644 lib/mldev/rte_mldev_core.h
create mode 100644 lib/mldev/rte_mldev_pmd.c
create mode 100644 lib/mldev/rte_mldev_pmd.h
diff --git a/lib/mldev/meson.build b/lib/mldev/meson.build
index e378cfca30..5c99532c1a 100644
--- a/lib/mldev/meson.build
+++ b/lib/mldev/meson.build
@@ -2,6 +2,7 @@
# Copyright (c) 2022 Marvell.
sources = files(
+'rte_mldev_pmd.c',
'rte_mldev.c',
)
@@ -9,6 +10,14 @@ headers = files(
'rte_mldev.h',
)
+indirect_headers += files(
+'rte_mldev_core.h',
+)
+
+driver_sdk_headers += files(
+'rte_mldev_pmd.h',
+)
+
deps += ['mempool']
if get_option('buildtype').contains('debug')
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 2e3dfa0e6b..a4e0b5f94f 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -3,3 +3,131 @@
*/
#include
+#include
+
+static struct rte_ml_dev ml_devices[RTE_MLDEV_MAX_DEVS];
+
+static struct rte_ml_dev_global ml_dev_globals = {
+ .devs = ml_devices, .data = {NULL}, .nb_devs = 0, .max_devs =
RTE_MLDEV_MAX_DEVS};
+
+struct rte_ml_dev *
+rte_ml_dev_pmd_get_dev(int16_t dev_id)
+{
+ return &ml_dev_globals.devs[dev_id];
+}
+
+struct rte_ml_dev *
+rte_ml_dev_pmd_get_named_dev(const char *name)
+{
+ struct rte_ml_dev *dev;
+ int16_t dev_id;
+
+ if (name == NULL)
+ return NULL;
+
+ for (dev_id = 0; dev_id < RTE_MLDEV_MAX_DEVS; dev_id++) {
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if ((dev->attached == ML_DEV_ATTACHED) &&
(strcmp(dev->data->name, name) == 0))
+ return dev;
+ }
+
+ return NULL;
+}
+
+struct rte_ml_dev *
+rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id)
+{
+ char mz_name[RTE_MEMZONE_NAMESIZE];
+ const struct rte_memzone *mz;
+ struct rte_ml_dev *dev;
+ int16_t dev_id;
+
+ if (rte_ml_dev_pmd_get_named_dev(name) != NULL) {
+ ML_DEV_LOG(ERR, "ML device with name %s already allocated!",
name);
+ return NULL;
+ }
+
+ /* Get a free device ID */
+ for (dev_id = 0; dev_id < RTE_MLDEV_MAX_DEVS; dev_id++) {
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (dev->attached == ML_DEV_DETACHED)
+ break;
+ }
+
+ if (dev_id == RTE_MLDEV_MAX_DEVS) {
+ ML_DEV_LOG(ERR, "Reached maximum number of ML devices");
+ return NULL;
+ }
+
+ if (dev->data == NULL) {
+ /* Reserve memzone name */
+ sprintf(mz_name, "rte_ml_dev_data_%d", dev_id);
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ mz = rte_memzone_reserve(mz_name, sizeof(struct
rte_ml_dev_data), socket_id,
+0);
+ ML_DEV_LOG(DEBUG, "PRIMARY: reserved memzone for %s
(%p)", mz_name, mz);
+ } else {
+ mz = rte_memzone_lookup(mz_name);
+ ML_DEV_LOG(DEBUG, "SECONDARY: looked up memzone for %s
(%p)", mz_name, mz);
+ }
+
+ if (mz == NULL)
+ return NULL;
+
+ ml_dev_globals.data[dev_id] = mz->addr;
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ memset(ml_dev_globals.data[dev_id], 0, sizeof(struct
rte_ml_dev_data));
+
+ dev->data = ml_dev_globals.data[dev_id];
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ strlcpy(dev->data->name, name, RTE_ML_STR_MAX);
+ dev->data->dev_id = dev_id;
+ dev->data->socket_id = socket_id;
+ dev->data->dev_started = 0;
+ ML_DEV_LOG(DEBUG, "PRIMARY: init mldev data");
+ }
+
+ ML_DEV_LOG(DEBUG, "Data for %s: dev_id %d, socket %u",
dev->data->name,
+ dev->data->dev_id, dev->data->socket_id);
+
+ dev->attached = ML_DEV_ATTACHED;
+ ml_dev_globals.nb_devs++;
+ }
+
+ return dev;
+}
+
+int
+rte_ml_dev_pmd_release(struct rte_ml_dev *dev)
+{
+ char mz_name[RTE_MEMZONE_NAMESIZE];
+ const struct rte_memzone *mz;
+ int16_t dev_id;
+ int ret = 0;
+
+ if
[dpdk-dev] [PATCH v1 03/12] mldev: support device handling functions
From: Srikanth Yalavarthi
Added device handling APIs. These APIs are used to get device
information, configure, start, stop and close ML devices. Added
function prototypes to PMD layer which are used by the ML driver
implementations in the poll mode driver.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 175 +
lib/mldev/rte_mldev_core.h | 107 +++
lib/mldev/version.map | 11 +++
3 files changed, 293 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index a4e0b5f94f..651f8b2f7c 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -131,3 +131,178 @@ rte_ml_dev_pmd_release(struct rte_ml_dev *dev)
return ret;
}
+
+uint16_t
+rte_ml_dev_count(void)
+{
+ return ml_dev_globals.nb_devs;
+}
+
+int
+rte_ml_dev_is_valid_dev(int16_t dev_id)
+{
+ struct rte_ml_dev *dev = NULL;
+
+ if (dev_id >= ml_dev_globals.max_devs || ml_devices[dev_id].data ==
NULL)
+ return 0;
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (dev->attached != ML_DEV_ATTACHED)
+ return 0;
+ else
+ return 1;
+}
+
+int
+rte_ml_dev_socket_id(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+
+ return dev->data->socket_id;
+}
+
+int
+rte_ml_dev_info_get(int16_t dev_id, struct rte_ml_dev_info *dev_info)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_info_get == NULL)
+ return -ENOTSUP;
+
+ if (dev_info == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, dev_info cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+ memset(dev_info, 0, sizeof(struct rte_ml_dev_info));
+
+ return (*dev->dev_ops->dev_info_get)(dev, dev_info);
+}
+
+int
+rte_ml_dev_configure(int16_t dev_id, const struct rte_ml_dev_config *config)
+{
+ struct rte_ml_dev_info dev_info;
+ struct rte_ml_dev *dev;
+ int ret;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_configure == NULL)
+ return -ENOTSUP;
+
+ if (dev->data->dev_started) {
+ ML_DEV_LOG(ERR, "Device %d must be stopped to allow
configuration", dev_id);
+ return -EBUSY;
+ }
+
+ if (config == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, config cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ ret = rte_ml_dev_info_get(dev_id, &dev_info);
+ if (ret < 0)
+ return ret;
+
+ if (config->nb_queue_pairs > dev_info.max_queue_pairs) {
+ ML_DEV_LOG(ERR, "Device %d num of queues %u > %u\n", dev_id,
config->nb_queue_pairs,
+ dev_info.max_queue_pairs);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->dev_configure)(dev, config);
+}
+
+int
+rte_ml_dev_close(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_close == NULL)
+ return -ENOTSUP;
+
+ /* Device must be stopped before it can be closed */
+ if (dev->data->dev_started == 1) {
+ ML_DEV_LOG(ERR, "Device %d must be stopped before closing",
dev_id);
+ return -EBUSY;
+ }
+
+ return (*dev->dev_ops->dev_close)(dev);
+}
+
+int
+rte_ml_dev_start(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+ int ret;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_start == NULL)
+ return -ENOTSUP;
+
+ if (dev->data->dev_started != 0) {
+ ML_DEV_LOG(ERR, "Device %d is already started", dev_id);
+ return -EBUSY;
+ }
+
+ ret = (*dev->dev_ops->dev_start)(dev);
+ if (ret == 0)
+ dev->data->dev_started = 1;
+
+ return ret;
+}
+
+int
+rte_ml_dev_stop(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+ int ret;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+
[dpdk-dev] [PATCH v1 01/12] mldev: introduce machine learning device library
From: Jerin Jacob Add mldev API specification to standardize and use the machine learning device and inference operations in vendor neutral way. Following operations are abstracted through APIs - ML device capability probe - ML device configuration - ML device queue pair configuration - ML device state management - ML device stat/xstat operations - ML model load/unload/start/stop operations - ML model information probe - ML IO operations to find size for input and output buffers - ML quantize and dequantize operations - ML ops pool creation and free operations - ML device enqueue/dequeue fastpath interference operations Also added programming guide. Signed-off-by: Jerin Jacob Signed-off-by: Srikanth Yalavarthi --- MAINTAINERS |5 + config/rte_config.h |3 + doc/api/doxy-api-index.md|1 + doc/api/doxy-api.conf.in |1 + doc/guides/prog_guide/img/mldev_flow.svg | 714 ++ doc/guides/prog_guide/index.rst |1 + doc/guides/prog_guide/mldev.rst | 186 lib/eal/common/eal_common_log.c |1 + lib/eal/include/rte_log.h|1 + lib/meson.build |1 + lib/mldev/meson.build| 18 + lib/mldev/rte_mldev.c|5 + lib/mldev/rte_mldev.h| 1092 ++ lib/mldev/version.map|3 + 14 files changed, 2032 insertions(+) create mode 100644 doc/guides/prog_guide/img/mldev_flow.svg create mode 100644 doc/guides/prog_guide/mldev.rst create mode 100644 lib/mldev/meson.build create mode 100644 lib/mldev/rte_mldev.c create mode 100644 lib/mldev/rte_mldev.h create mode 100644 lib/mldev/version.map diff --git a/MAINTAINERS b/MAINTAINERS index 0e2fd39928..b2ab042248 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -534,6 +534,11 @@ F: drivers/raw/skeleton/ F: app/test/test_rawdev.c F: doc/guides/prog_guide/rawdev.rst +ML device API - EXPERIMENTAL +M: Srikanth Yalavarthi +F: lib/mldev/ +F: doc/guides/prog_guide/mldev.rst + Memory Pool Drivers --- diff --git a/config/rte_config.h b/config/rte_config.h index 3c4876d434..083d37757d 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -83,6 +83,9 @@ /* rawdev defines */ #define RTE_RAWDEV_MAX_DEVS 64 +/* mldev defines */ +#define RTE_MLDEV_MAX_DEVS 64 + /* ip_fragmentation defines */ #define RTE_LIBRTE_IP_FRAG_MAX_FRAG 8 // RTE_LIBRTE_IP_FRAG_TBL_STAT is not set diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index de488c7abf..a12562977a 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -22,6 +22,7 @@ The public API headers are grouped by topics: [compress](@ref rte_comp.h), [regexdev](@ref rte_regexdev.h), [dmadev](@ref rte_dmadev.h), + [mldev](@ref rte_mldev.h), [eventdev](@ref rte_eventdev.h), [event_eth_rx_adapter](@ref rte_event_eth_rx_adapter.h), [event_eth_tx_adapter](@ref rte_event_eth_tx_adapter.h), diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index f0886c3bd1..5d6416d3e0 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -57,6 +57,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ @TOPDIR@/lib/mempool \ @TOPDIR@/lib/meter \ @TOPDIR@/lib/metrics \ + @TOPDIR@/lib/mldev \ @TOPDIR@/lib/node \ @TOPDIR@/lib/net \ @TOPDIR@/lib/pcapng \ diff --git a/doc/guides/prog_guide/img/mldev_flow.svg b/doc/guides/prog_guide/img/mldev_flow.svg new file mode 100644 index 00..6c5dda14e5 --- /dev/null +++ b/doc/guides/prog_guide/img/mldev_flow.svg @@ -0,0 +1,714 @@ + + + + + +http://www.inkscape.org/namespaces/inkscape"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:svg="http://www.w3.org/2000/svg";> + + + + + + + + + + + + + + + + + + + + + + +rte_ml_model_update_params() + + + +rte_ml_model_stop() + + + +rte_ml_model_unload() + + + +rte_ml_model_start() + + + +rte_ml_model_info_get() + + + +rte_ml_model_load() + + + +rte_ml_dequeue_burst() + + + + + + + + + +Queue Pair 0 + + + +Queue Pair .. + + + +Queue Pair N + + + + + +Core 0 + + + +Core .. + + + +Core N + + + +rte_ml_enqueue_burst() + + + +
[dpdk-dev] [PATCH v1 04/12] mldev: support device queue-pair setup
From: Srikanth Yalavarthi
Added APIs to create a queue-pair attached to ML device.
Queue pairs are created with a user specified ID. Added
function prototypes to be used by ML drivers for queue
pair create and destroy.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 33
lib/mldev/rte_mldev_core.h | 44 ++
lib/mldev/version.map | 1 +
3 files changed, 78 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 651f8b2f7c..c8672cff8e 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -306,3 +306,36 @@ rte_ml_dev_stop(int16_t dev_id)
return ret;
}
+
+int
+rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t queue_pair_id,
+ const struct rte_ml_dev_qp_conf *qp_conf, int
socket_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_queue_pair_setup == NULL)
+ return -ENOTSUP;
+
+ if (queue_pair_id >= dev->data->nb_queue_pairs) {
+ ML_DEV_LOG(ERR, "Invalid queue_pair_id = %d", queue_pair_id);
+ return -EINVAL;
+ }
+
+ if (qp_conf == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, qp_conf cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (dev->data->dev_started) {
+ ML_DEV_LOG(ERR, "Device %d must be stopped to allow
configuration", dev_id);
+ return -EBUSY;
+ }
+
+ return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id,
qp_conf, socket_id);
+}
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 1405cce7f7..e2a16034d6 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -117,6 +117,44 @@ typedef int (*mldev_start_t)(struct rte_ml_dev *dev);
*/
typedef int (*mldev_stop_t)(struct rte_ml_dev *dev);
+/**
+ * @internal
+ *
+ * Setup a queue pair for a device.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param queue_pair_id
+ * Queue pair index.
+ * @param queue_pair_conf
+ * Queue pair configuration structure.
+ * @param socket_id
+ * Socket index.
+ *
+ * @return
+ * - 0 on success.
+ * - < 0, error on failure.
+ */
+typedef int (*mldev_queue_pair_setup_t)(struct rte_ml_dev *dev, uint16_t
queue_pair_id,
+ const struct rte_ml_dev_qp_conf
*queue_pair_conf,
+ int socket_id);
+
+/**
+ * @internal
+ *
+ * Release memory resources allocated by given queue pair.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param queue_pair_id
+ * Queue pair index.
+ *
+ * @return
+ * - 0 on success.
+ * - -EAGAIN, if can't close as device is busy.
+ */
+typedef int (*mldev_queue_pair_release_t)(struct rte_ml_dev *dev, uint16_t
queue_pair_id);
+
/**
* @internal
*
@@ -137,6 +175,12 @@ struct rte_ml_dev_ops {
/** Stop device. */
mldev_stop_t dev_stop;
+
+ /** Set up a device queue pair. */
+ mldev_queue_pair_setup_t dev_queue_pair_setup;
+
+ /** Release a device queue pair. */
+ mldev_queue_pair_release_t dev_queue_pair_release;
};
/**
diff --git a/lib/mldev/version.map b/lib/mldev/version.map
index 1be508ab5f..cd44c05f3a 100644
--- a/lib/mldev/version.map
+++ b/lib/mldev/version.map
@@ -6,6 +6,7 @@ EXPERIMENTAL {
rte_ml_dev_count;
rte_ml_dev_info_get;
rte_ml_dev_is_valid_dev;
+ rte_ml_dev_queue_pair_setup;
rte_ml_dev_socket_id;
rte_ml_dev_start;
rte_ml_dev_stop;
--
2.38.1
[dpdk-dev] [PATCH v1 06/12] mldev: support input and output data handling
From: Srikanth Yalavarthi
Added RTE library functions to handle model input and
output data. The APIs can be used to get the size of I/O
buffers, quantize input data and dequantize output data.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 94
lib/mldev/rte_mldev_core.h | 106 +
lib/mldev/version.map | 4 ++
3 files changed, 204 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 327ed7144d..13b7e93943 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -462,3 +462,97 @@ rte_ml_model_params_update(int16_t dev_id, int16_t
model_id, void *buffer)
return (*dev->dev_ops->model_params_update)(dev, model_id, buffer);
}
+
+int
+rte_ml_io_input_size_get(int16_t dev_id, int16_t model_id, uint32_t nb_batches,
+uint64_t *input_qsize, uint64_t *input_dsize)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->io_input_size_get == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->io_input_size_get)(dev, model_id, nb_batches,
input_qsize,
+ input_dsize);
+}
+
+int
+rte_ml_io_output_size_get(int16_t dev_id, int16_t model_id, uint32_t
nb_batches,
+ uint64_t *output_qsize, uint64_t *output_dsize)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->io_output_size_get == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->io_output_size_get)(dev, model_id, nb_batches,
output_qsize,
+ output_dsize);
+}
+
+int
+rte_ml_io_quantize(int16_t dev_id, int16_t model_id, uint16_t nb_batches, void
*dbuffer,
+ void *qbuffer)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->io_quantize == NULL)
+ return -ENOTSUP;
+
+ if (dbuffer == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, dbuffer cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (qbuffer == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, qbuffer cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->io_quantize)(dev, model_id, nb_batches, dbuffer,
qbuffer);
+}
+
+int
+rte_ml_io_dequantize(int16_t dev_id, int16_t model_id, uint16_t nb_batches,
void *qbuffer,
+void *dbuffer)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->io_dequantize == NULL)
+ return -ENOTSUP;
+
+ if (qbuffer == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, qbuffer cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (dbuffer == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, dbuffer cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->io_dequantize)(dev, model_id, nb_batches,
qbuffer, dbuffer);
+}
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 172454c2aa..b388553a96 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -259,6 +259,100 @@ typedef int (*mldev_model_info_get_t)(struct rte_ml_dev
*dev, int16_t model_id,
*/
typedef int (*mldev_model_params_update_t)(struct rte_ml_dev *dev, int16_t
model_id, void *buffer);
+/**
+ * @internal
+ *
+ * Get size of input buffers.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param model_id
+ * Model ID to use.
+ * @param nb_batches
+ * Number of batches.
+ * @param input_qsize
+ * Size of quantized input.
+ * @param input_dsize
+ * Size of dequantized input.
+ *
+ * @return
+ * - 0 on success.
+ * - <0, error on failure.
+ */
+typedef int (*mldev_io_input_size_get_t)(struct rte_ml_dev *dev, int16_t
model_id,
+uint32_t nb_batches, uint64_t
*input_qsize,
+uint64_t *input_dsize);
+
+/**
+ * @internal
+ *
+ * Get size of output buffers.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param model_id
+ * Model ID to use.
+ * @param nb_batche
[dpdk-dev] [PATCH v1 05/12] mldev: support handling ML models
From: Srikanth Yalavarthi
Added RTE functions to handle ML models. These APIs can
load, unload, start, and stop an ML model. Additional APIs
to update model parameters and get model information are
added.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 123 +
lib/mldev/rte_mldev_core.h | 122
lib/mldev/version.map | 6 ++
3 files changed, 251 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index c8672cff8e..327ed7144d 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -339,3 +339,126 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t
queue_pair_id,
return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id,
qp_conf, socket_id);
}
+
+int
+rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, int16_t
*model_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_load == NULL)
+ return -ENOTSUP;
+
+ if (params == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, params cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (model_id == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, model_id cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->model_load)(dev, params, model_id);
+}
+
+int
+rte_ml_model_unload(int16_t dev_id, int16_t model_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_unload == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->model_unload)(dev, model_id);
+}
+
+int
+rte_ml_model_start(int16_t dev_id, int16_t model_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_start == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->model_start)(dev, model_id);
+}
+
+int
+rte_ml_model_stop(int16_t dev_id, int16_t model_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_stop == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->model_stop)(dev, model_id);
+}
+
+int
+rte_ml_model_info_get(int16_t dev_id, int16_t model_id, struct
rte_ml_model_info *model_info)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_info_get == NULL)
+ return -ENOTSUP;
+
+ if (model_info == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, model_id %d, model_info cannot be
NULL\n", dev_id,
+ model_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->model_info_get)(dev, model_id, model_info);
+}
+
+int
+rte_ml_model_params_update(int16_t dev_id, int16_t model_id, void *buffer)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->model_params_update == NULL)
+ return -ENOTSUP;
+
+ if (buffer == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, buffer cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->model_params_update)(dev, model_id, buffer);
+}
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index e2a16034d6..172454c2aa 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -155,6 +155,110 @@ typedef int (*mldev_queue_pair_setup_t)(struct rte_ml_dev
*dev, uint16_t queue_p
*/
typedef int (*mldev_queue_pair_release_t)(struct rte_ml_dev *dev, uint16_t
queue_pair_id);
+/**
+ * @internal
+ *
+ * Function used to load an ML model.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param params
+ * Model load params.
+ * @param model_id
+ * Model ID returned by the library.
+ *
+ * @return
+ * - 0 on success.
+ * - < 0, error on failure.
+
[dpdk-dev] [PATCH v1 07/12] mldev: support op pool and its operations
From: Srikanth Yalavarthi
Added RTE library functions to create and free ML op pool.
Create function allocates new ML op pool and initializes ML
ops to their defaults.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 69 +++
lib/mldev/version.map | 2 ++
2 files changed, 71 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 13b7e93943..cc87837d85 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -10,6 +10,17 @@ static struct rte_ml_dev ml_devices[RTE_MLDEV_MAX_DEVS];
static struct rte_ml_dev_global ml_dev_globals = {
.devs = ml_devices, .data = {NULL}, .nb_devs = 0, .max_devs =
RTE_MLDEV_MAX_DEVS};
+/*
+ * Private data structure of an operation pool.
+ *
+ * A structure that contains ml op_pool specific data that is
+ * appended after the mempool structure (in private data).
+ */
+struct rte_ml_op_pool_private {
+ uint16_t user_size;
+ /*< Size of private user data with each operation. */
+};
+
struct rte_ml_dev *
rte_ml_dev_pmd_get_dev(int16_t dev_id)
{
@@ -556,3 +567,61 @@ rte_ml_io_dequantize(int16_t dev_id, int16_t model_id,
uint16_t nb_batches, void
return (*dev->dev_ops->io_dequantize)(dev, model_id, nb_batches,
qbuffer, dbuffer);
}
+
+/** Initialise rte_ml_op mempool element */
+static void
+ml_op_init(struct rte_mempool *mempool, __rte_unused void *opaque_arg, void
*_op_data,
+ __rte_unused unsigned int i)
+{
+ struct rte_ml_op *op = _op_data;
+
+ memset(_op_data, 0, mempool->elt_size);
+ op->status = RTE_ML_OP_STATUS_NOT_PROCESSED;
+ op->mempool = mempool;
+}
+
+struct rte_mempool *
+rte_ml_op_pool_create(const char *name, unsigned int nb_elts, unsigned int
cache_size,
+ uint16_t user_size, int socket_id)
+{
+ struct rte_ml_op_pool_private *priv;
+ struct rte_mempool *mp;
+ unsigned int elt_size;
+
+ /* lookup mempool in case already allocated */
+ mp = rte_mempool_lookup(name);
+ elt_size = sizeof(struct rte_ml_op) + user_size;
+
+ if (mp != NULL) {
+ priv = (struct rte_ml_op_pool_private
*)rte_mempool_get_priv(mp);
+ if (mp->elt_size != elt_size || mp->cache_size < cache_size ||
mp->size < nb_elts ||
+ priv->user_size < user_size) {
+ mp = NULL;
+ ML_DEV_LOG(ERR,
+ "Mempool %s already exists but with
incompatible parameters",
+ name);
+ return NULL;
+ }
+ return mp;
+ }
+
+ mp = rte_mempool_create(name, nb_elts, elt_size, cache_size,
+ sizeof(struct rte_ml_op_pool_private), NULL,
NULL, ml_op_init, NULL,
+ socket_id, 0);
+ if (mp == NULL) {
+ ML_DEV_LOG(ERR, "Failed to create mempool %s", name);
+ return NULL;
+ }
+
+ priv = (struct rte_ml_op_pool_private *)rte_mempool_get_priv(mp);
+ priv->user_size = user_size;
+
+ return mp;
+}
+
+void
+rte_ml_op_pool_free(struct rte_mempool *mempool)
+{
+ if (mempool != NULL)
+ rte_mempool_free(mempool);
+}
diff --git a/lib/mldev/version.map b/lib/mldev/version.map
index 0b180020db..396ca0b96a 100644
--- a/lib/mldev/version.map
+++ b/lib/mldev/version.map
@@ -20,6 +20,8 @@ EXPERIMENTAL {
rte_ml_model_start;
rte_ml_model_stop;
rte_ml_model_unload;
+ rte_ml_op_pool_create;
+ rte_ml_op_pool_free;
local: *;
};
--
2.38.1
[dpdk-dev] [PATCH v1 08/12] mldev: support inference enqueue and dequeue
From: Srikanth Yalavarthi
Added implementations of fast-path functions to enqueue
and dequeue ML requests from an ML device queue-pair.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 76 ++
lib/mldev/rte_mldev_core.h | 46 +++
lib/mldev/rte_mldev_pmd.h | 2 +
lib/mldev/version.map | 2 +
4 files changed, 126 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index cc87837d85..adf8ab8cbc 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -2,6 +2,7 @@
* Copyright (c) 2022 Marvell.
*/
+#include
#include
#include
@@ -105,6 +106,9 @@ rte_ml_dev_pmd_allocate(const char *name, uint8_t socket_id)
ml_dev_globals.nb_devs++;
}
+ dev->enqueue_burst = NULL;
+ dev->dequeue_burst = NULL;
+
return dev;
}
@@ -625,3 +629,75 @@ rte_ml_op_pool_free(struct rte_mempool *mempool)
if (mempool != NULL)
rte_mempool_free(mempool);
}
+
+uint16_t
+rte_ml_enqueue_burst(int16_t dev_id, uint16_t qp_id, struct rte_ml_op **ops,
uint16_t nb_ops)
+{
+ struct rte_ml_dev *dev;
+
+#ifdef RTE_LIBRTE_ML_DEV_DEBUG
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->enqueue_burst == NULL) {
+ rte_errno = -ENOTSUP;
+ return 0;
+ }
+
+ if (ops == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, ops cannot be NULL\n", dev_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+
+ if (qp_id >= dev->data->nb_queue_pairs) {
+ ML_DEV_LOG(ERR, "Invalid qp_id %u\n", qp_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+#else
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+#endif
+
+ return (*dev->enqueue_burst)(dev, qp_id, ops, nb_ops);
+}
+
+uint16_t
+rte_ml_dequeue_burst(int16_t dev_id, uint16_t qp_id, struct rte_ml_op **ops,
uint16_t nb_ops)
+{
+ struct rte_ml_dev *dev;
+
+#ifdef RTE_LIBRTE_ML_DEV_DEBUG
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dequeue_burst == NULL) {
+ rte_errno = -ENOTSUP;
+ return 0;
+ }
+
+ if (ops == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, ops cannot be NULL\n", dev_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+
+ if (qp_id >= dev->data->nb_queue_pairs) {
+ ML_DEV_LOG(ERR, "Invalid qp_id %u\n", qp_id);
+ rte_errno = -EINVAL;
+ return 0;
+ }
+#else
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+#endif
+
+ return (*dev->dequeue_burst)(dev, qp_id, ops, nb_ops);
+}
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index b388553a96..9c19d7badf 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -37,6 +37,46 @@ extern "C" {
struct rte_ml_dev;
+/**
+ * @internal
+ *
+ * Enqueue a burst of inference requests to a queue on ML device.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param qp_id
+ * Queue-pair ID.
+ * @param ops
+ * Array of ML ops to be enqueued.
+ * @param nb_ops
+ * Number of ops to enqueue.
+ *
+ * @return
+ * - Number of ops enqueued.
+ */
+typedef uint16_t (*mldev_enqueue_t)(struct rte_ml_dev *dev, uint16_t qp_id,
struct rte_ml_op **ops,
+ uint16_t nb_ops);
+
+/**
+ * @internal
+ *
+ * Dequeue a burst of inference requests from a queue on ML device.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param qp_id
+ * Queue-pair ID.
+ * @param ops
+ * Array of ML ops to dequeued.
+ * @param nb_ops
+ * Number of ops to dequeue.
+ *
+ * @return
+ * - Number of ops dequeued.
+ */
+typedef uint16_t (*mldev_dequeue_t)(struct rte_ml_dev *dev, uint16_t qp_id,
struct rte_ml_op **ops,
+ uint16_t nb_ops);
+
/**
* Definitions of all functions exported by a driver through the generic
structure of type
* *ml_dev_ops* supplied in the *rte_ml_dev* structure associated with a
device.
@@ -455,6 +495,12 @@ struct rte_ml_dev_data {
* The data structure associated with each ML device.
*/
struct rte_ml_dev {
+ /** Pointer to PMD enqueue function. */
+ mldev_enqueue_t enqueue_burst;
+
+ /** Pointer to PMD dequeue function. */
+ mldev_dequeue_t dequeue_burst;
+
/** Pointer to device data. */
struct rte_ml_dev_data *data;
diff --git a/lib/mldev/rte_mldev_pmd.h b/lib/mldev/rte_mldev_pmd.h
index 33544f1b80..afe617e4bf 100644
--- a/lib/ml
[dpdk-dev] [PATCH v1 09/12] mldev: support device statistics
From: Srikanth Yalavarthi
Added functions to get and reset device stats.
Device stats include number of requests enqueued, dequeued and errors.
Added function prototypes to used by driver implementations.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 40 ++
lib/mldev/rte_mldev_core.h | 32 ++
lib/mldev/version.map | 2 ++
3 files changed, 74 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index adf8ab8cbc..41b2a0be84 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -355,6 +355,46 @@ rte_ml_dev_queue_pair_setup(int16_t dev_id, uint16_t
queue_pair_id,
return (*dev->dev_ops->dev_queue_pair_setup)(dev, queue_pair_id,
qp_conf, socket_id);
}
+int
+rte_ml_dev_stats_get(int16_t dev_id, struct rte_ml_dev_stats *stats)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_stats_get == NULL)
+ return -ENOTSUP;
+
+ if (stats == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, stats cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+ memset(stats, 0, sizeof(struct rte_ml_dev_stats));
+
+ return (*dev->dev_ops->dev_stats_get)(dev, stats);
+}
+
+void
+rte_ml_dev_stats_reset(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_stats_reset == NULL)
+ return;
+
+ (*dev->dev_ops->dev_stats_reset)(dev);
+}
+
int
rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, int16_t
*model_id)
{
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 9c19d7badf..3f05ecd9c6 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -195,6 +195,32 @@ typedef int (*mldev_queue_pair_setup_t)(struct rte_ml_dev
*dev, uint16_t queue_p
*/
typedef int (*mldev_queue_pair_release_t)(struct rte_ml_dev *dev, uint16_t
queue_pair_id);
+/**
+ * @internal
+ *
+ * Function used to get device statistics.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param stats
+ * Pointer to ML device stats structure to update.
+ *
+ * @return
+ * - 0 on success.
+ * - < 0, error on failure.
+ */
+typedef int (*mldev_stats_get_t)(struct rte_ml_dev *dev, struct
rte_ml_dev_stats *stats);
+
+/**
+ * @internal
+ *
+ * Function used to reset device statistics.
+ *
+ * @param dev
+ * ML device pointer.
+ */
+typedef void (*mldev_stats_reset_t)(struct rte_ml_dev *dev);
+
/**
* @internal
*
@@ -420,6 +446,12 @@ struct rte_ml_dev_ops {
/** Release a device queue pair. */
mldev_queue_pair_release_t dev_queue_pair_release;
+ /** Get device statistics. */
+ mldev_stats_get_t dev_stats_get;
+
+ /** Reset device statistics. */
+ mldev_stats_reset_t dev_stats_reset;
+
/** Load an ML model. */
mldev_model_load_t model_load;
diff --git a/lib/mldev/version.map b/lib/mldev/version.map
index 5d44d210d7..d12263010b 100644
--- a/lib/mldev/version.map
+++ b/lib/mldev/version.map
@@ -10,6 +10,8 @@ EXPERIMENTAL {
rte_ml_dev_queue_pair_setup;
rte_ml_dev_socket_id;
rte_ml_dev_start;
+ rte_ml_dev_stats_get;
+ rte_ml_dev_stats_reset;
rte_ml_dev_stop;
rte_ml_enqueue_burst;
rte_ml_io_dequantize;
--
2.38.1
[dpdk-dev] [PATCH v1 10/12] mldev: support device extended statistics
From: Srikanth Yalavarthi
Added functions to handle device extended stats.
xstats supported are driver specific and can include stats specific
to ML device or ML model and I/O.
Added prototypes for functions to be called by the device drivers.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 88
lib/mldev/rte_mldev_core.h | 93 ++
lib/mldev/version.map | 4 ++
3 files changed, 185 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 41b2a0be84..cdd68e933c 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -395,6 +395,94 @@ rte_ml_dev_stats_reset(int16_t dev_id)
(*dev->dev_ops->dev_stats_reset)(dev);
}
+int
+rte_ml_dev_xstats_names_get(int16_t dev_id, struct rte_ml_dev_xstats_map
*xstats_map, uint32_t size)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_xstats_names_get == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->dev_xstats_names_get)(dev, xstats_map, size);
+}
+
+int
+rte_ml_dev_xstats_by_name_get(int16_t dev_id, const char *name, uint16_t
*stat_id, uint64_t *value)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_xstats_by_name_get == NULL)
+ return -ENOTSUP;
+
+ if (name == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, name cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (value == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, value cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->dev_xstats_by_name_get)(dev, name, stat_id,
value);
+}
+
+int
+rte_ml_dev_xstats_get(int16_t dev_id, const uint16_t *stat_ids, uint64_t
*values, uint16_t nb_ids)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_xstats_get == NULL)
+ return -ENOTSUP;
+
+ if (stat_ids == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, stat_ids cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (values == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, values cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->dev_xstats_get)(dev, stat_ids, values, nb_ids);
+}
+
+int
+rte_ml_dev_xstats_reset(int16_t dev_id, const uint16_t *stat_ids, uint16_t
nb_ids)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_xstats_reset == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->dev_xstats_reset)(dev, stat_ids, nb_ids);
+}
+
int
rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, int16_t
*model_id)
{
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 3f05ecd9c6..82e8ed0422 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -221,6 +221,87 @@ typedef int (*mldev_stats_get_t)(struct rte_ml_dev *dev,
struct rte_ml_dev_stats
*/
typedef void (*mldev_stats_reset_t)(struct rte_ml_dev *dev);
+/**
+ * @internal
+ *
+ * Function used to get names of extended stats.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param xstats_map
+ * Array to insert id and names into.
+ * @param size
+ * Size of xstats_map array.
+ *
+ * @return
+ * - >= 0 and <= size on success.
+ * - > size, error. Returns the size of xstats_map array required.
+ * - < 0, error code on failure.
+ */
+typedef int (*mldev_xstats_names_get_t)(struct rte_ml_dev *dev,
+ struct rte_ml_dev_xstats_map
*xstats_map, uint32_t size);
+
+/**
+ * @internal
+ *
+ * Function used to get a single extended stat by name.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param name
+ * Name of the stat to retrieve.
+ * @param stat_id
+ * ID of the stat to be returned.
+ * @param value
+ * Value of the stat to be returned.
+ *
+ * @return
+ * - >= 0 stat value.
+ * - < 0, error code on failure.
+ */
+typedef int (*mldev_xstats_by_name_get_t)(struct rte_ml_dev *dev, const char
*name,
+ uint16_t *stat_id
[dpdk-dev] [PATCH v1 11/12] mldev: support to retrieve error information
From: Srikanth Yalavarthi
Added functions to get error information for an ML op.
This information can include both drive specific error
message and error code.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 31 +++
lib/mldev/rte_mldev_core.h | 22 ++
lib/mldev/version.map | 1 +
3 files changed, 54 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index cdd68e933c..7497a1316d 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -829,3 +829,34 @@ rte_ml_dequeue_burst(int16_t dev_id, uint16_t qp_id,
struct rte_ml_op **ops, uin
return (*dev->dequeue_burst)(dev, qp_id, ops, nb_ops);
}
+
+int
+rte_ml_op_error_get(int16_t dev_id, struct rte_ml_op *op, struct
rte_ml_op_error *error)
+{
+ struct rte_ml_dev *dev;
+
+#ifdef RTE_LIBRTE_ML_DEV_DEBUG
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->op_error_get == NULL)
+ return -ENOTSUP;
+
+ if (op == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, op cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+
+ if (error == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, error cannot be NULL\n", dev_id);
+ return -EINVAL;
+ }
+#else
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+#endif
+
+ return (*dev->op_error_get)(dev, op, error);
+}
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 82e8ed0422..9e3873dd3a 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -77,6 +77,25 @@ typedef uint16_t (*mldev_enqueue_t)(struct rte_ml_dev *dev,
uint16_t qp_id, stru
typedef uint16_t (*mldev_dequeue_t)(struct rte_ml_dev *dev, uint16_t qp_id,
struct rte_ml_op **ops,
uint16_t nb_ops);
+/**
+ * @internal
+ *
+ * Get error information for an Op.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param op
+ * ML Op handle.
+ * @param error
+ * Pointer to error structure.
+ *
+ * @return
+ * - 0 on success.
+ * - <0, error on failure.
+ */
+typedef int (*mldev_op_error_get_t)(struct rte_ml_dev *dev, struct rte_ml_op
*op,
+ struct rte_ml_op_error *error);
+
/**
* Definitions of all functions exported by a driver through the generic
structure of type
* *ml_dev_ops* supplied in the *rte_ml_dev* structure associated with a
device.
@@ -626,6 +645,9 @@ struct rte_ml_dev {
/** Pointer to PMD dequeue function. */
mldev_dequeue_t dequeue_burst;
+ /** Pointer to PMD Op error get function. */
+ mldev_op_error_get_t op_error_get;
+
/** Pointer to device data. */
struct rte_ml_dev_data *data;
diff --git a/lib/mldev/version.map b/lib/mldev/version.map
index 02d2eab100..86ab2129ce 100644
--- a/lib/mldev/version.map
+++ b/lib/mldev/version.map
@@ -28,6 +28,7 @@ EXPERIMENTAL {
rte_ml_model_start;
rte_ml_model_stop;
rte_ml_model_unload;
+ rte_ml_op_error_get;
rte_ml_op_pool_create;
rte_ml_op_pool_free;
--
2.38.1
[dpdk-dev] [PATCH v1 12/12] mldev: support to get debug info and test device
From: Srikanth Yalavarthi
Added library functions for ML device debug APIs.
The APIs are used to dump ML device debug information and to run selftest.
Signed-off-by: Srikanth Yalavarthi
Signed-off-by: Jerin Jacob
---
lib/mldev/rte_mldev.c | 39 ++
lib/mldev/rte_mldev_core.h | 37
lib/mldev/version.map | 2 ++
3 files changed, 78 insertions(+)
diff --git a/lib/mldev/rte_mldev.c b/lib/mldev/rte_mldev.c
index 7497a1316d..71aa98ee96 100644
--- a/lib/mldev/rte_mldev.c
+++ b/lib/mldev/rte_mldev.c
@@ -483,6 +483,45 @@ rte_ml_dev_xstats_reset(int16_t dev_id, const uint16_t
*stat_ids, uint16_t nb_id
return (*dev->dev_ops->dev_xstats_reset)(dev, stat_ids, nb_ids);
}
+int
+rte_ml_dev_dump(int16_t dev_id, FILE *fd)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_dump == NULL)
+ return -ENOTSUP;
+
+ if (fd == NULL) {
+ ML_DEV_LOG(ERR, "Dev %d, file descriptor cannot be NULL\n",
dev_id);
+ return -EINVAL;
+ }
+
+ return (*dev->dev_ops->dev_dump)(dev, fd);
+}
+
+int
+rte_ml_dev_selftest(int16_t dev_id)
+{
+ struct rte_ml_dev *dev;
+
+ if (!rte_ml_dev_is_valid_dev(dev_id)) {
+ ML_DEV_LOG(ERR, "Invalid dev_id = %d\n", dev_id);
+ return -EINVAL;
+ }
+
+ dev = rte_ml_dev_pmd_get_dev(dev_id);
+ if (*dev->dev_ops->dev_selftest == NULL)
+ return -ENOTSUP;
+
+ return (*dev->dev_ops->dev_selftest)(dev);
+}
+
int
rte_ml_model_load(int16_t dev_id, struct rte_ml_model_params *params, int16_t
*model_id)
{
diff --git a/lib/mldev/rte_mldev_core.h b/lib/mldev/rte_mldev_core.h
index 9e3873dd3a..b1426806a3 100644
--- a/lib/mldev/rte_mldev_core.h
+++ b/lib/mldev/rte_mldev_core.h
@@ -321,6 +321,37 @@ typedef int (*mldev_xstats_get_t)(struct rte_ml_dev *dev,
const uint16_t *stat_i
typedef int (*mldev_xstats_reset_t)(struct rte_ml_dev *dev, const uint16_t
*stat_ids,
uint16_t nb_ids);
+/**
+ * @internal
+ *
+ * Function used to dump ML device debug info.
+ *
+ * @param dev
+ * ML device pointer.
+ * @param fd
+ * File descriptor to dump the debug info.
+ *
+ * @return
+ * - 0 on success.
+ * - < 0, error code on failure.
+ */
+
+typedef int (*mldev_dump_t)(struct rte_ml_dev *dev, FILE *fd);
+
+/**
+ * @internal
+ *
+ * Function used for selftest of ML device.
+ *
+ * @param dev
+ * ML device pointer.
+ *
+ * @return
+ * - 0 on success.
+ * - < 0, error on failure.
+ */
+typedef int (*mldev_selftest_t)(struct rte_ml_dev *dev);
+
/**
* @internal
*
@@ -564,6 +595,12 @@ struct rte_ml_dev_ops {
/** Reset extended stats of the device. */
mldev_xstats_reset_t dev_xstats_reset;
+ /** Dump ML device debug info. */
+ mldev_dump_t dev_dump;
+
+ /** Dump ML device debug info. */
+ mldev_selftest_t dev_selftest;
+
/** Load an ML model. */
mldev_model_load_t model_load;
diff --git a/lib/mldev/version.map b/lib/mldev/version.map
index 86ab2129ce..61955ab701 100644
--- a/lib/mldev/version.map
+++ b/lib/mldev/version.map
@@ -5,9 +5,11 @@ EXPERIMENTAL {
rte_ml_dev_close;
rte_ml_dev_configure;
rte_ml_dev_count;
+ rte_ml_dev_dump;
rte_ml_dev_info_get;
rte_ml_dev_is_valid_dev;
rte_ml_dev_queue_pair_setup;
+ rte_ml_dev_selftest;
rte_ml_dev_socket_id;
rte_ml_dev_start;
rte_ml_dev_stats_get;
--
2.38.1
Re: [PATCH v3] netdev-dpdk: add control plane protection support
Hi Kevin, Kevin Traynor, Nov 11, 2022 at 19:15: > > +reta_conf_size = (dev->reta_size / RTE_ETH_RETA_GROUP_SIZE) > > +* sizeof(struct rte_eth_rss_reta_entry64); > > In dpdk_eth_dev_init, we get reta_size from driver, > > mlx5_ethdev.c > > 333├>info->reta_size = priv->reta_idx_n ? > 334│ priv->reta_idx_n : config->ind_table_max_size; > > (gdb) p priv->reta_idx_n > $5 = 1 > (gdb) p config->ind_table_max_size > $6 = 512 > > and store: > dev->reta_size = info.reta_size; > > Now we use it, > dev->reta_size = 1 / RTE_ETH_RETA_GROUP_SIZE (64) > but it results in reta_conf_size = 0 > > > +reta_conf = xmalloc(reta_conf_size); > > xmalloc only allocates 1 byte (void *p = malloc(size ? size : 1);) Hmm indeed this is bad :) Since reworking the RSS fallback I may not have re-tested with CX-5, only with Intel NICs. I am quite surprised of this return value. Could it be an issue with the mlx5 dpdk driver? Thanks for testing!
RE: [PATCH v2 1/3] net/mlx5: fix log level on failed transfer proxy stop
> -Original Message-
> From: Dariusz Sosnowski
> Sent: Wednesday, November 9, 2022 21:07
> To: Matan Azrad ; Slava Ovsiienko
> Cc: dev@dpdk.org
> Subject: [PATCH v2 1/3] net/mlx5: fix log level on failed transfer proxy
> stop
>
> This patches increases log level for error reporting when stopping the
> transfer proxy port failed. Stopping can fail with EBUSY when related
> representor ports are still running.
>
> Fixes: 483181f7b6dd ("net/mlx5: support device control of representor
> matching")
>
> Signed-off-by: Dariusz Sosnowski
Acked-by: Viacheslav Ovsiienko
RE: [PATCH v2 2/3] doc: document E-Switch limitations with HWS in mlx5 PMD
> -Original Message- > From: Dariusz Sosnowski > Sent: Wednesday, November 9, 2022 21:07 > To: Matan Azrad ; Slava Ovsiienko > Cc: dev@dpdk.org > Subject: [PATCH v2 2/3] doc: document E-Switch limitations with HWS in mlx5 > PMD > > This patch adds the following limitations to the mlx5 PMD guide: > > - With HW Steering and E-Switch enabled, transfer proxy port must > be started before any port representor. > - With HW Steering and E-Switch enabled, all representors > must be stopped before transfer proxy port is stopped. > > Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko
Re: [PATCH v2 3/3] ethdev: document special cases of port start and stop
On 11/9/2022 7:06 PM, Dariusz Sosnowski wrote:
This patch clarifies the handling of following cases
in the ethdev API docs:
- If rte_eth_dev_start() returns (-EAGAIN) for some port,
it cannot be started until other port is started.
- If rte_eth_dev_stop() returns (-EBUSY) for some port,
it cannot be stopped until other port is stopped.
EAGAIN and EBUSY has kind of standard meaning, I am not sure if it is
good idea to change this meaning to a specific "dependency to other
port" use case.
Why not keep common generic meanings of the error codes?
When stopping the port in testpmd fails due to (-EBUSY),
port's state is switched back to STARTED
to allow users to manually retry stopping the port.
No additional changes in testpmd are required to handle
failure to start port with (-EAGAIN).
If rte_eth_dev_start() fails, port's state is switched to STOPPED
and users are allowed to retry the operation.
Signed-off-by: Dariusz Sosnowski
---
app/test-pmd/testpmd.c | 10 +-
lib/ethdev/rte_ethdev.h | 9 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index aa7ea29f15..5a69e3c77a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3118,6 +3118,7 @@ stop_port(portid_t pid)
int need_check_link_status = 0;
portid_t peer_pl[RTE_MAX_ETHPORTS];
int peer_pi;
+ int ret;
if (port_id_is_invalid(pid, ENABLED_WARN))
return;
@@ -3167,9 +3168,16 @@ stop_port(portid_t pid)
if (port->flow_list)
port_flow_flush(pi);
- if (eth_dev_stop_mp(pi) != 0)
+ ret = eth_dev_stop_mp(pi);
+ if (ret != 0) {
RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port
%u\n",
pi);
+ if (ret == -EBUSY) {
+ /* Allow to retry stopping the port. */
+ port->port_status = RTE_PORT_STARTED;
If the stop() failed, isn't the current status should be STARTED
independent from the error type?
+ continue;
+ }
+ }
if (port->port_status == RTE_PORT_HANDLING)
port->port_status = RTE_PORT_STOPPED;
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 13fe73d5a3..abf5a24f92 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2701,10 +2701,14 @@ int rte_eth_dev_tx_queue_stop(uint16_t port_id,
uint16_t tx_queue_id);
* On success, all basic functions exported by the Ethernet API (link status,
* receive/transmit, and so on) can be invoked.
*
+ * If the port depends on another one being started,
+ * PMDs might return (-EAGAIN) to notify about such requirement.
+ *
* @param port_id
* The port identifier of the Ethernet device.
* @return
* - 0: Success, Ethernet device started.
+ * - -EAGAIN: If it depends on another port to be started first.
* - <0: Error code of the driver device start function.
*/
int rte_eth_dev_start(uint16_t port_id);
@@ -2713,10 +2717,15 @@ int rte_eth_dev_start(uint16_t port_id);
* Stop an Ethernet device. The device can be restarted with a call to
* rte_eth_dev_start()
*
+ * If the port provides some resources for other ports
+ * and it cannot be stopped before them,
+ * PMDs might return (-EBUSY) to notify about such requirement.
+ *
* @param port_id
* The port identifier of the Ethernet device.
* @return
* - 0: Success, Ethernet device stopped.
+ * - -EBUSY: If it depends on another port to be stopped first.
* - <0: Error code of the driver device stop function.
*/
int rte_eth_dev_stop(uint16_t port_id);
[PATCH] devtools: catch empty symbol maps
version.map are now optional for drivers if no symbol is exported.
Having no symbol exported from a library does not make sense.
Catch all empty maps and warn about them.
Example:
$ ./devtools/check-symbol-maps.sh
Found empty maps:
drivers/crypto/uadk/version.map
drivers/net/gve/version.map
drivers/net/idpf/version.map
Signed-off-by: David Marchand
---
devtools/check-symbol-maps.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh
index 32e1fa5c8f..0a6062de26 100755
--- a/devtools/check-symbol-maps.sh
+++ b/devtools/check-symbol-maps.sh
@@ -60,4 +60,18 @@ if [ -n "$local_miss_maps" ] ; then
ret=1
fi
+find_empty_maps ()
+{
+for map in $@ ; do
+[ $(buildtools/map-list-symbol.sh $map | wc -l) != '0' ] || echo $map
+done
+}
+
+empty_maps=$(find_empty_maps $@)
+if [ -n "$empty_maps" ] ; then
+echo "Found empty maps:"
+echo "$empty_maps"
+ret=1
+fi
+
exit $ret
--
2.38.1
Re: [PATCH v4 1/2] build: make version file optional for drivers
On Wed, Oct 12, 2022 at 1:33 PM Ferruh Yigit wrote: > On 10/12/2022 11:42 AM, Abdullah Ömer Yamaç wrote: > > In this patch, we removed the necessity of the version files and > > you don't need to update these files for each release, you can just > > remove them. > > > > Suggested-by: Ferruh Yigit > > Signed-off-by: Abdullah Ömer Yamaç > > Acked-by: Bruce Richardson > Tested-by: Ferruh Yigit I rebased this patch and updated newly added drivers, after running the new check I proposed at: https://patchwork.dpdk.org/project/dpdk/patch/20221114141651.1255306-1-david.march...@redhat.com/ Applied, thanks. -- David Marchand
[PATCH] drivers: various typos found by Lintian
From: Luca Boccassi
Signed-off-by: Luca Boccassi
---
drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++--
drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
drivers/net/hns3/hns3_ethdev.c | 2 +-
drivers/net/qede/base/ecore_int.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index b1e7027823..db52683847 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -754,14 +754,14 @@ dpaa_sec_dump(struct dpaa_sec_op_ctx *ctx, struct
dpaa_sec_qp *qp)
printf("ctx info:\n");
printf("job->sg[0] output info:\n");
memcpy(&sg[0], &job->sg[0], sizeof(sg[0]));
- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention =
%d"
+ printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension =
%d"
"\n\tbpid = %d\n\toffset = %d\n",
(uint64_t)sg[0].addr, sg[0].length, sg[0].final,
sg[0].extension, sg[0].bpid, sg[0].offset);
printf("\njob->sg[1] input info:\n");
memcpy(&sg[1], &job->sg[1], sizeof(sg[1]));
hw_sg_to_cpu(&sg[1]);
- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention =
%d"
+ printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension =
%d"
"\n\tbpid = %d\n\toffset = %d\n",
(uint64_t)sg[1].addr, sg[1].length, sg[1].final,
sg[1].extension, sg[1].bpid, sg[1].offset);
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 2efaad1e8e..b9bcebc6cb 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -198,7 +198,7 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,
if (slave_info.max_rx_queues < bond_dev->data->nb_rx_queues ||
slave_info.max_tx_queues <
bond_dev->data->nb_tx_queues) {
RTE_BOND_LOG(ERR,
- "%s: Slave %d capabilities doesn't allow to allocate
additional queues",
+ "%s: Slave %d capabilities doesn't allow allocating
additional queues",
__func__, slave_port);
return -1;
}
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index b4365b78be..d326f70129 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -1661,7 +1661,7 @@ hns3_set_default_mac_addr(struct rte_eth_dev *dev,
hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
mac_addr);
hns3_warn(hw,
- "Failed to roll back to del setted mac addr(%s): %d",
+ "Failed to roll back to del set mac addr(%s): %d",
mac_str, ret_val);
}
diff --git a/drivers/net/qede/base/ecore_int.c
b/drivers/net/qede/base/ecore_int.c
index 2c4aac9418..d9faf6bfcd 100644
--- a/drivers/net/qede/base/ecore_int.c
+++ b/drivers/net/qede/base/ecore_int.c
@@ -366,7 +366,7 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct
ecore_hwfn *p_hwfn,
tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS_ICPL);
if (tmp & ECORE_PGLUE_ATTENTION_ICPL_VALID)
- DP_NOTICE(p_hwfn, false, "ICPL erorr - %08x\n", tmp);
+ DP_NOTICE(p_hwfn, false, "ICPL error - %08x\n", tmp);
tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_MASTER_ZLR_ERR_DETAILS);
if (tmp & ECORE_PGLUE_ATTENTION_ZLR_VALID) {
@@ -378,7 +378,7 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct
ecore_hwfn *p_hwfn,
PGLUE_B_REG_MASTER_ZLR_ERR_ADD_63_32);
DP_NOTICE(p_hwfn, false,
- "ICPL erorr - %08x [Address %08x:%08x]\n",
+ "ICPL error - %08x [Address %08x:%08x]\n",
tmp, addr_hi, addr_lo);
}
--
2.34.1
[PATCH 2/2] docs: sort files lists in generator scripts
From: Luca Boccassi
In order to build the documentation in a reproducible manner, sort the lists of
files used as input, since walking the filesystem is not guaranteed to be done
in a stable order.
When converting the scripts from shell to python, sorting the input was lost.
Fixes: 53bb9a073f4f ("doc: rewrite shell scripts in Python")
Signed-off-by: Luca Boccassi
---
doc/api/generate_doxygen.py | 2 +-
doc/api/generate_examples.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/api/generate_doxygen.py b/doc/api/generate_doxygen.py
index 2ccedf844e..d3a22869f6 100755
--- a/doc/api/generate_doxygen.py
+++ b/doc/api/generate_doxygen.py
@@ -13,7 +13,7 @@
subprocess.run(doxygen_command, check=True, stdout=out)
with open(out_file) as out, open(dep_file, 'w') as dep:
print(f'{out_dir}:', end=' ', file=dep)
-for line in out:
+for line in sorted(out):
match = re.match(pattern, line)
if match:
print(match.group(1), end=' ', file=dep)
diff --git a/doc/api/generate_examples.py b/doc/api/generate_examples.py
index c35e72f280..7315b3c356 100755
--- a/doc/api/generate_examples.py
+++ b/doc/api/generate_examples.py
@@ -11,7 +11,7 @@
with open(f'{api_examples}.d', 'w') as dep:
print(f'{api_examples}:', end=' ', file=dep)
for root, _, files in os.walk(examples_dir):
-for name in files:
+for name in sorted(files):
is_source = name.endswith('.c')
if is_source or name == 'meson.build':
path = os.path.join(root, name)
@@ -23,7 +23,7 @@
print('''/**
@page examples DPDK Example Programs
''', file=out)
-for path in sources:
+for path in sorted(sources):
# Produce consistent output with forward slashes on all systems.
# Every \ in paths within examples directory is a separator, not
escape.
relpath = os.path.relpath(path, examples_dir).replace('\\', '/')
--
2.34.1
[PATCH 1/2] docs: add +x to generator scripts
From: Luca Boccassi
These scripts have a shebang so they are meant to be runnable, so set +x bits
Fixes: 53bb9a073f4f ("doc: rewrite shell scripts in Python")
Signed-off-by: Luca Boccassi
---
doc/api/generate_doxygen.py | 0
doc/api/generate_examples.py | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 doc/api/generate_doxygen.py
mode change 100644 => 100755 doc/api/generate_examples.py
diff --git a/doc/api/generate_doxygen.py b/doc/api/generate_doxygen.py
old mode 100644
new mode 100755
diff --git a/doc/api/generate_examples.py b/doc/api/generate_examples.py
old mode 100644
new mode 100755
--
2.34.1
Re: [PATCH 2/2] docs: sort files lists in generator scripts
On Mon, Nov 14, 2022 at 02:22:25PM +, luca.bocca...@gmail.com wrote:
> From: Luca Boccassi
>
> In order to build the documentation in a reproducible manner, sort the lists
> of
> files used as input, since walking the filesystem is not guaranteed to be done
> in a stable order.
> When converting the scripts from shell to python, sorting the input was lost.
>
> Fixes: 53bb9a073f4f ("doc: rewrite shell scripts in Python")
>
> Signed-off-by: Luca Boccassi
> ---
Seems reasonable.
Acked-by: Bruce Richardson
Re: [PATCH 1/2] docs: add +x to generator scripts
On Mon, Nov 14, 2022 at 02:22:24PM +, luca.bocca...@gmail.com wrote:
> From: Luca Boccassi
>
> These scripts have a shebang so they are meant to be runnable, so set +x bits
>
> Fixes: 53bb9a073f4f ("doc: rewrite shell scripts in Python")
>
> Signed-off-by: Luca Boccassi
> ---
> doc/api/generate_doxygen.py | 0
> doc/api/generate_examples.py | 0
> 2 files changed, 0 insertions(+), 0 deletions(-)
> mode change 100644 => 100755 doc/api/generate_doxygen.py
> mode change 100644 => 100755 doc/api/generate_examples.py
>
> diff --git a/doc/api/generate_doxygen.py b/doc/api/generate_doxygen.py
> old mode 100644
> new mode 100755
> diff --git a/doc/api/generate_examples.py b/doc/api/generate_examples.py
> old mode 100644
> new mode 100755
> --
Acked-by: Bruce Richardson
Re: [PATCH] devtools: catch empty symbol maps
On Mon, Nov 14, 2022 at 03:16:51PM +0100, David Marchand wrote: > version.map are now optional for drivers if no symbol is exported. > Having no symbol exported from a library does not make sense. > > Catch all empty maps and warn about them. > > Example: > $ ./devtools/check-symbol-maps.sh > Found empty maps: > drivers/crypto/uadk/version.map > drivers/net/gve/version.map > drivers/net/idpf/version.map > > Signed-off-by: David Marchand > --- Acked-by: Bruce Richardson
Re: [PATCH] devtools: catch empty symbol maps
On 11/14/2022 2:31 PM, Bruce Richardson wrote: On Mon, Nov 14, 2022 at 03:16:51PM +0100, David Marchand wrote: version.map are now optional for drivers if no symbol is exported. Having no symbol exported from a library does not make sense. Catch all empty maps and warn about them. Example: $ ./devtools/check-symbol-maps.sh Found empty maps: drivers/crypto/uadk/version.map drivers/net/gve/version.map drivers/net/idpf/version.map Signed-off-by: David Marchand --- Acked-by: Bruce Richardson +1 to have automated checks, Tested-by: Ferruh Yigit
RE: [PATCH 4/4] examples: remove unnecessary null checks
Hi Stephen, Looks good for fips validation. > -Original Message- > From: Stephen Hemminger > Sent: Wednesday, November 9, 2022 11:47 PM > To: dev@dpdk.org > Cc: Stephen Hemminger ; Hunt, David > ; Dooley, Brian > Subject: [PATCH 4/4] examples: remove unnecessary null checks > > The function rte_free() already handles NULL argument; therefore the > checks in this code are unnecessary. > > Signed-off-by: Stephen Hemminger > --- > examples/distributor/main.c | 3 +-- > examples/fips_validation/main.c | 15 +-- > 2 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/examples/distributor/main.c b/examples/distributor/main.c index > e767973ed8de..21304d661873 100644 > --- a/examples/distributor/main.c > +++ b/examples/distributor/main.c > @@ -1017,8 +1017,7 @@ main(int argc, char *argv[]) > > print_stats(); > > - if (pd) > - rte_free(pd); > + rte_free(pd); > rte_free(pr); > > /* clean up the EAL */ > diff --git a/examples/fips_validation/main.c > b/examples/fips_validation/main.c index 40a5b70e073b..73caaffb7e7a > 100644 > --- a/examples/fips_validation/main.c > +++ b/examples/fips_validation/main.c > @@ -962,8 +962,7 @@ prepare_rsa_op(void) > asym->rsa.message.data = msg.val; > asym->rsa.message.length = msg.len; > > - if (vec.rsa.signature.val) > - rte_free(vec.rsa.signature.val); > + rte_free(vec.rsa.signature.val); > > vec.rsa.signature.val = rte_zmalloc(NULL, vec.rsa.n.len, 0); > vec.rsa.signature.len = vec.rsa.n.len; @@ -1011,11 +1010,9 > @@ prepare_ecdsa_op(void) > asym->ecdsa.k.data = vec.ecdsa.k.val; > asym->ecdsa.k.length = vec.ecdsa.k.len; > > - if (vec.ecdsa.r.val) > - rte_free(vec.ecdsa.r.val); > + rte_free(vec.ecdsa.r.val); > > - if (vec.ecdsa.s.val) > - rte_free(vec.ecdsa.s.val); > + rte_free(vec.ecdsa.s.val); > > vec.ecdsa.r.len = info.interim_info.ecdsa_data.curve_len; > vec.ecdsa.r.val = rte_zmalloc(NULL, vec.ecdsa.r.len, 0); @@ - > 1060,11 +1057,9 @@ prepare_ecfpm_op(void) > asym->ecpm.scalar.data = vec.ecdsa.pkey.val; > asym->ecpm.scalar.length = vec.ecdsa.pkey.len; > > - if (vec.ecdsa.qx.val) > - rte_free(vec.ecdsa.qx.val); > + rte_free(vec.ecdsa.qx.val); > > - if (vec.ecdsa.qy.val) > - rte_free(vec.ecdsa.qy.val); > + rte_free(vec.ecdsa.qy.val); > > vec.ecdsa.qx.len = info.interim_info.ecdsa_data.curve_len; > vec.ecdsa.qx.val = rte_zmalloc(NULL, vec.ecdsa.qx.len, 0); > -- > 2.35.1 Acked-by: Brian Dooley
RE: [PATCH v2 3/3] ethdev: document special cases of port start and stop
Hi Ferruh,
> -Original Message-
> From: Ferruh Yigit
> Sent: Monday, November 14, 2022 15:08
> To: Dariusz Sosnowski ; Aman Singh
> ; Yuying Zhang ;
> NBU-Contact-Thomas Monjalon (EXTERNAL) ;
> Andrew Rybchenko
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2 3/3] ethdev: document special cases of port start and
> stop
>
> External email: Use caution opening links or attachments
>
>
> On 11/9/2022 7:06 PM, Dariusz Sosnowski wrote:
> > This patch clarifies the handling of following cases in the ethdev API
> > docs:
> >
> > - If rte_eth_dev_start() returns (-EAGAIN) for some port,
> >it cannot be started until other port is started.
> > - If rte_eth_dev_stop() returns (-EBUSY) for some port,
> >it cannot be stopped until other port is stopped.
> >
>
> EAGAIN and EBUSY has kind of standard meaning, I am not sure if it is good
> idea to change this meaning to a specific "dependency to other port" use
> case.
> Why not keep common generic meanings of the error codes?
In my opinion, using standard error meanings for EAGAIN and EBUSY would make
the returned errors too vague for the API user.
If we used the standard meanings, it's not clear why the port cannot be started
or stopped and what the user should do about it.
Providing specific reasons in the API makes it more understandable. On top of
that, they are "subcases" of standard errors:
- "Port cannot be stopped because another port depends on it" is a special case
of "Device or resource is busy".
- "Port cannot be started because it depends on other port being started" is a
special case of "Resource temporarily unavailable".
However, I see your concern, so maybe let's do the following. To not limit the
API, we could for example:
- In the documentation of returned values - provide the generic meaning for the
EAGAIN and EBUSY:
- rte_eth_dev_stop(): EBUSY is returned if stopping the port is not allowed
in the current state.
- rte_eth_dev_start(): EAGAIN is returned if start operation must be
retried.
- In the function description provide the specific use case of "dependency on
other port" as an example
of EBUSY/EAGAIN usage
- Depending on the use cases emerging in the future, new examples can be
added,
if EBUSY/EAGAIN is suitable for the new use cases.
What do you think?
> > When stopping the port in testpmd fails due to (-EBUSY), port's state
> > is switched back to STARTED to allow users to manually retry stopping
> > the port.
> >
> > No additional changes in testpmd are required to handle failure to
> > start port with (-EAGAIN).
> > If rte_eth_dev_start() fails, port's state is switched to STOPPED and
> > users are allowed to retry the operation.
> >
> > Signed-off-by: Dariusz Sosnowski
> > ---
> > app/test-pmd/testpmd.c | 10 +-
> > lib/ethdev/rte_ethdev.h | 9 +
> > 2 files changed, 18 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> > aa7ea29f15..5a69e3c77a 100644
> > --- a/app/test-pmd/testpmd.c
> > +++ b/app/test-pmd/testpmd.c
> > @@ -3118,6 +3118,7 @@ stop_port(portid_t pid)
> > int need_check_link_status = 0;
> > portid_t peer_pl[RTE_MAX_ETHPORTS];
> > int peer_pi;
> > + int ret;
> >
> > if (port_id_is_invalid(pid, ENABLED_WARN))
> > return;
> > @@ -3167,9 +3168,16 @@ stop_port(portid_t pid)
> > if (port->flow_list)
> > port_flow_flush(pi);
> >
> > - if (eth_dev_stop_mp(pi) != 0)
> > + ret = eth_dev_stop_mp(pi);
> > + if (ret != 0) {
> > RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port
> > %u\n",
> > pi);
> > + if (ret == -EBUSY) {
> > + /* Allow to retry stopping the port. */
> > + port->port_status = RTE_PORT_STARTED;
>
> If the stop() failed, isn't the current status should be STARTED independent
> from the error type?
Correct. I'll update it in v3.
> > + continue;
> > + }
> > + }
> >
> > if (port->port_status == RTE_PORT_HANDLING)
> > port->port_status = RTE_PORT_STOPPED; diff --git
> > a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index
> > 13fe73d5a3..abf5a24f92 100644
> > --- a/lib/ethdev/rte_ethdev.h
> > +++ b/lib/ethdev/rte_ethdev.h
> > @@ -2701,10 +2701,14 @@ int rte_eth_dev_tx_queue_stop(uint16_t
> port_id, uint16_t tx_queue_id);
> >* On success, all basic functions exported by the Ethernet API (link
> > status,
> >* receive/transmit, and so on) can be invoked.
> >*
> > + * If the port depends on another one being started,
> > + * PMDs might return (-EAGAIN) to notify about such requirement.
> > + *
> >* @param port_id
> >* The port identifier of the Ethernet device.
> >* @return
> >* - 0: Success, Ethernet device started.
> > + *
[RFC PATCH v2 00/10] dts: add hello world testcase
Add code needed to run the HelloWorld testcase which just runs the hello world dpdk application. The patch first outlines the basic class architecture, covering Nodes (hosts that DTS connects to), RemoteSession, OS-specific code, test runner and Exceptions. The patchset currently heavily refactors this original DTS code needed to run the testcase: * DPDK build on the System under Test * DPDK eal args construction, app running and shutting down * SUT hugepage memory configuration * Test runner The code that still needs to be refactored: * Test results * TestCase/TestSuite class * Test runner parts interfacing with TestCase * The HelloWorld testsuite itself The code is divided into sub-packages, some of which are divided further. It's possible that some sub-directories should be flattened to simplify imports. I've also had to make some concessions to code structure to avoid circular imports. I'll continue thinking about this going forward and v3 may have a different dir/import structure. The code has been ported from DTS and we may want/need to change some designs, such as what configuration to do and when - for example, we may not want DTS to configure hugepages (as that may be too much of a system modification or it just simply makes sense to configure once outside of DTS and not touch it in every single run). Juraj Linkeš (10): dts: add node and os abstractions dts: add ssh command verification dts: add dpdk build on sut dts: add dpdk execution handling dts: add node memory setup dts: add test results module dts: add simple stats report dts: add testsuite class dts: add hello world testplan dts: add hello world testsuite dts/conf.yaml | 16 +- dts/framework/config/__init__.py | 186 +- dts/framework/config/conf_yaml_schema.json| 137 +++- dts/framework/dts.py | 153 ++-- dts/framework/exception.py| 190 +- dts/framework/remote_session/__init__.py | 23 +- dts/framework/remote_session/arch/__init__.py | 20 ++ dts/framework/remote_session/arch/arch.py | 57 +++ dts/framework/remote_session/factory.py | 14 + dts/framework/remote_session/os/__init__.py | 17 + .../remote_session/os/linux_session.py| 111 ++ dts/framework/remote_session/os/os_session.py | 170 + .../remote_session/os/posix_session.py| 220 .../remote_session/remote_session.py | 94 - dts/framework/remote_session/ssh_session.py | 69 +++- dts/framework/settings.py | 65 +++- dts/framework/stats_reporter.py | 65 dts/framework/test_case.py| 246 + dts/framework/test_result.py | 217 dts/framework/testbed_model/__init__.py | 7 +- dts/framework/testbed_model/hw/__init__.py| 17 + dts/framework/testbed_model/hw/cpu.py | 164 + dts/framework/testbed_model/node.py | 62 dts/framework/testbed_model/node/__init__.py | 7 + dts/framework/testbed_model/node/node.py | 169 + dts/framework/testbed_model/node/sut_node.py | 331 ++ dts/framework/utils.py| 35 ++ dts/test_plans/hello_world_test_plan.rst | 68 dts/tests/TestSuite_hello_world.py| 53 +++ 29 files changed, 2854 insertions(+), 129 deletions(-) create mode 100644 dts/framework/remote_session/arch/__init__.py create mode 100644 dts/framework/remote_session/arch/arch.py create mode 100644 dts/framework/remote_session/factory.py create mode 100644 dts/framework/remote_session/os/__init__.py create mode 100644 dts/framework/remote_session/os/linux_session.py create mode 100644 dts/framework/remote_session/os/os_session.py create mode 100644 dts/framework/remote_session/os/posix_session.py create mode 100644 dts/framework/stats_reporter.py create mode 100644 dts/framework/test_case.py create mode 100644 dts/framework/test_result.py create mode 100644 dts/framework/testbed_model/hw/__init__.py create mode 100644 dts/framework/testbed_model/hw/cpu.py delete mode 100644 dts/framework/testbed_model/node.py create mode 100644 dts/framework/testbed_model/node/__init__.py create mode 100644 dts/framework/testbed_model/node/node.py create mode 100644 dts/framework/testbed_model/node/sut_node.py create mode 100644 dts/test_plans/hello_world_test_plan.rst create mode 100644 dts/tests/TestSuite_hello_world.py -- 2.30.2
[RFC PATCH v2 01/10] dts: add node and os abstractions
The abstraction model in DTS is as follows:
Node, defining and implementing methods common to and the base of SUT
(system under test) Node and TG (traffic generator) Node.
Remote Session, defining and implementing methods common to any remote
session implementation, such as SSH Session.
OSSession, defining and implementing methods common to any operating
system/distribution, such as Linux.
OSSession uses a derived Remote Session and Node in turn uses a derived
OSSession. This split delegates OS-specific and connection-specific code
to specialized classes designed to handle the differences.
The base classes implement the methods or parts of methods that are
common to all implementations and defines abstract methods that must be
implemented by derived classes.
Part of the abstractions is the DTS test execution skeleton: node init,
execution setup, build setup and then test execution.
Signed-off-by: Juraj Linkeš
---
dts/conf.yaml | 8 +-
dts/framework/config/__init__.py | 70 +-
dts/framework/config/conf_yaml_schema.json| 66 +-
dts/framework/dts.py | 116 +
dts/framework/exception.py| 87 -
dts/framework/remote_session/__init__.py | 18 +--
dts/framework/remote_session/factory.py | 14 ++
dts/framework/remote_session/os/__init__.py | 17 +++
.../remote_session/os/linux_session.py| 11 ++
dts/framework/remote_session/os/os_session.py | 46 +++
.../remote_session/os/posix_session.py| 12 ++
.../remote_session/remote_session.py | 23 +++-
dts/framework/remote_session/ssh_session.py | 2 +-
dts/framework/testbed_model/__init__.py | 6 +-
dts/framework/testbed_model/node.py | 62 -
dts/framework/testbed_model/node/__init__.py | 7 +
dts/framework/testbed_model/node/node.py | 120 ++
dts/framework/testbed_model/node/sut_node.py | 13 ++
18 files changed, 591 insertions(+), 107 deletions(-)
create mode 100644 dts/framework/remote_session/factory.py
create mode 100644 dts/framework/remote_session/os/__init__.py
create mode 100644 dts/framework/remote_session/os/linux_session.py
create mode 100644 dts/framework/remote_session/os/os_session.py
create mode 100644 dts/framework/remote_session/os/posix_session.py
delete mode 100644 dts/framework/testbed_model/node.py
create mode 100644 dts/framework/testbed_model/node/__init__.py
create mode 100644 dts/framework/testbed_model/node/node.py
create mode 100644 dts/framework/testbed_model/node/sut_node.py
diff --git a/dts/conf.yaml b/dts/conf.yaml
index 1aaa593612..6b0bc5c2bf 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -2,8 +2,14 @@
# Copyright 2022 The DPDK contributors
executions:
- - system_under_test: "SUT 1"
+ - build_targets:
+ - arch: x86_64
+os: linux
+cpu: native
+compiler: gcc
+system_under_test: "SUT 1"
nodes:
- name: "SUT 1"
hostname: sut1.change.me.localhost
user: root
+os: linux
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 214be8e7f4..1b97dc3ab9 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -3,13 +3,14 @@
# Copyright(c) 2022 University of New Hampshire
"""
-Generic port and topology nodes configuration file load function
+Yaml config parsing methods
"""
import json
import os.path
import pathlib
from dataclasses import dataclass
+from enum import Enum, auto, unique
from typing import Any
import warlock # type: ignore
@@ -18,6 +19,47 @@
from framework.settings import SETTINGS
+class StrEnum(Enum):
+@staticmethod
+def _generate_next_value_(
+name: str, start: int, count: int, last_values: object
+) -> str:
+return name
+
+
+@unique
+class Architecture(StrEnum):
+i686 = auto()
+x86_64 = auto()
+x86_32 = auto()
+arm64 = auto()
+ppc64le = auto()
+
+
+@unique
+class OS(StrEnum):
+linux = auto()
+freebsd = auto()
+windows = auto()
+
+
+@unique
+class CPUType(StrEnum):
+native = auto()
+armv8a = auto()
+dpaa2 = auto()
+thunderx = auto()
+xgene1 = auto()
+
+
+@unique
+class Compiler(StrEnum):
+gcc = auto()
+clang = auto()
+icc = auto()
+msvc = auto()
+
+
# Slots enables some optimizations, by pre-allocating space for the defined
# attributes in the underlying data structure.
#
@@ -29,6 +71,7 @@ class NodeConfiguration:
hostname: str
user: str
password: str | None
+os: OS
@staticmethod
def from_dict(d: dict) -> "NodeConfiguration":
@@ -37,19 +80,44 @@ def from_dict(d: dict) -> "NodeConfiguration":
hostname=d["hostname"],
user=d["user"],
password=d.get("password"),
+os=OS(d["os"]),
+)
+
+
+@dataclass(slots=True, frozen=True)
+class BuildTargetConfiguration:
+
[RFC PATCH v2 02/10] dts: add ssh command verification
This is a basic capability needed to check whether the command execution
was successful or not. If not, raise a RemoteCommandExecutionError. When
a failure is expected, the caller is supposed to catch the exception.
Signed-off-by: Juraj Linkeš
---
dts/framework/exception.py| 21 +++
.../remote_session/remote_session.py | 55 +--
dts/framework/remote_session/ssh_session.py | 11 +++-
3 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/dts/framework/exception.py b/dts/framework/exception.py
index cac8d84416..b282e48198 100644
--- a/dts/framework/exception.py
+++ b/dts/framework/exception.py
@@ -25,6 +25,7 @@ class ReturnCode(IntEnum):
NO_ERR = 0
GENERIC_ERR = 1
SSH_ERR = 2
+REMOTE_CMD_EXEC_ERR = 3
NODE_SETUP_ERR = 20
NODE_CLEANUP_ERR = 21
@@ -89,6 +90,26 @@ def __str__(self) -> str:
return f"SSH session with {self.host} has died"
+class RemoteCommandExecutionError(DTSError):
+"""
+Raised when a command executed on a Node returns a non-zero exit status.
+"""
+
+command: str
+command_return_code: int
+return_code: ClassVar[ReturnCode] = ReturnCode.REMOTE_CMD_EXEC_ERR
+
+def __init__(self, command: str, command_return_code: int) -> None:
+self.command = command
+self.command_return_code = command_return_code
+
+def __str__(self) -> str:
+return (
+f"Command {self.command} returned a non-zero exit code: "
+f"{self.command_return_code}"
+)
+
+
class NodeSetupError(DTSError):
"""
Raised when setting up a node.
diff --git a/dts/framework/remote_session/remote_session.py
b/dts/framework/remote_session/remote_session.py
index 4095e02c1b..fccd80a529 100644
--- a/dts/framework/remote_session/remote_session.py
+++ b/dts/framework/remote_session/remote_session.py
@@ -7,15 +7,29 @@
from abc import ABC, abstractmethod
from framework.config import NodeConfiguration
+from framework.exception import RemoteCommandExecutionError
from framework.logger import DTSLOG
from framework.settings import SETTINGS
@dataclasses.dataclass(slots=True, frozen=True)
-class HistoryRecord:
+class CommandResult:
+"""
+The result of remote execution of a command.
+"""
+
name: str
command: str
-output: str | int
+stdout: str
+stderr: str
+return_code: int
+
+def __str__(self) -> str:
+return (
+f"stdout: '{self.stdout}'\n"
+f"stderr: '{self.stderr}'\n"
+f"return_code: '{self.return_code}'"
+)
class RemoteSession(ABC):
@@ -35,7 +49,7 @@ class RemoteSession(ABC):
username: str
password: str
logger: DTSLOG
-history: list[HistoryRecord]
+history: list[CommandResult]
_node_config: NodeConfiguration
def __init__(
@@ -68,28 +82,33 @@ def _connect(self) -> None:
Create connection to assigned node.
"""
-def send_command(self, command: str, timeout: float = SETTINGS.timeout) ->
str:
+def send_command(
+self, command: str, timeout: float = SETTINGS.timeout, verify: bool =
False
+) -> CommandResult:
"""
-Send a command and return the output.
+Send a command to the connected node and return CommandResult.
+If verify is True, check the return code of the executed command
+and raise a RemoteCommandExecutionError if the command failed.
"""
-self.logger.info(f"Sending: {command}")
-out = self._send_command(command, timeout)
-self.logger.debug(f"Received from {command}: {out}")
-self._history_add(command=command, output=out)
-return out
+self.logger.info(f"Sending: '{command}'")
+result = self._send_command(command, timeout)
+if verify and result.return_code:
+self.logger.debug(
+f"Command '{command}' failed with return code
'{result.return_code}'"
+)
+self.logger.debug(f"stdout: '{result.stdout}'")
+self.logger.debug(f"stderr: '{result.stderr}'")
+raise RemoteCommandExecutionError(command, result.return_code)
+self.logger.debug(f"Received from '{command}':\n{result}")
+self.history.append(result)
+return result
@abstractmethod
-def _send_command(self, command: str, timeout: float) -> str:
+def _send_command(self, command: str, timeout: float) -> CommandResult:
"""
-Use the underlying protocol to execute the command and return the
output
-of the command.
+Use the underlying protocol to execute the command and return
CommandResult.
"""
-def _history_add(self, command: str, output: str) -> None:
-self.history.append(
-HistoryRecord(name=self.name, command=command, output=output)
-)
-
def close(self, force: bool = False) -> None:
"""
Close the remote ses
[RFC PATCH v2 03/10] dts: add dpdk build on sut
Add the ability to build DPDK and apps, using a configured target. Signed-off-by: Juraj Linkeš --- dts/framework/exception.py| 17 +++ dts/framework/remote_session/os/os_session.py | 90 +++- .../remote_session/os/posix_session.py| 128 + .../remote_session/remote_session.py | 34 - dts/framework/remote_session/ssh_session.py | 64 - dts/framework/settings.py | 40 +- dts/framework/testbed_model/node/sut_node.py | 131 ++ dts/framework/utils.py| 15 ++ 8 files changed, 505 insertions(+), 14 deletions(-) diff --git a/dts/framework/exception.py b/dts/framework/exception.py index b282e48198..93d99432ae 100644 --- a/dts/framework/exception.py +++ b/dts/framework/exception.py @@ -26,6 +26,7 @@ class ReturnCode(IntEnum): GENERIC_ERR = 1 SSH_ERR = 2 REMOTE_CMD_EXEC_ERR = 3 +DPDK_BUILD_ERR = 10 NODE_SETUP_ERR = 20 NODE_CLEANUP_ERR = 21 @@ -110,6 +111,22 @@ def __str__(self) -> str: ) +class RemoteDirectoryExistsError(DTSError): +""" +Raised when a remote directory to be created already exists. +""" + +return_code: ClassVar[ReturnCode] = ReturnCode.REMOTE_CMD_EXEC_ERR + + +class DPDKBuildError(DTSError): +""" +Raised when DPDK build fails for any reason. +""" + +return_code: ClassVar[ReturnCode] = ReturnCode.DPDK_BUILD_ERR + + class NodeSetupError(DTSError): """ Raised when setting up a node. diff --git a/dts/framework/remote_session/os/os_session.py b/dts/framework/remote_session/os/os_session.py index 2a72082628..57e2865282 100644 --- a/dts/framework/remote_session/os/os_session.py +++ b/dts/framework/remote_session/os/os_session.py @@ -2,12 +2,15 @@ # Copyright(c) 2022 PANTHEON.tech s.r.o. # Copyright(c) 2022 University of New Hampshire -from abc import ABC +from abc import ABC, abstractmethod +from pathlib import PurePath -from framework.config import NodeConfiguration +from framework.config import Architecture, NodeConfiguration from framework.logger import DTSLOG from framework.remote_session.factory import create_remote_session from framework.remote_session.remote_session import RemoteSession +from framework.settings import SETTINGS +from framework.utils import EnvVarsDict class OSSession(ABC): @@ -44,3 +47,86 @@ def is_alive(self) -> bool: Check whether the remote session is still responding. """ return self.remote_session.is_alive() + +@abstractmethod +def guess_dpdk_remote_dir(self, remote_dir) -> PurePath: +""" +Try to find DPDK remote dir in remote_dir. +""" + +@abstractmethod +def get_remote_tmp_dir(self) -> PurePath: +""" +Get the path of the temporary directory of the remote OS. +""" + +@abstractmethod +def get_dpdk_build_env_vars(self, arch: Architecture) -> dict: +""" +Create extra environment variables needed for the target architecture. Get +information from the node if needed. +""" + +@abstractmethod +def join_remote_path(self, *args: str | PurePath) -> PurePath: +""" +Join path parts using the path separator that fits the remote OS. +""" + +@abstractmethod +def copy_file( +self, +source_file: str | PurePath, +destination_file: str | PurePath, +source_remote: bool = False, +) -> None: +""" +Copy source_file from local storage to destination_file on the remote Node +associated with the remote session. +If source_remote is True, reverse the direction - copy source_file from the +associated remote Node to destination_file on local storage. +""" + +@abstractmethod +def remove_remote_dir( +self, +remote_dir_path: str | PurePath, +recursive: bool = True, +force: bool = True, +) -> None: +""" +Remove remote directory, by default remove recursively and forcefully. +""" + +@abstractmethod +def extract_remote_tarball( +self, +remote_tarball_path: str | PurePath, +expected_dir: str | PurePath | None = None, +) -> None: +""" +Extract remote tarball in place. If expected_dir is a non-empty string, check +whether the dir exists after extracting the archive. +""" + +@abstractmethod +def build_dpdk( +self, +env_vars: EnvVarsDict, +meson_args: str, +remote_dpdk_dir: str | PurePath, +target_name: str, +rebuild: bool = False, +timeout: float = SETTINGS.compile_timeout, +) -> PurePath: +""" +Build DPDK in the input dir with specified environment variables and meson +arguments. +Return the directory path where DPDK was built. +""" + +@abstractmethod +def get_dpdk_ver
[RFC PATCH v2 04/10] dts: add dpdk execution handling
Add methods for setting up and shutting down DPDK apps and for
constructing EAL parameters.
Signed-off-by: Juraj Linkeš
---
dts/conf.yaml | 4 +
dts/framework/config/__init__.py | 85 -
dts/framework/config/conf_yaml_schema.json| 22 +++
.../remote_session/os/linux_session.py| 15 ++
dts/framework/remote_session/os/os_session.py | 16 +-
.../remote_session/os/posix_session.py| 80
dts/framework/testbed_model/hw/__init__.py| 17 ++
dts/framework/testbed_model/hw/cpu.py | 164
dts/framework/testbed_model/node/node.py | 36
dts/framework/testbed_model/node/sut_node.py | 178 +-
dts/framework/utils.py| 20 ++
11 files changed, 634 insertions(+), 3 deletions(-)
create mode 100644 dts/framework/testbed_model/hw/__init__.py
create mode 100644 dts/framework/testbed_model/hw/cpu.py
diff --git a/dts/conf.yaml b/dts/conf.yaml
index 6b0bc5c2bf..976888a88e 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -12,4 +12,8 @@ nodes:
- name: "SUT 1"
hostname: sut1.change.me.localhost
user: root
+arch: x86_64
os: linux
+bypass_core0: true
+cpus: ""
+memory_channels: 4
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 1b97dc3ab9..344d697a69 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -11,12 +11,13 @@
import pathlib
from dataclasses import dataclass
from enum import Enum, auto, unique
-from typing import Any
+from typing import Any, Iterable
import warlock # type: ignore
import yaml
from framework.settings import SETTINGS
+from framework.utils import expand_range
class StrEnum(Enum):
@@ -60,6 +61,80 @@ class Compiler(StrEnum):
msvc = auto()
+@dataclass(slots=True, frozen=True)
+class CPU:
+cpu: int
+core: int
+socket: int
+node: int
+
+def __str__(self) -> str:
+return str(self.cpu)
+
+
+class CPUList(object):
+"""
+Convert these options into a list of int cpus
+cpu_list=[CPU1, CPU2] - a list of CPUs
+cpu_list=[0,1,2,3] - a list of int indices
+cpu_list=['0','1','2-3'] - a list of str indices; ranges are supported
+cpu_list='0,1,2-3' - a comma delimited str of indices; ranges are supported
+
+The class creates a unified format used across the framework and allows
+the user to use either a str representation (using str(instance) or
directly
+in f-strings) or a list representation (by accessing instance.cpu_list).
+Empty cpu_list is allowed.
+"""
+
+_cpu_list: list[int]
+
+def __init__(self, cpu_list: list[int | str | CPU] | str):
+self._cpu_list = []
+if isinstance(cpu_list, str):
+self._from_str(cpu_list.split(","))
+else:
+self._from_str((str(cpu) for cpu in cpu_list))
+
+# the input cpus may not be sorted
+self._cpu_list.sort()
+
+@property
+def cpu_list(self) -> list[int]:
+return self._cpu_list
+
+def _from_str(self, cpu_list: Iterable[str]) -> None:
+for cpu in cpu_list:
+self._cpu_list.extend(expand_range(cpu))
+
+def _get_consecutive_cpus_range(self, cpu_list: list[int]) -> list[str]:
+formatted_core_list = []
+tmp_cpus_list = list(sorted(cpu_list))
+segment = tmp_cpus_list[:1]
+for core_id in tmp_cpus_list[1:]:
+if core_id - segment[-1] == 1:
+segment.append(core_id)
+else:
+formatted_core_list.append(
+f"{segment[0]}-{segment[-1]}"
+if len(segment) > 1
+else f"{segment[0]}"
+)
+current_core_index = tmp_cpus_list.index(core_id)
+formatted_core_list.extend(
+
self._get_consecutive_cpus_range(tmp_cpus_list[current_core_index:])
+)
+segment.clear()
+break
+if len(segment) > 0:
+formatted_core_list.append(
+f"{segment[0]}-{segment[-1]}" if len(segment) > 1 else
f"{segment[0]}"
+)
+return formatted_core_list
+
+def __str__(self) -> str:
+return f'{",".join(self._get_consecutive_cpus_range(self._cpu_list))}'
+
+
# Slots enables some optimizations, by pre-allocating space for the defined
# attributes in the underlying data structure.
#
@@ -71,7 +146,11 @@ class NodeConfiguration:
hostname: str
user: str
password: str | None
+arch: Architecture
os: OS
+bypass_core0: bool
+cpus: CPUList
+memory_channels: int
@staticmethod
def from_dict(d: dict) -> "NodeConfiguration":
@@ -80,7 +159,11 @@ def from_dict(d: dict) -> "NodeConfiguration":
hostname=d["hostname"],
user=d["user"],
password=d.get("password"),
+arch
[RFC PATCH v2 05/10] dts: add node memory setup
Setup hugepages on nodes. This is useful not only on SUT nodes, but
also on TG nodes which use TGs that utilize hugepages.
Signed-off-by: Juraj Linkeš
---
dts/framework/remote_session/__init__.py | 1 +
dts/framework/remote_session/arch/__init__.py | 20 +
dts/framework/remote_session/arch/arch.py | 57 +
.../remote_session/os/linux_session.py| 85 +++
dts/framework/remote_session/os/os_session.py | 10 +++
dts/framework/testbed_model/node/node.py | 15 +++-
6 files changed, 187 insertions(+), 1 deletion(-)
create mode 100644 dts/framework/remote_session/arch/__init__.py
create mode 100644 dts/framework/remote_session/arch/arch.py
diff --git a/dts/framework/remote_session/__init__.py
b/dts/framework/remote_session/__init__.py
index f2339b20bd..f0deeadac6 100644
--- a/dts/framework/remote_session/__init__.py
+++ b/dts/framework/remote_session/__init__.py
@@ -11,4 +11,5 @@
# pylama:ignore=W0611
+from .arch import Arch, create_arch
from .os import OSSession, create_session
diff --git a/dts/framework/remote_session/arch/__init__.py
b/dts/framework/remote_session/arch/__init__.py
new file mode 100644
index 00..d78ad42ac5
--- /dev/null
+++ b/dts/framework/remote_session/arch/__init__.py
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2022 PANTHEON.tech s.r.o.
+
+from framework.config import Architecture, NodeConfiguration
+
+from .arch import PPC64, Arch, Arm64, i686, x86_32, x86_64
+
+
+def create_arch(node_config: NodeConfiguration) -> Arch:
+match node_config.arch:
+case Architecture.x86_64:
+return x86_64()
+case Architecture.x86_32:
+return x86_32()
+case Architecture.i686:
+return i686()
+case Architecture.ppc64le:
+return PPC64()
+case Architecture.arm64:
+return Arm64()
diff --git a/dts/framework/remote_session/arch/arch.py
b/dts/framework/remote_session/arch/arch.py
new file mode 100644
index 00..05c7602def
--- /dev/null
+++ b/dts/framework/remote_session/arch/arch.py
@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2022 PANTHEON.tech s.r.o.
+
+
+class Arch(object):
+"""
+Stores architecture-specific information.
+"""
+
+@property
+def default_hugepage_memory(self) -> int:
+"""
+Return the default amount of memory allocated for hugepages DPDK will
use.
+The default is an amount equal to 256 2MB hugepages (512MB memory).
+"""
+return 256 * 2048
+
+@property
+def hugepage_force_first_numa(self) -> bool:
+"""
+An architecture may need to force configuration of hugepages to first
socket.
+"""
+return False
+
+
+class x86_64(Arch):
+@property
+def default_hugepage_memory(self) -> int:
+return 4096 * 2048
+
+
+class x86_32(Arch):
+@property
+def hugepage_force_first_numa(self) -> bool:
+return True
+
+
+class i686(Arch):
+@property
+def default_hugepage_memory(self) -> int:
+return 512 * 2048
+
+@property
+def hugepage_force_first_numa(self) -> bool:
+return True
+
+
+class PPC64(Arch):
+@property
+def default_hugepage_memory(self) -> int:
+return 512 * 2048
+
+
+class Arm64(Arch):
+@property
+def default_hugepage_memory(self) -> int:
+return 2048 * 2048
diff --git a/dts/framework/remote_session/os/linux_session.py
b/dts/framework/remote_session/os/linux_session.py
index 21f117b714..fad33d7613 100644
--- a/dts/framework/remote_session/os/linux_session.py
+++ b/dts/framework/remote_session/os/linux_session.py
@@ -3,6 +3,8 @@
# Copyright(c) 2022 University of New Hampshire
from framework.config import CPU
+from framework.exception import RemoteCommandExecutionError
+from framework.utils import expand_range
from .posix_session import PosixSession
@@ -24,3 +26,86 @@ def get_remote_cpus(self, bypass_core0: bool) -> list[CPU]:
continue
cpus.append(CPU(int(cpu), int(core), int(socket), int(node)))
return cpus
+
+def setup_hugepages(
+self, hugepage_amount: int = -1, force_first_numa: bool = False
+) -> None:
+self.logger.info("Getting Hugepage information.")
+hugepage_size = self._get_hugepage_size()
+hugepages_total = self._get_hugepages_total()
+self._numa_nodes = self._get_numa_nodes()
+
+target_hugepages_total = int(hugepage_amount / hugepage_size)
+if hugepage_amount % hugepage_size:
+target_hugepages_total += 1
+if force_first_numa or hugepages_total != target_hugepages_total:
+# when forcing numa, we need to clear existing hugepages regardless
+# of size, so they can be moved to the first numa node
+self._configure_huge_pages(
+target_hugepages_total, hugepage_size, force_first_numa
+)
[RFC PATCH v2 06/10] dts: add test results module
The module keeps track of test case results along with miscellaneous
information, such as on which SUT's did a failure occur and during the
testing of which build target.
Signed-off-by: Juraj Linkeš
---
dts/framework/dts.py | 5 +
dts/framework/test_result.py | 217 +++
2 files changed, 222 insertions(+)
create mode 100644 dts/framework/test_result.py
diff --git a/dts/framework/dts.py b/dts/framework/dts.py
index 262c392d8e..d606f8de2e 100644
--- a/dts/framework/dts.py
+++ b/dts/framework/dts.py
@@ -14,9 +14,11 @@
from .exception import DTSError, ReturnCode
from .logger import DTSLOG, getLogger
from .settings import SETTINGS
+from .test_result import Result
from .utils import check_dts_python_version
dts_logger: DTSLOG = getLogger("dts")
+result: Result = Result()
def run_all() -> None:
@@ -26,6 +28,7 @@ def run_all() -> None:
"""
return_code = ReturnCode.NO_ERR
global dts_logger
+global result
# check the python version of the server that run dts
check_dts_python_version()
@@ -45,6 +48,7 @@ def run_all() -> None:
# for all Execution sections
for execution in CONFIGURATION.executions:
sut_node = init_nodes(execution, nodes)
+result.sut = sut_node
run_execution(sut_node, execution)
except DTSError as e:
@@ -104,6 +108,7 @@ def run_build_target(
Run the given build target.
"""
dts_logger.info(f"Running target '{build_target.name}'.")
+result.target = build_target
try:
sut_node.setup_build_target(build_target)
run_suite(sut_node, build_target, execution)
diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
new file mode 100644
index 00..a12517b9bc
--- /dev/null
+++ b/dts/framework/test_result.py
@@ -0,0 +1,217 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2022 PANTHEON.tech s.r.o.
+
+"""
+Generic result container and reporters
+"""
+
+
+class Result(object):
+"""
+Generic result container. Useful to store/retrieve results during
+a DTF execution.
+
+It manages and hide an internal complex structure like the one shown below.
+This is presented to the user with a property based interface.
+
+internals = [
+'sut1', [
+'kdriver',
+'firmware',
+'pkg',
+'driver',
+'dpdk_version',
+'target1', 'nic1', [
+'suite1', [
+'case1', ['PASSED', ''],
+'case2', ['PASSED', ''],
+],
+],
+'target2', 'nic1', [
+'suite2', [
+'case3', ['PASSED', ''],
+'case4', ['FAILED', 'message'],
+],
+'suite3', [
+'case5', ['BLOCKED', 'message'],
+],
+]
+]
+]
+
+"""
+
+def __init__(self):
+self.__sut = 0
+self.__target = 0
+self.__test_suite = 0
+self.__test_case = 0
+self.__test_result = None
+self.__message = None
+self.__internals = []
+self.__failed_suts = {}
+self.__failed_targets = {}
+
+def __set_sut(self, sut):
+if sut not in self.__internals:
+self.__internals.append(sut)
+self.__internals.append([])
+self.__sut = self.__internals.index(sut)
+
+def __get_sut(self):
+return self.__internals[self.__sut]
+
+def current_dpdk_version(self, sut):
+"""
+Returns the dpdk version for a given SUT
+"""
+try:
+sut_idx = self.__internals.index(sut)
+return self.__internals[sut_idx + 1][4]
+except:
+return ""
+
+def __set_dpdk_version(self, dpdk_version):
+if dpdk_version not in self.internals[self.__sut + 1]:
+dpdk_current = self.__get_dpdk_version()
+if dpdk_current:
+if dpdk_version not in dpdk_current:
+self.internals[self.__sut + 1][4] = (
+dpdk_current + "/" + dpdk_version
+)
+else:
+self.internals[self.__sut + 1].append(dpdk_version)
+
+def __get_dpdk_version(self):
+try:
+return self.internals[self.__sut + 1][4]
+except:
+return ""
+
+def __current_targets(self):
+return self.internals[self.__sut + 1]
+
+def __set_target(self, target):
+targets = self.__current_targets()
+if target not in targets:
+targets.append(target)
+targets.append("_nic_")
+targets.append([])
+self.__target = targets.index(target)
+
+def __get_target(self):
+return self.__current_targets()[self.__target]
+
+def __current_suites(self):
+return self.__current_ta
[RFC PATCH v2 07/10] dts: add simple stats report
Provide a summary of testcase passed/failed/blocked counts.
Signed-off-by: Juraj Linkeš
---
dts/framework/dts.py| 3 ++
dts/framework/stats_reporter.py | 65 +
2 files changed, 68 insertions(+)
create mode 100644 dts/framework/stats_reporter.py
diff --git a/dts/framework/dts.py b/dts/framework/dts.py
index d606f8de2e..a7c243a5c3 100644
--- a/dts/framework/dts.py
+++ b/dts/framework/dts.py
@@ -14,11 +14,13 @@
from .exception import DTSError, ReturnCode
from .logger import DTSLOG, getLogger
from .settings import SETTINGS
+from .stats_reporter import TestStats
from .test_result import Result
from .utils import check_dts_python_version
dts_logger: DTSLOG = getLogger("dts")
result: Result = Result()
+test_stats: TestStats = TestStats(SETTINGS.output_dir + "/statistics.txt")
def run_all() -> None:
@@ -29,6 +31,7 @@ def run_all() -> None:
return_code = ReturnCode.NO_ERR
global dts_logger
global result
+global test_stats
# check the python version of the server that run dts
check_dts_python_version()
diff --git a/dts/framework/stats_reporter.py b/dts/framework/stats_reporter.py
new file mode 100644
index 00..a2735d0a1d
--- /dev/null
+++ b/dts/framework/stats_reporter.py
@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2022 PANTHEON.tech s.r.o.
+
+"""
+Simple text file statistics generator
+"""
+
+
+class TestStats(object):
+"""
+Generates a small statistics file containing the number of passing,
+failing and blocked tests. It makes use of a Result instance as input.
+"""
+
+def __init__(self, filename):
+self.filename = filename
+
+def __add_stat(self, test_result):
+if test_result is not None:
+if test_result[0] == "PASSED":
+self.passed += 1
+if test_result[0] == "FAILED":
+self.failed += 1
+if test_result[0] == "BLOCKED":
+self.blocked += 1
+self.total += 1
+
+def __count_stats(self):
+for sut in self.result.all_suts():
+for target in self.result.all_targets(sut):
+for suite in self.result.all_test_suites(sut, target):
+for case in self.result.all_test_cases(sut, target, suite):
+test_result = self.result.result_for(sut, target,
suite, case)
+if len(test_result):
+self.__add_stat(test_result)
+
+def __write_stats(self):
+sut_nodes = self.result.all_suts()
+if len(sut_nodes) == 1:
+self.stats_file.write(
+f"dpdk_version =
{self.result.current_dpdk_version(sut_nodes[0])}\n"
+)
+else:
+for sut in sut_nodes:
+dpdk_version = self.result.current_dpdk_version(sut)
+self.stats_file.write(f"{sut}.dpdk_version = {dpdk_version}\n")
+self.__count_stats()
+self.stats_file.write(f"Passed = {self.passed}\n")
+self.stats_file.write(f"Failed = {self.failed}\n")
+self.stats_file.write(f"Blocked= {self.blocked}\n")
+rate = 0
+if self.total > 0:
+rate = self.passed * 100.0 / self.total
+self.stats_file.write(f"Pass rate = {rate:.1f}\n")
+
+def save(self, result):
+self.passed = 0
+self.failed = 0
+self.blocked = 0
+self.total = 0
+self.stats_file = open(self.filename, "w+")
+self.result = result
+self.__write_stats()
+self.stats_file.close()
--
2.30.2
[RFC PATCH v2 08/10] dts: add testsuite class
This is the base class that all test suites inherit from. The base class
implements methods common to all test suites. The derived test suites
implement tests and any particular setup needed for the suite or tests.
Signed-off-by: Juraj Linkeš
---
dts/conf.yaml | 4 +
dts/framework/config/__init__.py | 33 ++-
dts/framework/config/conf_yaml_schema.json | 49
dts/framework/dts.py | 29 +++
dts/framework/exception.py | 65 ++
dts/framework/settings.py | 25 +++
dts/framework/test_case.py | 246 +
7 files changed, 450 insertions(+), 1 deletion(-)
create mode 100644 dts/framework/test_case.py
diff --git a/dts/conf.yaml b/dts/conf.yaml
index 976888a88e..0b0f2c59b0 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -7,6 +7,10 @@ executions:
os: linux
cpu: native
compiler: gcc
+perf: false
+func: true
+test_suites:
+ - hello_world
system_under_test: "SUT 1"
nodes:
- name: "SUT 1"
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 344d697a69..8874b10030 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -11,7 +11,7 @@
import pathlib
from dataclasses import dataclass
from enum import Enum, auto, unique
-from typing import Any, Iterable
+from typing import Any, Iterable, TypedDict
import warlock # type: ignore
import yaml
@@ -186,9 +186,34 @@ def from_dict(d: dict) -> "BuildTargetConfiguration":
)
+class TestSuiteConfigDict(TypedDict):
+suite: str
+cases: list[str]
+
+
+@dataclass(slots=True, frozen=True)
+class TestSuiteConfig:
+test_suite: str
+test_cases: list[str]
+
+@staticmethod
+def from_dict(
+entry: str | TestSuiteConfigDict,
+) -> "TestSuiteConfig":
+if isinstance(entry, str):
+return TestSuiteConfig(test_suite=entry, test_cases=[])
+elif isinstance(entry, dict):
+return TestSuiteConfig(test_suite=entry["suite"],
test_cases=entry["cases"])
+else:
+raise TypeError(f"{type(entry)} is not valid for a test suite
config.")
+
+
@dataclass(slots=True, frozen=True)
class ExecutionConfiguration:
build_targets: list[BuildTargetConfiguration]
+perf: bool
+func: bool
+test_suites: list[TestSuiteConfig]
system_under_test: NodeConfiguration
@staticmethod
@@ -196,11 +221,17 @@ def from_dict(d: dict, node_map: dict) ->
"ExecutionConfiguration":
build_targets: list[BuildTargetConfiguration] = list(
map(BuildTargetConfiguration.from_dict, d["build_targets"])
)
+test_suites: list[TestSuiteConfig] = list(
+map(TestSuiteConfig.from_dict, d["test_suites"])
+)
sut_name = d["system_under_test"]
assert sut_name in node_map, f"Unknown SUT {sut_name} in execution {d}"
return ExecutionConfiguration(
build_targets=build_targets,
+perf=d["perf"],
+func=d["func"],
+test_suites=test_suites,
system_under_test=node_map[sut_name],
)
diff --git a/dts/framework/config/conf_yaml_schema.json
b/dts/framework/config/conf_yaml_schema.json
index c59d3e30e6..e37ced65fe 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -63,6 +63,31 @@
}
},
"additionalProperties": false
+},
+"test_suite": {
+ "type": "string",
+ "enum": [
+"hello_world"
+ ]
+},
+"test_target": {
+ "type": "object",
+ "properties": {
+"suite": {
+ "$ref": "#/definitions/test_suite"
+},
+"cases": {
+ "type": "array",
+ "items": {
+"type": "string"
+ },
+ "minimum": 1
+}
+ },
+ "required": [
+"suite"
+ ],
+ "additionalProperties": false
}
},
"type": "object",
@@ -130,6 +155,27 @@
},
"minimum": 1
},
+ "perf": {
+"type": "boolean",
+"description": "Enable performance testing"
+ },
+ "func": {
+"type": "boolean",
+"description": "Enable functional testing"
+ },
+ "test_suites": {
+"type": "array",
+"items": {
+ "oneOf": [
+{
+ "$ref": "#/definitions/test_suite"
+},
+{
+ "$ref": "#/definitions/test_target"
+}
+ ]
+}
+ },
"system_under_test": {
"$ref": "#/definitions/node_name"
}
@@ -137,6 +183,9 @@
"additionalProperties": false,
"required": [
"build_targets",
+ "perf",
+ "func",
+
[RFC PATCH v2 09/10] dts: add hello world testplan
The testplan describes the capabilities of the tested application along with the description of testcases to test it. Signed-off-by: Juraj Linkeš --- dts/test_plans/hello_world_test_plan.rst | 68 1 file changed, 68 insertions(+) create mode 100644 dts/test_plans/hello_world_test_plan.rst diff --git a/dts/test_plans/hello_world_test_plan.rst b/dts/test_plans/hello_world_test_plan.rst new file mode 100644 index 00..566a9bb10c --- /dev/null +++ b/dts/test_plans/hello_world_test_plan.rst @@ -0,0 +1,68 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright(c) 2010-2017 Intel Corporation + += +Sample Application Tests: Hello World Example += + +This example is one of the most simple RTE application that can be +done. The program will just print a "helloworld" message on every +enabled lcore. + +Command Usage:: + + ./dpdk-helloworld -c COREMASK [-m NB] [-r NUM] [-n NUM] + +EAL option list: + -c COREMASK: hexadecimal bitmask of cores we are running on + -m MB : memory to allocate (default = size of hugemem) + -n NUM : force number of memory channels (don't detect) + -r NUM : force number of memory ranks (don't detect) + --huge-file: base filename for hugetlbfs entries +debug options: + --no-huge : use malloc instead of hugetlbfs + --no-pci : disable pci + --no-hpet : disable hpet + --no-shconf: no shared config (mmap'd files) + + +Prerequisites += + +Support igb_uio and vfio driver, if used vfio, kernel need 3.6+ and enable vt-d in bios. +When used vfio , used "modprobe vfio" and "modprobe vfio-pci" insmod vfio driver, then used +"./tools/dpdk_nic_bind.py --bind=vfio-pci device_bus_id" to bind vfio driver to test driver. + +To find out the mapping of lcores (processor) to core id and socket (physical +id), the command below can be used:: + + $ grep "processor\|physical id\|core id\|^$" /proc/cpuinfo + +The total logical core number will be used as ``helloworld`` input parameters. + + +Test Case: run hello world on single lcores +=== + +To run example in single lcore :: + + $ ./dpdk-helloworld -c 1 +hello from core 0 + +Check the output is exact the lcore 0 + + +Test Case: run hello world on every lcores +== + +To run the example in all the enabled lcore :: + + $ ./dpdk-helloworld -cff +hello from core 1 +hello from core 2 +hello from core 3 + ... + ... +hello from core 0 + +Verify the output of according to all the core masks. -- 2.30.2
[RFC PATCH v2 10/10] dts: add hello world testsuite
The testsuite implements the testcases defined in the corresponding test
plan.
Signed-off-by: Juraj Linkeš
---
dts/framework/remote_session/os/os_session.py | 16 +-
dts/framework/testbed_model/__init__.py | 1 +
dts/framework/testbed_model/node/sut_node.py | 11
dts/tests/TestSuite_hello_world.py| 53 +++
4 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 dts/tests/TestSuite_hello_world.py
diff --git a/dts/framework/remote_session/os/os_session.py
b/dts/framework/remote_session/os/os_session.py
index f84f3ce63c..1548e3c6c8 100644
--- a/dts/framework/remote_session/os/os_session.py
+++ b/dts/framework/remote_session/os/os_session.py
@@ -9,7 +9,7 @@
from framework.config import CPU, Architecture, NodeConfiguration
from framework.logger import DTSLOG
from framework.remote_session.factory import create_remote_session
-from framework.remote_session.remote_session import RemoteSession
+from framework.remote_session.remote_session import CommandResult,
RemoteSession
from framework.settings import SETTINGS
from framework.utils import EnvVarsDict
@@ -49,6 +49,20 @@ def is_alive(self) -> bool:
"""
return self.remote_session.is_alive()
+def send_command(
+self,
+command: str,
+timeout: float,
+verify: bool = False,
+env: EnvVarsDict | None = None,
+) -> CommandResult:
+"""
+An all-purpose API in case the command to be executed is already
+OS-agnostic, such as when the path to the executed command has been
+constructed beforehand.
+"""
+return self.remote_session.send_command(command, timeout, verify, env)
+
@abstractmethod
def guess_dpdk_remote_dir(self, remote_dir) -> PurePath:
"""
diff --git a/dts/framework/testbed_model/__init__.py
b/dts/framework/testbed_model/__init__.py
index 13c29c59c8..0a4862d7d6 100644
--- a/dts/framework/testbed_model/__init__.py
+++ b/dts/framework/testbed_model/__init__.py
@@ -8,4 +8,5 @@
# pylama:ignore=W0611
+from .hw import CPUAmount, CPUAmountFilter, CPUListFilter, CPUList
from .node import Node, SutNode
diff --git a/dts/framework/testbed_model/node/sut_node.py
b/dts/framework/testbed_model/node/sut_node.py
index ff3be845b4..d56f7467ba 100644
--- a/dts/framework/testbed_model/node/sut_node.py
+++ b/dts/framework/testbed_model/node/sut_node.py
@@ -9,6 +9,7 @@
from framework.config import CPU, BuildTargetConfiguration, CPUList,
NodeConfiguration
from framework.remote_session import OSSession
+from framework.remote_session.remote_session import CommandResult
from framework.settings import SETTINGS
from framework.testbed_model.hw import CPUAmount, CPUListFilter
from framework.utils import EnvVarsDict, skip_setup
@@ -224,6 +225,16 @@ def create_eal_parameters(
return eal_str
+def run_dpdk_app(
+self, app_path: PurePath, eal_args: str, timeout: float = 30
+) -> CommandResult:
+"""
+Run DPDK application on the remote node.
+"""
+return self.main_session.send_command(
+f"{app_path} {eal_args}", timeout, verify=True
+)
+
class _EalParameter(object):
def __init__(
diff --git a/dts/tests/TestSuite_hello_world.py
b/dts/tests/TestSuite_hello_world.py
new file mode 100644
index 00..d3661bb243
--- /dev/null
+++ b/dts/tests/TestSuite_hello_world.py
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+"""
+DPDK Test suite.
+Test HelloWorld example.
+"""
+
+from framework.test_case import TestCase
+from framework.testbed_model import CPUAmount, CPUAmountFilter, CPUList
+
+
+class TestHelloWorld(TestCase):
+def set_up_all(self):
+"""
+Run at the start of each test suite.
+hello_world Prerequisites:
+helloworld build pass
+"""
+self.app_helloworld_path = self.sut_node.build_dpdk_app("helloworld")
+
+def test_hello_world_single_core(self):
+"""
+Run hello world on single lcores
+Only received hello message from core0
+"""
+
+# get the mask for the first core
+cpu_amount = CPUAmount(1, 1, 1)
+cores = CPUAmountFilter(self.sut_node.cpus, cpu_amount).filter()
+eal_para =
self.sut_node.create_eal_parameters(core_filter_specifier=cpu_amount)
+result = self.sut_node.run_dpdk_app(self.app_helloworld_path, eal_para)
+self.verify(
+f"hello from core {str(cores[0]) in result.stdout}",
+f"EAL not started on core{cores[0]}",
+)
+
+def test_hello_world_all_cores(self):
+"""
+Run hello world on all lcores
+Received hello message from all lcores
+"""
+
+# get the maximum logical core number
+eal_para = self.sut_node.create_eal_parameters(
+core_filter_specifier=CPUList(self.sut_node.cpus)
+)
+result =
[PATCH 1/2] test/crypto-perf: fix number of sessions for cores
Currently the performance application creates a device session per lcore.
This was not reflected in how many session objects were available
in the mempool, when using a scheduler device.
The number of lcores is now taken into consideration when calculating
how many sessions are needed for the scheduler.
Fixes: 09fcf99dcad2 ("test/crypto-perf: fix number of scheduler sessions")
Reported-by: Kevin O'Sullivan
Signed-off-by: Ciara Power
---
app/test-crypto-perf/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 0fe47c6caa..22f6b2b3ba 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -269,8 +269,8 @@ cperf_initialize_cryptodev(struct cperf_options *opts,
uint8_t *enabled_cdevs)
uint32_t nb_slaves =
rte_cryptodev_scheduler_workers_get(cdev_id,
NULL);
- /* scheduler session header + 1 session per worker qp */
- sessions_needed = 1 + enabled_cdev_count *
+ /* scheduler session header per lcore + 1 session per
worker qp */
+ sessions_needed = nb_lcores + enabled_cdev_count *
opts->nb_qps * nb_slaves;
#endif
} else
--
2.34.1
[PATCH 2/2] test/crypto-perf: replace slave with worker
Update the use of outdated language "slaves" with "workers".
Signed-off-by: Ciara Power
---
app/test-crypto-perf/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 22f6b2b3ba..af5bd0d23b 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -266,12 +266,12 @@ cperf_initialize_cryptodev(struct cperf_options *opts,
uint8_t *enabled_cdevs)
if (!strcmp((const char *)opts->device_type,
"crypto_scheduler")) {
#ifdef RTE_CRYPTO_SCHEDULER
- uint32_t nb_slaves =
+ uint32_t nb_workers =
rte_cryptodev_scheduler_workers_get(cdev_id,
NULL);
/* scheduler session header per lcore + 1 session per
worker qp */
sessions_needed = nb_lcores + enabled_cdev_count *
- opts->nb_qps * nb_slaves;
+ opts->nb_qps * nb_workers;
#endif
} else
sessions_needed = enabled_cdev_count * opts->nb_qps;
--
2.34.1
Re: [PATCH] net/mlx5: fix drop action validation
10/11/2022 13:18, Raslan Darawsheh:
> From: Shun Hao
> > Currently there's limitation for Drop action that can only co-exist with
> > Count action.
> >
> > Sample and Age actions are also able to exist with Drop within the same
> > flow, and this patch includes them in the Drop action validation.
> >
> > Fixes: acb67cc8 ("net/mlx5: fix action flag data type")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Shun Hao
> > Acked-by: Matan Azrad
>
> Patch applied to next-net-mlx,
Fixed the root cause while pulling:
Fixes: 70faf9ae0a29 ("net/mlx5: unify validation of drop action")
Please check the "Fixes" reference while reviewing.
Also, the commit ID should be 12 characters long.
Re: [PATCH v2 3/3] ethdev: document special cases of port start and stop
On 11/14/2022 4:12 PM, Dariusz Sosnowski wrote:
Hi Ferruh,
-Original Message-
From: Ferruh Yigit
Sent: Monday, November 14, 2022 15:08
To: Dariusz Sosnowski ; Aman Singh
; Yuying Zhang ;
NBU-Contact-Thomas Monjalon (EXTERNAL) ;
Andrew Rybchenko
Cc: dev@dpdk.org
Subject: Re: [PATCH v2 3/3] ethdev: document special cases of port start and
stop
External email: Use caution opening links or attachments
On 11/9/2022 7:06 PM, Dariusz Sosnowski wrote:
This patch clarifies the handling of following cases in the ethdev API
docs:
- If rte_eth_dev_start() returns (-EAGAIN) for some port,
it cannot be started until other port is started.
- If rte_eth_dev_stop() returns (-EBUSY) for some port,
it cannot be stopped until other port is stopped.
EAGAIN and EBUSY has kind of standard meaning, I am not sure if it is good
idea to change this meaning to a specific "dependency to other port" use
case.
Why not keep common generic meanings of the error codes?
In my opinion, using standard error meanings for EAGAIN and EBUSY would make
the returned errors too vague for the API user.
If we used the standard meanings, it's not clear why the port cannot be started
or stopped and what the user should do about it.
Providing specific reasons in the API makes it more understandable. On top of that, they
are "subcases" of standard errors:
I think generic error meaning is not vague, although underlying reason is.
- "Port cannot be stopped because another port depends on it" is a special case of
"Device or resource is busy".
- "Port cannot be started because it depends on other port being started" is a special
case of "Resource temporarily unavailable".
However, I see your concern, so maybe let's do the following. To not limit the
API, we could for example:
- In the documentation of returned values - provide the generic meaning for the
EAGAIN and EBUSY:
- rte_eth_dev_stop(): EBUSY is returned if stopping the port is not
allowed in the current state.
- rte_eth_dev_start(): EAGAIN is returned if start operation must be
retried.
- In the function description provide the specific use case of "dependency on other
port" as an example
of EBUSY/EAGAIN usage
- Depending on the use cases emerging in the future, new examples can be
added,
if EBUSY/EAGAIN is suitable for the new use cases.
What do you think?
OK to above generic error documentation.
And what do you think to document "dependency on other port" in the
driver dev_ops function comment, since it will be an instance of the
generic error message.
When stopping the port in testpmd fails due to (-EBUSY), port's state
is switched back to STARTED to allow users to manually retry stopping
the port.
No additional changes in testpmd are required to handle failure to
start port with (-EAGAIN).
If rte_eth_dev_start() fails, port's state is switched to STOPPED and
users are allowed to retry the operation.
Signed-off-by: Dariusz Sosnowski
---
app/test-pmd/testpmd.c | 10 +-
lib/ethdev/rte_ethdev.h | 9 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
aa7ea29f15..5a69e3c77a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3118,6 +3118,7 @@ stop_port(portid_t pid)
int need_check_link_status = 0;
portid_t peer_pl[RTE_MAX_ETHPORTS];
int peer_pi;
+ int ret;
if (port_id_is_invalid(pid, ENABLED_WARN))
return;
@@ -3167,9 +3168,16 @@ stop_port(portid_t pid)
if (port->flow_list)
port_flow_flush(pi);
- if (eth_dev_stop_mp(pi) != 0)
+ ret = eth_dev_stop_mp(pi);
+ if (ret != 0) {
RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port
%u\n",
pi);
+ if (ret == -EBUSY) {
+ /* Allow to retry stopping the port. */
+ port->port_status = RTE_PORT_STARTED;
If the stop() failed, isn't the current status should be STARTED independent
from the error type?
Correct. I'll update it in v3.
+ continue;
+ }
+ }
if (port->port_status == RTE_PORT_HANDLING)
port->port_status = RTE_PORT_STOPPED; diff --git
a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index
13fe73d5a3..abf5a24f92 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2701,10 +2701,14 @@ int rte_eth_dev_tx_queue_stop(uint16_t
port_id, uint16_t tx_queue_id);
* On success, all basic functions exported by the Ethernet API (link status,
* receive/transmit, and so on) can be invoked.
*
+ * If the port depends on another one being started,
+ * PMDs might return (-EAGAIN) to notify about such requirement.
+ *
* @param port_id
* The port identifier of the Ethernet device.
* @return
[PATCH v3 0/3] ethdev: document special cases of port start and stop
This patch series attempts to address the special failure cases of rte_eth_dev_stop() and rte_eth_dev_start(). In case of starting a port, If the port cannot be started and start operation must be retried, PMDs might return (-EAGAIN) to notify about such situation. In case of stopping a port, If the port cannot be stopped in the current state, PMDs might return (-EBUSY) to notify about such situation. These cases are addressed in ethdev API docs. Testpmd is updated to allow users to manually retry start/stop operations. v3: - Allow to retry port stop in testpmd for all errors. - Made error descriptions in the API more generic and moved specific error causes descriptions to PMD. v2: - Fixed documentation build. Dariusz Sosnowski (3): net/mlx5: fix log level on failed transfer proxy stop net/mlx5: document E-Switch limitations with HWS in mlx5 PMD ethdev: document special cases of port start and stop app/test-pmd/testpmd.c | 8 +++- doc/guides/nics/mlx5.rst| 13 + drivers/net/mlx5/mlx5_trigger.c | 17 ++--- lib/ethdev/rte_ethdev.h | 2 ++ 4 files changed, 36 insertions(+), 4 deletions(-) -- 2.25.1
[PATCH v3 1/3] net/mlx5: fix log level on failed transfer proxy stop
This patches increases log level for error reporting when stopping
the transfer proxy port failed. Stopping can fail with EBUSY when
related representor ports are still running.
Fixes: 483181f7b6dd ("net/mlx5: support device control of representor matching")
Signed-off-by: Dariusz Sosnowski
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_trigger.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 9854df828d..fe6359908a 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -1377,9 +1377,9 @@ mlx5_hw_proxy_port_allowed_stop(struct rte_eth_dev *dev)
representor_started = true;
}
if (representor_started) {
- DRV_LOG(INFO, "Failed to stop port %u: attached representor
ports"
- " must be stopped before stopping transfer proxy
port",
- dev->data->port_id);
+ DRV_LOG(ERR, "Failed to stop port %u: attached representor
ports"
+" must be stopped before stopping transfer proxy
port",
+dev->data->port_id);
rte_errno = EBUSY;
return -rte_errno;
}
--
2.25.1
[PATCH v3 2/3] net/mlx5: document E-Switch limitations with HWS in mlx5 PMD
This patch adds the following limitations to the mlx5 PMD guide: - With HW Steering and E-Switch enabled, transfer proxy port must be started before any port representor. - With HW Steering and E-Switch enabled, all representors must be stopped before transfer proxy port is stopped. Documentation of mlx5 PMD's implementations of rte_eth_dev_start() and rte_eth_dev_stop() is updated accordingly: - rte_eth_dev_start() returns (-EAGAIN) when transfer proxy port cannot be started. - rte_eth_dev_stop() returns (-EBUSY) when port representor cannot be stopped. Signed-off-by: Dariusz Sosnowski --- doc/guides/nics/mlx5.rst| 13 + drivers/net/mlx5/mlx5_trigger.c | 11 +++ 2 files changed, 24 insertions(+) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 4f0db21dde..1df6ca9711 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -161,6 +161,19 @@ Limitations - NIC ConnectX-5 and before are not supported. - Partial match with item template is not supported. - IPv6 5-tuple matching is not supported. + - With E-Switch enabled, ports which share the E-Switch domain +should be started and stopped in a specific order: + +- When starting ports, the transfer proxy port should be started first + and port representors should follow. +- When stopping ports, all of the port representors + should be stopped before stopping the transfer proxy port. + +If ports are started/stopped in an incorrect order, +``rte_eth_dev_start()``/``rte_eth_dev_stop()`` will return an appropriate error code: + +- ``-EAGAIN`` for ``rte_eth_dev_start()``. +- ``-EBUSY`` for ``rte_eth_dev_stop()``. - When using Verbs flow engine (``dv_flow_en`` = 0), flow pattern without any specific VLAN will match for VLAN packets as well: diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index fe6359908a..f54443ed1a 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1138,6 +1138,10 @@ mlx5_hw_representor_port_allowed_start(struct rte_eth_dev *dev) * * @return * 0 on success, a negative errno value otherwise and rte_errno is set. + * The following error values are defined: + * + * - -EAGAIN: If port representor cannot be started, + * because transfer proxy port is not started. */ int mlx5_dev_start(struct rte_eth_dev *dev) @@ -1394,6 +1398,13 @@ mlx5_hw_proxy_port_allowed_stop(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + * The following error values are defined: + * + * - -EBUSY: If transfer proxy port cannot be stopped, + * because other port representors are still running. */ int mlx5_dev_stop(struct rte_eth_dev *dev) -- 2.25.1
[PATCH v3 3/3] ethdev: document special cases of port start and stop
This patch clarifies the handling of following cases
in the ethdev API docs:
- If rte_eth_dev_start() returns (-EAGAIN) for some port,
it cannot be started right now and start operation
must be retried.
- If rte_eth_dev_stop() returns (-EBUSY) for some port,
it cannot be stopped in the current state.
When stopping the port in testpmd fails,
port's state is switched back to STARTED
to allow users to manually retry stopping the port.
No additional changes in testpmd are required to handle
failures to start the port.
If rte_eth_dev_start() fails, port's state is switched to STOPPED
and users are allowed to retry the operation.
Signed-off-by: Dariusz Sosnowski
---
app/test-pmd/testpmd.c | 8 +++-
lib/ethdev/rte_ethdev.h | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 4e25f77c6a..a0b4ede48b 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3182,6 +3182,7 @@ stop_port(portid_t pid)
int need_check_link_status = 0;
portid_t peer_pl[RTE_MAX_ETHPORTS];
int peer_pi;
+ int ret;
if (port_id_is_invalid(pid, ENABLED_WARN))
return;
@@ -3231,9 +3232,14 @@ stop_port(portid_t pid)
if (port->flow_list)
port_flow_flush(pi);
- if (eth_dev_stop_mp(pi) != 0)
+ ret = eth_dev_stop_mp(pi);
+ if (ret != 0) {
RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port
%u\n",
pi);
+ /* Allow to retry stopping the port. */
+ port->port_status = RTE_PORT_STARTED;
+ continue;
+ }
if (port->port_status == RTE_PORT_HANDLING)
port->port_status = RTE_PORT_STOPPED;
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 13fe73d5a3..c129ca1eaf 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -2705,6 +2705,7 @@ int rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t
tx_queue_id);
* The port identifier of the Ethernet device.
* @return
* - 0: Success, Ethernet device started.
+ * - -EAGAIN: If start operation must be retried.
* - <0: Error code of the driver device start function.
*/
int rte_eth_dev_start(uint16_t port_id);
@@ -2717,6 +2718,7 @@ int rte_eth_dev_start(uint16_t port_id);
* The port identifier of the Ethernet device.
* @return
* - 0: Success, Ethernet device stopped.
+ * - -EBUSY: If stopping the port is not allowed in current state.
* - <0: Error code of the driver device stop function.
*/
int rte_eth_dev_stop(uint16_t port_id);
--
2.25.1
RE: [PATCH v2 3/3] ethdev: document special cases of port start and stop
> -Original Message-
> From: Ferruh Yigit
> Sent: Monday, November 14, 2022 18:10
> To: Dariusz Sosnowski ; Aman Singh
> ; Yuying Zhang ;
> NBU-Contact-Thomas Monjalon (EXTERNAL) ;
> Andrew Rybchenko
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2 3/3] ethdev: document special cases of port start and
> stop
>
> External email: Use caution opening links or attachments
>
>
> On 11/14/2022 4:12 PM, Dariusz Sosnowski wrote:
> > Hi Ferruh,
> >
> >> -Original Message-
> >> From: Ferruh Yigit
> >> Sent: Monday, November 14, 2022 15:08
> >> To: Dariusz Sosnowski ; Aman Singh
> >> ; Yuying Zhang
> ;
> >> NBU-Contact-Thomas Monjalon (EXTERNAL) ;
> Andrew
> >> Rybchenko
> >> Cc: dev@dpdk.org
> >> Subject: Re: [PATCH v2 3/3] ethdev: document special cases of port
> >> start and stop
> >>
> >> External email: Use caution opening links or attachments
> >>
> >>
> >> On 11/9/2022 7:06 PM, Dariusz Sosnowski wrote:
> >>> This patch clarifies the handling of following cases in the ethdev
> >>> API
> >>> docs:
> >>>
> >>> - If rte_eth_dev_start() returns (-EAGAIN) for some port,
> >>> it cannot be started until other port is started.
> >>> - If rte_eth_dev_stop() returns (-EBUSY) for some port,
> >>> it cannot be stopped until other port is stopped.
> >>>
> >>
> >> EAGAIN and EBUSY has kind of standard meaning, I am not sure if it is
> >> good idea to change this meaning to a specific "dependency to other
> >> port" use case.
> >> Why not keep common generic meanings of the error codes?
> >
> > In my opinion, using standard error meanings for EAGAIN and EBUSY would
> make the returned errors too vague for the API user.
> > If we used the standard meanings, it's not clear why the port cannot be
> started or stopped and what the user should do about it.
> > Providing specific reasons in the API makes it more understandable. On top
> of that, they are "subcases" of standard errors:
> >
>
> I think generic error meaning is not vague, although underlying reason is.
>
> > - "Port cannot be stopped because another port depends on it" is a special
> case of "Device or resource is busy".
> > - "Port cannot be started because it depends on other port being started"
> is a special case of "Resource temporarily unavailable".
> >
> > However, I see your concern, so maybe let's do the following. To not limit
> the API, we could for example:
> >
> > - In the documentation of returned values - provide the generic meaning
> for the EAGAIN and EBUSY:
> > - rte_eth_dev_stop(): EBUSY is returned if stopping the port is not
> allowed in the current state.
> > - rte_eth_dev_start(): EAGAIN is returned if start operation must be
> retried.
> > - In the function description provide the specific use case of "dependency
> on other port" as an example
> >of EBUSY/EAGAIN usage
> > - Depending on the use cases emerging in the future, new examples can
> be added,
> >if EBUSY/EAGAIN is suitable for the new use cases.
> >
> > What do you think?
>
> OK to above generic error documentation.
> And what do you think to document "dependency on other port" in the
> driver dev_ops function comment, since it will be an instance of the generic
> error message.
Sounds good to me. Updated in v3.
> >
> >>> When stopping the port in testpmd fails due to (-EBUSY), port's
> >>> state is switched back to STARTED to allow users to manually retry
> >>> stopping the port.
> >>>
> >>> No additional changes in testpmd are required to handle failure to
> >>> start port with (-EAGAIN).
> >>> If rte_eth_dev_start() fails, port's state is switched to STOPPED
> >>> and users are allowed to retry the operation.
> >>>
> >>> Signed-off-by: Dariusz Sosnowski
> >>> ---
> >>>app/test-pmd/testpmd.c | 10 +-
> >>>lib/ethdev/rte_ethdev.h | 9 +
> >>>2 files changed, 18 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> >>> aa7ea29f15..5a69e3c77a 100644
> >>> --- a/app/test-pmd/testpmd.c
> >>> +++ b/app/test-pmd/testpmd.c
> >>> @@ -3118,6 +3118,7 @@ stop_port(portid_t pid)
> >>>int need_check_link_status = 0;
> >>>portid_t peer_pl[RTE_MAX_ETHPORTS];
> >>>int peer_pi;
> >>> + int ret;
> >>>
> >>>if (port_id_is_invalid(pid, ENABLED_WARN))
> >>>return;
> >>> @@ -3167,9 +3168,16 @@ stop_port(portid_t pid)
> >>>if (port->flow_list)
> >>>port_flow_flush(pi);
> >>>
> >>> - if (eth_dev_stop_mp(pi) != 0)
> >>> + ret = eth_dev_stop_mp(pi);
> >>> + if (ret != 0) {
> >>>RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for
> >>> port %u\n",
> >>>pi);
> >>> + if (ret == -EBUSY) {
> >>> + /* Allow to retry stopping the port. */
> >>> + port->port_status = RTE_PORT_STARTED;
> >>
> >> If the stop() failed, isn't th
Re: [PATCH v3 3/3] ethdev: document special cases of port start and stop
On 11/14/2022 6:19 PM, Dariusz Sosnowski wrote: This patch clarifies the handling of following cases in the ethdev API docs: - If rte_eth_dev_start() returns (-EAGAIN) for some port, it cannot be started right now and start operation must be retried. - If rte_eth_dev_stop() returns (-EBUSY) for some port, it cannot be stopped in the current state. When stopping the port in testpmd fails, port's state is switched back to STARTED to allow users to manually retry stopping the port. No additional changes in testpmd are required to handle failures to start the port. If rte_eth_dev_start() fails, port's state is switched to STOPPED and users are allowed to retry the operation. Signed-off-by: Dariusz Sosnowski Acked-by: Ferruh Yigit
Re: [PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
On Mon, Nov 14, 2022 at 9:13 AM changfengnan wrote: > > rte_mempool_create put tailq entry into rte_mempool_tailq list before > populate, and pool_data set when populate. So in multi process, if > process A create mempool, and process B can get mempool through > rte_mempool_lookup before pool_data set, if B call rte_mempool_lookup, > it will cause segment fault. I fail to see how pool_data impacts rte_mempool_lookup. Something is fishy about this commitlog. > Fix this by put tailq entry into rte_mempool_tailq after populate. Moving tailq manipulation to rte_mempool_create only, is probably incorrect. An application is allowed to call rte_mempool_create_empty() and rte_mempool_populate(). I did not look in depth, but It is likely the reason why testpmd (as run with devtools/test-null.sh) won't pass anymore. The CI reported this issue in various envs. We can't take this patch. > > Signed-off-by: changfengnan Please use your real name. -- David Marchand
Re: [PATCH 0/2] GitHub Actions configuration fixes
On Mon, Nov 14, 2022 at 11:44 AM David Marchand wrote: > > On Wed, Oct 12, 2022 at 6:30 PM David Marchand > wrote: > > > > GitHub Actions started to deprecated some part of the workflow syntax > > and dependencies of some core actions. > > > > This series (mostly) fix those warnings. > > For reviewers/testers, this is still moving: I got new warnings while > > I was testing the first patch... > > In the end, the series is good to go as is. Series applied. -- David Marchand
[PATCH 1/3] examples/l3fwd: validate ptype only for type of traffic sent
The check_ptype function is not considering the ptype of the incoming
traffic. --parse-ptype flag must be provided only when the NIC does not
support parsing the ptype of the incoming traffic
Suggested-by: Nathan Brown
Signed-off-by: Kamalakshitha Aligeri
Reviewed-by: Ruifeng Wang
Reviewed-by: Nathan Brown
Reviewed-by: Feifei Wang
---
examples/l3fwd/l3fwd_em.c | 8 +---
examples/l3fwd/l3fwd_lpm.c | 13 +++--
examples/l3fwd/main.c | 5 ++---
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index a203dc9e46..682ad343d7 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -507,12 +507,14 @@ em_check_ptype(int portid)
}
}
- if (ptype_l3_ipv4_ext == 0)
+ if (!ipv6 && !ptype_l3_ipv4_ext) {
printf("port %d cannot parse RTE_PTYPE_L3_IPV4_EXT\n", portid);
- if (ptype_l3_ipv6_ext == 0)
+ return 0;
+ }
+ if (ipv6 && !ptype_l3_ipv6_ext) {
printf("port %d cannot parse RTE_PTYPE_L3_IPV6_EXT\n", portid);
- if (!ptype_l3_ipv4_ext || !ptype_l3_ipv6_ext)
return 0;
+ }
if (ptype_l4_tcp == 0)
printf("port %d cannot parse RTE_PTYPE_L4_TCP\n", portid);
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 22d7f61a42..1ac78281f9 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -667,16 +667,17 @@ lpm_check_ptype(int portid)
ptype_l3_ipv6 = 1;
}
- if (ptype_l3_ipv4 == 0)
+ if (!ipv6 && !ptype_l3_ipv4) {
printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid);
+ return 0;
+ }
- if (ptype_l3_ipv6 == 0)
+ if (ipv6 && !ptype_l3_ipv6) {
printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid);
+ return 0;
+ }
- if (ptype_l3_ipv4 && ptype_l3_ipv6)
- return 1;
-
- return 0;
+ return 1;
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 5198ff30dd..71a3018036 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -964,12 +964,11 @@ parse_args(int argc, char **argv)
}
/*
-* ipv6 and hash flags are valid only for
-* exact match, reset them to default for
+* hash flag is valid only for
+* exact match, reset it to default for
* longest-prefix match.
*/
if (lookup_mode == L3FWD_LOOKUP_LPM) {
- ipv6 = 0;
hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
}
--
2.17.1
[PATCH 2/3] examples/l3fwd: removed hash entry number
hash_entry_number in l3fwd is not being used by both lpm and em lookup
method. Removed the global variable hash_entry_number and the function
that parses the hash-entry-number flag.
Signed-off-by: Kamalakshitha Aligeri
Reviewed-by: Honnappa Nagarahalli
---
examples/l3fwd/l3fwd.h | 1 -
examples/l3fwd/main.c | 37 +
2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index ca1426a687..b55855c932 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -55,7 +55,6 @@
/* 32-bit has less address-space for hugepage memory, limit to 1M entries */
#define L3FWD_HASH_ENTRIES (1024*1024*1)
#endif
-#define HASH_ENTRY_NUMBER_DEFAULT 16
struct parm_cfg {
const char *rule_ipv4_name;
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 71a3018036..a4f061537e 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -89,7 +89,6 @@ uint32_t enabled_port_mask;
/* Used only in exact match mode. */
int ipv6; /**< ipv6 is false by default. */
-uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
struct lcore_conf lcore_conf[RTE_MAX_LCORE];
@@ -395,7 +394,6 @@ print_usage(const char *prgname)
" [--eth-dest=X,MM:MM:MM:MM:MM:MM]"
" [--max-pkt-len PKTLEN]"
" [--no-numa]"
- " [--hash-entry-num]"
" [--ipv6]"
" [--parse-ptype]"
" [--per-port-pool]"
@@ -419,7 +417,6 @@ print_usage(const char *prgname)
" --eth-dest=X,MM:MM:MM:MM:MM:MM: Ethernet destination for
port X\n"
" --max-pkt-len PKTLEN: maximum packet length in decimal
(64-9600)\n"
" --no-numa: Disable numa awareness\n"
- " --hash-entry-num: Specify the hash entry number in
hexadecimal to be setup\n"
" --ipv6: Set if running ipv6 packets\n"
" --parse-ptype: Set to use software to analyze packet type\n"
" --per-port-pool: Use separate buffer pool per port\n"
@@ -479,22 +476,6 @@ parse_portmask(const char *portmask)
return pm;
}
-static int
-parse_hash_entry_number(const char *hash_entry_num)
-{
- char *end = NULL;
- unsigned long hash_en;
- /* parse hexadecimal string */
- hash_en = strtoul(hash_entry_num, &end, 16);
- if ((hash_entry_num[0] == '\0') || (end == NULL) || (*end != '\0'))
- return -1;
-
- if (hash_en == 0)
- return -1;
-
- return hash_en;
-}
-
static int
parse_config(const char *q_arg)
{
@@ -852,14 +833,7 @@ parse_args(int argc, char **argv)
break;
case CMD_LINE_OPT_HASH_ENTRY_NUM_NUM:
- ret = parse_hash_entry_number(optarg);
- if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {
- hash_entry_number = ret;
- } else {
- fprintf(stderr, "invalid hash entry number\n");
- print_usage(prgname);
- return -1;
- }
+ fprintf(stderr, "Hash entry number will be ignored\n");
break;
case CMD_LINE_OPT_PARSE_PTYPE_NUM:
@@ -963,15 +937,6 @@ parse_args(int argc, char **argv)
lookup_mode = L3FWD_LOOKUP_LPM;
}
- /*
-* hash flag is valid only for
-* exact match, reset it to default for
-* longest-prefix match.
-*/
- if (lookup_mode == L3FWD_LOOKUP_LPM) {
- hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
- }
-
/* For ACL, update port config rss hash filter */
if (lookup_mode == L3FWD_LOOKUP_ACL) {
port_conf.rx_adv_conf.rss_conf.rss_hf |=
--
2.17.1
[PATCH 3/3] doc/l3fwd: lpm supports IPv4 and IPv6 forwarding
LPM based lookup supports both IPv4 and IPv6 forwarding.
Fixes: 6a094e328598 ("examples/l3fwd: implement FIB lookup method")
Cc: sta...@dpdk.org
Signed-off-by: Kamalakshitha Aligeri
Reviewed-by: Honnappa Nagarahalli
---
doc/guides/sample_app_ug/l3_forward.rst | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/guides/sample_app_ug/l3_forward.rst
b/doc/guides/sample_app_ug/l3_forward.rst
index 94b22da01e..1cc2c1dd1d 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -56,9 +56,8 @@ for the IPv4/IPv6 5-tuple syntax specifically.
The 5-tuple syntax consists of a source IP address, a destination IP address,
a source port, a destination port and a protocol identifier.
-In the sample application, hash-based, FIB-based and ACL-based forwarding
supports
+In the sample application, hash-based, LPM-based, FIB-based and ACL-based
forwarding supports
both IPv4 and IPv6.
-LPM-based forwarding supports IPv4 only.
During the initialization phase route rules for IPv4 and IPv6 are read from
rule files.
Compiling the Application
--
2.17.1
Re: [PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
It seems that this modification ignores some certain cases, for example calling
rte_mempool_create_empty directly, maybe add a new flag bit to indicate
when to put tailq entry into rte_mempool_tailq list is a better way ?
Looking forward to any suggestions.
Thanks.
Fengnan Chang.
changfengnan 于2022年11月14日周一 15:14写道：
>
> rte_mempool_create put tailq entry into rte_mempool_tailq list before
> populate, and pool_data set when populate. So in multi process, if
> process A create mempool, and process B can get mempool through
> rte_mempool_lookup before pool_data set, if B call rte_mempool_lookup,
> it will cause segment fault.
> Fix this by put tailq entry into rte_mempool_tailq after populate.
>
> Signed-off-by: changfengnan
> ---
> lib/mempool/rte_mempool.c | 40 +++
> 1 file changed, 19 insertions(+), 21 deletions(-)
>
> diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
> index 4c78071a34..b23d6138ff 100644
> --- a/lib/mempool/rte_mempool.c
> +++ b/lib/mempool/rte_mempool.c
> @@ -798,9 +798,7 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
> int socket_id, unsigned flags)
> {
> char mz_name[RTE_MEMZONE_NAMESIZE];
> - struct rte_mempool_list *mempool_list;
> struct rte_mempool *mp = NULL;
> - struct rte_tailq_entry *te = NULL;
> const struct rte_memzone *mz = NULL;
> size_t mempool_size;
> unsigned int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
> @@ -820,8 +818,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
> RTE_CACHE_LINE_MASK) != 0);
> #endif
>
> - mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head,
> rte_mempool_list);
> -
> /* asked for zero items */
> if (n == 0) {
> rte_errno = EINVAL;
> @@ -866,14 +862,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
> private_data_size = (private_data_size +
> RTE_MEMPOOL_ALIGN_MASK) &
> (~RTE_MEMPOOL_ALIGN_MASK);
>
> -
> - /* try to allocate tailq entry */
> - te = rte_zmalloc("MEMPOOL_TAILQ_ENTRY", sizeof(*te), 0);
> - if (te == NULL) {
> - RTE_LOG(ERR, MEMPOOL, "Cannot allocate tailq entry!\n");
> - goto exit_unlock;
> - }
> -
> mempool_size = RTE_MEMPOOL_HEADER_SIZE(mp, cache_size);
> mempool_size += private_data_size;
> mempool_size = RTE_ALIGN_CEIL(mempool_size, RTE_MEMPOOL_ALIGN);
> @@ -908,7 +896,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
> mp->private_data_size = private_data_size;
> STAILQ_INIT(&mp->elt_list);
> STAILQ_INIT(&mp->mem_list);
> -
> /*
> * local_cache pointer is set even if cache_size is zero.
> * The local_cache points to just past the elt_pa[] array.
> @@ -922,12 +909,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
> mempool_cache_init(&mp->local_cache[lcore_id],
>cache_size);
> }
> -
> - te->data = mp;
> -
> - rte_mcfg_tailq_write_lock();
> - TAILQ_INSERT_TAIL(mempool_list, te, next);
> - rte_mcfg_tailq_write_unlock();
> rte_mcfg_mempool_write_unlock();
>
> rte_mempool_trace_create_empty(name, n, elt_size, cache_size,
> @@ -936,7 +917,6 @@ rte_mempool_create_empty(const char *name, unsigned n,
> unsigned elt_size,
>
> exit_unlock:
> rte_mcfg_mempool_write_unlock();
> - rte_free(te);
> rte_mempool_free(mp);
> return NULL;
> }
> @@ -951,11 +931,22 @@ rte_mempool_create(const char *name, unsigned n,
> unsigned elt_size,
> {
> int ret;
> struct rte_mempool *mp;
> + struct rte_mempool_list *mempool_list;
> + struct rte_tailq_entry *te = NULL;
> +
> + /* try to allocate tailq entry */
> + te = rte_zmalloc("MEMPOOL_TAILQ_ENTRY", sizeof(*te), 0);
> + if (te == NULL) {
> + RTE_LOG(ERR, MEMPOOL, "Cannot allocate tailq entry!\n");
> + return NULL;
> + }
>
> mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
> private_data_size, socket_id, flags);
> - if (mp == NULL)
> + if (mp == NULL) {
> + rte_free(te);
> return NULL;
> + }
>
> /*
> * Since we have 4 combinations of the SP/SC/MP/MC examine the flags
> to
> @@ -984,12 +975,19 @@ rte_mempool_create(const char *name, unsigned n,
> unsigned elt_size,
> if (obj_init)
> rte_mempool_obj_iter(mp, obj_init, obj_init_arg);
>
> + te->data = mp;
> + mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head,
> rte_mempool_list);
> + rte_mcfg_tailq_write_lock();
> + TAILQ_INSERT_TAIL(mempool_list, te, next);
> +
RE: [PATCH v4] doc: support IPsec Multi-buffer lib v1.3
Hi Akhil, I remember you have a comment in earlier version of this patch about to include this ipsec mb v1.3 release doc update into release notes. I have review the release_22_11.rst, but I'm not sure the best section to capture this info , any recommendations ? Best Kai > -Original Message- > From: De Lara Guarch, Pablo > Sent: Saturday, November 12, 2022 11:26 AM > To: Ji, Kai > Cc: dev@dpdk.org; De Lara Guarch, Pablo ; > Power, Ciara ; Dooley, Brian > Subject: [PATCH v4] doc: support IPsec Multi-buffer lib v1.3 > > Updated AESNI MB and AESNI GCM, KASUMI, ZUC, SNOW3G and > CHACHA20_POLY1305 PMD documentation guides with information about the > latest Intel IPSec Multi-buffer library supported. > > Signed-off-by: Pablo de Lara > Acked-by: Ciara Power > Acked-by: Brian Dooley > > --- > -v4: Added information on CHACHA20_POLY1305 PMD guide > -v3: Fixed library version from 1.2 to 1.3 in one line > -v2: Removed repeated word 'the' > ---
[PATCH] net/nfp: fix the problem of mask table free
The free process of mask table has problem, should use
'rte_has_free()' rather than 'rte_free()'.
Fixes: ac09376096d8 ("net/nfp: add structures and functions for flow offload")
Signed-off-by: Chaoyong He
Reviewed-by: Niklas Söderlund
---
drivers/net/nfp/nfp_flow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index af56e7bef2..6f79d950db 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -4116,7 +4116,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
free_flow_table:
rte_hash_free(priv->flow_table);
free_mask_table:
- rte_free(priv->mask_table);
+ rte_hash_free(priv->mask_table);
free_stats:
rte_free(priv->stats);
free_stats_id:
--
2.29.3
RE: [PATCH v2] net/mlx5: use just sufficient barrier for Arm platforms
>
> >
> > Hi, Honnappa
> Hi Slava, thanks for the feedback.
>
> >
> > We discussed the barrier here:
> > http://patches.dpdk.org/project/dpdk/patch/20210606164948.35997-1-
> > honnappa.nagaraha...@arm.com/
> Yes, I have changed the patch according to the discussion. i.e. barrier is
> needed, but different (inner sharable domain) barrier is required.
>
> >
> > (BTW, it is good practice to keep the reference to previous patch
> > versions below Commit Message of the next ones).
> >
> > This barrier is not about compiler ordering, it is about external HW
> > agent memory action completions.
> > So, I'm not sure the rte_atomic_thread_fence() is safe for x86 - patch
> > impacts
> > x86 as well.
> The earlier barrier 'rte_io_rmb()', resolves to a compiler barrier on x86 [1].
> The rte_atomic_thread_fence(__ATOMIC_ACQUIRE) on x86 also acts as a
> compiler barrier. So, there is no change for x86.
>
>
> [1]
> https://github.com/DPDK/dpdk/blob/main/lib/eal/x86/include/rte_atomic.h#
> L80
Hi Slava, any more comments on this?
>
> >
> > With best regards,
> > Slava
> >
> > > -Original Message-
> > > From: Honnappa Nagarahalli
> > > Sent: Tuesday, August 30, 2022 23:01
> > > To: dev@dpdk.org; honnappa.nagaraha...@arm.com;
> > ruifeng.w...@arm.com;
> > > Matan Azrad ; Shahaf Shuler
> ;
> > > Slava Ovsiienko
> > > Cc: n...@arm.com; Matan Azrad ; sta...@dpdk.org
> > > Subject: [PATCH v2] net/mlx5: use just sufficient barrier for Arm
> > > platforms
> > >
> > > cqe->op_own indicates if the CQE is owned by the NIC. The rest of
> > > the fields in CQE should be read only after op_own is read. On Arm
> > > platforms using "dmb ishld" is sufficient to enforce this.
> > >
> > > Fixes: 88c0733535d6 ("net/mlx5: extend Rx completion with error
> > > handling")
> > > Cc: ma...@mellanox.com
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Honnappa Nagarahalli
> > > Reviewed-by: Ruifeng Wang
> > > ---
> > > drivers/common/mlx5/mlx5_common.h | 6 +-
> > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/common/mlx5/mlx5_common.h
> > > b/drivers/common/mlx5/mlx5_common.h
> > > index 5028a05b49..ac2e85b15f 100644
> > > --- a/drivers/common/mlx5/mlx5_common.h
> > > +++ b/drivers/common/mlx5/mlx5_common.h
> > > @@ -195,7 +195,11 @@ check_cqe(volatile struct mlx5_cqe *cqe, const
> > > uint16_t cqes_n,
> > >
> > > if (unlikely((op_owner != (!!(idx))) || (op_code ==
> > > MLX5_CQE_INVALID)))
> > > return MLX5_CQE_STATUS_HW_OWN;
> > > - rte_io_rmb();
> > > + /* Prevent speculative reading of other fields in CQE until
> > > + * CQE is valid.
> > > + */
> > > + rte_atomic_thread_fence(__ATOMIC_ACQUIRE);
> > > +
> > > if (unlikely(op_code == MLX5_CQE_RESP_ERR ||
> > >op_code == MLX5_CQE_REQ_ERR))
> > > return MLX5_CQE_STATUS_ERR;
> > > --
> > > 2.17.1
[PATCH] config/arm: make SoC-generic more generic
The non-generic soc has 1280 max-lcores and 32 max-numas, but the
implementer-generic still has 256 max-lcores and 4 max-numas, which may
result in restrictions on the use of binaries compiled by soc-generic
in these systems.
This patch changes the soc-generic max-lcores to 1280 and max-numas to
32 to make it more generic.
Also, because single numa is a special case of multiple numas, mark
soc-generic's numa flag as true.
Signed-off-by: Chengwen Feng
---
config/arm/meson.build | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 6442ec9596..97b91cf609 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -32,8 +32,8 @@ implementer_generic = {
'flags': [
['RTE_MACHINE', '"armv8a"'],
['RTE_USE_C11_MEM_MODEL', true],
-['RTE_MAX_LCORE', 256],
-['RTE_MAX_NUMA_NODES', 4]
+['RTE_MAX_LCORE', 1280],
+['RTE_MAX_NUMA_NODES', 32]
],
'part_number_config': {
'generic': {
@@ -271,7 +271,8 @@ implementers = {
soc_generic = {
'description': 'Generic un-optimized build for armv8 aarch64 exec mode',
'implementer': 'generic',
-'part_number': 'generic'
+'part_number': 'generic',
+'numa': true
}
soc_generic_aarch32 = {
--
2.17.1
Re: [PATCH v3] mempool/cnxk: fix mempool destroy for empty pools
08/11/2022 07:55, Ashwin Sekhar T K:
> In scenarios where rte_mempool_free() is called immediately
> after rte_mempool_create_empty(), the NPA pool will not be
> created. In such cases the free path should not call
> roc_npa_pool_destroy().
>
> Fixes: bbf19e89b87c ("mempool/cnxk: add generic operations")
>
> Signed-off-by: Ashwin Sekhar T K
+ Cc: sta...@dpdk.org
Applied with the title "fix destroying empty pool".
RE: [PATCH] net/idpf: need to stop device when closing device
> -Original Message-
> From: Xing, Beilei
> Sent: Monday, November 14, 2022 6:40 PM
> To: Wu, Jingjing ; Zhang, Qi Z
> Cc: dev@dpdk.org; Xing, Beilei
> Subject: [PATCH] net/idpf: need to stop device when closing device
>
> From: Beilei Xing
>
> This patch stops device at the beginning of idpf_dev_close.
>
> Fixes: 14aa6ed8f2ec ("net/idpf: support device start and stop")
>
> Signed-off-by: Beilei Xing
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
[Bug 1119] [dpdk-22.11]pvp_virtio_bonding/vhost_virtio_bonding_mode_from_0_to_6: start bonding device failed and core dumped when quit testpmd
https://bugs.dpdk.org/show_bug.cgi?id=1119 Yuan,Dukai (dukaix.y...@intel.com) changed: What|Removed |Added Resolution|--- |FIXED Status|CONFIRMED |RESOLVED --- Comment #5 from Yuan,Dukai (dukaix.y...@intel.com) --- Verify on dpdk-22.11.0-rc2: 10d9e91a769. Test passed, so closed. OS: Ubuntu 22.04.1 LTS/5.15.45-051545-generic NIC type: Ethernet Controller XL710 for 40GbE QSFP+ 1583 NIC driver: i40e-2.20.12 NIC firmware:9.00 0x8000c8d4 1.3179.0 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1118] [dpdk-22.11.0rc1][meson test] driver-tests/link_bonding_autotest test failed core dumped
https://bugs.dpdk.org/show_bug.cgi?id=1118 liweiyuan (weiyuanx...@intel.com) changed: What|Removed |Added Resolution|--- |FIXED Status|CONFIRMED |RESOLVED --- Comment #5 from liweiyuan (weiyuanx...@intel.com) --- The patch has been merged into the DPDK main branch. Close this issue. -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH] config/arm: make SoC-generic more generic
On Tue, Nov 15, 2022 at 7:46 AM Chengwen Feng wrote:
>
> The non-generic soc has 1280 max-lcores and 32 max-numas, but the
> implementer-generic still has 256 max-lcores and 4 max-numas, which may
> result in restrictions on the use of binaries compiled by soc-generic
> in these systems.
>
> This patch changes the soc-generic max-lcores to 1280 and max-numas to
> 32 to make it more generic.
I think, it is not specific to ARM architecture issue. Even x86 config
set as below.
dpdk_conf.set('RTE_MAX_LCORE', 128)
dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)
I think, it makes sense to keep generic as "most commonly used max"
per application, expectation cases can have separate config.
Also, this is for SINGLE application, even if you have 1280 cores a
single application most likely won't use that.
So in that way this patch is not needed.
>
> Also, because single numa is a special case of multiple numas, mark
> soc-generic's numa flag as true.
>
> Signed-off-by: Chengwen Feng
> ---
> config/arm/meson.build | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/config/arm/meson.build b/config/arm/meson.build
> index 6442ec9596..97b91cf609 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -32,8 +32,8 @@ implementer_generic = {
> 'flags': [
> ['RTE_MACHINE', '"armv8a"'],
> ['RTE_USE_C11_MEM_MODEL', true],
> -['RTE_MAX_LCORE', 256],
> -['RTE_MAX_NUMA_NODES', 4]
> +['RTE_MAX_LCORE', 1280],
> +['RTE_MAX_NUMA_NODES', 32]
> ],
> 'part_number_config': {
> 'generic': {
> @@ -271,7 +271,8 @@ implementers = {
> soc_generic = {
> 'description': 'Generic un-optimized build for armv8 aarch64 exec mode',
> 'implementer': 'generic',
> -'part_number': 'generic'
> +'part_number': 'generic',
> +'numa': true
> }
>
> soc_generic_aarch32 = {
> --
> 2.17.1
>
RE: [External] Re: [PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
> From: Fengnan Chang [mailto:changfeng...@bytedance.com] > Sent: Tuesday, 15 November 2022 02.51 > > David Marchand 于2022年11月15日周二 > 04:44写道： > > > > On Mon, Nov 14, 2022 at 9:13 AM changfengnan > wrote: [...] > > > Signed-off-by: changfengnan > > > > Please use your real name. > > It's my real name. The name in the sign-off line must be Fengnan Chang , not changfengnan . -Morten
Re: [External] Re: [PATCH] mempool: fix rte_mempool_avail_count may segment fault when used in multiprocess
On Tue, Nov 15, 2022 at 2:51 AM Fengnan Chang wrote: > > David Marchand 于2022年11月15日周二 04:44写道： > > > > On Mon, Nov 14, 2022 at 9:13 AM changfengnan > > wrote: > > > > > > rte_mempool_create put tailq entry into rte_mempool_tailq list before > > > populate, and pool_data set when populate. So in multi process, if > > > process A create mempool, and process B can get mempool through > > > rte_mempool_lookup before pool_data set, if B call rte_mempool_lookup, > > > it will cause segment fault. > > > > I fail to see how pool_data impacts rte_mempool_lookup. > > Something is fishy about this commitlog. > > oh, it's my fault about this commit. correct: if B can get mempool through > rte_mempool_lookup before pool_data set, and call rte_mempool_avail_count, > it will cause segment fault. Ok, now it makes more sense :-). > > > > > > > > Fix this by put tailq entry into rte_mempool_tailq after populate. > > > > Moving tailq manipulation to rte_mempool_create only, is probably incorrect. > > An application is allowed to call rte_mempool_create_empty() and > > rte_mempool_populate(). > > > > I did not look in depth, but It is likely the reason why testpmd (as > > run with devtools/test-null.sh) won't pass anymore. > > The CI reported this issue in various envs. > > > > We can't take this patch. > > Yeah, this version makes CI fail. > I didn't notice rte_mempool_create_empty will called directly before, maybe > add a new flag bit to indicate when to put tailq entry into rte_mempool_tailq > list is a better way. If no better idea, I'll send a new version. I don't think we need an other flag. Can we "publish" the mempool at the mempool_ops_alloc_once stage? > > > > > > > > > > > Signed-off-by: changfengnan > > > > Please use your real name. > > It's my real name. Sorry, I meant your full name, like Fengnan Chang -- David Marchand
Re: [PATCH] config/arm: make SoC-generic more generic
Hi Jerin,
On 2022/11/15 15:08, Jerin Jacob wrote:
> On Tue, Nov 15, 2022 at 7:46 AM Chengwen Feng wrote:
>>
>> The non-generic soc has 1280 max-lcores and 32 max-numas, but the
>> implementer-generic still has 256 max-lcores and 4 max-numas, which may
>> result in restrictions on the use of binaries compiled by soc-generic
>> in these systems.
>>
>> This patch changes the soc-generic max-lcores to 1280 and max-numas to
>> 32 to make it more generic.
>
> I think, it is not specific to ARM architecture issue. Even x86 config
> set as below.
> dpdk_conf.set('RTE_MAX_LCORE', 128)
> dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)
>
> I think, it makes sense to keep generic as "most commonly used max"
> per application, expectation cases can have separate config.
>
> Also, this is for SINGLE application, even if you have 1280 cores a
> single application most likely won't use that.
> So in that way this patch is not needed.
If we keep it, then dpdk application could not run with lcore >= 256
I have a test for it:
1. set RTE_MAX_LCORE to 64
2. run testpmd with lcore 80-81: ./build/native/app/dpdk-testpmd -a
:bd:00.0 --file-prefix=feng -l 80-81 -- -i
it will display error:
EAL: Detected CPU lcores: 64
EAL: Detected NUMA nodes: 3
EAL: lcore 80 >= RTE_MAX_LCORE (64)
EAL: lcore 81 >= RTE_MAX_LCORE (64)
EAL: To use high physical core ids, please use --lcores to map them to
lcore ids below RTE_MAX_LCORE, e.g. --lcores 0@80,1@81
EAL: invalid core list syntax
>
>>
>> Also, because single numa is a special case of multiple numas, mark
>> soc-generic's numa flag as true.
>>
>> Signed-off-by: Chengwen Feng
>> ---
>> config/arm/meson.build | 7 ---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/config/arm/meson.build b/config/arm/meson.build
>> index 6442ec9596..97b91cf609 100644
>> --- a/config/arm/meson.build
>> +++ b/config/arm/meson.build
>> @@ -32,8 +32,8 @@ implementer_generic = {
>> 'flags': [
>> ['RTE_MACHINE', '"armv8a"'],
>> ['RTE_USE_C11_MEM_MODEL', true],
>> -['RTE_MAX_LCORE', 256],
>> -['RTE_MAX_NUMA_NODES', 4]
>> +['RTE_MAX_LCORE', 1280],
>> +['RTE_MAX_NUMA_NODES', 32]
>> ],
>> 'part_number_config': {
>> 'generic': {
>> @@ -271,7 +271,8 @@ implementers = {
>> soc_generic = {
>> 'description': 'Generic un-optimized build for armv8 aarch64 exec mode',
>> 'implementer': 'generic',
>> -'part_number': 'generic'
>> +'part_number': 'generic',
>> +'numa': true
>> }
>>
>> soc_generic_aarch32 = {
>> --
>> 2.17.1
>>
> .
>
