RE: [RFC] ethdev: introduce entropy calculation
Hi Andrew,
> -Original Message-
> From: Andrew Rybchenko
> Sent: Friday, January 12, 2024 9:46 AM
> To: Ori Kam ; Dariusz Sosnowski
> ; ferruh.yi...@amd.com;
> cristian.dumitre...@intel.com; NBU-Contact-Thomas Monjalon (EXTERNAL)
>
> Cc: dev@dpdk.org; Raslan Darawsheh
> Subject: Re: [RFC] ethdev: introduce entropy calculation
>
> Hi Ori,
>
> sorry for delay with reply.
>
> On 12/17/23 13:07, Ori Kam wrote:
> > Hi Andrew,
> >
> >> -Original Message-
> >> From: Andrew Rybchenko
> >> Sent: Saturday, December 16, 2023 11:19 AM
> >>
> >> On 12/10/23 11:30, Ori Kam wrote:
> >>> When offloading rules with the encap action, the HW may calculate entropy
> >> based on the encap protocol.
> >>> Each HW can implement a different algorithm.
> >>>
> >>> When the application receives packets that should have been
> >>> encaped by the HW, but didn't reach this stage yet (for example TCP SYN
> >> packets),
> >>> then when encap is done in SW, application must apply
> >>> the same entropy calculation algorithm.
> >>>
> >>> Using the new API application can request the PMD to calculate the
> >>> value as if the packet passed in the HW.
> >>
> >> I'm still wondering why the API is required. Does app install encap
> >> rule when the first packet is processed? The rule can contain all
> >> outer headers (as it is calculated in SW anyway) and HW does not need
> >> to calculate anything.
> >
> > Yes, the application installs a rule based on the first packet.
> > as a result, all the rest of the packets are encaped by the HW.
> > This API allows the application to use the same value as the HW will use
> > when
> encapsulating the packet.
> > In other words, we have 2 paths:
> > Path 1 SW, for the first packet
> > Path 2 HW, all the rest of the packest
>
> I get it, but I still don't understand why HW should calculate
> something. Can it simply use value provided by SW in encap rule?
> If so, calculation becomes not HW-specific and does not require
> driver callback.
The value is calculated per 5 tuple, it is possible that the SW will create
the encap flow with the required data. But this means that this rule should be
per tuple.
On the other hand, if the application wants to save HW resources and it can
create a single encapsulation
rule that will encapsulate all flows. In the last case the HW must calculate
the value since the SW can't configure the same value
for all flows.
Example for such a use case:
Group 0:
Match 5 tuple
Actions: NAT + counter + jump to group 2
Group 2
Match *
Actions: VXLAN encap
In the above case the application only use one HW resource for encapsulation.
I hope the use case is clearer to you
>
>
> >>> Signed-off-by: Ori Kam
> >>> ---
> >>>lib/ethdev/rte_flow.h | 49
> >> +++
> >>>1 file changed, 49 insertions(+)
> >>>
> >>> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> >>> index affdc8121b..3989b089dd 100644
> >>> --- a/lib/ethdev/rte_flow.h
> >>> +++ b/lib/ethdev/rte_flow.h
> >>> @@ -6753,6 +6753,55 @@ rte_flow_calc_table_hash(uint16_t port_id,
> const
> >> struct rte_flow_template_table
> >>>const struct rte_flow_item pattern[], uint8_t
> >> pattern_template_index,
> >>>uint32_t *hash, struct rte_flow_error *error);
> >>>
> >>> +/**
> >>> + * @warning
> >>> + * @b EXPERIMENTAL: this API may change without prior notice.
> >>> + *
> >>> + * Destination field type for the entropy calculation.
> >>> + *
> >>> + * @see function rte_flow_calc_encap_entropy
> >>> + */
> >>> +enum rte_flow_entropy_dest {
> >>> + /* Calculate entropy placed in UDP source port field. */
> >>> + RTE_FLOW_ENTROPY_DEST_UDP_SRC_PORT,
> >>
> >> And source and destination are used together but for different
> >> purposes it is very hard to follow which is used for which purpose.
> >> I'd avoid term "dest" in the enum naming. May be present "flow" is
> >> already good enough to highlight that it is per-flow?
> >> rte_flow_encap_hash? rte_flow_encap_field_hash?
> >
> > I'm open to any suggestions, this enum is supposed to show to which
> > field the HW insert the calculated value. This field is defined by the
> encapsulation
> > protocol. For example, VXLAN the hash is stored in source port, while in
> NVGRE it is stored in
> > flow_id field. The destination field also impact the size.
> >
> > What do you think about:
> > RTE_FLOW_ENCAP_HASH_SRC_PORT?
>
> Sounds better.
Great
>
> > What about if we change the destination to enum that will hold the
> destination tunnel type
> > RTE_FLOW_TUNNEL_TYPE_VXLAN,
> > RTE_FLOW_TUNNEL_TYPE_NVGRE
>
> It could be an option as well, but binds tunnel type to size of hash to
> be calculated. It looks OK right now, but may be wrong in the future.
>
Lets start with this and if needed update.
> >>> + /* Calculate entropy placed in NVGRE flow ID field. */
> >>> + RTE_FLOW_ENTROPY_DEST_NVGRE_FLOW_ID,
> >>> +};
> >>> +
> >>> +/**
> >>> + * @warning
[PATCH 1/2] config/arm: avoid mcpu and march conflicts
From: Pavan Nikhilesh
The compiler options march and mtune are a subset
of mcpu and will lead to conflicts if improper march
is chosen for a given mcpu.
To avoid conflicts, force part number march when
mcpu is available and is supported by the compiler.
Example:
march = armv9-a
mcpu = neoverse-n2
mcpu supported, march supported
machine_args = ['-mcpu=neoverse-n2', '-march=armv9-a']
mcpu supported, march not supported
machine_args = ['-mcpu=neoverse-n2']
mcpu not supported, march supported
machine_args = ['-march=armv9-a']
mcpu not supported, march not supported
machine_args = ['-march=armv8.6-a']
Signed-off-by: Pavan Nikhilesh
---
config/arm/meson.build | 109 +
1 file changed, 67 insertions(+), 42 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 36f21d2259..8c8cfccca0 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -58,18 +58,18 @@ implementer_generic = {
}
part_number_config_arm = {
-'0xd03': {'compiler_options': ['-mcpu=cortex-a53']},
-'0xd04': {'compiler_options': ['-mcpu=cortex-a35']},
-'0xd05': {'compiler_options': ['-mcpu=cortex-a55']},
-'0xd07': {'compiler_options': ['-mcpu=cortex-a57']},
-'0xd08': {'compiler_options': ['-mcpu=cortex-a72']},
-'0xd09': {'compiler_options': ['-mcpu=cortex-a73']},
-'0xd0a': {'compiler_options': ['-mcpu=cortex-a75']},
-'0xd0b': {'compiler_options': ['-mcpu=cortex-a76']},
+'0xd03': {'mcpu': 'cortex-a53'},
+'0xd04': {'mcpu': 'cortex-a35'},
+'0xd05': {'mcpu': 'cortex-a55'},
+'0xd07': {'mcpu': 'cortex-a57'},
+'0xd08': {'mcpu': 'cortex-a72'},
+'0xd09': {'mcpu': 'cortex-a73'},
+'0xd0a': {'mcpu': 'cortex-a75'},
+'0xd0b': {'mcpu': 'cortex-a76'},
'0xd0c': {
'march': 'armv8.2-a',
'march_features': ['crypto', 'rcpc'],
-'compiler_options': ['-mcpu=neoverse-n1'],
+'mcpu': 'neoverse-n1',
'flags': [
['RTE_MACHINE', '"neoverse-n1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -81,7 +81,7 @@ part_number_config_arm = {
'0xd40': {
'march': 'armv8.4-a',
'march_features': ['sve'],
-'compiler_options': ['-mcpu=neoverse-v1'],
+'mcpu': 'neoverse-v1',
'flags': [
['RTE_MACHINE', '"neoverse-v1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -92,8 +92,9 @@ part_number_config_arm = {
'march': 'armv8.4-a',
},
'0xd49': {
+'march': 'armv9-a',
'march_features': ['sve2'],
-'compiler_options': ['-mcpu=neoverse-n2'],
+'mcpu': 'neoverse-n2',
'flags': [
['RTE_MACHINE', '"neoverse-n2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -127,21 +128,22 @@ implementer_cavium = {
],
'part_number_config': {
'0xa1': {
-'compiler_options': ['-mcpu=thunderxt88'],
+'mcpu': 'thunderxt88',
'flags': flags_part_number_thunderx
},
'0xa2': {
-'compiler_options': ['-mcpu=thunderxt81'],
+'mcpu': 'thunderxt81',
'flags': flags_part_number_thunderx
},
'0xa3': {
-'compiler_options': ['-march=armv8-a+crc', '-mcpu=thunderxt83'],
+'mcpu': 'thunderxt83',
+'compiler_options': ['-march=armv8-a+crc'],
'flags': flags_part_number_thunderx
},
'0xaf': {
'march': 'armv8.1-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mcpu=thunderx2t99'],
+'mcpu': 'thunderx2t99',
'flags': [
['RTE_MACHINE', '"thunderx2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -153,7 +155,7 @@ implementer_cavium = {
'0xb2': {
'march': 'armv8.2-a',
'march_features': ['crc', 'crypto', 'lse'],
-'compiler_options': ['-mcpu=octeontx2'],
+'mcpu': 'octeontx2',
'flags': [
['RTE_MACHINE', '"cn9k"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -176,7 +178,7 @@ implementer_ampere = {
'0x0': {
'march': 'armv8-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mtune=emag'],
+'mcpu': 'emag',
'flags': [
['RTE_MACHINE', '"eMAG"'],
['RTE_MAX_LCORE', 32],
@@ -186,7 +188,7 @@ implementer_ampere = {
'0xac3': {
'march': 'armv8.6-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mcpu=ampere1'],
+'mcpu': 'ampere1',
'flags': [
['RTE_MACHINE', '"AmpereOne"'],
['RTE_MAX_LCORE', 320],
@@ -206,7 +208,7 @@ implementer_hisilicon = {
'0xd01': {
'march': 'armv8.2-a',
[PATCH 2/2] config/arm: add support for fallback march
From: Pavan Nikhilesh
Some ARM CPUs have specific march requirements and
are not compatible with the supported march list.
Add fallback march in case the mcpu and the march
advertised in the part_number_config are not supported
by the compiler.
Example
mcpu = neoverse-n2
march = armv9-a
fallback_march = armv8.5-a
mcpu, march not supported
machine_args = ['-march=armv8.5-a']
mcpu, march, fallback_march not supported
least march supported = armv8-a
machine_args = ['-march=armv8-a']
Signed-off-by: Pavan Nikhilesh
---
config/arm/meson.build | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8c8cfccca0..2aaf78a81a 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -94,6 +94,7 @@ part_number_config_arm = {
'0xd49': {
'march': 'armv9-a',
'march_features': ['sve2'],
+'fallback_march': 'armv8.5-a',
'mcpu': 'neoverse-n2',
'flags': [
['RTE_MACHINE', '"neoverse-n2"'],
@@ -709,14 +710,14 @@ if update_flags
# probe supported archs and their features
candidate_march = ''
+supported_marchs = ['armv9-a', 'armv8.6-a', 'armv8.5-a', 'armv8.4-a',
+'armv8.3-a', 'armv8.2-a', 'armv8.1-a', 'armv8-a']
if part_number_config.has_key('march')
if part_number_config.get('force_march', false) or support_mcpu
if cc.has_argument('-march=' + part_number_config['march'])
candidate_march = part_number_config['march']
endif
else
-supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a',
'armv8.3-a',
-'armv8.2-a', 'armv8.1-a', 'armv8-a']
check_compiler_support = false
foreach supported_march: supported_marchs
if supported_march == part_number_config['march']
@@ -733,6 +734,16 @@ if update_flags
endif
if candidate_march != part_number_config['march']
+if part_number_config.has_key('fallback_march') and not
support_mcpu
+fallback_march = part_number_config['fallback_march']
+foreach supported_march: supported_marchs
+if (supported_march == fallback_march
+and cc.has_argument('-march=' + supported_march))
+candidate_march = supported_march
+break
+endif
+endforeach
+endif
warning('Configuration march version is @0@, not supported.'
.format(part_number_config['march']))
if candidate_march != ''
--
2.25.1
[PATCH v3 1/2] config/arm: allow WFE to be enabled config time
From: Pavan Nikhilesh Allow RTE_ARM_USE_WFE to be enabled at meson configuration time by passing it via c_args instead of modifying `config/arm/meson.build`. Example usage: meson build -Dc_args='-DRTE_ARM_USE_WFE' \ --cross-file config/arm/arm64_cn10k_linux_gcc Signed-off-by: Pavan Nikhilesh --- v3 Changes: - Comment the meson option instead of removing it. config/arm/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 36f21d2259..89e1de312b 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -17,7 +17,9 @@ flags_common = [ #['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF], #['RTE_ARM64_MEMCPY_STRICT_ALIGN', false], -['RTE_ARM_USE_WFE', false], +# Enable use of ARM wait for event instruction. +# ['RTE_ARM_USE_WFE', false], + ['RTE_ARCH_ARM64', true], ['RTE_CACHE_LINE_SIZE', 128] ] -- 2.25.1
[PATCH v3 2/2] event/cnxk: use WFE LDP loop for getwork routine
From: Pavan Nikhilesh
Use WFE LDP loop while polling for GETWORK completion for better
power savings.
Disabled by default and can be enabled by configuring meson with
-Dc_args='-DRTE_ARM_USE_WFE'.
Signed-off-by: Pavan Nikhilesh
---
doc/guides/eventdevs/cnxk.rst | 9 ++
drivers/event/cnxk/cn10k_worker.h | 52 +--
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
index cccb8a0304..04f5b5025b 100644
--- a/doc/guides/eventdevs/cnxk.rst
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -198,6 +198,15 @@ Runtime Config Options
-a 0002:0e:00.0,tim_eclk_freq=12288-10-0
+Power Savings on CN10K
+--
+
+ARM cores can additionally use WFE when polling for transactions on SSO bus
+to save power i.e., in the event dequeue call ARM core can enter WFE and exit
+when either work has been scheduled or dequeue timeout has reached.
+This can be enabled by configuring meson with the following option
+``-Dc_args='-DRTE_ARM_USE_WFE'``.
+
Debugging Options
-
diff --git a/drivers/event/cnxk/cn10k_worker.h
b/drivers/event/cnxk/cn10k_worker.h
index 8aa916fa12..92d5190842 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -250,23 +250,57 @@ cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct
rte_event *ev,
gw.get_work = ws->gw_wdata;
#if defined(RTE_ARCH_ARM64)
-#if !defined(__clang__)
- asm volatile(
- PLT_CPU_FEATURE_PREAMBLE
- "caspal %[wdata], %H[wdata], %[wdata], %H[wdata], [%[gw_loc]]\n"
- : [wdata] "+r"(gw.get_work)
- : [gw_loc] "r"(ws->base + SSOW_LF_GWS_OP_GET_WORK0)
- : "memory");
-#else
+#if defined(__clang__)
register uint64_t x0 __asm("x0") = (uint64_t)gw.u64[0];
register uint64_t x1 __asm("x1") = (uint64_t)gw.u64[1];
+#if defined(RTE_ARM_USE_WFE)
+ plt_write64(gw.u64[0], ws->base + SSOW_LF_GWS_OP_GET_WORK0);
+ asm volatile(PLT_CPU_FEATURE_PREAMBLE
+" ldp %[x0], %[x1], [%[tag_loc]] \n"
+" tbz %[x0], %[pend_gw], done%= \n"
+" sevl\n"
+"rty%=:wfe \n"
+" ldp %[x0], %[x1], [%[tag_loc]] \n"
+" tbnz %[x0], %[pend_gw], rty%= \n"
+"done%=: \n"
+" dmb ld \n"
+: [x0] "+r" (x0), [x1] "+r" (x1)
+: [tag_loc] "r"(ws->base + SSOW_LF_GWS_WQE0),
+ [pend_gw] "i"(SSOW_LF_GWS_TAG_PEND_GET_WORK_BIT)
+: "memory");
+#else
asm volatile(".arch armv8-a+lse\n"
"caspal %[x0], %[x1], %[x0], %[x1], [%[dst]]\n"
-: [x0] "+r"(x0), [x1] "+r"(x1)
+: [x0] "+r" (x0), [x1] "+r" (x1)
: [dst] "r"(ws->base + SSOW_LF_GWS_OP_GET_WORK0)
: "memory");
+#endif
gw.u64[0] = x0;
gw.u64[1] = x1;
+#else
+#if defined(RTE_ARM_USE_WFE)
+ plt_write64(gw.u64[0], ws->base + SSOW_LF_GWS_OP_GET_WORK0);
+ asm volatile(PLT_CPU_FEATURE_PREAMBLE
+" ldp %[wdata], %H[wdata], [%[tag_loc]] \n"
+" tbz %[wdata], %[pend_gw], done%=\n"
+" sevl\n"
+"rty%=:wfe \n"
+" ldp %[wdata], %H[wdata], [%[tag_loc]] \n"
+" tbnz %[wdata], %[pend_gw], rty%=\n"
+"done%=: \n"
+" dmb ld \n"
+: [wdata] "=&r"(gw.get_work)
+: [tag_loc] "r"(ws->base + SSOW_LF_GWS_WQE0),
+ [pend_gw] "i"(SSOW_LF_GWS_TAG_PEND_GET_WORK_BIT)
+: "memory");
+#else
+ asm volatile(
+ PLT_CPU_FEATURE_PREAMBLE
+ "caspal %[wdata], %H[wdata], %[wdata], %H[wdata], [%[gw_loc]]\n"
+ : [wdata] "+r"(gw.get_work)
+ : [gw_loc] "r"(ws->base + SSOW_LF_GWS_OP_GET_WORK0)
+ : "memory");
+#endif
#endif
#else
plt_write64(gw.u64[0], ws->base + SSOW_LF_GWS_OP_GET_WORK0);
--
2.25.1
[PATCH v3 1/2] net/octeon_ep: improve Rx performance
From: Pavan Nikhilesh
Use mempool API instead of pktmbuf alloc to avoid mbuf reset
as it will be done by rearm on receive.
Reorder refill to avoid unnecessary write commits on mbuf data.
Signed-off-by: Pavan Nikhilesh
---
drivers/net/octeon_ep/cnxk_ep_rx.c | 4 +--
drivers/net/octeon_ep/cnxk_ep_rx.h | 13 ++---
drivers/net/octeon_ep/cnxk_ep_rx_avx.c | 20 +++---
drivers/net/octeon_ep/cnxk_ep_rx_sse.c | 38 ++
drivers/net/octeon_ep/otx_ep_rxtx.h| 2 +-
5 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/drivers/net/octeon_ep/cnxk_ep_rx.c
b/drivers/net/octeon_ep/cnxk_ep_rx.c
index f3e4fb27d1..7465e0a017 100644
--- a/drivers/net/octeon_ep/cnxk_ep_rx.c
+++ b/drivers/net/octeon_ep/cnxk_ep_rx.c
@@ -76,12 +76,12 @@ cnxk_ep_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
uint16_t new_pkts;
new_pkts = cnxk_ep_rx_pkts_to_process(droq, nb_pkts);
- cnxk_ep_process_pkts_scalar(rx_pkts, droq, new_pkts);
-
/* Refill RX buffers */
if (droq->refill_count >= DROQ_REFILL_THRESHOLD)
cnxk_ep_rx_refill(droq);
+ cnxk_ep_process_pkts_scalar(rx_pkts, droq, new_pkts);
+
return new_pkts;
}
diff --git a/drivers/net/octeon_ep/cnxk_ep_rx.h
b/drivers/net/octeon_ep/cnxk_ep_rx.h
index e71fc0de5c..61263e651e 100644
--- a/drivers/net/octeon_ep/cnxk_ep_rx.h
+++ b/drivers/net/octeon_ep/cnxk_ep_rx.h
@@ -21,13 +21,16 @@ cnxk_ep_rx_refill_mbuf(struct otx_ep_droq *droq, uint32_t
count)
uint32_t i;
int rc;
- rc = rte_pktmbuf_alloc_bulk(droq->mpool, &recv_buf_list[refill_idx],
count);
+ rc = rte_mempool_get_bulk(droq->mpool, (void
**)&recv_buf_list[refill_idx], count);
if (unlikely(rc)) {
droq->stats.rx_alloc_failure++;
return rc;
}
for (i = 0; i < count; i++) {
+ rte_prefetch_non_temporal(&desc_ring[(refill_idx + 1) & 3]);
+ if (i < count - 1)
+ rte_prefetch_non_temporal(recv_buf_list[refill_idx +
1]);
buf = recv_buf_list[refill_idx];
desc_ring[refill_idx].buffer_ptr =
rte_mbuf_data_iova_default(buf);
refill_idx++;
@@ -42,9 +45,9 @@ cnxk_ep_rx_refill_mbuf(struct otx_ep_droq *droq, uint32_t
count)
static inline void
cnxk_ep_rx_refill(struct otx_ep_droq *droq)
{
- uint32_t desc_refilled = 0, count;
- uint32_t nb_desc = droq->nb_desc;
+ const uint32_t nb_desc = droq->nb_desc;
uint32_t refill_idx = droq->refill_idx;
+ uint32_t desc_refilled = 0, count;
int rc;
if (unlikely(droq->read_idx == refill_idx))
@@ -128,6 +131,8 @@ cnxk_ep_rx_pkts_to_process(struct otx_ep_droq *droq,
uint16_t nb_pkts)
return RTE_MIN(nb_pkts, droq->pkts_pending);
}
+#define cnxk_pktmbuf_mtod(m, t) ((t)(void *)((char *)(m)->buf_addr +
RTE_PKTMBUF_HEADROOM))
+
static __rte_always_inline void
cnxk_ep_process_pkts_scalar(struct rte_mbuf **rx_pkts, struct otx_ep_droq
*droq, uint16_t new_pkts)
{
@@ -147,7 +152,7 @@ cnxk_ep_process_pkts_scalar(struct rte_mbuf **rx_pkts,
struct otx_ep_droq *droq,
void *));
mbuf = recv_buf_list[read_idx];
- info = rte_pktmbuf_mtod(mbuf, struct otx_ep_droq_info *);
+ info = cnxk_pktmbuf_mtod(mbuf, struct otx_ep_droq_info *);
read_idx = otx_ep_incr_index(read_idx, 1, nb_desc);
pkt_len = rte_bswap16(info->length >> 48);
mbuf->pkt_len = pkt_len;
diff --git a/drivers/net/octeon_ep/cnxk_ep_rx_avx.c
b/drivers/net/octeon_ep/cnxk_ep_rx_avx.c
index ae4615e6da..47eb1d2ef7 100644
--- a/drivers/net/octeon_ep/cnxk_ep_rx_avx.c
+++ b/drivers/net/octeon_ep/cnxk_ep_rx_avx.c
@@ -49,7 +49,7 @@ cnxk_ep_process_pkts_vec_avx(struct rte_mbuf **rx_pkts,
struct otx_ep_droq *droq
/* Load rearm data and packet length for shuffle. */
for (i = 0; i < CNXK_EP_OQ_DESC_PER_LOOP_AVX; i++)
data[i] = _mm256_set_epi64x(0,
- rte_pktmbuf_mtod(m[i], struct otx_ep_droq_info
*)->length >> 16,
+ cnxk_pktmbuf_mtod(m[i], struct otx_ep_droq_info
*)->length >> 16,
0, rearm_data);
/* Shuffle data to its place and sum the packet length. */
@@ -81,15 +81,15 @@ cnxk_ep_recv_pkts_avx(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkt
struct otx_ep_droq *droq = (struct otx_ep_droq *)rx_queue;
uint16_t new_pkts, vpkts;
+ /* Refill RX buffers */
+ if (droq->refill_count >= DROQ_REFILL_THRESHOLD)
+ cnxk_ep_rx_refill(droq);
+
new_pkts = cnxk_ep_rx_pkts_to_process(droq, nb_pkts);
vpkts = RTE_ALIGN_FLOOR(new_pkts, CNXK_EP_OQ_DESC_PER_LOOP_AVX);
cnxk_ep_process_pkts_vec_avx(rx_pkts, droq, vpkts);
cnxk_ep_process_pkts
[PATCH v3 2/2] net/octeon_ep: add Rx NEON routine
From: Pavan Nikhilesh
Add Rx ARM NEON SIMD routine.
Signed-off-by: Pavan Nikhilesh
---
drivers/net/octeon_ep/cnxk_ep_rx_neon.c | 140
drivers/net/octeon_ep/meson.build | 6 +-
drivers/net/octeon_ep/otx_ep_ethdev.c | 5 +-
drivers/net/octeon_ep/otx_ep_rxtx.h | 6 +
4 files changed, 155 insertions(+), 2 deletions(-)
create mode 100644 drivers/net/octeon_ep/cnxk_ep_rx_neon.c
diff --git a/drivers/net/octeon_ep/cnxk_ep_rx_neon.c
b/drivers/net/octeon_ep/cnxk_ep_rx_neon.c
new file mode 100644
index 00..b13a5897f9
--- /dev/null
+++ b/drivers/net/octeon_ep/cnxk_ep_rx_neon.c
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell.
+ */
+
+#include "cnxk_ep_rx.h"
+
+static __rte_always_inline void
+cnxk_ep_process_pkts_vec_neon(struct rte_mbuf **rx_pkts, struct otx_ep_droq
*droq,
+ uint16_t new_pkts)
+{
+ struct rte_mbuf **recv_buf_list = droq->recv_buf_list;
+ uint32_t pidx0, pidx1, pidx2, pidx3;
+ struct rte_mbuf *m0, *m1, *m2, *m3;
+ uint32_t read_idx = droq->read_idx;
+ uint16_t nb_desc = droq->nb_desc;
+ uint32_t idx0, idx1, idx2, idx3;
+ uint32x4_t bytes;
+ uint16_t pkts = 0;
+
+ idx0 = read_idx;
+ bytes = vdupq_n_u32(0);
+ while (pkts < new_pkts) {
+ const uint8x16_t mask0 = {0, 1, 0xff, 0xff, 0, 1, 0xff, 0xff,
+ 4, 5, 0xff, 0xff, 4, 5, 0xff, 0xff};
+ const uint8x16_t mask1 = {8, 9, 0xff, 0xff, 8, 9, 0xff,
0xff,
+ 12, 13, 0xff, 0xff, 12, 13, 0xff,
0xff};
+ uint64x2_t s01, s23;
+
+ idx1 = otx_ep_incr_index(idx0, 1, nb_desc);
+ idx2 = otx_ep_incr_index(idx1, 1, nb_desc);
+ idx3 = otx_ep_incr_index(idx2, 1, nb_desc);
+
+ if (new_pkts - pkts > 4) {
+ pidx0 = otx_ep_incr_index(idx3, 1, nb_desc);
+ pidx1 = otx_ep_incr_index(pidx0, 1, nb_desc);
+ pidx2 = otx_ep_incr_index(pidx1, 1, nb_desc);
+ pidx3 = otx_ep_incr_index(pidx2, 1, nb_desc);
+
+
rte_prefetch_non_temporal(cnxk_pktmbuf_mtod(recv_buf_list[pidx0], void *));
+
rte_prefetch_non_temporal(cnxk_pktmbuf_mtod(recv_buf_list[pidx1], void *));
+
rte_prefetch_non_temporal(cnxk_pktmbuf_mtod(recv_buf_list[pidx2], void *));
+
rte_prefetch_non_temporal(cnxk_pktmbuf_mtod(recv_buf_list[pidx3], void *));
+ }
+
+ m0 = recv_buf_list[idx0];
+ m1 = recv_buf_list[idx1];
+ m2 = recv_buf_list[idx2];
+ m3 = recv_buf_list[idx3];
+
+ /* Load packet size big-endian. */
+ s01 = vsetq_lane_u32(cnxk_pktmbuf_mtod(m0, struct
otx_ep_droq_info *)->length >> 48,
+s01, 0);
+ s01 = vsetq_lane_u32(cnxk_pktmbuf_mtod(m1, struct
otx_ep_droq_info *)->length >> 48,
+s01, 1);
+ s01 = vsetq_lane_u32(cnxk_pktmbuf_mtod(m2, struct
otx_ep_droq_info *)->length >> 48,
+s01, 2);
+ s01 = vsetq_lane_u32(cnxk_pktmbuf_mtod(m3, struct
otx_ep_droq_info *)->length >> 48,
+s01, 3);
+ /* Convert to little-endian. */
+ s01 = vrev16q_u8(s01);
+
+ /* Vertical add, consolidate outside the loop. */
+ bytes += vaddq_u32(bytes, s01);
+ /* Segregate to packet length and data length. */
+ s23 = vqtbl1q_u8(s01, mask1);
+ s01 = vqtbl1q_u8(s01, mask0);
+
+ /* Store packet length and data length to mbuf. */
+ *(uint64_t *)&m0->pkt_len = vgetq_lane_u64(s01, 0);
+ *(uint64_t *)&m1->pkt_len = vgetq_lane_u64(s01, 1);
+ *(uint64_t *)&m2->pkt_len = vgetq_lane_u64(s23, 0);
+ *(uint64_t *)&m3->pkt_len = vgetq_lane_u64(s23, 1);
+
+ /* Reset rearm data. */
+ *(uint64_t *)&m0->rearm_data = droq->rearm_data;
+ *(uint64_t *)&m1->rearm_data = droq->rearm_data;
+ *(uint64_t *)&m2->rearm_data = droq->rearm_data;
+ *(uint64_t *)&m3->rearm_data = droq->rearm_data;
+
+ rx_pkts[pkts++] = m0;
+ rx_pkts[pkts++] = m1;
+ rx_pkts[pkts++] = m2;
+ rx_pkts[pkts++] = m3;
+ idx0 = otx_ep_incr_index(idx3, 1, nb_desc);
+ }
+ droq->read_idx = idx0;
+
+ droq->refill_count += new_pkts;
+ droq->pkts_pending -= new_pkts;
+ /* Stats */
+ droq->stats.pkts_received += new_pkts;
+ droq->stats.bytes_received += vaddvq_u32(bytes);
+}
+
+uint16_t __rte_noinline __rte_hot
+cnxk_ep_recv_pkts_neon(void *rx_queu
Re: [RFC] mbuf: performance optimization
On Sun, 21 Jan 2024 06:32:42 +0100 Morten Brørup wrote: > I suppose that reducing mbuf->nb_segs from 16 to 8 bit is realistic, > considering that a maximum size IP packet (64 KB) is unlikely to use more > than 64 plus some segments. Does anyone know of any use case with more than > 255 segments in an mbuf? There is the case of Linux internally using super large IPv6 (and now IPv4) frames. See RFC 2675 IPv6 jumbograms https://netdevconf.info/0x15/slides/35/BIG%20TCP.pdf
RE: [RFC] mbuf: performance optimization
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Sunday, 21 January 2024 18.08 > > On Sun, 21 Jan 2024 06:32:42 +0100 > Morten Brørup wrote: > > > I suppose that reducing mbuf->nb_segs from 16 to 8 bit is realistic, > considering that a maximum size IP packet (64 KB) is unlikely to use > more than 64 plus some segments. Does anyone know of any use case with > more than 255 segments in an mbuf? > > There is the case of Linux internally using super large IPv6 (and now > IPv4) frames. > See RFC 2675 IPv6 jumbograms > > https://netdevconf.info/0x15/slides/35/BIG%20TCP.pdf Just took at brief look at it... I suppose something similar could grow into DPDK, so we are probably better prepared by leaving nb_segs at 16 bit. Then the proposed optimization falls to the ground. :-( Thanks for valuable feedback, Stephen. :-)
[PATCH v4 0/1] multiple representors in one device
Following series adds support to enable creation of multiple representors under one base device. There may be scenarios where port representors for multiple PFs or VFs under PF are required and all these representor ports created under a single pci device. Marvell CNXK port representor solution is designed around this scenario where all representors are backed by a single switch device. Earlier this change was implemented as part of the Marvell CNXK port representor series but after suggestions from Thomas we would like to propose these changes in common code. https://patches.dpdk.org/project/dpdk/patch/20231219174003.72901-25-hka...@marvell.com/#166785 V4: - Used MT safe strtok_r in place of strtok - Reworded some comments V3: - Fix duplicate representor devarg key handling logic V2: - Updated the multiple representor devarg pattern to list i.e. representor=[pf[0-1],pf2vf[1,2-3],[4-5]] - Introduced size of array as third argument to rte_eth_devargs_parse() to avoid array corruption - Squashed separate document patch Harman Kalra (1): ethdev: parsing multiple representor devargs string doc/guides/prog_guide/poll_mode_drv.rst | 4 +- .../prog_guide/switch_representation.rst | 1 + drivers/net/bnxt/bnxt_ethdev.c| 4 +- drivers/net/enic/enic_ethdev.c| 4 +- drivers/net/i40e/i40e_ethdev.c| 4 +- drivers/net/ice/ice_dcf_ethdev.c | 4 +- drivers/net/ixgbe/ixgbe_ethdev.c | 4 +- drivers/net/mlx5/linux/mlx5_os.c | 8 +- .../net/nfp/flower/nfp_flower_representor.c | 4 +- drivers/net/sfc/sfc_ethdev.c | 4 +- lib/ethdev/ethdev_driver.c| 108 +++--- lib/ethdev/ethdev_driver.h| 9 +- 12 files changed, 122 insertions(+), 36 deletions(-) -- 2.18.0
[PATCH v4 1/1] ethdev: parsing multiple representor devargs string
Adding support for parsing multiple representor devargs strings
passed to a PCI BDF. There may be scenario where port representors
for various PFs or VFs under PFs are required and all these are
representor ports shall be backed by single pci device. In such
case port representors can be created using devargs string:
,representor=[pf[0-1],pf2vf[1,2-3],[4-5]]
Signed-off-by: Harman Kalra
---
doc/guides/prog_guide/poll_mode_drv.rst | 4 +-
.../prog_guide/switch_representation.rst | 1 +
drivers/net/bnxt/bnxt_ethdev.c| 4 +-
drivers/net/enic/enic_ethdev.c| 4 +-
drivers/net/i40e/i40e_ethdev.c| 4 +-
drivers/net/ice/ice_dcf_ethdev.c | 4 +-
drivers/net/ixgbe/ixgbe_ethdev.c | 4 +-
drivers/net/mlx5/linux/mlx5_os.c | 8 +-
.../net/nfp/flower/nfp_flower_representor.c | 4 +-
drivers/net/sfc/sfc_ethdev.c | 4 +-
lib/ethdev/ethdev_driver.c| 108 +++---
lib/ethdev/ethdev_driver.h| 9 +-
12 files changed, 122 insertions(+), 36 deletions(-)
diff --git a/doc/guides/prog_guide/poll_mode_drv.rst
b/doc/guides/prog_guide/poll_mode_drv.rst
index c145a9066c..5008b41c60 100644
--- a/doc/guides/prog_guide/poll_mode_drv.rst
+++ b/doc/guides/prog_guide/poll_mode_drv.rst
@@ -376,7 +376,7 @@ parameters to those ports.
* ``representor`` for a device which supports the creation of representor ports
this argument allows user to specify which switch ports to enable port
- representors for. Multiple representors in one device argument is invalid::
+ representors for::
-a DBDF,representor=vf0
-a DBDF,representor=vf[0,4,6,9]
@@ -389,6 +389,8 @@ parameters to those ports.
-a DBDF,representor=pf1vf0
-a DBDF,representor=pf[0-1]sf[0-127]
-a DBDF,representor=pf1
+ -a DBDF,representor=[pf[0-1],pf2vf[0-2],pf3[3,5-8]]
+ (Multiple representors in one device argument can be represented as a list)
Note: PMDs are not required to support the standard device arguments and users
should consult the relevant PMD documentation to see support devargs.
diff --git a/doc/guides/prog_guide/switch_representation.rst
b/doc/guides/prog_guide/switch_representation.rst
index 6fd7b98bdc..46e0ca85a5 100644
--- a/doc/guides/prog_guide/switch_representation.rst
+++ b/doc/guides/prog_guide/switch_representation.rst
@@ -77,6 +77,7 @@ thought as a software "patch panel" front-end for
applications.
-a pci:dbdf,representor=sf1
-a pci:dbdf,representor=sf[0-1023]
-a pci:dbdf,representor=sf[0,2-1023]
+ -a pci:dbdf,representor=[pf[0-1],pf2vf[0-2],pf3[3,5]]
- As virtual devices, they may be more limited than their physical
counterparts, for instance by exposing only a subset of device
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index acf7e6e46e..5d4f599044 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -6383,8 +6383,8 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
if (pci_dev->device.devargs) {
ret = rte_eth_devargs_parse(pci_dev->device.devargs->args,
- ð_da);
- if (ret)
+ ð_da, 1);
+ if (ret < 0)
return ret;
}
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index b04b6c9aa1..33d96ec07a 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -1317,8 +1317,8 @@ static int eth_enic_pci_probe(struct rte_pci_driver
*pci_drv __rte_unused,
ENICPMD_FUNC_TRACE();
if (pci_dev->device.devargs) {
retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
- ð_da);
- if (retval)
+ ð_da, 1);
+ if (retval < 0)
return retval;
}
if (eth_da.nb_representor_ports > 0 &&
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 3ca226156b..4d21341382 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -646,8 +646,8 @@ eth_i40e_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
if (pci_dev->device.devargs) {
retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
- ð_da);
- if (retval)
+ ð_da, 1);
+ if (retval < 0)
return retval;
}
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index 5d845bba31..0e991fe4b8 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -2041,8 +2041,8 @@ eth_ice_dcf_pci_probe(__rte_unused struct rte_pci_driver
*pci_drv,
if (!ice_devargs_check(pci_dev->devic
RE: [EXT] Re: [PATCH v3 1/1] ethdev: parsing multiple representor devargs string
Hi Andrew,
Thanks for the review comments.
Please see responses inline.
Kindly review V4 as well.
> -Original Message-
> > @@ -459,9 +460,23 @@ eth_dev_devargs_tokenise(struct rte_kvargs
> *arglist, const char *str_in)
> > break;
> >
> > case 3: /* Parsing list */
> > - if (*letter == ']')
> > - state = 2;
> > - else if (*letter == '\0')
> > + if (*letter == ']') {
> > + /* Multiple representor case has ']' dual
> meaning, first end of
> > +* individual pfvf list and other end of
> consolidated list of
> > +* representors.
> > +* Complete multiple representors list to be
> considered as one
> > +* pair value.
> > +*/
> > + if ((strcmp("representor", pair->key) == 0)
> &&
> > + ((*(letter + 2) == 'p' && *(letter + 3) ==
> > 'f')
> ||
>
> Sorry, but it is unclear why it is not out-of-bound access.
Sorry I missed that, added in V4
>
> > +(*(letter + 2) == 'v' && *(letter + 3) ==
> > 'f')
> ||
> > +(*(letter + 2) == 's' && *(letter + 3) ==
> > 'f')
> ||
>
> may be it is better to use strncmp() instead?.
Yes strncmp can be used but I kept as is for symmetry with other comparisons.
Moreover I needed 2nd and 3rd letter comparison from current position, so just
for ease I kept as is.
> IMHO it is a bit hard to follow
I reworded the comment in V4 to explain the changes, I hope it is making sense
now.
>
> > +(*(letter + 2) == 'c' && isdigit(*(letter
> > + 3)))
> ||
> > +(*(letter + 2) == '[' && isdigit(*(letter +
> 3)
> > + state = 3;
> > + else
> > + state = 2;
> > + } else if (*letter == '\0')
> > return -EINVAL;
> > break;
> > }
> > @@ -469,16 +484,56 @@ eth_dev_devargs_tokenise(struct rte_kvargs
> *arglist, const char *str_in)
> > }
> > }
> >
> > +static int
> > +eth_dev_tokenise_representor_list(char *p_val, struct rte_eth_devargs
> *eth_devargs,
> > + uint8_t nb_da)
> > +{
> > + struct rte_eth_devargs *eth_da;
> > + char da_val[BUFSIZ];
> > + char delim[] = "]";
> > + int devargs = 0;
> > + int result = 0;
> > + char *token;
> > +
> > + token = strtok(&p_val[1], delim);
>
> since strtok() is MT-unsafe, I'd recommend to use strtok_r()
Thanks, changed in V4
>
> > + while (token != NULL) {
> > + eth_da = ð_devargs[devargs];
> > + memset(eth_da, 0, sizeof(*eth_da));
> > + snprintf(da_val, BUFSIZ, "%s%c", (token[0] == ',') ? ++token :
> token, ']');
> > + /* Parse the tokenised devarg value */
> > + result = rte_eth_devargs_parse_representor_ports(da_val,
> eth_da);
> > + if (result < 0)
> > + goto parse_cleanup;
> > + devargs++;
> > + if (devargs > nb_da) {
> > + RTE_ETHDEV_LOG_LINE(ERR,
> > + "Devargs parsed %d > max array
> size %d",
> > + devargs, nb_da);
> > + result = -1;
> > + goto parse_cleanup;
> > + }
> > + token = strtok(NULL, delim);
> > + }
> > +
> > + result = devargs;
> > +
> > +parse_cleanup:
> > + return result;
> > +
> > +}
> > +
> > int
> > -rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs
> > *eth_da)
> > +rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs
> *eth_devargs,
> > + uint8_t nb_da)
>
> I see no single reason to limit nb_da to uint8_t type. IMHO it should be
> 'unsigned int' as an unsigned number of default type.
> 'unsigned int' is used for number of stats and ptypes in array.
Ack, changed in V4
Thanks
Harman
>
> [snip]
RE: [PATCH v4 1/1] ethdev: parsing multiple representor devargs string
> -Original Message-
> From: Harman Kalra
> Sent: Monday, January 22, 2024 3:19 AM
> To: dev@dpdk.org; Thomas Monjalon ; Ferruh Yigit
> ; Andrew Rybchenko
> ; Ajit Khaparde
> ; Somnath Kotur
> ; John Daley ; Hyong
> Youb Kim ; Yuying Zhang ;
> Beilei Xing ; Qiming Yang ; Qi
> Zhang ; Wenjun Wu ;
> Dariusz Sosnowski ; Viacheslav Ovsiienko
> ; Ori Kam ; Suanming Mou
> ; Matan Azrad ; Chaoyong
> He
> Cc: Harman Kalra
> Subject: [PATCH v4 1/1] ethdev: parsing multiple representor devargs string
>
> [You don't often get email from hka...@marvell.com. Learn why this is
> important at https://aka.ms/LearnAboutSenderIdentification ]
>
> Adding support for parsing multiple representor devargs strings passed to a
> PCI BDF. There may be scenario where port representors for various PFs or VFs
> under PFs are required and all these are representor ports shall be backed by
> single pci device. In such case port representors can be created using devargs
> string:
> ,representor=[pf[0-1],pf2vf[1,2-3],[4-5]]
>
> Signed-off-by: Harman Kalra
> ---
> doc/guides/prog_guide/poll_mode_drv.rst | 4 +-
> .../prog_guide/switch_representation.rst | 1 +
> drivers/net/bnxt/bnxt_ethdev.c| 4 +-
> drivers/net/enic/enic_ethdev.c| 4 +-
> drivers/net/i40e/i40e_ethdev.c| 4 +-
> drivers/net/ice/ice_dcf_ethdev.c | 4 +-
> drivers/net/ixgbe/ixgbe_ethdev.c | 4 +-
> drivers/net/mlx5/linux/mlx5_os.c | 8 +-
> .../net/nfp/flower/nfp_flower_representor.c | 4 +-
> drivers/net/sfc/sfc_ethdev.c | 4 +-
> lib/ethdev/ethdev_driver.c| 108 +++---
> lib/ethdev/ethdev_driver.h| 9 +-
> 12 files changed, 122 insertions(+), 36 deletions(-)
>
> diff --git a/doc/guides/prog_guide/poll_mode_drv.rst
> b/doc/guides/prog_guide/poll_mode_drv.rst
> index c145a9066c..5008b41c60 100644
> --- a/doc/guides/prog_guide/poll_mode_drv.rst
> +++ b/doc/guides/prog_guide/poll_mode_drv.rst
> @@ -376,7 +376,7 @@ parameters to those ports.
>
> * ``representor`` for a device which supports the creation of representor
> ports
>this argument allows user to specify which switch ports to enable port
> - representors for. Multiple representors in one device argument is invalid::
> + representors for::
>
> -a DBDF,representor=vf0
> -a DBDF,representor=vf[0,4,6,9]
> @@ -389,6 +389,8 @@ parameters to those ports.
> -a DBDF,representor=pf1vf0
> -a DBDF,representor=pf[0-1]sf[0-127]
> -a DBDF,representor=pf1
> + -a DBDF,representor=[pf[0-1],pf2vf[0-2],pf3[3,5-8]]
> + (Multiple representors in one device argument can be represented as
> + a list)
>
> Note: PMDs are not required to support the standard device arguments and
> users should consult the relevant PMD documentation to see support
> devargs.
> diff --git a/doc/guides/prog_guide/switch_representation.rst
> b/doc/guides/prog_guide/switch_representation.rst
> index 6fd7b98bdc..46e0ca85a5 100644
> --- a/doc/guides/prog_guide/switch_representation.rst
> +++ b/doc/guides/prog_guide/switch_representation.rst
> @@ -77,6 +77,7 @@ thought as a software "patch panel" front-end for
> applications.
> -a pci:dbdf,representor=sf1
> -a pci:dbdf,representor=sf[0-1023]
> -a pci:dbdf,representor=sf[0,2-1023]
> + -a pci:dbdf,representor=[pf[0-1],pf2vf[0-2],pf3[3,5]]
>
> - As virtual devices, they may be more limited than their physical
>counterparts, for instance by exposing only a subset of device diff --git
> a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index
> acf7e6e46e..5d4f599044 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -6383,8 +6383,8 @@ static int bnxt_pci_probe(struct rte_pci_driver
> *pci_drv __rte_unused,
>
> if (pci_dev->device.devargs) {
> ret = rte_eth_devargs_parse(pci_dev->device.devargs->args,
> - ð_da);
> - if (ret)
> + ð_da, 1);
> + if (ret < 0)
> return ret;
> }
>
...
> a/drivers/net/nfp/flower/nfp_flower_representor.c
> b/drivers/net/nfp/flower/nfp_flower_representor.c
> index 5f7c1fa737..63fe37c8d7 100644
> --- a/drivers/net/nfp/flower/nfp_flower_representor.c
> +++ b/drivers/net/nfp/flower/nfp_flower_representor.c
> @@ -792,8 +792,8 @@ nfp_flower_repr_create(struct nfp_app_fw_flower
> *app_fw_flower)
>
> /* Now parse PCI device args passed for representor info */
> if (pci_dev->device.devargs != NULL) {
> - ret = rte_eth_devargs_parse(pci_dev->device.devargs->args,
> ð_da);
> - if (ret != 0) {
> + ret = rte_eth_devargs_parse(pci_dev->device.devargs->args,
> ð_da, 1);
> + if (ret < 0) {
> PMD_INIT_LOG(ERR, "devarg parse failed");
>
[PATCH v2] vhost: fix deadlock during software live migration of VDPA in a nested virtualization environment
In a nested virtualization environment, running dpdk-vdpa in QEMU-L1 for
software live migration will result in a deadlock between dpdke-vdpa and
QEMU-L2 processes.
'rte_vdpa_relay_vring_used'->
'__vhost_iova_to_vva'->
'vhost_user_iotlb_rd_unlock(vq)'->
'vhost_user_iotlb_miss'-> send vhost message 'VHOST_USER_SLAVE_IOTLB_MSG'
to QEMU-L2's vdpa socket,
then call 'vhost_user_iotlb_rd_lock(vq)' to hold the read lock `iotlb_lock`.
But there is no place to release this read lock.
QEMU-L2 get the 'VHOST_USER_SLAVE_IOTLB_MSG',
then call 'vhost_user_send_device_iotlb_msg' to send 'VHOST_USER_IOTLB_MSG'
messages to dpdk-vdpa.
Dpdk-vdpa will call vhost_user_iotlb_msg->
vhost_user_iotlb_cache_insert, here, will obtain the write lock
`iotlb_lock`, but the read lock `iotlb_lock` has not been released and
will block here.
This patch add lock and unlock function to fix the deadlock.
Fixes: b13ad2decc83 ("vhost: provide helpers for virtio ring relay")
Cc: sta...@dpdk.org
Signed-off-by: Hao Chen
---
Changes v1 ... v2:
- protect the vhost_alloc_copy_ind_table() call too.
lib/vhost/vdpa.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c
index 9776fc07a9..a1dd5a753b 100644
--- a/lib/vhost/vdpa.c
+++ b/lib/vhost/vdpa.c
@@ -19,6 +19,7 @@
#include "rte_vdpa.h"
#include "vdpa_driver.h"
#include "vhost.h"
+#include "iotlb.h"
/** Double linked list of vDPA devices. */
TAILQ_HEAD(vdpa_device_list, rte_vdpa_device);
@@ -147,7 +148,6 @@ rte_vdpa_unregister_device(struct rte_vdpa_device *dev)
int
rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)
- __rte_no_thread_safety_analysis /* FIXME: requires iotlb_lock? */
{
struct virtio_net *dev = get_device(vid);
uint16_t idx, idx_m, desc_id;
@@ -193,17 +193,21 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void
*vring_m)
if (unlikely(nr_descs > vq->size))
return -1;
+ vhost_user_iotlb_rd_lock(vq);
desc_ring = (struct vring_desc *)(uintptr_t)
vhost_iova_to_vva(dev, vq,
vq->desc[desc_id].addr, &dlen,
VHOST_ACCESS_RO);
+ vhost_user_iotlb_rd_unlock(vq);
if (unlikely(!desc_ring))
return -1;
if (unlikely(dlen < vq->desc[desc_id].len)) {
+ vhost_user_iotlb_rd_lock(vq);
idesc = vhost_alloc_copy_ind_table(dev, vq,
vq->desc[desc_id].addr,
vq->desc[desc_id].len);
+ vhost_user_iotlb_rd_unlock(vq);
if (unlikely(!idesc))
return -1;
@@ -220,9 +224,12 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void
*vring_m)
if (unlikely(nr_descs-- == 0))
goto fail;
desc = desc_ring[desc_id];
- if (desc.flags & VRING_DESC_F_WRITE)
+ if (desc.flags & VRING_DESC_F_WRITE) {
+ vhost_user_iotlb_rd_lock(vq);
vhost_log_write_iova(dev, vq, desc.addr,
desc.len);
+ vhost_user_iotlb_rd_unlock(vq);
+ }
desc_id = desc.next;
} while (desc.flags & VRING_DESC_F_NEXT);
--
2.27.0
[PATCH 00/12] add argparse library
Introduce argparse library (which was inspired by the thread [1]), compared with getopt, it makes it easy to write user-friendly command-like program. Note: the 2nd commit contains usage examples. [1] https://patchwork.dpdk.org/project/dpdk/patch/20231105054539.22303-2-fengcheng...@huawei.com/ Chengwen Feng (12): eal: introduce more macro for bit definition argparse: add argparse library argparse: support verify argument config test/argparse: add verify argument config test argparse: support parse parameters test/argparse: add parse parameters test argparse: provide parsing known type API test/argparse: add parse type test argparse: support parse unsigned base type test/argparse: add parse unsigned base type test argparse: pretty help info examples/dma: replace getopt with argparse app/test/meson.build | 1 + app/test/test_argparse.c | 835 + doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf.in | 1 + doc/guides/prog_guide/argparse_lib.rst | 141 + doc/guides/prog_guide/index.rst| 1 + doc/guides/rel_notes/release_24_03.rst | 5 + examples/dma/dmafwd.c | 279 - examples/dma/meson.build | 2 +- lib/argparse/meson.build | 7 + lib/argparse/rte_argparse.c| 782 +++ lib/argparse/rte_argparse.h| 218 +++ lib/argparse/version.map | 8 + lib/eal/include/rte_bitops.h | 64 ++ lib/meson.build| 1 + 15 files changed, 2192 insertions(+), 154 deletions(-) create mode 100644 app/test/test_argparse.c create mode 100644 doc/guides/prog_guide/argparse_lib.rst create mode 100644 lib/argparse/meson.build create mode 100644 lib/argparse/rte_argparse.c create mode 100644 lib/argparse/rte_argparse.h create mode 100644 lib/argparse/version.map -- 2.17.1
[PATCH 01/12] eal: introduce more macro for bit definition
Introduce macros: RTE_MBIT64/RTE_MBIT32, RTE_GENMASK64/RTE_GENMASK32,
and RTE_FIELD_GET64/RTE_FIELD_GET32.
Signed-off-by: Chengwen Feng
---
lib/eal/include/rte_bitops.h | 64
1 file changed, 64 insertions(+)
diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
index 6bd8bae21a..e1f3c4b195 100644
--- a/lib/eal/include/rte_bitops.h
+++ b/lib/eal/include/rte_bitops.h
@@ -39,6 +39,70 @@ extern "C" {
*/
#define RTE_BIT32(nr) (UINT32_C(1) << (nr))
+/**
+ * Get the uint64_t value for a multiple bits set.
+ *
+ * @param val
+ * The value may not all 1s.
+ * @param nr
+ * The bit number in range of 0 to (64 - width of val).
+ */
+#define RTE_MBIT64(val, nr) (UINT64_C(val) << (nr))
+
+/**
+ * Get the uint32_t value for a multiple bits set.
+ *
+ * @param val
+ * The value may not all 1s.
+ * @param nr
+ * The bit number in range of 0 to (32 - width of val).
+ */
+#define RTE_MBIT32(val, nr) (UINT32_C(val) << (nr))
+
+/**
+ * Generate a contiguous 64bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ * High bit position.
+ * @param low
+ * Low bit position.
+ */
+#define RTE_GENMASK64(high, low) (((~UINT64_C(0)) << (low)) & (~UINT64_C(0) >>
(63u - (high
+
+/**
+ * Generate a contiguous 32bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ * High bit position.
+ * @param low
+ * Low bit position.
+ */
+#define RTE_GENMASK32(high, low) (((~UINT32_C(0)) << (low)) & (~UINT32_C(0) >>
(31u - (high
+
+/**
+ * Extract a 64bit field element.
+ *
+ * @param mask
+ * shifted mask.
+ * @param reg
+ * value of entire bitfield.
+ */
+#define RTE_FIELD_GET64(mask, reg) \
+ (typeof(mask))(((reg) & (mask)) >> rte_ctz64(mask))
+
+/**
+ * Extract a 32bit field element.
+ *
+ * @param mask
+ * shifted mask.
+ * @param reg
+ * value of entire bitfield.
+ */
+#define RTE_FIELD_GET32(mask, reg) \
+ (typeof(mask))(((reg) & (mask)) >> rte_ctz32(mask))
+
/* 32-bit relaxed operations */
/**
--
2.17.1
[PATCH 03/12] argparse: support verify argument config
This commit supports verify argument config.
Signed-off-by: Chengwen Feng
---
lib/argparse/rte_argparse.c | 307 +++-
1 file changed, 306 insertions(+), 1 deletion(-)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 3471c5e757..3dbae8868b 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -2,13 +2,318 @@
* Copyright(c) 2024 HiSilicon Limited
*/
+#include
+#include
+#include
+
+#include
+
#include "rte_argparse.h"
+RTE_LOG_REGISTER_DEFAULT(rte_argparse_logtype, INFO);
+#define ARGPARSE_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, rte_argparse_logtype, RTE_FMT("argparse: " \
+ RTE_FMT_HEAD(__VA_ARGS__,) "\n", RTE_FMT_TAIL(__VA_ARGS__,)))
+
+#define ARG_ATTR_HAS_VAL_MASK RTE_GENMASK64(1, 0)
+#define ARG_ATTR_VAL_TYPE_MASK RTE_GENMASK64(9, 2)
+#define ARG_ATTR_SUPPORT_MULTI_MASKRTE_BIT64(10)
+#define ARG_ATTR_FLAG_PARSED_MASK RTE_BIT64(63)
+
+static inline bool
+is_arg_optional(const struct rte_argparse_arg *arg)
+{
+ return arg->name_long[0] == '-';
+}
+
+static inline bool
+is_arg_positional(const struct rte_argparse_arg *arg)
+{
+ return arg->name_long[0] != '-';
+}
+
+static inline uint32_t
+arg_attr_has_val(const struct rte_argparse_arg *arg)
+{
+ return RTE_FIELD_GET64(ARG_ATTR_HAS_VAL_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_val_type(const struct rte_argparse_arg *arg)
+{
+ return RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, arg->flags);
+}
+
+static inline bool
+arg_attr_flag_multi(const struct rte_argparse_arg *arg)
+{
+ return RTE_FIELD_GET64(ARG_ATTR_SUPPORT_MULTI_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_unused_bits(const struct rte_argparse_arg *arg)
+{
+#define USED_BIT_MASK (ARG_ATTR_HAS_VAL_MASK | ARG_ATTR_VAL_TYPE_MASK | \
+ARG_ATTR_SUPPORT_MULTI_MASK)
+ return arg->flags & ~USED_BIT_MASK;
+}
+
+static int
+verify_arg_name(const struct rte_argparse_arg *arg)
+{
+ if (is_arg_optional(arg)) {
+ if (strlen(arg->name_long) <= 3) {
+ ARGPARSE_LOG(ERR, "optional long name %s too short!",
arg->name_long);
+ return -EINVAL;
+ }
+ if (arg->name_long[1] != '-') {
+ ARGPARSE_LOG(ERR, "optional long name %s must only
start with '--'",
+arg->name_long);
+ return -EINVAL;
+ }
+ if (arg->name_long[2] == '-') {
+ ARGPARSE_LOG(ERR, "optional long name %s should not
start with '---'",
+arg->name_long);
+ return -EINVAL;
+ }
+ }
+
+ if (arg->name_short == NULL)
+ return 0;
+
+ if (!is_arg_optional(arg)) {
+ ARGPARSE_LOG(ERR, "short name %s corresponding long name must
be optional!",
+arg->name_short);
+ return -EINVAL;
+ }
+
+ if (strlen(arg->name_short) != 2 || arg->name_short[0] != '-' ||
+ arg->name_short[1] == '-') {
+ ARGPARSE_LOG(ERR, "short name %s must start with a hyphen (-)
followed by an English letter",
+arg->name_short);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_help(const struct rte_argparse_arg *arg)
+{
+ if (arg->help == NULL) {
+ ARGPARSE_LOG(ERR, "argument %s must have help info!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_has_val(const struct rte_argparse_arg *arg)
+{
+ uint32_t has_val = arg_attr_has_val(arg);
+
+ if (is_arg_positional(arg)) {
+ if (has_val == RTE_ARGPARSE_ARG_REQUIRED_VALUE)
+ return 0;
+ ARGPARSE_LOG(ERR, "argument %s is positional, should has zero
or required-val!",
+arg->name_long);
+ return -EINVAL;
+ }
+
+ if (has_val == 0) {
+ ARGPARSE_LOG(ERR, "argument %s is optional, has-val config
wrong!",
+arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_saver(const struct rte_argparse *obj, uint32_t index)
+{
+ uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK,
RTE_ARGPARSE_ARG_VALUE_MAX);
+ const struct rte_argparse_arg *arg = &obj->args[index];
+ uint32_t val_type = arg_attr_val_type(arg);
+ uint32_t has_val = arg_attr_has_val(arg);
+
+ if (arg->val_saver == NULL) {
+ if (val_type != 0) {
+ ARGPARSE_LOG(ERR, "argument %s parse by callback,
val-type must be zero!",
+arg->name_long);
+ return -EINVAL;
+
[PATCH 04/12] test/argparse: add verify argument config test
This commit adds verify argument config test.
Signed-off-by: Chengwen Feng
---
app/test/meson.build | 1 +
app/test/test_argparse.c | 327 +++
2 files changed, 328 insertions(+)
create mode 100644 app/test/test_argparse.c
diff --git a/app/test/meson.build b/app/test/meson.build
index dcc93f4a43..864b79d39f 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -27,6 +27,7 @@ source_file_deps = {
# the various test_*.c files
'test_acl.c': ['net', 'acl'],
'test_alarm.c': [],
+'test_argparse.c': ['argparse'],
'test_atomic.c': ['hash'],
'test_barrier.c': [],
'test_bitcount.c': [],
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
new file mode 100644
index 00..31c46ecccf
--- /dev/null
+++ b/app/test/test_argparse.c
@@ -0,0 +1,327 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 HiSilicon Limited
+ */
+
+#include
+#include
+
+#include
+
+#include "test.h"
+
+static int default_argc;
+static char *default_argv[1];
+
+/*
+ * Define strdup wrapper.
+ * 1. Mainly to fix compile error "warning: assignment discards 'const'
+ *qualifier from pointer target type [-Wdiscarded-qualifiers]" for
+ *following code:
+ * argv[x] = "100";
+ * 2. Because this is a test, the memory release which allocated by this
+ *wrapper in the subtest is not considered.
+ */
+static char *
+test_strdup(const char *str)
+{
+ char *s = strdup(str);
+ if (s == NULL)
+ exit(-ENOMEM);
+ return s;
+}
+
+static int
+test_argparse_setup(void)
+{
+ default_argc = 1;
+ default_argv[0] = test_strdup("test_argparse");
+ return 0;
+}
+
+static void
+test_argparse_teardown(void)
+{
+ free(default_argv[0]);
+}
+
+static int
+test_argparse_callback(uint32_t index, const char *value, void *opaque)
+{
+ RTE_SET_USED(index);
+ RTE_SET_USED(value);
+ RTE_SET_USED(opaque);
+ return 0;
+}
+
+/* valid templater, must contain at least two args. */
+#define argparse_templater() { \
+ .prog_name = "test_argparse", \
+ .usage = "-a xx -b yy", \
+ .descriptor = NULL, \
+ .epilog = NULL, \
+ .exit_on_error = false, \
+ .callback = test_argparse_callback, \
+ .args = { \
+ { "--abc", "-a", "abc argument", (void *)1, (void *)1,
RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT }, \
+ { "--xyz", "-x", "xyz argument", (void *)1, (void *)2,
RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT }, \
+ ARGPARSE_ARG_END(), \
+ }, \
+}
+
+static void
+test_argparse_copy(struct rte_argparse *dst, struct rte_argparse *src)
+{
+ uint32_t i;
+ memcpy(dst, src, sizeof(*src));
+ for (i = 0; /* NULL */; i++) {
+ memcpy(&dst->args[i], &src->args[i], sizeof(src->args[i]));
+ if (src->args[i].name_long == NULL)
+ break;
+ }
+}
+
+static struct rte_argparse *
+test_argparse_init_obj(void)
+{
+ static struct rte_argparse backup = argparse_templater();
+ static struct rte_argparse obj = argparse_templater();
+ test_argparse_copy(&obj, &backup);
+ return &obj;
+}
+
+static int
+test_argparse_invalid_basic_param(void)
+{
+ struct rte_argparse *obj;
+ int ret;
+
+ obj = test_argparse_init_obj();
+ obj->prog_name = NULL;
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ obj->usage = NULL;
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_argparse_invalid_arg_name(void)
+{
+ struct rte_argparse *obj;
+ int ret;
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "-ab";
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "-abc";
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "---c";
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "abc";
+ obj->args[0].name_short = "-a";
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_short = "a";
+ ret = rte_argparse_parse(obj, default_argc, default_argv);
+ TEST_
[PATCH 05/12] argparse: support parse parameters
This commit supports parse parameters which described in [argc, argv].
Signed-off-by: Chengwen Feng
---
lib/argparse/rte_argparse.c | 289 +++-
1 file changed, 286 insertions(+), 3 deletions(-)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 3dbae8868b..9c5bce6ddf 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -298,18 +298,301 @@ verify_argparse(const struct rte_argparse *obj)
return 0;
}
+static uint32_t
+calc_position_count(const struct rte_argparse *obj)
+{
+ const struct rte_argparse_arg *arg;
+ uint32_t count = 0;
+ uint32_t i;
+
+ for (i = 0; /* NULL */; i++) {
+ arg = &obj->args[i];
+ if (obj->args[i].name_long == NULL)
+ break;
+ if (is_arg_positional(arg))
+ count++;
+ }
+
+ return count;
+}
+
+static struct rte_argparse_arg *
+find_position_arg(struct rte_argparse *obj, uint32_t index)
+{
+ struct rte_argparse_arg *arg;
+ uint32_t count = 0;
+ uint32_t i;
+
+ for (i = 0; /* NULL */; i++) {
+ arg = &obj->args[i];
+ if (arg->name_long == NULL)
+ break;
+ if (!is_arg_positional(arg))
+ continue;
+ count++;
+ if (count == index)
+ return arg;
+ }
+
+ return NULL;
+}
+
+static bool
+is_arg_match(struct rte_argparse_arg *arg, const char *curr_argv, uint32_t len)
+{
+ if (strlen(arg->name_long) == len && strncmp(arg->name_long, curr_argv,
len) == 0)
+ return true;
+
+ if (arg->name_short == NULL)
+ return false;
+
+ if (strlen(arg->name_short) == len && strncmp(arg->name_short,
curr_argv, len) == 0)
+ return true;
+
+ return false;
+}
+
+static struct rte_argparse_arg *
+find_option_arg(struct rte_argparse *obj, const char *curr_argv, const char
*has_equal)
+{
+ uint32_t len = strlen(curr_argv) - (has_equal != NULL ?
strlen(has_equal) : 0);
+ struct rte_argparse_arg *arg;
+ uint32_t i;
+ bool match;
+
+ for (i = 0; /* nothing */; i++) {
+ arg = &obj->args[i];
+ if (arg->name_long == NULL)
+ break;
+ match = is_arg_match(arg, curr_argv, len);
+ if (match)
+ return arg;
+ }
+
+ return NULL;
+}
+
+static int
+parse_arg_int(struct rte_argparse_arg *arg, const char *value)
+{
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(int *)arg->val_saver = (int)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ *(int *)arg->val_saver = strtol(value, &s, 0);
+ if (errno == ERANGE) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an integer value!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+parse_arg_autosave(struct rte_argparse_arg *arg, const char *value)
+{
+ static struct {
+ int (*f_parse_type)(struct rte_argparse_arg *arg, const char
*value);
+ } map[] = {
+ /* Sort by RTE_ARGPARSE_ARG_VALUE_XXX. */
+ { NULL },
+ { parse_arg_int },
+ };
+ uint32_t index = arg_attr_val_type(arg);
+ int ret = -EINVAL;
+
+ if (index > 0 && index < RTE_DIM(map))
+ ret = map[index].f_parse_type(arg, value);
+
+ return ret;
+}
+
+static int
+parse_arg_val(struct rte_argparse *obj, struct rte_argparse_arg *arg, char
*value)
+{
+ int ret;
+
+ if (arg->val_saver == NULL)
+ ret = obj->callback((uint32_t)(uintptr_t)arg->val_set, value,
obj->opaque);
+ else
+ ret = parse_arg_autosave(arg, value);
+ if (ret != 0) {
+ ARGPARSE_LOG(ERR, "argument %s parse value fail!",
arg->name_long);
+ return ret;
+ }
+
+ return 0;
+}
+
+static bool
+is_help(const char *curr_argv)
+{
+ return strcmp(curr_argv, "-h") == 0 || strcmp(curr_argv, "--help") == 0;
+}
+
+static int
+parse_args(struct rte_argparse *obj, int argc, char **argv, bool *show_help)
+{
+ uint32_t position_count = calc_position_count(obj);
+ struct rte_argparse_arg *arg;
+ uint32_t position_index = 0;
+ char *curr_argv;
+ char *has_equal;
+ char *value;
+ int ret;
+ int i;
+
+ for (i = 1; i < argc; i++) {
+ curr_argv = argv[i];
+ if (curr_argv[0] != '-') {
+ /* process positional parameters. */
+ position_index++;
+ if (position_index > pos
[PATCH 02/12] argparse: add argparse library
Introduce argparse library (which was inspired by the thread [1]). This
commit provides public API and doc.
[1]
https://patchwork.dpdk.org/project/dpdk/patch/20231105054539.22303-2-fengcheng...@huawei.com/
Signed-off-by: Chengwen Feng
---
doc/api/doxy-api-index.md | 1 +
doc/api/doxy-api.conf.in | 1 +
doc/guides/prog_guide/argparse_lib.rst | 141 ++
doc/guides/prog_guide/index.rst| 1 +
doc/guides/rel_notes/release_24_03.rst | 5 +
lib/argparse/meson.build | 7 +
lib/argparse/rte_argparse.c| 14 ++
lib/argparse/rte_argparse.h| 191 +
lib/argparse/version.map | 7 +
lib/meson.build| 1 +
10 files changed, 369 insertions(+)
create mode 100644 doc/guides/prog_guide/argparse_lib.rst
create mode 100644 lib/argparse/meson.build
create mode 100644 lib/argparse/rte_argparse.c
create mode 100644 lib/argparse/rte_argparse.h
create mode 100644 lib/argparse/version.map
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index a6a768bd7c..fe41fba6ec 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -220,6 +220,7 @@ The public API headers are grouped by topics:
[random](@ref rte_random.h),
[config file](@ref rte_cfgfile.h),
[key/value args](@ref rte_kvargs.h),
+ [argument parse](@ref rte_argparse.h),
[string](@ref rte_string_fns.h),
[thread](@ref rte_thread.h)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index e94c9e4e46..76f89afe71 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -28,6 +28,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/lib/eal/include \
@TOPDIR@/lib/eal/include/generic \
@TOPDIR@/lib/acl \
+ @TOPDIR@/lib/argparse \
@TOPDIR@/lib/bbdev \
@TOPDIR@/lib/bitratestats \
@TOPDIR@/lib/bpf \
diff --git a/doc/guides/prog_guide/argparse_lib.rst
b/doc/guides/prog_guide/argparse_lib.rst
new file mode 100644
index 00..012b29bbfb
--- /dev/null
+++ b/doc/guides/prog_guide/argparse_lib.rst
@@ -0,0 +1,141 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(c) 2024 HiSilicon Limited
+
+Argparse Library
+
+
+The argparse library provides argument parse functionality, this library makes
+it easy to write user-friendly command-line program.
+
+Features and Capabilities
+-
+
+- Support parse optional argument (which could take with no-value,
+ required-value and optional-value).
+
+- Support parse positional argument (which must take with required-value).
+
+- Support automatic generate usage information.
+
+- Support issue errors when provide with invalid arguments.
+
+- Support parse argument by two way: 1) autosave: for which known value types,
+ this way can be used; 2) callback: will invoke user callback to parse.
+
+Usage Guide
+---
+
+The following code demonstrates how to initialize:
+
+.. code-block:: C
+
+ static int
+ argparse_user_callback(uint32_t index, const char *value, void *opaque)
+ {
+ if (index == 1) {
+ /* process "--ddd" argument, because it has no-value, the parameter
value is NULL. */
+ ...
+ } else if (index == 2) {
+ /* process "--eee" argument, because it has required-value, the
parameter value must not NULL. */
+ ...
+ } else if (index == 3) {
+ /* process "--fff" argument, because it has optional-value, the
parameter value maybe NULL or not NULL, depend on input. */
+ ...
+ } else if (index == 300) {
+ /* process "ppp" argument, because it's a positional argument, the
parameter value must not NULL. */
+ ...
+ } else {
+ return -EINVAL;
+ }
+ }
+
+ int aaa_val, bbb_val, ccc_val, ooo_val;
+
+ static struct rte_argparse obj = {
+ .prog_name = "test-demo",
+ .usage = "[EAL options] -- [optional parameters] [positional
parameters]",
+ .descriptor = NULL,
+ .epilog = NULL,
+ .exit_on_error = true,
+ .callback = argparse_user_callback,
+ .args = {
+ { "--aaa", "-a", "aaa argument", &aaa_val, (void *)100,
RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--bbb", "-b", "bbb argument", &bbb_val, NULL,
RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--ccc", "-c", "ccc argument", &ccc_val, (void *)200,
RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--ddd", "-d", "ddd argument", NULL, (void *)1,
RTE_ARGPARSE_ARG_NO_VALUE },
+ { "--eee", "-e", "eee argument", NULL, (void *)2,
RTE_ARGPARSE_ARG_REQUIRED_VALUE },
+ { "--fff", "-f", "fff argument", NULL, (void *)3,
RTE
[PATCH 06/12] test/argparse: add parse parameters test
This commit adds parse parameters test.
Signed-off-by: Chengwen Feng
---
app/test/test_argparse.c | 437 +++
1 file changed, 437 insertions(+)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 31c46ecccf..f55b57a21f 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -301,6 +301,434 @@ test_argparse_invalid_arg_repeat(void)
return 0;
}
+static int
+test_argparse_invalid_option(void)
+{
+ struct rte_argparse *obj;
+ char *argv[2];
+ int ret;
+
+ obj = test_argparse_init_obj();
+ argv[0] = test_strdup(obj->usage);
+ argv[1] = test_strdup("--invalid");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ obj = test_argparse_init_obj();
+ argv[0] = test_strdup(obj->usage);
+ argv[1] = test_strdup("invalid");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_no_val(void)
+{
+ uint32_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;
+ struct rte_argparse *obj;
+ int val_saver = 0;
+ char *argv[2];
+ int ret;
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "--test-long";
+ obj->args[0].name_short = "-t";
+ obj->args[0].val_saver = (void *)&val_saver;
+ obj->args[0].val_set = (void *)100;
+ obj->args[0].flags = flags;
+ obj->args[1].name_long = NULL;
+ argv[0] = test_strdup(obj->usage);
+ argv[1] = test_strdup("--test-long");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+ obj->args[0].flags = flags;
+ val_saver = 0;
+ argv[1] = test_strdup("-t");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+ return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_required_val(void)
+{
+ uint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE |
RTE_ARGPARSE_ARG_VALUE_INT;
+ struct rte_argparse *obj;
+ int val_saver = 0;
+ char *argv[3];
+ int ret;
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "--test-long";
+ obj->args[0].name_short = "-t";
+ obj->args[0].val_saver = (void *)&val_saver;
+ obj->args[0].val_set = NULL;
+ obj->args[0].flags = flags;
+ obj->args[1].name_long = NULL;
+ argv[0] = test_strdup(obj->usage);
+ argv[1] = test_strdup("--test-long");
+ argv[2] = test_strdup("100");
+ ret = rte_argparse_parse(obj, 3, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+ obj->args[0].flags = flags;
+ val_saver = 0;
+ argv[1] = test_strdup("-t");
+ ret = rte_argparse_parse(obj, 3, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+ /* test invalid value. */
+ obj->args[0].flags = flags;
+ val_saver = 0;
+ argv[1] = test_strdup("-t");
+ argv[2] = test_strdup("100a");
+ ret = rte_argparse_parse(obj, 3, argv);
+ TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+ return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_optional_val(void)
+{
+ uint32_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE |
RTE_ARGPARSE_ARG_VALUE_INT;
+ struct rte_argparse *obj;
+ int val_saver = 0;
+ char *argv[2];
+ int ret;
+
+ obj = test_argparse_init_obj();
+ obj->args[0].name_long = "--test-long";
+ obj->args[0].name_short = "-t";
+ obj->args[0].val_saver = (void *)&val_saver;
+ obj->args[0].val_set = (void *)100;
+ obj->args[0].flags = flags;
+ obj->args[1].name_long = NULL;
+ argv[0] = test_strdup(obj->usage);
+ argv[1] = test_strdup("--test-long");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+ obj->args[0].flags = flags;
+ val_saver = 0;
+ argv[1] = test_strdup("-t");
+ ret = rte_argparse_parse(obj, 2, argv);
+ TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+ TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+ /* test with value. */
+ obj->args[0].flags = flags;
+ val_saver = 0;
+ argv[1] = test_strdup("--test-long=200");
+ ret = rte_argparse_parse(obj, 2, argv);
+
[PATCH 07/12] argparse: provide parsing known type API
Provide API which could parsing the value from the input string based
on the value type. This API could used in user callback when parsing
string by argparse or kvargs library.
Signed-off-by: Chengwen Feng
---
lib/argparse/rte_argparse.c | 19 +++
lib/argparse/rte_argparse.h | 19 +++
lib/argparse/version.map| 1 +
3 files changed, 39 insertions(+)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 9c5bce6ddf..f536a7f92b 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -600,3 +600,22 @@ rte_argparse_parse(struct rte_argparse *obj, int argc,
char **argv)
exit(ret);
return ret;
}
+
+int
+rte_argparse_parse_type(const char *str, uint64_t val_type, void *val)
+{
+ uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK,
RTE_ARGPARSE_ARG_VALUE_MAX);
+ struct rte_argparse_arg arg = {
+ .name_long = str,
+ .name_short = NULL,
+ .val_saver = val,
+ .val_set = NULL,
+ .flags = val_type,
+ };
+ uint32_t value_type = arg_attr_val_type(&arg);
+
+ if (value_type == 0 || value_type >= cmp_max)
+ return -EINVAL;
+
+ return parse_arg_autosave(&arg, str);
+}
diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h
index 3e94711280..d4e074d3d7 100644
--- a/lib/argparse/rte_argparse.h
+++ b/lib/argparse/rte_argparse.h
@@ -184,6 +184,25 @@ struct rte_argparse {
__rte_experimental
int rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv);
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Parse the value from the input string based on the value type.
+ *
+ * @param str
+ * Input string.
+ * @param val_type
+ * The value type, @see RTE_ARGPARSE_ARG_VALUE_INT or other type.
+ * @param val
+ * Saver for the value.
+ *
+ * @return
+ * 0 on success. Otherwise negative value is returned.
+ */
+__rte_experimental
+int rte_argparse_parse_type(const char *str, uint64_t val_type, void *val);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/argparse/version.map b/lib/argparse/version.map
index 1c176f69e9..9b68464600 100644
--- a/lib/argparse/version.map
+++ b/lib/argparse/version.map
@@ -2,6 +2,7 @@ EXPERIMENTAL {
global:
rte_argparse_parse;
+ rte_argparse_parse_type;
local: *;
};
--
2.17.1
[PATCH 08/12] test/argparse: add parse type test
This commit adds parse type test.
Signed-off-by: Chengwen Feng
---
app/test/test_argparse.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index f55b57a21f..98c6cd6b80 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -729,6 +729,27 @@ test_argparse_pos_callback_parse_int(void)
return 0;
}
+static int
+test_argparse_parse_type(void)
+{
+ char *str_erange = test_strdup("99");
+ char *str_invalid = test_strdup("1a");
+ char *str_ok = test_strdup("123");
+ int value;
+ int ret;
+
+ /* test for int parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+
+ return 0;
+}
+
static struct unit_test_suite argparse_test_suite = {
.suite_name = "Argparse Unit Test Suite",
.setup = test_argparse_setup,
@@ -750,6 +771,7 @@ static struct unit_test_suite argparse_test_suite = {
TEST_CASE(test_argparse_opt_callback_parse_int_of_optional_val),
TEST_CASE(test_argparse_pos_autosave_parse_int),
TEST_CASE(test_argparse_pos_callback_parse_int),
+ TEST_CASE(test_argparse_parse_type),
TEST_CASES_END() /**< NULL terminate unit test array */
}
--
2.17.1
[PATCH 09/12] argparse: support parse unsigned base type
This commit supports parsing unsigned base type (u8/u16/u32/u64).
Signed-off-by: Chengwen Feng
---
lib/argparse/rte_argparse.c | 116
lib/argparse/rte_argparse.h | 10 +++-
2 files changed, 125 insertions(+), 1 deletion(-)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index f536a7f92b..cfd9bcf5f6 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -397,6 +397,118 @@ parse_arg_int(struct rte_argparse_arg *arg, const char
*value)
return 0;
}
+static int
+parse_arg_u8(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint8_t *)arg->val_saver = (uint8_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT8_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint8 value!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint8_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u16(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint16_t *)arg->val_saver = (uint16_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT16_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint16 value!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint16_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u32(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint32_t *)arg->val_saver = (uint32_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT32_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint32 value!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint32_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u64(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint64_t *)arg->val_saver = (uint64_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoull(value, &s, 0);
+ if (errno == ERANGE) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint64 value!",
arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint64_t *)arg->val_saver = val;
+
+ return 0;
+}
+
static int
parse_arg_autosave(struct rte_argparse_arg *arg, const char *value)
{
@@ -406,6 +518,10 @@ parse_arg_autosave(struct rte_argparse_arg *arg, const
char *value)
/* Sort by RTE_ARGPARSE_ARG_VALUE_XXX. */
{ NULL },
{ parse_arg_int },
+ { parse_arg_u8 },
+ { parse_arg_u16 },
+ { parse_arg_u32 },
+ { parse_arg_u64 },
};
uint32_t index = arg_attr_val_type(arg);
int ret = -EINVAL;
diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h
index d4e074d3d7..2059fe11da 100644
--- a/lib/argparse/rte_argparse.h
+++ b/lib/argparse/rte_argparse.h
@@ -59,8 +59,16 @@ enum rte_argparse_flag {
/** The argument's value is int type. */
RTE_ARGPARSE_ARG_VALUE_INT = RTE_MBIT64(1, 2),
+ /** The argument's value is uint8 type. */
+ RTE_ARGPARSE_ARG_VALUE_U8 = RTE_MBIT64(2, 2),
+ /** The argument's value is uint16 type. */
+ RTE_ARGPARSE_ARG_VALUE_U16 = RTE_MBIT64(3, 2),
+ /** The argument's value is uint32 type. */
+ RTE_ARGPARSE_ARG_VALUE_U32 = RTE_MBIT64(4, 2),
+ /** The argument's value is uint64 type. */
+ RTE_ARGPARSE_ARG_VALUE_U64 = RTE_MBIT64(5, 2),
/** Max value type. */
- RTE_ARGPARSE_ARG_VALUE_MAX = RTE_MBIT64(2, 2),
+ RTE_ARGPARSE_ARG_VALUE_MAX = RTE_MBIT64(6, 2),
/**
--
2.17.1
[PATCH 10/12] test/argparse: add parse unsigned base type test
This commit adds parsing unsigned base type (u8/u16/u32/u64) test.
Signed-off-by: Chengwen Feng
---
app/test/test_argparse.c | 59
1 file changed, 54 insertions(+), 5 deletions(-)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 98c6cd6b80..470c1bd2b6 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -733,19 +733,68 @@ static int
test_argparse_parse_type(void)
{
char *str_erange = test_strdup("99");
+ char *str_erange_u32 = test_strdup("4294967296");
+ char *str_erange_u16 = test_strdup("65536");
+ char *str_erange_u8 = test_strdup("256");
char *str_invalid = test_strdup("1a");
char *str_ok = test_strdup("123");
- int value;
+ uint16_t val_u16;
+ uint32_t val_u32;
+ uint64_t val_u64;
+ uint8_t val_u8;
+ int val_int;
int ret;
/* test for int parsing */
- ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT,
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
- ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT,
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
- ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT,
&value);
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT,
&val_int);
TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
- TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_int == 123, "Argparse parse type expect failed!");
+
+ /* test for u8 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U8,
&val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u8, RTE_ARGPARSE_ARG_VALUE_U8,
&val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U8,
&val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U8,
&val_u8);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u8 == 123, "Argparse parse type expect failed!");
+
+ /* test for u16 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U16,
&val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u16,
RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U16,
&val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U16,
&val_u16);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u16 == 123, "Argparse parse type expect failed!");
+
+ /* test for u32 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U32,
&val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u32,
RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U32,
&val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U32,
&val_u32);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u32 == 123, "Argparse parse type expect failed!");
+
+ /* test for u64 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U64,
&val_u64);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U64,
&val_u64);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U64,
&val_u64);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u64 == 123, "Argparse parse type expect failed!");
return 0;
}
--
2.17.1
[PATCH 11/12] argparse: pretty help info
This commit aligns help info.
Take dmafwd as an example, previous:
options:
-h, --help: show this help message and exit.
--mac-updating: Enable MAC addresses updating
--no-mac-updating: Disable MAC addresses updating
-p, --portmask: hexadecimal bitmask of ports to configure
-q, --nb-queue: number of RX queues per port (default is 1)
-c, --copy-type: type of copy: sw|hw
-s, --ring-size: size of dmadev descriptor ring for hardware copy mode or
rte_ring for software copy mode
-b, --dma-batch-size: number of requests per DMA batch
-f, --max-frame-size: max frame size
-m, --force-min-copy-size: force a minimum copy length, even for smaller
packets
-i, --stats-interval: interval, in seconds, between stats prints (default is 1)
Now:
options:
-h, --help show this help message and exit.
--mac-updating Enable MAC addresses updating
--no-mac-updating Disable MAC addresses updating
-p, --portmask hexadecimal bitmask of ports to configure
-q, --nb-queue number of RX queues per port (default is 1)
-c, --copy-typetype of copy: sw|hw
-s, --ring-sizesize of dmadev descriptor ring for hardware copy
mode or rte_ring for software copy mode
-b, --dma-batch-size number of requests per DMA batch
-f, --max-frame-size max frame size
-m, --force-min-copy-size force a minimum copy length, even for smaller
packets
-i, --stats-interval interval, in seconds, between stats prints (default
is 1)
Signed-off-by: Chengwen Feng
---
lib/argparse/rte_argparse.c | 67 +++--
1 file changed, 56 insertions(+), 11 deletions(-)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index cfd9bcf5f6..88c418d1f9 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -634,8 +634,47 @@ parse_args(struct rte_argparse *obj, int argc, char
**argv, bool *show_help)
return 0;
}
+static uint32_t
+calc_help_align(const struct rte_argparse *obj)
+{
+ const struct rte_argparse_arg *arg;
+ uint32_t width = 12; /* Default "-h, --help " len. */
+ uint32_t len;
+ uint32_t i;
+
+ for (i = 0; /* NULL */; i++) {
+ arg = &obj->args[i];
+ if (arg->name_long == NULL)
+ break;
+ len = strlen(arg->name_long);
+ if (is_arg_optional(arg) && arg->name_short != NULL) {
+ len += strlen(", ");
+ len += strlen(arg->name_short);
+ }
+ width = RTE_MAX(width, 1 + len + 2); /* start with 1 & end with
2 space. */
+ }
+
+ return width;
+}
+
+static void
+show_oneline_help(const struct rte_argparse_arg *arg, uint32_t width)
+{
+ uint32_t len = 0;
+ uint32_t i;
+
+ if (arg->name_short != NULL)
+ len = printf(" %s,", arg->name_short);
+ len += printf(" %s", arg->name_long);
+
+ for (i = len; i < width; i++)
+ printf(" ");
+
+ printf("%s\n", arg->help);
+}
+
static void
-show_args_pos_help(const struct rte_argparse *obj)
+show_args_pos_help(const struct rte_argparse *obj, uint32_t align)
{
uint32_t position_count = calc_position_count(obj);
const struct rte_argparse_arg *arg;
@@ -651,43 +690,49 @@ show_args_pos_help(const struct rte_argparse *obj)
break;
if (!is_arg_positional(arg))
continue;
- printf(" %s: %s\n", arg->name_long, arg->help);
+ show_oneline_help(arg, align);
}
}
static void
-show_args_opt_help(const struct rte_argparse *obj)
+show_args_opt_help(const struct rte_argparse *obj, uint32_t align)
{
+ static const struct rte_argparse_arg help = {
+ .name_long = "--help",
+ .name_short = "-h",
+ .help = "show this help message and exit.",
+ };
const struct rte_argparse_arg *arg;
uint32_t i;
- printf("\noptions:\n"
- " -h, --help: show this help message and exit.\n");
+ printf("\noptions:\n");
+ show_oneline_help(&help, align);
for (i = 0; /* NULL */; i++) {
arg = &obj->args[i];
if (arg->name_long == NULL)
break;
if (!is_arg_optional(arg))
continue;
- if (arg->name_short != NULL)
- printf(" %s, %s: %s\n", arg->name_short,
arg->name_long, arg->help);
- else
- printf(" %s: %s\n", arg->name_long, arg->help);
+ show_oneline_help(arg, align);
}
}
static void
show_args_help(const struct rte_argparse *obj)
{
+ uint32_t align = calc_help_align(obj);
+
printf("usage: %s %s\n", obj->prog_name, obj->usage);
if (obj->descriptor != NULL)
printf("\ndescriptor: %s\n",
[PATCH 12/12] examples/dma: replace getopt with argparse
Replace getopt with argparse.
Signed-off-by: Chengwen Feng
---
examples/dma/dmafwd.c| 279 ++-
examples/dma/meson.build | 2 +-
2 files changed, 127 insertions(+), 154 deletions(-)
diff --git a/examples/dma/dmafwd.c b/examples/dma/dmafwd.c
index f27317a622..4cc0913240 100644
--- a/examples/dma/dmafwd.c
+++ b/examples/dma/dmafwd.c
@@ -4,11 +4,11 @@
#include
#include
-#include
#include
#include
#include
+#include
#include
#include
#include
@@ -18,16 +18,18 @@
#define MAX_PKT_BURST 32
#define MEMPOOL_CACHE_SIZE 512
#define MIN_POOL_SIZE 65536U
-#define CMD_LINE_OPT_MAC_UPDATING "mac-updating"
-#define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating"
-#define CMD_LINE_OPT_PORTMASK "portmask"
-#define CMD_LINE_OPT_NB_QUEUE "nb-queue"
-#define CMD_LINE_OPT_COPY_TYPE "copy-type"
-#define CMD_LINE_OPT_RING_SIZE "ring-size"
-#define CMD_LINE_OPT_BATCH_SIZE "dma-batch-size"
-#define CMD_LINE_OPT_FRAME_SIZE "max-frame-size"
-#define CMD_LINE_OPT_FORCE_COPY_SIZE "force-min-copy-size"
-#define CMD_LINE_OPT_STATS_INTERVAL "stats-interval"
+#define CMD_LINE_OPT_MAC_UPDATING "--mac-updating"
+#define CMD_LINE_OPT_NO_MAC_UPDATING "--no-mac-updating"
+#define CMD_LINE_OPT_PORTMASK "--portmask"
+#define CMD_LINE_OPT_PORTMASK_INDEX 1
+#define CMD_LINE_OPT_NB_QUEUE "--nb-queue"
+#define CMD_LINE_OPT_COPY_TYPE "--copy-type"
+#define CMD_LINE_OPT_COPY_TYPE_INDEX 2
+#define CMD_LINE_OPT_RING_SIZE "--ring-size"
+#define CMD_LINE_OPT_BATCH_SIZE "--dma-batch-size"
+#define CMD_LINE_OPT_FRAME_SIZE "--max-frame-size"
+#define CMD_LINE_OPT_FORCE_COPY_SIZE "--force-min-copy-size"
+#define CMD_LINE_OPT_STATS_INTERVAL "--stats-interval"
/* configurable number of RX/TX ring descriptors */
#define RX_DEFAULT_RINGSIZE 1024
@@ -95,10 +97,10 @@ static copy_mode_t copy_mode = COPY_MODE_DMA_NUM;
/* size of descriptor ring for hardware copy mode or
* rte_ring for software copy mode
*/
-static unsigned short ring_size = 2048;
+static uint16_t ring_size = 2048;
/* interval, in seconds, between stats prints */
-static unsigned short stats_interval = 1;
+static uint16_t stats_interval = 1;
/* global mbuf arrays for tracking DMA bufs */
#define MBUF_RING_SIZE 2048
#define MBUF_RING_MASK (MBUF_RING_SIZE - 1)
@@ -583,26 +585,6 @@ static void start_forwarding_cores(void)
}
/* >8 End of starting to process for each lcore. */
-/* Display usage */
-static void
-dma_usage(const char *prgname)
-{
- printf("%s [EAL options] -- -p PORTMASK [-q NQ]\n"
- " -b --dma-batch-size: number of requests per DMA batch\n"
- " -f --max-frame-size: max frame size\n"
- " -m --force-min-copy-size: force a minimum copy length, even
for smaller packets\n"
- " -p --portmask: hexadecimal bitmask of ports to configure\n"
- " -q NQ: number of RX queues per port (default is 1)\n"
- " --[no-]mac-updating: Enable or disable MAC addresses
updating (enabled by default)\n"
- " When enabled:\n"
- " - The source MAC address is replaced by the TX port MAC
address\n"
- " - The destination MAC address is replaced by
02:00:00:00:00:TX_PORT_ID\n"
- " -c --copy-type CT: type of copy: sw|hw\n"
- " -s --ring-size RS: size of dmadev descriptor ring for
hardware copy mode or rte_ring for software copy mode\n"
- " -i --stats-interval SI: interval, in seconds, between stats
prints (default is 1)\n",
- prgname);
-}
-
static int
dma_parse_portmask(const char *portmask)
{
@@ -628,142 +610,133 @@ dma_parse_copy_mode(const char *copy_mode)
return COPY_MODE_INVALID_NUM;
}
+static int
+dma_parse_args_cb(uint32_t index, const char *value, void *opaque)
+{
+ int port_mask;
+
+ RTE_SET_USED(opaque);
+
+ if (index == CMD_LINE_OPT_PORTMASK_INDEX) {
+ port_mask = dma_parse_portmask(value);
+ if (port_mask & ~dma_enabled_port_mask || port_mask <= 0) {
+ printf("Invalid portmask, %s, suggest 0x%x\n",
+ value, dma_enabled_port_mask);
+ return -1;
+ }
+ dma_enabled_port_mask = port_mask;
+ } else if (index == CMD_LINE_OPT_COPY_TYPE_INDEX) {
+ copy_mode = dma_parse_copy_mode(value);
+ if (copy_mode == COPY_MODE_INVALID_NUM) {
+ printf("Invalid copy type. Use: sw, hw\n");
+ return -1;
+ }
+ } else {
+ printf("Invalid index %u\n", index);
+ return -1;
+ }
+
+ return 0;
+}
+
/* Parse the argument given in the command line of the application */
static int
dma_parse_args(int argc, char **argv, unsigned int nb_ports)
{
- static const char short_options[] =
- "b:" /* dma batch size */
-
Re: [PATCH 02/12] argparse: add argparse library
On Mon, 22 Jan 2024 03:57:52 + Chengwen Feng wrote: > +Parsing by autosave way > +~~~ > + > +For which known value types (just like ``RTE_ARGPARSE_ARG_VALUE_INT``"), > could > +parse by autosave way, just like above "--aaa"/"--bbb"/"--ccc" optional > +arguments: > + > +If the user input parameter are: "program --aaa --bbb 1234 --ccc=20 ...", > then > +the aaa_val will equal 100, the bbb_val will equal 1234 and the ccc_val will > +equal 20. > + > +If the user input parameter are: "program --ccc ...", then the aaa_val and > +bbb_val will not modify, and ccc_val will equal 200. These paragraphs are awkwardly worded.
Re: [PATCH 02/12] argparse: add argparse library
Hi Stephen, On 2024/1/22 12:54, Stephen Hemminger wrote: > On Mon, 22 Jan 2024 03:57:52 + > Chengwen Feng wrote: > >> +Parsing by autosave way >> +~~~ >> + >> +For which known value types (just like ``RTE_ARGPARSE_ARG_VALUE_INT``"), >> could >> +parse by autosave way, just like above "--aaa"/"--bbb"/"--ccc" optional >> +arguments: >> + >> +If the user input parameter are: "program --aaa --bbb 1234 --ccc=20 ...", >> then >> +the aaa_val will equal 100, the bbb_val will equal 1234 and the ccc_val will >> +equal 20. >> + >> +If the user input parameter are: "program --ccc ...", then the aaa_val and >> +bbb_val will not modify, and ccc_val will equal 200. > > These paragraphs are awkwardly worded. I will try to refine it, Thanks. > . >
Re: [PATCH 2/2] config/arm: add support for fallback march
+Cc
On 2024/1/21 5:36 PM, pbhagavat...@marvell.com wrote:
From: Pavan Nikhilesh
Some ARM CPUs have specific march requirements and
are not compatible with the supported march list.
Add fallback march in case the mcpu and the march
advertised in the part_number_config are not supported
by the compiler.
Example
mcpu = neoverse-n2
march = armv9-a
fallback_march = armv8.5-a
mcpu, march not supported
machine_args = ['-march=armv8.5-a']
mcpu, march, fallback_march not supported
least march supported = armv8-a
machine_args = ['-march=armv8-a']
Signed-off-by: Pavan Nikhilesh
---
config/arm/meson.build | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8c8cfccca0..2aaf78a81a 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -94,6 +94,7 @@ part_number_config_arm = {
'0xd49': {
'march': 'armv9-a',
'march_features': ['sve2'],
+'fallback_march': 'armv8.5-a',
'mcpu': 'neoverse-n2',
'flags': [
['RTE_MACHINE', '"neoverse-n2"'],
@@ -709,14 +710,14 @@ if update_flags
# probe supported archs and their features
candidate_march = ''
+supported_marchs = ['armv9-a', 'armv8.6-a', 'armv8.5-a', 'armv8.4-a',
+'armv8.3-a', 'armv8.2-a', 'armv8.1-a', 'armv8-a']
if part_number_config.has_key('march')
if part_number_config.get('force_march', false) or support_mcpu
if cc.has_argument('-march=' + part_number_config['march'])
candidate_march = part_number_config['march']
endif
else
-supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a',
'armv8.3-a',
-'armv8.2-a', 'armv8.1-a', 'armv8-a']
check_compiler_support = false
foreach supported_march: supported_marchs
if supported_march == part_number_config['march']
@@ -733,6 +734,16 @@ if update_flags
endif
if candidate_march != part_number_config['march']
+if part_number_config.has_key('fallback_march') and not
support_mcpu
+fallback_march = part_number_config['fallback_march']
+foreach supported_march: supported_marchs
+if (supported_march == fallback_march
+and cc.has_argument('-march=' + supported_march))
+candidate_march = supported_march
+break
+endif
+endforeach
+endif
warning('Configuration march version is @0@, not supported.'
.format(part_number_config['march']))
if candidate_march != ''
--
2.25.1
Re: [PATCH 1/2] config/arm: avoid mcpu and march conflicts
+Cc
On 2024/1/21 5:36 PM, pbhagavat...@marvell.com wrote:
From: Pavan Nikhilesh
The compiler options march and mtune are a subset
of mcpu and will lead to conflicts if improper march
is chosen for a given mcpu.
To avoid conflicts, force part number march when
mcpu is available and is supported by the compiler.
Example:
march = armv9-a
mcpu = neoverse-n2
mcpu supported, march supported
machine_args = ['-mcpu=neoverse-n2', '-march=armv9-a']
mcpu supported, march not supported
machine_args = ['-mcpu=neoverse-n2']
mcpu not supported, march supported
machine_args = ['-march=armv9-a']
mcpu not supported, march not supported
machine_args = ['-march=armv8.6-a']
Signed-off-by: Pavan Nikhilesh
---
config/arm/meson.build | 109 +
1 file changed, 67 insertions(+), 42 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 36f21d2259..8c8cfccca0 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -58,18 +58,18 @@ implementer_generic = {
}
part_number_config_arm = {
-'0xd03': {'compiler_options': ['-mcpu=cortex-a53']},
-'0xd04': {'compiler_options': ['-mcpu=cortex-a35']},
-'0xd05': {'compiler_options': ['-mcpu=cortex-a55']},
-'0xd07': {'compiler_options': ['-mcpu=cortex-a57']},
-'0xd08': {'compiler_options': ['-mcpu=cortex-a72']},
-'0xd09': {'compiler_options': ['-mcpu=cortex-a73']},
-'0xd0a': {'compiler_options': ['-mcpu=cortex-a75']},
-'0xd0b': {'compiler_options': ['-mcpu=cortex-a76']},
+'0xd03': {'mcpu': 'cortex-a53'},
+'0xd04': {'mcpu': 'cortex-a35'},
+'0xd05': {'mcpu': 'cortex-a55'},
+'0xd07': {'mcpu': 'cortex-a57'},
+'0xd08': {'mcpu': 'cortex-a72'},
+'0xd09': {'mcpu': 'cortex-a73'},
+'0xd0a': {'mcpu': 'cortex-a75'},
+'0xd0b': {'mcpu': 'cortex-a76'},
'0xd0c': {
'march': 'armv8.2-a',
'march_features': ['crypto', 'rcpc'],
-'compiler_options': ['-mcpu=neoverse-n1'],
+'mcpu': 'neoverse-n1',
'flags': [
['RTE_MACHINE', '"neoverse-n1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -81,7 +81,7 @@ part_number_config_arm = {
'0xd40': {
'march': 'armv8.4-a',
'march_features': ['sve'],
-'compiler_options': ['-mcpu=neoverse-v1'],
+'mcpu': 'neoverse-v1',
'flags': [
['RTE_MACHINE', '"neoverse-v1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -92,8 +92,9 @@ part_number_config_arm = {
'march': 'armv8.4-a',
},
'0xd49': {
+'march': 'armv9-a',
'march_features': ['sve2'],
-'compiler_options': ['-mcpu=neoverse-n2'],
+'mcpu': 'neoverse-n2',
'flags': [
['RTE_MACHINE', '"neoverse-n2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -127,21 +128,22 @@ implementer_cavium = {
],
'part_number_config': {
'0xa1': {
-'compiler_options': ['-mcpu=thunderxt88'],
+'mcpu': 'thunderxt88',
'flags': flags_part_number_thunderx
},
'0xa2': {
-'compiler_options': ['-mcpu=thunderxt81'],
+'mcpu': 'thunderxt81',
'flags': flags_part_number_thunderx
},
'0xa3': {
-'compiler_options': ['-march=armv8-a+crc', '-mcpu=thunderxt83'],
+'mcpu': 'thunderxt83',
+'compiler_options': ['-march=armv8-a+crc'],
'flags': flags_part_number_thunderx
},
'0xaf': {
'march': 'armv8.1-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mcpu=thunderx2t99'],
+'mcpu': 'thunderx2t99',
'flags': [
['RTE_MACHINE', '"thunderx2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -153,7 +155,7 @@ implementer_cavium = {
'0xb2': {
'march': 'armv8.2-a',
'march_features': ['crc', 'crypto', 'lse'],
-'compiler_options': ['-mcpu=octeontx2'],
+'mcpu': 'octeontx2',
'flags': [
['RTE_MACHINE', '"cn9k"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -176,7 +178,7 @@ implementer_ampere = {
'0x0': {
'march': 'armv8-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mtune=emag'],
+'mcpu': 'emag',
'flags': [
['RTE_MACHINE', '"eMAG"'],
['RTE_MAX_LCORE', 32],
@@ -186,7 +188,7 @@ implementer_ampere = {
'0xac3': {
'march': 'armv8.6-a',
'march_features': ['crc', 'crypto'],
-'compiler_options': ['-mcpu=ampere1'],
+'mcpu': 'ampere1',
'flags': [
['RTE_MACHINE', '"AmpereOne"'],
['RTE_MAX_LCOR
Re: [PATCH v3 1/2] config/arm: allow WFE to be enabled config time
Acked-by: Chengwen Feng On 2024/1/21 23:21, pbhagavat...@marvell.com wrote: > From: Pavan Nikhilesh > > Allow RTE_ARM_USE_WFE to be enabled at meson configuration > time by passing it via c_args instead of modifying > `config/arm/meson.build`. > > Example usage: > meson build -Dc_args='-DRTE_ARM_USE_WFE' \ > --cross-file config/arm/arm64_cn10k_linux_gcc > > Signed-off-by: Pavan Nikhilesh > --- > v3 Changes: > - Comment the meson option instead of removing it. > > config/arm/meson.build | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/config/arm/meson.build b/config/arm/meson.build > index 36f21d2259..89e1de312b 100644 > --- a/config/arm/meson.build > +++ b/config/arm/meson.build > @@ -17,7 +17,9 @@ flags_common = [ > #['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF], > #['RTE_ARM64_MEMCPY_STRICT_ALIGN', false], > > -['RTE_ARM_USE_WFE', false], > +# Enable use of ARM wait for event instruction. > +# ['RTE_ARM_USE_WFE', false], > + > ['RTE_ARCH_ARM64', true], > ['RTE_CACHE_LINE_SIZE', 128] > ] > -- > 2.25.1 > > . >
Re: [PATCH v3 1/2] config/arm: allow WFE to be enabled config time
On 2024/1/21 11:21 PM, pbhagavat...@marvell.com wrote: From: Pavan Nikhilesh Allow RTE_ARM_USE_WFE to be enabled at meson configuration time by passing it via c_args instead of modifying `config/arm/meson.build`. Example usage: meson build -Dc_args='-DRTE_ARM_USE_WFE' \ --cross-file config/arm/arm64_cn10k_linux_gcc Signed-off-by: Pavan Nikhilesh --- v3 Changes: - Comment the meson option instead of removing it. config/arm/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 36f21d2259..89e1de312b 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -17,7 +17,9 @@ flags_common = [ #['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF], #['RTE_ARM64_MEMCPY_STRICT_ALIGN', false], -['RTE_ARM_USE_WFE', false], +# Enable use of ARM wait for event instruction. +# ['RTE_ARM_USE_WFE', false], + ['RTE_ARCH_ARM64', true], ['RTE_CACHE_LINE_SIZE', 128] ] -- 2.25.1 Acked-by: Ruifeng Wang IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
Re: [PATCH] mempool: test performance with larger bursts
Hi Morten,
On 2024/1/21 12:52, Morten Brørup wrote:
> Bursts of up to 128 packets are not uncommon, so increase the maximum
> tested get and put burst sizes from 32 to 128.
How about add 64 ?
>
> Some applications keep more than 512 objects, so increase the maximum
> number of kept objects from 512 to 4096.
> This exceeds the typical mempool cache size of 512 objects, so the test
> also exercises the mempool driver.
And for 2048? (I notice below already has 1024)
PS: with this commit, the number of combinations will grow much, and every
subtest cost 5sec, so the total time will increases great. So could this perf
suite
support paramters or derivative command ? for instance:
REGISTER_PERF_TEST(mempool_perf_autotest, test_mempool_perf);
REGISTER_PERF_TEST(mempool_perf_autotest_keeps256, test_mempool_perf_keeps256);
Thanks.
>
> Signed-off-by: Morten Brørup
> ---
> app/test/test_mempool_perf.c | 25 -
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
> index 96de347f04..f52106e833 100644
> --- a/app/test/test_mempool_perf.c
> +++ b/app/test/test_mempool_perf.c
> @@ -1,6 +1,6 @@
> /* SPDX-License-Identifier: BSD-3-Clause
> * Copyright(c) 2010-2014 Intel Corporation
> - * Copyright(c) 2022 SmartShare Systems
> + * Copyright(c) 2022-2024 SmartShare Systems
> */
>
> #include
> @@ -54,22 +54,24 @@
> *
> *- Bulk size (*n_get_bulk*, *n_put_bulk*)
> *
> - * - Bulk get from 1 to 32
> - * - Bulk put from 1 to 32
> - * - Bulk get and put from 1 to 32, compile time constant
> + * - Bulk get from 1 to 128
> + * - Bulk put from 1 to 128
> + * - Bulk get and put from 1 to 128, compile time constant
> *
> *- Number of kept objects (*n_keep*)
> *
> * - 32
> * - 128
> * - 512
> + * - 1024
> + * - 4096
> */
>
> #define N 65536
> #define TIME_S 5
> #define MEMPOOL_ELT_SIZE 2048
> -#define MAX_KEEP 512
> -#define MEMPOOL_SIZE
> ((rte_lcore_count()*(MAX_KEEP+RTE_MEMPOOL_CACHE_MAX_SIZE))-1)
> +#define MAX_KEEP 4096
> +#define MEMPOOL_SIZE
> ((rte_lcore_count()*(MAX_KEEP+RTE_MEMPOOL_CACHE_MAX_SIZE*2))-1)
>
> /* Number of pointers fitting into one cache line. */
> #define CACHE_LINE_BURST (RTE_CACHE_LINE_SIZE / sizeof(uintptr_t))
> @@ -204,6 +206,8 @@ per_lcore_mempool_test(void *arg)
> CACHE_LINE_BURST, CACHE_LINE_BURST);
> else if (n_get_bulk == 32)
> ret = test_loop(mp, cache, n_keep, 32, 32);
> + else if (n_get_bulk == 128)
> + ret = test_loop(mp, cache, n_keep, 128, 128);
> else
> ret = -1;
>
> @@ -289,9 +293,9 @@ launch_cores(struct rte_mempool *mp, unsigned int cores)
> static int
> do_one_mempool_test(struct rte_mempool *mp, unsigned int cores)
> {
> - unsigned int bulk_tab_get[] = { 1, 4, CACHE_LINE_BURST, 32, 0 };
> - unsigned int bulk_tab_put[] = { 1, 4, CACHE_LINE_BURST, 32, 0 };
> - unsigned int keep_tab[] = { 32, 128, 512, 0 };
> + unsigned int bulk_tab_get[] = { 1, 4, CACHE_LINE_BURST, 32, 128, 0 };
> + unsigned int bulk_tab_put[] = { 1, 4, CACHE_LINE_BURST, 32, 128, 0 };
> + unsigned int keep_tab[] = { 32, 128, 512, 1024, 4096, 0 };
> unsigned *get_bulk_ptr;
> unsigned *put_bulk_ptr;
> unsigned *keep_ptr;
> @@ -301,6 +305,9 @@ do_one_mempool_test(struct rte_mempool *mp, unsigned int
> cores)
> for (put_bulk_ptr = bulk_tab_put; *put_bulk_ptr;
> put_bulk_ptr++) {
> for (keep_ptr = keep_tab; *keep_ptr; keep_ptr++) {
>
> + if (*keep_ptr < *get_bulk_ptr || *keep_ptr <
> *put_bulk_ptr)
> + continue;
> +
> use_constant_values = 0;
> n_get_bulk = *get_bulk_ptr;
> n_put_bulk = *put_bulk_ptr;
>
Re: [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail
Acked-by: Chengwen Feng
On 2024/1/20 16:58, Shaowei Sun wrote:
> Telemetry can only create 10 conns by default, each of which is processed
> by a thread.
>
> When a thread fails to write using socket, the thread will end directly
> without reducing the total number of conns.
>
> This will result in the machine running for a long time, and if there are
> 10 failures, the telemetry will be unavailable
>
> Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
>
> Signed-off-by: Shaowei Sun <1819846...@qq.com>
> ---
> lib/telemetry/telemetry.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
> index 31e2391867..0b00c04090 100644
> --- a/lib/telemetry/telemetry.c
> +++ b/lib/telemetry/telemetry.c
> @@ -378,8 +378,8 @@ client_handler(void *sock_id)
> "{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",
> telemetry_version, getpid(), MAX_OUTPUT_LEN);
> if (write(s, info_str, strlen(info_str)) < 0) {
> - close(s);
> - return NULL;
> + TMTY_LOG_LINE(ERR, "Socket write base info to client failed");
> + goto exit;
> }
>
> /* receive data is not null terminated */
> @@ -404,6 +404,7 @@ client_handler(void *sock_id)
>
> bytes = read(s, buffer, sizeof(buffer) - 1);
> }
> +exit:
> close(s);
> rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
> return NULL;
>
[PATCH v1] net/mlx5: fix secondary process query stats segfault
The "outer_of_buffer" counter is owned by the primary process devx
object and it is pointer by pointer in mlx5_priv structure. Actually,
there are 4 levels' pointers in this piece of code.
The secondary process can't access this part directly since it belongs
to another process' heap.
Return ENOTSUP as workaround.
Signed-off-by: Rongwei Liu
Acked-by: Matan Azrad
Fixes: 750e48c7d ("common/mlx5: add DevX commands for queue counters")
Cc: ma...@nvidia.com
Cc: sta...@dpdk.org
---
drivers/net/mlx5/linux/mlx5_os.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 8682899735..dc854ebb64 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -3192,9 +3192,15 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char
*ctr_name,
if (priv->sh) {
if (priv->q_counters != NULL &&
- strcmp(ctr_name, "out_of_buffer") == 0)
+ strcmp(ctr_name, "out_of_buffer") == 0) {
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+ DRV_LOG(WARNING, "Devx out_of_buffer counter is
not supported in the secondary process");
+ rte_errno = ENOTSUP;
+ return 1;
+ }
return mlx5_devx_cmd_queue_counter_query
(priv->q_counters, 0, (uint32_t *)stat);
+ }
MKSTR(path, "%s/ports/%d/hw_counters/%s",
priv->sh->ibdev_path,
priv->dev_port,
--
2.27.0
