From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kamil Rytarowski Subject: [PATCH v2 1/2] tools: Add support for handling built-in kernel modules Date: Mon, 7 Dec 2015 17:57:39 +0100 Message-ID: <1449507460-32038-1-git-send-email-Kamil.Rytarowski@caviumnetworks.com> References: <1449499771-31466-1-git-send-email-Kamil.Rytarowski@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain To: Return-path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0091.outbound.protection.outlook.com [157.56.110.91]) by dpdk.org (Postfix) with ESMTP id 53E669A8A for ; Mon, 7 Dec 2015 17:58:16 +0100 (CET) In-Reply-To: <1449499771-31466-1-git-send-email-Kamil.Rytarowski@caviumnetworks.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. Signed-off-by: Kamil Rytarowski --- tools/dpdk_nic_bind.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/dpdk_nic_bind.py b/tools/dpdk_nic_bind.py index f02454e..cb1ac80 100755 --- a/tools/dpdk_nic_bind.py +++ b/tools/dpdk_nic_bind.py @@ -33,7 +33,7 @@ # import sys, os, getopt, subprocess -from os.path import exists, abspath, dirname, basename +from os.path import exists, abspath, dirname, basename, join # The PCI device class for ETHERNET devices @@ -173,6 +173,26 @@ def check_modules(): elif line.replace("_", "-").startswith(mod["Name"]): mod["Found"] = True + try: + # Get list of syfs modules, some of them might be builtin and merge with mods + 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 mod["Found"] == False and (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: if b_flag in dpdk_drivers: -- 2.5.0