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 89F7AA0613 for ; Tue, 27 Aug 2019 11:31:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7EB0854AE; Tue, 27 Aug 2019 11:31:47 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 58D9B1BFFA for ; Tue, 27 Aug 2019 11:31:46 +0200 (CEST) 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 CBCCA369CC; Tue, 27 Aug 2019 09:31:45 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id C057A5C1D6; Tue, 27 Aug 2019 09:31:44 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: Bruce Richardson , dpdk stable Date: Tue, 27 Aug 2019 10:30:20 +0100 Message-Id: <20190827093032.20423-43-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-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.30]); Tue, 27 Aug 2019 09:31:45 +0000 (UTC) Subject: [dpdk-stable] patch 'eal/freebsd: fix config creation' has been queued to LTS release 18.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 LTS release 18.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 09/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00 Thanks. Kevin Traynor --- >From f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 12 Jul 2019 15:48:08 +0100 Subject: [PATCH] eal/freebsd: fix config creation [ upstream commit e6d3c09282d88e904e4255a0c81e0c19a92217c1 ] The config create function did not store the mem config address in the shared memconfig structure, so the secondary processes couldn't map it at the required address. Fixes: b149a7064261 ("eal/freebsd: add config reattach in secondary process") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- lib/librte_eal/bsdapp/eal/eal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 30b4cf7bf..e85c26ae6 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -254,4 +254,9 @@ rte_eal_config_create(void) memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); rte_config.mem_config = rte_mem_cfg_addr; + + /* store address of the config in the config itself so that secondary + * processes could later map the config into this exact location + */ + rte_config.mem_config->mem_cfg_addr = (uintptr_t) rte_mem_cfg_addr; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:13.261296953 +0100 +++ 0043-eal-freebsd-fix-config-creation.patch 2019-08-27 09:40:10.940143903 +0100 @@ -1 +1 @@ -From e6d3c09282d88e904e4255a0c81e0c19a92217c1 Mon Sep 17 00:00:00 2001 +From f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e6d3c09282d88e904e4255a0c81e0c19a92217c1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/librte_eal/freebsd/eal/eal.c | 5 +++++ + lib/librte_eal/bsdapp/eal/eal.c | 5 +++++ @@ -19,5 +20,6 @@ -diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c -index 13ca1202c..d53f0fe69 100644 ---- a/lib/librte_eal/freebsd/eal/eal.c -+++ b/lib/librte_eal/freebsd/eal/eal.c -@@ -267,4 +267,9 @@ rte_eal_config_create(void) +diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c +index 30b4cf7bf..e85c26ae6 100644 +--- a/lib/librte_eal/bsdapp/eal/eal.c ++++ b/lib/librte_eal/bsdapp/eal/eal.c +@@ -254,4 +254,9 @@ rte_eal_config_create(void) + memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); @@ -25 +27 @@ - ++ @@ -30,2 +31,0 @@ -+ - return 0; @@ -32,0 +33 @@ +