app/testpmd: support QinQ offload in VLAN set command
Checks
Commit Message
From: Vivek Sharma <viveksharma@marvell.com>
Segregate QinQ from Extend Offload and support QinQ offload
in vlan set command. Merge all port wise rx vlan offloads in
command line help and documentation for a cleaner structure.
Signed-off-by: Vivek Sharma <viveksharma@marvell.com>
---
app/test-pmd/cmdline.c | 19 +++++++------------
app/test-pmd/config.c | 27 +++++++++++++++++++++++++++
app/test-pmd/testpmd.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 23 ++++-------------------
4 files changed, 39 insertions(+), 31 deletions(-)
Comments
On 9/13/2019 1:15 PM, viveksharma@marvell.com wrote:
> From: Vivek Sharma <viveksharma@marvell.com>
>
> Segregate QinQ from Extend Offload and support QinQ offload
> in vlan set command. Merge all port wise rx vlan offloads in
> command line help and documentation for a cleaner structure.
>
> Signed-off-by: Vivek Sharma <viveksharma@marvell.com>
<...>
> @@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
> }
> else if (!strcmp(res->what, "filter"))
> rx_vlan_filter_set(port_id, on);
> + else if (!strcmp(res->what, "qinq"))
Indeed this is enabling QinQ strip, what do you think calling it 'qinq_strip'?
> + rx_vlan_qinq_strip_set(port_id, on);
> else
> vlan_extend_set(port_id, on);
>
> @@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set =
> set, "set");
> cmdline_parse_token_string_t cmd_vlan_offload_what =
> TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> - what, "strip#filter#qinq#stripq");
> + what, "strip#filter#qinq#extend#stripq");
> cmdline_parse_token_string_t cmd_vlan_offload_on =
> TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> on, "on#off");
> @@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid =
> cmdline_parse_inst_t cmd_vlan_offload = {
> .f = cmd_vlan_offload_parsed,
> .data = NULL,
> - .help_str = "vlan set strip|filter|qinq|stripq on|off "
> + .help_str = "vlan set strip|filter|qinq|extend|stripq on|off "
"show port info ..." command ('port_infos_display()') displays the vlan offloads
too, can you please add displaying 'qinq' support too.
btw, it displays line by line:
VLAN offload:
strip off
filter on
qinq(extend) off
perhaps we can flatten it, to reduce the info length, what do you think?
VLAN offload:
strip off, filter on, qinq(extend) off, qinq off
On Wed, Oct 9, 2019 at 6:26 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> On 9/13/2019 1:15 PM, viveksharma@marvell.com wrote:
> > From: Vivek Sharma <viveksharma@marvell.com>
> >
> > Segregate QinQ from Extend Offload and support QinQ offload
> > in vlan set command. Merge all port wise rx vlan offloads in
> > command line help and documentation for a cleaner structure.
> >
> > Signed-off-by: Vivek Sharma <viveksharma@marvell.com>
>
> <...>
>
> > @@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
> > }
> > else if (!strcmp(res->what, "filter"))
> > rx_vlan_filter_set(port_id, on);
> > + else if (!strcmp(res->what, "qinq"))
>
> Indeed this is enabling QinQ strip, what do you think calling it
> 'qinq_strip'?
>
Agreed!
>
> > + rx_vlan_qinq_strip_set(port_id, on);
> > else
> > vlan_extend_set(port_id, on);
> >
> > @@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set =
> > set, "set");
> > cmdline_parse_token_string_t cmd_vlan_offload_what =
> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > - what, "strip#filter#qinq#stripq");
> > + what, "strip#filter#qinq#extend#stripq");
> > cmdline_parse_token_string_t cmd_vlan_offload_on =
> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > on, "on#off");
> > @@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t
> cmd_vlan_offload_portid =
> > cmdline_parse_inst_t cmd_vlan_offload = {
> > .f = cmd_vlan_offload_parsed,
> > .data = NULL,
> > - .help_str = "vlan set strip|filter|qinq|stripq on|off "
> > + .help_str = "vlan set strip|filter|qinq|extend|stripq on|off "
>
> "show port info ..." command ('port_infos_display()') displays the vlan
> offloads
> too, can you please add displaying 'qinq' support too.
>
This is already implemented in another patch which introduces 'qinq
offload'.
>
> btw, it displays line by line:
> VLAN offload:
> strip off
> filter on
> qinq(extend) off
>
> perhaps we can flatten it, to reduce the info length, what do you think?
>
Absolutely. In fact, I thought about doing so in the original patch.
> VLAN offload:
> strip off, filter on, qinq(extend) off, qinq off
>
On 10/10/2019 8:20 AM, Vivek Sharma wrote:
> On Wed, Oct 9, 2019 at 6:26 PM Ferruh Yigit <ferruh.yigit@intel.com
> <mailto:ferruh.yigit@intel.com>> wrote:
>
> On 9/13/2019 1:15 PM, viveksharma@marvell.com
> <mailto:viveksharma@marvell.com> wrote:
> > From: Vivek Sharma <viveksharma@marvell.com <mailto:viveksharma@marvell.com>>
> >
> > Segregate QinQ from Extend Offload and support QinQ offload
> > in vlan set command. Merge all port wise rx vlan offloads in
> > command line help and documentation for a cleaner structure.
> >
> > Signed-off-by: Vivek Sharma <viveksharma@marvell.com
> <mailto:viveksharma@marvell.com>>
>
> <...>
>
> > @@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
> > }
> > else if (!strcmp(res->what, "filter"))
> > rx_vlan_filter_set(port_id, on);
> > + else if (!strcmp(res->what, "qinq"))
>
> Indeed this is enabling QinQ strip, what do you think calling it 'qinq_strip'?
>
>
> Agreed!
>
>
>
> > + rx_vlan_qinq_strip_set(port_id, on);
> > else
> > vlan_extend_set(port_id, on);
> >
> > @@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set =
> > set, "set");
> > cmdline_parse_token_string_t cmd_vlan_offload_what =
> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > - what, "strip#filter#qinq#stripq");
> > + what, "strip#filter#qinq#extend#stripq");
> > cmdline_parse_token_string_t cmd_vlan_offload_on =
> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > on, "on#off");
> > @@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid =
> > cmdline_parse_inst_t cmd_vlan_offload = {
> > .f = cmd_vlan_offload_parsed,
> > .data = NULL,
> > - .help_str = "vlan set strip|filter|qinq|stripq on|off "
> > + .help_str = "vlan set strip|filter|qinq|extend|stripq on|off "
>
> "show port info ..." command ('port_infos_display()') displays the vlan offloads
> too, can you please add displaying 'qinq' support too.
>
>
> This is already implemented in another patch which introduces 'qinq offload'.
Right, I found it [1], but I believe that change suits better here. Since you
are the author of both patch, would you mind I include that bit into this patch
while merging?
[1]
https://patches.dpdk.org/patch/60847/
>
>
>
> btw, it displays line by line:
> VLAN offload:
> strip off
> filter on
> qinq(extend) off
>
> perhaps we can flatten it, to reduce the info length, what do you think?
>
>
> Absolutely. In fact, I thought about doing so in the original patch.
I was hoping the change can be part of your patch, but since it is already out
this can be done as separate patch later.
>
>
> VLAN offload:
> strip off, filter on, qinq(extend) off, qinq off
>
On 10/10/2019 11:24 AM, Ferruh Yigit wrote:
> On 10/10/2019 8:20 AM, Vivek Sharma wrote:
>> On Wed, Oct 9, 2019 at 6:26 PM Ferruh Yigit <ferruh.yigit@intel.com
>> <mailto:ferruh.yigit@intel.com>> wrote:
>>
>> On 9/13/2019 1:15 PM, viveksharma@marvell.com
>> <mailto:viveksharma@marvell.com> wrote:
>> > From: Vivek Sharma <viveksharma@marvell.com <mailto:viveksharma@marvell.com>>
>> >
>> > Segregate QinQ from Extend Offload and support QinQ offload
>> > in vlan set command. Merge all port wise rx vlan offloads in
>> > command line help and documentation for a cleaner structure.
>> >
>> > Signed-off-by: Vivek Sharma <viveksharma@marvell.com
>> <mailto:viveksharma@marvell.com>>
>>
>> <...>
>>
>> > @@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
>> > }
>> > else if (!strcmp(res->what, "filter"))
>> > rx_vlan_filter_set(port_id, on);
>> > + else if (!strcmp(res->what, "qinq"))
>>
>> Indeed this is enabling QinQ strip, what do you think calling it 'qinq_strip'?
>>
>>
>> Agreed!
>>
>>
>>
>> > + rx_vlan_qinq_strip_set(port_id, on);
>> > else
>> > vlan_extend_set(port_id, on);
>> >
>> > @@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set =
>> > set, "set");
>> > cmdline_parse_token_string_t cmd_vlan_offload_what =
>> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
>> > - what, "strip#filter#qinq#stripq");
>> > + what, "strip#filter#qinq#extend#stripq");
>> > cmdline_parse_token_string_t cmd_vlan_offload_on =
>> > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
>> > on, "on#off");
>> > @@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid =
>> > cmdline_parse_inst_t cmd_vlan_offload = {
>> > .f = cmd_vlan_offload_parsed,
>> > .data = NULL,
>> > - .help_str = "vlan set strip|filter|qinq|stripq on|off "
>> > + .help_str = "vlan set strip|filter|qinq|extend|stripq on|off "
>>
>> "show port info ..." command ('port_infos_display()') displays the vlan offloads
>> too, can you please add displaying 'qinq' support too.
>>
>>
>> This is already implemented in another patch which introduces 'qinq offload'.
>
> Right, I found it [1], but I believe that change suits better here. Since you
> are the author of both patch, would you mind I include that bit into this patch
> while merging?
Ahh, I missed that there will be a new version of this patch, so would you mind
getting that bit into next version? I can take care of other patch while merging.
And since that part will be in this patch, can you also implement below flattening?
>
> [1]
> https://patches.dpdk.org/patch/60847/
>
>>
>>
>>
>> btw, it displays line by line:
>> VLAN offload:
>> strip off
>> filter on
>> qinq(extend) off
>>
>> perhaps we can flatten it, to reduce the info length, what do you think?
>>
>>
>> Absolutely. In fact, I thought about doing so in the original patch.
>
> I was hoping the change can be part of your patch, but since it is already out
> this can be done as separate patch later.
>
>>
>>
>> VLAN offload:
>> strip off, filter on, qinq(extend) off, qinq off
>>
>
On Thu, Oct 10, 2019 at 3:54 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> On 10/10/2019 8:20 AM, Vivek Sharma wrote:
> > On Wed, Oct 9, 2019 at 6:26 PM Ferruh Yigit <ferruh.yigit@intel.com
> > <mailto:ferruh.yigit@intel.com>> wrote:
> >
> > On 9/13/2019 1:15 PM, viveksharma@marvell.com
> > <mailto:viveksharma@marvell.com> wrote:
> > > From: Vivek Sharma <viveksharma@marvell.com <mailto:
> viveksharma@marvell.com>>
> > >
> > > Segregate QinQ from Extend Offload and support QinQ offload
> > > in vlan set command. Merge all port wise rx vlan offloads in
> > > command line help and documentation for a cleaner structure.
> > >
> > > Signed-off-by: Vivek Sharma <viveksharma@marvell.com
> > <mailto:viveksharma@marvell.com>>
> >
> > <...>
> >
> > > @@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
> > > }
> > > else if (!strcmp(res->what, "filter"))
> > > rx_vlan_filter_set(port_id, on);
> > > + else if (!strcmp(res->what, "qinq"))
> >
> > Indeed this is enabling QinQ strip, what do you think calling it
> 'qinq_strip'?
> >
> >
> > Agreed!
> >
> >
> >
> > > + rx_vlan_qinq_strip_set(port_id, on);
> > > else
> > > vlan_extend_set(port_id, on);
> > >
> > > @@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t
> cmd_vlan_offload_set =
> > > set, "set");
> > > cmdline_parse_token_string_t cmd_vlan_offload_what =
> > > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > > - what, "strip#filter#qinq#stripq");
> > > + what,
> "strip#filter#qinq#extend#stripq");
> > > cmdline_parse_token_string_t cmd_vlan_offload_on =
> > > TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
> > > on, "on#off");
> > > @@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t
> cmd_vlan_offload_portid =
> > > cmdline_parse_inst_t cmd_vlan_offload = {
> > > .f = cmd_vlan_offload_parsed,
> > > .data = NULL,
> > > - .help_str = "vlan set strip|filter|qinq|stripq on|off "
> > > + .help_str = "vlan set strip|filter|qinq|extend|stripq on|off
> "
> >
> > "show port info ..." command ('port_infos_display()') displays the
> vlan offloads
> > too, can you please add displaying 'qinq' support too.
> >
> >
> > This is already implemented in another patch which introduces 'qinq
> offload'.
>
> Right, I found it [1], but I believe that change suits better here. Since
> you
> are the author of both patch, would you mind I include that bit into this
> patch
> while merging?
>
>
Sure, please go ahead! Anyways, I was planning to send v2 of both the
patches, which would take
care of all the valid points raised by you.
> [1]
> https://patches.dpdk.org/patch/60847/
>
> >
> >
> >
> > btw, it displays line by line:
> > VLAN offload:
> > strip off
> > filter on
> > qinq(extend) off
> >
> > perhaps we can flatten it, to reduce the info length, what do you
> think?
> >
> >
> > Absolutely. In fact, I thought about doing so in the original patch.
>
> I was hoping the change can be part of your patch, but since it is already
> out
> this can be done as separate patch later.
>
> >
> >
> > VLAN offload:
> > strip off, filter on, qinq(extend) off, qinq off
> >
>
>
@@ -325,9 +325,6 @@ static void cmd_help_long_parsed(void *parsed_result,
"set vf broadcast (port_id) (vf_id) (on|off)\n"
" Set VF broadcast for a VF from the PF.\n\n"
- "vlan set strip (on|off) (port_id)\n"
- " Set the VLAN strip on a port.\n\n"
-
"vlan set stripq (on|off) (port_id,queue_id)\n"
" Set the VLAN strip for a queue on a port.\n\n"
@@ -358,12 +355,8 @@ static void cmd_help_long_parsed(void *parsed_result,
"set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n"
" Set all TCs' min bandwidth(%%) for all PF and VFs.\n\n"
- "vlan set filter (on|off) (port_id)\n"
- " Set the VLAN filter on a port.\n\n"
-
- "vlan set qinq (on|off) (port_id)\n"
- " Set the VLAN QinQ (extended queue in queue)"
- " on a port.\n\n"
+ "vlan set (strip|filter|qinq|extend) (on|off) (port_id)\n"
+ " Set the VLAN strip or filter or qinq strip or extend\n\n"
"vlan set (inner|outer) tpid (value) (port_id)\n"
" Set the VLAN TPID for Packet Filtering on"
@@ -3902,6 +3895,8 @@ cmd_vlan_offload_parsed(void *parsed_result,
}
else if (!strcmp(res->what, "filter"))
rx_vlan_filter_set(port_id, on);
+ else if (!strcmp(res->what, "qinq"))
+ rx_vlan_qinq_strip_set(port_id, on);
else
vlan_extend_set(port_id, on);
@@ -3916,7 +3911,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set =
set, "set");
cmdline_parse_token_string_t cmd_vlan_offload_what =
TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
- what, "strip#filter#qinq#stripq");
+ what, "strip#filter#qinq#extend#stripq");
cmdline_parse_token_string_t cmd_vlan_offload_on =
TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result,
on, "on#off");
@@ -3927,9 +3922,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid =
cmdline_parse_inst_t cmd_vlan_offload = {
.f = cmd_vlan_offload_parsed,
.data = NULL,
- .help_str = "vlan set strip|filter|qinq|stripq on|off "
+ .help_str = "vlan set strip|filter|qinq|extend|stripq on|off "
"<port_id[,queue_id]>: "
- "Filter/Strip for rx side qinq(extended) for both rx/tx sides",
+ "Strip/Filter/QinQ for rx side Extend for both rx/tx sides",
.tokens = {
(void *)&cmd_vlan_offload_vlan,
(void *)&cmd_vlan_offload_set,
@@ -2985,6 +2985,33 @@ rx_vlan_filter_set(portid_t port_id, int on)
ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
}
+void
+rx_vlan_qinq_strip_set(portid_t port_id, int on)
+{
+ int diag;
+ int vlan_offload;
+ uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
+
+ if (on) {
+ vlan_offload |= ETH_QINQ_STRIP_OFFLOAD;
+ port_rx_offloads |= DEV_RX_OFFLOAD_QINQ_STRIP;
+ } else {
+ vlan_offload &= ~ETH_QINQ_STRIP_OFFLOAD;
+ port_rx_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP;
+ }
+
+ diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
+ if (diag < 0)
+ printf("%s(port_pi=%d, on=%d) failed "
+ "diag=%d\n", __func__, port_id, on, diag);
+ ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
+}
+
int
rx_vft_set(portid_t port_id, uint16_t vlan_id, int on)
{
@@ -752,6 +752,7 @@ void rx_vlan_strip_set_on_queue(portid_t port_id, uint16_t queue_id, int on);
void rx_vlan_filter_set(portid_t port_id, int on);
void rx_vlan_all_filter_set(portid_t port_id, int on);
+void rx_vlan_qinq_strip_set(portid_t port_id, int on);
int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on);
void vlan_extend_set(portid_t port_id, int on);
void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type,
@@ -799,13 +799,6 @@ Set broadcast mode for a VF from the PF::
testpmd> set vf broadcast (port_id) (vf_id) (on|off)
-vlan set strip
-~~~~~~~~~~~~~~
-
-Set the VLAN strip on a port::
-
- testpmd> vlan set strip (on|off) (port_id)
-
vlan set stripq
~~~~~~~~~~~~~~~
@@ -841,19 +834,11 @@ Set VLAN antispoof for a VF from the PF::
testpmd> set vf vlan antispoof (port_id) (vf_id) (on|off)
-vlan set filter
-~~~~~~~~~~~~~~~
-
-Set the VLAN filter on a port::
-
- testpmd> vlan set filter (on|off) (port_id)
-
-vlan set qinq
-~~~~~~~~~~~~~
-
-Set the VLAN QinQ (extended queue in queue) on for a port::
+vlan set (strip|filter|qinq|extend)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Set the VLAN strip/filter/QinQ strip/extend on for a port::
- testpmd> vlan set qinq (on|off) (port_id)
+ testpmd> vlan set (strip|filter|qinq|extend) (on|off) (port_id)
vlan set tpid
~~~~~~~~~~~~~