From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792964733; b=MSiGtmd8X6uYlyMgG08nYRRh2q1Tyz6YGinnof3RZIGhkD3wTgnSvqy5EFQreoYiVSpG lkiaoNjrhqIdglh775tMspUiYu9/A8roex26YQelw/+p4ZPYuqN03l9T1tlrjrXEj0JGI eUhv51fes9Cb+nvnPkj+kf74jEAY8c2fFr3sQAD7BOse5PFrUmMxc4ms25cGUX3ypnJKm 60DIN1djy//B7JOlWLC/YJuijFbUvIJCbAVZmLjh1yn9FQauzgfqMj8q1pz4s5/2hvKEf /YurYa/ZtaqLmUreQZW/Cc6gAlqqmjhCT3CcHHW0Tu9MNSuh1RSk7fTgQN6FvgDGm1w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792964733; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:Received:From:To:Cc:Subject:Date: Message-ID:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Scanned-By; bh=4J8c+Hr5fTJH0BDfp7U8QsduNp0G3VxfVToMETDsmm0=; b=GYR/tHg2D8ZgGaoCatlblKfijJmYNyZ6h0HhxV4YLYrmSvLwpFQu1QYU9Js7EmpCuPCX hqS239Gk/VYEgA2GGmn58dbnLTl+3xBKFe9YWnCpS2TbOOhA/JWf8BCRd8+BORThVtVIK zrQcg6AsfrFntn9qh56odBKZKfg/PvcsMnJlmT5tpctD5t+3r6Y07kYHDFTYkTTNlBKQA 5R2o3U/GT6MRbW1xO7x+2+X7SSURmW4HFZCszkwU2HifSZM5mjjA0kKE+g2E2choCI4RO HLHcvjBk1jy9Jp6VtpEeBLnay4E2pfoAoyhXnARrtZ5HtmaIUTZk8hvwBgn8FwDDVmw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hR3mvh1J; arc=none smtp.remote-ip=170.10.133.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8E5A606A321 for ; Sun, 25 Oct 2026 21:45:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D8E5A606A321 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hR3mvh1J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792964731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4J8c+Hr5fTJH0BDfp7U8QsduNp0G3VxfVToMETDsmm0=; b=hR3mvh1JfszqIK/t/8CpTIOOmHAFIYPxPAzOSjcQXPtfWf1M8DOgmNy+QDubKCZb6FjK9Z j2LvnTpdholfxjRbHT2cxswQDGQ5KDQVap1xzShLbt3ZBd6V+2tfw41nxa0NtuEqQ88aug DiA9sKs2abS5ftHGm8mBbgdEy0e4/CM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-kiY07tD6MfuvvRHOjurh2Q-1; Sun, 25 Oct 2026 17:45:26 -0400 X-MC-Unique: kiY07tD6MfuvvRHOjurh2Q-1 X-Mimecast-MFC-AGG-ID: kiY07tD6MfuvvRHOjurh2Q_1792964725 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C36D41801359; Sun, 25 Oct 2026 21:45:24 +0000 (UTC) Received: from llong-thinkpadp16vgen1.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 493FA1956087; Sun, 25 Oct 2026 21:45:23 +0000 (UTC) From: Waiman Long To: Ridong Chen , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Shuah Khan Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Guopeng Zhang , Waiman Long Subject: [PATCH-next v3 07/11] cgroup/cpuset: Make sure compute_partition_effective_cpumask() is only called for valid partition Date: Sun, 25 Oct 2026 17:44:45 -0400 Message-ID: <20261025214449.310715-8-longman@redhat.com> In-Reply-To: <20261025214449.310715-1-longman@redhat.com> References: <20261025214449.310715-1-longman@redhat.com> X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 With visual inspection to make sure that compute_partition_effective_cpumask() is only called for valid partition root, it was found that the function can be called for an invalidated partition near the end of cpuset_hotplug_update_tasks(). When partcmd is set, update_parent_effective_cpumask() is called to either invalidate a valid partition or with partcmd_update to check if an invalid partition can be switched back to valid. In both cases, cpuset_force_rebuild() should be invoked. However, compute_partition_effective_cpumask() should only be called when an invalid partition is switched back to valid. When a partition is invalidated, compute_effective_cpumask() should be called instead. Also add a WARN_ON_ONCE() in compute_partition_effective_cpumask() to ensure that a valid partition root is passed in. Fixes: 72c6303acfa1 ("cgroup/cpuset: Take isolated CPUs out of workqueue unbound cpumask") Signed-off-by: Waiman Long --- kernel/cgroup/cpuset.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 8903e441ecc1..53fa3970946e 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2163,6 +2163,8 @@ static void compute_partition_effective_cpumask(struct cpuset *cs, struct cpuset *child; bool populated = partition_is_populated(cs, NULL); + WARN_ON_ONCE(!is_partition_valid(cs)); + /* * Check child partition roots to see if they should be * invalidated when @@ -4035,9 +4037,12 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs, struct tmpmasks *tmp) if (partcmd >= 0) { update_parent_effective_cpumask(cs, partcmd, NULL, tmp); - if ((partcmd == partcmd_invalidate) || is_partition_valid(cs)) { + if (is_partition_valid(cs)) { compute_partition_effective_cpumask(cs, &new_cpus); cpuset_force_rebuild(); + } else if (partcmd == partcmd_invalidate) { + compute_effective_cpumask(&new_cpus, cs, parent); + cpuset_force_rebuild(); } } -- 2.56.0