livepatch: Use kallsyms_on_each_match_symbol() to improve performance

[linux-2.6-block.git] / kernel / livepatch / core.c

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 9ada0bc5247be5de41c3c21476b1dd2cd9f20a9a..50bfc3481a4ee38f6ce01eb2f9cb350c505b1974 100644 (file)
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -153,6 +153,24 @@ static int klp_find_callback(void *data, const char *name,
        return 0;
 }
 
+static int klp_match_callback(void *data, unsigned long addr)
+{
+       struct klp_find_arg *args = data;
+
+       args->addr = addr;
+       args->count++;
+
+       /*
+        * Finish the search when the symbol is found for the desired position
+        * or the position is not defined for a non-unique symbol.
+        */
+       if ((args->pos && (args->count == args->pos)) ||
+           (!args->pos && (args->count > 1)))
+               return 1;
+
+       return 0;
+}
+
 static int klp_find_object_symbol(const char *objname, const char *name,
                                  unsigned long sympos, unsigned long *addr)
 {
@@ -167,7 +185,7 @@ static int klp_find_object_symbol(const char *objname, const char *name,
        if (objname)
                module_kallsyms_on_each_symbol(klp_find_callback, &args);
        else
-               kallsyms_on_each_symbol(klp_find_callback, &args);
+               kallsyms_on_each_match_symbol(klp_match_callback, name, &args);
 
        /*
         * Ensure an address was found. If sympos is 0, ensure symbol is unique;