From nobody Wed Oct 8 23:45:35 2025 Received: from mail.nfschina.com (unknown [42.101.60.213]) by smtp.subspace.kernel.org (Postfix) with SMTP id 7CA04AD2C; Mon, 23 Jun 2025 11:25:52 +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=1750677959; cv=none; b=gyxFhsuiadAWj/xfAoQObkcbkxetojHXhCZZzJeVFhV5FykXYtsKgQMfPCEai+tmTc9nUFXEIsUYQSFxXbgr9Vvhhvacc00dtJxOT3DmaQQQOA/leeLYEaB88eEj3JZSH96WtWcNIGFK8M8Cx2F24L91KMajlnjrvA0iCBSLQFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750677959; c=relaxed/simple; bh=JqNLDEah2GOKHVU7TafHOvabicOGp61hHYVVC6ESmGw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=n/m1522fZ4K5gcvp5GMoQnZRYHZ7aFaaHMVcl6H02BQJxSjGyKAqI7j6lKzGYS6niFN8jaiMToQbMTaRkEvsQ9m8NPNedk7GMSxc9o90Mv7eCQR3orXqznhqSUDYQmw9Z9vPP5EZ+K7wg3qCtrkytpCAOad/q+09daeLThY4C2E= 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 E060E60303EF0; Mon, 23 Jun 2025 19:25:47 +0800 (CST) X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: tony.luck@intel.com, reinette.chatre@intel.com, Dave.Martin@arm.com, james.morse@arm.com Cc: Su Hui , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] fs/resctrl: using guard to simplify lock/unlock code Date: Mon, 23 Jun 2025 19:25:41 +0800 Message-Id: <20250623112540.3581675-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" Using guard() to replace *unlock* label. guard() is better than goto unlock patterns and is more concise. No functional changes. Signed-off-by: Su Hui --- fs/resctrl/monitor.c | 25 ++++++++----------------- fs/resctrl/rdtgroup.c | 29 +++++++++-------------------- 2 files changed, 17 insertions(+), 37 deletions(-) diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c index f5637855c3ac..12e999eb7ed8 100644 --- a/fs/resctrl/monitor.c +++ b/fs/resctrl/monitor.c @@ -769,10 +769,10 @@ static int dom_data_init(struct rdt_resource *r) u32 idx_limit =3D resctrl_arch_system_num_rmid_idx(); u32 num_closid =3D resctrl_arch_get_num_closid(r); struct rmid_entry *entry =3D NULL; - int err =3D 0, i; + int i; u32 idx; =20 - mutex_lock(&rdtgroup_mutex); + guard(mutex)(&rdtgroup_mutex); if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { u32 *tmp; =20 @@ -783,10 +783,8 @@ static int dom_data_init(struct rdt_resource *r) * use. */ tmp =3D kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL); - if (!tmp) { - err =3D -ENOMEM; - goto out_unlock; - } + if (!tmp) + return -ENOMEM; =20 closid_num_dirty_rmid =3D tmp; } @@ -797,8 +795,7 @@ static int dom_data_init(struct rdt_resource *r) kfree(closid_num_dirty_rmid); closid_num_dirty_rmid =3D NULL; } - err =3D -ENOMEM; - goto out_unlock; + return -ENOMEM; } =20 for (i =3D 0; i < idx_limit; i++) { @@ -819,18 +816,15 @@ static int dom_data_init(struct rdt_resource *r) entry =3D __rmid_entry(idx); list_del(&entry->list); =20 -out_unlock: - mutex_unlock(&rdtgroup_mutex); - - return err; + return 0; } =20 static void dom_data_exit(struct rdt_resource *r) { - mutex_lock(&rdtgroup_mutex); + guard(mutex)(&rdtgroup_mutex); =20 if (!r->mon_capable) - goto out_unlock; + return; =20 if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { kfree(closid_num_dirty_rmid); @@ -839,9 +833,6 @@ static void dom_data_exit(struct rdt_resource *r) =20 kfree(rmid_ptrs); rmid_ptrs =3D NULL; - -out_unlock: - mutex_unlock(&rdtgroup_mutex); } =20 static struct mon_evt llc_occupancy_event =3D { diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index 77d08229d855..73bc1ab05b5e 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -916,14 +916,13 @@ int proc_resctrl_show(struct seq_file *s, struct pid_= namespace *ns, struct pid *pid, struct task_struct *tsk) { struct rdtgroup *rdtg; - int ret =3D 0; =20 - mutex_lock(&rdtgroup_mutex); + guard(mutex)(&rdtgroup_mutex); =20 /* Return empty if resctrl has not been mounted. */ if (!resctrl_mounted) { seq_puts(s, "res:\nmon:\n"); - goto unlock; + return 0; } =20 list_for_each_entry(rdtg, &rdt_all_groups, rdtgroup_list) { @@ -952,17 +951,13 @@ int proc_resctrl_show(struct seq_file *s, struct pid_= namespace *ns, break; } seq_putc(s, '\n'); - goto unlock; + return 0; } /* * The above search should succeed. Otherwise return * with an error. */ - ret =3D -ENOENT; -unlock: - mutex_unlock(&rdtgroup_mutex); - - return ret; + return -ENOENT; } #endif =20 @@ -4132,11 +4127,11 @@ int resctrl_online_mon_domain(struct rdt_resource *= r, struct rdt_mon_domain *d) { int err; =20 - mutex_lock(&rdtgroup_mutex); + guard(mutex)(&rdtgroup_mutex); =20 err =3D domain_setup_mon_state(r, d); if (err) - goto out_unlock; + return err; =20 if (resctrl_is_mbm_enabled()) { INIT_DELAYED_WORK(&d->mbm_over, mbm_handle_overflow); @@ -4156,10 +4151,7 @@ int resctrl_online_mon_domain(struct rdt_resource *r= , struct rdt_mon_domain *d) if (resctrl_mounted && resctrl_arch_mon_capable()) mkdir_mondata_subdir_allrdtgrp(r, d); =20 -out_unlock: - mutex_unlock(&rdtgroup_mutex); - - return err; + return 0; } =20 void resctrl_online_cpu(unsigned int cpu) @@ -4202,7 +4194,7 @@ void resctrl_offline_cpu(unsigned int cpu) struct rdt_mon_domain *d; struct rdtgroup *rdtgrp; =20 - mutex_lock(&rdtgroup_mutex); + guard(mutex)(&rdtgroup_mutex); list_for_each_entry(rdtgrp, &rdt_all_groups, rdtgroup_list) { if (cpumask_test_and_clear_cpu(cpu, &rdtgrp->cpu_mask)) { clear_childcpus(rdtgrp, cpu); @@ -4211,7 +4203,7 @@ void resctrl_offline_cpu(unsigned int cpu) } =20 if (!l3->mon_capable) - goto out_unlock; + return; =20 d =3D get_mon_domain_from_cpu(cpu, l3); if (d) { @@ -4225,9 +4217,6 @@ void resctrl_offline_cpu(unsigned int cpu) cqm_setup_limbo_handler(d, 0, cpu); } } - -out_unlock: - mutex_unlock(&rdtgroup_mutex); } =20 /* --=20 2.30.2