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 18BFF4301F for ; Thu, 10 Aug 2023 02:03:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 12A8C40DD8; Thu, 10 Aug 2023 02:03:33 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2065.outbound.protection.outlook.com [40.107.93.65]) by mails.dpdk.org (Postfix) with ESMTP id CD082406B6 for ; Thu, 10 Aug 2023 02:03:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fj1xJzGnUYCVyn8shJHDMM6u4MT9iAx49m2XxkIJI6pan5uIAdEGIvYHP+277L+t/n92RF4jzbCyEviEueV8w5eot0b7XdmP08ubfFvkeDY4VuCuQlACTEQLn/g2dYbrkokj9Hmlr6iZmBDKvjwDM9UlpAi7F+vIqPHyMgtRqzTw5NWOfoQtH3znWZF/yo+wSgMSkTfoe8+iNdPrytb5OVkMlRBcVMz+ZVVQXYtbkMjlolXei38+tD11+gEkLPPOILJRqH5MiYYeR6eZr6bgOJRasZ24LcdQKXq3RqUnxRtHwExTU8ygEHxOI6H28Odpe8fGF8B5xpQ1YydEFhNvVw== 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=G7mIQGgoVor3f2BkfPU+ctIBa+1K8RwzymdmbCmLaqY=; b=FUIoHxsnjWAFDkbEEeaMarJLZdAucGHME4vaoS4OSOkK2aHYnlGsSRFimnpkbq7XoRSDUpJL7k+xWNE2EQn0jD8FtmYoIKi4fVmdAVtq0yPe13C6PO3WpL6cTDCQeLCeciC3FteNaLfq+SsbU152sSgdIPqYKAylf3ho1awIotWV8kaMgJj4qbrOVbTsYF+11MPF6rZPvc0esiseqZmYFiaThERgTKEXOHiEpBS54qufmodTpypTzoCbXiIJICso32NY5v0GafknUxnkNtJFs3IqRAIFG+KLkWi0wQdOk/F+5hzmW6TMXXjg/KcGbnI+U5mEojXpJTrNknAdKy8RGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=G7mIQGgoVor3f2BkfPU+ctIBa+1K8RwzymdmbCmLaqY=; b=OIGD4wP9gFwbWqC7PJ1HqR2AEb1r6T0boXsUU9UdHffom06huV0vpmbn5TQq+rJzPi9hx+2To3lp1YrpHxiNkK1BvgHnrklDDmfiyPq2TDx8EyBunX8z1j5iXUUvKSGq8K8EalTTHpENRW+aDZqjLPDCvFXoXX9jkjnvJezCBdrURulZsHEF+IPXi7I7nQy+xoYcNsThlHAxp6vwXObmSC91iPUz9nKNOKm/ybcpAnKo6kesZuHOEnNp4xBozWwkRiFVhs+DTXU4OdTnOf7TPg9qAwWLiPpa/LJRu4mWAZw8s4lVLBsxYwtpTzFDW4D8w9dhsrctabnDVLLJfzFWdA== Received: from CYZPR20CA0022.namprd20.prod.outlook.com (2603:10b6:930:a2::21) by CH3PR12MB8404.namprd12.prod.outlook.com (2603:10b6:610:12d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Thu, 10 Aug 2023 00:03:26 +0000 Received: from CY4PEPF0000E9D4.namprd03.prod.outlook.com (2603:10b6:930:a2:cafe::1d) by CYZPR20CA0022.outlook.office365.com (2603:10b6:930:a2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:03:26 +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 CY4PEPF0000E9D4.mail.protection.outlook.com (10.167.241.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:03:25 +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.5; Wed, 9 Aug 2023 17:03:13 -0700 Received: from nvidia.com (10.126.230.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; Wed, 9 Aug 2023 17:03:11 -0700 From: Xueming Li To: Wenzhuo Lu CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN insertion in vector path' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:59:06 +0800 Message-ID: <20230809235947.1187-34-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: CY4PEPF0000E9D4:EE_|CH3PR12MB8404:EE_ X-MS-Office365-Filtering-Correlation-Id: 71760b5a-46c3-43fa-d0a9-08db99353842 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JHn64sGQU3vGyfDrfgJn1UhmTaWb1csy/r0LapexzHBu3TKiDhui7lID4DeWX7vkCCQzp+y/+rW97qzh2ck+XFj7Yq68mkNZ9F6RAn5XI0xMYDsep/nyxbs2iV6Eoh4t1s+/n0Rh/eXitzb2qxkr8fPNzM4del357pDS4J0eyF4mJwmG9kUEzYe60fWVFf9O2HnTM03u+fXdkWciULCAHXgX8Z+kpSp1TC0v3sz546P/z7Ckq6kgwzMnEksTNLHEMyUZTMHAl+zR7wFLkS0ZWT0mrvCPNXslyJsXiIDclUxlKSBaaCZyXnIu1cjeTDPvMqgbnn9svROLinAtiyIqq08q9b9cmOH/oVn+Awr3zlrMIvkiScn31PZTXsHko6l/4czVVwYXiK7UdQBoq2wUcDtLW/orn1Yn5MN54srW0s0MAWHa2++nyynn+6yhDQosHysS/qS2FtI/hHTF1qDshnCzq/pFizkiuREBkuEforNvr0w9Qrc8Ah+XlZDZD5M2jaxSpFW0zqz7axBFCUfDcpl3+wHzrNtFrrNdNPnFAHZZbqaEGOorQuZpPjD2emtv11YD7pEqUJ+oztKyKs+YhkoBpu8r8/eZpR0NTfBv3vFxu3f4JO1nP1JXwru1mMzKVGt9onpgcf8eSpiMufvJA/s4nKDCp3WjehxxNdjsFSG+QnPxbeXr9ROUKdH3jlxMfCKIAa6EqOfBtmvHB4r1RVY5j67K663S5ij9piciZfcMGVl9YIq4x8d2yt9GKewiAyIn1r7iCfXVsJyJOPjpmw== 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:(13230028)(4636009)(136003)(346002)(376002)(396003)(39860400002)(82310400008)(451199021)(186006)(1800799006)(46966006)(40470700004)(36840700001)(2616005)(426003)(82740400003)(316002)(41300700001)(6666004)(336012)(2906002)(83380400001)(86362001)(6286002)(16526019)(36860700001)(47076005)(5660300002)(40480700001)(8936002)(55016003)(8676002)(26005)(53546011)(1076003)(54906003)(966005)(7696005)(70206006)(70586007)(40460700003)(36756003)(6916009)(7636003)(478600001)(356005)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:03:25.7870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71760b5a-46c3-43fa-d0a9-08db99353842 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: CY4PEPF0000E9D4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8404 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=5c23daed42046e8ef4e82cdb6c134c6ff817fe80 Thanks. Xueming Li --- >From 5c23daed42046e8ef4e82cdb6c134c6ff817fe80 Mon Sep 17 00:00:00 2001 From: Wenzhuo Lu Date: Mon, 3 Jul 2023 10:22:00 +0800 Subject: [PATCH] net/iavf: fix VLAN insertion in vector path Cc: Xueming Li [ upstream commit efe1b63775e8369b867f411d7bf8f61e97bd446b ] As the VLAN insertion is partially supported in vector path, the behavior is different in scalar and vector path. For a VLAN packet, if using scalar path, the new VLAN tag will be inserted after the original VLAN tag. If using vector path, the new VLAN tag is inserted before the original VLAN tag. To avoid any misleading, disable VLAN insertion in vector path. Fixes: 059f18ae2aec ("net/iavf: add offload path for Tx AVX512") Signed-off-by: Wenzhuo Lu Acked-by: Qi Zhang --- doc/guides/nics/features/iavf.ini | 2 +- drivers/net/iavf/iavf_rxtx.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini index 9db2865b71..5cdf0ddee6 100644 --- a/doc/guides/nics/features/iavf.ini +++ b/doc/guides/nics/features/iavf.ini @@ -21,7 +21,7 @@ RSS key update = Y RSS reta update = Y VLAN filter = Y CRC offload = Y -VLAN offload = Y +VLAN offload = P L3 checksum offload = P L4 checksum offload = P Timestamp offload = P diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index 2c4d8e2700..354326c235 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -27,6 +27,8 @@ #define IAVF_VPMD_TX_MAX_FREE_BUF 64 #define IAVF_TX_NO_VECTOR_FLAGS ( \ + RTE_ETH_TX_OFFLOAD_VLAN_INSERT | \ + RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_MULTI_SEGS | \ RTE_ETH_TX_OFFLOAD_TCP_TSO | \ RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | \ @@ -34,8 +36,6 @@ RTE_ETH_TX_OFFLOAD_SECURITY) #define IAVF_TX_VECTOR_OFFLOAD ( \ - RTE_ETH_TX_OFFLOAD_VLAN_INSERT | \ - RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | \ RTE_ETH_TX_OFFLOAD_UDP_CKSUM | \ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.445710000 +0800 +++ 0087-net-iavf-fix-VLAN-insertion-in-vector-path.patch 2023-08-09 21:51:18.254352000 +0800 @@ -1 +1 @@ -From efe1b63775e8369b867f411d7bf8f61e97bd446b Mon Sep 17 00:00:00 2001 +From 5c23daed42046e8ef4e82cdb6c134c6ff817fe80 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit efe1b63775e8369b867f411d7bf8f61e97bd446b ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index fbb5b7df32..55a02165a0 100644 +index 9db2865b71..5cdf0ddee6 100644 @@ -27 +29 @@ -@@ -24,7 +24,7 @@ RSS key update = Y +@@ -21,7 +21,7 @@ RSS key update = Y @@ -33,2 +35,2 @@ - L3 checksum offload = Y - L4 checksum offload = Y + L3 checksum offload = P + L4 checksum offload = P @@ -37 +39 @@ -index 2bf2e3252a..8d4a77271a 100644 +index 2c4d8e2700..354326c235 100644 @@ -40 +42 @@ -@@ -27,13 +27,13 @@ +@@ -27,6 +27,8 @@ @@ -47,0 +50,2 @@ + RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | \ +@@ -34,8 +36,6 @@