update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / bus / pci / linux / pci_vfio.c

diff --git a/ceph/src/spdk/dpdk/drivers/bus/pci/linux/pci_vfio.c b/ceph/src/spdk/dpdk/drivers/bus/pci/linux/pci_vfio.c
index ebf6ccd3c19fc6a251dcc0dbf5c2b81f820bbabc..64cd84a6897fde6132672c8130ad2832888c6e86 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/bus/pci/linux/pci_vfio.c
+++ b/ceph/src/spdk/dpdk/drivers/bus/pci/linux/pci_vfio.c
@@ -14,12 +14,12 @@
 #include <rte_log.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_eal_memconfig.h>
 #include <rte_malloc.h>
 #include <rte_vfio.h>
 #include <rte_eal.h>
 #include <rte_bus.h>
 #include <rte_spinlock.h>
+#include <rte_tailq.h>
 
 #include "eal_filesystem.h"
 
@@ -451,7 +451,8 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res,
                int bar_index, int additional_flags)
 {
        struct memreg {
-               unsigned long offset, size;
+               uint64_t offset;
+               size_t   size;
        } memreg[2] = {};
        void *bar_addr;
        struct pci_msix_table *msix_table = &vfio_res->msix_table;
@@ -504,7 +505,8 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res,
                RTE_LOG(DEBUG, EAL,
                        "Trying to map BAR%d that contains the MSI-X "
                        "table. Trying offsets: "
-                       "0x%04lx:0x%04lx, 0x%04lx:0x%04lx\n", bar_index,
+                       "0x%04" PRIx64 ":0x%04zx, 0x%04" PRIx64 ":0x%04zx\n",
+                       bar_index,
                        memreg[0].offset, memreg[0].size,
                        memreg[1].offset, memreg[1].size);
        } else {
@@ -529,8 +531,8 @@ pci_vfio_mmap_bar(int vfio_dev_fd, struct mapped_pci_resource *vfio_res,
                if (map_addr != MAP_FAILED
                        && memreg[1].offset && memreg[1].size) {
                        void *second_addr = RTE_PTR_ADD(bar_addr,
-                                                       memreg[1].offset -
-                                                       (uintptr_t)bar->offset);
+                                               (uintptr_t)(memreg[1].offset -
+                                               bar->offset));
                        map_addr = pci_map_resource(second_addr,
                                                        vfio_dev_fd,
                                                        memreg[1].offset,
@@ -748,6 +750,9 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
                bar_addr = pci_map_addr;
                pci_map_addr = RTE_PTR_ADD(bar_addr, (size_t) reg->size);
 
+               pci_map_addr = RTE_PTR_ALIGN(pci_map_addr,
+                                       sysconf(_SC_PAGE_SIZE));
+
                maps[i].addr = bar_addr;
                maps[i].offset = reg->offset;
                maps[i].size = reg->size;