From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32A62A051C for ; Tue, 11 Feb 2020 12:39:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 207225B3C; Tue, 11 Feb 2020 12:39:25 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 8C4061BFA5 for ; Tue, 11 Feb 2020 12:39:23 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id q9so3073188wmj.5 for ; Tue, 11 Feb 2020 03:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UhyOZva6P7/rg5VIt96va6q+u9eAJCBmgbhGvGDp/uU=; b=mTGTSYx2NkOTlqj5t+H5eUMZr628CHmtT9Re/DLTyrpeyfGiDE7ZlolqcUTSP1mwmu cmFrLWkTqLy9hq1MhTfLcdUse0CtU9uo13i0Q6e1h5cZmYpBGtWukT39oaUuJYO7WObU GQCGjvXalon8eeKgDPXASFR7dkiabVGEhfb6Bs7z48SQzNsbutPIYGvqCL7/TZ10ttHu f80LYa02InPryS77STqRxHNmQeuMiT4J5nrAmRJXELntg6NbFli3h5dqIidPXsonrILS nW4xJpwqI7z57Ojnij9wD+t5/HHT/wE5VgXm5x3pzb0TBaA3wLIwWGTUdGe6YtXz1ZKq 2vvA== 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=UhyOZva6P7/rg5VIt96va6q+u9eAJCBmgbhGvGDp/uU=; b=fM9FcWPWgk34iVLGNXIchokRBwhA21E7mmY/zDVJKs+pB95l6ivj7S7ffpDhtHbgzj 6uimWzGjvJuuK4ekBdQM3zNKe5kajwwaY5ohVzseUkMc/Zt22iwKQEungC4DTgGFpFrQ PlhXdvp2egELhxU8e6oEkDSNc/rki8T8ROOtYXPdgG+HB98cU/sgftpsQcxl854wPC0b WJ6SPik4fVRUjEI6q9ibZSHrPKlsQX4DNC2G32X61dqQM2F5whW2aFdcSLPruZ1C7n9W eCE0/21TSAkT/ZW591LIeLxPkZeFoFHcp/VprfcKvDYfSE0wO+ZbPO1fUqKgvxX6KobM x9Gw== X-Gm-Message-State: APjAAAUNEaIRrcQ/Asf555TCouwaRQvY/ysFaexoeo8LxLb7MzWuNxE2 B5LeR5nLX6yDKY/hpze3O6s= X-Google-Smtp-Source: APXvYqxOcDwGCubFnzu7diGkU7yaR+LqaUYl0FwC4AtHnLl58Skzo6XN+jejhn4eoQXikXKVT4YJ9A== X-Received: by 2002:a7b:c088:: with SMTP id r8mr5272131wmh.18.1581421162089; Tue, 11 Feb 2020 03:39:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a16sm4790917wrt.30.2020.02.11.03.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:39:21 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Ajit Khaparde , dpdk stable Date: Tue, 11 Feb 2020 11:21:24 +0000 Message-Id: <20200211112216.3929-138-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix VLAN strip flags in SSE Rx' has been queued to stable release 19.11.1 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From ab9e33077bc7753b843a97080f32bbddeaf3316d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 21 Jan 2020 16:47:33 -0800 Subject: [PATCH] net/bnxt: fix VLAN strip flags in SSE Rx [ upstream commit 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af ] When the VLAN is stripped from the packet on receive the driver must set the PKT_RX_VLAN_STRIPPED flag in the mbuf. This is done correctly for normal receive in the bnxt driver but was not being handled correctly in the new SSE code. Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode") Signed-off-by: Stephen Hemminger Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index 22d9f9e84a..31457300a7 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -289,7 +289,8 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, (RX_PKT_CMPL_METADATA_VID_MASK | RX_PKT_CMPL_METADATA_DE | RX_PKT_CMPL_METADATA_PRI_MASK); - mbuf->ol_flags |= PKT_RX_VLAN; + mbuf->ol_flags |= + PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; } bnxt_parse_csum(mbuf, rxcmp1); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.475336510 +0000 +++ 0138-net-bnxt-fix-VLAN-strip-flags-in-SSE-Rx.patch 2020-02-11 11:17:38.652006059 +0000 @@ -1,15 +1,16 @@ -From 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af Mon Sep 17 00:00:00 2001 +From ab9e33077bc7753b843a97080f32bbddeaf3316d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 21 Jan 2020 16:47:33 -0800 Subject: [PATCH] net/bnxt: fix VLAN strip flags in SSE Rx +[ upstream commit 88ba6cac4a646ff479d9dfcc830e0d650fd0d0af ] + When the VLAN is stripped from the packet on receive the driver must set the PKT_RX_VLAN_STRIPPED flag in the mbuf. This is done correctly for normal receive in the bnxt driver but was not being handled correctly in the new SSE code. Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ajit Khaparde