From: Olivier Matz <olivier.matz@6wind.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
dev@dpdk.org,
"Michał Mirosław" <michal.miroslaw@atendesoftware.pl>,
stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation
Date: Fri, 5 May 2017 12:02:27 +0200 [thread overview]
Message-ID: <20170505120227.1bac5411@platinum> (raw)
In-Reply-To: <20170504223613.24431-1-thomas@monjalon.net>
Hi Thomas,
On Fri, 5 May 2017 00:36:13 +0200, Thomas Monjalon <thomas@monjalon.net> wrote:
> From: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
>
> Apply the new flag PKT_RX_VLAN_STRIPPED to the software emulation case
> (currently only for virtio and af_packet).
>
> Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN")
> Cc: stable@dpdk.org
>
> Signed-off-by: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v2: add explanations and update rte_vlan_insert()
> ---
> lib/librte_net/rte_ether.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
> index ff3d06540..5edf66c3f 100644
> --- a/lib/librte_net/rte_ether.h
> +++ b/lib/librte_net/rte_ether.h
> @@ -357,7 +357,7 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
> return -1;
>
> struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
> - m->ol_flags |= PKT_RX_VLAN_PKT;
> + m->ol_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED;
> m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci);
>
> /* Copy ether header over rather than moving whole packet */
> @@ -407,6 +407,8 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
> vh = (struct vlan_hdr *) (nh + 1);
> vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci);
>
> + (*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED;
> +
> return 0;
> }
>
Having disymetric flags looks strange at first glance, but I think
you are right and PKT_RX_VLAN_PKT should be kept in rte_vlan_strip()
for compat purpose. As I said previously in the thread, I think
there is some work remaining to clean-up the vlan offload flags,
we should do this for 17.08.
Acked-by: Olivier Matz <olivier.matz@6wind.com>
next prev parent reply other threads:[~2017-05-05 10:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170504093041.503dcd8c@glumotte.dev.6wind.com>
2017-05-04 22:36 ` Thomas Monjalon
2017-05-05 10:02 ` Olivier Matz [this message]
2017-05-05 14:00 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170505120227.1bac5411@platinum \
--to=olivier.matz@6wind.com \
--cc=dev@dpdk.org \
--cc=michal.miroslaw@atendesoftware.pl \
--cc=mirq-linux@rere.qmqm.pl \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).