From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 85B6A1B455 for ; Thu, 31 Jan 2019 16:50:05 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E07B788E56; Thu, 31 Jan 2019 15:50:04 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD3BD5C207; Thu, 31 Jan 2019 15:50:03 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: dpdk stable Date: Thu, 31 Jan 2019 15:48:26 +0000 Message-Id: <20190131154901.5383-18-ktraynor@redhat.com> In-Reply-To: <20190131154901.5383-1-ktraynor@redhat.com> References: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 31 Jan 2019 15:50:04 +0000 (UTC) Subject: [dpdk-stable] patch 'vfio: do not unregister callback in secondary process' has been queued to LTS release 18.11.1 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: , X-List-Received-Date: Thu, 31 Jan 2019 15:50:05 -0000 Hi, FYI, your patch has been queued to LTS release 18.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/07/19. 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. Kevin Traynor --- >>From f478a01ab9a5380595430b052b6d0eb681c9a786 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 10 Jan 2019 16:33:39 +0000 Subject: [PATCH] vfio: do not unregister callback in secondary process [ upstream commit c0f8d50d1c3930c560f244b66c6820879be9297c ] Callbacks are only registered in the primary, so do not attempt to unregister callbacks in secondary processes. Fixes: 43e463137154 ("vfio: support memory event callbacks") Signed-off-by: Anatoly Burakov --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index 0516b1597..72cc65151 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -858,5 +858,6 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, * avoid spurious attempts to map/unmap memory from VFIO. */ - if (vfio_cfg == default_vfio_cfg && vfio_cfg->vfio_active_groups == 0) + if (vfio_cfg == default_vfio_cfg && vfio_cfg->vfio_active_groups == 0 && + rte_eal_process_type() != RTE_PROC_SECONDARY) rte_mem_event_callback_unregister(VFIO_MEM_EVENT_CLB_NAME, NULL); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-31 15:44:06.171753374 +0000 +++ 0018-vfio-do-not-unregister-callback-in-secondary-process.patch 2019-01-31 15:44:05.000000000 +0000 @@ -1,13 +1,14 @@ -From c0f8d50d1c3930c560f244b66c6820879be9297c Mon Sep 17 00:00:00 2001 +From f478a01ab9a5380595430b052b6d0eb681c9a786 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 10 Jan 2019 16:33:39 +0000 Subject: [PATCH] vfio: do not unregister callback in secondary process +[ upstream commit c0f8d50d1c3930c560f244b66c6820879be9297c ] + Callbacks are only registered in the primary, so do not attempt to unregister callbacks in secondary processes. Fixes: 43e463137154 ("vfio: support memory event callbacks") -Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov ---