usertools: fix binding built-in kernel driver
A driver can be loaded as a dynamic module or a built-in module. In commit681a672886
("usertools: check if module is loaded before binding"), the script only checks modules in /sys/module/. However, for built-in kernel driver, it only shows up in /sys/module/, if it has a version or at least one parameter. So add check for modules in /lib/modules/$(uname -r)/modules.builtin. Fixes:681a672886
("usertools: check if module is loaded before binding") Cc: stable@dpdk.org Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
parent
0b89dbc259
commit
7a016af4aa
@ -7,6 +7,7 @@
|
||||
import os
|
||||
import subprocess
|
||||
import argparse
|
||||
import platform
|
||||
|
||||
from glob import glob
|
||||
from os.path import exists, basename
|
||||
@ -107,7 +108,17 @@ def module_is_loaded(module):
|
||||
|
||||
loaded_modules = sysfs_mods
|
||||
|
||||
return module in sysfs_mods
|
||||
# add built-in modules as loaded
|
||||
release = platform.uname().release
|
||||
filename = os.path.join("/lib/modules/", release, "modules.builtin")
|
||||
if os.path.exists(filename):
|
||||
try:
|
||||
with open(filename) as f:
|
||||
loaded_modules += [os.path.splitext(os.path.basename(mod))[0] for mod in f]
|
||||
except IOError:
|
||||
print("Warning: cannot read list of built-in kernel modules")
|
||||
|
||||
return module in loaded_modules
|
||||
|
||||
|
||||
def check_modules():
|
||||
|
Loading…
Reference in New Issue
Block a user