76 lines
2.7 KiB
Diff
76 lines
2.7 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-20
|
|
|
|
From bb9f408550d13af6c1da104b0d9d9b9837f69bde Mon Sep 17 00:00:00 2001
|
|
From: Kamil Rytarowski <kamil.rytarowski@caviumnetworks.com>
|
|
Date: Thu, 28 Jan 2016 14:13:53 +0100
|
|
Subject: [PATCH] tools: support binding to built-in kernel modules
|
|
|
|
Currently dpdk_nic_bind.py detects Linux kernel modules via reading
|
|
/proc/modules. Built-in ones aren't listed there and therefore they are
|
|
not being found by the script.
|
|
|
|
Add support for checking built-in modules with parsing the sysfs files.
|
|
|
|
This commit obsoletes the /proc/modules parsing approach.
|
|
|
|
Signed-off-by: Kamil Rytarowski <kamil.rytarowski@caviumnetworks.com>
|
|
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
|
|
---
|
|
tools/dpdk_nic_bind.py | 30 ++++++++++++++++++++----------
|
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/tools/dpdk_nic_bind.py b/tools/dpdk_nic_bind.py
|
|
index dfefdae..14c5311 100755
|
|
--- a/tools/dpdk_nic_bind.py
|
|
+++ b/tools/dpdk_nic_bind.py
|
|
@@ -156,22 +156,32 @@ def check_modules():
|
|
'''Checks that igb_uio is loaded'''
|
|
global dpdk_drivers
|
|
|
|
- fd = open("/proc/modules", 'r')
|
|
- loaded_mods = fd.readlines()
|
|
- fd.close()
|
|
-
|
|
# list of supported modules
|
|
mods = [{"Name" : driver, "Found" : False} for driver in dpdk_drivers]
|
|
|
|
# first check if module is loaded
|
|
- for line in loaded_mods:
|
|
+ try:
|
|
+ # Get list of sysfs modules (both built-in and dynamically loaded)
|
|
+ sysfs_path = '/sys/module/'
|
|
+
|
|
+ # Get the list of directories in sysfs_path
|
|
+ sysfs_mods = [os.path.join(sysfs_path, o) for o
|
|
+ in os.listdir(sysfs_path)
|
|
+ if os.path.isdir(os.path.join(sysfs_path, o))]
|
|
+
|
|
+ # Extract the last element of '/sys/module/abc' in the array
|
|
+ sysfs_mods = [a.split('/')[-1] for a in sysfs_mods]
|
|
+
|
|
+ # special case for vfio_pci (module is named vfio-pci,
|
|
+ # but its .ko is named vfio_pci)
|
|
+ sysfs_mods = map(lambda a:
|
|
+ a if a != 'vfio_pci' else 'vfio-pci', sysfs_mods)
|
|
+
|
|
for mod in mods:
|
|
- if line.startswith(mod["Name"]):
|
|
- mod["Found"] = True
|
|
- # special case for vfio_pci (module is named vfio-pci,
|
|
- # but its .ko is named vfio_pci)
|
|
- elif line.replace("_", "-").startswith(mod["Name"]):
|
|
+ if mod["Name"] in sysfs_mods:
|
|
mod["Found"] = True
|
|
+ except:
|
|
+ pass
|
|
|
|
# check if we have at least one loaded module
|
|
if True not in [mod["Found"] for mod in mods] and b_flag is not None:
|
|
--
|
|
2.7.3
|
|
|