Bump to version 1.22.1

[platform/upstream/busybox.git] / modutils / modprobe.c

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 8d2ccc5..7f7446d 100644 (file)
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -89,8 +89,7 @@
 //usage:       "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
 //usage:       " MODULE [symbol=value]..."
 //usage:#define modprobe_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n       -a      Load multiple MODULEs"
+//usage:       "       -a      Load multiple MODULEs"
 //usage:     "\n       -l      List (MODULE is a pattern)"
 //usage:     "\n       -r      Remove MODULE (stacks) or do autoclean"
 //usage:     "\n       -q      Quiet"
@@ -102,12 +101,15 @@
 //usage:       )
 //usage:#endif /* !ENABLE_MODPROBE_SMALL */
 
-/* Note that usage text doesn't document various 2.4 options
- * we pull in through INSMOD_OPTS define */
-#define MODPROBE_OPTS  "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b")
+/* Note: usage text doesn't document various 2.4 options
+ * we pull in through INSMOD_OPTS define
+ * Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST,
+ * it is a no-op.
+ */
+#define MODPROBE_OPTS  "alrDb"
 /* -a and -D _are_ in fact compatible */
 #define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl")
-//#define MODPROBE_OPTS  "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b")
+//#define MODPROBE_OPTS  "acd:lnrt:C:b"
 //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
 enum {
        OPT_INSERT_ALL   = (INSMOD_OPT_UNUSED << 0), /* a */
@@ -134,10 +136,8 @@ static const char modprobe_longopts[] ALIGN1 =
        /* module-init-tools 3.11.1 has only long opt --show-depends
         * but no short -D, we provide long opt for scripts which
         * were written for 3.11.1: */
-       "show-depends\0" No_argument "D"
-       // IF_FEATURE_MODPROBE_BLACKLIST(
+       "show-depends\0"     No_argument "D"
        // "use-blacklist\0" No_argument "b"
-       // )
        ;
 #endif
 
@@ -158,20 +158,21 @@ struct module_entry { /* I'll call it ME. */
        llist_t *deps; /* strings. modules we depend on */
 };
 
+#define DB_HASH_SIZE 256
+
 struct globals {
-       llist_t *db; /* MEs of all modules ever seen (caching for speed) */
        llist_t *probes; /* MEs of module(s) requested on cmdline */
        char *cmdline_mopts; /* module options from cmdline */
        int num_unresolved_deps;
        /* bool. "Did we have 'symbol:FOO' requested on cmdline?" */
        smallint need_symbols;
        struct utsname uts;
+       llist_t *db[DB_HASH_SIZE]; /* MEs of all modules ever seen (caching for speed) */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
-struct BUG_G_too_big {
-        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
+#define G (*ptr_to_globals)
+#define INIT_G() do { \
+       SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
 
 
 static int read_config(const char *path);
@@ -191,14 +192,26 @@ static char *gather_options_str(char *opts, const char *append)
        return opts;
 }
 
+/* These three functions called many times, optimizing for speed.
+ * Users reported minute-long delays when they runn iptables repeatedly
+ * (iptables use modprobe to install needed kernel modules).
+ */
 static struct module_entry *helper_get_module(const char *module, int create)
 {
        char modname[MODULE_NAME_LEN];
        struct module_entry *e;
        llist_t *l;
+       unsigned i;
+       unsigned hash;
 
        filename2modname(module, modname);
-       for (l = G.db; l != NULL; l = l->link) {
+
+       hash = 0;
+       for (i = 0; modname[i]; i++)
+               hash = ((hash << 5) + hash) + modname[i];
+       hash %= DB_HASH_SIZE;
+
+       for (l = G.db[hash]; l; l = l->link) {
                e = (struct module_entry *) l->data;
                if (strcmp(e->modname, modname) == 0)
                        return e;
@@ -208,15 +221,15 @@ static struct module_entry *helper_get_module(const char *module, int create)
 
        e = xzalloc(sizeof(*e));
        e->modname = xstrdup(modname);
-       llist_add_to(&G.db, e);
+       llist_add_to(&G.db[hash], e);
 
        return e;
 }
-static struct module_entry *get_or_add_modentry(const char *module)
+static ALWAYS_INLINE struct module_entry *get_or_add_modentry(const char *module)
 {
        return helper_get_module(module, 1);
 }
-static struct module_entry *get_modentry(const char *module)
+static ALWAYS_INLINE struct module_entry *get_modentry(const char *module)
 {
        return helper_get_module(module, 0);
 }
@@ -276,7 +289,7 @@ static int FAST_FUNC config_file_action(const char *filename,
                                continue;
                        filename2modname(tokens[1], wildcard);
 
-                       for (l = G.probes; l != NULL; l = l->link) {
+                       for (l = G.probes; l; l = l->link) {
                                m = (struct module_entry *) l->data;
                                if (fnmatch(wildcard, m->modname, 0) != 0)
                                        continue;
@@ -378,7 +391,6 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo
 static int do_modprobe(struct module_entry *m)
 {
        int rc, first;
-       llist_t *l;
 
        if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
                if (!(option_mask32 & INSMOD_OPT_SILENT))
@@ -391,8 +403,11 @@ static int do_modprobe(struct module_entry *m)
        if (!(option_mask32 & OPT_REMOVE))
                m->deps = llist_rev(m->deps);
 
-       for (l = m->deps; l != NULL; l = l->link)
-               DBG("dep: %s", l->data);
+       if (0) {
+               llist_t *l;
+               for (l = m->deps; l; l = l->link)
+                       DBG("dep: %s", l->data);
+       }
 
        first = 1;
        rc = 0;
@@ -530,10 +545,14 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
        xchdir(G.uts.release);
 
        if (opt & OPT_LIST_ONLY) {
+               int i;
                char name[MODULE_NAME_LEN];
                char *colon, *tokens[2];
                parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
 
+               for (i = 0; argv[i]; i++)
+                       replace(argv[i], '-', '_');
+
                while (config_read(p, tokens, 2, 1, "# \t", PARSE_NORMAL)) {
                        colon = last_char_is(tokens[0], ':');
                        if (!colon)
@@ -543,7 +562,6 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                        if (!argv[0])
                                puts(tokens[0]);
                        else {
-                               int i;
                                for (i = 0; argv[i]; i++) {
                                        if (fnmatch(argv[i], name, 0) == 0) {
                                                puts(tokens[0]);