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 5E771A04B5 for ; Tue, 3 Dec 2019 19:28:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 548F0235; Tue, 3 Dec 2019 19:28:56 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 3093B235 for ; Tue, 3 Dec 2019 19:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397734; 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=pECwAXf5ue3uQCc4UrKA9k/oG3HuEj7winR46lbycgE=; b=D+3yQRGNnTLXwF53wneAonbR7ktT8YZll+Lx8X/8PBwzpzFNWaa1BBa3OqwqVAu62SdAH1 QPn+dGroD0hig5GKJ9AwtWKX0sMg2BHV+m3+LUMXZCr+Tzw0tGIdtJwCzxA+zunubzdJL6 0Jawu014UP4mgAJH2Es7SZQ4TaLEg6g= 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-318-HkBGdg8QMZ6e-6zrEDuloA-1; Tue, 03 Dec 2019 13:28:51 -0500 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 75080107ACC5; Tue, 3 Dec 2019 18:28:50 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83BC05C240; Tue, 3 Dec 2019 18:28:49 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: Ferruh Yigit , dpdk stable Date: Tue, 3 Dec 2019 18:26:54 +0000 Message-Id: <20191203182714.17297-45-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: HkBGdg8QMZ6e-6zrEDuloA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'eal/linux: restore specific hugepage ordering for ppc' has been queued to LTS release 18.11.6 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.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 12/10/19. 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 rebasi= ng (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/c75284148867891fd2= 356376ab159afbaef3227b Thanks. Kevin. --- >From c75284148867891fd2356376ab159afbaef3227b Mon Sep 17 00:00:00 2001 From: David Christensen Date: Wed, 25 Sep 2019 14:42:23 -0700 Subject: [PATCH] eal/linux: restore specific hugepage ordering for ppc [ upstream commit ed5d3d5cdb4d19262e9c5face0a11129f090a485 ] An ifdef present in eal_memory.c references "RTE_ARCH_PPC64" when it should actually use "RTE_ARCH_PPC_64". Simple testing revealed that both the PPC_64 and non-PPC_64 versions of the code involved work, but the PPC_64 version of the code is retained to be consistent with other instances in the same file where mmapped memory is accessed in reverse order on Power platforms. Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: David Christensen Reviewed-by: Ferruh Yigit --- lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linu= xapp/eal/eal_memory.c index 60cf41b6d..de91c6afb 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -709,5 +709,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_= start, int seg_end) =09} =20 -#ifdef RTE_ARCH_PPC64 +#ifdef RTE_ARCH_PPC_64 =09/* for PPC64 we go through the list backwards */ =09for (cur_page =3D seg_end - 1; cur_page >=3D seg_start; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.385405617 +0000 +++ 0045-eal-linux-restore-specific-hugepage-ordering-for-ppc.patch=092019-= 12-03 17:29:51.769749557 +0000 @@ -1 +1 @@ -From ed5d3d5cdb4d19262e9c5face0a11129f090a485 Mon Sep 17 00:00:00 2001 +From c75284148867891fd2356376ab159afbaef3227b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ed5d3d5cdb4d19262e9c5face0a11129f090a485 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - lib/librte_eal/linux/eal/eal_memory.c | 2 +- + lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +- @@ -22,5 +23,5 @@ -diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/= eal/eal_memory.c -index 8f62c343d..28a78a5d4 100644 ---- a/lib/librte_eal/linux/eal/eal_memory.c -+++ b/lib/librte_eal/linux/eal/eal_memory.c -@@ -688,5 +688,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/lin= uxapp/eal/eal_memory.c +index 60cf41b6d..de91c6afb 100644 +--- a/lib/librte_eal/linuxapp/eal/eal_memory.c ++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c +@@ -709,5 +709,5 @@ remap_segment(struct hugepage_file *hugepages, int seg= _start, int seg_end)