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 445E245C9B for ; Tue, 12 Nov 2024 23:09:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FE6E40B90; Tue, 12 Nov 2024 23:09:45 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 7E85540A8B for ; Tue, 12 Nov 2024 23:09:44 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-37d473c4bb6so5706809f8f.3 for ; Tue, 12 Nov 2024 14:09:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449384; x=1732054184; darn=dpdk.org; 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=anI2RAYXfU3TnIEAKpJzNytPjwP6agcyPZGSCpPyYLU=; b=WcCPhCoyrdxmr27juqfLr4imT91cqUzgVsDQWc55Nq+bqkag1pHjrVltsV3kgHt3ix VZ805cmV1ls5NSr0Fy8o7ytWh4WezylZNlG2EPrTQuYF9jqfFovgo19xVsSmWniDcAue juAhiM+vfMLluu7rJ3Nk03zGFIxydhz6ktOLh4XW9Qcd5w0iGozATMajvbugvOgApn14 3tiIDgsOZntlNhy7sof4dlJRpOm7IHolbJDWW/r4nmDgyfEpqU3ginuzRI5HK5SEvlq4 s/YqEjpkiOWY92sTFmZWUgdx9WoyJNz5mAcOEmiUF995YVRgeobBkIet5KQjsmPRp875 8NRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449384; x=1732054184; 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=anI2RAYXfU3TnIEAKpJzNytPjwP6agcyPZGSCpPyYLU=; b=pRP6pJFJmLNd056ABacRcEIsCReI2/nEJ1/j2o/vjva1wBna5+CLBYTdzOpLZNGDy7 ROU9Vd5uLptzg2s2CJomnpQ2LqgRhXaU1trpcNkt/jmEi7n/LUQTutrjAH/MmNtVv4LI uzoYFKzHBNBDfCD3i5P/kK+iIYQs03Oeo+DQZKiugtm2X2sUFZGYAXxI8SFzo3iAOtuS lVkdQ6GJvPVzsUw6D+Sz2ehcfY7+ty34B+Q0eeP44pPSZpvaRxMIIB5d3WgK1YQEO223 W4E09lneLA7nGmKrhLpBSN2Uwj/H7JgJOXDF694uQVd3xaDFoBVqStddge//lr0tzZ/Q kkHA== X-Gm-Message-State: AOJu0Yw/jRUX5GKWJiuOCSLfoS1QIhA6qzoCVF6xNlmwwV39TCQg9Mnl Xm1EWSgEevQdpR/LzZSgsU3szaD34EbMl7Ob5qV+cJxvqhZxab7pfJ0yvA== X-Google-Smtp-Source: AGHT+IG47tXTurA+Hby1CZG9UvJNLyF7g6rkxg9xxw4RfIgmNW9usH3C324pJ+Pb5Sx6MHQ2pr5m5g== X-Received: by 2002:a05:6000:1acc:b0:381:eb8a:b81b with SMTP id ffacd0b85a97d-381f1872402mr20163069f8f.33.1731449384026; Tue, 12 Nov 2024 14:09:44 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed997320sm16606380f8f.47.2024.11.12.14.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:09:43 -0800 (PST) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix interrupt lost in legacy or MSI mode' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:40 +0000 Message-ID: <20241112220754.666489-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-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 22.11.7 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/14/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5e2ce50e415b5acbc641bde383f76ca27c02dedb Thanks. Luca Boccassi --- >From 5e2ce50e415b5acbc641bde383f76ca27c02dedb Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 4 Nov 2024 10:30:06 +0800 Subject: [PATCH] net/ngbe: fix interrupt lost in legacy or MSI mode [ upstream commit 68f04c0aa79316de333441e7efdadd2876412ffa ] When interrupt is legacy or MSI mode, shared interrupt may cause the interrupt cannot be re-enabled. So fix to read the shared interrupt. Fixes: b9246b8fa280 ("net/ngbe: support link update") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 5f39bd336b..38754ce0f0 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -2146,6 +2146,19 @@ ngbe_dev_interrupt_get_status(struct rte_eth_dev *dev) struct ngbe_hw *hw = ngbe_dev_hw(dev); struct ngbe_interrupt *intr = ngbe_dev_intr(dev); + eicr = ((u32 *)hw->isb_mem)[NGBE_ISB_VEC0]; + if (!eicr) { + /* + * shared interrupt alert! + * make sure interrupts are enabled because the read will + * have disabled interrupts. + */ + if (!hw->adapter_stopped) + ngbe_enable_intr(dev); + return 0; + } + ((u32 *)hw->isb_mem)[NGBE_ISB_VEC0] = 0; + /* read-on-clear nic registers here */ eicr = ((u32 *)hw->isb_mem)[NGBE_ISB_MISC]; PMD_DRV_LOG(DEBUG, "eicr %x", eicr); -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.642832760 +0000 +++ 0030-net-ngbe-fix-interrupt-lost-in-legacy-or-MSI-mode.patch 2024-11-12 22:06:58.679307391 +0000 @@ -1 +1 @@ -From 68f04c0aa79316de333441e7efdadd2876412ffa Mon Sep 17 00:00:00 2001 +From 5e2ce50e415b5acbc641bde383f76ca27c02dedb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68f04c0aa79316de333441e7efdadd2876412ffa ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index c372fd928c..325a9d1eaf 100644 +index 5f39bd336b..38754ce0f0 100644 @@ -21 +22 @@ -@@ -2193,6 +2193,19 @@ ngbe_dev_interrupt_get_status(struct rte_eth_dev *dev) +@@ -2146,6 +2146,19 @@ ngbe_dev_interrupt_get_status(struct rte_eth_dev *dev)