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 E1DBE41D8D for ; Mon, 27 Feb 2023 08:11:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18616410DC; Mon, 27 Feb 2023 08:11:36 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id EC43340A7D for ; Mon, 27 Feb 2023 08:11:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fIEMjmUi6lhjywBkAfsfA9j7jL7+4XVUU6FZcrTIyI+yr3KWYp2IMjjm2vX7rA7CvtBjKzdfGDe7PCJHLoEvZZVarOPpvAI/0TW/bdoE18cR8Don/Et1myquNK7/tSaThi3Ls81i2Yfa4ceVzqnxi1xqdmZR7gOwL8SRLkl3QEyHAQnXxNeAtggE8u3SdjcYDP1nhP3xK9pgo9Dq/P4bHy3BEy53TD6bKa6Ax94lRI8IkcQuwBl4hte3uzsfjHGHb0W2tSfTAlX9GxUQa2VDCo39rKWj/U6aT1wN2ntN6mjPA6q5KcnB1MenWj7tFQWjVQem0p7NZbngHaQVlA2+Wg== 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=onVO+/64bmw8yfFQ2LvVThpPOHy27gQTn50W6wVbKRs=; b=EzgSjudHH8W6BgGC84o78mX+h7W3ig6SaBPuqCo8jg7XGT0kuGNEpQ13dOY4tNMN7pqHN/f5z51x9KaoxjJzs94j6wvrGEfrB9SNBjWF5WJGVFIDZMdiuJtcqUucAE/NLydQhehIZK+vfW93QSnfLTjCA0EN9njLgBwlGVLM8hUxOfcLI1jCJxMnSXIzRdNf/RVbOh2dhUaxxwNJdH8hu1w3+mXEPKTT6wNTmW7IzyBREKHGSnfRnJTE2z+EZhlfonulEc/YBb5EssNN9hRmE5yh6FfXEjCzgCtJq2m/BQs1ChUnh9sD/OPC3RGym+21yJIy/Ntqxvbc95t7z6hQAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.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=onVO+/64bmw8yfFQ2LvVThpPOHy27gQTn50W6wVbKRs=; b=lxq9t1tStnx1zaq5gaeMhBf0eHX3chbgHoa/9ctS5h9RgfkHlaRGPZWX9+37vXlvmg14AzFAKV5AcuvPyeTyEZomGf7R0Oo3zh+ZJdOGnqhidLeJ53albZ1JITiAH8sNnFSGqA83Wt1bZfeqKSugvx4Izqps+C6swLzN4KrwhVgGwup6/ktz1q9bJYu+LhYO4iPqeKuvJ1F6Q/TmVCzJcjHbpZ9jzK2O+yWKIJzMnKL/WNcrfc6X25yGua0PX4JFGRt3yUabA6/Fd2Gz2L10oSKVWWzCzaS6oSk7HXOskzcXIuWfdQ1PYcTVy6yqCqhq9jFdhx7Ww/nDwFKQ/vdisw== Received: from MN2PR20CA0028.namprd20.prod.outlook.com (2603:10b6:208:e8::41) by CY8PR12MB7416.namprd12.prod.outlook.com (2603:10b6:930:5c::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:11:31 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:e8:cafe::99) by MN2PR20CA0028.outlook.office365.com (2603:10b6:208:e8::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:11:31 +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 BL02EPF00010206.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:11:30 +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:11:13 -0800 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; Sun, 26 Feb 2023 23:11:11 -0800 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: fix interrupt loss' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:03 +0800 Message-ID: <20230227070107.15664-95-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-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: BL02EPF00010206:EE_|CY8PR12MB7416:EE_ X-MS-Office365-Filtering-Correlation-Id: 88e9b2d4-e843-401f-8821-08db1891da0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G1pSr90xzvmLj0/Ddq0u2UGuek+4C6COLQqciSX/q80hGGqDGclss6v9EnqAV49SLhwTgt6mKapybWdALFWSSPuuoPYtQrJy7wtoFklFQX2fyLannk612yRBMyzGv8pSWmE8+uMDnECs0blMKZtIAVG0KIke2N4WwyXX/RLILYay4/Dj7GcSOSiBQG4lgKYK2taMGd9REzN0iJt/r7Xd2BgNdKYU4GZiUEaNVDSSjrPOyouSjbeUbWRhA7ff3e+L1iLz/bfcBEIICVqKaEcFhvWq4CG+p/72LPVZSk4z3DoQS6hmB8yQkWD7pq0IYBAw3w3UcqaGNnvJdUs+PCLzGgW9pqTH1TnEQu/UpxvE6wJD0kUayhepxiuZk81KoPZOFtN9+aIBygI0nakvQBilV5fW1zDRp7z01SkyH/BDhxNeYudAaO24ioXVye1jijI/vHNJnJvOZed393ZjykLZCGoyXMs1QKiZHdaA/0ELflyUsfJa+atxDChkq67TRWd71O1CDdaUOZnutP74ebWJMfrHHV5bOHQGGMzWsr4EWS4bLzAWZl6fHu8fOo79TtXTyc5mjL1kclRav6zERtlWynIeoGdKRpez9ySbwVup03rweTOB1Y1e6v2DP4tDKFE4NkCZ+G9QWh0trhQqD82IlqjZbIcSLcQtiej1xnhqUb8xAzq0HXIhGS9Qk7FE0v32DMjnvmbrBWHef2W6ilgqcSCfLx3zChWXJG9mmSBpC6P+h6Kt2W11h5y3acRC2qurWMJKPiPouzitCvYWx2Py962qmqoipftPWEK0hjJo0ws= 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)(396003)(136003)(376002)(346002)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(36756003)(5660300002)(8936002)(1076003)(36860700001)(53546011)(7636003)(82740400003)(6666004)(82310400005)(16526019)(336012)(47076005)(83380400001)(426003)(6286002)(26005)(186003)(2616005)(86362001)(40480700001)(316002)(55016003)(40460700003)(41300700001)(70206006)(70586007)(4326008)(6916009)(8676002)(7696005)(356005)(478600001)(966005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:11:30.8539 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88e9b2d4-e843-401f-8821-08db1891da0b 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: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7416 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=547a2c7a554afa70424215c3d5c8fa60d41c693c Thanks. Xueming Li --- >From 547a2c7a554afa70424215c3d5c8fa60d41c693c Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 2 Feb 2023 17:21:31 +0800 Subject: [PATCH] net/txgbe: fix interrupt loss Cc: Xueming Li [ upstream commit a4315c1434b6bf78a9e04bf5fa34d02e9b3afd35 ] Disable interrupt in the interrupt handling process will sometimes cause interrupts to be lost. Fixes: 2fc745e6b606 ("net/txgbe: add interrupt operation") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 86ef979b29..55777cb10a 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2949,9 +2949,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, rte_intr_type_get(intr_handle) != RTE_INTR_HANDLE_VFIO_MSIX) wr32(hw, TXGBE_PX_INTA, 1); - /* clear all cause mask */ - txgbe_disable_intr(hw); - /* read-on-clear nic registers here */ eicr = ((u32 *)hw->isb_mem)[TXGBE_ISB_MISC]; PMD_DRV_LOG(DEBUG, "eicr %x", eicr); @@ -2974,6 +2971,8 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, if (eicr & TXGBE_ICRMISC_GPIO) intr->flags |= TXGBE_FLAG_PHY_INTERRUPT; + + ((u32 *)hw->isb_mem)[TXGBE_ISB_MISC] = 0; return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.954138600 +0800 +++ 0096-net-txgbe-fix-interrupt-loss.patch 2023-02-27 14:08:40.829237000 +0800 @@ -1 +1 @@ -From a4315c1434b6bf78a9e04bf5fa34d02e9b3afd35 Mon Sep 17 00:00:00 2001 +From 547a2c7a554afa70424215c3d5c8fa60d41c693c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a4315c1434b6bf78a9e04bf5fa34d02e9b3afd35 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index ce7cf2506d..6e939b8ce3 100644 +index 86ef979b29..55777cb10a 100644 @@ -21 +23 @@ -@@ -2972,9 +2972,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, +@@ -2949,9 +2949,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, @@ -31,3 +33,3 @@ -@@ -3000,6 +2997,8 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, - if (eicr & TXGBE_ICRMISC_HEAT) - intr->flags |= TXGBE_FLAG_OVERHEAT; +@@ -2974,6 +2971,8 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, + if (eicr & TXGBE_ICRMISC_GPIO) + intr->flags |= TXGBE_FLAG_PHY_INTERRUPT; @@ -35 +36,0 @@ -+ ((u32 *)hw->isb_mem)[TXGBE_ISB_MISC] = 0; @@ -36,0 +38 @@ ++ ((u32 *)hw->isb_mem)[TXGBE_ISB_MISC] = 0;