From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id E28C6A00E6 for ; Tue, 16 Apr 2019 16:39:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D63911B4D3; Tue, 16 Apr 2019 16:39:08 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8D5AF1B4D3 for ; Tue, 16 Apr 2019 16:39:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04D26C049E20 for ; Tue, 16 Apr 2019 14:39:07 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06CBA1001E92; Tue, 16 Apr 2019 14:39:05 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: Aaron Conole , dpdk stable Date: Tue, 16 Apr 2019 15:37:12 +0100 Message-Id: <20190416143719.21601-54-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 16 Apr 2019 14:39:07 +0000 (UTC) Subject: [dpdk-stable] patch 'eal/linux: fix log levels for pagemap reading failure' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >From 16ad59011dbc01f9bcf2702dcc8f49cf5d9871e1 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Thu, 14 Feb 2019 17:56:56 +0000 Subject: [PATCH] eal/linux: fix log levels for pagemap reading failure [ upstream commit c0d9052afbc711d85350c6e1252affda66e2f88b ] Commit cdc242f260e7 says: For Linux kernel 4.0 and newer, the ability to obtain physical page frame numbers for unprivileged users from /proc/self/pagemap was removed. Instead, when an IOMMU is present, simply choose our own DMA addresses instead. In this case the user still sees error messages, so adjust the log levels. Later, other checks will ensure that errors are logged in the appropriate cases. Fixes: cdc242f260e7 ("eal/linux: support running as unprivileged user") Signed-off-by: Kevin Traynor Acked-by: Aaron Conole --- lib/librte_eal/linuxapp/eal/eal_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index e05da74ca..7a4a9ed3c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -111,5 +111,5 @@ rte_mem_virt2phy(const void *virtaddr) fd = open("/proc/self/pagemap", O_RDONLY); if (fd < 0) { - RTE_LOG(ERR, EAL, "%s(): cannot open /proc/self/pagemap: %s\n", + RTE_LOG(INFO, EAL, "%s(): cannot open /proc/self/pagemap: %s\n", __func__, strerror(errno)); return RTE_BAD_IOVA; @@ -119,5 +119,5 @@ rte_mem_virt2phy(const void *virtaddr) offset = sizeof(uint64_t) * virt_pfn; if (lseek(fd, offset, SEEK_SET) == (off_t) -1) { - RTE_LOG(ERR, EAL, "%s(): seek error in /proc/self/pagemap: %s\n", + RTE_LOG(INFO, EAL, "%s(): seek error in /proc/self/pagemap: %s\n", __func__, strerror(errno)); close(fd); @@ -128,9 +128,9 @@ rte_mem_virt2phy(const void *virtaddr) close(fd); if (retval < 0) { - RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap: %s\n", + RTE_LOG(INFO, EAL, "%s(): cannot read /proc/self/pagemap: %s\n", __func__, strerror(errno)); return RTE_BAD_IOVA; } else if (retval != PFN_MASK_SIZE) { - RTE_LOG(ERR, EAL, "%s(): read %d bytes from /proc/self/pagemap " + RTE_LOG(INFO, EAL, "%s(): read %d bytes from /proc/self/pagemap " "but expected %d:\n", __func__, retval, PFN_MASK_SIZE); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:27.606956657 +0100 +++ 0054-eal-linux-fix-log-levels-for-pagemap-reading-failure.patch 2019-04-16 15:34:25.234178752 +0100 @@ -1,8 +1,10 @@ -From c0d9052afbc711d85350c6e1252affda66e2f88b Mon Sep 17 00:00:00 2001 +From 16ad59011dbc01f9bcf2702dcc8f49cf5d9871e1 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Thu, 14 Feb 2019 17:56:56 +0000 Subject: [PATCH] eal/linux: fix log levels for pagemap reading failure +[ upstream commit c0d9052afbc711d85350c6e1252affda66e2f88b ] + Commit cdc242f260e7 says: For Linux kernel 4.0 and newer, the ability to obtain physical page frame numbers for unprivileged users from @@ -14,33 +16,32 @@ are logged in the appropriate cases. Fixes: cdc242f260e7 ("eal/linux: support running as unprivileged user") -Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Acked-by: Aaron Conole --- - lib/librte_eal/linux/eal/eal_memory.c | 8 ++++---- + lib/librte_eal/linuxapp/eal/eal_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/lib/librte_eal/linux/eal/eal_memory.c b/lib/librte_eal/linux/eal/eal_memory.c -index 1b96b576e..f6ee403ad 100644 ---- a/lib/librte_eal/linux/eal/eal_memory.c -+++ b/lib/librte_eal/linux/eal/eal_memory.c -@@ -115,5 +115,5 @@ rte_mem_virt2phy(const void *virtaddr) +diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c +index e05da74ca..7a4a9ed3c 100644 +--- a/lib/librte_eal/linuxapp/eal/eal_memory.c ++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c +@@ -111,5 +111,5 @@ rte_mem_virt2phy(const void *virtaddr) fd = open("/proc/self/pagemap", O_RDONLY); if (fd < 0) { - RTE_LOG(ERR, EAL, "%s(): cannot open /proc/self/pagemap: %s\n", + RTE_LOG(INFO, EAL, "%s(): cannot open /proc/self/pagemap: %s\n", __func__, strerror(errno)); return RTE_BAD_IOVA; -@@ -123,5 +123,5 @@ rte_mem_virt2phy(const void *virtaddr) +@@ -119,5 +119,5 @@ rte_mem_virt2phy(const void *virtaddr) offset = sizeof(uint64_t) * virt_pfn; if (lseek(fd, offset, SEEK_SET) == (off_t) -1) { - RTE_LOG(ERR, EAL, "%s(): seek error in /proc/self/pagemap: %s\n", + RTE_LOG(INFO, EAL, "%s(): seek error in /proc/self/pagemap: %s\n", __func__, strerror(errno)); close(fd); -@@ -132,9 +132,9 @@ rte_mem_virt2phy(const void *virtaddr) +@@ -128,9 +128,9 @@ rte_mem_virt2phy(const void *virtaddr) close(fd); if (retval < 0) { - RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap: %s\n",