From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E87EDA0A0E for ; Fri, 7 May 2021 20:50:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD47C410E0; Fri, 7 May 2021 20:50:27 +0200 (CEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by mails.dpdk.org (Postfix) with ESMTP id B6BA040040 for ; Fri, 7 May 2021 20:50:25 +0200 (CEST) Received: by mail-ot1-f48.google.com with SMTP id 65-20020a9d03470000b02902808b4aec6dso8757281otv.6 for ; Fri, 07 May 2021 11:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vPoNW4CAu6z9arRgXgGthC7BF+qpTrK+NNKYb2g7Gy4=; b=M4KydfKKIIHkWBLdSVRttg0G8fVDAok27X9rC34CpMqIawTNfjaSovcYJbP3WuolBV /w3hl/2Zbn7O4MR32RB2jv/AybNNKTQjRG/A+weueZGIU3t6HXFY17IjoN9KUtMNWdTR xvLrPO2oMh3bn4crik4d1t23ayaoMMFmBUm8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vPoNW4CAu6z9arRgXgGthC7BF+qpTrK+NNKYb2g7Gy4=; b=RzCwtHwyiV5o8wNa9PRhYGOcx7aZRs7v4rFE5zClyuaEMLSJc0bShsUP62ej3LBXkl oG9yAyC6Gqq8c7rUglcLMufIBwjQFDKfO7KJKW7p6XIi1JLP8ZettlgbuewOxpenSFmw GNcC8MvqRJChBpaWUA9gSU3AHSmJd6TCP3xml9HmRfJyyjljnKCV/fVsi2wK9jCqMovg Diyad+LYN7ud+DHNUbxbVmhuop/c5OJvwgO8EuoVCoJl7ghR3urVCm6Ae6Ri3XOwGjGx UyrqspwMOKVNS5UvHuMY8YJTH+7Bl49bP+Qs9sWJ9W0t6HroGtnX0MfWmw3rk7I8I2NX ep8g== X-Gm-Message-State: AOAM5328MV3510SHcGviKphc71iNYvOeQWV3KJlGv4dM/3YMzPFP+Q9o /6z60Ur2N5H/jmtW3rqQrda3QyjV0kqfaynOhygMCA== X-Google-Smtp-Source: ABdhPJwWkDP3eOP9Y7bdZOINj+DI+9zFz8Z6ttzhgfRhMEwDM1vwLynqRa8BLEbrAurBHgrA0PLDKJpFhtv4E4bd7eI= X-Received: by 2002:a9d:6b85:: with SMTP id b5mr9245581otq.172.1620413424994; Fri, 07 May 2021 11:50:24 -0700 (PDT) MIME-Version: 1.0 References: <20210507181025.84012-1-lance.richardson@broadcom.com> In-Reply-To: <20210507181025.84012-1-lance.richardson@broadcom.com> From: Lance Richardson Date: Fri, 7 May 2021 14:50:14 -0400 Message-ID: To: Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam Cc: dev@dpdk.org, dpdk stable Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="0000000000009b67da05c1c1e669" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-stable] [PATCH] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" --0000000000009b67da05c1c1e669 Content-Type: text/plain; charset="UTF-8" On Fri, May 7, 2021 at 2:10 PM Lance Richardson wrote: > > 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 off_t > instead, which is usually a 64-bit type when compiled with > _D_FILE_OFFSET_BITS=64 as is the case for DPDK. > > 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 > --- > 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..2c05025ffc 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, off_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..51a42e1a43 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, off_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, off_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..f1c4b03e96 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, off_t offset) > { > HANDLE file_handle = INVALID_HANDLE_VALUE; > HANDLE mapping_handle = INVALID_HANDLE_VALUE; > -- > 2.25.1 > Windows compilation is failing in CI, apparently Windows doesn't understand "off_t". Should we add an "rte_off_t" definition for non-POSIX portability? --0000000000009b67da05c1c1e669--