2015-02-10 10:27:49

by Kiran Kumar

[permalink] [raw]
Subject: [RFC] pstore-ram: remove superfluous memory size check

From: Mark Salyzyn <[email protected]>

pstore-ram: remove superfluous memory size check

All previous checks will fail with error if memory size
is not sufficient to register a zone, so this legacy
check has become redundant.

Cc: Anton Vorontsov <[email protected]>
Cc: Colin Cross <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: [email protected]
Signed-off-by: Mark Salyzyn <[email protected]>
[Kiran: Added Context]
Signed-off-by: Kiran Raparthy <[email protected]>

---
This is one of the number of patches from the Android AOSP common.git tree,
which is used on Android devices. I wanted to submit it for review
to see if it should go upstream.

fs/pstore/ram.c | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 8613e5b..34ed8f8 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -474,14 +474,6 @@ static int ramoops_probe(struct platform_device *pdev)
if (err)
goto fail_init_fprz;

- if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
- pr_err("memory size too small, minimum is %zu\n",
- cxt->console_size + cxt->record_size +
- cxt->ftrace_size);
- err = -EINVAL;
- goto fail_cnt;
- }
-
cxt->pstore.data = cxt;
/*
* Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
@@ -525,7 +517,6 @@ fail_buf:
kfree(cxt->pstore.buf);
fail_clear:
cxt->pstore.bufsize = 0;
-fail_cnt:
kfree(cxt->fprz);
fail_init_fprz:
kfree(cxt->cprz);
--
1.8.2.1


2015-02-10 17:08:41

by Mark Salyzyn

[permalink] [raw]
Subject: Re: [RFC] pstore-ram: remove superfluous memory size check

Please refer to '[PATCH v2 2/5] pstore: remove superfluous memory size
check'

Sincerely -- Mark Salyzyn

On 02/10/2015 02:26 AM, Kiran Raparthy wrote:
> From: Mark Salyzyn <[email protected]>
>
> pstore-ram: remove superfluous memory size check
>
> All previous checks will fail with error if memory size
> is not sufficient to register a zone, so this legacy
> check has become redundant.
>
> Cc: Anton Vorontsov <[email protected]>
> Cc: Colin Cross <[email protected]>
> Cc: Kees Cook <[email protected]>
> Cc: Tony Luck <[email protected]>
> Cc: [email protected]
> Signed-off-by: Mark Salyzyn <[email protected]>
> [Kiran: Added Context]
> Signed-off-by: Kiran Raparthy <[email protected]>
>
> ---
> This is one of the number of patches from the Android AOSP common.git tree,
> which is used on Android devices. I wanted to submit it for review
> to see if it should go upstream.
> [PATCH v2 2/5] pstore: remove superfluous memory size check
> fs/pstore/ram.c | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
> index 8613e5b..34ed8f8 100644
> --- a/fs/pstore/ram.c
> +++ b/fs/pstore/ram.c
> @@ -474,14 +474,6 @@ static int ramoops_probe(struct platform_device *pdev)
> if (err)
> goto fail_init_fprz;
>
> - if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
> - pr_err("memory size too small, minimum is %zu\n",
> - cxt->console_size + cxt->record_size +
> - cxt->ftrace_size);
> - err = -EINVAL;
> - goto fail_cnt;
> - }
> -
> cxt->pstore.data = cxt;
> /*
> * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
> @@ -525,7 +517,6 @@ fail_buf:
> kfree(cxt->pstore.buf);
> fail_clear:
> cxt->pstore.bufsize = 0;
> -fail_cnt:
> kfree(cxt->fprz);
> fail_init_fprz:
> kfree(cxt->cprz);

2015-02-11 04:50:11

by Kiran Kumar

[permalink] [raw]
Subject: Re: [RFC] pstore-ram: remove superfluous memory size check

On Tue, Feb 10, 2015 at 10:38 PM, Mark Salyzyn <[email protected]> wrote:
>
> Please refer to '[PATCH v2 2/5] pstore: remove superfluous memory size check'

Cool,thanks for pointing.
Regards,
Kiran

>
> Sincerely -- Mark Salyzyn
>
> On 02/10/2015 02:26 AM, Kiran Raparthy wrote:
>>
>> From: Mark Salyzyn <[email protected]>
>>
>> pstore-ram: remove superfluous memory size check
>>
>> All previous checks will fail with error if memory size
>> is not sufficient to register a zone, so this legacy
>> check has become redundant.
>>
>> Cc: Anton Vorontsov <[email protected]>
>> Cc: Colin Cross <[email protected]>
>> Cc: Kees Cook <[email protected]>
>> Cc: Tony Luck <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Mark Salyzyn <[email protected]>
>> [Kiran: Added Context]
>> Signed-off-by: Kiran Raparthy <[email protected]>
>>
>> ---
>> This is one of the number of patches from the Android AOSP common.git tree,
>> which is used on Android devices. I wanted to submit it for review
>> to see if it should go upstream.
>> [PATCH v2 2/5] pstore: remove superfluous memory size check
>>
>> fs/pstore/ram.c | 9 ---------
>> 1 file changed, 9 deletions(-)
>>
>> diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
>> index 8613e5b..34ed8f8 100644
>> --- a/fs/pstore/ram.c
>> +++ b/fs/pstore/ram.c
>> @@ -474,14 +474,6 @@ static int ramoops_probe(struct platform_device *pdev)
>> if (err)
>> goto fail_init_fprz;
>> - if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
>> - pr_err("memory size too small, minimum is %zu\n",
>> - cxt->console_size + cxt->record_size +
>> - cxt->ftrace_size);
>> - err = -EINVAL;
>> - goto fail_cnt;
>> - }
>> -
>> cxt->pstore.data = cxt;
>> /*
>> * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
>> @@ -525,7 +517,6 @@ fail_buf:
>> kfree(cxt->pstore.buf);
>> fail_clear:
>> cxt->pstore.bufsize = 0;
>> -fail_cnt:
>> kfree(cxt->fprz);
>> fail_init_fprz:
>> kfree(cxt->cprz);
>
>

2015-02-12 16:54:24

by Tony Luck

[permalink] [raw]
Subject: Re: [RFC] pstore-ram: remove superfluous memory size check

On Tue, Feb 10, 2015 at 8:50 PM, Kiran Kumar <[email protected]> wrote:
> On Tue, Feb 10, 2015 at 10:38 PM, Mark Salyzyn <[email protected]> wrote:
>>
>> Please refer to '[PATCH v2 2/5] pstore: remove superfluous memory size check'


FYI: Linus pulled the pstore branch - so this patch is now upstream.

-Tony