d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/vmbus: skip non-network devices

Browse Source 
The vmbus scan code can just skip non-network devices.
More importantly, this fixes the bug where some vmbus devices
don't have all the attributes (like monitor_id) and a single
failure would cause the scan to break the loop.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")
Cc: stable@dpdk.org

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
This commit is contained in:
Stephen Hemminger 2019-06-05 17:37:46 -07:00 committed by Thomas Monjalon
parent e0f4a0ed42
commit b11b76c22c
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/bus/vmbus/linux/vmbus_bus.c
View File

@ -25,6 +25,18 @@
/** Pathname of VMBUS devices directory. */
#define SYSFS_VMBUS_DEVICES "/sys/bus/vmbus/devices"
/*
* GUID associated with network devices
* {f8615163-df3e-46c5-913f-f2d2f965ed0e}
*/
static const rte_uuid_t vmbus_nic_uuid = {
0xf8, 0x61, 0x51, 0x63,
0xdf, 0x3e,
0x46, 0xc5,
0x91, 0x3f,
0xf2, 0xd2, 0xf9, 0x65, 0xed, 0xe
};
extern struct rte_vmbus_bus rte_vmbus_bus;
/* Read sysfs file to get UUID */
@ -242,16 +254,22 @@ vmbus_scan_one(const char *name)
snprintf(dirname, sizeof(dirname), "%s/%s",
SYSFS_VMBUS_DEVICES, name);
/* get device id */
snprintf(filename, sizeof(filename), "%s/device_id", dirname);
if (parse_sysfs_uuid(filename, dev->device_id) < 0)
goto error;
/* get device class */
snprintf(filename, sizeof(filename), "%s/class_id", dirname);
if (parse_sysfs_uuid(filename, dev->class_id) < 0)
goto error;
/* skip non-network devices */
if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) {
free(dev);
return 0;
}
/* get device id */
snprintf(filename, sizeof(filename), "%s/device_id", dirname);
if (parse_sysfs_uuid(filename, dev->device_id) < 0)
goto error;
/* get relid */
snprintf(filename, sizeof(filename), "%s/id", dirname);
if (eal_parse_sysfs_value(filename, &tmp) < 0)