[dpdk-dev] [PATCH v3 2/2] eal/linux: Add support for handling built-in kernel modules

Kamil Rytarowski Kamil.Rytarowski at caviumnetworks.com
Mon Dec 7 19:36:05 CET 2015


Currently rte_eal_check_module() 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 at caviumnetworks.com>
---
 lib/librte_eal/linuxapp/eal/eal.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 635ec36..539188f 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -52,6 +52,8 @@
 #if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
 #include <sys/io.h>
 #endif
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <rte_common.h>
 #include <rte_debug.h>
@@ -901,27 +903,27 @@ int rte_eal_has_hugepages(void)
 int
 rte_eal_check_module(const char *module_name)
 {
-	char mod_name[30]; /* Any module names can be longer than 30 bytes? */
-	int ret = 0;
-	int n;
+	char sysfs_mod_name[PATH_MAX];
+	struct stat st;
 
 	if (NULL == module_name)
 		return -1;
 
-	FILE *fd = fopen("/proc/modules", "r");
-	if (NULL == fd) {
-		RTE_LOG(ERR, EAL, "Open /proc/modules failed!"
-			" error %i (%s)\n", errno, strerror(errno));
+	/* Check if there is sysfs mounted */
+	if (stat("/sys/module", &st) != 0) {
+		RTE_LOG(DEBUG, EAL, "Open /sys/module failed: %s\n",
+			strerror(errno));
 		return -1;
 	}
-	while (!feof(fd)) {
-		n = fscanf(fd, "%29s %*[^\n]", mod_name);
-		if ((n == 1) && !strcmp(mod_name, module_name)) {
-			ret = 1;
-			break;
-		}
+
+	/* A module might be built-in, therefore try sysfs */
+	snprintf(sysfs_mod_name, PATH_MAX, "/sys/module/%s", module_name);
+	if (stat(sysfs_mod_name, &st) != 0) {
+		RTE_LOG(DEBUG, EAL, "Open %s failed! error %i (%s)\n",
+			sysfs_mod_name, errno, strerror(errno));
+		return 0;
 	}
-	fclose(fd);
 
-	return ret;
+	/* Module has been found */
+	return 1;
 }
-- 
2.5.0



More information about the dev mailing list