From patchwork Sun Dec 31 07:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 184094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3402845dyb; Sat, 30 Dec 2023 23:29:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXWdER9mq84sUdITre+ZZm4pKsx+lvRKPe8RA1jg0N+eCJBBykFtGW/LL5NjClJCf8qjm0 X-Received: by 2002:a05:622a:1441:b0:425:4054:bc47 with SMTP id v1-20020a05622a144100b004254054bc47mr18037124qtx.35.1704007742473; Sat, 30 Dec 2023 23:29:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704007742; cv=none; d=google.com; s=arc-20160816; b=r6K21q0uvnlqu91u+N5Ms9frgPAkMbltEaDYHo6jgms7XXRBB4xUwsXGITqQswAyHO P9QUIjw7CnJ7ifeGnzZalRv3g0tO50Od+XJr0Xk6J7X2Wo+M1XLZjRsR8hy/Lv6ppj+f v9u9ZebUmL0VPd/eyHO7rEKxWObjOPJGC4R+Epc6ZW2LnDm+J2oBwEcW+oB8cB+cL/PR enIao1Ytiim6wESyj8h30vmpT8F5f4Bodssy9waMJdg4kiGctIdQy3OdCFPPYo0LDY/6 w4oRM3yFtar7CE6t2b3EJlRpecAh7SkDwnUtd+trWzroiVoi+L1y3qNP3K/V09qHxqDl T6Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:subject:from:cc :content-language:to:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=banR3g8EbH9yourjxopLyAzCV0T6Fqvhb3Wbf3LDQv0=; fh=yWb7c5p4VgAwEBbILEKljyC9DtnJlngE7TiHqYRtp/k=; b=UCoTzFwXgWce5Z3qDJtIlkQr9fpO5tnmZ989YzT0TMgSKO/iEDETBOVL/LMoOtRynv /JF/6LEKa4CFeoMQfl7bEYQnydttGkCguuOv33p+5yKxLqt0G6LRMNuNDbOK2fe410l7 KCh5V0aW51LWbCGEfedeIkmQ9fDnwsufY5+ugFOrvhxmIBgcRMyjMTNoQzF7RHc7TCLG T3kwYY82uZD5/hM40d0jV2o2SdpQMmKKUThUK7wqvzTyKb94mT+Hdq/DU4BX6gEXiuHo UxW6qxIo57Xc1+0fisfTHGfnACMuwsOqrJ/M4dG7Tl+gPp33+OHyv0gPkhLGLWZwLXtG GlEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=ELwpUcpY; spf=pass (google.com: domain of linux-kernel+bounces-13648-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13648-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w14-20020ac87e8e000000b004281105462asi2598460qtj.16.2023.12.30.23.29.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Dec 2023 23:29:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13648-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=ELwpUcpY; spf=pass (google.com: domain of linux-kernel+bounces-13648-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13648-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4745F1C219AD for ; Sun, 31 Dec 2023 07:29:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 405CA2F58; Sun, 31 Dec 2023 07:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=web.de header.i=markus.elfring@web.de header.b="ELwpUcpY" X-Original-To: linux-kernel@vger.kernel.org Received: from mout.web.de (mout.web.de [212.227.15.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C55C17C2; Sun, 31 Dec 2023 07:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1704007702; x=1704612502; i=markus.elfring@web.de; bh=PcBUvluZb/BvdgF7ktzLibEt8A6a4VGufG/N/XU2tBU=; h=X-UI-Sender-Class:Date:To:Cc:From:Subject; b=ELwpUcpYPoNstTo91UNCbohC7BFOMxxWrqAkEmEOqjWz3nqiDvzL2I3euvfKyNmI nPi3A5ivgBq/LZiGsIH+l6YnzuXg1opvuAi7X/4VvtW7ALscdj5B/jiaihEIzg0lz VORijwlqpsLv+KQaO2212muYJ6Cg9HbiH2txaffdryuEpvzZ7xoU0z08mFzTcL4ox fF8zl/KPXt/VQjrzzIs3E03Qxl3P27dx7FEcVQ7sRTvlHWN3wOEyREq5yBH0YydYI fbAACO6kC25hBxQ7qjDYWo1MaXkovH0U3VBByJSjb0IKAGyhK9namzw9ZeDnWb9Va LA0hLj24xtUhjcSbZQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.90.95]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MkVwo-1qxSnY0oKE-00mBMi; Sun, 31 Dec 2023 08:28:22 +0100 Message-ID: <53be5f98-6359-48b5-955e-fd203d99d3cb@web.de> Date: Sun, 31 Dec 2023 08:28:08 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: cgroups@vger.kernel.org, kernel-janitors@vger.kernel.org, Johannes Weiner , Tejun Heo , Waiman Long , Zefan Li Content-Language: en-GB Cc: LKML From: Markus Elfring Subject: [PATCH] cgroup/cpuset: Adjust exception handling in generate_sched_domains() X-Provags-ID: V03:K1:pgnSzo2W+vneiGpO38IiNDAlEaIXKSMMACiIapp8BWsnXekDcdT PbTKnujXFwSFjr6dNhr2LWeXpGIYfELudkL0U/datOqgwQAGOG/p9DwHtGBFh/9TQQafMBx pd+MTC5ua7UFSk/OLfcvENKiCpoFoOWzzkxvHQ+qqoVir1t+VcPONx+YOK5gSR+1EnqEaYv 0Fq2o9AvO1SPmzhnL2LyA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:MF8NwxLMoUE=;Vth/hMGB+E6eKMV2W7MGJ4MxLZ9 hf387lQW9S4mRbLHw+Wk1eXh7IbH+bgBJcy+74ziZppgtw0VnnxAe5jSfvj68WT4yCJJ/Nwvc BWJ8IKnFwUDWr2Kk70SQv2jfBC3WA6dZPSjPXCb+esuBBnLv4YTDuBhQigtyV+y0Za3A10B7A yxAq/Fk+Jmim1yWVSd5OBavzsMkvdSjw9V3xIz5/cVckRMsEIgheJT3wFUqxKTZNpG5t32mcD ggFRvYvU2FysZZp0bB6dShfetu8WG1oot+Kw62+/MVsh35d8/UKxNvZu1nmD1aQC5kPFwh19n TEmjEgHyRG2oPSMt5VXucXMoHBS6l+HuGcI1OUk917w28P1DWe5nXfCuhhrZHp5IFPvGXtaRe MPUjozzfWjDMuT5F7TKq4A/rICf6lRPeWfhSB1brZp8x72mfmQX3E4hmM0RN3SPku4Fro6kjt VPN8BRJJP+jg/+KqDgIYxt7OC1L9F9oHSMtJ9xALb9kv7ftI5A14kT/9u5E8m5RcZfBfUq7Ob 4TrJM7zUO4dImuHeG7tmPDlDeKTrH2RhgBCia8zAlLdHTh9h59+MWSXsD6QP6Frl1ZkkRnhYc B76CGZ6ZHAyKp31HgPvYCYw6SOoXHzKc2BWKRGFXu1gaborbduJsWr02wcmKT7wnXORtwM/Ul dCRVeLp1kzUfsFUq4iC8Cj2ve5zwMG+zly/IfCUpF4q7Fdu2AxS/zJsC6Kvom89eGf8twuRb6 4jdUSIsetjqDbx910SJ/COQuAeUSNqHW0w/6HO7YQMYmsjYE34UAxFrGOVbGAJUDrRP616MyE AgikrA491MEz8xjVuqhULxPJ/BrThtIt4OrEZz8nnv5YIrTf3j79DA+CKuryk/mx5MeXcEKeT 7z35aZi/HPSiirS9mGKOQ4ychsjertrc23Jb4ZLEVaRdgUobNWgsbRFS3Fv8APXd+S5im2PiT uy8gWQ== X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786781622028182301 X-GMAIL-MSGID: 1786781622028182301 From: Markus Elfring 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 --- kernel/cgroup/cpuset.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.43.0 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;