From patchwork Mon Nov 14 07:03:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Du, Frank" X-Patchwork-Id: 119814 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0F4B3A0C1A; Mon, 14 Nov 2022 08:13:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD5C540150; Mon, 14 Nov 2022 08:13:37 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 2AA754014F for ; Mon, 14 Nov 2022 08:13:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668410016; x=1699946016; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=MU+uhds2F8RZKp519GH+PUULckH3ik9HCpqDTmITuic=; b=IUCLWqJ1K5Exe0DSG0GOJXjHxxnOrJXmfTQAu1MHGdTekK8M+GAySq7H L3VUAPTjJnuxks3Vdvq4i3gLlbBfPah31VVbEyWpJMrHXpV4rF7HNFMI3 w2SnClu9nDipVKqRPCd09nATobPyHhpetkcw28PrUyzBwNfMPWaR8fSy0 ahLeQxSZqfAemnbkri0I/kmEm/1Ek8+SZv6X4mR2BMal/yO21fFtk5nJO SvFp9EpDX+D+CdqExGF66OBbYWJepzNAsJlNeAgXyHbcJFcAfbZs6tLdv Es1VApz3wDACOcsQhgSSyd5YpliK4JmHpl38EHa2616fBHc6ldT1aQySK g==; X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="299418972" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="299418972" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2022 23:13:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="780814393" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="780814393" Received: from media-frankdu-kahawai-node2.sh.intel.com ([10.67.119.73]) by fmsmga001.fm.intel.com with ESMTP; 13 Nov 2022 23:13:34 -0800 From: "Du, Frank" To: dev@dpdk.org Subject: [PATCH v3] net/ice: fix ice_interrupt_handler panic when stop Date: Mon, 14 Nov 2022 15:03:29 +0800 Message-Id: <20221114070329.989070-1-frank.du@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221111062219.874370-1-frank.du@intel.com> References: <20221111062219.874370-1-frank.du@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org rte_intr_callback_unregister may fail when irq cb is in handling, use sync version to make sure unregister successfully. Signed-off-by: Du, Frank Acked-by: Qi Zhang --- v3: * Move rte_intr_callback_unregister_sync to right after irq disable --- 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 7294f38edc..0bc739daf0 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2555,12 +2555,17 @@ ice_dev_close(struct rte_eth_dev *dev) return 0; /* 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); if (!ad->is_safe_mode) @@ -2595,10 +2600,6 @@ ice_dev_close(struct rte_eth_dev *dev) /* disable uio intr before callback unregister */ rte_intr_disable(intr_handle); - /* unregister callback func from eal lib */ - rte_intr_callback_unregister(intr_handle, - ice_interrupt_handler, dev); - return ret; }