app/testpmd: add flush multicast MAC address command
Checks
Commit Message
Add command to flush multicast MAC address
Usage:
mcast_addr flush <port_id> :
flush multicast MAC address on port_id
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
---
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(+)
Comments
On Tue, 1 Aug 2023 10:43:04 +0800
Dengdui Huang <huangdengdui@huawei.com> wrote:
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 0d0723f659..2d9d925776 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
> "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
> " Remove a MAC address from port_id.\n\n"
>
> + "mcast_addr flush (port_id)\n"
> + " To flush the set of multicast addresses.\n\n"
> +
> "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
> " Set the default MAC address for port_id.\n\n"
Why out this in middle of the mac_addr commands? better to be in logical or alpha order.
在 2023/8/1 23:18, Stephen Hemminger 写道:
> On Tue, 1 Aug 2023 10:43:04 +0800
> Dengdui Huang <huangdengdui@huawei.com> wrote:
>
>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>> index 0d0723f659..2d9d925776 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>> "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
>> " Remove a MAC address from port_id.\n\n"
>>
>> + "mcast_addr flush (port_id)\n"
>> + " To flush the set of multicast addresses.\n\n"
>> +
>> "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
>> " Set the default MAC address for port_id.\n\n"
>
> Why out this in middle of the mac_addr commands? better to be in logical or alpha order.
Thanks, I will do in v2.
在 2023/8/1 23:18, Stephen Hemminger 写道:
> On Tue, 1 Aug 2023 10:43:04 +0800
> Dengdui Huang <huangdengdui@huawei.com> wrote:
>
>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>> index 0d0723f659..2d9d925776 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>> "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
>> " Remove a MAC address from port_id.\n\n"
>>
>> + "mcast_addr flush (port_id)\n"
>> + " To flush the set of multicast addresses.\n\n"
>> +
>> "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
>> " Set the default MAC address for port_id.\n\n"
>
> Why out this in middle of the mac_addr commands? better to be in logical or alpha order.
Sorry Stephen, I made a mistake in my reply. It's already in logical order(mac_addr/mcast_addr add/remove---->other setting), the same order as in the doc.
The order looks odd because the help command doesn't have a description of "multicast add/remove".Do you agree with this explanation?
On Wed, 2 Aug 2023 10:41:46 +0800
huangdengdui <huangdengdui@huawei.com> wrote:
> 在 2023/8/1 23:18, Stephen Hemminger 写道:
> > On Tue, 1 Aug 2023 10:43:04 +0800
> > Dengdui Huang <huangdengdui@huawei.com> wrote:
> >
> >> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> >> index 0d0723f659..2d9d925776 100644
> >> --- a/app/test-pmd/cmdline.c
> >> +++ b/app/test-pmd/cmdline.c
> >> @@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
> >> "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
> >> " Remove a MAC address from port_id.\n\n"
> >>
> >> + "mcast_addr flush (port_id)\n"
> >> + " To flush the set of multicast addresses.\n\n"
> >> +
> >> "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
> >> " Set the default MAC address for port_id.\n\n"
> >
> > Why out this in middle of the mac_addr commands? better to be in logical or alpha order.
> Sorry Stephen, I made a mistake in my reply. It's already in logical order(mac_addr/mcast_addr add/remove---->other setting), the same order as in the doc.
> The order looks odd because the help command doesn't have a description of "multicast add/remove".Do you agree with this explanation?
The help is already a bit of a mess. It really needs to be split up more.
Lets add the new line after "set allmulti"?
在 2023/8/2 12:16, Stephen Hemminger 写道:
> On Wed, 2 Aug 2023 10:41:46 +0800
> huangdengdui <huangdengdui@huawei.com> wrote:
>
>> 在 2023/8/1 23:18, Stephen Hemminger 写道:
>>> On Tue, 1 Aug 2023 10:43:04 +0800
>>> Dengdui Huang <huangdengdui@huawei.com> wrote:
>>>
>>>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>>>> index 0d0723f659..2d9d925776 100644
>>>> --- a/app/test-pmd/cmdline.c
>>>> +++ b/app/test-pmd/cmdline.c
>>>> @@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>>>> "mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
>>>> " Remove a MAC address from port_id.\n\n"
>>>>
>>>> + "mcast_addr flush (port_id)\n"
>>>> + " To flush the set of multicast addresses.\n\n"
>>>> +
>>>> "mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
>>>> " Set the default MAC address for port_id.\n\n"
>>>
>>> Why out this in middle of the mac_addr commands? better to be in logical or alpha order.
>> Sorry Stephen, I made a mistake in my reply. It's already in logical order(mac_addr/mcast_addr add/remove---->other setting), the same order as in the doc.
>> The order looks odd because the help command doesn't have a description of "multicast add/remove".Do you agree with this explanation?
>
> The help is already a bit of a mess. It really needs to be split up more.
>
> Lets add the new line after "set allmulti"?
>
OK, I will do in v2.
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(+)
On 10/8/2023 7:46 AM, Dengdui Huang wrote:
> 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
>
>
For series,
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Series applied to dpdk-next-net/main, thanks.
@@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
" Remove a MAC address from port_id.\n\n"
+ "mcast_addr flush (port_id)\n"
+ " To flush the set of multicast addresses.\n\n"
+
"mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
" Set the default MAC address for port_id.\n\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 <port_id> : "
+ "flush multicast MAC address 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,
@@ -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;
+ }
+ mcast_addr_pool_destroy(port_id);
+}
+
void
port_dcb_info_display(portid_t port_id)
{
@@ -1176,6 +1176,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);
@@ -1320,6 +1320,14 @@ filtered by port::
testpmd> mcast_addr remove (port_id) (mcast_addr)
+mcast_addr flush
+~~~~~~~~~~~~~~~~
+
+To flush the set of multicast addresses
+filtered by port::
+
+ testpmd> mcast_addr flush (port_id)
+
mac_addr add (for VF)
~~~~~~~~~~~~~~~~~~~~~