[PATCH v2] hash: fix SSE comparison
__mm_cmpeq_epi16 returns 0x if the corresponding 16-bit elements are
equal. In original SSE2 implementation for function compare_signatures,
it utilizes _mm_movemask_epi8 to create mask from the MSB of each 8-bit
element, while we should only care about the MSB of lower 8-bit in each
16-bit element.
For example, if the comparison result is all equal, SSE2 path returns
0x while NEON and default scalar path return 0x.
Although this bug is not causing any negative effects since the caller
function solely examines the trailing zeros of each match mask, we
recommend this fix to ensure consistency with NEON and default scalar
code behaviors.
Fixes: c7d93df552c2 ("hash: use partial-key hashing")
Cc: sta...@dpdk.org
Signed-off-by: Feifei Wang
Signed-off-by: Jieqiang Wang
Reviewed-by: Ruifeng Wang
---
lib/hash/rte_cuckoo_hash.c | 4
1 file changed, 4 insertions(+)
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index d92a903bb3..d348d45246 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -1868,11 +1868,15 @@ compare_signatures(uint32_t *prim_hash_matches,
uint32_t *sec_hash_matches,
_mm_load_si128(
(__m128i const *)prim_bkt->sig_current),
_mm_set1_epi16(sig)));
+/* Extract the even-index bits only */
+*prim_hash_matches &= 0x;
/* Compare all signatures in the bucket */
*sec_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16(
_mm_load_si128(
(__m128i const *)sec_bkt->sig_current),
_mm_set1_epi16(sig)));
+/* Extract the even-index bits only */
+*sec_hash_matches &= 0x;
break;
#elif defined(__ARM_NEON)
case RTE_HASH_COMPARE_NEON: {
--
2.25.1
[PATCH v3] hash: fix SSE comparison
__mm_cmpeq_epi16 returns 0x if the corresponding 16-bit elements are
equal. In original SSE2 implementation for function compare_signatures,
it utilizes _mm_movemask_epi8 to create mask from the MSB of each 8-bit
element, while we should only care about the MSB of lower 8-bit in each
16-bit element.
For example, if the comparison result is all equal, SSE2 path returns
0x while NEON and default scalar path return 0x.
Although this bug is not causing any negative effects since the caller
function solely examines the trailing zeros of each match mask, we
recommend this fix to ensure consistency with NEON and default scalar
code behaviors.
Fixes: c7d93df552c2 ("hash: use partial-key hashing")
Cc: sta...@dpdk.org
v2:
1. Utilize scalar mask instead of vector mask to save extra loads (Bruce)
v3:
1. Fix coding style warnings
Signed-off-by: Feifei Wang
Signed-off-by: Jieqiang Wang
Reviewed-by: Ruifeng Wang
---
lib/hash/rte_cuckoo_hash.c | 4
1 file changed, 4 insertions(+)
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index d92a903bb3..19b23f2a97 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -1868,11 +1868,15 @@ compare_signatures(uint32_t *prim_hash_matches,
uint32_t *sec_hash_matches,
_mm_load_si128(
(__m128i const *)prim_bkt->sig_current),
_mm_set1_epi16(sig)));
+ /* Extract the even-index bits only */
+ *prim_hash_matches &= 0x;
/* Compare all signatures in the bucket */
*sec_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16(
_mm_load_si128(
(__m128i const *)sec_bkt->sig_current),
_mm_set1_epi16(sig)));
+ /* Extract the even-index bits only */
+ *sec_hash_matches &= 0x;
break;
#elif defined(__ARM_NEON)
case RTE_HASH_COMPARE_NEON: {
--
2.25.1
Re: [PATCH v2] app/testpmd: add flush multicast MAC address command
On 2023/9/29 1:23, Ferruh Yigit wrote:
> On 8/2/2023 7:23 AM, Dengdui Huang wrote:
>> Add command to flush multicast MAC address
>> Usage:
>> mcast_addr flush :
>> flush multicast MAC address on port_id
>>
>> Signed-off-by: Dengdui Huang
>> ---
>> app/test-pmd/cmdline.c | 43 +
>> app/test-pmd/config.c | 18 +
>> app/test-pmd/testpmd.h | 1 +
>> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8
>> 4 files changed, 70 insertions(+)
>>
>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>> index 0d0723f659..d5a3bd2287 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -516,6 +516,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>> "set allmulti (port_id|all) (on|off)\n"
>> "Set the allmulti mode on port_id, or all.\n\n"
>>
>> +"mcast_addr flush (port_id)\n"
>> +"To flush the set of multicast addresses.\n\n"
>> +>
>
> I assume 'set of multicast address' comes from the API getting
> 'mc_addr_set' as parameter, but using 'set' is not useful in the command
> description, what about:
> "Flush all multicast MAC addresses on port_id."
>
> Similarly there are logs/documents below refers as "set of multicast
> addresses", does it make sense to replace all as "all multicast MAC
> addresses"?
>
>
> And relating to the ordering, as you said "mcast_addr add|remove ..." is
> missing, which is contributing to the confusion.
> Can you please add this first (in a separate patch) to just below
> "mac_addr .*" group, later put "mcast_addr flush .*' below it in this patch?
>
>
>> "set flow_ctrl rx (on|off) tx (on|off) (high_water)"
>> " (low_water) (pause_time) (send_xon)
>> mac_ctrl_frame_fwd"
>> " (on|off) autoneg (on|off) (port_id)\n"
>> @@ -8561,6 +8564,45 @@ static cmdline_parse_inst_t cmd_mcast_addr = {
>> },
>> };
>>
>> +/* *** FLUSH MULTICAST MAC ADDRESS ON PORT *** */
>> +struct cmd_mcast_addr_flush_result {
>> +cmdline_fixed_string_t mcast_addr_cmd;
>> +cmdline_fixed_string_t what;
>> +uint16_t port_num;
>> +};
>> +
>> +static void cmd_mcast_addr_flush_parsed(void *parsed_result,
>> +__rte_unused struct cmdline *cl,
>> +__rte_unused void *data)
>> +{
>> +struct cmd_mcast_addr_flush_result *res = parsed_result;
>> +
>> +mcast_addr_flush(res->port_num);
>> +}
>> +
>> +static cmdline_parse_token_string_t cmd_mcast_addr_flush_cmd =
>> +TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result,
>> + mcast_addr_cmd, "mcast_addr");
>> +static cmdline_parse_token_string_t cmd_mcast_addr_flush_what =
>> +TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
>> + "flush");
>> +static cmdline_parse_token_num_t cmd_mcast_addr_flush_portnum =
>> +TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
>> + RTE_UINT16);
>> +
>> +static cmdline_parse_inst_t cmd_mcast_addr_flush = {
>> +.f = cmd_mcast_addr_flush_parsed,
>> +.data = (void *)0,
>> +.help_str = "mcast_addr flush : "
>> +"flush multicast MAC address on port_id",>
>
> What about:
> "Flush all multicast MAC addresses on port_id."
>
>
>> +.tokens = {
>> +(void *)&cmd_mcast_addr_flush_cmd,
>> +(void *)&cmd_mcast_addr_flush_what,
>> +(void *)&cmd_mcast_addr_flush_portnum,
>> +NULL,
>> +},
>> +};
>> +
>> /* vf vlan anti spoof configuration */
>>
>> /* Common result structure for vf vlan anti spoof */
>> @@ -12929,6 +12971,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
>> (cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
>> (cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
>> (cmdline_parse_inst_t *)&cmd_mcast_addr,
>> +(cmdline_parse_inst_t *)&cmd_mcast_addr_flush,
>> (cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
>> (cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
>> (cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,
>> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
>> index 11f3a22048..d66d1db37c 100644
>> --- a/app/test-pmd/config.c
>> +++ b/app/test-pmd/config.c
>> @@ -6802,6 +6802,24 @@ mcast_addr_remove(portid_t port_id, struct
>> rte_ether_addr *mc_addr)
>> mcast_addr_pool_append(port, mc_addr);
>> }
>>
>> +void
>> +mcast_addr_flush(portid_t port_id)
>> +{
>> +int ret;
>> +
>> +if (port_id_is_invalid(port_id, ENABLED_WARN))
>> +return;
>> +
>> +ret = rte_eth_dev_set_mc_addr_list(port_id, NULL, 0);
>> +if (ret != 0) {
>> +fprintf(stderr,
>> +"Failed to flush the set of filtered addresses on port
>> %u\n",
>> +port_id);
>> +return;
>> +}
>> +
Re: [PATCH v2 1/8] lib/ethdev: update Rx and Tx queue status
On 2023/9/28 21:15, Ferruh Yigit wrote:
On 9/28/2023 8:42 AM, Jie Hai wrote:
The DPDK framework reports the queue status, which is stored in
'dev->data->tx_queue_state' and 'dev->data->rx_queue_state'.The
state is currently maintained by the drivers. Users may determine
whether a queue participates in packet forwarding based on the
state. However, not all drivers correctly report the queue status.
This may cause forwarding problems.
Since it is difficult to modify the queue status of all drivers,
we consider updating the queue status at the framework level.
Some drivers support queues for hairpin, leaving status updating
for such queues to the drivers. Some drivers support
'deferred_start'. Assume that all drivers that support
'deferred_start' can obtain the configuration through
'rte_eth_tx_queue_info_get' and 'rte_eth_rx_queue_info_get'. So
we can directly update the queue status in 'rte_eth_dev_start'
and 'rte_eth_dev_stop'.
Signed-off-by: Jie Hai
---
lib/ethdev/rte_ethdev.c | 40
1 file changed, 40 insertions(+)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 0840d2b5942a..e3aaa71eba9e 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -1641,6 +1641,9 @@ rte_eth_dev_start(uint16_t port_id)
struct rte_eth_dev_info dev_info;
int diag;
int ret, ret_stop;
+ uint16_t i;
+ struct rte_eth_rxq_info rxq_info;
+ struct rte_eth_txq_info txq_info;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
dev = &rte_eth_devices[port_id];
@@ -1697,6 +1700,30 @@ rte_eth_dev_start(uint16_t port_id)
(*dev->dev_ops->link_update)(dev, 0);
}
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ if (rte_eth_dev_is_rx_hairpin_queue(dev, i))
+ continue;
+
+ memset(&rxq_info, 0, sizeof(rxq_info));
+ ret = rte_eth_rx_queue_info_get(port_id, i, &rxq_info);
+ if (ret == 0 && rxq_info.conf.rx_deferred_start != 0)
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
+ else
+ dev->data->rx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
+ }
+
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ if (rte_eth_dev_is_tx_hairpin_queue(dev, i))
+ continue;
+
+ memset(&txq_info, 0, sizeof(txq_info));
+ ret = rte_eth_tx_queue_info_get(port_id, i, &txq_info);
+ if (ret == 0 && txq_info.conf.tx_deferred_start != 0)
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
+ else
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STARTED;
+ }
+
Hi Jie,
I am not sure about adding queue_info_get() calls a dependency to
start(), since start() is a mandatory API, I am concerned about possible
side affects.
Like if rte_eth_rx_queue_info_get() fails,Yes, unless we let
rte_eth_rx|tx_queue_info_get a mandatory API.
Or event though deferred_start is set, can application first call
rx_queue_start(), later start(), like:
start()
rx_queue_start()
stop()
rx_queue_start()
start()
start() --> deferred_start is confugured, the queue is stopped
rx_queue_start() --> the queue is started
stop() --> all queues are stopped
rx_queue_start() --> not supported, port should starts first
start()
If we change the order as:
start()
rx_queue_start()
stop()
start()
The last status of the queue for different drivers may be different.
Most drivers starts all queues except the queue setting deferred_start.
For sfc driver, all queues are started and the status of the queue
setting deferred_start will be reported as stopped, which is not correct.
That's the point, drivers have their own private processing for
different sequences of deferred_start, start|stop and queue_start|stop.
Or even applications sets deferred_start, PMD be ignoring without
reflecting that to conf.rx_deferred_start, etc...
Supppose the app sets the deferred_start,
whether the driver verifies the support the configuration or not,
whether the driver issues the configuration to the hardware or not,
whether the driver saves and reports the configuration or not,
Different driver implementations vary.
For the above three cases, pay attention to the following:
1) Y-Y-Y That's what we need.
2) Y-Y-N That's what we should add.
3) N-N-Y This will lead to wrong information(e.g.ice_rxtx.c mlx5_txq.c
mlx5_rxq.c)
4) N-N-N That's what we need, too.
Anyway, intention was to move common task, setting queue state, to the
ethdev layer, but because of the deferred_start, in rte_eth_dev_start()
we don't really know the queue state.
We can try to move deferred state information to the ethdev, but that is
similar to setting queue state in the driver, that is why perhaps better
to leave setting state to dr
Re: [PATCH v3 1/2] dmadev: offload to free source buffer
Hi Amit,
On 2023/9/28 19:50, Amit Prakash Shukla wrote:
> This changeset adds support in DMA library to free source DMA buffer by
> hardware. On a supported hardware, application can pass on the mempool
> information as part of vchan config when the DMA transfer direction is
> configured as RTE_DMA_DIR_MEM_TO_DEV.
>
> Signed-off-by: Amit Prakash Shukla
> Acked-by: Morten Brørup
> Acked-by: Anoob Joseph
> ---
> lib/dmadev/rte_dmadev.h | 27 +++
> 1 file changed, 27 insertions(+)
>
> diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
> index b157ab7600..f7a6af2528 100644
> --- a/lib/dmadev/rte_dmadev.h
> +++ b/lib/dmadev/rte_dmadev.h
> @@ -278,6 +278,13 @@ int16_t rte_dma_next_dev(int16_t start_dev_id);
> #define RTE_DMA_CAPA_OPS_COPY_SG RTE_BIT64(33)
> /** Support fill operation. */
> #define RTE_DMA_CAPA_OPS_FILLRTE_BIT64(34)
> +/** Support for source buffer free for mem to dev transfer.
Support auto free source buffer once the M2D (memory-to-device) transfer
completed.
> + *
> + * @note Even though the DMA driver has this capability, it may not support
> all
> + * mempool drivers. If the mempool is not supported by the DMA driver,
> + * rte_dma_vchan_setup() will fail.
In addition to hardware support, there are requirements for buffer attribute
(e.g. only specific mempool support it).
> + **/
> +#define RTE_DMA_CAPA_MEM_TO_DEV_SOURCE_BUFFER_FREE RTE_BIT64(35)
1) this should follow RTE_DMA_CAPA_HANDLES_ERRORS, because it not new OPS.
2) the name is too long. how abort RTE_DMA_CAPA_AUTO_FREE_M2D_SBUF? I am not
sure, suggest get better name.
> /**@}*/
>
> /**
> @@ -581,6 +588,19 @@ struct rte_dma_vchan_conf {
>* @see struct rte_dma_port_param
>*/
> struct rte_dma_port_param dst_port;
> + /** Mempool from which source buffer is allocated. Mempool info is used
> + * for freeing source buffer by hardware when configured direction is
> + * RTE_DMA_DIR_MEM_TO_DEV. To free the source buffer by hardware,
> + * RTE_DMA_OP_FLAG_FREE_SBUF must be set while calling rte_dma_copy and
> + * rte_dma_copy_sg().
> + *
> + * @note If the mempool is not supported by the DMA device,
> + * rte_dma_vchan_setup() will fail.
> + *
> + * @see RTE_DMA_OP_FLAG_FREE_SBUF
> + */
> + struct rte_mempool *mem_to_dev_src_buf_pool;
> +
> };
Suggest add one extra struct e.g.
struct rte_dma_auto_free_param {
union {
struct rte_mempool *pool;
}
uint64_t reserved[2]; /**< Reserved for future fields. */
};
In the above conf, we could add a new field: struct rte_dma_auto_free_param
m2d_buf
>
> /**
> @@ -818,6 +838,13 @@ struct rte_dma_sge {
> * capability bit for this, driver should not return error if this flag was
> set.
> */
> #define RTE_DMA_OP_FLAG_LLC RTE_BIT64(2)
> +/** Mem to dev source buffer free flag.
> + * Used for freeing source DMA buffer by hardware when the transfer
> direction is
> + * configured as RTE_DMA_DIR_MEM_TO_DEV.
> + *
> + * @see struct rte_dma_vchan_conf::mem_to_dev_src_buf_pool
> + */
> +#define RTE_DMA_OP_FLAG_FREE_SBUFRTE_BIT64(3)
Suggest RTE_DMA_OP_FLAG_AUTO_FREE_SBUF
> /**@}*/
>
> /**
>
The S in SBUF seem useless, because it should not auto free dstbuf in logically.
Maybe we should direct use auto-free (just like silent)
Re: [PATCH v3 2/2] test/dma: add source buffer offload free test
Hi Amit, On 2023/9/28 19:50, Amit Prakash Shukla wrote: > Add a test case to validate the functionality of drivers' dma > source buffer offload free. As part of dmadev_autotest, test case > will be executed only if the driver supports source buffer offload > free and if the test is exported by env variable DPDK_ADD_DMA_TEST. Why should under control by the env variable? > > Signed-off-by: Amit Prakash Shukla > --- > app/test/test_dmadev.c | 166 - > 1 file changed, 165 insertions(+), 1 deletion(-) > ...
Re: [PATCH v2 1/8] ethdev: add member notification for bonding port
On Sat, 7 Oct 2023 09:34:33 +0800
Chaoyong He wrote:
> diff --git a/drivers/net/bonding/eth_bond_private.h
> b/drivers/net/bonding/eth_bond_private.h
> index e688894210..1344f8c002 100644
> --- a/drivers/net/bonding/eth_bond_private.h
> +++ b/drivers/net/bonding/eth_bond_private.h
> @@ -186,6 +186,8 @@ struct bond_dev_private {
>
> void *vlan_filter_bmpmem; /* enabled vlan filter bitmap */
> struct rte_bitmap *vlan_filter_bmp;
> +
> + bool notify_member; /**< Enable member notification of bonding port. */
> };
>
> extern const struct eth_dev_ops default_dev_ops;
There are holes in existing data structure, use one of them for your new flag.
RE: [PATCH v4] app/testpmd: enable cli for programmable action
> -Original Message- > From: Zhang, Qi Z > Sent: Saturday, October 7, 2023 11:48 AM > To: Singh, Aman Deep ; Zhang, Yuying > > Cc: dev@dpdk.org; Dumitrescu, Cristian ; > or...@nvidia.com; ferruh.yi...@amd.com; Zhang, Qi Z > Subject: [PATCH v4] app/testpmd: enable cli for programmable action > > Parsing command line for rte_flow_action_prog. > > Syntax: > > "prog name [arguments \ >... end]" > > Use parse_string0 to parse name string. > Use parse_hex to parse hex string. > Use struct action_prog_data to store parsed result. > > Example: > > Action with 2 arguments: > > "prog name action0 arguments field0 03FF field1 55AA end" > > Action without argument: > > "prog name action1" > > Signed-off-by: Qi Zhang > --- > > v4: > - be more generous on the max size of name and value. Acked-by: Cristian Dumitrescu
Re: Technical board meeting agenda for 2023-09-20
Hi TB, On 2023/9/19 4:20, Maxime Coquelin wrote: > Dear DPDK community, > > Following topics are planned to be discussed at the next Technical board > meeting, which will take place on Sept. 20th @3PM UTC: > 1- Memarea library inclusion Sorry to miss this meeting. Could you help rescheduling on the new TB meeting and make a final decision for this library ? Thanks > 2- Power management brainstorming > 3- Bugzilla maintenance: request for volunteers > 4- Process to add new drivers > > The order the topics will be discussed may change based on their > priority/urgency. Some topics might have to be postponed to the > following meeting if time does not allow to cover them. > > If time permits, below recurring items will be checked: > - Security process > - Community Lab > - Doc maintenance > - Bugzilla status > - Examples to drop or move > > .
RE: [PATCH v2 1/8] ethdev: add member notification for bonding port
> Chaoyong He wrote:
>
> > diff --git a/drivers/net/bonding/eth_bond_private.h
> b/drivers/net/bonding/eth_bond_private.h
> > index e688894210..1344f8c002 100644
> > --- a/drivers/net/bonding/eth_bond_private.h
> > +++ b/drivers/net/bonding/eth_bond_private.h
> > @@ -186,6 +186,8 @@ struct bond_dev_private {
> >
> > void *vlan_filter_bmpmem; /* enabled vlan filter bitmap
> */
> > struct rte_bitmap *vlan_filter_bmp;
> > +
> > + bool notify_member; /**< Enable member notification of bonding
> port. */
> > };
> >
> > extern const struct eth_dev_ops default_dev_ops;
>
> There are holes in existing data structure, use one of them for your new flag.
Okay, I will do that in the next version, thanks!
Re: [PATCH 1/4] dmadev: add function to get list of device identifiers
Hi Gowrishankar,
This could create a help function in test, just like:
func() {
RTE_DMA_FOREACH_DEV(i) {
rte_dma_info_get(i, &dev_info);
if (strncmp(dev_info->dev_name, xxx)
...
}
}
If some application (not test) should pick some specific device, I suggest
add more general API, e.g.
typedef int (*rte_dma_filter_fn)(struct rte_dma_info *dev_info, void *param);
uint16_t
rte_dma_get_devs_by_filter(rte_dma_filter_fn fn, void *param, uint16_t
*dev_ids, uint16_t nb_ids) {
RTE_DMA_FOREACH_DEV(i) {
rte_dma_info_get(i, &dev_info);
if (fn(&dev_info, param) == 0) {
// add to out list
}
}
}
So we could filter special name-prefix/capability/multi-vchans
Thanks.
On 2023/8/10 20:21, Gowrishankar Muthukrishnan wrote:
> Add a function to get list of device identifiers for a given driver
> name.
>
> Signed-off-by: Gowrishankar Muthukrishnan
> ---
> lib/dmadev/rte_dmadev.c | 20
> lib/dmadev/rte_dmadev.h | 21 +
> lib/dmadev/version.map | 1 +
> 3 files changed, 42 insertions(+)
>
> diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
> index 8c095e1f35..f2a106564d 100644
> --- a/lib/dmadev/rte_dmadev.c
> +++ b/lib/dmadev/rte_dmadev.c
> @@ -388,6 +388,26 @@ rte_dma_get_dev_id_by_name(const char *name)
> return dev->data->dev_id;
> }
>
> +uint8_t
> +rte_dma_get_dev_list_by_driver(const char *name, int16_t *devs, uint8_t
> nb_devs)
> +{
> + uint8_t i, count = 0;
> +
> + if (name == NULL)
> + return count;
> +
> + for (i = 0; i < dma_devices_max && count < nb_devs; i++) {
> + if (rte_dma_devices[i].state == RTE_DMA_DEV_UNUSED)
> + continue;
> +
> + if (strncmp(rte_dma_devices[i].device->driver->name,
> + name, strlen(name) + 1) == 0)
> + devs[count++] = i;
> + }
> +
> + return count;
> +}
> +
> bool
> rte_dma_is_valid(int16_t dev_id)
> {
> diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
> index e61d71959e..689062a686 100644
> --- a/lib/dmadev/rte_dmadev.h
> +++ b/lib/dmadev/rte_dmadev.h
> @@ -191,6 +191,27 @@ int rte_dma_dev_max(size_t dev_max);
> __rte_experimental
> int rte_dma_get_dev_id_by_name(const char *name);
>
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change without prior notice.
> + *
> + * Get the list of device identifiers for the DMA driver.
> + *
> + * @param name
> + * DMA driver name.
> + * @param devs
> + * Output devices identifiers.
> + * @param nb_devs
> + * Maximal number of devices.
> + *
> + * @return
> + * Returns number of device identifiers.
> + */
> +__rte_experimental
> +uint8_t rte_dma_get_dev_list_by_driver(const char *name,
> +int16_t *devs,
> +uint8_t nb_devs);
> +
> /**
> * @warning
> * @b EXPERIMENTAL: this API may change without prior notice.
> diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map
> index 7031d6b335..b4d56b41a0 100644
> --- a/lib/dmadev/version.map
> +++ b/lib/dmadev/version.map
> @@ -7,6 +7,7 @@ EXPERIMENTAL {
> rte_dma_dev_max;
> rte_dma_dump;
> rte_dma_get_dev_id_by_name;
> + rte_dma_get_dev_list_by_driver;
> rte_dma_info_get;
> rte_dma_is_valid;
> rte_dma_next_dev;
>
Re: [PATCH] test/dma: add test skip status
Hi Gowrishankar,
It was already support in test framework (unit_test_suite), I suggest not
invent.
Could you help refactoring the test_dmadev (use the test framework) ?
PS: could refer test_fbarray.c
Thanks.
On 2023/8/10 19:59, Gowrishankar Muthukrishnan wrote:
> Add status on skipped tests.
>
> Signed-off-by: Gowrishankar Muthukrishnan
> ---
> app/test/test_dmadev_api.c | 26 +++---
> 1 file changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c
> index 4a181af90a..a1646472b0 100644
> --- a/app/test/test_dmadev_api.c
> +++ b/app/test/test_dmadev_api.c
> @@ -9,6 +9,8 @@
> #include
> #include
>
> +#include "test.h"
> +
> extern int test_dma_api(uint16_t dev_id);
>
> #define DMA_TEST_API_RUN(test) \
> @@ -17,9 +19,6 @@ extern int test_dma_api(uint16_t dev_id);
> #define TEST_MEMCPY_SIZE 1024
> #define TEST_WAIT_US_VAL 5
>
> -#define TEST_SUCCESS 0
> -#define TEST_FAILED -1
> -
> static int16_t test_dev_id;
> static int16_t invalid_dev_id;
>
> @@ -29,6 +28,7 @@ static char *dst;
> static int total;
> static int passed;
> static int failed;
> +static int skipped;
>
> static int
> testsuite_setup(int16_t dev_id)
> @@ -49,6 +49,7 @@ testsuite_setup(int16_t dev_id)
> total = 0;
> passed = 0;
> failed = 0;
> + skipped = 0;
>
> /* Set dmadev log level to critical to suppress unnecessary output
>* during API tests.
> @@ -78,12 +79,22 @@ testsuite_run_test(int (*test)(void), const char *name)
>
> if (test) {
> ret = test();
> - if (ret < 0) {
> - failed++;
> - printf("%s Failed\n", name);
> - } else {
> + switch (ret) {
> + case TEST_SUCCESS:
> passed++;
> printf("%s Passed\n", name);
> + break;
> + case TEST_FAILED:
> + failed++;
> + printf("%s Failed\n", name);
> + break;
> + case TEST_SKIPPED:
> + skipped++;
> + printf("%s Skipped\n", name);
> + break;
> + default:
> + printf("Invalid test status\n");
> + break;
> }
> }
>
> @@ -566,6 +577,7 @@ test_dma_api(uint16_t dev_id)
> printf("Total tests : %d\n", total);
> printf("Passed: %d\n", passed);
> printf("Failed: %d\n", failed);
> + printf("Skipped : %d\n", skipped);
>
> if (failed)
> return -1;
>
[PATCH v3 0/8] Enhance the bond framework to support offload
This patch series try to enhance the bond framework to support the offload feature better: * Add new API to make the member port can access some information of the bond port which belongs. * Add new API to get the result of whether bond port is created by the member port. * Add two command line argument to control if enable member port notification and dedicated queue features. * Add logic to support add ports which share the same PCI address into bond port. * Also modify the testpmd application to test the new APIs and logics added by this patch series. --- v2: * Fix compile error on github-robot by removing the redundancy function declaration in the header file. v3: * Use the hole in the structure for the new added flag data field. --- Long Wu (8): ethdev: add member notification for bonding port ethdev: add API to get hardware creation of bonding port net/bonding: modify interface comment format net/bonding: add bonding port arguments net/bonding: support add port by data name net/bonding: create new rte flow header file net/bonding: support checking valid bonding port ID net/bonding: add commands for bonding port notification .../link_bonding_poll_mode_drv_lib.rst| 19 ++ drivers/net/bonding/bonding_testpmd.c | 128 ++ drivers/net/bonding/eth_bond_8023ad_private.h | 52 ++-- drivers/net/bonding/eth_bond_private.h| 24 +- drivers/net/bonding/rte_eth_bond.h| 238 +- drivers/net/bonding/rte_eth_bond_8023ad.h | 76 -- drivers/net/bonding/rte_eth_bond_alb.h| 34 ++- drivers/net/bonding/rte_eth_bond_api.c| 123 + drivers/net/bonding/rte_eth_bond_args.c | 47 drivers/net/bonding/rte_eth_bond_flow.c | 1 + drivers/net/bonding/rte_eth_bond_flow.h | 22 ++ drivers/net/bonding/rte_eth_bond_pmd.c| 89 ++- drivers/net/bonding/version.map | 5 + lib/ethdev/ethdev_driver.h| 38 +++ 14 files changed, 766 insertions(+), 130 deletions(-) create mode 100644 drivers/net/bonding/rte_eth_bond_flow.h -- 2.39.1
[PATCH v3 1/8] ethdev: add member notification for bonding port
From: Long Wu
Bonding PMD does not let member ports know the bonding port's
information, like how many member ports the bonding port has,
what mode the bonding port is in and so on.
Add the notification interface for bonding port to let member
port know it is added to a bonding port and what the bonding
port's configuration is. If so the member ports have chance to
achieve its bond-flow-offlod or other private bonding functions.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/eth_bond_private.h | 1 +
drivers/net/bonding/rte_eth_bond.h | 46
drivers/net/bonding/rte_eth_bond_api.c | 73 ++
drivers/net/bonding/rte_eth_bond_pmd.c | 27 --
drivers/net/bonding/version.map| 3 ++
lib/ethdev/ethdev_driver.h | 18 +++
6 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/eth_bond_private.h
b/drivers/net/bonding/eth_bond_private.h
index e688894210..f69e85c199 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -180,6 +180,7 @@ struct bond_dev_private {
uint8_t member_update_idx;
bool kvargs_processing_is_done;
+ bool notify_member; /**< Enable member notification of bonding port. */
uint32_t candidate_max_rx_pktlen;
uint32_t max_rx_pktlen;
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index f10165f2c6..737beca446 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -351,6 +351,52 @@ rte_eth_bond_link_up_prop_delay_set(uint16_t
bonding_port_id,
int
rte_eth_bond_link_up_prop_delay_get(uint16_t bonding_port_id);
+/**
+ * Set the flag of whether bonding port notifies member ports.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param notify_member
+ * Flag of whether bonding port notifies member ports.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_member_flag_set(uint16_t bonding_port_id, bool
notify_member);
+
+/**
+ * Get the flag of whether bonding port notifies member ports.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param notify_member
+ * Flag of whether bonding port notifies member ports.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_member_flag_get(uint16_t bonding_port_id, bool
*notify_member);
+
+/**
+ * Notify the member ports of bonding port's information.
+ *
+ * This interface is called in the following functions:
+ * - bond_ethdev_lsc_event_callback()
+ * - bond_ethdev_configure()
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_members(uint16_t bonding_port_id);
#ifdef __cplusplus
}
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 99e496556a..48c1d050fd 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -627,6 +627,17 @@ __eth_bond_member_add_lock_free(uint16_t bonding_port_id,
uint16_t member_port_i
member_vlan_filter_set(bonding_port_id, member_port_id);
+ if (internals->notify_member &&
+ *member_eth_dev->dev_ops->bond_notify_member != NULL) {
+ ret =
member_eth_dev->dev_ops->bond_notify_member(member_eth_dev,
+ bonding_eth_dev);
+ if (ret < 0) {
+ RTE_BOND_LOG(ERR, "Add member (port %u) notify failed!",
+ member_port_id);
+ return -1;
+ }
+ }
+
return 0;
}
@@ -733,6 +744,10 @@ __eth_bond_member_remove_lock_free(uint16_t
bonding_port_id,
member_eth_dev = &rte_eth_devices[member_port_id];
member_remove(internals, member_eth_dev);
member_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDING_MEMBER);
+ if (internals->notify_member &&
+ *member_eth_dev->dev_ops->bond_notify_member != NULL)
+ member_eth_dev->dev_ops->bond_notify_member(member_eth_dev,
+ bonding_eth_dev);
/* first member in the active list will be the primary by default,
* otherwise use first device in list */
@@ -1098,3 +1113,61 @@ rte_eth_bond_link_up_prop_delay_get(uint16_t
bonding_port_id)
return internals->link_up_delay_ms;
}
+
+int
+rte_eth_bond_notify_member_flag_set(uint16_t bonding_port_id, bool
notify_member)
+{
+ struct bond_dev_private *internals;
+
+ if (valid_bonding_port_id(bonding_port_id) != 0)
+ return -EINVAL;
+
+ internals = rte_eth_devices[bonding_port_id].data->dev_private;
+
+ internals->notify_mem
[PATCH v3 2/8] ethdev: add API to get hardware creation of bonding port
From: Long Wu
After bonding port notification, member port hardware may create the
bonding port. We want to get the result of creatition, so we add this
API to do the getting action.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/rte_eth_bond.h | 15 ++
drivers/net/bonding/rte_eth_bond_api.c | 28 ++
drivers/net/bonding/version.map| 1 +
lib/ethdev/ethdev_driver.h | 20 ++
4 files changed, 64 insertions(+)
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index 737beca446..6be5e46deb 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -398,6 +398,21 @@ __rte_experimental
int
rte_eth_bond_notify_members(uint16_t bonding_port_id);
+/**
+ * Get the status of specified bonding port created by member port hardware.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param member_port_id
+ * Port ID of member device.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_hw_create_get(uint16_t bonding_port_id, uint16_t member_port_id);
+
#ifdef __cplusplus
}
#endif
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 48c1d050fd..0be580b19b 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -1171,3 +1171,31 @@ rte_eth_bond_notify_members(uint16_t bonding_port_id)
return 0;
}
+
+int
+rte_eth_bond_hw_create_get(uint16_t bonding_port_id, uint16_t member_port_id)
+{
+ uint32_t i;
+ struct rte_eth_dev *bonding_dev;
+ struct rte_eth_dev *member_dev;
+ struct bond_dev_private *internals;
+
+ if (valid_bonding_port_id(bonding_port_id) != 0)
+ return -EINVAL;
+
+ bonding_dev = &rte_eth_devices[bonding_port_id];
+ internals = bonding_dev->data->dev_private;
+ for (i = 0; i < internals->member_count; i++) {
+ if (internals->members[i].port_id == member_port_id)
+ break;
+ }
+
+ if (i == internals->member_count)
+ return -EINVAL;
+
+ member_dev = &rte_eth_devices[member_port_id];
+ if (*member_dev->dev_ops->bond_hw_create_get == NULL)
+ return -ENOTSUP;
+
+ return member_dev->dev_ops->bond_hw_create_get(member_dev, bonding_dev);
+}
diff --git a/drivers/net/bonding/version.map b/drivers/net/bonding/version.map
index 3bd5e8ad11..3cfff51269 100644
--- a/drivers/net/bonding/version.map
+++ b/drivers/net/bonding/version.map
@@ -32,6 +32,7 @@ EXPERIMENTAL {
global:
rte_eth_bond_8023ad_member_info;
rte_eth_bond_active_members_get;
+ rte_eth_bond_hw_create_get;
rte_eth_bond_member_add;
rte_eth_bond_member_remove;
rte_eth_bond_members_get;
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index f626f971e5..18ff5db969 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -1231,6 +1231,21 @@ typedef int (*eth_map_aggr_tx_affinity_t)(struct
rte_eth_dev *dev, uint16_t tx_q
typedef int (*eth_bond_notify_member)(struct rte_eth_dev *dev,
struct rte_eth_dev *bonding_dev);
+/**
+ * @internal
+ * Get the status of specified bonding port created by member port hardware.
+ *
+ * @param dev
+ * Member port (ethdev) handle.
+ * @param bonding_dev
+ * Bonding port (ethdev) handle.
+ *
+ * @return
+ * Negative on error, 0 on success.
+ */
+typedef int (*eth_bond_hw_create_get)(struct rte_eth_dev *dev,
+ struct rte_eth_dev *bonding_dev);
+
/**
* @internal A structure containing the functions exported by an Ethernet
driver.
*/
@@ -1473,6 +1488,11 @@ struct eth_dev_ops {
/** Notify the member port of bonding port information */
eth_bond_notify_member bond_notify_member;
+ /**
+* Get the status of whether bonding port is successfully created by
+* the member port hardware.
+*/
+ eth_bond_hw_create_get bond_hw_create_get;
};
/**
--
2.39.1
[PATCH v3 3/8] net/bonding: modify interface comment format
From: Long Wu
Most of the previous interface comment format does not meet the
current standards and were not uniform.
Modify them to meet current standards.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/eth_bond_8023ad_private.h | 52 +++---
drivers/net/bonding/rte_eth_bond.h| 150 +++---
drivers/net/bonding/rte_eth_bond_8023ad.h | 76 ++---
drivers/net/bonding/rte_eth_bond_alb.h| 34 ++--
4 files changed, 199 insertions(+), 113 deletions(-)
diff --git a/drivers/net/bonding/eth_bond_8023ad_private.h
b/drivers/net/bonding/eth_bond_8023ad_private.h
index ab7d15f81a..29ee8700c3 100644
--- a/drivers/net/bonding/eth_bond_8023ad_private.h
+++ b/drivers/net/bonding/eth_bond_8023ad_private.h
@@ -196,10 +196,13 @@ struct bond_dev_private;
*
* Set mode 4 configuration of bonding interface.
*
- * @pre Bonding interface must be stopped.
+ * @pre
+ * Bonding interface must be stopped.
*
- * @param dev Bonding interface
- * @param conf new configuration. If NULL set default configuration.
+ * @param dev
+ * Bonding interface
+ * @param conf
+ * new configuration. If NULL set default configuration.
*/
void
bond_mode_8023ad_setup(struct rte_eth_dev *dev,
@@ -210,9 +213,11 @@ bond_mode_8023ad_setup(struct rte_eth_dev *dev,
*
* Enables 802.1AX mode and all active members on bonding interface.
*
- * @param dev Bonding interface
+ * @param dev
+ * Bonding interface
+ *
* @return
- * 0 on success, negative value otherwise.
+ * 0 on success, negative value otherwise.
*/
int
bond_mode_8023ad_enable(struct rte_eth_dev *dev);
@@ -222,7 +227,8 @@ bond_mode_8023ad_enable(struct rte_eth_dev *dev);
*
* Disables 802.1AX mode of the bonding interface and members.
*
- * @param dev Bonding interface
+ * @param dev
+ * Bonding interface
* @return
* 0 on success, negative value otherwise.
*/
@@ -232,7 +238,8 @@ int bond_mode_8023ad_disable(struct rte_eth_dev *dev);
* @internal
*
* Starts 802.3AX state machines management logic.
- * @param dev Bonding interface
+ * @param dev
+ * Bonding interface
* @return
* 0 if machines was started, 1 if machines was already running,
* negative value otherwise.
@@ -244,7 +251,8 @@ bond_mode_8023ad_start(struct rte_eth_dev *dev);
* @internal
*
* Stops 802.3AX state machines management logic.
- * @param dev Bonding interface
+ * @param dev
+ * Bonding interface
* @return
* 0 if this call stopped state machines, -ENOENT if alarm was not set.
*/
@@ -255,9 +263,12 @@ bond_mode_8023ad_stop(struct rte_eth_dev *dev);
* @internal
*
* Passes given slow packet to state machines management logic.
- * @param internals Bonding device private data.
- * @param member_id Member port id.
- * @param slot_pkt Slow packet.
+ * @param internals
+ * Bonding device private data.
+ * @param member_id
+ * Member port id.
+ * @param slot_pkt
+ * Slow packet.
*/
void
bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals,
@@ -268,11 +279,13 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private
*internals,
*
* Appends given member used member
*
- * @param dev Bonding interface.
- * @param port_id Member port ID to be added
+ * @param dev
+ * Bonding interface.
+ * @param port_id
+ * Member port ID to be added
*
* @return
- * 0 on success, negative value otherwise.
+ * 0 on success, negative value otherwise.
*/
void
bond_mode_8023ad_activate_member(struct rte_eth_dev *dev, uint16_t port_id);
@@ -282,18 +295,21 @@ bond_mode_8023ad_activate_member(struct rte_eth_dev *dev,
uint16_t port_id);
*
* Denitializes and removes given member from 802.1AX mode.
*
- * @param dev Bonding interface.
- * @param member_num Position of member in active_members array
+ * @param dev
+ * Bonding interface.
+ * @param member_num
+ * Position of member in active_members array
*
* @return
- * 0 on success, negative value otherwise.
+ * 0 on success, negative value otherwise.
*/
int
bond_mode_8023ad_deactivate_member(struct rte_eth_dev *dev, uint16_t
member_pos);
/**
* Updates state when MAC was changed on bonding device or one of its members.
- * @param bond_dev Bonding device
+ * @param bond_dev
+ * Bonding device
*/
void
bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev);
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index 6be5e46deb..28aa341d2f 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -95,12 +95,15 @@ extern "C" {
/**
* Create a bonding rte_eth_dev device
*
- * @param name Name of new link bonding device.
- * @param mode Mode to initialize bonding device in.
- * @param socket_idSocket Id on which to allocate eth_dev
resources.
+ * @param name
+ * Name of new link bonding device.
+ * @param mode
+ * Mode to in
[PATCH v3 4/8] net/bonding: add bonding port arguments
From: Long Wu
Include the following new arguments for bonding ports:
- "notify_member" to enable/disable member notification.
- "dedicated_queue" to enable/disable dedicated queue.
Add these two arguments in initial argument.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/eth_bond_private.h | 10
drivers/net/bonding/rte_eth_bond.h | 14 ++
drivers/net/bonding/rte_eth_bond_api.c | 14 ++
drivers/net/bonding/rte_eth_bond_args.c | 44 ++
drivers/net/bonding/rte_eth_bond_pmd.c | 61 -
5 files changed, 142 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/eth_bond_private.h
b/drivers/net/bonding/eth_bond_private.h
index f69e85c199..f9603a0f6b 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -28,6 +28,8 @@
#define PMD_BOND_LSC_POLL_PERIOD_KVARG ("lsc_poll_period_ms")
#define PMD_BOND_LINK_UP_PROP_DELAY_KVARG ("up_delay")
#define PMD_BOND_LINK_DOWN_PROP_DELAY_KVARG("down_delay")
+#define PMD_BOND_NOTIFY_MEMBER_KVARG ("notify_member")
+#define PMD_BOND_DEDICATED_QUEUE_KVARG ("dedicated_queue")
#define PMD_BOND_XMIT_POLICY_LAYER2_KVARG ("l2")
#define PMD_BOND_XMIT_POLICY_LAYER23_KVARG ("l23")
@@ -319,6 +321,14 @@ int
bond_ethdev_parse_time_ms_kvarg(const char *key,
const char *value, void *extra_args);
+int
+bond_ethdev_parse_notify_member_kvarg(const char *key __rte_unused,
+ const char *value, void *extra_args);
+
+int
+bond_ethdev_parse_dedicated_queue_kvarg(const char *key __rte_unused,
+ const char *value, void *extra_args);
+
void
bond_tlb_disable(struct bond_dev_private *internals);
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index 28aa341d2f..3f427b6bab 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -385,6 +385,20 @@ rte_eth_bond_link_up_prop_delay_set(uint16_t
bonding_port_id,
int
rte_eth_bond_link_up_prop_delay_get(uint16_t bonding_port_id);
+/**
+ * Set the flag that whether bonding device enable dedicated queue.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param queue_flag
+ * The flag of enable bond dedicated queue
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+int
+rte_eth_bond_dedicated_queue_flag_set(uint16_t bonding_port_id, bool
queue_flag);
+
/**
* Set the flag of whether bonding port notifies member ports.
*
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 0be580b19b..a042f05a4c 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -1114,6 +1114,20 @@ rte_eth_bond_link_up_prop_delay_get(uint16_t
bonding_port_id)
return internals->link_up_delay_ms;
}
+int
+rte_eth_bond_dedicated_queue_flag_set(uint16_t bonding_port_id, bool
queue_flag)
+{
+ struct bond_dev_private *internals;
+
+ if (valid_bonding_port_id(bonding_port_id) != 0)
+ return -1;
+
+ internals = rte_eth_devices[bonding_port_id].data->dev_private;
+ internals->mode4.dedicated_queues.enabled = queue_flag;
+
+ return 0;
+}
+
int
rte_eth_bond_notify_member_flag_set(uint16_t bonding_port_id, bool
notify_member)
{
diff --git a/drivers/net/bonding/rte_eth_bond_args.c
b/drivers/net/bonding/rte_eth_bond_args.c
index bdec5d61d4..8a3e4656ef 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -20,6 +20,8 @@ const char *pmd_bond_init_valid_arguments[] = {
PMD_BOND_MAC_ADDR_KVARG,
PMD_BOND_AGG_MODE_KVARG,
RTE_DEVARGS_KEY_DRIVER,
+ PMD_BOND_NOTIFY_MEMBER_KVARG,
+ PMD_BOND_DEDICATED_QUEUE_KVARG,
NULL
};
@@ -297,3 +299,45 @@ bond_ethdev_parse_time_ms_kvarg(const char *key
__rte_unused,
return 0;
}
+
+int
+bond_ethdev_parse_notify_member_kvarg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ bool *notify_member;
+
+ if (value == NULL || extra_args == NULL)
+ return -1;
+
+ notify_member = extra_args;
+
+ if (strcmp("enable", value) == 0)
+ *notify_member = true;
+ else if (strcmp("disable", value) == 0)
+ *notify_member = false;
+ else
+ return -1;
+
+ return 0;
+}
+
+int
+bond_ethdev_parse_dedicated_queue_kvarg(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ bool *dedicated_queue;
+
+ if (value == NULL || extra_args == NULL)
+ return -1;
+
+ dedicated_queue = extra_args;
+
+ if (strcmp("enable", value) == 0)
+ *dedicated_queue = true;
+ else if (strcmp("disable", value) == 0)
+ *dedicated_queue = false;
+ else
+
[PATCH v3 5/8] net/bonding: support add port by data name
From: Long Wu Several ports may share the same PCI address, like nfp representor. So we cannot add this type of ports to bonding port by "--vdev" argument in dpdk-testpmd. But the port's data name is unique between them, we include an option to add such ports to the bonding port. After adding this feature, we can create a bonding port that member port is this type of port by "--vdev" in dpdk-testpmd start command. For example: dpdk-testpmd -l 2-10 -s 0x8 -a ca:00.0,representor=[0-2] --vdev 'net_bonding0,member=flower_repr_p0,member=flower_repr_p1, mode=4,socket_id=1,xmit_policy=l34' -- -i Note: 1. "ca:00.0" is nfp 4000 card. 2. "flower_repr_p0" and "flower_repr_p1" are nfp phy representor's data name. Signed-off-by: Long Wu Reviewed-by: James Hershaw Reviewed-by: Chaoyong He --- drivers/net/bonding/rte_eth_bond_args.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index 8a3e4656ef..b320eb3038 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -70,6 +70,9 @@ find_port_id_by_dev_name(const char *name) if (strcmp(rte_eth_devices[i].device->name, name) == 0) return i; + + if (strcmp(rte_eth_devices[i].data->name, name) == 0) + return i; } return -1; } -- 2.39.1
[PATCH v3 7/8] net/bonding: support checking valid bonding port ID
From: Long Wu
Add API to support checking if the port id is a bonding
port id.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/rte_eth_bond.h | 13 +
drivers/net/bonding/rte_eth_bond_api.c | 7 +++
drivers/net/bonding/version.map| 1 +
3 files changed, 21 insertions(+)
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index 3f427b6bab..e8152a155f 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -461,6 +461,19 @@ __rte_experimental
int
rte_eth_bond_hw_create_get(uint16_t bonding_port_id, uint16_t member_port_id);
+/**
+ * Check whether bonding port id is valid.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_valid_bonding_port_id(uint16_t bonding_port_id);
+
#ifdef __cplusplus
}
#endif
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 0113dfdc16..80d71529cc 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -1214,3 +1214,10 @@ rte_eth_bond_hw_create_get(uint16_t bonding_port_id,
uint16_t member_port_id)
return member_dev->dev_ops->bond_hw_create_get(member_dev, bonding_dev);
}
+
+
+int
+rte_eth_bond_valid_bonding_port_id(uint16_t port_id)
+{
+ return valid_bonding_port_id(port_id);
+}
diff --git a/drivers/net/bonding/version.map b/drivers/net/bonding/version.map
index 3cfff51269..bf5e50521e 100644
--- a/drivers/net/bonding/version.map
+++ b/drivers/net/bonding/version.map
@@ -39,4 +39,5 @@ EXPERIMENTAL {
rte_eth_bond_notify_member_flag_get;
rte_eth_bond_notify_member_flag_set;
rte_eth_bond_notify_members;
+ rte_eth_bond_valid_bonding_port_id;
};
--
2.39.1
[PATCH v3 6/8] net/bonding: create new rte flow header file
From: Long Wu
Move the flow code to a new head file to make flow related
code more clean and make the code architecture more reasonable
in the future. There is no functional change, just moving
verbatim code around.
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/eth_bond_private.h | 13 -
drivers/net/bonding/rte_eth_bond_api.c | 1 +
drivers/net/bonding/rte_eth_bond_flow.c | 1 +
drivers/net/bonding/rte_eth_bond_flow.h | 22 ++
drivers/net/bonding/rte_eth_bond_pmd.c | 1 +
5 files changed, 25 insertions(+), 13 deletions(-)
create mode 100644 drivers/net/bonding/rte_eth_bond_flow.h
diff --git a/drivers/net/bonding/eth_bond_private.h
b/drivers/net/bonding/eth_bond_private.h
index f9603a0f6b..4373465d8d 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -9,10 +9,8 @@
#include
#include
-#include
#include
#include
-#include
#include "rte_eth_bond.h"
#include "eth_bond_8023ad_private.h"
@@ -47,8 +45,6 @@ extern const char *pmd_bond_init_valid_arguments[];
extern struct rte_vdev_driver pmd_bond_drv;
-extern const struct rte_flow_ops bond_flow_ops;
-
/** Port Queue Mapping Structure */
struct bond_rx_queue {
uint16_t queue_id;
@@ -94,15 +90,6 @@ struct bond_member_details {
uint16_t reta_size;
};
-struct rte_flow {
- TAILQ_ENTRY(rte_flow) next;
- /* Members flows */
- struct rte_flow *flows[RTE_MAX_ETHPORTS];
- /* Flow description for synchronization */
- struct rte_flow_conv_rule rule;
- uint8_t rule_data[];
-};
-
typedef void (*burst_xmit_hash_t)(struct rte_mbuf **buf, uint16_t nb_pkts,
uint16_t member_count, uint16_t *members);
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index a042f05a4c..0113dfdc16 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -12,6 +12,7 @@
#include
#include "rte_eth_bond.h"
+#include "rte_eth_bond_flow.h"
#include "eth_bond_private.h"
#include "eth_bond_8023ad_private.h"
diff --git a/drivers/net/bonding/rte_eth_bond_flow.c
b/drivers/net/bonding/rte_eth_bond_flow.c
index 71a91675f7..e6c7ce5362 100644
--- a/drivers/net/bonding/rte_eth_bond_flow.c
+++ b/drivers/net/bonding/rte_eth_bond_flow.c
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2018 Mellanox Technologies, Ltd
*/
+#include "rte_eth_bond_flow.h"
#include
#include
diff --git a/drivers/net/bonding/rte_eth_bond_flow.h
b/drivers/net/bonding/rte_eth_bond_flow.h
new file mode 100644
index 00..7394e0e2e1
--- /dev/null
+++ b/drivers/net/bonding/rte_eth_bond_flow.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Corigine, Inc.
+ */
+
+#ifndef _RTE_ETH_BOND_FLOW_H_
+#define _RTE_ETH_BOND_FLOW_H_
+
+#include
+#include
+
+extern const struct rte_flow_ops bond_flow_ops;
+
+struct rte_flow {
+ TAILQ_ENTRY(rte_flow) next;
+ struct rte_flow *flows[RTE_MAX_ETHPORTS];
+ /**< Member ports flows */
+ struct rte_flow_conv_rule rule;
+ /**< Flow description for synchronization */
+ uint8_t rule_data[];
+};
+
+#endif /* _RTE_ETH_BOND_FLOW_H_ */
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 1ebeb270c8..630afc3740 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -21,6 +21,7 @@
#include
#include "rte_eth_bond.h"
+#include "rte_eth_bond_flow.h"
#include "eth_bond_private.h"
#include "eth_bond_8023ad_private.h"
--
2.39.1
[PATCH v3 8/8] net/bonding: add commands for bonding port notification
From: Long Wu
Add some commands to support bonding port notification in
dpdk-testpmd.
1. We can enable the notification by command:
"set bonding notify_member (port_id) (enable|disable)"
2. If member port hardware try to create the bonding port after
notification we can get the status by command:
"get bonding member hardware create (member_port_id) (bonding_port_id)"
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
.../link_bonding_poll_mode_drv_lib.rst| 19 +++
drivers/net/bonding/bonding_testpmd.c | 128 ++
2 files changed, 147 insertions(+)
diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
index 60717a3587..9f6443ebd8 100644
--- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
+++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
@@ -637,3 +637,22 @@ in balance mode with a transmission policy of layer 2+3::
Members (3): [1 3 4]
Active Members (3): [1 3 4]
Primary: [3]
+
+set bonding notify_member
+~
+
+Set the notify member flag of bonding port::
+
+ testpmd> set bonding notify_member (port_id) (enable|disable)
+
+This command just set the flag of notification.
+If we enable it, bonding PMD will notify member ports when its some
+configurations changed. So member ports can do some private things, maybe
hardware
+bonding creation and etc.
+
+get bonding member hardware create
+~~
+
+Get the status of member port hardware creating the bonding port::
+
+ testpmd> get bonding member hardware create (member_port_id)
(bonding_port_id)
diff --git a/drivers/net/bonding/bonding_testpmd.c
b/drivers/net/bonding/bonding_testpmd.c
index 8fcd6cadd0..da7d9cc58f 100644
--- a/drivers/net/bonding/bonding_testpmd.c
+++ b/drivers/net/bonding/bonding_testpmd.c
@@ -692,6 +692,124 @@ static cmdline_parse_inst_t
cmd_set_bonding_agg_mode_policy = {
}
};
+struct cmd_set_bonding_notify_member_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t bonding;
+ cmdline_fixed_string_t notify_member;
+ uint16_t port_num;
+ cmdline_fixed_string_t mode;
+};
+
+static void
+cmd_set_bonding_notify_member_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl, __rte_unused void *data)
+{
+ struct cmd_set_bonding_notify_member_result *res = parsed_result;
+ bool notify_member = false;
+
+ if (strcmp(res->notify_member, "enable") == 0)
+ notify_member = true;
+ else if (strcmp(res->notify_member, "disable") == 0)
+ notify_member = false;
+
+ rte_eth_bond_notify_member_flag_set(res->port_num, notify_member);
+}
+
+static cmdline_parse_token_string_t cmd_set_bonding_notify_member_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_notify_member_result,
+ set, "set");
+static cmdline_parse_token_string_t cmd_set_bonding_notify_member_bonding =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_notify_member_result,
+ bonding, "bonding");
+static cmdline_parse_token_string_t cmd_set_bonding_notify_member =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_notify_member_result,
+ notify_member, "notify_member");
+static cmdline_parse_token_num_t cmd_set_bonding_notify_member_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_notify_member_result,
+ port_num, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_set_bonding_notify_member_mode_string =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_notify_member_result,
+ mode, "enable#disable");
+
+static cmdline_parse_inst_t cmd_set_bonding_notify_member_ports = {
+ .f = cmd_set_bonding_notify_member_parsed,
+ .data = NULL,
+ .help_str = "set bonding notify_member (port_id) (enable|disable)",
+ .tokens = {
+ (void *)&cmd_set_bonding_notify_member_set,
+ (void *)&cmd_set_bonding_notify_member_bonding,
+ (void *)&cmd_set_bonding_notify_member,
+ (void *)&cmd_set_bonding_notify_member_portnum,
+ (void *)&cmd_set_bonding_notify_member_mode_string,
+ NULL
+ }
+};
+
+struct cmd_get_bonding_member_hw_create_result {
+ cmdline_fixed_string_t get;
+ cmdline_fixed_string_t bonding;
+ cmdline_fixed_string_t member;
+ cmdline_fixed_string_t hardware;
+ cmdline_fixed_string_t create;
+ uint16_t member_port_id;
+ uint16_t bonding_port_id;
+};
+
+static void
+cmd_get_bonding_member_hw_create_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl, __rte_unused void *data)
+{
+ struct cmd_get_bonding_member_hw_create_result *res = parsed_result;
+ int ret;
+
+ ret = rte_eth_bond_hw_create_get(res->bonding_port_id,
res->member_port_id);
+
[PATCH v3 0/2] fix help string and add a new command
This series fix help string and add a new command. v2->v3 add 'mcast_addr add|remove' to help string and update the new command description. v1->v2 update order on help string Dengdui Huang (2): app/testpmd: fix help string app/testpmd: add flush all multicast MAC address command app/test-pmd/cmdline.c | 49 + app/test-pmd/config.c | 18 app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 +++ 4 files changed, 75 insertions(+) -- 2.33.0
[PATCH v3 1/2] app/testpmd: fix help string
Command help string is missing 'mcast_addr add|remove'.
This patch add it.
Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
addresses")
Cc: sta...@dpdk.org
Signed-off-by: Dengdui Huang
---
app/test-pmd/cmdline.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a0e97719b3..3165347a05 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -516,6 +516,12 @@ static void cmd_help_long_parsed(void *parsed_result,
"set allmulti (port_id|all) (on|off)\n"
"Set the allmulti mode on port_id, or all.\n\n"
+ "mcast_addr add (port_id) (mcast_addr)\n"
+ "Add a multicast MAC addresses on port_id.\n\n"
+
+ "mcast_addr remove (port_id) (mcast_addr)"
+ "Remove a multicast MAC address from port_id.\n\n"
+
"set flow_ctrl rx (on|off) tx (on|off) (high_water)"
" (low_water) (pause_time) (send_xon)
mac_ctrl_frame_fwd"
" (on|off) autoneg (on|off) (port_id)\n"
--
2.33.0
[PATCH v3 2/2] app/testpmd: add flush all multicast MAC address command
Add command to flush all multicast MAC address
Usage:
mcast_addr flush :
flush all multicast MAC address on port_id
Signed-off-by: Dengdui Huang
---
app/test-pmd/cmdline.c | 43 +
app/test-pmd/config.c | 18 +
app/test-pmd/testpmd.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7
4 files changed, 69 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 3165347a05..6404d06e8f 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -522,6 +522,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"mcast_addr remove (port_id) (mcast_addr)"
"Remove a multicast MAC address from port_id.\n\n"
+ "mcast_addr flush (port_id)\n"
+ "Flush all multicast MAC addresses on port_id.\n\n"
+
"set flow_ctrl rx (on|off) tx (on|off) (high_water)"
" (low_water) (pause_time) (send_xon)
mac_ctrl_frame_fwd"
" (on|off) autoneg (on|off) (port_id)\n"
@@ -8567,6 +8570,45 @@ static cmdline_parse_inst_t cmd_mcast_addr = {
},
};
+/* *** FLUSH MULTICAST MAC ADDRESS ON PORT *** */
+struct cmd_mcast_addr_flush_result {
+ cmdline_fixed_string_t mcast_addr_cmd;
+ cmdline_fixed_string_t what;
+ uint16_t port_num;
+};
+
+static void cmd_mcast_addr_flush_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_mcast_addr_flush_result *res = parsed_result;
+
+ mcast_addr_flush(res->port_num);
+}
+
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result,
+mcast_addr_cmd, "mcast_addr");
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_what =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
+"flush");
+static cmdline_parse_token_num_t cmd_mcast_addr_flush_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_mcast_addr_flush = {
+ .f = cmd_mcast_addr_flush_parsed,
+ .data = (void *)0,
+ .help_str = "mcast_addr flush : "
+ "flush all multicast MAC addresses on port_id",
+ .tokens = {
+ (void *)&cmd_mcast_addr_flush_cmd,
+ (void *)&cmd_mcast_addr_flush_what,
+ (void *)&cmd_mcast_addr_flush_portnum,
+ NULL,
+ },
+};
+
/* vf vlan anti spoof configuration */
/* Common result structure for vf vlan anti spoof */
@@ -12935,6 +12977,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
(cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
(cmdline_parse_inst_t *)&cmd_mcast_addr,
+ (cmdline_parse_inst_t *)&cmd_mcast_addr_flush,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 709864bb44..7034fa125b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6829,6 +6829,24 @@ mcast_addr_remove(portid_t port_id, struct
rte_ether_addr *mc_addr)
mcast_addr_pool_append(port, mc_addr);
}
+void
+mcast_addr_flush(portid_t port_id)
+{
+ int ret;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_eth_dev_set_mc_addr_list(port_id, NULL, 0);
+ if (ret != 0) {
+ fprintf(stderr,
+ "Failed to flush all multicast MAC addresses on port_id
%u\n",
+ port_id);
+ return;
+ }
+ mcast_addr_pool_destroy(port_id);
+}
+
void
port_dcb_info_display(portid_t port_id)
{
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index e236845a81..6457ac4c0a 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1181,6 +1181,7 @@ void show_mcast_macs(portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
void mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr);
void mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr);
+void mcast_addr_flush(portid_t port_id);
void port_dcb_info_display(portid_t port_id);
uint8_t *open_file(const char *file_path, uint32_t *size);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e6d218caaa..7a40980d6c 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1323,6 +1323,13 @@ filtered by port::
te
Re: [PATCH v1 1/3] dmadev: add inter-domain operations
Hi Anatoly, On 2023/8/12 0:14, Anatoly Burakov wrote: > Add a flag to indicate that a specific device supports inter-domain > operations, and add an API for inter-domain copy and fill. > > Inter-domain operation is an operation that is very similar to regular > DMA operation, except either source or destination addresses can be in a > different process's address space, indicated by source and destination > handle values. These values are currently meant to be provided by > private drivers' API's. > > This commit also adds a controller ID field into the DMA device API. > This is an arbitrary value that may not be implemented by hardware, but > it is meant to represent some kind of device hierarchy. > > Signed-off-by: Vladimir Medvedkin > Signed-off-by: Anatoly Burakov > --- ... > +__rte_experimental > +static inline int > +rte_dma_copy_inter_dom(int16_t dev_id, uint16_t vchan, rte_iova_t src, > + rte_iova_t dst, uint32_t length, uint16_t src_handle, > + uint16_t dst_handle, uint64_t flags) I would suggest add more general extension: rte_dma_copy*(int16_t dev_id, uint16_t vchan, rte_iova_t src, rte_iova_t dst, uint32_t length, uint64_t flags, void *param) The param only valid under some flags bits. As for this inter-domain extension: we could define inter-domain param struct. Whether add in current rte_dma_copy() API or add one new API, I think it mainly depend on performance impact of parameter transfer. Suggest more discuss for differnt platform and call specification. And last, Could you introduce the application scenarios of this feature? Thanks.
Re: [PATCH v3 1/2] app/testpmd: fix help string
Hi Dengdui,
On 2023/10/8 9:56, Dengdui Huang wrote:
> Command help string is missing 'mcast_addr add|remove'.
> This patch add it.
>
> Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
> addresses")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Dengdui Huang
> ---
> app/test-pmd/cmdline.c | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index a0e97719b3..3165347a05 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -516,6 +516,12 @@ static void cmd_help_long_parsed(void *parsed_result,
> "set allmulti (port_id|all) (on|off)\n"
> "Set the allmulti mode on port_id, or all.\n\n"
>
> + "mcast_addr add (port_id) (mcast_addr)\n"
> + "Add a multicast MAC addresses on port_id.\n\n"
> +
> + "mcast_addr remove (port_id) (mcast_addr)"
Please add '\n' at last.
with above fixed,
Acked-by: Chengwen Feng
> + "Remove a multicast MAC address from port_id.\n\n"
> +
> "set flow_ctrl rx (on|off) tx (on|off) (high_water)"
> " (low_water) (pause_time) (send_xon)
> mac_ctrl_frame_fwd"
> " (on|off) autoneg (on|off) (port_id)\n"
>
Re: [PATCH v3 1/8] ethdev: add member notification for bonding port
Hi Chaoyong,
some comments as below.
在 2023/10/8 9:50, Chaoyong He 写道:
From: Long Wu
Bonding PMD does not let member ports know the bonding port's
information, like how many member ports the bonding port has,
what mode the bonding port is in and so on.
Add the notification interface for bonding port to let member
port know it is added to a bonding port and what the bonding
port's configuration is. If so the member ports have chance to
achieve its bond-flow-offlod or other private bonding functions.
"its bond-flow-offlod or other private bonding functions"
I wonder that what PMDs can do with this.
Can you give an example in PMD to help others review?
Signed-off-by: Long Wu
Reviewed-by: James Hershaw
Reviewed-by: Chaoyong He
---
drivers/net/bonding/eth_bond_private.h | 1 +
drivers/net/bonding/rte_eth_bond.h | 46
drivers/net/bonding/rte_eth_bond_api.c | 73 ++
drivers/net/bonding/rte_eth_bond_pmd.c | 27 --
drivers/net/bonding/version.map| 3 ++
lib/ethdev/ethdev_driver.h | 18 +++
6 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/eth_bond_private.h
b/drivers/net/bonding/eth_bond_private.h
index e688894210..f69e85c199 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -180,6 +180,7 @@ struct bond_dev_private {
uint8_t member_update_idx;
bool kvargs_processing_is_done;
+ bool notify_member; /**< Enable member notification of bonding port. */
uint32_t candidate_max_rx_pktlen;
uint32_t max_rx_pktlen;
diff --git a/drivers/net/bonding/rte_eth_bond.h
b/drivers/net/bonding/rte_eth_bond.h
index f10165f2c6..737beca446 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -351,6 +351,52 @@ rte_eth_bond_link_up_prop_delay_set(uint16_t
bonding_port_id,
int
rte_eth_bond_link_up_prop_delay_get(uint16_t bonding_port_id);
+/**
+ * Set the flag of whether bonding port notifies member ports.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param notify_member
+ * Flag of whether bonding port notifies member ports.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_member_flag_set(uint16_t bonding_port_id, bool
notify_member);
s/notify_membe/notify in input?
because function name reveals the meaning already.
+
+/**
+ * Get the flag of whether bonding port notifies member ports.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ * @param notify_member
+ * Flag of whether bonding port notifies member ports.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_member_flag_get(uint16_t bonding_port_id, bool
*notify_member);
+
+/**
+ * Notify the member ports of bonding port's information.
+ *
+ * This interface is called in the following functions:
+ * - bond_ethdev_lsc_event_callback()
+ * - bond_ethdev_configure()
Is this interface used just in these cases?
If so I don't think it should be a API in eth_dev_op.
+ *
+ * @param bonding_port_id
+ * Port ID of bonding device.
+ *
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+__rte_experimental
+int
+rte_eth_bond_notify_members(uint16_t bonding_port_id);
#ifdef __cplusplus
}
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 99e496556a..48c1d050fd 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -627,6 +627,17 @@ __eth_bond_member_add_lock_free(uint16_t bonding_port_id,
uint16_t member_port_i
member_vlan_filter_set(bonding_port_id, member_port_id);
+ if (internals->notify_member &&
+ *member_eth_dev->dev_ops->bond_notify_member != NULL) {
+ ret =
member_eth_dev->dev_ops->bond_notify_member(member_eth_dev,
+ bonding_eth_dev);
+ if (ret < 0) {
+ RTE_BOND_LOG(ERR, "Add member (port %u) notify failed!",
+ member_port_id);
+ return -1;
+ }
+ }
+
return 0;
}
@@ -733,6 +744,10 @@ __eth_bond_member_remove_lock_free(uint16_t
bonding_port_id,
member_eth_dev = &rte_eth_devices[member_port_id];
member_remove(internals, member_eth_dev);
member_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDING_MEMBER);
+ if (internals->notify_member &&
+ *member_eth_dev->dev_ops->bond_notify_member != NULL)
+ member_eth_dev->dev_ops->bond_notify_member(member_eth_dev,
+ bonding_eth_dev);
/* first member in the active list will be the primary by default,
* otherwise use first device in list */
@@ -1098,3 +1113,61 @@ rte_eth_bond_link_up_prop_d
Re: [PATCH v3 2/2] app/testpmd: add flush all multicast MAC address command
Hi Dengdui, On 2023/10/8 9:56, Dengdui Huang wrote: > Add command to flush all multicast MAC address > Usage: > mcast_addr flush : > flush all multicast MAC address on port_id > > Signed-off-by: Dengdui Huang Acked-by: Chengwen Feng
[PATCH v4 0/5] support item NSH matching
NSH can be matched using the existed item: RTE_FLOW_ITEM_TYPE_NSH. NSH fields matching is not supported. Add support for configuring VXLAN-GPE's next protocol. The CLI is: vxlan-gpe protocol is . Add support for matching item NSH. The CLI is: nsh Add support for HCA attribute query of NSH. Enhance the validation for the case matching item NSH is supported. Add NSH support in net/mlx5. V2: Add Ack info in commit message. V3: Add more Ack in commi message. V4: Add nsh in feature ini file. Haifei Luo (5): app/testpmd: support for VXLAN-GPE's next protocol common/mlx5: extend HCA attribute query for NSH net/mlx5: enhance the validation for item VXLAN-GPE app/testpmd: support for NSH flow item net/mlx5: add support for item NSH app/test-pmd/cmdline_flow.c | 26 ++ doc/guides/nics/features/mlx5.ini| 1 + drivers/common/mlx5/mlx5_devx_cmds.c | 3 ++ drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/common/mlx5/mlx5_prm.h | 4 ++- drivers/net/mlx5/mlx5_flow.c | 52 drivers/net/mlx5/mlx5_flow.h | 6 drivers/net/mlx5/mlx5_flow_dv.c | 13 ++- 8 files changed, 97 insertions(+), 9 deletions(-) -- 2.27.0
[PATCH v4 1/5] app/testpmd: support for VXLAN-GPE's next protocol
Add support for configuring VXLAN-GPE's next protocol.
The CLI is: vxlan-gpe protocol is .
Example:
flow create 0 transfer group 1 pattern eth / ipv6 / udp dst is 4790
/ vxlan-gpe protocol is 0x04 / eth / ipv4 / tcp / end
actions port_id id 1 / end
Signed-off-by: Jiawei Wang
Signed-off-by: Haifei Luo
Acked-by: Dariusz Sosnowski
Acked-by: Suanming Mou
---
app/test-pmd/cmdline_flow.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 95c0a19beb..8a4e06c50a 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -386,6 +386,7 @@ enum index {
ITEM_GENEVE_OPTLEN,
ITEM_VXLAN_GPE,
ITEM_VXLAN_GPE_VNI,
+ ITEM_VXLAN_GPE_PROTO,
ITEM_ARP_ETH_IPV4,
ITEM_ARP_ETH_IPV4_SHA,
ITEM_ARP_ETH_IPV4_SPA,
@@ -1760,6 +1761,7 @@ static const enum index item_geneve[] = {
static const enum index item_vxlan_gpe[] = {
ITEM_VXLAN_GPE_VNI,
+ ITEM_VXLAN_GPE_PROTO,
ITEM_NEXT,
ZERO,
};
@@ -4813,6 +4815,14 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe,
hdr.vni)),
},
+ [ITEM_VXLAN_GPE_PROTO] = {
+ .name = "protocol",
+ .help = "VXLAN-GPE next protocol",
+ .next = NEXT(item_vxlan_gpe, NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+ .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe,
+protocol)),
+ },
[ITEM_ARP_ETH_IPV4] = {
.name = "arp_eth_ipv4",
.help = "match ARP header for Ethernet/IPv4",
--
2.27.0
[PATCH v4 2/5] common/mlx5: extend HCA attribute query for NSH
Add NSH supporting field in two places:
1. New HCA capability indicating NSH is supported
2. New field in "mlx5_ifc_per_protocol_networking_offload_caps_bits"
structure
Signed-off-by: Haifei Luo
Acked-by: Dariusz Sosnowski
Acked-by: Suanming Mou
---
drivers/common/mlx5/mlx5_devx_cmds.c | 3 +++
drivers/common/mlx5/mlx5_devx_cmds.h | 1 +
drivers/common/mlx5/mlx5_prm.h | 4 +++-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 66a77159a0..830199212e 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -1313,6 +1313,9 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
attr->tunnel_stateless_gtp = MLX5_GET
(per_protocol_networking_offload_caps,
hcattr, tunnel_stateless_gtp);
+ attr->tunnel_stateless_vxlan_gpe_nsh = MLX5_GET
+ (per_protocol_networking_offload_caps,
+hcattr,
tunnel_stateless_vxlan_gpe_nsh);
attr->rss_ind_tbl_cap = MLX5_GET
(per_protocol_networking_offload_caps,
hcattr, rss_ind_tbl_cap);
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h
b/drivers/common/mlx5/mlx5_devx_cmds.h
index e071cd841f..11772431ae 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -196,6 +196,7 @@ struct mlx5_hca_attr {
uint32_t tunnel_stateless_geneve_rx:1;
uint32_t geneve_max_opt_len:1; /* 0x0: 14DW, 0x1: 63DW */
uint32_t tunnel_stateless_gtp:1;
+ uint32_t tunnel_stateless_vxlan_gpe_nsh:1;
uint32_t max_lso_cap;
uint32_t scatter_fcs:1;
uint32_t lro_cap:1;
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 51f426c614..f005877dd7 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1964,7 +1964,9 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits
{
u8 swp_lso[0x1];
u8 reserved_at_23[0x8];
u8 tunnel_stateless_gtp[0x1];
- u8 reserved_at_25[0x4];
+ u8 reserved_at_25[0x2];
+ u8 tunnel_stateless_vxlan_gpe_nsh[0x1];
+ u8 reserved_at_28[0x1];
u8 max_vxlan_udp_ports[0x8];
u8 reserved_at_38[0x6];
u8 max_geneve_opt_len[0x1];
--
2.27.0
[PATCH v4 3/5] net/mlx5: enhance the validation for item VXLAN-GPE
Enhance the validation so that configuring vxlan-gpe's next protocol as NSH
is supported.
1. The spec's protocol can have value and nic_mask's protocol is 0xff.
Signed-off-by: Haifei Luo
Acked-by: Dariusz Sosnowski
Acked-by: Suanming Mou
---
drivers/net/mlx5/mlx5_flow.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index f7f8f54eb4..202e878ddf 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3198,6 +3198,11 @@ mlx5_flow_validate_item_vxlan_gpe(const struct
rte_flow_item *item,
uint8_t vni[4];
} id = { .vlan_id = 0, };
+ struct rte_flow_item_vxlan_gpe nic_mask = {
+ .vni = "\xff\xff\xff",
+ .protocol = 0xff,
+ };
+
if (!priv->sh->config.l3_vxlan_en)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -3221,18 +3226,12 @@ mlx5_flow_validate_item_vxlan_gpe(const struct
rte_flow_item *item,
mask = &rte_flow_item_vxlan_gpe_mask;
ret = mlx5_flow_item_acceptable
(item, (const uint8_t *)mask,
-(const uint8_t *)&rte_flow_item_vxlan_gpe_mask,
+(const uint8_t *)&nic_mask,
sizeof(struct rte_flow_item_vxlan_gpe),
MLX5_ITEM_RANGE_NOT_ACCEPTED, error);
if (ret < 0)
return ret;
if (spec) {
- if (spec->hdr.proto)
- return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_ITEM,
- item,
- "VxLAN-GPE protocol"
- " not supported");
memcpy(&id.vni[1], spec->hdr.vni, 3);
memcpy(&id.vni[1], mask->hdr.vni, 3);
}
--
2.27.0
[PATCH v4 4/5] app/testpmd: support for NSH flow item
Add support for item NSH. The CLI is: nsh
Example:
flow create 0 transfer group 1
pattern eth / ipv6 / udp dst is 4790 /
vxlan-gpe / nsh / eth / ipv4 / tcp / end
actions port_id id 1 / end
Signed-off-by: Haifei Luo
Acked-by: Dariusz Sosnowski
Acked-by: Suanming Mou
---
app/test-pmd/cmdline_flow.c | 16
doc/guides/nics/features/mlx5.ini | 1 +
2 files changed, 17 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 8a4e06c50a..84de3a2506 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -526,6 +526,7 @@ enum index {
ITEM_IB_BTH_PSN,
ITEM_IPV6_PUSH_REMOVE_EXT,
ITEM_IPV6_PUSH_REMOVE_EXT_TYPE,
+ ITEM_NSH,
/* Validate/create actions. */
ACTIONS,
@@ -1563,6 +1564,7 @@ static const enum index next_item[] = {
ITEM_AGGR_AFFINITY,
ITEM_TX_QUEUE,
ITEM_IB_BTH,
+ ITEM_NSH,
END_SET,
ZERO,
};
@@ -2083,6 +2085,11 @@ static const enum index item_ib_bth[] = {
ZERO,
};
+static const enum index item_nsh[] = {
+ ITEM_NEXT,
+ ZERO,
+};
+
static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -5846,6 +5853,15 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ib_bth,
hdr.psn)),
},
+ [ITEM_NSH] = {
+ .name = "nsh",
+ .help = "match NSH header",
+ .priv = PRIV_ITEM(NSH,
+ sizeof(struct rte_flow_item_nsh)),
+ .next = NEXT(item_nsh),
+ .call = parse_vc,
+ },
+
/* Validate/create actions. */
[ACTIONS] = {
.name = "actions",
diff --git a/doc/guides/nics/features/mlx5.ini
b/doc/guides/nics/features/mlx5.ini
index c0e0b779cf..fc67415c6c 100644
--- a/doc/guides/nics/features/mlx5.ini
+++ b/doc/guides/nics/features/mlx5.ini
@@ -82,6 +82,7 @@ mark = Y
meta = Y
meter_color = Y
mpls = Y
+nsh = Y
nvgre= Y
port_id = Y
port_representor = Y
--
2.27.0
[PATCH v4 5/5] net/mlx5: add support for item NSH
1. Add validation for item NSH.
It will fail if HCA cap for NSH is false.
2. Add item_flags for NSH.
3. For vxlan-gpe if next header is NSH, set next_protocol as NSH.
Signed-off-by: Haifei Luo
Acked-by: Dariusz Sosnowski
Acked-by: Suanming Mou
---
drivers/net/mlx5/mlx5_flow.c| 39 +
drivers/net/mlx5/mlx5_flow.h| 6 +
drivers/net/mlx5/mlx5_flow_dv.c | 13 ++-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 202e878ddf..8ad85e6027 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3905,6 +3905,45 @@ mlx5_flow_validate_item_ecpri(const struct rte_flow_item
*item,
MLX5_ITEM_RANGE_NOT_ACCEPTED, error);
}
+/**
+ * Validate the NSH item.
+ *
+ * @param[in] dev
+ * Pointer to Ethernet device on which flow rule is being created on.
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_flow_validate_item_nsh(struct rte_eth_dev *dev,
+ const struct rte_flow_item *item,
+ struct rte_flow_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+
+ if (item->mask) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "NSH fields matching is not
supported");
+ }
+
+ if (!priv->sh->config.dv_flow_en) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "NSH support requires DV flow
interface");
+ }
+
+ if (!priv->sh->cdev->config.hca_attr.tunnel_stateless_vxlan_gpe_nsh) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "Current FW does not support matching
on NSH");
+ }
+
+ return 0;
+}
+
static int
flow_null_validate(struct rte_eth_dev *dev __rte_unused,
const struct rte_flow_attr *attr __rte_unused,
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 3a97975d69..ccb416e497 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -233,6 +233,9 @@ enum mlx5_feature_name {
/* IB BTH ITEM. */
#define MLX5_FLOW_ITEM_IB_BTH (1ull << 51)
+/* NSH ITEM */
+#define MLX5_FLOW_ITEM_NSH (1ull << 53)
+
/* Outer Masks. */
#define MLX5_FLOW_LAYER_OUTER_L3 \
(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)
@@ -2453,6 +2456,9 @@ int mlx5_flow_validate_item_ecpri(const struct
rte_flow_item *item,
uint16_t ether_type,
const struct rte_flow_item_ecpri *acc_mask,
struct rte_flow_error *error);
+int mlx5_flow_validate_item_nsh(struct rte_eth_dev *dev,
+ const struct rte_flow_item *item,
+ struct rte_flow_error *error);
int mlx5_flow_create_mtr_tbls(struct rte_eth_dev *dev,
struct mlx5_flow_meter_info *fm,
uint32_t mtr_idx,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 3f4325c5c8..5cd04b1d93 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7815,6 +7815,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct
rte_flow_attr *attr,
last_item = MLX5_FLOW_ITEM_IB_BTH;
break;
+ case RTE_FLOW_ITEM_TYPE_NSH:
+ ret = mlx5_flow_validate_item_nsh(dev, items, error);
+ if (ret < 0)
+ return ret;
+ last_item = MLX5_FLOW_ITEM_NSH;
+ break;
default:
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM,
@@ -9720,7 +9726,9 @@ flow_dv_translate_item_vxlan_gpe(void *key, const struct
rte_flow_item *item,
v_protocol = vxlan_v->hdr.protocol;
if (!m_protocol) {
/* Force next protocol to ensure next headers parsing. */
- if (pattern_flags & MLX5_FLOW_LAYER_INNER_L2)
+ if (pattern_flags & MLX5_FLOW_ITEM_NSH)
+ v_protocol = RTE_VXLAN_GPE_TYPE_NSH;
+ else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L2)
v_protocol = RTE_VXLAN_GPE_TYPE_ETH;
else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV4)
v_protocol = RTE_VXLAN_GPE_TYPE_IPV4;
Re: [PATCH v3 1/2] app/testpmd: fix help string
On 2023/10/8 10:47, fengchengwen wrote:
> Hi Dengdui,
>
> On 2023/10/8 9:56, Dengdui Huang wrote:
>> Command help string is missing 'mcast_addr add|remove'.
>> This patch add it.
>>
>> Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
>> addresses")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Dengdui Huang
>> ---
>> app/test-pmd/cmdline.c | 6 ++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>> index a0e97719b3..3165347a05 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -516,6 +516,12 @@ static void cmd_help_long_parsed(void *parsed_result,
>> "set allmulti (port_id|all) (on|off)\n"
>> "Set the allmulti mode on port_id, or all.\n\n"
>>
>> +"mcast_addr add (port_id) (mcast_addr)\n"
>> +"Add a multicast MAC addresses on port_id.\n\n"
>> +
>> +"mcast_addr remove (port_id) (mcast_addr)"
>
> Please add '\n' at last.
>
> with above fixed,
> Acked-by: Chengwen Feng
>
OK, thanks
>> +"Remove a multicast MAC address from port_id.\n\n"
>> +
>> "set flow_ctrl rx (on|off) tx (on|off) (high_water)"
>> " (low_water) (pause_time) (send_xon)
>> mac_ctrl_frame_fwd"
>> " (on|off) autoneg (on|off) (port_id)\n"
>>
[PATCH v3 0/2] fix help string and add a new command
This series fix help string and add a new command. v3->v4 help string add '\n' at last. v2->v3 add 'mcast_addr add|remove' to help string and update the new command description. v1->v2 update order on help string. Dengdui Huang (2): app/testpmd: fix help string app/testpmd: add flush all multicast MAC address command app/test-pmd/cmdline.c | 49 + app/test-pmd/config.c | 18 app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 +++ 4 files changed, 75 insertions(+) -- 2.33.0
[PATCH v4 1/2] app/testpmd: fix help string
Command help string is missing 'mcast_addr add|remove'.
This patch add it.
Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
addresses")
Cc: sta...@dpdk.org
Signed-off-by: Dengdui Huang
Acked-by: Chengwen Feng
---
app/test-pmd/cmdline.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a0e97719b3..b934f61be7 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -516,6 +516,12 @@ static void cmd_help_long_parsed(void *parsed_result,
"set allmulti (port_id|all) (on|off)\n"
"Set the allmulti mode on port_id, or all.\n\n"
+ "mcast_addr add (port_id) (mcast_addr)\n"
+ "Add a multicast MAC addresses on port_id.\n\n"
+
+ "mcast_addr remove (port_id) (mcast_addr)\n"
+ "Remove a multicast MAC address from port_id.\n\n"
+
"set flow_ctrl rx (on|off) tx (on|off) (high_water)"
" (low_water) (pause_time) (send_xon)
mac_ctrl_frame_fwd"
" (on|off) autoneg (on|off) (port_id)\n"
--
2.33.0
[PATCH v4 2/2] app/testpmd: add flush all multicast MAC address command
Add command to flush all multicast MAC address
Usage:
mcast_addr flush :
flush all multicast MAC address on port_id
Signed-off-by: Dengdui Huang
Acked-by: Chengwen Feng
---
app/test-pmd/cmdline.c | 43 +
app/test-pmd/config.c | 18 +
app/test-pmd/testpmd.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7
4 files changed, 69 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b934f61be7..45bfedd394 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -522,6 +522,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"mcast_addr remove (port_id) (mcast_addr)\n"
"Remove a multicast MAC address from port_id.\n\n"
+ "mcast_addr flush (port_id)\n"
+ "Flush all multicast MAC addresses on port_id.\n\n"
+
"set flow_ctrl rx (on|off) tx (on|off) (high_water)"
" (low_water) (pause_time) (send_xon)
mac_ctrl_frame_fwd"
" (on|off) autoneg (on|off) (port_id)\n"
@@ -8567,6 +8570,45 @@ static cmdline_parse_inst_t cmd_mcast_addr = {
},
};
+/* *** FLUSH MULTICAST MAC ADDRESS ON PORT *** */
+struct cmd_mcast_addr_flush_result {
+ cmdline_fixed_string_t mcast_addr_cmd;
+ cmdline_fixed_string_t what;
+ uint16_t port_num;
+};
+
+static void cmd_mcast_addr_flush_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_mcast_addr_flush_result *res = parsed_result;
+
+ mcast_addr_flush(res->port_num);
+}
+
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result,
+mcast_addr_cmd, "mcast_addr");
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_what =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
+"flush");
+static cmdline_parse_token_num_t cmd_mcast_addr_flush_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_mcast_addr_flush = {
+ .f = cmd_mcast_addr_flush_parsed,
+ .data = (void *)0,
+ .help_str = "mcast_addr flush : "
+ "flush all multicast MAC addresses on port_id",
+ .tokens = {
+ (void *)&cmd_mcast_addr_flush_cmd,
+ (void *)&cmd_mcast_addr_flush_what,
+ (void *)&cmd_mcast_addr_flush_portnum,
+ NULL,
+ },
+};
+
/* vf vlan anti spoof configuration */
/* Common result structure for vf vlan anti spoof */
@@ -12935,6 +12977,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
(cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
(cmdline_parse_inst_t *)&cmd_mcast_addr,
+ (cmdline_parse_inst_t *)&cmd_mcast_addr_flush,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 709864bb44..7034fa125b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6829,6 +6829,24 @@ mcast_addr_remove(portid_t port_id, struct
rte_ether_addr *mc_addr)
mcast_addr_pool_append(port, mc_addr);
}
+void
+mcast_addr_flush(portid_t port_id)
+{
+ int ret;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_eth_dev_set_mc_addr_list(port_id, NULL, 0);
+ if (ret != 0) {
+ fprintf(stderr,
+ "Failed to flush all multicast MAC addresses on port_id
%u\n",
+ port_id);
+ return;
+ }
+ mcast_addr_pool_destroy(port_id);
+}
+
void
port_dcb_info_display(portid_t port_id)
{
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index e236845a81..6457ac4c0a 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1181,6 +1181,7 @@ void show_mcast_macs(portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
void mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr);
void mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr);
+void mcast_addr_flush(portid_t port_id);
void port_dcb_info_display(portid_t port_id);
uint8_t *open_file(const char *file_path, uint32_t *size);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e6d218caaa..7a40980d6c 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1323,6 +1323,13 @@
