From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 83D84A0A0F
for <public@inbox.dpdk.org>; Fri, 7 May 2021 21:07:10 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 6C99240040;
Fri, 7 May 2021 21:07:10 +0200 (CEST)
Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com
[209.85.214.172])
by mails.dpdk.org (Postfix) with ESMTP id 27EDA40040
for <stable@dpdk.org>; Fri, 7 May 2021 21:07:09 +0200 (CEST)
Received: by mail-pl1-f172.google.com with SMTP id 69so1082284plc.5
for <stable@dpdk.org>; Fri, 07 May 2021 12:07:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version; bh=bQejcuR/vTWbwjKWn0KQcqK7Woc+/zpIxKonGvbuL2I=;
b=dIsTqOgzUVdoSVySN6lhaxlmgi4ftgEek9Jw+luoZR5KKXQmaPRhfLevrdWqO2Zeqm
Y/BC3E+1HzHweT6lQMDey7WWM6nyELuJr2RL6NV6kEIYuXfhr/uVb9hQR8q6mtlJk9q+
YVkD4WUYkJRXX6uOmNRvnsVSo3Sx7k9v75bJc=
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;
bh=bQejcuR/vTWbwjKWn0KQcqK7Woc+/zpIxKonGvbuL2I=;
b=t7gbhdAlERB6PRSSjhvMuSvJ580GReVsVBQKLKcMyRCdo9BqRXlj6Sqp5RpNkKtqgx
kxGlaCKv1QM+HXseS63TnJ7OxkPlw0GsSQuOBJBFe7d4Z9Pp2R8mRSLQBpuuZDoPW0Ah
JxK+63sikHCdVb4KsA74xvsu+eTy5FaALbGvmQtmryPJR1W6qK49plxsfM7eB4dNbmqo
JBgwQr997NT+NDj783a4uDaMlNX5n+TfAFbNhQkeHLpTyQ6rCtTf1C/gQl1p1gL7xV3Y
HpWI92yIuBTu9T4Alot82HgHIU2o3/xP6F29rxquchRH1r7gyYkVTFZeAwKlkwOBmSVF
eqhw==
X-Gm-Message-State: AOAM5318cnUvSCkjcamCaHqKEGCrTu9VyyOkgBOEc7obODiYrJEocyHk
VE0VONlRPYz65BF5Pa+F8Z2PBw==
X-Google-Smtp-Source: ABdhPJy/BrdkBb4Dhq75XezWmcEbJJAvSaiW4R1VcYt6ngKERfW943WLGfyfSrGJhAIw9ce/Isky5A==
X-Received: by 2002:a17:902:db09:b029:ee:f2d5:3d0f with SMTP id
m9-20020a170902db09b02900eef2d53d0fmr11177335plx.13.1620414427943;
Fri, 07 May 2021 12:07:07 -0700 (PDT)
Received: from localhost.localdomain ([192.19.231.250])
by smtp.gmail.com with ESMTPSA id i14sm5341074pgk.77.2021.05.07.12.07.04
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 07 May 2021 12:07:07 -0700 (PDT)
From: Lance Richardson <lance.richardson@broadcom.com>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,
Dmitry Malloy <dmitrym@microsoft.com>,
Pallavi Kadam <pallavi.kadam@intel.com>
Cc: dev@dpdk.org,
stable@dpdk.org
Date: Fri, 7 May 2021 15:06:57 -0400
Message-Id: <20210507190657.84927-1-lance.richardson@broadcom.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210507181025.84012-1-lance.richardson@broadcom.com>
References: <20210507181025.84012-1-lance.richardson@broadcom.com>
MIME-Version: 1.0
Content-Type: multipart/signed; protocol="application/pkcs7-signature";
micalg=sha-256; boundary="000000000000654c9d05c1c2222a"
X-Content-Filtered-By: Mailman/MimeDel 2.1.29
Subject: [dpdk-stable] [PATCH v2] eal: fix memory mapping for 32-bit targets
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
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>
--000000000000654c9d05c1c2222a
Content-Transfer-Encoding: 8bit
For 32-bit targets, size_t is normally a 32-bit type and
does not have sufficient range to represent 64-bit offsets
that can are needed when mapping PCI addresses. Use uint64_t
instead.
Found when attempting to run 32-bit Linux dpdk-testpmd
using VFIO driver:
EAL: pci_map_resource(): cannot map resource(63, 0xc0010000, \
0x200000, 0x20000000000): Invalid argument ((nil))
Fixes: c4b89ecb64ea ("eal: introduce memory management wrappers")
Cc: stable@dpdk.org
Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
---
v2: Use uint64_t instead of off_t (off_t is unknown to Windows).
lib/eal/include/rte_eal_paging.h | 2 +-
lib/eal/unix/eal_unix_memory.c | 10 +++++-----
lib/eal/windows/eal_memory.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
index ed98e70e9e..c60317d0f5 100644
--- a/lib/eal/include/rte_eal_paging.h
+++ b/lib/eal/include/rte_eal_paging.h
@@ -61,7 +61,7 @@ enum rte_map_flags {
__rte_internal
void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
- int fd, size_t offset);
+ int fd, uint64_t offset);
/**
* OS-independent implementation of POSIX munmap(3).
diff --git a/lib/eal/unix/eal_unix_memory.c b/lib/eal/unix/eal_unix_memory.c
index ec7156df96..41a94a7511 100644
--- a/lib/eal/unix/eal_unix_memory.c
+++ b/lib/eal/unix/eal_unix_memory.c
@@ -24,14 +24,14 @@
static void *
mem_map(void *requested_addr, size_t size, int prot, int flags,
- int fd, size_t offset)
+ int fd, uint64_t offset)
{
void *virt = mmap(requested_addr, size, prot, flags, fd, offset);
if (virt == MAP_FAILED) {
RTE_LOG(DEBUG, EAL,
- "Cannot mmap(%p, 0x%zx, 0x%x, 0x%x, %d, 0x%zx): %s\n",
- requested_addr, size, prot, flags, fd, offset,
- strerror(errno));
+ "Cannot mmap(%p, 0x%zx, 0x%x, 0x%x, %d, 0x%llx): %s\n",
+ requested_addr, size, prot, flags, fd,
+ (unsigned long long)offset, strerror(errno));
rte_errno = errno;
return NULL;
}
@@ -106,7 +106,7 @@ mem_rte_to_sys_prot(int prot)
void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
- int fd, size_t offset)
+ int fd, uint64_t offset)
{
int sys_flags = 0;
int sys_prot;
diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c
index 2cf5a5e649..4db048ccb5 100644
--- a/lib/eal/windows/eal_memory.c
+++ b/lib/eal/windows/eal_memory.c
@@ -508,7 +508,7 @@ eal_mem_set_dump(void *virt, size_t size, bool dump)
void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
- int fd, size_t offset)
+ int fd, uint64_t offset)
{
HANDLE file_handle = INVALID_HANDLE_VALUE;
HANDLE mapping_handle = INVALID_HANDLE_VALUE;
--
2.25.1
--000000000000654c9d05c1c2222a--