From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 74AD2A0555 for ; Wed, 25 May 2022 18:29:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F6EC400EF; Wed, 25 May 2022 18:29:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 11A8C4282A for ; Wed, 25 May 2022 18:29:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496165; 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=kl0bDuErbOVysKycrF5yd+Xy/suiXoqxuoFEuNrmCwc=; b=TLGn39jx+XBdTxarch6zqUuKSUePb2ep5pNI5ur356p7Whvq+Jr7B0aKkO8N9tZz5EiyEz RKaoR0DYED8ON2Iaz8PFkQYSwFLfBUtlTHp8baZxrJg3nETfiCY+bq/gmDgnM1ImNPsJQW 8dAIPVb43wcS+sYBEHAyRus7mtlhplY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-425-JsKd0khDNtm4aqNbjlP9jw-1; Wed, 25 May 2022 12:29:22 -0400 X-MC-Unique: JsKd0khDNtm4aqNbjlP9jw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 730BB833A12; Wed, 25 May 2022 16:29:18 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3A8E2024509; Wed, 25 May 2022 16:29:16 +0000 (UTC) From: Kevin Traynor To: Quentin Armitage Cc: David Marchand , dpdk stable Subject: patch 'net/tap: fix interrupt handler freeing' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:09 +0100 Message-Id: <20220525162847.711753-17-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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 05/30/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b839853e83ea8505b040aa1fd7c0456223f4451d Thanks. Kevin --- >From b839853e83ea8505b040aa1fd7c0456223f4451d Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Tue, 3 May 2022 16:27:32 +0100 Subject: [PATCH] net/tap: fix interrupt handler freeing [ upstream commit 0809d870fc22916627ec5e177d4c138c12196321 ] rte_pmd_tun/tap_probe() allocates pmd->intr_handle in eth_dev_tap_create() and it should not be freed until rte_pmd_tap_remove() is called. Inspection of tap_rx_intr_vec_set() shows that the call to tap_tx_intr_vec_uninstall() was calling rte_intr_instance_free() but tap_tx_intr_vec_install() can then be immediately called, and this then uses pmd->intr_handle without it being reallocated. Move rte_intr_instance_free() call from tap_tx_intr_vec_uninstall() to rte_pmd_tap_remove(). Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Quentin Armitage Reviewed-by: David Marchand --- drivers/net/tap/rte_eth_tap.c | 2 ++ drivers/net/tap/tap_intr.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index b0c09956de..919968af44 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1206,4 +1206,6 @@ tap_dev_close(struct rte_eth_dev *dev) tuntap_types[internals->type], rte_socket_id()); + rte_intr_instance_free(internals->intr_handle); + if (internals->ioctl_sock != -1) { close(internals->ioctl_sock); diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c index 56c343acea..a9097def1a 100644 --- a/drivers/net/tap/tap_intr.c +++ b/drivers/net/tap/tap_intr.c @@ -35,6 +35,4 @@ tap_rx_intr_vec_uninstall(struct rte_eth_dev *dev) rte_intr_vec_list_free(intr_handle); rte_intr_nb_efd_set(intr_handle, 0); - - rte_intr_instance_free(intr_handle); } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.008877079 +0100 +++ 0017-net-tap-fix-interrupt-handler-freeing.patch 2022-05-25 17:26:58.553828311 +0100 @@ -1 +1 @@ -From 0809d870fc22916627ec5e177d4c138c12196321 Mon Sep 17 00:00:00 2001 +From b839853e83ea8505b040aa1fd7c0456223f4451d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0809d870fc22916627ec5e177d4c138c12196321 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index bc3d56a311..5495818be6 100644 +index b0c09956de..919968af44 100644 @@ -31 +32 @@ -@@ -1214,4 +1214,6 @@ tap_dev_close(struct rte_eth_dev *dev) +@@ -1206,4 +1206,6 @@ tap_dev_close(struct rte_eth_dev *dev)