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 76C18468E4 for ; Thu, 12 Jun 2025 23:09:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F47B42E02; Thu, 12 Jun 2025 23:09:29 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 2F1CA42DD9 for ; Thu, 12 Jun 2025 23:09:28 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-451d54214adso12246415e9.3 for ; Thu, 12 Jun 2025 14:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762568; x=1750367368; 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=leTk1AqngVxHHcQuUvryCjKFAhzXgN9wscypRWnl95E=; b=MBHXJgtMb+K2ThPpmzHhq8EpVQZywNz7cQfFkKOJtqxNK9QW3vH3TwIrpatWn14jZ8 T4ZS8Ko1xraZMXjLvYk48yoHBuAGuXFWW5IeKWsWDthH+Yzt4kAQFxh64R3DMMaNQ2i/ 0x5f3GlBFP1YlnNfkV1dwQgFHm+8t1GzGtsEMfblMS6ysT4gmZoqspVpA3cJO4A/0L71 WFcH2SnZ9cI9syNmYYR5LT4y0v5tiiDqQSGojEJvB6QM6f7AuaQTTjEIDAp4CKl+6Tmx PjcYmdlu8h8F6kUKNgZvvLkjtxSDoY+8g0pbCUZwmyI/zJYZdVsll8Dy4TnJk/ngL2nu HMAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762568; x=1750367368; 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=leTk1AqngVxHHcQuUvryCjKFAhzXgN9wscypRWnl95E=; b=f952ajln76XLcJ1r/E+f0zSbd6K5A4I3fgI828lyftsuQWidRzzlv8QnjmRkvyvBog BVaU+S73VZ+jQk7zq6hgFBqocEHKQuMQD2gEIbSUg6uUqSIIAztWczOC34Fydfe9m5Hj 9d+zsK/GSdFsk7z8DW7VnV4NSBYLBtAZ3WUbAy0KengMdgIR/oXM/BWEELu5gNa3kCJX G3fVMvU57Gs9CUsoOT7QM5XEb4TpMDxAZgw+1Hewb3j6srk13ztyV6CbUpL+oTtrLAPx 8zBwwOSkAS2Y/3ehm85pL9blL0k6Na0ct5UL+4BrmSZFquqGI6nolmaTNnyk2v07jR/Y 710Q== X-Gm-Message-State: AOJu0Yxjznxk7haiZnNRczAURJZiuPxmWn1VNa59wlPRN1XEEu0Vzrzw Za1tO7OBd7A1j2UxS/dpRWF5bAdVKp/sChgAYH05HkNzeKs19G6gh9+iFg3qjANs X-Gm-Gg: ASbGncubWTjYuZ9A6o4KESkVKEaT72YP+fv8/zAAu5cH1pkZQbhGKDLpk4VuJTuSeDB WGtbMhVo6WOsduUFZs4EPaDQYt69SWl1KlGDCsEWiRBPGGwG+Eiu018vybWr1Lh9/wgAFH6Nn6b EExSaTQd4CC3D7TMdcTeQLe/7h50S86blEhWzqNe+KFip3HD7sYcdfp1Gws+E1DrD91xU3jM0MI 9w5hczvGa0n3Wvwi5s4085Owpm8Yt1WSSbnuDKl8GktIp3iwggCxtVMd0esgze32rbaNiT+MHRJ iaT8pb+/epkjXp40nT/lB7LUCfuIUAK8SsfX9vWbEnxNSGD6CtVpLeLm+I1yARDWh7qk X-Google-Smtp-Source: AGHT+IFqFzetfCRFRIqh0XyqWajNblmK1iybzupz+VU1xIvWVihyT2feydI67JgzGegMiS+7H10ZPg== X-Received: by 2002:a05:6000:3108:b0:3a5:52b2:fa65 with SMTP id ffacd0b85a97d-3a568655e36mr625692f8f.5.1749762567653; Thu, 12 Jun 2025 14:09:27 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e224617sm32147465e9.2.2025.06.12.14.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: dpdk stable Subject: patch 'net/hns3: fix resources release on reset' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:50 +0100 Message-ID: <20250612210733.2506558-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/25. 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/e9063c8f242260215659a8719d14f1a0f17311a1 Thanks. Luca Boccassi --- >From e9063c8f242260215659a8719d14f1a0f17311a1 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Tue, 8 Apr 2025 16:31:00 +0800 Subject: [PATCH] net/hns3: fix resources release on reset [ upstream commit 361eab82df67c09cb84a9e2e66c0d93a84be610d ] Some resources, like, unmapping Rx interrupt, doesn't perform when execute dev_stop on reset. This will lead to other issues. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_ethdev.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 2c3a992e1a..c31b052b6f 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5231,20 +5231,23 @@ hns3_dev_stop(struct rte_eth_dev *dev) struct hns3_hw *hw = &hns->hw; PMD_INIT_FUNC_TRACE(); + if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) != 0) { + hns3_warn(hw, "device is resetting, stop operation is not allowed."); + return -EBUSY; + } + dev->data->dev_started = 0; hw->adapter_state = HNS3_NIC_STOPPING; hns3_stop_rxtx_datapath(dev); rte_spinlock_lock(&hw->lock); - if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) { - hns3_tm_dev_stop_proc(hw); - hns3_config_mac_tnl_int(hw, false); - hns3_stop_tqps(hw); - hns3_do_stop(hns); - hns3_unmap_rx_interrupt(dev); - hw->adapter_state = HNS3_NIC_CONFIGURED; - } + hns3_tm_dev_stop_proc(hw); + hns3_config_mac_tnl_int(hw, false); + hns3_stop_tqps(hw); + hns3_do_stop(hns); + hns3_unmap_rx_interrupt(dev); + hw->adapter_state = HNS3_NIC_CONFIGURED; hns3_rx_scattered_reset(dev); rte_eal_alarm_cancel(hns3_service_handler, dev); hns3_stop_report_lse(dev); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.115917009 +0100 +++ 0033-net-hns3-fix-resources-release-on-reset.patch 2025-06-12 22:06:23.854044300 +0100 @@ -1 +1 @@ -From 361eab82df67c09cb84a9e2e66c0d93a84be610d Mon Sep 17 00:00:00 2001 +From e9063c8f242260215659a8719d14f1a0f17311a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 361eab82df67c09cb84a9e2e66c0d93a84be610d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2d4e348442..9f99525e70 100644 +index 2c3a992e1a..c31b052b6f 100644 @@ -21 +22 @@ -@@ -5219,20 +5219,23 @@ hns3_dev_stop(struct rte_eth_dev *dev) +@@ -5231,20 +5231,23 @@ hns3_dev_stop(struct rte_eth_dev *dev) @@ -25 +26 @@ -+ if (rte_atomic_load_explicit(&hw->reset.resetting, rte_memory_order_relaxed) != 0) { ++ if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) != 0) { @@ -36 +37 @@ -- if (rte_atomic_load_explicit(&hw->reset.resetting, rte_memory_order_relaxed) == 0) { +- if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {