From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE6D3A0093 for ; Thu, 28 May 2020 18:26:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C5B4F1DC10; Thu, 28 May 2020 18:26:15 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DAE371DC10 for ; Thu, 28 May 2020 18:26:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683174; 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=sBAToEaTIzroB9E/E2B0uWBP/uKl3OO+WK6TiXw3uNE=; b=WaNRTl+StrjXruLp07o3tCJ+4I3ypTpqDFUMDf6rPl4q40tMh+d758q1twe35MTH1eMPX7 K6yFMtR30mKQQD7arJBI9xNNpkqMX/1o2rlNE7gYaWxaAwCrUHTZdmuesWZy8MnXfqnqaC D2wtngr3AqcDw/RBxcAV/MBwk31FQsA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-HfXRf-oJOEScHNet4JL-xw-1; Thu, 28 May 2020 12:26:07 -0400 X-MC-Unique: HfXRf-oJOEScHNet4JL-xw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94EA91054F90; Thu, 28 May 2020 16:26:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id B117D60C05; Thu, 28 May 2020 16:26:05 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Thu, 28 May 2020 17:23:10 +0100 Message-Id: <20200528162322.7863-83-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix unexpected link handler' has been queued to LTS release 18.11.9 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.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/03/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6b0addc2243b55f7aa7c07dd9a3cd08f11e798fe Thanks. Kevin. --- >From 6b0addc2243b55f7aa7c07dd9a3cd08f11e798fe Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 21:50:52 +0800 Subject: [PATCH] net/tap: fix unexpected link handler [ upstream commit dc1a4d86c63732e57e9593919504e8c81f46fcdf ] The nic's interrupt source has some active handler, which maybe call tap_dev_intr_handler() to set link handler. We should cancel the link handler before close fd to prevent executing the link handler. It triggers segfault. Call Trace: 0x00007f15e08dad99 in __rte_panic (Error adding fd %d epoll_ctl, %s\n") 0x00007f15e08e9b87 in eal_intr_thread_main () 0x00007f15e249be15 in start_thread () 0x00007f15d5322f9d in clone () Fixes: c0bddd3a057f ("net/tap: add link status notification") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index a1e7eb2bde..d3adde8eb5 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -19,4 +19,5 @@ #include #include +#include #include @@ -1521,11 +1522,10 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) { struct pmd_internals *pmd = dev->data->dev_private; + int ret; /* In any case, disable interrupt if the conf is no longer there. */ if (!dev->data->dev_conf.intr_conf.lsc) { if (pmd->intr_handle.fd != -1) { - tap_nl_final(pmd->intr_handle.fd); - rte_intr_callback_unregister(&pmd->intr_handle, - tap_dev_intr_handler, dev); + goto clean; } return 0; @@ -1538,7 +1538,24 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) &pmd->intr_handle, tap_dev_intr_handler, dev); } + +clean: + do { + ret = rte_intr_callback_unregister(&pmd->intr_handle, + tap_dev_intr_handler, dev); + if (ret >= 0) { + break; + } else if (ret == -EAGAIN) { + rte_delay_ms(100); + } else { + TAP_LOG(ERR, "intr callback unregister failed: %d", + ret); + break; + } + } while (true); + tap_nl_final(pmd->intr_handle.fd); - return rte_intr_callback_unregister(&pmd->intr_handle, - tap_dev_intr_handler, dev); + pmd->intr_handle.fd = -1; + + return 0; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.398943289 +0100 +++ 0083-net-tap-fix-unexpected-link-handler.patch 2020-05-28 17:12:59.173554771 +0100 @@ -1 +1 @@ -From dc1a4d86c63732e57e9593919504e8c81f46fcdf Mon Sep 17 00:00:00 2001 +From 6b0addc2243b55f7aa7c07dd9a3cd08f11e798fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc1a4d86c63732e57e9593919504e8c81f46fcdf ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index fea464c3d2..e644f8875b 100644 +index a1e7eb2bde..d3adde8eb5 100644 @@ -36 +37 @@ -@@ -1600,11 +1601,10 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) +@@ -1521,11 +1522,10 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) @@ -50 +51 @@ -@@ -1617,7 +1617,24 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) +@@ -1538,7 +1538,24 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set)