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 7C798A04DD for ; Wed, 18 Nov 2020 17:38:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0EB3A160; Wed, 18 Nov 2020 17:37:40 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 6465D3B5 for ; Wed, 18 Nov 2020 17:37:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717455; 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=G/6i7Gk5VKwlSqcCm7xnUJ9mNK4FlnA6mlATuLCrviI=; b=O4sMtBIFdZvCbtM9isQI2NU9vxtSTaDPIcWBEqvB2BRBcEPNcefqA/BJZO8lPhcRHcz6EC ByLjEEa0sjQjniMBiQIQ+R8y7VumaLYRC/HcFwSPCggfGnaKYyD6elvkkpDGaxQHQPzF5n kV7F6xTpK1pzeMaGzbhwv71H6O2LKI8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258--8NMVRK-PoeFnjUKZWHTpg-1; Wed, 18 Nov 2020 11:37:31 -0500 X-MC-Unique: -8NMVRK-PoeFnjUKZWHTpg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7CF91922054; Wed, 18 Nov 2020 16:37:25 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE0CB5C1A3; Wed, 18 Nov 2020 16:37:24 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: David Marchand , dpdk stable Date: Wed, 18 Nov 2020 16:35:27 +0000 Message-Id: <20201118163558.1101823-41-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'mem: fix config name in error logs' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 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/24/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/0521cca7c8c96f88d2dccffce101ea56a568f608 Thanks. Kevin. --- >From 0521cca7c8c96f88d2dccffce101ea56a568f608 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon 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 Acked-by: David Marchand --- lib/librte_eal/bsdapp/eal/eal_memory.c | 2 +- lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c index 418c4bb0aa..79bd221490 100644 --- a/lib/librte_eal/bsdapp/eal/eal_memory.c +++ b/lib/librte_eal/bsdapp/eal/eal_memory.c @@ -181,5 +181,5 @@ rte_eal_hugepage_init(void) 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; } diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index ac0424582e..e690d0ffd0 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -705,5 +705,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.709292424 +0000 +++ 0041-mem-fix-config-name-in-error-logs.patch 2020-11-18 16:33:37.941215070 +0000 @@ -1 +1 @@ -From a796c922d24da9444be9ede24d925d25519602b7 Mon Sep 17 00:00:00 2001 +From 0521cca7c8c96f88d2dccffce101ea56a568f608 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/bsdapp/eal/eal_memory.c | 2 +- + lib/librte_eal/linuxapp/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 -@@ -175,5 +175,5 @@ rte_eal_hugepage_init(void) +diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c +index 418c4bb0aa..79bd221490 100644 +--- a/lib/librte_eal/bsdapp/eal/eal_memory.c ++++ b/lib/librte_eal/bsdapp/eal/eal_memory.c +@@ -181,5 +181,5 @@ rte_eal_hugepage_init(void) @@ -30,5 +31,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 -@@ -715,5 +715,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) +diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c +index ac0424582e..e690d0ffd0 100644 +--- a/lib/librte_eal/linuxapp/eal/eal_memory.c ++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c +@@ -705,5 +705,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)