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 4316EA0518 for ; Fri, 24 Jul 2020 14:05:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A00B1C0CC; Fri, 24 Jul 2020 14:05:43 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 43F551C0CC for ; Fri, 24 Jul 2020 14:05:42 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id 9so7730289wmj.5 for ; Fri, 24 Jul 2020 05:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LuYZkpdOCRUeaIsiwZJebVDFPSIEP+KQN8GaIYobO6M=; b=i0xZSI/U/MyFe5w27rJ1W8bqAWewnGtDuFdH8zTmT002f51BPOqajOktjxKe8bzlVr DBPMJotB748wvCz50VLk1s186ItUS47i2VXPs4bHUQIrU/iVn5mW4VkDkv7Tw/DVJjLP JK0ILYCJXBhdoEkwvQ6ttovmNARrUE9ipwy6EJD0h4WjTPPRMOjFaZKZ6zylLNBi24de qQfOuWd6oubUkkBckKmW9uRIH84CD4/SJtV+5/yWkOtsM5Yw4P4jNu7RNATA65boiPnM UnIunyNXvIuGzxl7S3M8CVqNwQg/eVUF93JiUG7AO8KzPyZxDwSad2Ts74bUx7eO9puY wkEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LuYZkpdOCRUeaIsiwZJebVDFPSIEP+KQN8GaIYobO6M=; b=VKAmEzKkh5uXIFevbZ3Bs7v5/lTpVzBWg42HXy1zm+rt0uSU+C/hcvJJ4L6Likupnq /8ZIDKZRah2BvWWg4HVIpUHRdo/X5N7udt8yK2HrKAL9B2VslSlvfb7sryiVY7XYsw9t vxYPLNd6WvcmKxRqJAUxYQcltZnSLRKQZ485YySUjC8EmCz/sztMfC09utfNv4gZc7gE f9VMkCWmTdUq0tr3/NY+KloXa7m8TV9Q7ELIV6QBTkg5mipoGMxWZdBy4+C3BLn8zESZ vPDG7y0elmoHj++maJVXXdHJo0/HeYCo7z60Vr/luiVNAVdoHGNn0kIyt10t+4C4+hFT LMgw== X-Gm-Message-State: AOAM532ktl5UWyVaUtwPb46kEykjWWrDthWrxuBEeon4lM5sCU2TFpb6 N9x77AX76isWz9kxYgTchLbiRW0Y62vDaw== X-Google-Smtp-Source: ABdhPJy8jqgHyFcPjpvAGmsIEqJswF25Voju9sn02KYCcfpbJ/JcWb6838hu8nLCcZGhcu4MfuxHNQ== X-Received: by 2002:a1c:6106:: with SMTP id v6mr8231374wmb.178.1595592341991; Fri, 24 Jul 2020 05:05:41 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s203sm7211059wms.32.2020.07.24.05.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:05:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:58:31 +0100 Message-Id: <20200724120030.1863487-73-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mem: fix 32-bit init config with meson' has been queued to stable release 19.11.4 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 stable release 19.11.4 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/26/20. 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. Luca Boccassi --- >From 63cfb8b938d405896b8026b8726bd24bfc9ded8d Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 2 Jul 2020 11:57:21 +0100 Subject: [PATCH] mem: fix 32-bit init config with meson [ upstream commit b29ac33ffccf856825c42dc11185b112f569ba57 ] When building with meson, the default size of virtual address space reserved for mapping pages was globally set at 512GB, which is too big for use in 32-bit processes. To match the behaviour with "make", we configure this to be 512GB for 64-bit and 2GB for 32-bit builds. Bugzilla ID: 498 Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: Bruce Richardson Tested-by: Ferruh Yigit --- config/meson.build | 5 +++++ config/rte_config.h | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 78bfdf309..9f77802d0 100644 --- a/config/meson.build +++ b/config/meson.build @@ -214,6 +214,11 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) +if dpdk_conf.get('RTE_ARCH_64') + dpdk_conf.set('RTE_MAX_MEM_MB', 524288) +else # for 32-bit we need smaller reserved memory areas + dpdk_conf.set('RTE_MAX_MEM_MB', 2048) +endif compile_time_cpuflags = [] diff --git a/config/rte_config.h b/config/rte_config.h index d30786bc0..765251a25 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -38,7 +38,6 @@ #define RTE_MAX_MEM_MB_PER_LIST 32768 #define RTE_MAX_MEMSEG_PER_TYPE 32768 #define RTE_MAX_MEM_MB_PER_TYPE 65536 -#define RTE_MAX_MEM_MB 524288 #define RTE_MAX_MEMZONE 2560 #define RTE_MAX_TAILQ 32 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:51.392667367 +0100 +++ 0073-mem-fix-32-bit-init-config-with-meson.patch 2020-07-24 12:53:48.299006683 +0100 @@ -1,8 +1,10 @@ -From b29ac33ffccf856825c42dc11185b112f569ba57 Mon Sep 17 00:00:00 2001 +From 63cfb8b938d405896b8026b8726bd24bfc9ded8d Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 2 Jul 2020 11:57:21 +0100 Subject: [PATCH] mem: fix 32-bit init config with meson +[ upstream commit b29ac33ffccf856825c42dc11185b112f569ba57 ] + When building with meson, the default size of virtual address space reserved for mapping pages was globally set at 512GB, which is too big for use in 32-bit processes. To match the behaviour with "make", we configure @@ -10,7 +12,6 @@ Bugzilla ID: 498 Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Tested-by: Ferruh Yigit @@ -20,10 +21,10 @@ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build -index 351e268c1..241d62acc 100644 +index 78bfdf309..9f77802d0 100644 --- a/config/meson.build +++ b/config/meson.build -@@ -238,6 +238,11 @@ dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp')) +@@ -214,6 +214,11 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) @@ -36,7 +37,7 @@ compile_time_cpuflags = [] diff --git a/config/rte_config.h b/config/rte_config.h -index e9201fd46..086acf74a 100644 +index d30786bc0..765251a25 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -38,7 +38,6 @@