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=1794235989; b=G7N9SuVf5DjV1kz0mMf9tij2j+B37uO9ZInk24xKq3VLWdjlq6TObtGa3e0QLf6Scwva aIrSPGDq00a5DMO46i/kdoDKKPwjC2vyifGMlhSAgvTJ8gHElRHQBEa/Ii+pv7blnkseR 7Ou5Tl8+xKhhAt/lQB6AgQZM6DbRKeRiqH9yOZ6KxS/fe+IPLYd14RKq6CXgy97hMVV1R EVms5HRqBRF1z2HFGBt1JVpAmonWdTNOmzVFX50CDFAb2m4VF/+vNhWITMMvA1lSRzRfC SLO83uht1t7Ie/hiIw/Y7x7FeSnq4S0RJAR+6BWAtod6fjMPnmZMtCQyqamDqf6vI3w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794235989; 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=+3ccHp+dxclpMhI+JAx+vBwHB1pqGCZbz+PjeLxKEeI=; b=hbJhhtpYSMeRPi3uZdX2/3fb3gb8gojxHkmy5e1klmyHMiymdje9Pcv32IFRqsSMz4un agywKjgXsrbrNM5y+OWqYNu7j8TbA6iUtLtkCJMWZw/80MjiXTE8TOwv06qA0UIa99RMC ZTt5pqIbmXEcbDce59kyaCusvouVmzefF5N1TqncisCfVGdI4k8D5+XbyriVytBmsMFrH f02JU26bMyTZF5ziCIYF1uEDjc8KJPxmSue0J2rXk+f3uxhqC/PZG6APQPyF73Qsd0p60 s7Db9J/r4vvNdUdYi+nJtrPPNyOA4JfIqm9g7zYmZCtRxXKttSxuxP6xlAzFLsS5dCQ== 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=Us9yBEc5; 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 24B8A606A326 for ; Mon, 9 Nov 2026 14:53:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 24B8A606A326 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=Us9yBEc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1794235988; 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=+3ccHp+dxclpMhI+JAx+vBwHB1pqGCZbz+PjeLxKEeI=; b=Us9yBEc5XQicLhpGh7lT3OcP28iiEwZOO+FTpfqNuuIah7VAB2vCQJzXZkRkhUH2gKWYmZ CrCY+mKjuo0mo7nxXcT2T7jMc8ZltdrZj/NSpBH8UxDUi81TpwT0gsPxtdLl8/epbmwUlU sCVIae66oixb4LSKktMxa5RNlNEg0BA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-158-dE37GRRrPZWD6X8PdWHeeQ-1; Mon, 09 Nov 2026 09:53:03 -0500 X-MC-Unique: dE37GRRrPZWD6X8PdWHeeQ-1 X-Mimecast-MFC-AGG-ID: dE37GRRrPZWD6X8PdWHeeQ_1794235981 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 762FA19560A7; Mon, 9 Nov 2026 14:53:00 +0000 (UTC) Received: from [100.91.18.181] (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 06EB718004F5; Mon, 9 Nov 2026 14:52:57 +0000 (UTC) Message-ID: Date: Mon, 9 Nov 2026 09:52:57 -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 v3 4/4] cpuset: generalize the validate_partition() interface To: Ridong Chen , Tejun Heo , Johannes Weiner , =?UTF-8?Q?Michal_Koutn=C3=BD?= , Shuah Khan Cc: Chen Ridong , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Sashiko , Guopeng Zhang , Ridong Chen References: <20261107120100.3587595-1-ridong.chen@linux.dev> <20261107120100.3587595-5-ridong.chen@linux.dev> Content-Language: en-US From: Waiman Long In-Reply-To: <20261107120100.3587595-5-ridong.chen@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 On 11/7/26 7:01 AM, Ridong Chen wrote: > From: Chen Ridong > > Refactor validate_partition() to take the parent partition, the new > partition root state, the new effective exclusive CPUs and the CPUs to > be deleted, instead of a trial cpuset. A NULL parent stands for a > remote partition, whose CPUs come from top_cpuset. This makes the > interface flexible enough to handle both local and remote partition > validation. > > The no CPU left for tasks check now uses the given parent instead of > parent_cs(cs), and top_cpuset for a remote partition, as that is where > its CPUs are taken from. The cgroup parent of a remote partition does > not give it any CPU. > > The housekeeping conflict check is folded into validate_partition(). It > is skipped when the parent is not a valid partition root, as @cs can't > be a valid local partition in that case. > > Use the new interface for local partition enablement in > update_parent_effective_cpumask() and in partition_cpus_change(), > replacing the open-coded checks there. The order of the checks is now > the same for both paths: empty CPUs, housekeeping conflict, then no CPU > left for tasks. > > Signed-off-by: Chen Ridong > Signed-off-by: Ridong Chen > --- > kernel/cgroup/cpuset.c | 119 ++++++++++++++++++++--------------------- > 1 file changed, 59 insertions(+), 60 deletions(-) > > diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c > index fc9de6e16ff5..0ec20412b3ce 100644 > --- a/kernel/cgroup/cpuset.c > +++ b/kernel/cgroup/cpuset.c > @@ -1414,6 +1414,48 @@ static bool prstate_housekeeping_conflict(int new_prs, int parent_prs, > return res; > } > > +/** > + * validate_partition - Validate a cpuset partition configuration > + * @cs: The cpuset to validate > + * @parent: Parent partition of @cs, NULL for remote partition > + * @new_prs: The proposed new partition root state > + * @new_excpus: The new effective exclusive CPUs mask to validate > + * @del: exclusive CPUs to be deleted from @cs, can be NULL > + * > + * A remote partition gets its CPUs from top_cpuset, so top_cpuset is used > + * as the parent when @parent is NULL. > + * > + * The housekeeping check is skipped if @parent is not a valid partition > + * root as @cs can't be a valid local partition in that case. > + * > + * Return: PRS error code (0 if valid, non-zero error code if invalid) > + */ > +static enum prs_errcode validate_partition(struct cpuset *cs, > + struct cpuset *parent, int new_prs, > + struct cpumask *new_excpus, > + struct cpumask *del) > +{ > + int parent_prs; > + > + if (new_prs == PRS_MEMBER) > + return PERR_NONE; > + > + if (cpumask_empty(new_excpus)) > + return PERR_INVCPUS; > + > + if (!parent) > + parent = &top_cpuset; > + parent_prs = parent->partition_root_state; > + if (parent_prs > 0 && > + prstate_housekeeping_conflict(new_prs, parent_prs, new_excpus, del)) > + return PERR_HKEEPING; > + > + if (tasks_nocpu_error(parent, cs, new_excpus)) > + return PERR_NOCPUS; > + > + return PERR_NONE; > +} > + > /* > * cpuset_update_sd_hk_unlock - Rebuild sched domains, update HK & unlock > * > @@ -1934,18 +1976,10 @@ static int update_parent_effective_cpumask(struct cpuset *cs, int cmd, > if ((cmd == partcmd_enable) || (cmd == partcmd_enablei)) { > new_prs = (cmd == partcmd_enable) ? PRS_ROOT : PRS_ISOLATED; > > - /* > - * Enabling partition root is not allowed if its > - * effective_xcpus is empty. > - */ > - if (cpumask_empty(tmp->delmask)) > - return PERR_INVCPUS; > - > - if (prstate_housekeeping_conflict(new_prs, parent_prs, tmp->delmask, NULL)) > - return PERR_HKEEPING; > - > - if (nocpu) > - return PERR_NOCPUS; > + part_error = validate_partition(cs, parent, new_prs, > + tmp->delmask, NULL); > + if (part_error) > + return part_error; > > /* > * This function will only be called when all the preliminary > @@ -2424,32 +2458,6 @@ static int parse_cpuset_cpulist(const char *buf, struct cpumask *out_mask) > return 0; > } > > -/** > - * validate_partition - Validate a cpuset partition configuration > - * @cs: The cpuset to validate > - * @trialcs: The trial cpuset containing proposed configuration changes > - * > - * If any validation check fails, the appropriate error code is set in the > - * cpuset's prs_err field. > - * > - * Return: PRS error code (0 if valid, non-zero error code if invalid) > - */ > -static enum prs_errcode validate_partition(struct cpuset *cs, struct cpuset *trialcs) > -{ > - struct cpuset *parent = parent_cs(cs); > - > - if (cs_is_member(trialcs)) > - return PERR_NONE; > - > - if (cpumask_empty(trialcs->effective_xcpus)) > - return PERR_INVCPUS; > - > - if (tasks_nocpu_error(parent, cs, trialcs->effective_xcpus)) > - return PERR_NOCPUS; > - > - return PERR_NONE; > -} > - > /** > * partition_cpus_change - Handle partition state changes due to CPU mask updates > * @cs: The target cpuset being modified > @@ -2463,33 +2471,24 @@ static void partition_cpus_change(struct cpuset *cs, struct cpuset *trialcs, > struct tmpmasks *tmp) > { > enum prs_errcode prs_err; > - int parent_prs = is_remote_partition(cs) > - ? PRS_ROOT : parent_cs(cs)->partition_root_state; > + struct cpuset *parent = is_remote_partition(cs) ? NULL : parent_cs(cs); > > if (cs_is_member(cs)) > return; > > - prs_err = validate_partition(cs, trialcs); > - if (!prs_err && (parent_prs > 0) && > - !cpumask_empty(trialcs->effective_xcpus)) { > - int prs = cs->partition_root_state; > - > - /* > - * Check for housekeeping conflict by passing the whole > - * effective_xcpus as well as those CPUs that are to be > - * removed from cs as delmask. > - */ > - if (prs > 0) > - cpumask_andnot(tmp->delmask, cs->effective_xcpus, > - trialcs->effective_xcpus); > - else > - cpumask_clear(tmp->delmask); > - > - if (prstate_housekeeping_conflict(prs, parent_prs, > - trialcs->effective_xcpus, tmp->delmask)) > - prs_err = PERR_HKEEPING; > - } > + /* > + * Check for housekeeping conflict by passing the whole > + * effective_xcpus as well as those CPUs that are to be > + * removed from cs as delmask. > + */ > + if (is_partition_valid(cs)) > + cpumask_andnot(tmp->delmask, cs->effective_xcpus, > + trialcs->effective_xcpus); > + else > + cpumask_clear(tmp->delmask); > > + prs_err = validate_partition(cs, parent, trialcs->partition_root_state, > + trialcs->effective_xcpus, tmp->delmask); > if (prs_err) { > WRITE_ONCE(cs->prs_err, prs_err); > trialcs->prs_err = prs_err; Again, this code change looks good to me. Similar to previous patch, it includes both code restructuring and bug fixes. Cheers, Longman