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 33A6FA0093 for ; Tue, 19 May 2020 15:11:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 29DE11D6A4; Tue, 19 May 2020 15:11:05 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 3C6861D6FB for ; Tue, 19 May 2020 15:11:03 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id n18so3488840wmj.5 for ; Tue, 19 May 2020 06:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EyauZpwrxQXbHRFsmPsDQ6S4t2aUCqU3K+Y+8Rmqf7o=; b=lfxnKg/eYntBCht67pXeUWqG9oXkbIalfxWfvcVp1b4ZAIzImNpyFN1cR4c5Wz6h2B SL25ktN7mujG8sZ8w7rSewCstx9pC4PEfHx1kjt2UWPwy88UfB8YZMAks55MaIY5iRnM 663AZ2v0ZVKV7Izb1P8//7OoN3caV/G2R/ak7j/kEOmj7V5NRXZsPaggfnuKQ+Cy8n1q GrX0nUSkixJLTz5jII5Kt+3GhaAml6lNpBJQ1KulsbWu8JJEnlh1+ap4R1oa9yrP3MRM yMAC/qLwpYPuvlsQTtcP/9bSk5JPBedZablNZQQ6qSLH4TfgImp1i96QB6GIZCPjZkoK 9c+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EyauZpwrxQXbHRFsmPsDQ6S4t2aUCqU3K+Y+8Rmqf7o=; b=EXmHA8KQifRljYjVtnvl4x/NwuIh4saBxLumg7L4KSRhK9I923VyBeQehZk2yr9B1c bWNG0NWJUkPToGSjP4nC6lW7lPO8b65Xb38bqUmJVbbSs5Vpckuz0YAafGKJXIqTYvnn FuCmM7j77RmrOocCpcc2rkNaj8hULXGaq0ExPzxN9q6NqlieYyVDw8Vv1Rjn3H9OwSIN YORS2z0S07ywFpKVpbD5v2RdHurfYLCcvicQ11VM+aVbRl1A/HzDyI13/Nk8nqNS8Onc vXqifARjv5Asg6USGRaJUm0kxWWMwZqnCUhejQof3AZ2EC4FL0aY74Aw+1wvMSRDWa9h XEbg== X-Gm-Message-State: AOAM530DNBs0FomR3d+bUj3TV7kedzjJLz6Xt+dDVm3lxBxRaoxsHXOv XvkZkWnh5Cd+UPzY9Szy0X5I/SNAeTWrhWRD X-Google-Smtp-Source: ABdhPJxVivWQWW0OczYxDKLP12HQAuP/3MSTm/YP/qBsBVEav0D7FLEJmxWxX4CCxaFzC0ctCcUbaQ== X-Received: by 2002:a1c:a910:: with SMTP id s16mr5454516wme.70.1589893862985; Tue, 19 May 2020 06:11:02 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c80sm4049031wme.15.2020.05.19.06.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:03:53 +0100 Message-Id: <20200519130549.112823-98-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix unexpected link handler' has been queued to stable release 19.11.3 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 stable release 19.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 05/21/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. Thanks. Luca Boccassi --- >From d28299df0a2419b69b35ad5b3d2205ad6605a8a6 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 fea464c3d2..e644f8875b 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -1599,13 +1600,12 @@ static int 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; } @@ -1616,9 +1616,26 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) return rte_intr_callback_register( &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; } static int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.459531234 +0100 +++ 0098-net-tap-fix-unexpected-link-handler.patch 2020-05-19 14:04:44.308650040 +0100 @@ -1,8 +1,10 @@ -From dc1a4d86c63732e57e9593919504e8c81f46fcdf Mon Sep 17 00:00:00 2001 +From d28299df0a2419b69b35ad5b3d2205ad6605a8a6 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 @@ -15,7 +17,6 @@ 0x00007f15d5322f9d in clone () Fixes: c0bddd3a057f ("net/tap: add link status notification") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit