Commit a25a834a authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

env_dpdk: move <=22.07 specific code to pci_dpdk_2207.c 



Get ready to have multiple implementations of the
dpdk_fn_table.  We could do some fancy self-registering
constructor functions, but let's just keep it simple
for now and extern declare each implementation in
the pci_dpdk.h header file.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I8f5621412d1c8bd22c95ab74ef66c5bcc41d1380
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14636


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 53cd692b

lib/env_dpdk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ CFLAGS += $(ENV_CFLAGS) 
C_SRCS = env.c memory.c pci.c init.c threads.c

C_SRCS += pci_ioat.c pci_virtio.c pci_vmd.c pci_idxd.c

C_SRCS += pci_event.c sigbus_handler.c pci_dpdk.c

C_SRCS += pci_dpdk_2207.c

LIBNAME = env_dpdk



SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_env_dpdk.map)

lib/env_dpdk/pci_dpdk.c

+1 −236
Original line number Diff line number Diff line
@@ -6,243 +6,8 @@ 
#include <rte_config.h>

#include <rte_version.h>

#include "pci_dpdk.h"

#include <rte_bus_pci.h>

#include "spdk/assert.h"



SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver_buf) == 0, "driver_buf must be first");

SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver) >= sizeof(struct rte_pci_driver),

		   "driver_buf not big enough");



static uint64_t

pci_device_vtophys_2207(struct rte_pci_device *dev, uint64_t vaddr)

{

	struct rte_mem_resource *res;

	uint64_t paddr;

	unsigned r;



	for (r = 0; r < PCI_MAX_RESOURCE; r++) {

		res = &dev->mem_resource[r];

		if (res->phys_addr && vaddr >= (uint64_t)res->addr &&

		    vaddr < (uint64_t)res->addr + res->len) {

			paddr = res->phys_addr + (vaddr - (uint64_t)res->addr);

			return paddr;

		}

	}



	return SPDK_VTOPHYS_ERROR;

}



static const char *

pci_device_get_name_2207(struct rte_pci_device *rte_dev)

{

	return rte_dev->name;

}



static struct rte_devargs *

pci_device_get_devargs_2207(struct rte_pci_device *rte_dev)

{

	return rte_dev->device.devargs;

}



static void

pci_device_copy_identifiers_2207(struct rte_pci_device *_dev, struct spdk_pci_device *dev)

{

	dev->addr.domain = _dev->addr.domain;

	dev->addr.bus = _dev->addr.bus;

	dev->addr.dev = _dev->addr.devid;

	dev->addr.func = _dev->addr.function;

	dev->id.class_id = _dev->id.class_id;

	dev->id.vendor_id = _dev->id.vendor_id;

	dev->id.device_id = _dev->id.device_id;

	dev->id.subvendor_id = _dev->id.subsystem_vendor_id;

	dev->id.subdevice_id = _dev->id.subsystem_device_id;

	dev->socket_id = _dev->device.numa_node;

}



static int

pci_device_map_bar_2207(struct rte_pci_device *dev, uint32_t bar,

			void **mapped_addr, uint64_t *phys_addr, uint64_t *size)

{

	*mapped_addr = dev->mem_resource[bar].addr;

	*phys_addr = (uint64_t)dev->mem_resource[bar].phys_addr;

	*size = (uint64_t)dev->mem_resource[bar].len;



	return 0;

}



static int

pci_device_read_config_2207(struct rte_pci_device *dev, void *value, uint32_t len, uint32_t offset)

{

	int rc;



	rc = rte_pci_read_config(dev, value, len, offset);



	return (rc > 0 && (uint32_t) rc == len) ? 0 : -1;

}



static int

pci_device_write_config_2207(struct rte_pci_device *dev, void *value, uint32_t len, uint32_t offset)

{

	int rc;



	rc = rte_pci_write_config(dev, value, len, offset);



#ifdef __FreeBSD__

	/* DPDK returns 0 on success and -1 on failure */

	return rc;

#endif

	return (rc > 0 && (uint32_t) rc == len) ? 0 : -1;

}



/* translate spdk_pci_driver to an rte_pci_driver and register it to dpdk */

static int

