From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Monjalon <thomas@monjalon.net>
Subject: Re: [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag
	for offload emulation
Date: Fri, 05 May 2017 16:00:22 +0200
Message-ID: <2719377.9oiiVVdPIA@xps>
References: <20170504093041.503dcd8c@glumotte.dev.6wind.com>
 <20170504223613.24431-1-thomas@monjalon.net>
 <20170505120227.1bac5411@platinum>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Cc: stable@dpdk.org, dev@dpdk.org
To: Olivier Matz <olivier.matz@6wind.com>,
 =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= <mirq-linux@rere.qmqm.pl>,
 =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= <michal.miroslaw@atendesoftware.pl>
Return-path: <dev-bounces@dpdk.org>
In-Reply-To: <20170505120227.1bac5411@platinum>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

05/05/2017 12:02, Olivier Matz:
> Hi Thomas,
>=20
> On Fri,  5 May 2017 00:36:13 +0200, Thomas Monjalon <thomas@monjalon.net>=
 wrote:
> > From: Micha=C5=82 Miros=C5=82aw <michal.miroslaw@atendesoftware.pl>
> >=20
> > Apply the new flag PKT_RX_VLAN_STRIPPED to the software emulation case
> > (currently only for virtio and af_packet).
> >=20
> > Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN")
> > Cc: stable@dpdk.org
> >=20
> > Signed-off-by: Micha=C5=82 Miros=C5=82aw <michal.miroslaw@atendesoftwar=
e.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(-)
> >=20
> > 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;
> > =20
> >  	struct vlan_hdr *vh =3D (struct vlan_hdr *)(eh + 1);
> > -	m->ol_flags |=3D PKT_RX_VLAN_PKT;
> > +	m->ol_flags |=3D PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED;
> >  	m->vlan_tci =3D rte_be_to_cpu_16(vh->vlan_tci);
> > =20
> >  	/* Copy ether header over rather than moving whole packet */
> > @@ -407,6 +407,8 @@ static inline int rte_vlan_insert(struct rte_mbuf *=
*m)
> >  	vh =3D (struct vlan_hdr *) (nh + 1);
> >  	vh->vlan_tci =3D rte_cpu_to_be_16((*m)->vlan_tci);
> > =20
> > +	(*m)->ol_flags &=3D ~PKT_RX_VLAN_STRIPPED;
> > +
> >  	return 0;
> >  }
> > =20
>=20
> 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.
>=20
>=20
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied, thanks