From nobody Wed Oct 8 23:45:34 2025 Received: from mail.nfschina.com (unknown [42.101.60.213]) by smtp.subspace.kernel.org (Postfix) with SMTP id BCB12136988; Mon, 23 Jun 2025 10:47:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=42.101.60.213 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750675665; cv=none; b=ZN4BRkW4fHKp/QBG8yIiUYHag3y31/ZRHUz8jgV+6EDIUNTBpsjNop8P0CtEee7JwwlN+aiDY40EZEMZubXIP28Y55F/lSnmRvfVQwnJNx3lcfrIFpWfsniBv8Z9o8U98sfKKzl5kCY6bgrLLUpnYQ+sLungg4Pn+La3kXNYeRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750675665; c=relaxed/simple; bh=yY64zDwdRCY42XgnhSwxhXqXaXXDuygVgFzhpdlOqD0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=toLHrg2eUFl9XuEYAAeTcr2TQEHj7D7FkUuXinHJbpQgbvbsxtRiMB1uw5IKQQo4KbsGHkeUux9NhaSiT3lB40CC+psjrouVzYW1SV70u6chCB/97eg/cBVyfpRshHk7JLyNJjuM2UjaM5W0RLnkPthSmgxwhi8JljNzEUzL6ow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nfschina.com; spf=pass smtp.mailfrom=nfschina.com; arc=none smtp.client-ip=42.101.60.213 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nfschina.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nfschina.com Received: from longsh.shanghai.nfschina.local (unknown [180.167.10.98]) by mail.nfschina.com (MailData Gateway V2.8.8) with ESMTPSA id 75C08602FE8D8; Mon, 23 Jun 2025 18:47:29 +0800 (CST) X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: akpm@linux-foundation.org, bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com Cc: Su Hui , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] fs/proc/vmcore: a few cleanups for vmcore_add_device_dump Date: Mon, 23 Jun 2025 18:47:05 +0800 Message-Id: <20250623104704.3489471-1-suhui@nfschina.com> X-Mailer: git-send-email 2.30.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 =3D NULL; - size_t data_size; + unsigned int data_size; int ret; =20 if (vmcoredd_disabled) { @@ -1490,10 +1490,8 @@ int vmcore_add_device_dump(struct vmcoredd_data *dat= a) return -EINVAL; =20 dump =3D vzalloc(sizeof(*dump)); - if (!dump) { - ret =3D -ENOMEM; - goto out_err; - } + if (!dump) + return -ENOMEM; =20 /* Keep size of the buffer page aligned so that it can be mmaped */ data_size =3D roundup(sizeof(struct vmcoredd_header) + data->size, @@ -1519,21 +1517,18 @@ int vmcore_add_device_dump(struct vmcoredd_data *da= ta) dump->size =3D data_size; =20 /* 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 =3D -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 =3D -EBUSY; + goto out_err; + } =20 -unlock: - mutex_unlock(&vmcore_mutex); + list_add_tail(&dump->list, &vmcoredd_list); + vmcoredd_update_size(data_size); + return 0; + } =20 out_err: vfree(buf); --=20 2.30.2