pci_driver_register_2207(struct spdk_pci_driver *driver,

			 int (*probe_fn)(struct rte_pci_driver *driver, struct rte_pci_device *device),

			 int (*remove_fn)(struct rte_pci_device *device))



{

	unsigned pci_id_count = 0;

	struct rte_pci_id *rte_id_table;

	char *rte_name;

	size_t rte_name_len;

	uint32_t rte_flags;



	assert(driver->id_table);

	while (driver->id_table[pci_id_count].vendor_id) {

		pci_id_count++;

	}

	assert(pci_id_count > 0);



	rte_id_table = calloc(pci_id_count + 1, sizeof(*rte_id_table));

	if (!rte_id_table) {

		return -ENOMEM;

	}



	while (pci_id_count > 0) {

		struct rte_pci_id *rte_id = &rte_id_table[pci_id_count - 1];

		const struct spdk_pci_id *spdk_id = &driver->id_table[pci_id_count - 1];



		rte_id->class_id = spdk_id->class_id;

		rte_id->vendor_id = spdk_id->vendor_id;

		rte_id->device_id = spdk_id->device_id;

		rte_id->subsystem_vendor_id = spdk_id->subvendor_id;

		rte_id->subsystem_device_id = spdk_id->subdevice_id;

		pci_id_count--;

	}



	assert(driver->name);

	rte_name_len = strlen(driver->name) + strlen("spdk_") + 1;

	rte_name = calloc(rte_name_len, 1);

	if (!rte_name) {

		free(rte_id_table);

		return -ENOMEM;

	}



	snprintf(rte_name, rte_name_len, "spdk_%s", driver->name);

	driver->driver->driver.name = rte_name;

	driver->driver->id_table = rte_id_table;



	rte_flags = 0;

	if (driver->drv_flags & SPDK_PCI_DRIVER_NEED_MAPPING) {

		rte_flags |= RTE_PCI_DRV_NEED_MAPPING;

	}

	if (driver->drv_flags & SPDK_PCI_DRIVER_WC_ACTIVATE) {

		rte_flags |= RTE_PCI_DRV_WC_ACTIVATE;

	}

	driver->driver->drv_flags = rte_flags;



	driver->driver->probe = probe_fn;

	driver->driver->remove = remove_fn;



	rte_pci_register(driver->driver);

	return 0;

}



static int

pci_device_enable_interrupt_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_intr_enable(&rte_dev->intr_handle);

#else

	return rte_intr_enable(rte_dev->intr_handle);

#endif

}



static int

pci_device_disable_interrupt_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_intr_disable(&rte_dev->intr_handle);

#else

	return rte_intr_disable(rte_dev->intr_handle);

#endif

}



static int

pci_device_get_interrupt_efd_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_dev->intr_handle.fd;

#else

	return rte_intr_fd_get(rte_dev->intr_handle);

#endif

}



static int

bus_probe_2207(void)

{

	return rte_bus_probe();

}



static void

bus_scan_2207(void)

{

	rte_bus_scan();

}



static struct rte_devargs *

device_get_devargs_2207(struct rte_device *dev)

{

	return dev->devargs;

}



static void

device_set_devargs_2207(struct rte_device *dev, struct rte_devargs *devargs)

{

	dev->devargs = devargs;

}



static const char *

device_get_name_2207(struct rte_device *dev)

{

	return dev->name;

}



static bool

device_scan_allowed_2207(struct rte_device *dev)

{

	return dev->bus->conf.scan_mode == RTE_BUS_SCAN_ALLOWLIST;

}



static struct dpdk_fn_table fn_table_2207 = {

	.pci_device_vtophys		= pci_device_vtophys_2207,

	.pci_device_get_name		= pci_device_get_name_2207,

	.pci_device_get_devargs		= pci_device_get_devargs_2207,

	.pci_device_copy_identifiers	= pci_device_copy_identifiers_2207,

	.pci_device_map_bar		= pci_device_map_bar_2207,

	.pci_device_read_config		= pci_device_read_config_2207,

	.pci_device_write_config	= pci_device_write_config_2207,

	.pci_driver_register		= pci_driver_register_2207,

	.pci_device_enable_interrupt	= pci_device_enable_interrupt_2207,

	.pci_device_disable_interrupt	= pci_device_disable_interrupt_2207,

	.pci_device_get_interrupt_efd	= pci_device_get_interrupt_efd_2207,

