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 57443A0540 for ; Thu, 7 Jul 2022 09:55:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 520EF410D3; Thu, 7 Jul 2022 09:55:48 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 783D8406B4 for ; Thu, 7 Jul 2022 09:55:47 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 935343F04C for ; Thu, 7 Jul 2022 07:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180546; bh=mqAfnx1oqenReSPSjLVvDbGK6hFtxiASS+IEYBW1D7k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TgcIpfooH738TAYCEiWLwhI76A0Zpojif8lCc5BzHJ+cKDdWlWMN4zc0ZiCmXsPTM jH9uSdpneED7F/Aae2zaueD67exkcRwFPI91FdewzLE2rDeP7LZqGMzjdUTLv43rba RH6Tox4tQfw/XFoC9JMzOSwGSriQL76mciI9tHGLpq1Ycbwk3XEs5tew8LMRvS3hAi tf+KkxGpVd/h3VRBlQxzCEf85HneAlKkiYv7oJ6ociZOIUMr75A/Z4mJeH8kIKboeE 2aDnBfz49UB66y++nKYupMQKj03xGneRmk8nFRUnFk5cmbot0EH75ZMvBRglxXXYt0 tbov/bJ5PvIpQ== Received: by mail-ed1-f70.google.com with SMTP id j6-20020a05640211c600b0043a8ea2c138so2725211edw.2 for ; Thu, 07 Jul 2022 00:55:46 -0700 (PDT) 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=mqAfnx1oqenReSPSjLVvDbGK6hFtxiASS+IEYBW1D7k=; b=EWhKe6/fYI8Ogsbph/rb0wyU+UKe+Gb1UoNg4p+C+fIKZbKefm2DSgCPU1OyGffRAh EXY7msZxusROLFVP3lw04txdobC/zI81/1BoGIfLNqDmXZLr7pM0Zg+l63YB19t1FPJ5 Tqj32ZpKvLKo/2zx3Usk1+84fkbHACtuW4aKpmerZ8CNosOMBFzVWIEk8PTrO9+3oBEU DHGxRGCS+lEt7acWzrIYLm95sJRjRkg+G7gaVHZhey3cfcYfn0ZCULT55sklqNdau27K GgB3fEvjUE8s7OBI0+PMUSaa3Vk6y+sbvN6uNeAKDFpXNRm/UIiqZVkvlcaPmHoRmTmK ufTg== X-Gm-Message-State: AJIora+MkyJKNDXI/ez/TAFmKqhteTIMBz+ddzfI8QdEaz/HWWooNg2r OfeCJm2726ueAlL4OjOcqVjgfnhvZ/9h+eNtbbzFz817Vm/TX5plNE2WMWS6aZXPhWr8qUsw7l1 Hg+ENBrYXhpuP98gKFo8BEaTJ X-Received: by 2002:aa7:c45a:0:b0:435:d7a4:99bc with SMTP id n26-20020aa7c45a000000b00435d7a499bcmr59596386edr.158.1657180546279; Thu, 07 Jul 2022 00:55:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sA5ICMVKNQ9D5mhMN9uuPyYTbNIUk784ehmrFXyMMe6Jyo2QMM40Dudeu6DJARzoUEfMQ1LA== X-Received: by 2002:aa7:c45a:0:b0:435:d7a4:99bc with SMTP id n26-20020aa7c45a000000b00435d7a499bcmr59596365edr.158.1657180545993; Thu, 07 Jul 2022 00:55:45 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id c12-20020a170906d18c00b00727c6da69besm11731855ejz.38.2022.07.07.00.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:55:45 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Deepak Khandelwal Cc: Anatoly Burakov , dpdk stable Subject: patch 'mem: skip attaching external memory in secondary process' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:01 +0200 Message-Id: <20220707075522.194223-6-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6933433fea7c7f590eabd95865e4fbb05105a710 Thanks. Christian Ehrhardt --- >From 6933433fea7c7f590eabd95865e4fbb05105a710 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/librte_eal/freebsd/eal/eal_memory.c | 4 ++-- lib/librte_eal/linux/eal/eal_memory.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c index fb1549fbe6..1cc36dff60 100644 --- a/lib/librte_eal/freebsd/eal/eal_memory.c +++ b/lib/librte_eal/freebsd/eal/eal_memory.c @@ -508,8 +508,8 @@ 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; if (rte_fbarray_attach(&msl->memseg_arr)) { diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c index c93d9bb2b8..e7ab3aaf17 100644 --- a/lib/librte_eal/linux/eal/eal_memory.c +++ b/lib/librte_eal/linux/eal/eal_memory.c @@ -2423,8 +2423,8 @@ 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; if (rte_fbarray_attach(&msl->memseg_arr)) { -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.463943632 +0200 +++ 0006-mem-skip-attaching-external-memory-in-secondary-proc.patch 2022-07-07 09:54:10.789823530 +0200 @@ -1 +1 @@ -From 90bf3f89ed33f78e9f41818caf123e13e508dee7 Mon Sep 17 00:00:00 2001 +From 6933433fea7c7f590eabd95865e4fbb05105a710 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90bf3f89ed33f78e9f41818caf123e13e508dee7 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -22,2 +23,2 @@ - lib/eal/freebsd/eal_memory.c | 4 ++-- - lib/eal/linux/eal_memory.c | 4 ++-- + lib/librte_eal/freebsd/eal/eal_memory.c | 4 ++-- + lib/librte_eal/linux/eal/eal_memory.c | 4 ++-- @@ -26,5 +27,5 @@ -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 -@@ -446,8 +446,8 @@ memseg_secondary_init(void) +diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c +index fb1549fbe6..1cc36dff60 100644 +--- a/lib/librte_eal/freebsd/eal/eal_memory.c ++++ b/lib/librte_eal/freebsd/eal/eal_memory.c +@@ -508,8 +508,8 @@ memseg_secondary_init(void) @@ -41,5 +42,5 @@ -diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c -index ee1a9e6800..c890c42106 100644 ---- a/lib/eal/linux/eal_memory.c -+++ b/lib/eal/linux/eal_memory.c -@@ -1874,8 +1874,8 @@ memseg_secondary_init(void) +diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c +index c93d9bb2b8..e7ab3aaf17 100644 +--- a/lib/librte_eal/linux/eal/eal_memory.c ++++ b/lib/librte_eal/linux/eal/eal_memory.c +@@ -2423,8 +2423,8 @@ memseg_secondary_init(void)