From 9dba32c9a8c026a98993c32bdbc01f6454a79720 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Thu, 3 Nov 2016 15:17:49 +0200 Subject: dpdk_setup_ports.py: config creation - don't run TRex if IP config is wanted Signed-off-by: Yaroslav Brustinov --- scripts/dpdk_nic_bind.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'scripts/dpdk_nic_bind.py') diff --git a/scripts/dpdk_nic_bind.py b/scripts/dpdk_nic_bind.py index a85ecb71..36d123f1 100755 --- a/scripts/dpdk_nic_bind.py +++ b/scripts/dpdk_nic_bind.py @@ -609,7 +609,7 @@ def get_info_from_trex(pci_addr_list): pci_info_dict[pci]['TRex_Driver'] = match.group(3) return pci_info_dict -def show_table(): +def show_table(get_macs = True): '''Function called when the script is passed the "--table" option. Similar to show_status() function, but shows more info: NUMA etc.''' global dpdk_drivers @@ -620,12 +620,13 @@ def show_table(): if devices[d].get("Driver_str") in dpdk_drivers: dpdk_drv.append(d) - for pci, info in get_info_from_trex(dpdk_drv).items(): - if pci not in dpdk_drv: # sanity check, should not happen - print('Internal error while getting MACs of DPDK bound interfaces, unknown PCI: %s' % pci) - return - devices[pci].update(info) - + if get_macs: + for pci, info in get_info_from_trex(dpdk_drv).items(): + if pci not in dpdk_drv: # sanity check, should not happen + print('Internal error while getting MACs of DPDK bound interfaces, unknown PCI: %s' % pci) + return + devices[pci].update(info) + table = texttable.Texttable(max_width=-1) table.header(['ID', 'NUMA', 'PCI', 'MAC', 'Name', 'Driver', 'Linux IF', 'Active']) for id, pci in enumerate(sorted(devices.keys())): -- cgit From 7d8d95fbce7b101c51bae6f468b7942dcdaf1032 Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Tue, 8 Nov 2016 13:10:15 +0200 Subject: mlx5 support build WIP Signed-off-by: Hanoh Haim --- scripts/dpdk_nic_bind.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/dpdk_nic_bind.py') diff --git a/scripts/dpdk_nic_bind.py b/scripts/dpdk_nic_bind.py index 36d123f1..ad2fc3db 100755 --- a/scripts/dpdk_nic_bind.py +++ b/scripts/dpdk_nic_bind.py @@ -54,7 +54,8 @@ if needed_path not in PATH: # Each device within this is itself a dictionary of device properties devices = {} # list of supported DPDK drivers -dpdk_drivers = [ "igb_uio", "vfio-pci", "uio_pci_generic" ] +# +dpdk_drivers = [ "mlx5_core", "mlx5_ib","igb_uio", "vfio-pci", "uio_pci_generic" ] # command-line arg flags b_flag = None -- cgit From 947806622a178bf06a2daba927aa478162689ef2 Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Mon, 14 Nov 2016 15:30:39 +0200 Subject: mlx5 is both kerenl and dpdk Signed-off-by: Hanoh Haim --- scripts/dpdk_nic_bind.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'scripts/dpdk_nic_bind.py') diff --git a/scripts/dpdk_nic_bind.py b/scripts/dpdk_nic_bind.py index ad2fc3db..e797666b 100755 --- a/scripts/dpdk_nic_bind.py +++ b/scripts/dpdk_nic_bind.py @@ -54,8 +54,11 @@ if needed_path not in PATH: # Each device within this is itself a dictionary of device properties devices = {} # list of supported DPDK drivers -# -dpdk_drivers = [ "mlx5_core", "mlx5_ib","igb_uio", "vfio-pci", "uio_pci_generic" ] +# , + +dpdk_and_kernel=[ "mlx5_core", "mlx5_ib" ] + +dpdk_drivers = ["igb_uio", "vfio-pci", "uio_pci_generic" ] # command-line arg flags b_flag = None @@ -569,10 +572,15 @@ def show_status(): if not has_driver(d): no_drv.append(devices[d]) continue - if devices[d]["Driver_str"] in dpdk_drivers: + + if devices[d]["Driver_str"] in dpdk_and_kernel: dpdk_drv.append(devices[d]) - else: kernel_drv.append(devices[d]) + else: + if devices[d]["Driver_str"] in dpdk_drivers: + dpdk_drv.append(devices[d]) + else: + kernel_drv.append(devices[d]) # print each category separately, so we can clearly see what's used by DPDK display_devices("Network devices using DPDK-compatible driver", dpdk_drv, \ @@ -618,7 +626,7 @@ def show_table(get_macs = True): get_nic_details() dpdk_drv = [] for d in devices.keys(): - if devices[d].get("Driver_str") in dpdk_drivers: + if devices[d].get("Driver_str") in (dpdk_drivers+dpdk_and_kernel): dpdk_drv.append(d) if get_macs: -- cgit