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 EDC02A0032 for ; Fri, 18 Feb 2022 13:45:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7DA540395; Fri, 18 Feb 2022 13:45:08 +0100 (CET) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mails.dpdk.org (Postfix) with ESMTP id 8923640141 for ; Fri, 18 Feb 2022 13:45:07 +0100 (CET) Received: by mail-ej1-f42.google.com with SMTP id qx21so14706083ejb.13 for ; Fri, 18 Feb 2022 04:45:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DZcjJzEcyXhrQ4vzd2ddrA7RuHLTrA3VtyrCjinu4Uw=; b=SyarS0mdY06DjzDjItwdHAYtD0XiINMb9A/pbuZm9/FS1H3QtxqrRmYwkdeWkGodbC fSLitz9b24s9k46f3ZEexI9nnZtEgTohRJ3kbr7S8mllIAOPg11S1de8mB+bYuF2LhZt mFBx+fAxsdQBh2xbYIyiECOBPpwy4WQslD1scswsFovI1EZenFSfygLZPItP6tzgrrDO PwcwTQ/invuJa0k8F4z0Cw1kAGNVCS1HDP6nZac+sHaP0RijIfLLRMRkLJILhCgu0NAx DttePOBNjR0QiMZT96KuBYcxBIsRUohsGrBx1Qw07z1unEm9PjA29B7bZ+6Tv4y9xRN+ nSAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DZcjJzEcyXhrQ4vzd2ddrA7RuHLTrA3VtyrCjinu4Uw=; b=ylIbiZ14/Lb7ToNvEQf3uA2Mh8B5jeoKeFrM/qowXzHibQyAcy/d2F0Cl6YDvRy+0h EhVuQZNsAccBH5Ga/dRcrEyhrNFmrWS2gR7psDCtDA58T6cudK5dHslw0HXMiDFH4/Hv EReQbybDYn4WxkCJ+1SHgnfx/o+cNOwlEIqYZp50VscrHFhTMmCuEVDAYkU68Y9gPS5n Ky4eWttSSh3Lj7zpqWYkfcIEohimWPjjEqpe3UrMV912mfJ4+IPJxTZlJcZDvigtKNmM 2qcavI/Bna7LKFIRfmMeNUCbBJXYm8eeWkOI2/ODWC6IhJuY0E9P3uuzwXlCk3Gy1Q9t HWaQ== X-Gm-Message-State: AOAM533XiyAJmkkjq0WsuDQ0bxwMM+Fcpn2uUs3xzTToEJj8iARhf0HR M0BBmD4ZiWDgYibAEkUJGbU= X-Google-Smtp-Source: ABdhPJytkedg39a/e4YvNrj5diSfpGUsEPPyxhfSZTKwBrcLkLPZChvHoDnrGsPGxXHkQKgy3so1iA== X-Received: by 2002:a17:907:98a5:b0:6ce:8c66:e75e with SMTP id ju5-20020a17090798a500b006ce8c66e75emr6722071ejc.239.1645188307250; Fri, 18 Feb 2022 04:45:07 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 17sm2185000eja.57.2022.02.18.04.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:06 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Anatoly Burakov , dpdk stable Subject: patch 'vfio: cleanup the multiprocess sync handle' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:17 +0000 Message-Id: <20220218123931.1749595-108-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/468cbff3fee4060264ea8e64385d722bfcebca17 Thanks. Luca Boccassi --- >From 468cbff3fee4060264ea8e64385d722bfcebca17 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/librte_eal/linux/eal.c | 4 ++++ lib/librte_eal/linux/eal_vfio.h | 1 + lib/librte_eal/linux/eal_vfio_mp_sync.c | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index 814572ccbd..5814f9ce69 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -1360,7 +1360,11 @@ 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(); rte_trace_save(); eal_trace_fini(); diff --git a/lib/librte_eal/linux/eal_vfio.h b/lib/librte_eal/linux/eal_vfio.h index c5d5f70548..bba5c7afa5 100644 --- a/lib/librte_eal/linux/eal_vfio.h +++ b/lib/librte_eal/linux/eal_vfio.h @@ -133,6 +133,7 @@ int 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/librte_eal/linux/eal_vfio_mp_sync.c b/lib/librte_eal/linux/eal_vfio_mp_sync.c index a2accfab3a..d12bbaee64 100644 --- a/lib/librte_eal/linux/eal_vfio_mp_sync.c +++ b/lib/librte_eal/linux/eal_vfio_mp_sync.c @@ -120,4 +120,12 @@ vfio_mp_sync_setup(void) return 0; } +void +vfio_mp_sync_cleanup(void) +{ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return; + + rte_mp_action_unregister(EAL_VFIO_MP); +} #endif -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.925327243 +0000 +++ 0108-vfio-cleanup-the-multiprocess-sync-handle.patch 2022-02-18 12:37:37.842795315 +0000 @@ -1 +1 @@ -From 6412941ae8d183ead5720f06cd2616f7c523f6a8 Mon Sep 17 00:00:00 2001 +From 468cbff3fee4060264ea8e64385d722bfcebca17 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6412941ae8d183ead5720f06cd2616f7c523f6a8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,3 +16,3 @@ - lib/eal/linux/eal.c | 4 ++++ - lib/eal/linux/eal_vfio.h | 1 + - lib/eal/linux/eal_vfio_mp_sync.c | 8 ++++++++ + lib/librte_eal/linux/eal.c | 4 ++++ + lib/librte_eal/linux/eal_vfio.h | 1 + + lib/librte_eal/linux/eal_vfio_mp_sync.c | 8 ++++++++ @@ -20,7 +21,7 @@ -diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c -index fad062a2dd..d77cd871be 100644 ---- a/lib/eal/linux/eal.c -+++ b/lib/eal/linux/eal.c -@@ -1276,7 +1276,11 @@ rte_eal_cleanup(void) - if (rte_eal_process_type() == RTE_PROC_PRIMARY && - internal_conf->hugepage_file.unlink_existing) +diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c +index 814572ccbd..5814f9ce69 100644 +--- a/lib/librte_eal/linux/eal.c ++++ b/lib/librte_eal/linux/eal.c +@@ -1360,7 +1360,11 @@ rte_eal_cleanup(void) + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) @@ -34,3 +35,3 @@ - /* after this point, any DPDK pointers will become dangling */ - rte_eal_memory_detach(); -diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h + rte_trace_save(); + eal_trace_fini(); +diff --git a/lib/librte_eal/linux/eal_vfio.h b/lib/librte_eal/linux/eal_vfio.h @@ -38,2 +39,2 @@ ---- a/lib/eal/linux/eal_vfio.h -+++ b/lib/eal/linux/eal_vfio.h +--- a/lib/librte_eal/linux/eal_vfio.h ++++ b/lib/librte_eal/linux/eal_vfio.h @@ -48 +49 @@ -diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c +diff --git a/lib/librte_eal/linux/eal_vfio_mp_sync.c b/lib/librte_eal/linux/eal_vfio_mp_sync.c @@ -50,2 +51,2 @@ ---- a/lib/eal/linux/eal_vfio_mp_sync.c -+++ b/lib/eal/linux/eal_vfio_mp_sync.c +--- a/lib/librte_eal/linux/eal_vfio_mp_sync.c ++++ b/lib/librte_eal/linux/eal_vfio_mp_sync.c