By doing the registration immediately upon mapping the BAR instead of when the memory is inserted into the spdk_mem_map, we're able to register BARs that are not 2MB multiples in size and alignment. The SPDK API for registering a BAR already returns the physical/io address in the map call, and it can be used directly without a call to spdk_mem_register(). If the user does elect to later register the BAR using spdk_mem_register(), we attempt to insert the 2MB aligned segments we can into the spdk_mem_map. Users may still need to register memory for a few reasons, such as making spdk_vtophys() work, or for setting up the BAR as a target for RDMA. These cases still require 2MB aligned and sized segments. Change-Id: I395ae8803ec4bf22703f6f76db54200949e82532 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14017 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
#ifndef SPDK_ENV_INTERNAL_H
|
|
#define SPDK_ENV_INTERNAL_H
|
|
|
|
#include "spdk/stdinc.h"
|
|
|
|
#include "spdk/env.h"
|
|
|
|
#include <rte_config.h>
|
|
#include <rte_version.h>
|
|
#include <rte_eal.h>
|
|
|
|
#if RTE_VERSION < RTE_VERSION_NUM(19, 11, 0, 0)
|
|
#error RTE_VERSION is too old! Minimum 19.11 is required.
|
|
#endif
|
|
|
|
/* x86-64 and ARM userspace virtual addresses use only the low 48 bits [0..47],
|
|
* which is enough to cover 256 TB.
|
|
*/
|
|
#define SHIFT_256TB 48 /* (1 << 48) == 256 TB */
|
|
#define MASK_256TB ((1ULL << SHIFT_256TB) - 1)
|
|
|
|
#define SHIFT_1GB 30 /* (1 << 30) == 1 GB */
|
|
#define MASK_1GB ((1ULL << SHIFT_1GB) - 1)
|
|
|
|
int pci_env_init(void);
|
|
void pci_env_reinit(void);
|
|
void pci_env_fini(void);
|
|
int mem_map_init(bool legacy_mem);
|
|
int vtophys_init(void);
|
|
|
|
int vtophys_iommu_map_dma_bar(uint64_t vaddr, uint64_t iova, uint64_t size);
|
|
int vtophys_iommu_unmap_dma_bar(uint64_t vaddr);
|
|
|
|
struct rte_pci_device;
|
|
|
|
/**
|
|
* Report a DMA-capable PCI device to the vtophys translation code.
|
|
* Increases the refcount of active DMA-capable devices managed by SPDK.
|
|
* This must be called after a `rte_pci_device` is created.
|
|
*/
|
|
void vtophys_pci_device_added(struct rte_pci_device *pci_device);
|
|
|
|
/**
|
|
* Report the removal of a DMA-capable PCI device to the vtophys translation code.
|
|
* Decreases the refcount of active DMA-capable devices managed by SPDK.
|
|
* This must be called before a `rte_pci_device` is destroyed.
|
|
*/
|
|
void vtophys_pci_device_removed(struct rte_pci_device *pci_device);
|
|
|
|
#endif
|