From dabd8993653c92be84102c25fe543d2141e4bab7 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 15 Sep 2022 20:58:40 +0000 Subject: [PATCH] env_dpdk: add dpdk_pci_device_get_devargs Signed-off-by: Jim Harris Change-Id: I54bdd891f99b53fbc3111f1a51c2f73f7a73b92a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14543 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Konrad Sztyber --- lib/env_dpdk/pci.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/env_dpdk/pci.c b/lib/env_dpdk/pci.c index 0c2baa8fe..b1bbeb20a 100644 --- a/lib/env_dpdk/pci.c +++ b/lib/env_dpdk/pci.c @@ -57,6 +57,7 @@ SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver) >= sizeof(struct rte "driver_buf not big enough"); const char *dpdk_pci_device_get_name(struct rte_pci_device *); +struct rte_devargs *dpdk_pci_device_get_devargs(struct rte_pci_device *); int pci_device_init(struct rte_pci_driver *driver, struct rte_pci_device *device); int pci_device_fini(struct rte_pci_device *device); @@ -537,8 +538,8 @@ pci_device_fini(struct rte_pci_device *_dev) } /* remove our allowed_at option */ - if (_dev->device.devargs) { - set_allowed_at(_dev->device.devargs, 0); + if (dpdk_pci_device_get_devargs(_dev)) { + set_allowed_at(dpdk_pci_device_get_devargs(_dev), 0); } /* It is possible that removed flag was already set when there is a race @@ -734,7 +735,7 @@ spdk_pci_device_attach(struct spdk_pci_driver *driver, rte_dev = dev->dev_handle; if (rte_dev != NULL) { - da = rte_dev->device.devargs; + da = dpdk_pci_device_get_devargs(rte_dev); if (da && get_allowed_at(da)) { set_allowed_at(da, spdk_get_ticks()); da->policy = RTE_DEV_ALLOWED; @@ -1280,3 +1281,9 @@ dpdk_pci_device_get_name(struct rte_pci_device *rte_dev) { return rte_dev->name; } + +struct rte_devargs * +dpdk_pci_device_get_devargs(struct rte_pci_device *rte_dev) +{ + return rte_dev->device.devargs; +}