mirror of https://gitee.com/openkylin/linux.git
- A new platform data parameter to specify ECC configuration;
- Rounding fixup to not waste memory in ecc_blocks; - Restore ECC information printouts; - A small code cleanup: use kmemdup where appropriate. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRgzLpAAoJEGgI9fZJve1bz3wP/0uolMtor/SmvU24iGn6ZNdM sAXOyexLlGTfDp5m/wtzdrLO2nuDnJvUxCqi8lq6zsGzX3XL4p/bDIUlWaFPy6IR PtlWJBlvm52V+HLYUjF7qlJtB8TdT24n4+yB6jFn4sqIiUptJWh6ttfg6Y+i16k2 6eScyerpN0kHFaPiVU5MsNgyBDJc7z8FczDaeXtknaUbNWkLW287bCBt23O0KMoh npeMqBLYthjtcah6+MC8yixgZR4CNp4f7lKGCpK8tJ39oQ1GiUEAQJhqOY3Bo9ct 75T5BigBmvASeTNA19Zhkhk3g2CzyFSGtO8ivIagFTTA0PGVhPM5qG6MFvGh1JYY aG0OvRNWa1at+4rh7TgPG199QnkgE2zhnjUO4YhHVVSbrYX7DLZ/OJ1jjBzZAiL8 Fk361GCVjHC4r8CV8tcabpc5XN8tWSscUapVTduI749KI8OaSm+uQv1eAh+4wK0L tltFK8nv0WTYPBnA1eFZAw82EOLdg9f4+43xyVsfuUmygegSNJUWh3ZT3uGM6DmE topdSX51d1dPKoJ0SCyOEzwQNgfmxv/LmIsdB8fAWVHdb2jID6T+TZ15FGRKv6h8 dxiGnK50pqwL9QyDHzDzb4QJob5hirGJxWXQ5c+CWuJ70Maj1jHm1yXFIIr3GDhD YG7Io9nLpsuvZtfe1Bkz =XdR6 -----END PGP SIGNATURE----- Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore Pull pstore update from Anton Vorontsov: - A new platform data parameter to specify ECC configuration; - Rounding fixup to not waste memory in ecc_blocks; - Restore ECC information printouts; - A small code cleanup: use kmemdup where appropriate. * tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore: pstore/ram: Restore ecc information block pstore/ram: Allow specifying ecc parameters in platform data pstore/ram: Include ecc_size when calculating ecc_block pstore: Replace calls to kmalloc and memcpy with kmemdup
This commit is contained in:
Linus Torvalds
commit
00fdffb513
|
|
@ -83,7 +83,7 @@ struct ramoops_context {
|
|||
size_t console_size;
|
||||
size_t ftrace_size;
|
||||
int dump_oops;
|
||||
int ecc_size;
|
||||
struct persistent_ram_ecc_info ecc_info;
|
||||
unsigned int max_dump_cnt;
|
||||
unsigned int dump_write_cnt;
|
||||
unsigned int dump_read_cnt;
|
||||
|
|
@ -136,6 +136,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
|
|||
char **buf, struct pstore_info *psi)
|
||||
{
|
||||
ssize_t size;
|
||||
ssize_t ecc_notice_size;
|
||||
struct ramoops_context *cxt = psi->data;
|
||||
struct persistent_ram_zone *prz;
|
||||
|
||||
|
|
@ -156,12 +157,18 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
|
|||
time->tv_nsec = 0;
|
||||
|
||||
size = persistent_ram_old_size(prz);
|
||||
*buf = kmalloc(size, GFP_KERNEL);
|
||||
|
||||
/* ECC correction notice */
|
||||
ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0);
|
||||
|
||||
*buf = kmalloc(size + ecc_notice_size + 1, GFP_KERNEL);
|
||||
if (*buf == NULL)
|
||||
return -ENOMEM;
|
||||
memcpy(*buf, persistent_ram_old(prz), size);
|
||||
|
||||
return size;
|
||||
memcpy(*buf, persistent_ram_old(prz), size);
|
||||
persistent_ram_ecc_string(prz, *buf + size, ecc_notice_size + 1);
|
||||
|
||||
return size + ecc_notice_size;
|
||||
}
|
||||
|
||||
static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz)
|
||||
|
|
@ -323,7 +330,8 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
|
|||
for (i = 0; i < cxt->max_dump_cnt; i++) {
|
||||
size_t sz = cxt->record_size;
|
||||
|
||||
cxt->przs[i] = persistent_ram_new(*paddr, sz, 0, cxt->ecc_size);
|
||||
cxt->przs[i] = persistent_ram_new(*paddr, sz, 0,
|
||||
&cxt->ecc_info);
|
||||
if (IS_ERR(cxt->przs[i])) {
|
||||
err = PTR_ERR(cxt->przs[i]);
|
||||
dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n",
|
||||
|
|
@ -353,7 +361,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*prz = persistent_ram_new(*paddr, sz, sig, cxt->ecc_size);
|
||||
*prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info);
|
||||
if (IS_ERR(*prz)) {
|
||||
int err = PTR_ERR(*prz);
|
||||
|
||||
|
|
@ -407,7 +415,7 @@ static int ramoops_probe(struct platform_device *pdev)
|
|||
cxt->console_size = pdata->console_size;
|
||||
cxt->ftrace_size = pdata->ftrace_size;
|
||||
cxt->dump_oops = pdata->dump_oops;
|
||||
cxt->ecc_size = pdata->ecc_size;
|
||||
cxt->ecc_info = pdata->ecc_info;
|
||||
|
||||
paddr = cxt->phys_addr;
|
||||
|
||||
|
|
@ -465,9 +473,9 @@ static int ramoops_probe(struct platform_device *pdev)
|
|||
record_size = pdata->record_size;
|
||||
dump_oops = pdata->dump_oops;
|
||||
|
||||
pr_info("attached 0x%lx@0x%llx, ecc: %d\n",
|
||||
pr_info("attached 0x%lx@0x%llx, ecc: %d/%d\n",
|
||||
cxt->size, (unsigned long long)cxt->phys_addr,
|
||||
cxt->ecc_size);
|
||||
cxt->ecc_info.ecc_size, cxt->ecc_info.block_size);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
@ -539,7 +547,7 @@ static void ramoops_register_dummy(void)
|
|||
* For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
|
||||
* (using 1 byte for ECC isn't much of use anyway).
|
||||
*/
|
||||
dummy_data->ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
|
||||
dummy_data->ecc_info.ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
|
||||
|
||||
dummy = platform_device_register_data(NULL, "ramoops", -1,
|
||||
dummy_data, sizeof(struct ramoops_platform_data));
|
||||
|
|
|
|||
|
|
@ -82,12 +82,12 @@ static void notrace persistent_ram_encode_rs8(struct persistent_ram_zone *prz,
|
|||
uint8_t *data, size_t len, uint8_t *ecc)
|
||||
{
|
||||
int i;
|
||||
uint16_t par[prz->ecc_size];
|
||||
uint16_t par[prz->ecc_info.ecc_size];
|
||||
|
||||
/* Initialize the parity buffer */
|
||||
memset(par, 0, sizeof(par));
|
||||
encode_rs8(prz->rs_decoder, data, len, par, 0);
|
||||
for (i = 0; i < prz->ecc_size; i++)
|
||||
for (i = 0; i < prz->ecc_info.ecc_size; i++)
|
||||
ecc[i] = par[i];
|
||||
}
|
||||
|
||||
|
|
@ -95,9 +95,9 @@ static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz,
|
|||
void *data, size_t len, uint8_t *ecc)
|
||||
{
|
||||
int i;
|
||||
uint16_t par[prz->ecc_size];
|
||||
uint16_t par[prz->ecc_info.ecc_size];
|
||||
|
||||
for (i = 0; i < prz->ecc_size; i++)
|
||||
for (i = 0; i < prz->ecc_info.ecc_size; i++)
|
||||
par[i] = ecc[i];
|
||||
return decode_rs8(prz->rs_decoder, data, par, len,
|
||||
NULL, 0, NULL, 0, NULL);
|
||||
|
|
@ -110,15 +110,15 @@ static void notrace persistent_ram_update_ecc(struct persistent_ram_zone *prz,
|
|||
uint8_t *buffer_end = buffer->data + prz->buffer_size;
|
||||
uint8_t *block;
|
||||
uint8_t *par;
|
||||
int ecc_block_size = prz->ecc_block_size;
|
||||
int ecc_size = prz->ecc_size;
|
||||
int size = prz->ecc_block_size;
|
||||
int ecc_block_size = prz->ecc_info.block_size;
|
||||
int ecc_size = prz->ecc_info.ecc_size;
|
||||
int size = ecc_block_size;
|
||||
|
||||
if (!prz->ecc_size)
|
||||
if (!ecc_size)
|
||||
return;
|
||||
|
||||
block = buffer->data + (start & ~(ecc_block_size - 1));
|
||||
par = prz->par_buffer + (start / ecc_block_size) * prz->ecc_size;
|
||||
par = prz->par_buffer + (start / ecc_block_size) * ecc_size;
|
||||
|
||||
do {
|
||||
if (block + ecc_block_size > buffer_end)
|
||||
|
|
@ -133,7 +133,7 @@ static void persistent_ram_update_header_ecc(struct persistent_ram_zone *prz)
|
|||
{
|
||||
struct persistent_ram_buffer *buffer = prz->buffer;
|
||||
|
||||
if (!prz->ecc_size)
|
||||
if (!prz->ecc_info.ecc_size)
|
||||
return;
|
||||
|
||||
persistent_ram_encode_rs8(prz, (uint8_t *)buffer, sizeof(*buffer),
|
||||
|
|
@ -146,14 +146,14 @@ static void persistent_ram_ecc_old(struct persistent_ram_zone *prz)
|
|||
uint8_t *block;
|
||||
uint8_t *par;
|
||||
|
||||
if (!prz->ecc_size)
|
||||
if (!prz->ecc_info.ecc_size)
|
||||
return;
|
||||
|
||||
block = buffer->data;
|
||||
par = prz->par_buffer;
|
||||
while (block < buffer->data + buffer_size(prz)) {
|
||||
int numerr;
|
||||
int size = prz->ecc_block_size;
|
||||
int size = prz->ecc_info.block_size;
|
||||
if (block + size > buffer->data + prz->buffer_size)
|
||||
size = buffer->data + prz->buffer_size - block;
|
||||
numerr = persistent_ram_decode_rs8(prz, block, size, par);
|
||||
|
|
@ -166,44 +166,49 @@ static void persistent_ram_ecc_old(struct persistent_ram_zone *prz)
|
|||
block);
|
||||
prz->bad_blocks++;
|
||||
}
|
||||
block += prz->ecc_block_size;
|
||||
par += prz->ecc_size;
|
||||
block += prz->ecc_info.block_size;
|
||||
par += prz->ecc_info.ecc_size;
|
||||
}
|
||||
}
|
||||
|
||||
static int persistent_ram_init_ecc(struct persistent_ram_zone *prz,
|
||||
int ecc_size)
|
||||
struct persistent_ram_ecc_info *ecc_info)
|
||||
{
|
||||
int numerr;
|
||||
struct persistent_ram_buffer *buffer = prz->buffer;
|
||||
int ecc_blocks;
|
||||
size_t ecc_total;
|
||||
int ecc_symsize = 8;
|
||||
int ecc_poly = 0x11d;
|
||||
|
||||
if (!ecc_size)
|
||||
if (!ecc_info || !ecc_info->ecc_size)
|
||||
return 0;
|
||||
|
||||
prz->ecc_block_size = 128;
|
||||
prz->ecc_size = ecc_size;
|
||||
prz->ecc_info.block_size = ecc_info->block_size ?: 128;
|
||||
prz->ecc_info.ecc_size = ecc_info->ecc_size ?: 16;
|
||||
prz->ecc_info.symsize = ecc_info->symsize ?: 8;
|
||||
prz->ecc_info.poly = ecc_info->poly ?: 0x11d;
|
||||
|
||||
ecc_blocks = DIV_ROUND_UP(prz->buffer_size, prz->ecc_block_size);
|
||||
ecc_total = (ecc_blocks + 1) * prz->ecc_size;
|
||||
ecc_blocks = DIV_ROUND_UP(prz->buffer_size - prz->ecc_info.ecc_size,
|
||||
prz->ecc_info.block_size +
|
||||
prz->ecc_info.ecc_size);
|
||||
ecc_total = (ecc_blocks + 1) * prz->ecc_info.ecc_size;
|
||||
if (ecc_total >= prz->buffer_size) {
|
||||
pr_err("%s: invalid ecc_size %u (total %zu, buffer size %zu)\n",
|
||||
__func__, prz->ecc_size, ecc_total, prz->buffer_size);
|
||||
__func__, prz->ecc_info.ecc_size,
|
||||
ecc_total, prz->buffer_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
prz->buffer_size -= ecc_total;
|
||||
prz->par_buffer = buffer->data + prz->buffer_size;
|
||||
prz->par_header = prz->par_buffer + ecc_blocks * prz->ecc_size;
|
||||
prz->par_header = prz->par_buffer +
|
||||
ecc_blocks * prz->ecc_info.ecc_size;
|
||||
|
||||
/*
|
||||
* first consecutive root is 0
|
||||
* primitive element to generate roots = 1
|
||||
*/
|
||||
prz->rs_decoder = init_rs(ecc_symsize, ecc_poly, 0, 1, prz->ecc_size);
|
||||
prz->rs_decoder = init_rs(prz->ecc_info.symsize, prz->ecc_info.poly,
|
||||
0, 1, prz->ecc_info.ecc_size);
|
||||
if (prz->rs_decoder == NULL) {
|
||||
pr_info("persistent_ram: init_rs failed\n");
|
||||
return -EINVAL;
|
||||
|
|
@ -230,6 +235,9 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
|
|||
{
|
||||
ssize_t ret;
|
||||
|
||||
if (!prz->ecc_info.ecc_size)
|
||||
return 0;
|
||||
|
||||
if (prz->corrected_bytes || prz->bad_blocks)
|
||||
ret = snprintf(str, len, ""
|
||||
"\n%d Corrected bytes, %d unrecoverable blocks\n",
|
||||
|
|
@ -391,11 +399,11 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
|
|||
}
|
||||
|
||||
static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig,
|
||||
int ecc_size)
|
||||
struct persistent_ram_ecc_info *ecc_info)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = persistent_ram_init_ecc(prz, ecc_size);
|
||||
ret = persistent_ram_init_ecc(prz, ecc_info);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
@ -444,7 +452,7 @@ void persistent_ram_free(struct persistent_ram_zone *prz)
|
|||
}
|
||||
|
||||
struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
|
||||
u32 sig, int ecc_size)
|
||||
u32 sig, struct persistent_ram_ecc_info *ecc_info)
|
||||
{
|
||||
struct persistent_ram_zone *prz;
|
||||
int ret = -ENOMEM;
|
||||
|
|
@ -459,7 +467,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
|
|||
if (ret)
|
||||
goto err;
|
||||
|
||||
ret = persistent_ram_post_init(prz, sig, ecc_size);
|
||||
ret = persistent_ram_post_init(prz, sig, ecc_info);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,13 @@
|
|||
struct persistent_ram_buffer;
|
||||
struct rs_control;
|
||||
|
||||
struct persistent_ram_ecc_info {
|
||||
int block_size;
|
||||
int ecc_size;
|
||||
int symsize;
|
||||
int poly;
|
||||
};
|
||||
|
||||
struct persistent_ram_zone {
|
||||
phys_addr_t paddr;
|
||||
size_t size;
|
||||
|
|
@ -39,15 +46,14 @@ struct persistent_ram_zone {
|
|||
struct rs_control *rs_decoder;
|
||||
int corrected_bytes;
|
||||
int bad_blocks;
|
||||
int ecc_block_size;
|
||||
int ecc_size;
|
||||
struct persistent_ram_ecc_info ecc_info;
|
||||
|
||||
char *old_log;
|
||||
size_t old_log_size;
|
||||
};
|
||||
|
||||
struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
|
||||
u32 sig, int ecc_size);
|
||||
u32 sig, struct persistent_ram_ecc_info *ecc_info);
|
||||
void persistent_ram_free(struct persistent_ram_zone *prz);
|
||||
void persistent_ram_zap(struct persistent_ram_zone *prz);
|
||||
|
||||
|
|
@ -74,7 +80,7 @@ struct ramoops_platform_data {
|
|||
unsigned long console_size;
|
||||
unsigned long ftrace_size;
|
||||
int dump_oops;
|
||||
int ecc_size;
|
||||
struct persistent_ram_ecc_info ecc_info;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue