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 DCB79A0350 for ; Mon, 21 Feb 2022 16:42:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6EDB4013F; Mon, 21 Feb 2022 16:42:21 +0100 (CET) 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 5FBFC41143 for ; Mon, 21 Feb 2022 16:42:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458139; 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=NgGDI20orr+5QUr1zDcsfZEYxC1GTk4L2Hq8YZ/hMEM=; b=dfM5Jf5d6j9PVcA4ssuLpT3hcNz6jz7pNT3HZP1dudB04E5sUynrPJ4ThwMsZM4lfL77wa ZRkBaR29PbfJSbWzGcVfegrCcUA+DHoTWKqgjltSOtOANuKHwJD7q0KIuZq54G1v8lyIdS sAWIy0dJyoKc7eeVtWcz+LS8NUU3sMI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-lM-FO35ZNISTs3G0yzuVpA-1; Mon, 21 Feb 2022 10:42:16 -0500 X-MC-Unique: lM-FO35ZNISTs3G0yzuVpA-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 7722C1091DA2; Mon, 21 Feb 2022 15:42:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CAD87E2E8; Mon, 21 Feb 2022 15:42:14 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Anatoly Burakov , dpdk stable Subject: patch 'vfio: cleanup the multiprocess sync handle' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:47 +0000 Message-Id: <20220221153625.152324-158-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-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.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 02/26/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/e183e43e2b4690e133829c7d6fd21fad502fd8aa Thanks. Kevin --- >From e183e43e2b4690e133829c7d6fd21fad502fd8aa Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 13 Nov 2021 09:22:55 -0800 Subject: [PATCH] vfio: cleanup the multiprocess sync handle [ upstream commit 6412941ae8d183ead5720f06cd2616f7c523f6a8 ] When rte_eal_cleanup is called the rte_mp_action for VFIO should be freed. Fixes: edf73dd33072 ("ipc: handle unsupported IPC in action register") Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- lib/eal/linux/eal.c | 4 ++++ lib/eal/linux/eal_vfio.h | 1 + lib/eal/linux/eal_vfio_mp_sync.c | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 60b4924838..504287c7ec 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1363,5 +1363,9 @@ rte_eal_cleanup(void) if (rte_eal_process_type() == RTE_PROC_PRIMARY) rte_memseg_walk(mark_freeable, NULL); + rte_service_finalize(); +#ifdef VFIO_PRESENT + vfio_mp_sync_cleanup(); +#endif rte_mp_channel_cleanup(); /* after this point, any DPDK pointers will become dangling */ diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h index c5d5f70548..bba5c7afa5 100644 --- a/lib/eal/linux/eal_vfio.h +++ b/lib/eal/linux/eal_vfio.h @@ -134,4 +134,5 @@ vfio_has_supported_extensions(int vfio_container_fd); int vfio_mp_sync_setup(void); +void vfio_mp_sync_cleanup(void); #define EAL_VFIO_MP "eal_vfio_mp_sync" diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c index a2accfab3a..d12bbaee64 100644 --- a/lib/eal/linux/eal_vfio_mp_sync.c +++ b/lib/eal/linux/eal_vfio_mp_sync.c @@ -121,3 +121,11 @@ vfio_mp_sync_setup(void) } +void +vfio_mp_sync_cleanup(void) +{ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return; + + rte_mp_action_unregister(EAL_VFIO_MP); +} #endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.981728577 +0000 +++ 0158-vfio-cleanup-the-multiprocess-sync-handle.patch 2022-02-21 15:22:44.308704615 +0000 @@ -1 +1 @@ -From 6412941ae8d183ead5720f06cd2616f7c523f6a8 Mon Sep 17 00:00:00 2001 +From e183e43e2b4690e133829c7d6fd21fad502fd8aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6412941ae8d183ead5720f06cd2616f7c523f6a8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index fad062a2dd..d77cd871be 100644 +index 60b4924838..504287c7ec 100644 @@ -24,2 +25,2 @@ -@@ -1277,5 +1277,9 @@ rte_eal_cleanup(void) - internal_conf->hugepage_file.unlink_existing) +@@ -1363,5 +1363,9 @@ rte_eal_cleanup(void) + if (rte_eal_process_type() == RTE_PROC_PRIMARY)