From patchwork Sat May 8 14:27:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Richardson X-Patchwork-Id: 93060 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A75AA0C42; Sat, 8 May 2021 16:28:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFC634013F; Sat, 8 May 2021 16:28:04 +0200 (CEST) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 2D51240041 for ; Sat, 8 May 2021 16:28:04 +0200 (CEST) Received: by mail-pj1-f41.google.com with SMTP id p17so6771727pjz.3 for ; Sat, 08 May 2021 07:28:04 -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=orx2VZUx+mamRd7VvoqiIs4B9eQ6fXk0hDDHl/yK/u4=; b=Klzdo2iHckDO6qhqAZwkpVFWSVsY9sTkah5idm1GK6ihsLQwLQPtJ+BzE/zElWDKcP Gb+ftN92HkUlexzPoynM4U97Z9QkpnQtFtzzA6WuiXMZbcceIcyKsR23/iw2yUvin8sC PqAoJM+eKo1BWQcja31ISHDGIrDNmeCk6bxyI= 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=orx2VZUx+mamRd7VvoqiIs4B9eQ6fXk0hDDHl/yK/u4=; b=rZeIUD+jhqE1mhSfgANY1fUBQEHiOkDMOxl34DChB/msZjGZ4Bsmu/sdpTSYOJXbLL PzKNaPnqwxpqrCwgWah1avdzW7mUNOyPlsSoPlVOUnNyKo9eZlkeY9M5PwQqSFAe2hN0 Cye2yhzcqVTmecqPRW7a9bpuND7QgTYhsoDst2BObO77XLbDYCxY1LX2UVwVwaBI+0i+ +NBRTmX6WHCjd2bgHc+pMM46lYojChVku+JM56VYIrsTK+5YFf4JiynWd/EWBEN8wNh5 xPmBuGKDn9czxi/xNUKcyrXDF7vE8xsilJh5DIkTBievLNKHE0IGAkVSQ2cgAXRGs/6F X8yw== X-Gm-Message-State: AOAM533tBxwzV+KIDgLYlJbN/2Yqc5LAto4qEZssJRdXqYlmGp0em8PR a3FIhMCRaHSHi25GFtRbDY/esQ== X-Google-Smtp-Source: ABdhPJzoG/fRC4GusnjmI7Rv69Zu89FF8Tcyro4dy3yIH7y4uq6+i7EI6RkWu3Nm5z/erPX08mLF0A== X-Received: by 2002:a17:90b:e98:: with SMTP id fv24mr30416469pjb.216.1620484083089; Sat, 08 May 2021 07:28:03 -0700 (PDT) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id l10sm7116918pfc.125.2021.05.08.07.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 May 2021 07:28:02 -0700 (PDT) From: Lance Richardson To: Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam Cc: dev@dpdk.org, stable@dpdk.org Date: Sat, 8 May 2021 10:27:53 -0400 Message-Id: <20210508142753.114343-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 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH v3] eal: fix memory mapping for 32-bit targets X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Anatoly Burakov --- v3: Use PRIx64 instead of llx to format offset in log message. 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 | 11 ++++++----- lib/eal/windows/eal_memory.c | 2 +- 3 files changed, 8 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..68ae93bd6e 100644 --- a/lib/eal/unix/eal_unix_memory.c +++ b/lib/eal/unix/eal_unix_memory.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -24,14 +25,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%"PRIx64"): %s\n", + requested_addr, size, prot, flags, fd, offset, + strerror(errno)); rte_errno = errno; return NULL; } @@ -106,7 +107,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;