From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by dpdk.org (Postfix) with ESMTP id CF8C668C1 for ; Fri, 5 May 2017 12:02:30 +0200 (CEST) Received: by mail-wr0-f178.google.com with SMTP id z52so886141wrc.2 for ; Fri, 05 May 2017 03:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LwYWDquShxNS920MWvcqDYVi1QKxSSD9C2hpF8f26sA=; b=TwfEsfADEHWaSlnTDPwFz9F3J49VJUPsw1ZCmrn5b6agbNFY40g4NQdqptAOiusTyr 2nt4LAvgT9UXgJ5elI9A5XUDDVhkJW42GSxe+iSlZGYkAT8f0Vh/rQZ5A7c/rA5jXstL vNZJItvzWr0ZLKDvoWAfLHzhevLsl0AITpp8UAc1NphyR9I0HEH22N5jXW+eUyMkW8H+ YmySI5/jw9w97inQVfMSXbI7XRkDnH3Z1eh7yy32lKV5JU6G9YT1VnYX0U9tPpadZVqD 0AwaniDsFTyooOUNJj0OYa9FK9mfFnMXDcrHx2kn5csR0F5zOC954Y263JLBsyw+U19D rMtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LwYWDquShxNS920MWvcqDYVi1QKxSSD9C2hpF8f26sA=; b=no5Z4sf/hiDfwe1YQUs8xuyYZZhd6ueobWUCwyL9DahYVn807KpVtZ7Tc2T83qM1/Z 8hWZp3Pbd0ajjrfMpeS/G7F6cZj3QzHIMo3ZZkuoHOQdI3Laaepb/n5AmG8nxdIK300d S3ZWeyoyDYDuEVx1DAMhe0PgONBlPNrCCWjzACCINe5x2rwIbGiPD01CNETokQWs+HYF lR7KKtJZ2T6AZJVUOerc7gKAFVcDCLzzzaklY+JVrOVKAPElqI3Q/dbBFUgZcseexh5y 8mdB7UYZYoDIpDZqR4jxgln3HdTvUnu113w8D1H8ZMDftTmO8w8djwl/ufeJd+Qs5Gsj pnag== X-Gm-Message-State: AN3rC/5Uy0OI716Jz238F+S1U3MVHqltyxPUnD2Z7ozp1OZV0p9UY83a VzGFU3NhfSDPAVVnU+M= X-Received: by 10.223.150.74 with SMTP id c10mr30769270wra.85.1493978550411; Fri, 05 May 2017 03:02:30 -0700 (PDT) Received: from platinum (2a01cb0c03c651000226b0fffeed02fc.ipv6.abo.wanadoo.fr. [2a01:cb0c:3c6:5100:226:b0ff:feed:2fc]) by smtp.gmail.com with ESMTPSA id t30sm4307979wrc.24.2017.05.05.03.02.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 May 2017 03:02:30 -0700 (PDT) Date: Fri, 5 May 2017 12:02:27 +0200 From: Olivier Matz To: Thomas Monjalon Cc: =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , dev@dpdk.org, =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , stable@dpdk.org Message-ID: <20170505120227.1bac5411@platinum> In-Reply-To: <20170504223613.24431-1-thomas@monjalon.net> References: <20170504093041.503dcd8c@glumotte.dev.6wind.com> <20170504223613.24431-1-thomas@monjalon.net> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] [PATCH v2] net: fix stripped VLAN flag for offload emulation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2017 10:02:31 -0000 Hi Thomas, On Fri, 5 May 2017 00:36:13 +0200, Thomas Monjalon w= rote: > From: Micha=C5=82 Miros=C5=82aw >=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 > Signed-off-by: Thomas Monjalon > --- > 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 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