redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

pstore: Convert internal records to timespec64 

This prepares pstore for converting the VFS layer to timespec64.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
hifive-unleashed-5.1
Kees Cook 2018-05-14 15:50:52 -07:00 committed by Deepa Dinamani
parent 0220eddac6
commit 7aaa822ed0
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/firmware/efi/efi-pstore.c
View File

@ -28,10 +28,9 @@ static int efi_pstore_close(struct pstore_info *psi)
return 0; return 0;
} }
static inline u64 generic_id(unsigned long timestamp, static inline u64 generic_id(u64 timestamp, unsigned int part, int count)
unsigned int part, int count)
{ {
return ((u64) timestamp * 100 + part) * 1000 + count; return (timestamp * 100 + part) * 1000 + count;
} }
static int efi_pstore_read_func(struct efivar_entry *entry, static int efi_pstore_read_func(struct efivar_entry *entry,
@ -42,7 +41,8 @@ static int efi_pstore_read_func(struct efivar_entry *entry,
int i; int i;
int cnt; int cnt;
unsigned int part; unsigned int part;
unsigned long time, size; unsigned long size;
u64 time;
if (efi_guidcmp(entry->var.VendorGuid, vendor)) if (efi_guidcmp(entry->var.VendorGuid, vendor))
return 0; return 0;
@ -50,7 +50,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry,
for (i = 0; i < DUMP_NAME_LEN; i++) for (i = 0; i < DUMP_NAME_LEN; i++)
name[i] = entry->var.VariableName[i]; name[i] = entry->var.VariableName[i];
if (sscanf(name, "dump-type%u-%u-%d-%lu-%c", if (sscanf(name, "dump-type%u-%u-%d-%llu-%c",
&record->type, &part, &cnt, &time, &data_type) == 5) { &record->type, &part, &cnt, &time, &data_type) == 5) {
record->id = generic_id(time, part, cnt); record->id = generic_id(time, part, cnt);
record->part = part; record->part = part;
@ -62,7 +62,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry,
else else
record->compressed = false; record->compressed = false;
record->ecc_notice_size = 0; record->ecc_notice_size = 0;
} else if (sscanf(name, "dump-type%u-%u-%d-%lu", } else if (sscanf(name, "dump-type%u-%u-%d-%llu",
&record->type, &part, &cnt, &time) == 4) { &record->type, &part, &cnt, &time) == 4) {
record->id = generic_id(time, part, cnt); record->id = generic_id(time, part, cnt);
record->part = part; record->part = part;
@ -71,7 +71,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry,
record->time.tv_nsec = 0; record->time.tv_nsec = 0;
record->compressed = false; record->compressed = false;
record->ecc_notice_size = 0; record->ecc_notice_size = 0;
} else if (sscanf(name, "dump-type%u-%u-%lu", } else if (sscanf(name, "dump-type%u-%u-%llu",
&record->type, &part, &time) == 3) { &record->type, &part, &time) == 3) {
/* /*
* Check if an old format, * Check if an old format,
@ -250,9 +250,10 @@ static int efi_pstore_write(struct pstore_record *record)
/* Since we copy the entire length of name, make sure it is wiped. */ /* Since we copy the entire length of name, make sure it is wiped. */
memset(name, 0, sizeof(name)); memset(name, 0, sizeof(name));
snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu-%c", snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lld-%c",
record->type, record->part, record->count, record->type, record->part, record->count,
record->time.tv_sec, record->compressed ? 'C' : 'D'); (long long)record->time.tv_sec,
record->compressed ? 'C' : 'D');
for (i = 0; i < DUMP_NAME_LEN; i++) for (i = 0; i < DUMP_NAME_LEN; i++)
efi_name[i] = name[i]; efi_name[i] = name[i];
@ -327,15 +328,15 @@ static int efi_pstore_erase(struct pstore_record *record)
char name[DUMP_NAME_LEN]; char name[DUMP_NAME_LEN];
int ret; int ret;
snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu", snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lld",
record->type, record->part, record->count, record->type, record->part, record->count,
record->time.tv_sec); (long long)record->time.tv_sec);
ret = efi_pstore_erase_name(name); ret = efi_pstore_erase_name(name);
if (ret != -ENOENT) if (ret != -ENOENT)
return ret; return ret;
snprintf(name, sizeof(name), "dump-type%u-%u-%lu", snprintf(name, sizeof(name), "dump-type%u-%u-%lld",
record->type, record->part, record->time.tv_sec); record->type, record->part, (long long)record->time.tv_sec);
ret = efi_pstore_erase_name(name); ret = efi_pstore_erase_name(name);
return ret; return ret;

3
fs/pstore/inode.c
View File

@ -392,7 +392,8 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
inode->i_private = private; inode->i_private = private;
if (record->time.tv_sec) if (record->time.tv_sec)
inode->i_mtime = inode->i_ctime = record->time; inode->i_mtime = inode->i_ctime =
timespec64_to_timespec(record->time);
d_add(dentry, inode); d_add(dentry, inode);

2
fs/pstore/platform.c
View File

@ -328,7 +328,7 @@ void pstore_record_init(struct pstore_record *record,
record->psi = psinfo; record->psi = psinfo;
/* Report zeroed timestamp if called before timekeeping has resumed. */ /* Report zeroed timestamp if called before timekeeping has resumed. */
record->time = ns_to_timespec(ktime_get_real_fast_ns()); record->time = ns_to_timespec64(ktime_get_real_fast_ns());
} }
/* /*

21
fs/pstore/ram.c
View File

@ -38,6 +38,11 @@
#define RAMOOPS_KERNMSG_HDR "====" #define RAMOOPS_KERNMSG_HDR "===="
#define MIN_MEM_SIZE 4096UL #define MIN_MEM_SIZE 4096UL
#if __BITS_PER_LONG == 64
# define TVSEC_FMT "%ld"
#else
# define TVSEC_FMT "%lld"
#endif
static ulong record_size = MIN_MEM_SIZE; static ulong record_size = MIN_MEM_SIZE;
module_param(record_size, ulong, 0400); module_param(record_size, ulong, 0400);
@ -153,21 +158,23 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,
return prz; return prz;
} }
static int ramoops_read_kmsg_hdr(char *buffer, struct timespec *time, static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time,
bool *compressed) bool *compressed)
{ {
char data_type; char data_type;
int header_length = 0; int header_length = 0;
if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lu.%lu-%c\n%n", &time->tv_sec, if (sscanf(buffer, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu-%c\n%n",
&time->tv_nsec, &data_type, &header_length) == 3) { &time->tv_sec, &time->tv_nsec, &data_type,
&header_length) == 3) {
if (data_type == 'C') if (data_type == 'C')
*compressed = true; *compressed = true;
else else
*compressed = false; *compressed = false;
} else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lu.%lu\n%n", } else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu\n%n",
&time->tv_sec, &time->tv_nsec, &header_length) == 2) { &time->tv_sec, &time->tv_nsec,
*compressed = false; &header_length) == 2) {
*compressed = false;
} else { } else {
time->tv_sec = 0; time->tv_sec = 0;
time->tv_nsec = 0; time->tv_nsec = 0;
@ -360,7 +367,7 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz,
char *hdr; char *hdr;
size_t len; size_t len;
hdr = kasprintf(GFP_ATOMIC, RAMOOPS_KERNMSG_HDR "%lu.%lu-%c\n", hdr = kasprintf(GFP_ATOMIC, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu-%c\n",
record->time.tv_sec, record->time.tv_sec,
record->time.tv_nsec / 1000, record->time.tv_nsec / 1000,
record->compressed ? 'C' : 'D'); record->compressed ? 'C' : 'D');

2
include/linux/pstore.h
View File

@ -71,7 +71,7 @@ struct pstore_record {
struct pstore_info *psi; struct pstore_info *psi;
enum pstore_type_id type; enum pstore_type_id type;
u64 id; u64 id;
struct timespec time; struct timespec64 time;
char *buf; char *buf;
ssize_t size; ssize_t size;
ssize_t ecc_notice_size; ssize_t ecc_notice_size;