From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id BA06C2BCE for ; Mon, 15 Oct 2018 13:52:04 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id d2-v6so20972870wro.7 for ; Mon, 15 Oct 2018 04:52:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aR2cyBZpbMryO5LzRI4dYk9QZBSbf/wacnxtF2fAf+s=; b=pqng0GS284OtVU5sZiZZvz7pD+lsTHDzGGIUqJNdgR4Bk7BzPrmRJ26JZckQfBWquE 09onzHqFjAYlrACj0fotxnkpPKpiVXHGX8axUwUjS29aansbTpsIm6SOC+4lrkXbNOLV n04cYcVN0/157rJd8TnZpFKPD10r1aoKANcjV0Ao81oF2mSWzZbWb9LTqUC53RiXvzsf g1T6YF9QFqom4Daaf3IYq/5bRzYRFQhuGuA3aPo/5KP4Dara+s1xQGqgVO1tqyoDD/Ve hkKklNvRAu6pA59C6P1nJsRNU1BImnzRpFr4Nt4KFTfoqopP3FBrBBbKqbHCgKaZWMtB 76bw== X-Gm-Message-State: ABuFfohCjmn+8wq3/jojiqxJhT2Fr/F8Jq7raPLIPutGFOd8d6ITaQXI lzmU7BkTtnK/uwkeNG/W84CLGnqR X-Google-Smtp-Source: ACcGV62nbI58kXz18EdAGQJ+YC3i12zjcLAbAtfSK+SiMiDMjGQqJf8y968rBnRVyZhKMc4dyJ1Sjg== X-Received: by 2002:adf:b109:: with SMTP id l9-v6mr13750549wra.101.1539604324336; Mon, 15 Oct 2018 04:52:04 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id l140-v6sm10509007wmb.24.2018.10.15.04.52.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:52:03 -0700 (PDT) From: Luca Boccassi To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Mon, 15 Oct 2018 12:51:28 +0100 Message-Id: <20181015115144.27626-8-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/enic: set Rx VLAN offload flag for non-stripped packets' has been queued to LTS release 16.11.9 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: Mon, 15 Oct 2018 11:52:04 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/17/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From cc76098cd86383279ad285cbeceff5c75ebb899f Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 19:54:19 -0700 Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets [ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ] The NIC indicates VLAN TCI to the driver even when VLAN stripping is disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set PKT_RX_VLAN to indicate that vlan_tci is valid. Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/enic_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 1934f8baf1..0cfde4684a 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -189,10 +189,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) pkt_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED; mbuf->packet_type |= RTE_PTYPE_L2_ETHER; } else { - if (vlan_tci != 0) + if (vlan_tci != 0) { + pkt_flags |= PKT_RX_VLAN_PKT; mbuf->packet_type |= RTE_PTYPE_L2_ETHER_VLAN; - else + } else { mbuf->packet_type |= RTE_PTYPE_L2_ETHER; + } } mbuf->vlan_tci = vlan_tci; -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-15 12:48:34.809131672 +0100 +++ 0008-net-enic-set-Rx-VLAN-offload-flag-for-non-stripped-p.patch 2018-10-15 12:48:34.513096018 +0100 @@ -1,14 +1,15 @@ -From fe5383d133f484d7cb2ad385bbf1e43ad7078682 Mon Sep 17 00:00:00 2001 +From cc76098cd86383279ad285cbeceff5c75ebb899f Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 19:54:19 -0700 Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets +[ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ] + The NIC indicates VLAN TCI to the driver even when VLAN stripping is disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set PKT_RX_VLAN to indicate that vlan_tci is valid. Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type") -Cc: stable@dpdk.org Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley @@ -17,16 +18,16 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c -index 7129e1217c..0eb113d753 100644 +index 1934f8baf1..0cfde4684a 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c -@@ -233,10 +233,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) - pkt_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; +@@ -189,10 +189,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) + pkt_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED; mbuf->packet_type |= RTE_PTYPE_L2_ETHER; } else { - if (vlan_tci != 0) + if (vlan_tci != 0) { -+ pkt_flags |= PKT_RX_VLAN; ++ pkt_flags |= PKT_RX_VLAN_PKT; mbuf->packet_type |= RTE_PTYPE_L2_ETHER_VLAN; - else + } else {