	.bus_scan			= bus_scan_2207,

	.bus_probe			= bus_probe_2207,

	.device_get_devargs		= device_get_devargs_2207,

	.device_set_devargs		= device_set_devargs_2207,

	.device_get_name		= device_get_name_2207,

	.device_scan_allowed		= device_scan_allowed_2207,

};

extern struct dpdk_fn_table fn_table_2207;



static struct dpdk_fn_table *g_dpdk_fn_table = &fn_table_2207;

lib/env_dpdk/pci_dpdk_2207.c

0 → 100644
+245 −0
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 */



#include <rte_config.h>

#include <rte_version.h>

#include "pci_dpdk.h"

#include <rte_bus_pci.h>

#include "spdk/assert.h"



SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver_buf) == 0, "driver_buf must be first");

SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver) >= sizeof(struct rte_pci_driver),

		   "driver_buf not big enough");



static uint64_t

pci_device_vtophys_2207(struct rte_pci_device *dev, uint64_t vaddr)

{

	struct rte_mem_resource *res;

	uint64_t paddr;

	unsigned r;



	for (r = 0; r < PCI_MAX_RESOURCE; r++) {

		res = &dev->mem_resource[r];

		if (res->phys_addr && vaddr >= (uint64_t)res->addr &&

		    vaddr < (uint64_t)res->addr + res->len) {

			paddr = res->phys_addr + (vaddr - (uint64_t)res->addr);

			return paddr;

		}

	}



	return SPDK_VTOPHYS_ERROR;

}



static const char *

pci_device_get_name_2207(struct rte_pci_device *rte_dev)

{

	return rte_dev->name;

}



static struct rte_devargs *

pci_device_get_devargs_2207(struct rte_pci_device *rte_dev)

{

	return rte_dev->device.devargs;

}



static void

pci_device_copy_identifiers_2207(struct rte_pci_device *_dev, struct spdk_pci_device *dev)

{

	dev->addr.domain = _dev->addr.domain;

	dev->addr.bus = _dev->addr.bus;

	dev->addr.dev = _dev->addr.devid;

	dev->addr.func = _dev->addr.function;

	dev->id.class_id = _dev->id.class_id;

	dev->id.vendor_id = _dev->id.vendor_id;

	dev->id.device_id = _dev->id.device_id;

	dev->id.subvendor_id = _dev->id.subsystem_vendor_id;

	dev->id.subdevice_id = _dev->id.subsystem_device_id;

	dev->socket_id = _dev->device.numa_node;

}



static int

pci_device_map_bar_2207(struct rte_pci_device *dev, uint32_t bar,

			void **mapped_addr, uint64_t *phys_addr, uint64_t *size)

{

	*mapped_addr = dev->mem_resource[bar].addr;

	*phys_addr = (uint64_t)dev->mem_resource[bar].phys_addr;

	*size = (uint64_t)dev->mem_resource[bar].len;



	return 0;

}



static int

pci_device_read_config_2207(struct rte_pci_device *dev, void *value, uint32_t len, uint32_t offset)

{

	int rc;



	rc = rte_pci_read_config(dev, value, len, offset);



	return (rc > 0 && (uint32_t) rc == len) ? 0 : -1;

}



static int

pci_device_write_config_2207(struct rte_pci_device *dev, void *value, uint32_t len, uint32_t offset)

{

	int rc;



	rc = rte_pci_write_config(dev, value, len, offset);



#ifdef __FreeBSD__

	/* DPDK returns 0 on success and -1 on failure */

	return rc;

#endif

	return (rc > 0 && (uint32_t) rc == len) ? 0 : -1;

}



/* translate spdk_pci_driver to an rte_pci_driver and register it to dpdk */

static int

pci_driver_register_2207(struct spdk_pci_driver *driver,

			 int (*probe_fn)(struct rte_pci_driver *driver, struct rte_pci_device *device),

			 int (*remove_fn)(struct rte_pci_device *device))



