From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D3F341D8D for ; Mon, 27 Feb 2023 08:16:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 499E14114B; Mon, 27 Feb 2023 08:16:39 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id 6F2EE410FB for ; Mon, 27 Feb 2023 08:16:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H5YxaKCaiup7aUErUpbgvVdPCmlTTWXrifRabfK8LHe8726LfPUAwpgs0bXnpa5xVSrowSakI5MOeIPF1Dmotfff63GE3vO0Gy8RFAstFAdtt/huEDPPAaKc+npBdprpKBZlbZg2c9uByzXhVI2Boe34hltFm/Q2Q4WrhN3JsUo7FAc2rDAag5/aMb++4aZzj6O4mPxtaxR0aY1kQsdQJKdXVj6x1fgLR0OwTvywqHScQv9aUWxs4yvtXw5e5TsxEBZ/SiCixFSKuXusipI9Hk466CleHexz6kOLkndA7jjEsOhUfyReJxP9renfbdWsMeoNmIQA64aBPuIokW9zog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PfP18CLS4W0hPN1aqt3Qa1kSh8aBQsT9Ogo0c8alVn4=; b=UP7ROzsC8lFo3tMNwCBZR6LB4XIULAFBeM00c52Srd3ypLreXq1+xBWYwumpJ0VSoDBuxQ/1bF4qRzYFIhqTbsaQXiNRX+vX9oTplZx0L0qrRQnaTC5Mg54OjB3kzSZwvygECct4AEpwIkHzBEvDitWzYr9N263AruvVNY13WXrMx5K3mtQCOEVHFAXb3ABtrU8dm58Q37UGIrZKVP7TwWz54pl31mzrOKjmAuy9WWoror9gp/zN+Nb65Gnr8zu4KGC7qJqAaCveVkPGEQc7DlYp8LBjK5y2nUY8H3Oua/SLNRj9qZ9NfwmsaSlAvKAPf5nO482a35X3csYl/O1dUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PfP18CLS4W0hPN1aqt3Qa1kSh8aBQsT9Ogo0c8alVn4=; b=q5d8L8vhpyLl33+C+EGf8iQg99WzKdohMl9Gfi9DPR47cwp/nKuEijTILXT99ZJ31P1elzfE8fkeGJ3br3vfNt6iet0IlWSFIXN+ftKZACM0Qf3Epa/UpgKHzQuSHxbJC5HMpPlwkE8xOozsasqiq8OpnymswRoRLHbQ8y3oq20PDZNxwDJof9R3LytBOuPik/6gKEJz1iM/WmH1LXsaCz1+M4bbc1HB2TZulOl3bldDR5Jbe4UHSoTJLVnenNEC6zAhsfCiztvWQ92imKL/EhhXbAIiDBL9R5ZcJCXQlsg2LHBpFNCViHoY7CNdddnQNeNfR938rAw2A5T9Rf5tRg== Received: from DM6PR08CA0012.namprd08.prod.outlook.com (2603:10b6:5:80::25) by CY5PR12MB6347.namprd12.prod.outlook.com (2603:10b6:930:20::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28; Mon, 27 Feb 2023 07:16:36 +0000 Received: from DM6NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::5a) by DM6PR08CA0012.outlook.office365.com (2603:10b6:5:80::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:16:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT055.mail.protection.outlook.com (10.13.173.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:16:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:16:27 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:16:24 -0800 From: Xueming Li To: Michal Schmidt CC: Maxime Coquelin , Wenzhuo Lu , dpdk stable Subject: patch 'net/iavf: fix VLAN offload with AVX2' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:49 +0800 Message-ID: <20230227070107.15664-141-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT055:EE_|CY5PR12MB6347:EE_ X-MS-Office365-Filtering-Correlation-Id: a29bdc8b-d005-4473-37cf-08db1892900d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lBKzqFM+7yhBiD5Cw2DeOzPQglUojvWQggu1zj+out3JaeAsDtvV3fQS+dcFb6LualeYn8z9FruSruofHKzJ+PfEAaqP8aG87yX581WoaxNOCrf6tMX8nJ9hwNw+a9J7lpTpfFjZS9JtDYWAXph5/RAnLOKQwQ9H7zSkaouL1JAunBdqe1De/zmnNqwNkU0ax8ppgaDJS53dmWvA9zBpaHPNLQdbx/aJiUTzeE1RX2OADmOGObqyxmMJGyPVBKIzxChMscv22t1RRzr+s5wfxQHLP1hWumPcFF5lwo6ZpHjquQRPSfvbggtTOJakh2Rr067aopYAxprhZwwOuX+IfKU6sVS2KH8I6m/E2DvMj06Vrm5u7NrgXznDbUMqdl5VLHFNlK0C7KbGR4QXhM2J7m4yWI60JahH5++mfSZ1joy1bTzLYlgzmyLScAn/mOj6ki0ijnzvfa3ygliNnIrEPtfqEmACliX77ZsG7pzBHC+9ClQeCkJW+FjzjH2YXv7kudOxvcmHQ7EHN/wUjTBNuVRWnXW3NcRl723dkvd2svMD2ccFAAT9GpUaL0qEbtOUh1o+aYUCo/QCHNLHN/GsbNpLlAIPCNT6g+L3yPrxC+tlnsGfXl6MdnOEyRgTCAMqjFtewhoWeHnwax/nnH+2fAbQT3PASTj8ujYS6nNWYWhoD2QFux917S0Zj3glYUauK1HH0VM+FzIf9kNhgGplpYX7yAU+2v8t3oYD0dBN2utHgpjOBGoqLtaXKZQEFmpy2xacrlCmcxzTjk7qBniO+wMthqTKAm3dDJ5W6XTH8rlIeNeAtaLJIB7TOABZ8Ail X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(396003)(376002)(346002)(451199018)(46966006)(40470700004)(36840700001)(336012)(426003)(47076005)(66574015)(36860700001)(40480700001)(36756003)(86362001)(55016003)(34020700004)(7636003)(356005)(82310400005)(82740400003)(40460700003)(83380400001)(8936002)(2906002)(7696005)(5660300002)(70586007)(70206006)(4326008)(6916009)(8676002)(41300700001)(54906003)(19627235002)(316002)(26005)(186003)(16526019)(6286002)(2616005)(966005)(478600001)(53546011)(1076003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:16:36.2571 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a29bdc8b-d005-4473-37cf-08db1892900d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6347 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. 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. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c0280459158695a9d64bd6a43fc27c3eb7b8bff8 Thanks. Xueming Li --- >From c0280459158695a9d64bd6a43fc27c3eb7b8bff8 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 8 Dec 2022 13:19:16 +0100 Subject: [PATCH] net/iavf: fix VLAN offload with AVX2 Cc: Xueming Li [ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ] It has been observed that mbufs of some received VLAN packets had the VLAN tag correctly set in vlan_tci, but ol_flags were missing the VLAN-indicating flags. _mm256_shuffle_epi8 operates as two independent 128-bit operations, not as a single 256-bit operation. To have the RTE_MBUF_F_RX_VLAN* flags reflected in the resulting vlan_flags for all 8 rx descriptors, the input l2tag2_flags_shuf must contain the required pattern in both 128-bit halves. Fixes: 3a1aca384d3a ("net/iavf: fix VLAN tag extraction handling") Signed-off-by: Michal Schmidt Reviewed-by: Maxime Coquelin Acked-by: Wenzhuo Lu --- .mailmap | 1 + drivers/net/iavf/iavf_rxtx_vec_avx2.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index eb5bd55eb1..c5ee0741b7 100644 --- a/.mailmap +++ b/.mailmap @@ -888,6 +888,7 @@ Michal Litwicki Michal Mazurek Michal Michalik Michał Mirosław +Michal Schmidt Michal Swiatkowski Michal Wilczynski Michel Machado diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c index 862f6eb0c0..b4ebac9d34 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c +++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c @@ -1074,7 +1074,10 @@ _iavf_recv_raw_pkts_vec_avx2_flex_rxd(struct iavf_rx_queue *rxq, _mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 0, 0, + RTE_MBUF_F_RX_VLAN | + RTE_MBUF_F_RX_VLAN_STRIPPED, + 0, /* end up 128-bits */ 0, 0, 0, 0, 0, 0, 0, 0, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.394777600 +0800 +++ 0142-net-iavf-fix-VLAN-offload-with-AVX2.patch 2023-02-27 14:08:40.929237000 +0800 @@ -1 +1 @@ -From eb24917428a1db11d6736e8c076077a47b991f01 Mon Sep 17 00:00:00 2001 +From c0280459158695a9d64bd6a43fc27c3eb7b8bff8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit eb24917428a1db11d6736e8c076077a47b991f01 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 2cb7f5accb..e111e05bc2 100644 +index eb5bd55eb1..c5ee0741b7 100644 @@ -31 +33 @@ -@@ -894,6 +894,7 @@ Michal Litwicki +@@ -888,6 +888,7 @@ Michal Litwicki