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 74105A034F for ; Wed, 10 Nov 2021 07:48:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E10940142; Wed, 10 Nov 2021 07:48:53 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2044.outbound.protection.outlook.com [40.107.223.44]) by mails.dpdk.org (Postfix) with ESMTP id E6F9340E03 for ; Wed, 10 Nov 2021 07:48:51 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m+KuI48bCY89971kERUCMjIqRJJIoufa1XmmnwOExLEwSalV0Pxi7E7EgJ0U54dzL47nJHylZJ00gUj2SxxWwsQvZKCupp2wcsuj7SoCEEr/zm1MYJm+6A+XiRmh0EyqQUF4zA774QGZqvffwQDIjthMjVB4NfJVzuXRV2QGxymfdvUp8dBYy1Aj6s37Lpc4tPMdI66OzBfQrahWzTIIm5sT7Bk9oP7GWw5jlTe5gzj3aWS63dRGKhOdyj8hYY9sVyVFALCmKlLcy3xGzQB5YdyTNQUFUPfSZEZgbliMPn6A2+XZOUpsCan5rWHN5BIThC/QVLBqSxAvpjgJGJ3XGQ== 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=WwFXkGC3B4/wDbK3wbk6nIFq8k6e8CGUWJWRW0RBMDQ=; b=kn/avr9+Fx0olKCvl1jnn4do3FPZXDZGEB9CTrIcLQodO2sBCM6uA6W6TUPA1pyuzH9L1WQA1NcFqZvrYqq5Ef73+yLfTThI0kaMwz8LgVv9CnI7+VyHLN9vVxh+VdrIOfauu5kUT4ZxkNfXDkI5tiFjaZFzBJ30RGjDHw9G3vrg2813LRlx0IvgKBNr+hMqd7adtY1nSbbwBkc8/KHdcZtg/8AUEoSdq/YfcG/euTlOqfzLE5z7IEof4XxfbFwfc/Clg6DhHb7WwFl1Ybq/7KtBMfn0L8cervnVGrZN7inlSSzYixYiftYMePjcbwRDqT9n9p0py+3zEJuO9qEwqQ== 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=quarantine sp=quarantine 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=WwFXkGC3B4/wDbK3wbk6nIFq8k6e8CGUWJWRW0RBMDQ=; b=BFWpX9QBlhMdD53t1cR9zUdkoLyyTFlM+UuKy8Fd+nD4ABbztfGajZg+3hvAGUo9aatMia2m8q+rf9liLtB736kpRvOlNXMmxQz/MB/XlZXWbt0133Yz9L2fHyJs/jB7S63jWxkQI452C8hsFCDkQGG9DkF1YIoQZdk7u6XrEF8FLd5eF1MROxto7y7euVT7oPbkeYMNUuZSDAbOdCxmMkHIM+8Cqw/FHhLlk+jR/x/v6eRYSy3sQVhuTz75Ifh84ec5H9KHD8+SrHRTrv/Z26Jaoori4JrlaIeEboPw44ZI9WwnoHnPr6nhfqQJcHsbUD2Z35CQVnPqarPmxDqx7A== Received: from BN8PR04CA0063.namprd04.prod.outlook.com (2603:10b6:408:d4::37) by DM4PR12MB5231.namprd12.prod.outlook.com (2603:10b6:5:39b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Wed, 10 Nov 2021 06:48:50 +0000 Received: from BN8NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:408:d4:cafe::a3) by BN8PR04CA0063.outlook.office365.com (2603:10b6:408:d4::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:48:50 +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 BN8NAM11FT037.mail.protection.outlook.com (10.13.177.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:48:49 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:48:47 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Christopher Pau , Beilei Xing , dpdk stable Date: Wed, 10 Nov 2021 14:30:32 +0800 Message-ID: <20211110063216.2744012-149-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33e14d37-683b-407d-b2bf-08d9a41626ee X-MS-TrafficTypeDiagnostic: DM4PR12MB5231: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QFj1ZWqhG1n+DyDwKiYENAARSkcm4smi/7X0jc/jmystnKbUolyZ8c9n1JTIEM0smkSFwWc8TG6QUujeF+GEu+6llf3mTfRk6ISc4zHUUFjP8bygu1uKP964vw0i0BOrdgXvYPpIx+mXXRa1nVS7yfPx9DS5aruW/YIjrmhiDDeCZKUPazxTgsatiZrG+4c9h7LY1lTdHDVvvEB2fkrFuh9YPKUnLyyOC26saUhG9BJ6pmUBOIEieGal44v7CWIknosrrM08HbVjCHYgqUetubzZA9SHoqWq+rK1/lleZ6fmKkGuNGRXlHgMAwKDXLHkU031xkx/FSuqUlPIWyhhwYw4FFo40SmHKYte/tcpEWxYkFiNhE1cYP002xfIaQpW6rYuiFIEpdaUDm2hg9Ynj/rm0EH9vxoCZXEiPWENUXNus5uRQKzbkysz3s1OuxivaIG3rr+m7Ez1ozSyTDzeeFt40wSqytrqKKLm3v4eKzDC1vTGouEffyoWHm4WwVKoOEkfiVPLHLDQJa6EqOKzBqR6doGLdq/qq04T9OiKo7hufnPRFj9vHq5ufBWFZUsJ8T+9lTSxINSU3uLd9/mbBSwQKo/Tn8KSgHCw7esxPhuGik04sYJGjEmE6TOI6SoM28M7LzYrZwq/IySiMB5MbkWda8b6xG3u+KLJG/YVXm0bkKeqrJhn77tDYwNN4vmhoL8wr9c4YZ09YbNYBh952aAXKTEqdyxss4pA1TUMR/pTAY1a9FddfhDUtAXEJ5UrGj/hLhVnYvACU4MuTUxjViriv0dm2/dZOBNkbe5MKAMXTXrFU6lK43qcNOIm2zn0lqkYd92DgueRmPM9cCPDww== 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)(36840700001)(46966006)(47076005)(54906003)(53546011)(26005)(7696005)(16526019)(6916009)(426003)(70206006)(186003)(356005)(36860700001)(7636003)(2616005)(508600001)(82310400003)(83380400001)(70586007)(8936002)(4326008)(36756003)(55016002)(1076003)(4001150100001)(86362001)(6666004)(966005)(336012)(36906005)(316002)(6286002)(5660300002)(8676002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:48:49.7440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33e14d37-683b-407d-b2bf-08d9a41626ee 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: BN8NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5231 Subject: [dpdk-stable] patch 'net/i40e/base: fix using checksum before check' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/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/ae2b2f46f532c26737476c22bf628190cab1eff4 Thanks. Xueming Li --- >From ae2b2f46f532c26737476c22bf628190cab1eff4 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:51 +0000 Subject: [PATCH] net/i40e/base: fix using checksum before check Cc: Xueming Li [ upstream commit e59d949182767cdf8c7ee1b2637034f50a8487fb ] The variable checksum from i40e_calc_nvm_checksum is used before return value is checked. Fix this logic. Fixes: 8db9e2a1b232 ("i40e: base driver") Fixes: 3ed6c3246f43 ("i40e/base: handle AQ timeout when releasing NVM") Signed-off-by: Christopher Pau Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_nvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c index 67e58cc195..f385042601 100644 --- a/drivers/net/i40e/base/i40e_nvm.c +++ b/drivers/net/i40e/base/i40e_nvm.c @@ -755,10 +755,11 @@ enum i40e_status_code i40e_update_nvm_checksum(struct i40e_hw *hw) DEBUGFUNC("i40e_update_nvm_checksum"); ret_code = i40e_calc_nvm_checksum(hw, &checksum); - le_sum = CPU_TO_LE16(checksum); - if (ret_code == I40E_SUCCESS) + if (ret_code == I40E_SUCCESS) { + le_sum = CPU_TO_LE16(checksum); ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD, 1, &le_sum, true); + } return ret_code; } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.520872908 +0800 +++ 0148-net-i40e-base-fix-using-checksum-before-check.patch 2021-11-10 14:17:01.934078906 +0800 @@ -1 +1 @@ -From e59d949182767cdf8c7ee1b2637034f50a8487fb Mon Sep 17 00:00:00 2001 +From ae2b2f46f532c26737476c22bf628190cab1eff4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e59d949182767cdf8c7ee1b2637034f50a8487fb ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org