{

	unsigned pci_id_count = 0;

	struct rte_pci_id *rte_id_table;

	char *rte_name;

	size_t rte_name_len;

	uint32_t rte_flags;



	assert(driver->id_table);

	while (driver->id_table[pci_id_count].vendor_id) {

		pci_id_count++;

	}

	assert(pci_id_count > 0);



	rte_id_table = calloc(pci_id_count + 1, sizeof(*rte_id_table));

	if (!rte_id_table) {

		return -ENOMEM;

	}



	while (pci_id_count > 0) {

		struct rte_pci_id *rte_id = &rte_id_table[pci_id_count - 1];

		const struct spdk_pci_id *spdk_id = &driver->id_table[pci_id_count - 1];



		rte_id->class_id = spdk_id->class_id;

		rte_id->vendor_id = spdk_id->vendor_id;

		rte_id->device_id = spdk_id->device_id;

		rte_id->subsystem_vendor_id = spdk_id->subvendor_id;

		rte_id->subsystem_device_id = spdk_id->subdevice_id;

		pci_id_count--;

	}



	assert(driver->name);

	rte_name_len = strlen(driver->name) + strlen("spdk_") + 1;

	rte_name = calloc(rte_name_len, 1);

	if (!rte_name) {

		free(rte_id_table);

		return -ENOMEM;

	}



	snprintf(rte_name, rte_name_len, "spdk_%s", driver->name);

	driver->driver->driver.name = rte_name;

	driver->driver->id_table = rte_id_table;



	rte_flags = 0;

	if (driver->drv_flags & SPDK_PCI_DRIVER_NEED_MAPPING) {

		rte_flags |= RTE_PCI_DRV_NEED_MAPPING;

	}

	if (driver->drv_flags & SPDK_PCI_DRIVER_WC_ACTIVATE) {

		rte_flags |= RTE_PCI_DRV_WC_ACTIVATE;

	}

	driver->driver->drv_flags = rte_flags;



	driver->driver->probe = probe_fn;

	driver->driver->remove = remove_fn;



	rte_pci_register(driver->driver);

	return 0;

}



static int

pci_device_enable_interrupt_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_intr_enable(&rte_dev->intr_handle);

#else

	return rte_intr_enable(rte_dev->intr_handle);

#endif

}



static int

pci_device_disable_interrupt_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_intr_disable(&rte_dev->intr_handle);

#else

	return rte_intr_disable(rte_dev->intr_handle);

#endif

}



static int

pci_device_get_interrupt_efd_2207(struct rte_pci_device *rte_dev)

{

#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)

	return rte_dev->intr_handle.fd;

#else

	return rte_intr_fd_get(rte_dev->intr_handle);

#endif

}



static int

bus_probe_2207(void)

{

	return rte_bus_probe();

}



static void

bus_scan_2207(void)

{

	rte_bus_scan();

}



static struct rte_devargs *

device_get_devargs_2207(struct rte_device *dev)

{

	return dev->devargs;

}



static void

device_set_devargs_2207(struct rte_device *dev, struct rte_devargs *devargs)

{

	dev->devargs = devargs;

}



static const char *

device_get_name_2207(struct rte_device *dev)

{

	return dev->name;

}



static bool

device_scan_allowed_2207(struct rte_device *dev)

{

	return dev->bus->conf.scan_mode == RTE_BUS_SCAN_ALLOWLIST;

}



struct dpdk_fn_table fn_table_2207 = {

	.pci_device_vtophys		= pci_device_vtophys_2207,

	.pci_device_get_name		= pci_device_get_name_2207,

	.pci_device_get_devargs		= pci_device_get_devargs_2207,

	.pci_device_copy_identifiers	= pci_device_copy_identifiers_2207,

	.pci_device_map_bar		= pci_device_map_bar_2207,

	.pci_device_read_config		= pci_device_read_config_2207,

	.pci_device_write_config	= pci_device_write_config_2207,

	.pci_driver_register		= pci_driver_register_2207,

	.pci_device_enable_interrupt	= pci_device_enable_interrupt_2207,

	.pci_device_disable_interrupt	= pci_device_disable_interrupt_2207,

	.pci_device_get_interrupt_efd	= pci_device_get_interrupt_efd_2207,

	.bus_scan			= bus_scan_2207,

	.bus_probe			= bus_probe_2207,

	.device_get_devargs		= device_get_devargs_2207,

	.device_set_devargs		= device_set_devargs_2207,

	.device_get_name		= device_get_name_2207,

	.device_scan_allowed		= device_scan_allowed_2207,

};