From nobody Sat Feb 7 05:44:23 2026 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 1461950A63; Tue, 20 Aug 2024 03:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123357; cv=none; b=aIFKpi4R2lpTSiz98amkmp8QiX72MnjGENKmJKdaLLEK9P9UIWhVNaImRAUZHVhYYcYqHBB4qN+mrZ97bNSZ5Vn5ylyBlVl6inaVc3C34cbZRlH9U1CfupnwRvnhJNSvsXkSbLhM6hmlMmxsgRs//Ee40yHjUyN8A5S70hN6Lc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123357; c=relaxed/simple; bh=VV+Wh59sYdVaS7hobUVpmOqniW6CX27QZcXWVjqbI8U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DWMgDWL2UTQywbqt4fNrD15OwQlg8NQFI1BJb4H3UN6K5Hnb7QJ+fRStOIUwPyWRTWVlyfN8XGsx6BCC5nivTzu0LbrvJpk9swVxDhU79kbZV+yVxdIApEtBXKprPKW/vvTkAwS0M7lEpOQk57cXpDCVNPsKd0X2yWeUVgTAr/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WnvWt12zbzfbY3; Tue, 20 Aug 2024 11:07:06 +0800 (CST) Received: from kwepemd100013.china.huawei.com (unknown [7.221.188.163]) by mail.maildlp.com (Postfix) with ESMTPS id 136B114037B; Tue, 20 Aug 2024 11:09:06 +0800 (CST) Received: from huawei.com (10.67.174.121) by kwepemd100013.china.huawei.com (7.221.188.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Tue, 20 Aug 2024 11:09:05 +0800 From: Chen Ridong To: , , , , , , CC: , Subject: [PATCH v2 -next 1/3] cgroup/cpuset: Correct invalid remote parition prs Date: Tue, 20 Aug 2024 03:01:24 +0000 Message-ID: <20240820030126.236997-2-chenridong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240820030126.236997-1-chenridong@huawei.com> References: <20240820030126.236997-1-chenridong@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemd100013.china.huawei.com (7.221.188.163) Content-Type: text/plain; charset="utf-8" When enable a remote partition, I found that: cd /sys/fs/cgroup/ mkdir test mkdir test/test1 echo +cpuset > cgroup.subtree_control echo +cpuset > test/cgroup.subtree_control echo 3 > test/test1/cpuset.cpus echo root > test/test1/cpuset.cpus.partition cat test/test1/cpuset.cpus.partition root invalid (Parent is not a partition root) The parent of a remote partition could not be a root. This is due to the emtpy effective_xcpus. It would be better to prompt the message "invalid cpu list in cpuset.cpus.exclusive". Signed-off-by: Chen Ridong Reviewed-by: Waiman Long --- kernel/cgroup/cpuset.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index e34fd6108b06..0ae68e0e5733 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -80,6 +80,7 @@ enum prs_errcode { PERR_HOTPLUG, PERR_CPUSEMPTY, PERR_HKEEPING, + PERR_ACCESS, }; =20 static const char * const perr_strings[] =3D { @@ -91,6 +92,7 @@ static const char * const perr_strings[] =3D { [PERR_HOTPLUG] =3D "No cpu available due to hotplug", [PERR_CPUSEMPTY] =3D "cpuset.cpus and cpuset.cpus.exclusive are empty", [PERR_HKEEPING] =3D "partition config conflicts with housekeeping setup", + [PERR_ACCESS] =3D "Enable partition not permitted", }; =20 struct cpuset { @@ -1655,7 +1657,7 @@ static inline bool is_local_partition(struct cpuset *= cs) * @cs: the cpuset to update * @new_prs: new partition_root_state * @tmp: temparary masks - * Return: 1 if successful, 0 if error + * Return: 0 if successful, errcode if error * * Enable the current cpuset to become a remote partition root taking CPUs * directly from the top cpuset. cpuset_mutex must be held by the caller. @@ -1669,7 +1671,7 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, * The user must have sysadmin privilege. */ if (!capable(CAP_SYS_ADMIN)) - return 0; + return PERR_ACCESS; =20 /* * The requested exclusive_cpus must not be allocated to other @@ -1683,7 +1685,7 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, if (cpumask_empty(tmp->new_cpus) || cpumask_intersects(tmp->new_cpus, subpartitions_cpus) || cpumask_subset(top_cpuset.effective_cpus, tmp->new_cpus)) - return 0; + return PERR_INVCPUS; =20 spin_lock_irq(&callback_lock); isolcpus_updated =3D partition_xcpus_add(new_prs, NULL, tmp->new_cpus); @@ -1698,7 +1700,7 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, */ update_tasks_cpumask(&top_cpuset, tmp->new_cpus); update_sibling_cpumasks(&top_cpuset, NULL, tmp); - return 1; + return 0; } =20 /* @@ -3151,9 +3153,6 @@ static int update_prstate(struct cpuset *cs, int new_= prs) goto out; =20 if (!old_prs) { - enum partition_cmd cmd =3D (new_prs =3D=3D PRS_ROOT) - ? partcmd_enable : partcmd_enablei; - /* * cpus_allowed and exclusive_cpus cannot be both empty. */ @@ -3162,13 +3161,18 @@ static int update_prstate(struct cpuset *cs, int ne= w_prs) goto out; } =20 - err =3D update_parent_effective_cpumask(cs, cmd, NULL, &tmpmask); /* - * If an attempt to become local partition root fails, - * try to become a remote partition root instead. + * If parent is valid partition, enable local partiion. + * Otherwise, enable a remote partition. */ - if (err && remote_partition_enable(cs, new_prs, &tmpmask)) - err =3D 0; + if (is_partition_valid(parent)) { + enum partition_cmd cmd =3D (new_prs =3D=3D PRS_ROOT) + ? partcmd_enable : partcmd_enablei; + + err =3D update_parent_effective_cpumask(cs, cmd, NULL, &tmpmask); + } else { + err =3D remote_partition_enable(cs, new_prs, &tmpmask); + } } else if (old_prs && new_prs) { /* * A change in load balance state only, no change in cpumasks. --=20 2.34.1 From nobody Sat Feb 7 05:44:23 2026 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (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 12E7050285; Tue, 20 Aug 2024 03:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123356; cv=none; b=TiWcK2RGd5JOneL1QTi4p93paCBXt0X76XN2BSpiDX9nPk/INQAUuZgXTZMh0qOcubRz4qgYAiyNIFpQnCj01doNcIsI0IjBs1ceCU5+6l/52YZtRLrPEsBGTIKKUERUVSfEThgAzru4WH3autJUfmsBEyT0Ud8Sst3pB9FzH9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123356; c=relaxed/simple; bh=x/dQjt+SI5PYEpMKAmX6f5FN1RZaX99JafDnT5L77gw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fgWpur8it3Y5MMo2viBeGj2B3A8FRHjithTDI2s2PXd14i24bjCS9J44QihNJesHva5quBzazOq8Bbw+AWKufBGX6vBDkDX03uajqwIsuLzzFsi8MKrUgoWKVRP1JTu9dd8djobZXcEJOE13vJddDywp6MqI6YqSCZZ2qXyjcck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4WnvSp1vzyz20m1v; Tue, 20 Aug 2024 11:04:26 +0800 (CST) Received: from kwepemd100013.china.huawei.com (unknown [7.221.188.163]) by mail.maildlp.com (Postfix) with ESMTPS id 769C71A016C; Tue, 20 Aug 2024 11:09:06 +0800 (CST) Received: from huawei.com (10.67.174.121) by kwepemd100013.china.huawei.com (7.221.188.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Tue, 20 Aug 2024 11:09:05 +0800 From: Chen Ridong To: , , , , , , CC: , Subject: [PATCH v2 -next 2/3] cgroup/cpuset: remove fetch_xcpus Date: Tue, 20 Aug 2024 03:01:25 +0000 Message-ID: <20240820030126.236997-3-chenridong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240820030126.236997-1-chenridong@huawei.com> References: <20240820030126.236997-1-chenridong@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemd100013.china.huawei.com (7.221.188.163) Content-Type: text/plain; charset="utf-8" Both fetch_xcpus and user_xcpus functions are used to retrieve the value of exclusive_cpus. If exclusive_cpus is not set, cpus_allowed is the implicit value used as exclusive in a local partition. I can not imagine a scenario where effective_xcpus is not empty when exclusive_cpus is empty. Therefore, I suggest removing the fetch_xcpus function. Signed-off-by: Chen Ridong Reviewed-by: Waiman Long --- kernel/cgroup/cpuset.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 0ae68e0e5733..92e79ddc8188 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -771,13 +771,6 @@ static inline bool xcpus_empty(struct cpuset *cs) cpumask_empty(cs->exclusive_cpus); } =20 -static inline struct cpumask *fetch_xcpus(struct cpuset *cs) -{ - return !cpumask_empty(cs->exclusive_cpus) ? cs->exclusive_cpus : - cpumask_empty(cs->effective_xcpus) ? cs->cpus_allowed - : cs->effective_xcpus; -} - /* * cpusets_are_exclusive() - check if two cpusets are exclusive * @@ -785,8 +778,8 @@ static inline struct cpumask *fetch_xcpus(struct cpuset= *cs) */ static inline bool cpusets_are_exclusive(struct cpuset *cs1, struct cpuset= *cs2) { - struct cpumask *xcpus1 =3D fetch_xcpus(cs1); - struct cpumask *xcpus2 =3D fetch_xcpus(cs2); + struct cpumask *xcpus1 =3D user_xcpus(cs1); + struct cpumask *xcpus2 =3D user_xcpus(cs2); =20 if (cpumask_intersects(xcpus1, xcpus2)) return false; @@ -2585,7 +2578,7 @@ static int update_cpumask(struct cpuset *cs, struct c= puset *trialcs, invalidate =3D true; rcu_read_lock(); cpuset_for_each_child(cp, css, parent) { - struct cpumask *xcpus =3D fetch_xcpus(trialcs); + struct cpumask *xcpus =3D user_xcpus(trialcs); =20 if (is_partition_valid(cp) && cpumask_intersects(xcpus, cp->effective_xcpus)) { --=20 2.34.1 From nobody Sat Feb 7 05:44:23 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 69EBF33F9; Tue, 20 Aug 2024 03:09:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123353; cv=none; b=cXU876EjuP9dJr0oM7ajO3yXi7lNAxo4CSNRSBttW/rsVI3u4nQ8zFsHG+Jzey6hmKFxxUO2hHt5CN28faZfK8zoYoVjiHrYUASueGrbzLFpzsB+4VR2OX/QneaCdfbg1K/R7JEYzEtUyaZWPZSfp1BWpFqIpYftqc5SoB7PqxI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724123353; c=relaxed/simple; bh=8uC0HKt3gjBHQ0nISF578xaCgVaD8qkHzi7kUyXAEG0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ll/lPsxFJ3uyzOPY30hj5FdsiKC+RJaGCFu+EObQ/nI8O4eH2H6iLzYp/c2HT4ecGH09DHlO7qgYWTS0F/TbmOXLZ60PYZ2lPWGCdZd5kqa1UuEp7mFBbKobFYjRkRq+p6OQfTMKLs2bYAlgWPKwCYDAsqmDoO/Lq4veRLUcox0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WnvYT3HDvzyQFW; Tue, 20 Aug 2024 11:08:29 +0800 (CST) Received: from kwepemd100013.china.huawei.com (unknown [7.221.188.163]) by mail.maildlp.com (Postfix) with ESMTPS id EE25B1800A0; Tue, 20 Aug 2024 11:09:06 +0800 (CST) Received: from huawei.com (10.67.174.121) by kwepemd100013.china.huawei.com (7.221.188.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Tue, 20 Aug 2024 11:09:06 +0800 From: Chen Ridong To: , , , , , , CC: , Subject: [PATCH v2 -next 3/3] cgroup/cpuset: remove use_parent_ecpus of cpuset Date: Tue, 20 Aug 2024 03:01:26 +0000 Message-ID: <20240820030126.236997-4-chenridong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240820030126.236997-1-chenridong@huawei.com> References: <20240820030126.236997-1-chenridong@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemd100013.china.huawei.com (7.221.188.163) Content-Type: text/plain; charset="utf-8" use_parent_ecpus is used to track whether the children are using the parent's effective_cpus. When a parent's effective_cpus is changed due to changes in a child partition's effective_xcpus, any child using parent'effective_cpus must call update_cpumasks_hier. However, if a child is not a valid partition, it is sufficient to determine whether to call update_cpumasks_hier based on whether the child's effective_cpus is going to change. To make the code more succinct, it is suggested to remove use_parent_ecpus. Signed-off-by: Chen Ridong Reviewed-by: Waiman Long --- kernel/cgroup/cpuset.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 92e79ddc8188..7db55eed63cf 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -185,12 +185,6 @@ struct cpuset { /* partition root state */ int partition_root_state; =20 - /* - * Default hierarchy only: - * use_parent_ecpus - set if using parent's effective_cpus - */ - int use_parent_ecpus; - /* * number of SCHED_DEADLINE tasks attached to this cpuset, so that we * know when to rebuild associated root domain bandwidth information. @@ -1505,11 +1499,8 @@ static void reset_partition_data(struct cpuset *cs) if (is_cpu_exclusive(cs)) clear_bit(CS_CPU_EXCLUSIVE, &cs->flags); } - if (!cpumask_and(cs->effective_cpus, - parent->effective_cpus, cs->cpus_allowed)) { - cs->use_parent_ecpus =3D true; + if (!cpumask_and(cs->effective_cpus, parent->effective_cpus, cs->cpus_all= owed)) cpumask_copy(cs->effective_cpus, parent->effective_cpus); - } } =20 /* @@ -1683,8 +1674,6 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, spin_lock_irq(&callback_lock); isolcpus_updated =3D partition_xcpus_add(new_prs, NULL, tmp->new_cpus); list_add(&cs->remote_sibling, &remote_children); - if (cs->use_parent_ecpus) - cs->use_parent_ecpus =3D false; spin_unlock_irq(&callback_lock); update_unbound_workqueue_cpumask(isolcpus_updated); =20 @@ -2309,13 +2298,8 @@ static void update_cpumasks_hier(struct cpuset *cs, = struct tmpmasks *tmp, * it is a partition root that has explicitly distributed * out all its CPUs. */ - if (is_in_v2_mode() && !remote && cpumask_empty(tmp->new_cpus)) { + if (is_in_v2_mode() && !remote && cpumask_empty(tmp->new_cpus)) cpumask_copy(tmp->new_cpus, parent->effective_cpus); - if (!cp->use_parent_ecpus) - cp->use_parent_ecpus =3D true; - } else if (cp->use_parent_ecpus) { - cp->use_parent_ecpus =3D false; - } =20 if (remote) goto get_css; @@ -2452,8 +2436,7 @@ static void update_sibling_cpumasks(struct cpuset *pa= rent, struct cpuset *cs, * Check all its siblings and call update_cpumasks_hier() * if their effective_cpus will need to be changed. * - * With the addition of effective_xcpus which is a subset of - * cpus_allowed. It is possible a change in parent's effective_cpus + * It is possible a change in parent's effective_cpus * due to a change in a child partition's effective_xcpus will impact * its siblings even if they do not inherit parent's effective_cpus * directly. @@ -2467,8 +2450,7 @@ static void update_sibling_cpumasks(struct cpuset *pa= rent, struct cpuset *cs, cpuset_for_each_child(sibling, pos_css, parent) { if (sibling =3D=3D cs) continue; - if (!sibling->use_parent_ecpus && - !is_partition_valid(sibling)) { + if (!is_partition_valid(sibling)) { compute_effective_cpumask(tmp->new_cpus, sibling, parent); if (cpumask_equal(tmp->new_cpus, sibling->effective_cpus)) @@ -4128,7 +4110,6 @@ static int cpuset_css_online(struct cgroup_subsys_sta= te *css) if (is_in_v2_mode()) { cpumask_copy(cs->effective_cpus, parent->effective_cpus); cs->effective_mems =3D parent->effective_mems; - cs->use_parent_ecpus =3D true; } spin_unlock_irq(&callback_lock); =20 @@ -4194,9 +4175,6 @@ static void cpuset_css_offline(struct cgroup_subsys_s= tate *css) is_sched_load_balance(cs)) update_flag(CS_SCHED_LOAD_BALANCE, cs, 0); =20 - if (cs->use_parent_ecpus) - cs->use_parent_ecpus =3D false; - cpuset_dec(); clear_bit(CS_ONLINE, &cs->flags); =20 --=20 2.34.1