ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env_dpdk: add allowed_at helpers for PCI hotplug timeout

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I5265f99fc12e134bf156de75de433a739b9ef1ef

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7505
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: <dongx.yi@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2021-04-20 12:17:53 -07:00 committed by Tomasz Zawadzki
parent 2f9271b818
commit de9f4857d0
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/env_dpdk/pci.c
View File

@ -457,6 +457,18 @@ pci_device_init(struct rte_pci_driver *_drv,
return 0; return 0;
} }
static void
set_allowed_at(struct rte_devargs *rte_da, uint64_t tsc)
{
rte_da->data = (void *)(tsc);
}
static uint64_t
get_allowed_at(struct rte_devargs *rte_da)
{
return (uint64_t)rte_da->data;
}
int int
pci_device_fini(struct rte_pci_device *_dev) pci_device_fini(struct rte_pci_device *_dev)
{ {
@ -477,7 +489,7 @@ pci_device_fini(struct rte_pci_device *_dev)
/* remove our allowed_at option */ /* remove our allowed_at option */
if (_dev->device.devargs) { if (_dev->device.devargs) {
_dev->device.devargs->data = NULL; set_allowed_at(_dev->device.devargs, 0);
} }
assert(!dev->internal.removed); assert(!dev->internal.removed);
@ -550,8 +562,8 @@ scan_pci_bus(bool delay_init)
rte_dev->device.devargs = da; rte_dev->device.devargs = da;
} }
if (da->data) { if (get_allowed_at(da)) {
uint64_t allowed_at = (uint64_t)(uintptr_t)da->data; uint64_t allowed_at = get_allowed_at(da);
/* this device was seen by spdk before... */ /* this device was seen by spdk before... */
if (da->policy == RTE_DEV_BLOCKED && allowed_at <= now) { if (da->policy == RTE_DEV_BLOCKED && allowed_at <= now) {
@ -563,10 +575,10 @@ scan_pci_bus(bool delay_init)
if (delay_init) { if (delay_init) {
da->policy = RTE_DEV_BLOCKED; da->policy = RTE_DEV_BLOCKED;
da->data = (void *)(now + 2 * spdk_get_ticks_hz()); set_allowed_at(da, now + 2 * spdk_get_ticks_hz());
} else { } else {
da->policy = RTE_DEV_ALLOWED; da->policy = RTE_DEV_ALLOWED;
da->data = (void *)(uintptr_t)now; set_allowed_at(da, now);
} }
} }
} }
@ -647,8 +659,8 @@ spdk_pci_device_attach(struct spdk_pci_driver *driver,
rte_dev = dev->dev_handle; rte_dev = dev->dev_handle;
da = rte_dev->device.devargs; da = rte_dev->device.devargs;
if (da && da->data) { if (da && get_allowed_at(da)) {
da->data = (void *)(uintptr_t)spdk_get_ticks(); set_allowed_at(da, spdk_get_ticks());
da->policy = RTE_DEV_ALLOWED; da->policy = RTE_DEV_ALLOWED;
} }