From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794802921; b=0FlrkAprzOYRPKZVJz3jt6uVSmIfDhO+k2PtCNnYQN1GAI82dnWsYVrSZKhKxizi+dgm Rh+NSUmoiW3s0DZkX2BTei3Z2spYYt8Ebpwmx1d0hIZtTnoaZJgz+3p1YzVrXY/VGQlGc TUSMM5TW4oh9IEqBn64Of/5d41PuVcYOOP/dTICU6opXWb5x5rslmKQaaRcU3ysxsza0x s9PNmKlDJtCWe45hgHDiKaNTztngA/MuqUxWTod1gGUQB+sBYVx8TGj9wh8BMXW0BlbSf KjXYDeaCpIyd7Wh6PnhWAgPIWqBR1meh9Jd4P+1lqz+AeR+8ERRS3dk9hdI7gzVutYQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794802921; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:Received:Message-ID:Date:MIME-Version: User-Agent:Subject:To:Cc:References:Content-Language:From:In-Reply-To: Content-Type:Content-Transfer-Encoding:X-Scanned-By; bh=mAiC+0hT+OAYgDZe7uQXWa25nna0BFe7OezHBcr8Cmo=; b=05Sxs73VkxDWvuCnkR0E6nz+WItsnt00Wzo0vhvV3yyH8MD8mmlvKNdUc22P/MWFfdwh +qX6BFEjkAKIIc+qa6K3O/lun4GynUUoRJx9jnYWltkGjwv558K5J/Cw8SBXR5DEEFv9w e1TJiG0SbbXY8FW2fMcA8UNCmFtTQYnxU9BdN9PWG0QjjDBtrlpkg7Sd3DY4dLlKawBF1 wPH6QGS3l2+LUramJbNuwKfXDDDSdq7qB/jCZ07Byx3HQoNRcIrPFr2Utek5UGDY53rst sWmeNWJnJs7QhIS5JhBLv+nC5yZlICEOm10FvFo30z7F4QlwDLEarNlUjVJ7OXZCdCA== 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=PUtI0MnS; arc=none smtp.remote-ip=170.10.129.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 2B919606A31C for ; Mon, 16 Nov 2026 04:22:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2B919606A31C 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) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PUtI0MnS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1794802919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAiC+0hT+OAYgDZe7uQXWa25nna0BFe7OezHBcr8Cmo=; b=PUtI0MnSiXkeUUC5O9hkWBe7xD25pg1DNAOwMMbVRR1Vac7tcqk/XYrZFnLyGp7uww1Hf9 uMSl6/bI/TxX1yEmSY+u54PMNm5RbfU4B05EThi0kkPKcDnaPfDtZ8Yn6L1HlQFuRzUVy4 XVCWIVepc6r6oCarcKnSSO3mLLONfFg= 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-467-oB_zzBfpP8-TC5JepjMO-g-1; Sun, 15 Nov 2026 23:21:52 -0500 X-MC-Unique: oB_zzBfpP8-TC5JepjMO-g-1 X-Mimecast-MFC-AGG-ID: oB_zzBfpP8-TC5JepjMO-g_1794802911 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 988661800476; Mon, 16 Nov 2026 04:21:50 +0000 (UTC) Received: from [100.91.18.181] (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9BFBA1956095; Mon, 16 Nov 2026 04:21:48 +0000 (UTC) Message-ID: Date: Sun, 15 Nov 2026 23:21:47 -0500 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH-next v4 3/6] cgroup/cpuset: Check remote partition underneath before making an invalid partition valid To: Ridong Chen , Tejun Heo , Johannes Weiner , =?UTF-8?Q?Michal_Koutn=C3=BD?= , Shuah Khan Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Guopeng Zhang , Sashiko References: <20261116012330.2271010-1-longman@redhat.com> <20261116012330.2271010-4-longman@redhat.com> <8c126892-8e4d-4bfe-9f3f-bc1e1a72338d@linux.dev> Content-Language: en-US From: Waiman Long In-Reply-To: <8c126892-8e4d-4bfe-9f3f-bc1e1a72338d@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 On 11/15/26 10:47 PM, Ridong Chen wrote: > > > On 11/16/2026 9:23 AM, Waiman Long wrote: >> When re-evaluating an invalid local partition via partcmd_update, >> update_parent_effective_cpumask() does not check whether a descendant >> remote partition is using its exclusive CPUs, promoting the cpuset to a >> valid partition root over the remote partition. This condition should >> only >> be possible if parent is the top_cpuset and exclusive_cpus isn't empty. >> >> This leaves an active remote partition underneath a valid >> local partition root with overlapping exclusive CPUs, breaking >> scheduler domain partitioning and triggering warnings in >> compute_partition_effective_cpumask() and generate_sched_domains(). >> >> Fix that by checking the effective_xcpus against subpartitions_cpus >> when an underneath remote partition is possible to make sure that all >> the exclusive CPUs are available before allowing the invalid partition >> to be switched back to valid. >> >> Also make sure that effective_xcpus is non-empty before swtiching an >> invalid partition back to valid. >> >> Add a test case in test_cpuset_prs.sh to verify that an invalid >> partition >> with a remote partition underneath cannot be switched back to valid >> with a hotplug event. >> >> In the special case when the last active CPU in the top_cpuset partition >> is offlined, the hotplug code will empty subpartitions_cpus and let the >> existing local partition to compete for the exclusive CPUs again. If >> there is an invalid local partition above a remote partition and that >> invalid local partition is able to switch to a valid partition, the >> remote >> partition below will now share some the of exclusive CPUs violating the >> CPU exclusivity rule. This special case will be handled in a later >> patch. >> >> Fixes: 181c8e091aae ("cgroup/cpuset: Introduce remote partition") >> Reported-by: Sashiko >> Link: >> https://sashiko.dev/#/bug/linux-47715b89-d5fb-4731-b7c9-070773c6ff75 >> Signed-off-by: Waiman Long >> --- >>   kernel/cgroup/cpuset.c                        | 42 ++++++++++++------- >>   .../selftests/cgroup/test_cpuset_prs.sh       |  4 ++ >>   2 files changed, 30 insertions(+), 16 deletions(-) >> >> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c >> index 195d4e3a283c..81481fa62cfe 100644 >> --- a/kernel/cgroup/cpuset.c >> +++ b/kernel/cgroup/cpuset.c >> @@ -2029,11 +2029,7 @@ static int >> update_parent_effective_cpumask(struct cpuset *cs, int cmd, >>            * tasks_nocpu_error() with this very mask, and a failing >>            * write is routed to partcmd_invalidate instead. >>            */ >> -        if (is_partition_invalid(cs)) { >> -            adding = false; >> -            deleting = cpumask_and(tmp->delmask, >> -                    newmask, parent->effective_xcpus); >> -        } else { >> +        if (is_partition_valid(cs)) { >>               cpumask_andnot(tmp->addmask, cs->effective_xcpus, >> newmask); >>               adding = cpumask_and(tmp->addmask, tmp->addmask, >>                            parent->effective_xcpus); >> @@ -2041,6 +2037,17 @@ static int >> update_parent_effective_cpumask(struct cpuset *cs, int cmd, >>               cpumask_andnot(tmp->delmask, newmask, >> cs->effective_xcpus); >>               deleting = cpumask_and(tmp->delmask, tmp->delmask, >>                              parent->effective_xcpus); >> +        } else { >> +            deleting = cpumask_and(tmp->delmask, >> +                    newmask, parent->effective_xcpus); >> + >> +            /* Check if a remote partition may be underneath */ >> +            if ((parent == &top_cpuset) && >> +                !cpumask_empty(cs->exclusive_cpus) && >> +                cpumask_intersects(tmp->delmask, subpartitions_cpus)) { >> +                part_error = PERR_REMOTE; >> +                deleting = false; >> +            } >>           } >>             /* >> @@ -2107,34 +2114,37 @@ static int >> update_parent_effective_cpumask(struct cpuset *cs, int cmd, >>           } else if (is_partition_invalid(cs)) { >>               struct cgroup_subsys_state *css; >>               struct cpuset *child; >> -            bool exclusive = true; >>                 /* >>                * Convert invalid partition to valid has to pass the >> -             * cpu exclusivity test when cpuset.cpus.exclusive is >> -             * empty as well as the housekeeping check. >> +             * following tests: >> +             * 1) housekeeping CPU conflict check >> +             * 2) cpu exclusivity test when cpuset.cpus.exclusive is >> +             *    empty. >> +             * 3) if parent is top_cpuset, none of the effective_xcpus >> +             *    (tmp->delmask) are in subpartitions_cpus, if not a >> +             *    remote partition may be underneath. >>                */ >>               if >> (prstate_housekeeping_conflict(cs->partition_root_state, >>                                 parent_prs, tmp->delmask, NULL)) { >>                   part_error = PERR_HKEEPING; >> -                goto write_error; >> -            } >> -            if (cpumask_empty(cs->exclusive_cpus)) { >> +            } else if (cpumask_empty(cs->exclusive_cpus)) { >>                   rcu_read_lock(); >>                   cpuset_for_each_child(child, css, parent) { >>                       if (child == cs) >>                           continue; >>                       if (!cpusets_are_exclusive(cs, child)) { >> -                        exclusive = false; >> +                        part_error = PERR_NOTEXCL; >>                           break; >>                       } >>                   } >>                   rcu_read_unlock(); >> +            } else if ((parent == &top_cpuset) && >> +                   cpumask_intersects(tmp->delmask, >> subpartitions_cpus)) { >> +                part_error = PERR_REMOTE; >>               } >> -            if (exclusive) >> +            if (!part_error) >>                   deleting = !cpumask_empty(tmp->delmask); >> -            else >> -                part_error = PERR_NOTEXCL; >>           } >>       } >>   @@ -2155,7 +2165,7 @@ static int >> update_parent_effective_cpumask(struct cpuset *cs, int cmd, >>               break; >>           case PRS_INVALID_ROOT: >>           case PRS_INVALID_ISOLATED: >> -            if (!part_error) >> +            if (!part_error && deleting) >>                   new_prs = -old_prs; >>               break; >>           } > > Nit: deleting is always true when part_error is 0, so this check > doesn't change anything. It's fine to keep it as a safeguard, but > then the changelog shouldn't describe it as a fix. tmp->delmask can be empty and deleting will be set to false in this case. Of course, we should not activate an invalid partition root with empty effective_xcpus. > > Typos in the changelog: "swtiching", "share some the of". > Will fix that in the next version. Thanks, Longman > Otherwise, > > Reviewed-by: Ridong Chen > > >> diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh >> b/tools/testing/selftests/cgroup/test_cpuset_prs.sh >> index 1397ec428c46..81f0eecaca80 100755 >> --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh >> +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh >> @@ -563,6 +563,10 @@ TEST_MATRIX=( >>       " C1-6:P1 C3-6:P2 C5-6:P2  .       .    P1      . .     0 >> A1:1-2|A2:3-4|A3:5-6 \ >>                                          A1:P1|A2:P1|A3:P2 5-6" >>   +    # A hotplug event will not incorrectly activate an invalid >> partition with >> +    # a remote partition underneath. >> +    "  CX1-4  C3-4:P1   .      .      P1   O1=0     . .     0 >> A1:2|A2:3-4 A1:P-1|A2:P1" >> + >>       # >>       #  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail >> ECPUs Pstate ISOLCPUS >>       #  ------ ------ ------ ------ ------ ------ ------ ------ ---- >> ----- ------ -------- >