Merge tag 'pstore-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

Pull pstore updates from Kees Cook:
 "This has a large internal refactoring along with several smaller
  fixes.

   - constify compression structures; Bhumika Goyal

   - restore powerpc dumping; Ankit Kumar

   - fix more bugs in the rarely exercises module unloading logic

   - reorganize filesystem locking to fix problems noticed by lockdep

   - refactor internal pstore APIs to make development and review
     easier:
      - improve error reporting
      - add kernel-doc structure and function comments
      - avoid insane argument passing by using a common record
        structure"

* tag 'pstore-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (23 commits)
  pstore: Solve lockdep warning by moving inode locks
  pstore: Fix flags to enable dumps on powerpc
  pstore: Remove unused vmalloc.h in pmsg
  pstore: simplify write_user_compat()
  pstore: Remove write_buf() callback
  pstore: Replace arguments for write_buf_user() API
  pstore: Replace arguments for write_buf() API
  pstore: Replace arguments for erase() API
  pstore: Do not duplicate record metadata
  pstore: Allocate records on heap instead of stack
  pstore: Pass record contents instead of copying
  pstore: Always allocate buffer for decompression
  pstore: Replace arguments for write() API
  pstore: Replace arguments for read() API
  pstore: Switch pstore_mkfile to pass record
  pstore: Move record decompression to function
  pstore: Extract common arguments into structure
  pstore: Add kernel-doc for struct pstore_info
  pstore: Improve register_pstore() error reporting
  pstore: Avoid race in module unloading
  ...

diff --combined drivers/firmware/efi/efi-pstore.c
index 6b5acefce6b360fdb74f72cffa857bb75295ecb8,93d8cdbe7ef49361bd28a49083eb86478e0a0f4f..ed3137c1ceb0c0ed0fcbb1c94bffdf1a4811bf41
--- 1/drivers/firmware/efi/efi-pstore.c
--- 2/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@@ -28,26 -28,16 +28,16 @@@ static int efi_pstore_close(struct psto
        return 0;
  }
  
- struct pstore_read_data {
-       u64 *id;
-       enum pstore_type_id *type;
-       int *count;
-       struct timespec *timespec;
-       bool *compressed;
-       ssize_t *ecc_notice_size;
-       char **buf;
- };
- 
  static inline u64 generic_id(unsigned long timestamp,
                             unsigned int part, int count)
  {
        return ((u64) timestamp * 100 + part) * 1000 + count;
  }
  
- static int efi_pstore_read_func(struct efivar_entry *entry, void *data)
+ static int efi_pstore_read_func(struct efivar_entry *entry,
+                               struct pstore_record *record)
  {
        efi_guid_t vendor = LINUX_EFI_CRASH_GUID;
-       struct pstore_read_data *cb_data = data;
        char name[DUMP_NAME_LEN], data_type;
        int i;
        int cnt;
@@@ -61,37 -51,37 +51,37 @@@
                name[i] = entry->var.VariableName[i];
  
        if (sscanf(name, "dump-type%u-%u-%d-%lu-%c",
-                  cb_data->type, &part, &cnt, &time, &data_type) == 5) {
-               *cb_data->id = generic_id(time, part, cnt);
-               *cb_data->count = cnt;
-               cb_data->timespec->tv_sec = time;
-               cb_data->timespec->tv_nsec = 0;
+                  &record->type, &part, &cnt, &time, &data_type) == 5) {
+               record->id = generic_id(time, part, cnt);
+               record->count = cnt;
+               record->time.tv_sec = time;
+               record->time.tv_nsec = 0;
                if (data_type == 'C')
-                       *cb_data->compressed = true;
+                       record->compressed = true;
                else
-                       *cb_data->compressed = false;
-               *cb_data->ecc_notice_size = 0;
+                       record->compressed = false;
+               record->ecc_notice_size = 0;
        } else if (sscanf(name, "dump-type%u-%u-%d-%lu",
-                  cb_data->type, &part, &cnt, &time) == 4) {
-               *cb_data->id = generic_id(time, part, cnt);
-               *cb_data->count = cnt;
-               cb_data->timespec->tv_sec = time;
-               cb_data->timespec->tv_nsec = 0;
-               *cb_data->compressed = false;
-               *cb_data->ecc_notice_size = 0;
+                  &record->type, &part, &cnt, &time) == 4) {
+               record->id = generic_id(time, part, cnt);
+               record->count = cnt;
+               record->time.tv_sec = time;
+               record->time.tv_nsec = 0;
+               record->compressed = false;
+               record->ecc_notice_size = 0;
        } else if (sscanf(name, "dump-type%u-%u-%lu",
-                         cb_data->type, &part, &time) == 3) {
+                         &record->type, &part, &time) == 3) {
                /*
                 * Check if an old format,
                 * which doesn't support holding
                 * multiple logs, remains.
                 */
-               *cb_data->id = generic_id(time, part, 0);
-               *cb_data->count = 0;
-               cb_data->timespec->tv_sec = time;
-               cb_data->timespec->tv_nsec = 0;
-               *cb_data->compressed = false;
-               *cb_data->ecc_notice_size = 0;
+               record->id = generic_id(time, part, 0);
+               record->count = 0;
+               record->time.tv_sec = time;
+               record->time.tv_nsec = 0;
+               record->compressed = false;
+               record->ecc_notice_size = 0;
        } else
                return 0;
  
@@@ -99,7 -89,7 +89,7 @@@
        __efivar_entry_get(entry, &entry->var.Attributes,
                           &entry->var.DataSize, entry->var.Data);
        size = entry->var.DataSize;
-       memcpy(*cb_data->buf, entry->var.Data,
+       memcpy(record->buf, entry->var.Data,
               (size_t)min_t(unsigned long, EFIVARS_DATA_SIZE_MAX, size));
  
        return size;
@@@ -164,7 -154,7 +154,7 @@@ static int efi_pstore_scan_sysfs_exit(s
  /**
   * efi_pstore_sysfs_entry_iter
   *
-  * @data: function-specific data to pass to callback
+  * @record: pstore record to pass to callback
   * @pos: entry to begin iterating from
   *
   * You MUST call efivar_enter_iter_begin() before this function, and
@@@ -175,7 -165,8 +165,8 @@@
   * the next entry of the last one passed to efi_pstore_read_func().
   * To begin iterating from the beginning of the list @pos must be %NULL.
   */
- static int efi_pstore_sysfs_entry_iter(void *data, struct efivar_entry **pos)
+ static int efi_pstore_sysfs_entry_iter(struct pstore_record *record,
+                                      struct efivar_entry **pos)
  {
        struct efivar_entry *entry, *n;
        struct list_head *head = &efivar_sysfs_list;
@@@ -186,7 -177,7 +177,7 @@@
                list_for_each_entry_safe(entry, n, head, list) {
                        efi_pstore_scan_sysfs_enter(entry, n, head);
  
-                       size = efi_pstore_read_func(entry, data);
+                       size = efi_pstore_read_func(entry, record);
                        ret = efi_pstore_scan_sysfs_exit(entry, n, head,
                                                         size < 0);
                        if (ret)
@@@ -201,7 -192,7 +192,7 @@@
        list_for_each_entry_safe_from((*pos), n, head, list) {
                efi_pstore_scan_sysfs_enter((*pos), n, head);
  
-               size = efi_pstore_read_func((*pos), data);
+               size = efi_pstore_read_func((*pos), record);
                ret = efi_pstore_scan_sysfs_exit((*pos), n, head, size < 0);
                if (ret)
                        return ret;
@@@ -225,71 -216,57 +216,57 @@@
   * size < 0: Failed to get data of entry logging via efi_pstore_write(),
   *           and pstore will stop reading entry.
   */
- static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
-                              int *count, struct timespec *timespec,
-                              char **buf, bool *compressed,
-                              ssize_t *ecc_notice_size,
-                              struct pstore_info *psi)
+ static ssize_t efi_pstore_read(struct pstore_record *record)
  {
-       struct pstore_read_data data;
+       struct efivar_entry *entry = (struct efivar_entry *)record->psi->data;
        ssize_t size;
  
-       data.id = id;
-       data.type = type;
-       data.count = count;
-       data.timespec = timespec;
-       data.compressed = compressed;
-       data.ecc_notice_size = ecc_notice_size;
-       data.buf = buf;
- 
-       *data.buf = kzalloc(EFIVARS_DATA_SIZE_MAX, GFP_KERNEL);
-       if (!*data.buf)
+       record->buf = kzalloc(EFIVARS_DATA_SIZE_MAX, GFP_KERNEL);
+       if (!record->buf)
                return -ENOMEM;
  
        if (efivar_entry_iter_begin()) {
-               kfree(*data.buf);
-               return -EINTR;
+               size = -EINTR;
+               goto out;
        }
-       size = efi_pstore_sysfs_entry_iter(&data,
-                                          (struct efivar_entry **)&psi->data);
+       size = efi_pstore_sysfs_entry_iter(record, &entry);
        efivar_entry_iter_end();
-       if (size <= 0)
-               kfree(*data.buf);
+ 
+ out:
+       if (size <= 0) {
+               kfree(record->buf);
+               record->buf = NULL;
+       }
        return size;
  }
  
- static int efi_pstore_write(enum pstore_type_id type,
-               enum kmsg_dump_reason reason, u64 *id,
-               unsigned int part, int count, bool compressed, size_t size,
-               struct pstore_info *psi)
+ static int efi_pstore_write(struct pstore_record *record)
  {
        char name[DUMP_NAME_LEN];
        efi_char16_t efi_name[DUMP_NAME_LEN];
        efi_guid_t vendor = LINUX_EFI_CRASH_GUID;
        int i, ret = 0;
  
-       sprintf(name, "dump-type%u-%u-%d-%lu-%c", type, part, count,
-               get_seconds(), compressed ? 'C' : 'D');
+       snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu-%c",
+                record->type, record->part, record->count,
+                get_seconds(), record->compressed ? 'C' : 'D');
  
        for (i = 0; i < DUMP_NAME_LEN; i++)
                efi_name[i] = name[i];
  
 -      efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES,
 +      ret = efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES,
-                                   !pstore_cannot_block_path(reason),
-                                   size, psi->buf);
+                             !pstore_cannot_block_path(record->reason),
+                             record->size, record->psi->buf);
  
-       if (reason == KMSG_DUMP_OOPS)
+       if (record->reason == KMSG_DUMP_OOPS)
                efivar_run_worker();
  
-       *id = part;
+       record->id = record->part;
        return ret;
  };
  
  struct pstore_erase_data {
-       u64 id;
-       enum pstore_type_id type;
-       int count;
-       struct timespec time;
+       struct pstore_record *record;
        efi_char16_t *name;
  };
  
@@@ -315,8 -292,9 +292,9 @@@ static int efi_pstore_erase_func(struc
                 * Check if an old format, which doesn't support
                 * holding multiple logs, remains.
                 */
-               sprintf(name_old, "dump-type%u-%u-%lu", ed->type,
-                       (unsigned int)ed->id, ed->time.tv_sec);
+               snprintf(name_old, sizeof(name_old), "dump-type%u-%u-%lu",
+                       ed->record->type, (unsigned int)ed->record->id,
+                       ed->record->time.tv_sec);
  
                for (i = 0; i < DUMP_NAME_LEN; i++)
                        efi_name_old[i] = name_old[i];
@@@ -341,8 -319,7 +319,7 @@@
        return 1;
  }
  
- static int efi_pstore_erase(enum pstore_type_id type, u64 id, int count,
-                           struct timespec time, struct pstore_info *psi)
+ static int efi_pstore_erase(struct pstore_record *record)
  {
        struct pstore_erase_data edata;
        struct efivar_entry *entry = NULL;
@@@ -351,17 -328,16 +328,16 @@@
        int found, i;
        unsigned int part;
  
-       do_div(id, 1000);
-       part = do_div(id, 100);
-       sprintf(name, "dump-type%u-%u-%d-%lu", type, part, count, time.tv_sec);
+       do_div(record->id, 1000);
+       part = do_div(record->id, 100);
+       snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu",
+                record->type, record->part, record->count,
+                record->time.tv_sec);
  
        for (i = 0; i < DUMP_NAME_LEN; i++)
                efi_name[i] = name[i];
  
-       edata.id = part;
-       edata.type = type;
-       edata.count = count;
-       edata.time = time;
+       edata.record = record;
        edata.name = efi_name;
  
        if (efivar_entry_iter_begin())