From: Markus Elfring <Markus.Elfring@web.de>
To: cgroups@vger.kernel.org, kernel-janitors@vger.kernel.org,
Johannes Weiner <hannes@cmpxchg.org>, Tejun Heo <tj@kernel.org>,
Waiman Long <longman@redhat.com>,
Zefan Li <lizefan.x@bytedance.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] cgroup/cpuset: Adjust exception handling in generate_sched_domains()
Date: Sun, 31 Dec 2023 08:28:08 +0100 [thread overview]
Message-ID: <53be5f98-6359-48b5-955e-fd203d99d3cb@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 31 Dec 2023 08:00:31 +0100
Two resource allocation failures triggered further actions
over the label “done” so far.
* Jump to the statement “ndoms = 1;” in three cases directly
by using the label “set_ndoms” instead.
* Delete an assignment for the variable “ndoms” in one if branch.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
kernel/cgroup/cpuset.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index ba36c073304a..29ccd52eb45c 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -973,10 +973,9 @@ static int generate_sched_domains(cpumask_var_t **domains,
/* Special case for the 99% of systems with one, full, sched domain */
if (root_load_balance && !top_cpuset.nr_subparts) {
- ndoms = 1;
doms = alloc_sched_domains(ndoms);
if (!doms)
- goto done;
+ goto set_ndoms;
dattr = kmalloc(sizeof(struct sched_domain_attr), GFP_KERNEL);
if (dattr) {
@@ -986,12 +985,12 @@ static int generate_sched_domains(cpumask_var_t **domains,
cpumask_and(doms[0], top_cpuset.effective_cpus,
housekeeping_cpumask(HK_TYPE_DOMAIN));
- goto done;
+ goto set_ndoms;
}
csa = kmalloc_array(nr_cpusets(), sizeof(cp), GFP_KERNEL);
if (!csa)
- goto done;
+ goto set_ndoms;
csn = 0;
rcu_read_lock();
@@ -1123,6 +1122,7 @@ static int generate_sched_domains(cpumask_var_t **domains,
* See comments in partition_sched_domains().
*/
if (doms == NULL)
+set_ndoms:
ndoms = 1;
*domains = doms;
--
2.43.0
next reply other threads:[~2023-12-31 7:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-31 7:28 Markus Elfring [this message]
2023-12-31 18:29 ` [PATCH] cgroup/cpuset: Adjust exception handling in generate_sched_domains() Waiman Long
2024-01-01 8:56 ` Markus Elfring
2024-01-01 16:26 ` Waiman Long
2024-01-10 15:01 ` kernel test robot
2024-01-10 15:21 ` Waiman Long
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=53be5f98-6359-48b5-955e-fd203d99d3cb@web.de \
--to=markus.elfring@web.de \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan.x@bytedance.com \
--cc=longman@redhat.com \
--cc=tj@kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).