From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (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 DAE107261A; Sat, 31 Jan 2026 00:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769820471; cv=none; b=u27C6AWHLm3WbuKe+Xroryib8Tf4I3XtEx5/aVHcVFrUiIBeWS6KslxqcM83yxJDN1qEO+M4sZ1GEkxK6sKhQT8ZAlg/3D2RfcBiL8IXOy/kQ9hDErEuVta5mYMEkYu+6MZVvbgd5apzB5upD8vzlC77j8w1iSRz0ooTqt/DZOQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769820471; c=relaxed/simple; bh=6YUy3EGUzavSE3JC4NM2cqgi5dw2VTnlldAwE5Cnw1w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=FMgmb7B7q1am+4ciACsp/crrOrivWc76OQvYiBUd5ABjuL54rPsMTT/KFsAhiiglfVWc1RnVHBs0CmuPokhwI6YDdl/Dxq4SGbwLftbOs+qrZ+1g5gLdH/GqSIi+iA6cD9GBirNnqyRcRSdw7HfQqV0xPw8SUfVHyadO57QAxAY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.170]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4f2vNW28LqzKHMLG; Sat, 31 Jan 2026 08:47:23 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 9B8734056B; Sat, 31 Jan 2026 08:47:39 +0800 (CST) Received: from [10.67.111.176] (unknown [10.67.111.176]) by APP4 (Coremail) with SMTP id gCh0CgC3Y_QqUX1pBZXYFg--.24541S2; Sat, 31 Jan 2026 08:47:39 +0800 (CST) Message-ID: <647ad3d2-364c-4e83-b46d-49a2a30b8f94@huaweicloud.com> Date: Sat, 31 Jan 2026 08:47:37 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH/for-next v2 1/2] cgroup/cpuset: Defer housekeeping_update() call from CPU hotplug to workqueue To: Waiman Long , Tejun Heo , Johannes Weiner , =?UTF-8?Q?Michal_Koutn=C3=BD?= , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Shuah Khan Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org References: <20260130154254.1422113-1-longman@redhat.com> <20260130154254.1422113-2-longman@redhat.com> Content-Language: en-US From: Chen Ridong In-Reply-To: <20260130154254.1422113-2-longman@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CM-TRANSID:gCh0CgC3Y_QqUX1pBZXYFg--.24541S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKw43XryDZrW5Zw1fuFWfXwb_yoWxXFyUpF yFgrWIyrZ0gr13ua4SvwnrXr4F9wn7J3WUKanxJr1UZF13JFn2vr1kKrnxJrWrCr98CrZ8 ZF9rG397Wa1jy37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvjb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I 0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x 0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AF wI0_GFv_Wryl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4 xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5 MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWU JVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIa 0PDUUUU X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ On 2026/1/30 23:42, Waiman Long wrote: > The update_isolation_cpumasks() function can be called either directly > from regular cpuset control file write with cpuset_full_lock() called > or via the CPU hotplug path with cpus_write_lock and cpuset_mutex held. > > As we are going to enable dynamic update to the nozh_full housekeeping > cpumask (HK_TYPE_KERNEL_NOISE) soon with the help of CPU hotplug, > allowing the CPU hotplug path to call into housekeeping_update() directly > from update_isolation_cpumasks() will likely cause deadlock. So we > have to defer any call to housekeeping_update() after the CPU hotplug > operation has finished. This is now done via the workqueue where > the actual housekeeping_update() call, if needed, will happen after > cpus_write_lock is released. > > We can't use the synchronous task_work API as call from CPU hotplug > path happen in the per-cpu kthread of the CPU that is being shut down > or brought up. Because of the asynchronous nature of workqueue, the > HK_TYPE_DOMAIN housekeeping cpumask will be updated a bit later than the > "cpuset.cpus.isolated" control file in this case. > > Also add a check in test_cpuset_prs.sh and modify some existing > test cases to confirm that "cpuset.cpus.isolated" and HK_TYPE_DOMAIN > housekeeping cpumask will both be updated. > > Signed-off-by: Waiman Long > --- > kernel/cgroup/cpuset.c | 37 +++++++++++++++++-- > .../selftests/cgroup/test_cpuset_prs.sh | 13 +++++-- > 2 files changed, 44 insertions(+), 6 deletions(-) > > diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c > index 7b7d12ab1006..0b0eb1df09d5 100644 > --- a/kernel/cgroup/cpuset.c > +++ b/kernel/cgroup/cpuset.c > @@ -84,6 +84,9 @@ static cpumask_var_t isolated_cpus; > */ > static bool isolated_cpus_updating; > > +/* Both cpuset_mutex and cpus_read_locked acquired */ > +static bool cpuset_locked; > + > /* > * A flag to force sched domain rebuild at the end of an operation. > * It can be set in > @@ -285,10 +288,12 @@ void cpuset_full_lock(void) > { > cpus_read_lock(); > mutex_lock(&cpuset_mutex); > + cpuset_locked = true; > } > > void cpuset_full_unlock(void) > { > + cpuset_locked = false; > mutex_unlock(&cpuset_mutex); > cpus_read_unlock(); > } > @@ -1285,6 +1290,16 @@ static bool prstate_housekeeping_conflict(int prstate, struct cpumask *new_cpus) > return false; > } > > +static void isolcpus_workfn(struct work_struct *work) > +{ > + cpuset_full_lock(); > + if (isolated_cpus_updating) { > + WARN_ON_ONCE(housekeeping_update(isolated_cpus) < 0); > + isolated_cpus_updating = false; > + } > + cpuset_full_unlock(); > +} > + > /* > * update_isolation_cpumasks - Update external isolation related CPU masks > * > @@ -1293,14 +1308,30 @@ static bool prstate_housekeeping_conflict(int prstate, struct cpumask *new_cpus) > */ > static void update_isolation_cpumasks(void) > { > - int ret; > + static DECLARE_WORK(isolcpus_work, isolcpus_workfn); > > if (!isolated_cpus_updating) > return; > Can this happen? cpu0 cpu1 [...] isolated_cpus_updating = true; ... // 'full_lock' is not acquired update_isolation_cpumasks // exec worker concurrently isolcpus_workfn cpuset_full_lock isolated_cpus_updating = false; cpuset_full_unlock(); // This returns uncorrectly if (!isolated_cpus_updating) return; > - ret = housekeeping_update(isolated_cpus); > - WARN_ON_ONCE(ret < 0); > + /* > + * This function can be reached either directly from regular cpuset > + * control file write (cpuset_locked) or via hotplug (cpus_write_lock > + * && cpuset_mutex held). In the later case, we defer the > + * housekeeping_update() call to the system_unbound_wq to avoid the > + * possibility of deadlock. This also means that there will be a short > + * period of time where HK_TYPE_DOMAIN housekeeping cpumask will lag > + * behind isolated_cpus. > + */ > + if (!cpuset_locked) { > + /* > + * We rely on WORK_STRUCT_PENDING_BIT to not requeue a work > + * item that is still pending. > + */ > + queue_work(system_unbound_wq, &isolcpus_work); > + return; > + } > > + WARN_ON_ONCE(housekeeping_update(isolated_cpus) < 0); > isolated_cpus_updating = false; > } > > diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh > index 5dff3ad53867..0502b156582b 100755 > --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh > +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh > @@ -245,8 +245,9 @@ TEST_MATRIX=( > "C2-3:P1:S+ C3:P2 . . O2=0 O2=1 . . 0 A1:2|A2:3 A1:P1|A2:P2" > "C2-3:P1:S+ C3:P1 . . O2=0 . . . 0 A1:|A2:3 A1:P1|A2:P1" > "C2-3:P1:S+ C3:P1 . . O3=0 . . . 0 A1:2|A2: A1:P1|A2:P1" > - "C2-3:P1:S+ C3:P1 . . T:O2=0 . . . 0 A1:3|A2:3 A1:P1|A2:P-1" > - "C2-3:P1:S+ C3:P1 . . . T:O3=0 . . 0 A1:2|A2:2 A1:P1|A2:P-1" > + "C2-3:P1:S+ C3:P2 . . T:O2=0 . . . 0 A1:3|A2:3 A1:P1|A2:P-2" > + "C1-3:P1:S+ C3:P2 . . . T:O3=0 . . 0 A1:1-2|A2:1-2 A1:P1|A2:P-2 3|" > + "C1-3:P1:S+ C3:P2 . . . T:O3=0 O3=1 . 0 A1:1-2|A2:3 A1:P1|A2:P2 3" > "$SETUP_A123_PARTITIONS . O1=0 . . . 0 A1:|A2:2|A3:3 A1:P1|A2:P1|A3:P1" > "$SETUP_A123_PARTITIONS . O2=0 . . . 0 A1:1|A2:|A3:3 A1:P1|A2:P1|A3:P1" > "$SETUP_A123_PARTITIONS . O3=0 . . . 0 A1:1|A2:2|A3: A1:P1|A2:P1|A3:P1" > @@ -764,7 +765,7 @@ check_cgroup_states() > # only CPUs in isolated partitions as well as those that are isolated at > # boot time. > # > -# $1 - expected isolated cpu list(s) {,} > +# $1 - expected isolated cpu list(s) {|} > # - expected sched/domains value > # - cpuset.cpus.isolated value = if not defined > # > @@ -773,6 +774,7 @@ check_isolcpus() > EXPECTED_ISOLCPUS=$1 > ISCPUS=${CGROUP2}/cpuset.cpus.isolated > ISOLCPUS=$(cat $ISCPUS) > + HKICPUS=$(cat /sys/devices/system/cpu/isolated) > LASTISOLCPU= > SCHED_DOMAINS=/sys/kernel/debug/sched/domains > if [[ $EXPECTED_ISOLCPUS = . ]] > @@ -810,6 +812,11 @@ check_isolcpus() > ISOLCPUS= > EXPECTED_ISOLCPUS=$EXPECTED_SDOMAIN > > + # > + # The inverse of HK_TYPE_DOMAIN cpumask in $HKICPUS should match $ISOLCPUS > + # > + [[ "$ISOLCPUS" != "$HKICPUS" ]] && return 1 > + > # > # Use the sched domain in debugfs to check isolated CPUs, if available > # -- Best regards, Ridong