Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull module updates from Rusty Russell:
 "Nothing major: the stricter permissions checking for sysfs broke a
  staging driver; fix included.  Greg KH said he'd take the patch but
  hadn't as the merge window opened, so it's included here to avoid
  breaking build"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  staging: fix up speakup kobject mode
  Use 'E' instead of 'X' for unsigned module taint flag.
  VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.
  kallsyms: fix percpu vars on x86-64 with relocation.
  kallsyms: generalize address range checking
  module: LLVMLinux: Remove unused function warning from __param_check macro
  Fix: module signature vs tracepoints: add new TAINT_UNSIGNED_MODULE
  module: remove MODULE_GENERIC_TABLE
  module: allow multiple calls to MODULE_DEVICE_TABLE() per module
  module: use pr_cont

3 files changed, 66 insertions, 26 deletions

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 10085de886fe..1237dd7fb4ca 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -36,13 +36,13 @@ struct sym_entry {
         unsigned char *sym;
 };
 
-struct text_range {
-        const char *stext, *etext;
+struct addr_range {
+        const char *start_sym, *end_sym;
         unsigned long long start, end;
 };
 
 static unsigned long long _text;
-static struct text_range text_ranges[] = {
+static struct addr_range text_ranges[] = {
         { "_stext",     "_etext"     },
         { "_sinittext", "_einittext" },
         { "_stext_l1",  "_etext_l1"  }, /* Blackfin on-chip L1 inst SRAM */
@@ -51,9 +51,14 @@ static struct text_range text_ranges[] = {
 #define text_range_text     (&text_ranges[0])
 #define text_range_inittext (&text_ranges[1])
 
+static struct addr_range percpu_range = {
+        "__per_cpu_start", "__per_cpu_end", -1ULL, 0
+};
+
 static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
 static int all_symbols = 0;
+static int absolute_percpu = 0;
 static char symbol_prefix_char = '\0';
 static unsigned long long kernel_start_addr = 0;
 
@@ -83,19 +88,20 @@ static inline int is_arm_mapping_symbol(const char *str)
                && (str[2] == '\0' || str[2] == '.');
 }
 
-static int read_symbol_tr(const char *sym, unsigned long long addr)
+static int check_symbol_range(const char *sym, unsigned long long addr,
+                              struct addr_range *ranges, int entries)
 {
         size_t i;
-        struct text_range *tr;
+        struct addr_range *ar;
 
-        for (i = 0; i < ARRAY_SIZE(text_ranges); ++i) {
-                tr = &text_ranges[i];
+        for (i = 0; i < entries; ++i) {
+                ar = &ranges[i];
 
-                if (strcmp(sym, tr->stext) == 0) {
-                        tr->start = addr;
+                if (strcmp(sym, ar->start_sym) == 0) {
+                        ar->start = addr;
                         return 0;
-                } else if (strcmp(sym, tr->etext) == 0) {
-                        tr->end = addr;
+                } else if (strcmp(sym, ar->end_sym) == 0) {
+                        ar->end = addr;
                         return 0;
                 }
         }
@@ -130,7 +136,8 @@ static int read_symbol(FILE *in, struct sym_entry *s)
         /* Ignore most absolute/undefined (?) symbols. */
         if (strcmp(sym, "_text") == 0)
                 _text = s->addr;
-        else if (read_symbol_tr(sym, s->addr) == 0)
+        else if (check_symbol_range(sym, s->addr, text_ranges,
+                                    ARRAY_SIZE(text_ranges)) == 0)
                 /* nothing to do */;
         else if (toupper(stype) == 'A')
         {
@@ -164,18 +171,22 @@ static int read_symbol(FILE *in, struct sym_entry *s)
         strcpy((char *)s->sym + 1, str);
         s->sym[0] = stype;
 
+        /* Record if we've found __per_cpu_start/end. */
+        check_symbol_range(sym, s->addr, &percpu_range, 1);
+
         return 0;
 }
 
-static int symbol_valid_tr(struct sym_entry *s)
+static int symbol_in_range(struct sym_entry *s, struct addr_range *ranges,
+                           int entries)
 {
         size_t i;
-        struct text_range *tr;
+        struct addr_range *ar;
 
-        for (i = 0; i < ARRAY_SIZE(text_ranges); ++i) {
-                tr = &text_ranges[i];
+        for (i = 0; i < entries; ++i) {
+                ar = &ranges[i];
 
-                if (s->addr >= tr->start && s->addr <= tr->end)
+                if (s->addr >= ar->start && s->addr <= ar->end)
                         return 1;
         }
 
@@ -214,7 +225,8 @@ static int symbol_valid(struct sym_entry *s)
         /* if --all-symbols is not specified, then symbols outside the text
          * and inittext sections are discarded */
         if (!all_symbols) {
-                if (symbol_valid_tr(s) == 0)
+                if (symbol_in_range(s, text_ranges,
+                                    ARRAY_SIZE(text_ranges)) == 0)
                         return 0;
                 /* Corner case.  Discard any symbols with the same value as
                  * _etext _einittext; they can move between pass 1 and 2 when
@@ -223,9 +235,11 @@ static int symbol_valid(struct sym_entry *s)
                  * rules.
                  */
                 if ((s->addr == text_range_text->end &&
-                                strcmp((char *)s->sym + offset, text_range_text->etext)) ||
+                                strcmp((char *)s->sym + offset,
+                                       text_range_text->end_sym)) ||
                     (s->addr == text_range_inittext->end &&
-                                strcmp((char *)s->sym + offset, text_range_inittext->etext)))
+                                strcmp((char *)s->sym + offset,
+                                       text_range_inittext->end_sym)))
                         return 0;
         }
 
@@ -298,6 +312,11 @@ static int expand_symbol(unsigned char *data, int len, char *result)
         return total;
 }
 
+static int symbol_absolute(struct sym_entry *s)
+{
+        return toupper(s->sym[0]) == 'A';
+}
+
 static void write_src(void)
 {
         unsigned int i, k, off;
@@ -325,7 +344,7 @@ static void write_src(void)
          */
         output_label("kallsyms_addresses");
         for (i = 0; i < table_cnt; i++) {
-                if (toupper(table[i].sym[0]) != 'A') {
+                if (!symbol_absolute(&table[i])) {
                         if (_text <= table[i].addr)
                                 printf("\tPTR\t_text + %#llx\n",
                                         table[i].addr - _text);
@@ -646,6 +665,15 @@ static void sort_symbols(void)
         qsort(table, table_cnt, sizeof(struct sym_entry), compare_symbols);
 }
 
+static void make_percpus_absolute(void)
+{
+        unsigned int i;
+
+        for (i = 0; i < table_cnt; i++)
+                if (symbol_in_range(&table[i], &percpu_range, 1))
+                        table[i].sym[0] = 'A';
+}
+
 int main(int argc, char **argv)
 {
         if (argc >= 2) {
@@ -653,6 +681,8 @@ int main(int argc, char **argv)
                 for (i = 1; i < argc; i++) {
                         if(strcmp(argv[i], "--all-symbols") == 0)
                                 all_symbols = 1;
+                        else if (strcmp(argv[i], "--absolute-percpu") == 0)
+                                absolute_percpu = 1;
                         else if (strncmp(argv[i], "--symbol-prefix=", 16) == 0) {
                                 char *p = &argv[i][16];
                                 /* skip quote */
@@ -669,6 +699,8 @@ int main(int argc, char **argv)
                 usage();
 
         read_map(stdin);
+        if (absolute_percpu)
+                make_percpus_absolute();
         sort_symbols();
         optimize_token_table();
         write_src();
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 2dcb37736d84..86a4fe75f453 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -86,6 +86,10 @@ kallsyms()
                 kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
         fi
 
+        if [ -n "${CONFIG_X86_64}" ]; then
+                kallsymopt="${kallsymopt} --absolute-percpu"
+        fi
+
         local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
                       ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
 
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 25f6f5970552..1924990a737f 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -42,7 +42,7 @@ typedef unsigned char	__u8;
 
 /* This array collects all instances that use the generic do_table */
 struct devtable {
-        const char *device_id; /* name of table, __mod_<name>_device_table. */
+        const char *device_id; /* name of table, __mod_<name>__*_device_table. */
         unsigned long id_size;
         void *function;
 };
@@ -146,7 +146,8 @@ static void device_id_check(const char *modname, const char *device_id,
 
         if (size % id_size || size < id_size) {
                 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
-                      "of the size of section __mod_%s_device_table=%lu.\n"
+                      "of the size of "
+                      "section __mod_%s__<identifier>_device_table=%lu.\n"
                       "Fix definition of struct %s_device_id "
                       "in mod_devicetable.h\n",
                       modname, device_id, id_size, device_id, size, device_id);
@@ -1216,7 +1217,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 {
         void *symval;
         char *zeros = NULL;
-        const char *name;
+        const char *name, *identifier;
         unsigned int namelen;
 
         /* We're looking for a section relative symbol */
@@ -1227,7 +1228,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
         if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
                 return;
 
-        /* All our symbols are of form <prefix>__mod_XXX_device_table. */
+        /* All our symbols are of form <prefix>__mod_<name>__<identifier>_device_table. */
         name = strstr(symname, "__mod_");
         if (!name)
                 return;
@@ -1237,7 +1238,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 return;
         if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))
                 return;
-        namelen -= strlen("_device_table");
+        identifier = strstr(name, "__");
+        if (!identifier)
+                return;
+        namelen = identifier - name;
 
         /* Handle all-NULL symbols allocated into .bss */
         if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {