From: Su Hui <suhui@nfschina.com>
To: Dan Carpenter <dan.carpenter@linaro.org>
Cc: akpm@linux-foundation.org, bhe@redhat.com, vgoyal@redhat.com,
dyoung@redhat.com, kexec@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
kernel-janitors@vger.kernel.org, Su Hui <suhui@nfschina.com>
Subject: Re: [PATCH] fs/proc/vmcore: a few cleanups for vmcore_add_device_dump
Date: Tue, 24 Jun 2025 10:20:35 +0800 [thread overview]
Message-ID: <ac035aaa-f7b4-42a6-8f5c-e0a93faf5c6b@nfschina.com> (raw)
In-Reply-To: <33a9a2a5-a725-4ab0-865c-1d26e941e054@suswa.mountain>
On 2025/6/23 23:06, Dan Carpenter wrote:
> On Mon, Jun 23, 2025 at 06:47:05PM +0800, Su Hui wrote:
>> There are three cleanups for vmcore_add_device_dump(). Adjust data_size's
>> type from 'size_t' to 'unsigned int' for the consistency of data->size.
>> Return -ENOMEM directly rather than goto the label to simplify the code.
>> Using scoped_guard() to simplify the lock/unlock code.
>>
>> Signed-off-by: Su Hui <suhui@nfschina.com>
>> ---
>> fs/proc/vmcore.c | 33 ++++++++++++++-------------------
>> 1 file changed, 14 insertions(+), 19 deletions(-)
>>
>> diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
>> index 10d01eb09c43..9ac2863c68d8 100644
>> --- a/fs/proc/vmcore.c
>> +++ b/fs/proc/vmcore.c
>> @@ -1477,7 +1477,7 @@ int vmcore_add_device_dump(struct vmcoredd_data *data)
>> {
>> struct vmcoredd_node *dump;
>> void *buf = NULL;
>> - size_t data_size;
>> + unsigned int data_size;
>> int ret;
> This was in reverse Christmas tree order before. Move the data_size
> declaration up a line.
>
> long long_variable_name;
> medium variable_name;
> short name;
Got it, and this 'usgined int' will be removed because of 'size_t' can
avoid overflow in some case.
>>
>> if (vmcoredd_disabled) {
>> @@ -1490,10 +1490,8 @@ int vmcore_add_device_dump(struct vmcoredd_data *data)
>> return -EINVAL;
>>
>> dump = vzalloc(sizeof(*dump));
>> - if (!dump) {
>> - ret = -ENOMEM;
>> - goto out_err;
>> - }
>> + if (!dump)
>> + return -ENOMEM;
>>
>> /* Keep size of the buffer page aligned so that it can be mmaped */
>> data_size = roundup(sizeof(struct vmcoredd_header) + data->size,
>> @@ -1519,21 +1517,18 @@ int vmcore_add_device_dump(struct vmcoredd_data *data)
>> dump->size = data_size;
>>
>> /* Add the dump to driver sysfs list and update the elfcore hdr */
>> - mutex_lock(&vmcore_mutex);
>> - if (vmcore_opened)
>> - pr_warn_once("Unexpected adding of device dump\n");
>> - if (vmcore_open) {
>> - ret = -EBUSY;
>> - goto unlock;
>> - }
>> -
>> - list_add_tail(&dump->list, &vmcoredd_list);
>> - vmcoredd_update_size(data_size);
>> - mutex_unlock(&vmcore_mutex);
>> - return 0;
>> + scoped_guard(mutex, &vmcore_mutex) {
>> + if (vmcore_opened)
>> + pr_warn_once("Unexpected adding of device dump\n");
>> + if (vmcore_open) {
>> + ret = -EBUSY;
>> + goto out_err;
>> + }
>>
>> -unlock:
>> - mutex_unlock(&vmcore_mutex);
>> + list_add_tail(&dump->list, &vmcoredd_list);
>> + vmcoredd_update_size(data_size);
>> + return 0;
> Please, move this "return 0;" out of the scoped_guard(). Otherwise
> it's not obvious that we return zero on the success path.
Yes, it's better. Will update in v2 patch.
Thanks again!
Regards,
Su Hui
prev parent reply other threads:[~2025-06-24 2:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-23 10:47 Su Hui
2025-06-23 14:36 ` Baoquan He
2025-06-23 15:22 ` Dan Carpenter
2025-06-24 2:14 ` Su Hui
2025-06-23 15:06 ` Dan Carpenter
2025-06-24 2:20 ` Su Hui [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ac035aaa-f7b4-42a6-8f5c-e0a93faf5c6b@nfschina.com \
--to=suhui@nfschina.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=dan.carpenter@linaro.org \
--cc=dyoung@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kexec@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®