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 8F6A7A0543 for ; Tue, 21 Jun 2022 10:04:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8748B40151; Tue, 21 Jun 2022 10:04:18 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2059.outbound.protection.outlook.com [40.107.102.59]) by mails.dpdk.org (Postfix) with ESMTP id AA74B427F4 for ; Tue, 21 Jun 2022 10:04:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l7gN+C4eN/6JtuZLyLIOmNyULhOSIlOogAYL1RONL6p2cBDV4bSt1OrSex+NdSM1FNbBh1f7kea531JsHEs6w3ZmnoFiclR0PZkSjii9dMUwRgkKaHZF6Rk0nDbqfhJR+7jz/8If8hedDpv7R7+OyztqzLCXeYhQmNHgza9Q+sWqQ1/ke5MOrrpyU4l1FKWANptpEAZnwvZZ2wle+gqE/3y92mZVoeFpBexVMDLyU40KoWT0234nQ5Qy3ndm4hQ6hu25Q4HCkqm6fav+1N+tYiLnwE/5BcndPExSRlgV9NEbEbfcFkZoscgo6UNHP29nkMI1CIhJ7HYH47O3JRm+TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vf1F+VCPuRNZrJCZSfJj701kK6N3lQxGLmZ/4H46POM=; b=RqqvyU8Az54iFzRlhnYFhWyClH4N+TjwmQQBCWxm+zaXQCfMN/Fn3pSX0sh/vjOzV7JJM86SYQVVhovUrpcQJlmSmaEmMuBwq8QVxnjz6EpChJGnmG+SnQgRDrNsqWdalrgNWwGwCyLeLhyDVRWkBiVVb9R+UYI/i4Kue7SnyXeVRlmAJH5oE1eSxXejzMADfDlU3KMXdcAky1+rw/fzbvkzYV6rNp8lqskk7tkpvlXCaBtCqEXaaiQkT8XEqW4dOiTibtmla0zl+7YDI/1LniRA3FMMVkyYaquh3tqI/36lvvou2+Mkub5FZUuiq9rOf3IlJHxSN08s8lWvNotysQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vf1F+VCPuRNZrJCZSfJj701kK6N3lQxGLmZ/4H46POM=; b=tCP0L1dXQyTHDE6T395fhykPDfrPKura0Coq7wBMFk8k95dZXAovUC54PbSx7SB0jIJnK83MlfuH2ixoOr6+SJ0uVrJ8FvGoiRdSkeo9K8Z5LXIl+bYizshrv5nfu+wCjEbjbyTvS0+sKJatyilwiMqJu74CmvqRKJQf9SjQfDdd+YobWz1lKog4L1ynmfwRwB5tWvQsy4M91oVTE3OyVITNPdlcPj5qC2abfa9Gm4Uia4nYskPb1Gk8r1vZjUQh/+fri+DFGLIATl90FS7Y3YieTermlKsnQ3Hko8Ytc+5AtU8H2fd6UYhwJUfaG2dHW5R7++CiFYmGW69sWrLfkQ== Received: from DM6PR03CA0065.namprd03.prod.outlook.com (2603:10b6:5:100::42) by MWHPR1201MB0190.namprd12.prod.outlook.com (2603:10b6:301:55::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:04:15 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:100:cafe::5b) by DM6PR03CA0065.outlook.office365.com (2603:10b6:5:100::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:04:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:04:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:04:14 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:04:12 -0700 From: Xueming Li To: Deepak Khandelwal CC: Anatoly Burakov , dpdk stable Subject: patch 'mem: skip attaching external memory in secondary process' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:19 +0300 Message-ID: <20220621080301.2315720-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2900461-68e6-44d0-79df-08da535ca1fc X-MS-TrafficTypeDiagnostic: MWHPR1201MB0190:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aa33jcHXcs+WezCcCru9oVHZcAh3SqMy08XHYbLweoXRYNY4ssKy49vOImWUrFcXMWsqB2X2riTMo5qjLzCV9m/E+X0GeddeOVFVgUBmOrhSUEu2ubxB+Jfb0vnYz3c/EjQYeVNY88jbLTdByXlzOKEkq3am3g5xdY/XRpHHWjS6/A03UfPYACDZQeg7NAU6a+G/zI4OG37rCmAqeZANgQTshtPPoM0WKU5EnDMcJOjLYmj8ZwH4ChRceiQauVbLo1rwqSfoZTwRobQD5JN7rnDAG2ACSYhxQscjXKcKd6HA5Zezg2abBfYtxlFaJj0EzzbsrS7Vu8yRQlHJ6n5DKj/cVWbTKVCHzWCfK2WOxUBrf9Hz0oYv0wfrWmCkfV92MP9M91ubhZ5jT8XezsnkXz4uziUabK15X+2P67Eg87X2K1awKO9qQXZnQPJVaLBras2gMjmIZdMDUpZFcjr952caRPuvNC8qDSd9Xx8OAq9bMeNTF1AZteAAK2NjaaC01J1MblWdIfEqxNUgH/L0Ng2pDvStVmdTNxwQjz6hOgFe+h2HuGUEvDUYeodfUYtE+vrqRdZeBdyS3waJyw6G5kCE9tfnpo2YADjkGNHZU+pjG/QeqfH5lJ2OEnBSBZbVBl3bJKaSJR7LIDWZu0ah4aHLgrIouoAdBByVg3zaFII/64umYdEx93UaBJ2xXsMubHTs6ozJS9oS07pHS7uvHJA/mJ+ng1+9BJczNP1nvMWJS5oewm7PtuuLCTNVkx5b0aHnNLjPWxxBSgunUjBbfY5kmGSDs4jxd/0ZF2EVRtm8PFxbNW0TfUZ9aiUf2+IHI2N02xk6mSaIx8tOw2vlap7ScoUZcKW9+NUFfBnqG0g= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(346002)(396003)(376002)(46966006)(40470700004)(36840700001)(82740400003)(36756003)(82310400005)(40460700003)(356005)(316002)(36860700001)(40480700001)(6916009)(55016003)(54906003)(966005)(81166007)(7696005)(186003)(16526019)(47076005)(4326008)(6286002)(2906002)(336012)(426003)(70586007)(1076003)(83380400001)(8936002)(86362001)(5660300002)(2616005)(478600001)(41300700001)(8676002)(26005)(70206006)(53546011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:04:14.5027 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2900461-68e6-44d0-79df-08da535ca1fc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0190 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/ae1ed789dc3c7d9cfc0d8ca5e4e35e60dc11c19f Thanks. Xueming Li --- >From ae1ed789dc3c7d9cfc0d8ca5e4e35e60dc11c19f 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 Cc: Xueming Li [ 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_memory.c | 4 ++-- lib/librte_eal/linux/eal_memory.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/librte_eal/freebsd/eal_memory.c index 78ac142b82..17ab10e0ca 100644 --- a/lib/librte_eal/freebsd/eal_memory.c +++ b/lib/librte_eal/freebsd/eal_memory.c @@ -446,8 +446,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_memory.c b/lib/librte_eal/linux/eal_memory.c index 03a4f2dd2d..fda6a159d5 100644 --- a/lib/librte_eal/linux/eal_memory.c +++ b/lib/librte_eal/linux/eal_memory.c @@ -1883,8 +1883,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:49.888119184 +0800 +++ 0013-mem-skip-attaching-external-memory-in-secondary-proc.patch 2022-06-21 15:37:48.981117718 +0800 @@ -1 +1 @@ -From 90bf3f89ed33f78e9f41818caf123e13e508dee7 Mon Sep 17 00:00:00 2001 +From ae1ed789dc3c7d9cfc0d8ca5e4e35e60dc11c19f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 90bf3f89ed33f78e9f41818caf123e13e508dee7 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -22,2 +24,2 @@ - lib/eal/freebsd/eal_memory.c | 4 ++-- - lib/eal/linux/eal_memory.c | 4 ++-- + lib/librte_eal/freebsd/eal_memory.c | 4 ++-- + lib/librte_eal/linux/eal_memory.c | 4 ++-- @@ -26 +28 @@ -diff --git a/lib/eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c +diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/librte_eal/freebsd/eal_memory.c @@ -28,2 +30,2 @@ ---- a/lib/eal/freebsd/eal_memory.c -+++ b/lib/eal/freebsd/eal_memory.c +--- a/lib/librte_eal/freebsd/eal_memory.c ++++ b/lib/librte_eal/freebsd/eal_memory.c @@ -41,5 +43,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_memory.c b/lib/librte_eal/linux/eal_memory.c +index 03a4f2dd2d..fda6a159d5 100644 +--- a/lib/librte_eal/linux/eal_memory.c ++++ b/lib/librte_eal/linux/eal_memory.c +@@ -1883,8 +1883,8 @@ memseg_secondary_init(void)