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 3180541D4F for ; Thu, 23 Feb 2023 10:39:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E40B431A5; Thu, 23 Feb 2023 10:39:17 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id C7C9643164 for ; Thu, 23 Feb 2023 10:39:15 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id m14-20020a7bce0e000000b003e00c739ce4so7610887wmc.5 for ; Thu, 23 Feb 2023 01:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YmG7tFCfD73iXCM7e7ROnqs8C/ZSxOu87IIkXpehguw=; b=Jm+UL2AoxQRkhpURL6v5bJMSyjVi1kiUE44HcYucPU5tCx/AGCDy5RF+MOM5RKNb75 z2zTB7qF6A38wBzRRkKXfIj43xIe3cQTPlK4Wqj6DyLGe14uSf7jMsFQ/ni56pPhyOfL 1NkLksAilGTCPhO0vEVoU8wX6vl8sstHyg46yT9ltxZeJNJfcaqQOQ9FfE59mxArkoNk GBnoUtF66lwS+Gv2YSgpfAfxjNx5Vl/PFp022QnebiVSDYp0ZJWG5Xz/Y0V2aZ5Gf0n0 KmSChOPCTj3+XPDvYkn75IxJKgZXgJY7DVuaeXWbC3Nz0fXOOLHzA3IPkFEeHIwLbnjJ A78Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YmG7tFCfD73iXCM7e7ROnqs8C/ZSxOu87IIkXpehguw=; b=CmHfcXQEpgGUrs467ccpZSt68ZC0czMC2sGx+Mmcy7/OUlT1BVnAwTQ+AgWE1YMMif vJbPldGm8GsFCZqd0gullFHc7EDgq1cSF2s2wQd+7LXijDiMzFMGR+LnoNVGQ2/+P3wN rabgBbUJZcewm9nSqX6Atgsh9Kgq0y8Ls7Ieg7bJyqCMJpmSS90sSxvkrP/hmzXS3bja OFXVENy8czREtUmO2h2ib5Y0ZSxpsi8d2eLjpD7LfcWJqBEj9NFwtEZAGmtqqDM1Dy+y PAPiv69K/NyL6n7jN5WsbG7LSZwY10u+LxTTkNFYsm01S/jz/2diNEoRII44vMt/DHic qu2w== X-Gm-Message-State: AO0yUKU1MU3HHLCN58I8Rrj5paj/6PqqfC+AlIlHFw1Y0EL3Wi4dIOMu FV9+dvQ/Gjxip3SdWSop/+gPFMusupQ0lg== X-Google-Smtp-Source: AK7set9RZr6WgPPZIWhy7LAfz8uu7s20RgxdZUQ4gVd1jZo1hEnIxTTowDuEuxbXITOOYFGwTYRhdA== X-Received: by 2002:a05:600c:3087:b0:3df:ed95:d757 with SMTP id g7-20020a05600c308700b003dfed95d757mr2390579wmn.34.1677145155549; Thu, 23 Feb 2023 01:39:15 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c409200b003db06224953sm11676605wmh.41.2023.02.23.01.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:39:15 -0800 (PST) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix interrupt loss' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:42 +0000 Message-Id: <20230223093715.3926893-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0ddf24a6beba37641ca3cb91b3163f7151fe0f17 Thanks. Luca Boccassi --- >From 0ddf24a6beba37641ca3cb91b3163f7151fe0f17 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 [ 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 c62ed02cfd..dd5b54b83f 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2682,9 +2682,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, intr_handle->type != 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); @@ -2704,6 +2701,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.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:29.760724943 +0000 +++ 0038-net-txgbe-fix-interrupt-loss.patch 2023-02-23 09:36:28.250170382 +0000 @@ -1 +1 @@ -From a4315c1434b6bf78a9e04bf5fa34d02e9b3afd35 Mon Sep 17 00:00:00 2001 +From 0ddf24a6beba37641ca3cb91b3163f7151fe0f17 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a4315c1434b6bf78a9e04bf5fa34d02e9b3afd35 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index ce7cf2506d..6e939b8ce3 100644 +index c62ed02cfd..dd5b54b83f 100644 @@ -21,2 +22,2 @@ -@@ -2972,9 +2972,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, - rte_intr_type_get(intr_handle) != RTE_INTR_HANDLE_VFIO_MSIX) +@@ -2682,9 +2682,6 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, + intr_handle->type != RTE_INTR_HANDLE_VFIO_MSIX) @@ -31,3 +32,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; +@@ -2704,6 +2701,8 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, + if (eicr & TXGBE_ICRMISC_GPIO) + intr->flags |= TXGBE_FLAG_PHY_INTERRUPT;