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 6F04CA0093 for ; Tue, 10 May 2022 14:30:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A24B42834; Tue, 10 May 2022 14:30:50 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9A43A4283A for ; Tue, 10 May 2022 14:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185847; 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=ojIOqJ1YKicBb5S2phG+iR2FwFHQKPywEyhPiWUuzOo=; b=TLP7ytBR5nrbIoQdx8tqc63mKA3SAoLIi7D6CkQGJd+8WxWy8Q6XPWGfQrpbNY9IzoY5P+ xlMH9qWLhgqhFSGEm0r8er6vwJrVKFviNyBey0EgazbIjBs9c+F2zCvXNdZjt8BbciflhN fswxQ7AZ+fB1R4DMQVzXnuCeexY0w5w= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-eYWcBayENzmbF9SPuGrMRA-1; Tue, 10 May 2022 08:30:46 -0400 X-MC-Unique: eYWcBayENzmbF9SPuGrMRA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ABB903C92FC1; Tue, 10 May 2022 12:30:45 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id C691240CFD19; Tue, 10 May 2022 12:30:44 +0000 (UTC) From: Kevin Traynor To: Deepak Khandelwal Cc: Anatoly Burakov , dpdk stable Subject: patch 'mem: skip attaching external memory in secondary process' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:56 +0100 Message-Id: <20220510123010.159523-19-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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/15/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/804b2e64eb2f09c46e2521271ac3735624512e86 Thanks. Kevin --- >From 804b2e64eb2f09c46e2521271ac3735624512e86 Mon Sep 17 00:00:00 2001 From: Deepak Khandelwal Date: Thu, 21 Apr 2022 14:41:21 +0530 Subject: [PATCH] mem: skip attaching external memory in secondary process [ upstream commit 90bf3f89ed33f78e9f41818caf123e13e508dee7 ] Currently, EAL init in secondary processes will attach all fbarrays in the memconfig to have access to the primary process's page tables. However, fbarrays corresponding to external memory segments should not be attached at initialization, because this will happen as part of `rte_extmem_attach` [1] or `rte_malloc_heap_memory_attach` [2] calls. 1: https://doc.dpdk.org/api/rte__memory_8h.html#a2796da68de6825f8edf53759f8e4d230 2: https://doc.dpdk.org/api/rte__malloc_8h.html#af6360dea35bdf162feeb2b62cf149fd3 Fixes: ff3619d6244b ("malloc: allow attaching to external memory chunks") Suggested-by: Anatoly Burakov Signed-off-by: Deepak Khandelwal Acked-by: Anatoly Burakov --- lib/eal/freebsd/eal_memory.c | 4 ++-- lib/eal/linux/eal_memory.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c index 78ac142b82..17ab10e0ca 100644 --- a/lib/eal/freebsd/eal_memory.c +++ b/lib/eal/freebsd/eal_memory.c @@ -447,6 +447,6 @@ memseg_secondary_init(void) msl = &mcfg->memsegs[msl_idx]; - /* skip empty memseg lists */ - if (msl->memseg_arr.len == 0) + /* skip empty and external memseg lists */ + if (msl->memseg_arr.len == 0 || msl->external) continue; diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index 03a4f2dd2d..fda6a159d5 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -1884,6 +1884,6 @@ memseg_secondary_init(void) msl = &mcfg->memsegs[msl_idx]; - /* skip empty memseg lists */ - if (msl->memseg_arr.len == 0) + /* skip empty and external memseg lists */ + if (msl->memseg_arr.len == 0 || msl->external) continue; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.126717131 +0100 +++ 0019-mem-skip-attaching-external-memory-in-secondary-proc.patch 2022-05-10 13:24:21.610646369 +0100 @@ -1 +1 @@ -From 90bf3f89ed33f78e9f41818caf123e13e508dee7 Mon Sep 17 00:00:00 2001 +From 804b2e64eb2f09c46e2521271ac3735624512e86 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90bf3f89ed33f78e9f41818caf123e13e508dee7 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -40 +41 @@ -index ee1a9e6800..c890c42106 100644 +index 03a4f2dd2d..fda6a159d5 100644 @@ -43 +44 @@ -@@ -1875,6 +1875,6 @@ memseg_secondary_init(void) +@@ -1884,6 +1884,6 @@ memseg_secondary_init(void)