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 8726DA00C2 for ; Wed, 23 Nov 2022 19:04:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C178142DC2; Wed, 23 Nov 2022 19:04:57 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9906040E5A for ; Wed, 23 Nov 2022 19:04:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IkKyKE4jZBaz/IlUSRP9rypAYMN0yNSL5XpDNdkzW6A=; b=NF8tqABWplhcbJtOjpnvj38Us05Rf3BMQhUPZVhoq7sB9Gi6fkYTLo47Ipnlt4Vxhy2JIs KFLx5q8uguZYeQJT3r/pKarXxrY7ChLFmEErMK7CiJI0zvgx9lo+bOjg6LyApQuyICMFuR E5d2vA8vTiU0/IkVgvpK7am6f9Zae18= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-qdj5j3uyNtO86uzPMGICog-1; Wed, 23 Nov 2022 13:04:54 -0500 X-MC-Unique: qdj5j3uyNtO86uzPMGICog-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0BC7D185A7AA; Wed, 23 Nov 2022 18:04:54 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DC96492B07; Wed, 23 Nov 2022 18:04:53 +0000 (UTC) From: Kevin Traynor To: Frank Du Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix interrupt handler unregister' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:38 +0000 Message-Id: <20221123180413.733554-25-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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/28/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b0df64d8a26ae8da6a1f3054858e18306920f3b1 Thanks. Kevin --- >From b0df64d8a26ae8da6a1f3054858e18306920f3b1 Mon Sep 17 00:00:00 2001 From: Frank Du Date: Mon, 14 Nov 2022 15:03:29 +0800 Subject: [PATCH] net/ice: fix interrupt handler unregister [ upstream commit 63bd26448539e8cd6da6813807f47eaaca616390 ] rte_intr_callback_unregister may fail when irq cb is in handling, use sync version to make sure unregister successfully. Fixes: cf911d90e366 ("net/ice: support link update") Signed-off-by: Frank Du Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index fb2b1998f2..08edca79ce 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2457,10 +2457,15 @@ ice_dev_close(struct rte_eth_dev *dev) /* Since stop will make link down, then the link event will be - * triggered, disable the irq firstly to avoid the port_infoe etc - * resources deallocation causing the interrupt service thread - * crash. + * triggered, disable the irq firstly. */ ice_pf_disable_irq0(hw); + /* Unregister callback func from eal lib, use sync version to + * make sure all active interrupt callbacks is done, then it's + * safe to free all resources. + */ + rte_intr_callback_unregister_sync(intr_handle, + ice_interrupt_handler, dev); + ret = ice_dev_stop(dev); @@ -2494,8 +2499,4 @@ ice_dev_close(struct rte_eth_dev *dev) rte_intr_disable(intr_handle); - /* unregister callback func from eal lib */ - rte_intr_callback_unregister(intr_handle, - ice_interrupt_handler, dev); - return ret; } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.693351158 +0000 +++ 0025-net-ice-fix-interrupt-handler-unregister.patch 2022-11-23 09:55:57.066149299 +0000 @@ -1 +1 @@ -From 63bd26448539e8cd6da6813807f47eaaca616390 Mon Sep 17 00:00:00 2001 +From b0df64d8a26ae8da6a1f3054858e18306920f3b1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 63bd26448539e8cd6da6813807f47eaaca616390 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7294f38edc..0bc739daf0 100644 +index fb2b1998f2..08edca79ce 100644 @@ -22 +23 @@ -@@ -2556,10 +2556,15 @@ ice_dev_close(struct rte_eth_dev *dev) +@@ -2457,10 +2457,15 @@ ice_dev_close(struct rte_eth_dev *dev) @@ -41 +42 @@ -@@ -2596,8 +2601,4 @@ ice_dev_close(struct rte_eth_dev *dev) +@@ -2494,8 +2499,4 @@ ice_dev_close(struct rte_eth_dev *dev)