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 8443545CE3 for ; Mon, 11 Nov 2024 07:35:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 756B740E2D; Mon, 11 Nov 2024 07:35:17 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75]) by mails.dpdk.org (Postfix) with ESMTP id B8A7940685 for ; Mon, 11 Nov 2024 07:35:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pfuNmfxrxTcUbBJf/Z2hZdLFQ6SdX7swQCnMsoJ4GrewL2SqWVJqqpiUO9zFiF0tTkDvPMQZk6VS93xMFOmEqIPx0opJknE9HW4hp291nPBaQhFpDnlkyo/o5r18V3C1Sk9wgx0q8LTgyI74HDGt29WcvBMwx0J6VZ3amvqGicwOwinIus5H+mnBL4krTp4H0xsh0SGEHtO5GBmrKxsMnvoQ4CXJj/2x53wpz/dBlaAhEnGAYo4b9EJbDwoela6+RuX60UHJfY6UhDp6TykxdM0OlqxmcDKhGGlvjMw8VKVnrCBWlurX9G5Z5UV3VqYr8bdjXlvOArrYbEdr0W5dtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=AD0p7ktnxq69PEYx9y5/ru8uIsS44LqMBQXbT6P8vxg=; b=k2X/EEWIdgXPaK20thQ5+9Q9hkmxaOCfm7pNlrIe0d3FEt8PpZ+DeB3VU9LjKpTBKJWjbkomwd6mniel4T6d0yihhClNm6LftgBUwUR6e1N+DNfy1YEQ1J/+ZlBMaP7Vtba6MB0eMkkPzowEBzy6rZ8qubLxr58HnykWWb3IFrQZbvq3PoPu5v8LccZwaFrwrKnEuv/xYMhXMeXjTCcU1rFaoiNevLJVsnuyzugFMh/yC8NgM5VCG1P93t/7wLwKXF08IG29EA7soeqw6+eiBoz1QpYVGlT1hFXj8fZ0wzCYdumpIjFXxSGlTtJa87ubQ2QShV6Hc5DCOAHugIf7sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 (0) 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=AD0p7ktnxq69PEYx9y5/ru8uIsS44LqMBQXbT6P8vxg=; b=nRuBbH7Qeew8vXypHkTXALEq+a0rT1fKWGzmHDopV94sEfJJIVOiI6rRasBCWnv8y8uEJ0sgqexsiVbXSQz8zCtz9HIfOnFgxGiIuxiauWMQs/mjrmq2CAVAEOxmdvgCT7G1hJl8DjidfEnHBI1H+BTnqpRmNLGa06CrECajgwsW1o2czkMBgSGYLJZr0CCTLebmokAn25VgtIvTICXapbt8Vl3oZ82HA8Kfn7zP9KrwLkYVwijtNjt/HVrxsrIQfm/W/1/X1Px2Hu91VKhbFuuDy6BWJ1yPq2ffZT7GNEKUgJf27fk7tGRpH21vkHT11ebglN1p3YoUfswX8oKvSw== Received: from BN9PR03CA0772.namprd03.prod.outlook.com (2603:10b6:408:13a::27) by BY5PR12MB4306.namprd12.prod.outlook.com (2603:10b6:a03:206::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:35:13 +0000 Received: from BL02EPF00021F6A.namprd02.prod.outlook.com (2603:10b6:408:13a:cafe::e1) by BN9PR03CA0772.outlook.office365.com (2603:10b6:408:13a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:35:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00021F6A.mail.protection.outlook.com (10.167.249.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:35:12 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:34:58 -0800 Received: from nvidia.com (10.126.231.35) 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.1544.4; Sun, 10 Nov 2024 22:34:56 -0800 From: Xueming Li To: Barbara Skobiej CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/ixgbe/base: fix unchecked return value' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:45 +0800 Message-ID: <20241111062847.216344-60-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: BL02EPF00021F6A:EE_|BY5PR12MB4306:EE_ X-MS-Office365-Filtering-Correlation-Id: 63ee8805-fc6d-4faa-bc8b-08dd021afef9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9WMh7VppM2ATnnXHBtwsc1J5MrluODq4YNU5wegb44Ybff1QeexSF+fRqyyU?= =?us-ascii?Q?OXlkww5vX4wVgvA8MEt1RLI9eUAe82sTOAUHCF2uNrYyHK1YiiGoB2MVkD1N?= =?us-ascii?Q?FDPFtEGZSLa/h/rwkmeacyw+9v6j1V5C3hBEtrqgJhMObQcy6fRZ+y/Ry6X0?= =?us-ascii?Q?wS17oHjp06A1NcbnPIIqmOfWCWBii5/dc3jCxRdTXwZFakhwjzDYOqRuUACM?= =?us-ascii?Q?NBzNFmIuOWmipynoHU1Vat8n6xcHyhp2wCtnXwQPu3Mfk9uZQmRzA/sAUnNy?= =?us-ascii?Q?ZekW+9mKUumFS5tBJ2COGkuuw92yUPKUsqbyfyR9q1rGIdioZ74jqNbh3IqE?= =?us-ascii?Q?a4KJ7LAywtIzGvW7IFPVqzwEP5JNASGiBpGji5Q0YzIzTAkiGQN++8+t3Da9?= =?us-ascii?Q?ZLbQT0HPEP5wvVN1lYP02HPQD5QOx+yxGdhUxC9tyra2EhpZNiHm5lutbNdm?= =?us-ascii?Q?sSt8i6XLXlloSeAV8XwH1dq9EHJV4OuHxaQFV4iHb2on2OA3Ts0eBx3DxZK4?= =?us-ascii?Q?TVbXuvZoqsX6ibmmBDPnX7r6e2Hp9M9RJdlW7x2mcT3yGPX98DyJ/mORWrBL?= =?us-ascii?Q?EmqU9qlew+HdPUe7/FTLYJsf7IcGqa4azCJsWZ+3rKBGrBgGIIOcHnM5LGWP?= =?us-ascii?Q?coHFuhKhxKCUsdNPuYm3jSFjoeeWwn5mSRkLn5uBxiuBBs0NE5xtXUnFgHv/?= =?us-ascii?Q?pzARL7e7ecDqQXYHzdPbw/Xt82qPJjIWQjZWd3EvvA9nlzlYD16Fg+GQJNCp?= =?us-ascii?Q?2UZZjRSHznVSdbkn6vUfzu5oNxB901DyU73Tsh9Ih/pt7WU8ZZ1xs/wXy9O7?= =?us-ascii?Q?reU6E+UasD1f6chgrWSHYymEGExMBh8tXtYcZ9N94wY+teXE8pSpg3X//OLj?= =?us-ascii?Q?U4Pr98x6zxaJiJ+VV9T/9rKE3hxhIjNnFlx66P5UetI7ADzMJs9NyTFQrOAF?= =?us-ascii?Q?yyWUmbF/sebHFiGJWYvEPm+XZk5Ysz6NOUsxGlrzrAGX8YsHrNuJWAnz3Jma?= =?us-ascii?Q?m1WAO/7ncgJTP8b/Hmj9mqtj14ZNzGQHT/cgbrWfqs9GPaa2AWRWFEs4sHT/?= =?us-ascii?Q?Aky6fxv8rhXuwrw7oO9XMfq6gK7r/LIHOhPqSRG3bXLOs67IJQ2UIvoW7vnM?= =?us-ascii?Q?8WQlLceYzDMZeF/DPVAnUQmBOojk1+u7Yy90h06r5RtScWvNLRtBOjnWJ2Xd?= =?us-ascii?Q?jHzUefsW7YP04i1EjM5MQku7/qU17v+V/L6xUE2sF65MobMuV5ZNZIFaAc4c?= =?us-ascii?Q?7ot4SV5roxMl3y7H9Y9lf/K+UT0na9dc55pC2kw9s3y7dAwFXiARxB2BLJLZ?= =?us-ascii?Q?D8/jd8NfQUXHn5PY5dNmAWJQg5VRc/dETcf8xv/eUZd1+dPNHHXjkBKMxDD0?= =?us-ascii?Q?LFts4milI6hbgYfpqZM8wkf/Y8fvz6PKGJq1UNbtqeqGcPdBzA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:35:12.5100 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63ee8805-fc6d-4faa-bc8b-08dd021afef9 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F6A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4306 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 23.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 11/30/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=1d3aa94783958688adbc498e1bf6413201dd28cb Thanks. Xueming Li --- >From 1d3aa94783958688adbc498e1bf6413201dd28cb Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 29 Aug 2024 10:00:11 +0100 Subject: [PATCH] net/ixgbe/base: fix unchecked return value Cc: Xueming Li [ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] There was unchecked return value in the ixgbe_stop_mac_link_on_d3_82599 function. Added checking of return value from the called function ixgbe_read_eeprom. Fixes: b7ad3713b958 ("ixgbe/base: allow to disable link on D3") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/ixgbe/base/ixgbe_82599.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c index c6e8b7e976..f37d83a0ab 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_82599.c @@ -554,13 +554,15 @@ out: **/ void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw) { - u32 autoc2_reg; u16 ee_ctrl_2 = 0; + u32 autoc2_reg; + u32 status; DEBUGFUNC("ixgbe_stop_mac_link_on_d3_82599"); - ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); + status = ixgbe_read_eeprom(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); - if (!ixgbe_mng_present(hw) && !hw->wol_enabled && + if (status == IXGBE_SUCCESS && + !ixgbe_mng_present(hw) && !hw->wol_enabled && ee_ctrl_2 & IXGBE_EEPROM_CCD_BIT) { autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2); autoc2_reg |= IXGBE_AUTOC2_LINK_DISABLE_ON_D3_MASK; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:08.057296280 +0800 +++ 0059-net-ixgbe-base-fix-unchecked-return-value.patch 2024-11-11 14:23:05.142192839 +0800 @@ -1 +1 @@ -From eb3684b191928ebb5d263e3f8ab1e309bfec099e Mon Sep 17 00:00:00 2001 +From 1d3aa94783958688adbc498e1bf6413201dd28cb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit eb3684b191928ebb5d263e3f8ab1e309bfec099e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c4ad906f0f..3110477700 100644 +index c6e8b7e976..f37d83a0ab 100644 @@ -24 +26 @@ -@@ -556,13 +556,15 @@ out: +@@ -554,13 +554,15 @@ out: