From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6C9ABA0527
for <public@inbox.dpdk.org>; Mon, 9 Nov 2020 19:41:46 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 666C16883;
Mon, 9 Nov 2020 19:41:45 +0100 (CET)
Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com
[209.85.221.51]) by dpdk.org (Postfix) with ESMTP id EE0AA6883
for <stable@dpdk.org>; Mon, 9 Nov 2020 19:41:42 +0100 (CET)
Received: by mail-wr1-f51.google.com with SMTP id b8so9872599wrn.0
for <stable@dpdk.org>; Mon, 09 Nov 2020 10:41:42 -0800 (PST)
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=WWNIkzcNA7O3hmqbfvrO6wRShoyFoxnEQ6vQndHLuZQ=;
b=TveBLzDFiZqSjyKTYi7RV9lRNUIfPHImF2djEMORUnZXuwaf3x165/Z8o19f4J7TrA
tQNb8Agynr2EIyGGg7Tw1HLk6nN74bEu9jKcvdYIv+ClRZzTYBZzXEqCyieap5uChP5N
dG6hfe7TW89gvLHYjzNKmgKmMeunKk1qG/4btIW1D7Ncj57ZKZNVvDJk2X6hiUlKJCLS
aen3V7LzpIa29BpqMrhtkv4ugt5hKGktlQyrXQDM0FmEBRWLJIfyVuFc7IX9m8z328c4
3jA3cl+IuP+hCc4Uwdqy9vn1qS0BpE/3C5imJtqJTmxSWQUbNZDpxjnTVRYOFLR66DM9
Re/Q==
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=WWNIkzcNA7O3hmqbfvrO6wRShoyFoxnEQ6vQndHLuZQ=;
b=o0YC4I6z11PHXj7sqgu1wB/o6MxZzJWK2ZUcdanTfpDqjH8UPu6wS5h8F1st8vnXtS
/IUnuPuAMAEel8xrhYCsdwId/f+GKJaZMKk5S8APcXP9WdZhmImuYD0t8lb8RsXx1xao
xq4oHWOqeiCJNgwFK8dtavUhiLXjHxsNVf3aK71cYalD+BNa6JBZBfeLLUBMwtKoejVZ
I3JG3oTEuPnlsKSMhR0vxY87ol7bsCEUZ1m7LVbrwO++z65TPmXsBUa4SaY2cq/VzsLs
3+DritsN7ph4vCs/qfzvbgBYJMFoI/+FLfPwVXO7KsZaI/nAFp8jB3xIYm0rTLIJCd4O
VOqg==
X-Gm-Message-State: AOAM532FeTsMsE8Vrw5pLYmPdNKW7NMj+dAGQrTXqtT46wFtyBcX3iha
zal2N2nTCbdgwbJggmLRzNKnDgjR80FgOg==
X-Google-Smtp-Source: ABdhPJy8WBRKV9Sx7YHQBPqEhZJdxL0jA2WCPKh40DuGOws4CV8PjCGP0NdhdzIBuxWs3dBVnpJMjA==
X-Received: by 2002:adf:9124:: with SMTP id j33mr18980031wrj.376.1604947301658;
Mon, 09 Nov 2020 10:41:41 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id f7sm15068029wrx.64.2020.11.09.10.41.40
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 09 Nov 2020 10:41:40 -0800 (PST)
From: luca.boccassi@gmail.com
To: Thomas Monjalon <thomas@monjalon.net>
Cc: David Marchand <david.marchand@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Mon, 9 Nov 2020 18:39:54 +0000
Message-Id: <20201109184111.3463090-6-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com>
References: <20201028104606.3504127-207-luca.boccassi@gmail.com>
<20201109184111.3463090-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'mem: fix config name in error logs' has been
queued to stable release 19.11.6
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.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 11/11/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.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/e85eb5178ae270cda848473ebdeac77c93402444
Thanks.
Luca Boccassi
---
>From e85eb5178ae270cda848473ebdeac77c93402444 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Thu, 22 Oct 2020 19:36:21 +0200
Subject: [PATCH] mem: fix config name in error logs
[ upstream commit a796c922d24da9444be9ede24d925d25519602b7 ]
When introducing the new option CONFIG_RTE_MAX_MEM_MB_PER_TYPE,
some logs were referencing a wrong name: CONFIG_RTE_MAX_MEM_PER_TYPE.
Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: David Marchand <david.marchand@redhat.com>
---
lib/librte_eal/freebsd/eal/eal_memory.c | 2 +-
lib/librte_eal/linux/eal/eal_memory.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c
index 5bc2da160c..fb1549fbe6 100644
--- a/lib/librte_eal/freebsd/eal/eal_memory.c
+++ b/lib/librte_eal/freebsd/eal/eal_memory.c
@@ -193,7 +193,7 @@ rte_eal_hugepage_init(void)
if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
- RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
+ RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
return -1;
}
arr = &msl->memseg_arr;
diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
index 7a9c97ff88..c93d9bb2b8 100644
--- a/lib/librte_eal/linux/eal/eal_memory.c
+++ b/lib/librte_eal/linux/eal/eal_memory.c
@@ -703,7 +703,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
- RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
+ RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
return -1;
}
--
2.27.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-09 18:40:11.460633134 +0000
+++ 0006-mem-fix-config-name-in-error-logs.patch 2020-11-09 18:40:11.071310349 +0000
@@ -1 +1 @@
-From a796c922d24da9444be9ede24d925d25519602b7 Mon Sep 17 00:00:00 2001
+From e85eb5178ae270cda848473ebdeac77c93402444 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a796c922d24da9444be9ede24d925d25519602b7 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,2 +16,2 @@
- lib/librte_eal/freebsd/eal_memory.c | 2 +-
- lib/librte_eal/linux/eal_memory.c | 2 +-
+ lib/librte_eal/freebsd/eal/eal_memory.c | 2 +-
+ lib/librte_eal/linux/eal/eal_memory.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/librte_eal/freebsd/eal_memory.c
-index b8b337a554..8d4b26b9b8 100644
---- a/lib/librte_eal/freebsd/eal_memory.c
-+++ b/lib/librte_eal/freebsd/eal_memory.c
-@@ -174,7 +174,7 @@ rte_eal_hugepage_init(void)
+diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c
+index 5bc2da160c..fb1549fbe6 100644
+--- a/lib/librte_eal/freebsd/eal/eal_memory.c
++++ b/lib/librte_eal/freebsd/eal/eal_memory.c
+@@ -193,7 +193,7 @@ rte_eal_hugepage_init(void)
@@ -32,5 +33,5 @@
-diff --git a/lib/librte_eal/linux/eal_memory.c b/lib/librte_eal/linux/eal_memory.c
-index 3e47efe582..df0f07ee7e 100644
---- a/lib/librte_eal/linux/eal_memory.c
-+++ b/lib/librte_eal/linux/eal_memory.c
-@@ -714,7 +714,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
+diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c
+index 7a9c97ff88..c93d9bb2b8 100644
+--- a/lib/librte_eal/linux/eal/eal_memory.c
++++ b/lib/librte_eal/linux/eal/eal_memory.c
+@@ -703,7 +703,7 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)