ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlib: fix error when creating avf interface on SMP system

Browse Source 
On SMP architecture, '/sys/bus/pci/devices/<devices id>/numa_node' file
will return -1 as a valid value if it does not have any NUMA node information.
Using -1 as a valid node id to access data structures will cause memory issue.
Fix the error by setting the value of numa_node to 0 if '/sys/bus/pci/devices/
<devices id>/numa_node' returns -1 and it is a SMP system.

Type: fix

Change-Id: Ib60e79c3656fe5b17e08fd9011122683e8b08b6f
Signed-off-by: Jieqiang Wang <jieqiang.wang@arm.com>
This commit is contained in:
Jieqiang Wang
2020-01-13 17:15:13 +08:00
committed by Damjan Marion
parent 34177e8763
commit 76c6159d83
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vlib/linux/pci.c
View File

@@ -208,6 +208,7 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr,
u32 tmp;
int fd;
u8 *tmpstr;
clib_bitmap_t *bmp = 0;
di = clib_mem_alloc (sizeof (vlib_pci_device_info_t));
clib_memset (di, 0, sizeof (vlib_pci_device_info_t));
@@ -260,12 +261,22 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr,
di->numa_node = -1;
vec_reset_length (f);
f = format (f, "%v/numa_node%c", dev_dir_name, 0);
err = clib_sysfs_read ((char *) f, "%u", &di->numa_node);
err = clib_sysfs_read ((char *) f, "%d", &di->numa_node);
if (err)
{
di->numa_node = -1;
clib_error_free (err);
}
if (di->numa_node == -1)
{
/* if '/sys/bus/pci/devices/<device id>/numa_node' returns -1 and
it is a SMP system, set numa_node to 0. */
if ((err = clib_sysfs_read ("/sys/devices/system/node/online", "%U",
unformat_bitmap_list, &bmp)))
clib_error_free (err);
if (clib_bitmap_count_set_bits (bmp) == 1)
di->numa_node = 0;
}
vec_reset_length (f);
f = format (f, "%v/class%c", dev_dir_name, 0);
@@ -362,6 +373,7 @@ error:
di = 0;
done:
vec_free (bmp);
vec_free (f);
vec_free (dev_dir_name);
if (error)