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

env_dpdk: don't embed rte_pci_driver directly 



struct rte_pci_driver will become private, and its
size may change between DPDK releases.  But we want
to keep the spdk_pci_driver structure generic.  So
allocate 256 bytes of space for the rte_pci_driver
structure, which is far more than the 104 bytes it
currently occupies.  We will keep a struct
rte_pci_driver pointer to this memory in spdk_pci_driver
which can be set up in the generic code.  This will
make it easier in future patches to make sure that
anything actually touching the rte_pci_driver
structure will be in the separate DPDK dependent
files.

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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 4a9209bf

lib/env_dpdk/pci.c

+13 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "spdk/env.h"

#include "spdk/log.h"

#include "spdk/string.h"

#include "spdk/assert.h"



#define SYSFS_PCI_DRIVERS	"/sys/bus/pci/drivers"
@@ -40,7 +41,8 @@ static TAILQ_HEAD(, spdk_pci_device_provider) g_pci_device_providers = 
	TAILQ_HEAD_INITIALIZER(g_pci_device_providers);



struct spdk_pci_driver {

	struct rte_pci_driver		driver;

	uint8_t				driver_buf[256];

	struct rte_pci_driver		*driver;



	const char                      *name;

	const struct spdk_pci_id	*id_table;
@@ -50,6 +52,9 @@ struct spdk_pci_driver { 
	void				*cb_arg;

	TAILQ_ENTRY(spdk_pci_driver)	tailq;

};

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");



int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device);

int pci_device_fini(struct rte_pci_device *device);
@@ -213,6 +218,7 @@ spdk_pci_driver_register(const char *name, struct spdk_pci_id *id_table, uint32_ 
	driver->name = name;

	driver->id_table = id_table;

	driver->drv_flags = flags;

	driver->driver = (struct rte_pci_driver *)driver->driver_buf;

	TAILQ_INSERT_TAIL(&g_pci_drivers, driver, tailq);

}
@@ -352,8 +358,8 @@ register_rte_driver(struct spdk_pci_driver *driver) 
	}



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

	driver->driver.driver.name = rte_name;

	driver->driver.id_table = rte_id_table;

	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) {
@@ -362,12 +368,12 @@ register_rte_driver(struct spdk_pci_driver *driver) 
	if (driver->drv_flags & SPDK_PCI_DRIVER_WC_ACTIVATE) {

		rte_flags |= RTE_PCI_DRV_WC_ACTIVATE;

	}

	driver->driver.drv_flags = rte_flags;

	driver->driver->drv_flags = rte_flags;



	driver->driver.probe = pci_device_init;

	driver->driver.remove = pci_device_fini;

	driver->driver->probe = pci_device_init;

	driver->driver->remove = pci_device_fini;



	rte_pci_register(&driver->driver);

	rte_pci_register(driver->driver);

	return 0;

}