* [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation [not found] <20170504093041.503dcd8c@glumotte.dev.6wind.com> @ 2017-05-04 22:36 ` Thomas Monjalon 2017-05-05 10:02 ` Olivier Matz 0 siblings, 1 reply; 3+ messages in thread From: Thomas Monjalon @ 2017-05-04 22:36 UTC (permalink / raw) To: Michał Mirosław Cc: dev, olivier.matz, Michał Mirosław, stable 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; } -- 2.12.2 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation 2017-05-04 22:36 ` [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation Thomas Monjalon @ 2017-05-05 10:02 ` Olivier Matz 2017-05-05 14:00 ` Thomas Monjalon 0 siblings, 1 reply; 3+ messages in thread From: Olivier Matz @ 2017-05-05 10:02 UTC (permalink / raw) To: Thomas Monjalon Cc: Michał Mirosław, dev, Michał Mirosław, stable 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> ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation 2017-05-05 10:02 ` Olivier Matz @ 2017-05-05 14:00 ` Thomas Monjalon 0 siblings, 0 replies; 3+ messages in thread From: Thomas Monjalon @ 2017-05-05 14:00 UTC (permalink / raw) To: Olivier Matz, Michał Mirosław, Michał Mirosław Cc: stable, dev 05/05/2017 12:02, Olivier Matz: > 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> Applied, thanks ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-05 14:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20170504093041.503dcd8c@glumotte.dev.6wind.com>
2017-05-04 22:36 ` [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation Thomas Monjalon
2017-05-05 10:02 ` Olivier Matz
2017-05-05 14:00 ` Thomas Monjalon
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).