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 E38F9A0C3F for ; Sat, 12 Jun 2021 01:08:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DAA1B4014F; Sat, 12 Jun 2021 01:08:00 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2079.outbound.protection.outlook.com [40.107.102.79]) by mails.dpdk.org (Postfix) with ESMTP id 2012D40E46 for ; Sat, 12 Jun 2021 01:08:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XsZ/OdPxPOYIrTSXMClHVJ4V+BxygHyMI0YGrNwZPZuH8R+nG+0jDGMo0v/TNKJZXBHeGw6CBUWKAxTwSShG7GQPzgyGoIYJYCdhKRdFk9bi52GapC7yd8/uM00PnherXUJGJRxS2ojEplCGReiyVSNAmFcIeaTZaYFNBI2b2ZBN8X4zakUxMsxMmod8X7gBXbkNmQ1DQi3fMQHC9TIoIysVyCRFKsMNfmRXE8qQ6PHre7SWwQCduXF26vIiws0thFt2OYWTBxTnMDz5505Cz6spaTlnRyBUjFXjTO+fBCB+8/YjGGLGY3+kgzt4UFXFTgNu68EHay9h/SRtcJ/UnA== 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-SenderADCheck; bh=FCjhAeOdbZuiSpPx9cdjgnl6ya/KTSNqD+zrsqHcX4g=; b=P5wVm7S4W2PxldnXLTZQMyeG28ki+J0fRsLdE2FfyUugKMeOWPKWqU9vTAKzDFcKUhoCGstkY4WdZ5XJnmV7UK/AJ3qF2zykg8ONBXvyndGz1DHuPOCxOY/i5KAI4q+aY2C8RpIZEFARp6cW5EKdQXUtoci5NWJmPysrNDebLMuKUh79N/nFHfWrNJm66HizKSUf0u2Bz6fxNNTXniV8eQWxdMjAc4RMX+7jafB6/DpQkAOSnrMBzxpgeXSRQ6q5IxO6yCc6tamD30yzZxuRE8MaRKvaUelVIQHBpjh27J/RUonTpQfN+nZXupDmfxBQUbxXmDfE7PetI2+Dchq70Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=FCjhAeOdbZuiSpPx9cdjgnl6ya/KTSNqD+zrsqHcX4g=; b=Me6BOvNb5l+/m2/wRW3SkgTSWBfyTVbmlQLGz50hh7M+n3U6AmoD+4fS6P4ebUBrGeEqqh4gdtKOapk2J3bMcv9XHfTMPpVvYqCkg3sq6iGZn2uZ/00ZvuFsL7j1vZJuyvrJiRAheRFhaJv23LLwBq7hwfIdnZLNrip+PAyjqWONs0yfe0W6kRx/f5lJK5wDyBfgZ6Cemx1DXEXylJMoVIOpn2SxcuohNGnEbnYybqc3Wn04okwcv/2LJdPW9rqiBdETfM8Sr2s8qNOAZYggHLzluWTGrbhL5CGfKbeTsXHOoaAPUaKKzJJ4RABzUYwcJkuxYc/puvMQmy590qV0jg== Received: from MWHPR11CA0016.namprd11.prod.outlook.com (2603:10b6:301:1::26) by CH2PR12MB4231.namprd12.prod.outlook.com (2603:10b6:610:7d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:07:58 +0000 Received: from CO1NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:301:1:cafe::7d) by MWHPR11CA0016.outlook.office365.com (2603:10b6:301:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:07:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT006.mail.protection.outlook.com (10.13.174.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:07:58 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:07:56 +0000 From: Xueming Li To: Qi Zhang CC: Luca Boccassi , Brett Creeley , Beilei Xing , dpdk stable Date: Sat, 12 Jun 2021 07:02:08 +0800 Message-ID: <20210611230433.8208-34-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee95de2b-08ef-476a-cc34-08d92d2dc120 X-MS-TrafficTypeDiagnostic: CH2PR12MB4231: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OTpaQhGTkw4z+8LVovZbVU8ikSR0LLfdHyCTmg9Fxz6RPXP+ogAZ+NHCVjnxNY5WiHGuzUn3FCrjX9yYGetKbvrW4YSsUx1ROd5RCT7CCQzFYXWkN0Re/ZMFD7D09TUDO1Dam9j9bedyRZXYg6EeMT62nNVblv/3U0yJUV+2BTSSvMtKdRkH/+ummPuCz0bjbI8/zYzx0Dsdt4Nb8ruF0ElOcwfH632o1fiqMP36f+WI4dajyJHBM6Gyk8cq3DgfhYtrjZwVxqy4ss92NVskmCVZkt078RHbDNUQbNS3ZcF+YTcojA8Mlyd90dI5zAXrnt+0QOgngZggUTCQDwu5sb/CopMxFMkE/DiZavw/ywv2DnJ1d5yxvvl3Rqzgi5gd62Fz7PQqPx480nbwnLnP2EuyH84xMS7hSSQO4F6ovpQ8f3pnVycncs/QNTHFPzhmZBSnEYep05bj6VbK24rgEaU04Vb+wItTup1iXVTuBYZgHZ58BosqgarnzPFh2SBNO6gZL6JobBTayNALyk6E9Yt3wxN0/PdgYVK7TaSedtAeHe6fJdcXnHf5I3Sq1+7gWnEHxAnfpxHxzh5iAuTEqryTaKE93cDng0kZFoqOL54N6wx0f0SBnYAh6XkiWPHUI+55bNedTF65ok+vJnzdBfL1cCAVy4UWS5b+6iQrVofTmnftQcjgkCRSCmAvEbca8+ViOGC+CS8Tv/a8LU58zfwh7XfCRcbfhQZgyOCBF2IgXvFi87su0sCo9Qner1FirqgeZKW61BO1fZglLbHQfmAzQPZd0J2W2gPqLsmo/6jICbX92nJ/AYgmqvIGq+gh X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(39860400002)(376002)(346002)(46966006)(36840700001)(6916009)(54906003)(356005)(36756003)(83380400001)(36860700001)(5660300002)(8936002)(186003)(82740400003)(6666004)(16526019)(7696005)(86362001)(47076005)(2616005)(6286002)(316002)(55016002)(26005)(7636003)(70586007)(1076003)(426003)(8676002)(966005)(36906005)(4326008)(82310400003)(2906002)(53546011)(336012)(478600001)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:07:58.5486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee95de2b-08ef-476a-cc34-08d92d2dc120 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4231 Subject: [dpdk-stable] patch 'common/iavf: fix duplicated offload bit' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 06/14/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5d2c2857f43cabf67aca8a76bea465947937c012 Thanks. Xueming Li --- >From 5d2c2857f43cabf67aca8a76bea465947937c012 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Sat, 24 Apr 2021 14:03:34 +0800 Subject: [PATCH] common/iavf: fix duplicated offload bit Cc: Luca Boccassi [ upstream commit 44a87aa9c2c89af075cec0f4eedf6ddd7c829088 ] The value of offload VIRTCHNL_VF_OFFLOAD_CRC bit already existed as VIRTCHNL_VF_CAP_ADV_LINK_SPEED. Fix this now by changing the value of VIRTCHNL_VF_OFFLOAD_CRC to a currently unused value. Also, move the define for VIRTCHNL_VF_CAP_ADV_LINK_SPEED in the correct place to line up with the other bit values and add a comment for its purpose. Hopefully this will prevent from defining duplicate bits moving forward. Fixes: e244eeafcecb ("net/iavf/base: update virtual channel") Signed-off-by: Brett Creeley Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/common/iavf/virtchnl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h index b931da61e5..4c34d35ba7 100644 --- a/drivers/common/iavf/virtchnl.h +++ b/drivers/common/iavf/virtchnl.h @@ -248,9 +248,11 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); #define VIRTCHNL_VF_OFFLOAD_RSS_REG 0x00000010 #define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR 0x00000020 #define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x00000040 -#define VIRTCHNL_VF_OFFLOAD_CRC 0x00000080 +/* used to negotiate communicating link speeds in Mbps */ +#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080 /* 0X00000100 is reserved */ #define VIRTCHNL_VF_LARGE_NUM_QPAIRS 0x00000200 +#define VIRTCHNL_VF_OFFLOAD_CRC 0x00000400 #define VIRTCHNL_VF_OFFLOAD_VLAN 0x00010000 #define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x00020000 #define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 0x00040000 @@ -268,8 +270,6 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); #define VIRTCHNL_VF_CAP_DCF 0X40000000 /* 0X80000000 is reserved */ -/* Define below the capability flags that are not offloads */ -#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x00000080 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \ VIRTCHNL_VF_OFFLOAD_VLAN | \ VIRTCHNL_VF_OFFLOAD_RSS_PF) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.566466100 +0800 +++ 0034-common-iavf-fix-duplicated-offload-bit.patch 2021-06-12 06:53:56.170000000 +0800 @@ -1 +1 @@ -From 44a87aa9c2c89af075cec0f4eedf6ddd7c829088 Mon Sep 17 00:00:00 2001 +From 5d2c2857f43cabf67aca8a76bea465947937c012 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 44a87aa9c2c89af075cec0f4eedf6ddd7c829088 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 139569787f..c68128f773 100644 +index b931da61e5..4c34d35ba7 100644 @@ -29 +31 @@ -@@ -372,9 +372,11 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); +@@ -248,9 +248,11 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); @@ -39 +40,0 @@ - #define VIRTCHNL_VF_OFFLOAD_VLAN_V2 0x00008000 @@ -42 +43,2 @@ -@@ -393,8 +395,6 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource); + #define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 0x00040000 +@@ -268,8 +270,6 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);