From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id D83012A66 for ; Sun, 22 Apr 2018 17:11:33 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id F0329212E0; Sun, 22 Apr 2018 11:11:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:11:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=iWsfpuL4kDZ+a0BPQ +Dq+yvNuDU9UY/yViDmt0TTJmQ=; b=n8WgSc32+8zDt6aIourbys8jqhvm26TbM fa2KwtPAeyGPE1XKXaGipQNGHqezquy/ZODLcC0DJZEGBV2GxogZyLMbmxdGvMxZ uiemMs6oiOeL4OXAGd/nMbApTPyJI3KTEfJv/7l+uruoL5pstfBQDHzzn/iq4wRB a7cohWm+BKlUDKNwhYikzpA0GCk0SYOSEvft/K6gt3EKNE2j0pPBgY926IF36mih sfMJlc99dCTxq3qEkZwgXxBKJ787VDrMMQWcElhguoiaDok3CDfHzSKswi2aMBAo b+7rSqNs+gb4Zzdy5KA1Zj4P1OCL2lTDzaJMcdcY5sMlDH2rBFjLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=iWsfpuL4kDZ+a0BPQ+Dq+yvNuDU9UY/yViDmt0TTJmQ=; b=GvYe35Mr 2/aaGOahJl1k7k7xPE2EIKFAB5e0iDgtGtlc0r3a7DsXN77qpPgDKOELIgpc+y/N jshZhk6PdHOU+iwTojmhZu/CaZIxZM6/hYkVEW+714r1Uzx9B8lKKs0Br9IsEtxi igQVbjE+4I2rj9Eq/k68fd/aDFpMNmO2um0md892J+C/8x5yT8w2VupcXugUzbXn ldP7I3O3z3Is3wuLVKggH6y1c75SUZoWoFGoGJ1/Ts9BZsb8PpcK3OEYxdQofdzL Oh8ejgcjAL17YxEknriIiQY51eGlvmTe91FnkJK3UTvPThmxNovC67rcRgzm8o6A OUkax2Wr9OkhOA== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id A29D61025D; Sun, 22 Apr 2018 11:11:30 -0400 (EDT) From: Yuanhan Liu To: Yunjian Wang Cc: Kirill Rybalchenko , Qi Zhang , dpdk stable Date: Sun, 22 Apr 2018 23:09:23 +0800 Message-Id: <20180422150949.17523-33-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/i40e: fix intr callback unregister by adding retry' has been queued to LTS release 17.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Apr 2018 15:11:34 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From ed3b62da2a97cf8edbade91d0675f4a833b156bd Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 20 Mar 2018 15:01:24 +0800 Subject: [PATCH] net/i40e: fix intr callback unregister by adding retry [ upstream commit 0264539dce2d40d8abaed474d4b1b526ca3ed2e4 ] The nic's interrupt source has some active callbacks, when the port hotplug. Add a retry to give more port's a chance to uninit before returning an error. Fixes: d42aaf30008b ("i40e: support port hotplug") Signed-off-by: Yunjian Wang Reviewed-by: Kirill Rybalchenko Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index ef6470814..8383adefe 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1554,6 +1554,7 @@ eth_i40e_dev_uninit(struct rte_eth_dev *dev) struct rte_flow *p_flow; int ret; uint8_t aq_fail = 0; + int retries = 0; PMD_INIT_FUNC_TRACE(); @@ -1595,9 +1596,20 @@ eth_i40e_dev_uninit(struct rte_eth_dev *dev) /* disable uio intr before callback unregister */ rte_intr_disable(intr_handle); - /* register callback func to eal lib */ - rte_intr_callback_unregister(intr_handle, - i40e_dev_interrupt_handler, dev); + /* unregister callback func to eal lib */ + do { + ret = rte_intr_callback_unregister(intr_handle, + i40e_dev_interrupt_handler, dev); + if (ret >= 0) { + break; + } else if (ret != -EAGAIN) { + PMD_INIT_LOG(ERR, + "intr callback unregister failed: %d", + ret); + return ret; + } + i40e_msec_delay(500); + } while (retries++ < 5); i40e_rm_ethtype_filter_list(pf); i40e_rm_tunnel_filter_list(pf); -- 2.11.0