7fed70f1bd
This patch revert commit 8f7d9ec. In function vtophys_iommu_init(), we can use `dev->drvier` in RTE_DEV_FOREACH() loop to count number of devices probed by device driver using vfio APIs, or we will count all the PCI devices that bind to vfio-pci driver, only the probed device's IOMMU group is added to vfio container. The original implementation is correct to count `g_vfio.device_ref` in vtophys_pci_device_added(), we don't need to count it in vtophys_iommu_device_event() callback. Fix issue #2086. Change-Id: Ib1502a67960a49e9a2f93823cc8ceab2e8303134 Signed-off-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9236 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Dong Yi <dongx.yi@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
99 lines
3.4 KiB
C
99 lines
3.4 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#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>
|
|
#include <rte_bus.h>
|
|
#include <rte_pci.h>
|
|
#include <rte_bus_pci.h>
|
|
#include <rte_dev.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)
|
|
|
|
#define SPDK_PCI_DRIVER_MAX_NAME_LEN 32
|
|
struct spdk_pci_driver {
|
|
struct rte_pci_driver driver;
|
|
|
|
const char *name;
|
|
const struct spdk_pci_id *id_table;
|
|
uint32_t drv_flags;
|
|
|
|
spdk_pci_enum_cb cb_fn;
|
|
void *cb_arg;
|
|
TAILQ_ENTRY(spdk_pci_driver) tailq;
|
|
};
|
|
|
|
int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device);
|
|
int pci_device_fini(struct rte_pci_device *device);
|
|
|
|
void 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);
|
|
|
|
/**
|
|
* 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
|