From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 67A8EA00E6 for ; Thu, 21 Mar 2019 13:29:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 605444CA9; Thu, 21 Mar 2019 13:29:33 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4122A4CA9 for ; Thu, 21 Mar 2019 13:29:32 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DFA53082E0F; Thu, 21 Mar 2019 12:29:31 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id B29ED60BE5; Thu, 21 Mar 2019 12:29:30 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Qi Zhang , dpdk stable Date: Thu, 21 Mar 2019 12:29:03 +0000 Message-Id: <20190321122903.668-5-ktraynor@redhat.com> In-Reply-To: <20190321122903.668-1-ktraynor@redhat.com> References: <20190321122903.668-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 21 Mar 2019 12:29:31 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe: fix crash on remove' has been queued to LTS release 18.11.1 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/22/19. 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. Thanks. Kevin Traynor --- >From 13db2fb5fbc46651c77c64732ade4f0a45055d7f Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 13 Feb 2019 10:48:52 +0800 Subject: [PATCH] net/ixgbe: fix crash on remove [ upstream commit ce66e351404f167db9bf47d6a70bd83e101126c9 ] The NIC's interrupt source has some active handler when the port removed. We should cancel the delay handler before removing dev to prevent executing the delay handler. Call Trace: #0 ixgbe_disable_intr (hw=0x0, hw=0x0) at /usr/src/debug/dpdk-18.11/drivers/net/ixgbe/ixgbe_ethdev.c:852 #1 ixgbe_dev_interrupt_delayed_handler (param=0xadb9c0 ) at /usr/src/debug/dpdk-18.11/drivers/net/ixgbe/ixgbe_ethdev.c:4386 #2 0x00007f05782147af in eal_alarm_callback (arg=) at /usr/src/debug/dpdk-18.11/lib/librte_eal/linuxapp/eal/ eal_alarm.c:90 #3 0x00007f057821320a in eal_intr_process_interrupts (nfds=1, events=0x7f056cbf3e88) at /usr/src/debug/dpdk-18.11/lib/ librte_eal/linuxapp/eal/eal_interrupts.c:838 #4 eal_intr_handle_interrupts (totalfds=, pfd=18) at /usr/src/debug/dpdk-18.11/lib/librte_eal/linuxapp/eal/ eal_interrupts.c:885 #5 eal_intr_thread_main (arg=) at /usr/src/debug/dpdk-18.11/lib/librte_eal/linuxapp/eal/ eal_interrupts.c:965 #6 0x00007f05708a0e45 in start_thread () from /usr/lib64/libpthread.so.0 #7 0x00007f056eb4ab5d in clone () from /usr/lib64/libc.so.6 Fixes: 2866c5f1b87e ("ixgbe: support port hotplug") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 749311048..e9533e5a1 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1337,4 +1337,7 @@ eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev) } while (retries++ < (10 + IXGBE_LINK_UP_TIME)); + /* cancel the delay handler before remove dev */ + rte_eal_alarm_cancel(ixgbe_dev_interrupt_delayed_handler, eth_dev); + /* uninitialize PF if max_vfs not zero */ ixgbe_pf_host_uninit(eth_dev); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-21 11:21:26.548799682 +0000 +++ 0005-net-ixgbe-fix-crash-on-remove.patch 2019-03-21 11:21:26.310140533 +0000 @@ -1,8 +1,10 @@ -From ce66e351404f167db9bf47d6a70bd83e101126c9 Mon Sep 17 00:00:00 2001 +From 13db2fb5fbc46651c77c64732ade4f0a45055d7f Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 13 Feb 2019 10:48:52 +0800 Subject: [PATCH] net/ixgbe: fix crash on remove +[ upstream commit ce66e351404f167db9bf47d6a70bd83e101126c9 ] + The NIC's interrupt source has some active handler when the port removed. We should cancel the delay handler before removing dev to prevent executing the delay handler. @@ -29,7 +31,6 @@ #7 0x00007f056eb4ab5d in clone () from /usr/lib64/libc.so.6 Fixes: 2866c5f1b87e ("ixgbe: support port hotplug") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Qi Zhang @@ -38,7 +39,7 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index 4deedb0c8..c336937c2 100644 +index 749311048..e9533e5a1 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1337,4 +1337,7 @@ eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)