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=1794888402; b=GCnWkzi+CEuleMva6CtZSNBgFMW/boLe+8h8kshZvYkis3awf9U5Km9zhSb/9ncvnXD/ Mnd+NSLBdax7hdV0X7tRSg884SYddMeMeCds6dTTEomqkmUParX3GEbv90+xzYFHtMfkf nvGYn3ZfuV5nMFTVX1FgH0j80B6A3gkimcTEwk1QxpCjKtVhgfUhn90kZls5AJzsOfXZS ElB3XA30//I0m9+lMBPTSI/VuXeVEn2ziFUQYfMI9bKb5b6Kn19BByoJxoBbhGFRpdB7B nKuqBbuFTsIvjle34SXq3KLUU094zlmbnbUBfeE98L/52uvrLbpBqnfTtqTtWYiqLFA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794888402; 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=va/mnMTqx710thSJTM0Z8CocDpxShRf7Hl6EIOOUmGE=; b=nPEtOWrQ1hKsOMHBluhXCvcIX+ALlZgVFv4ZrvJgUp7Byzb3kGG1ZBRZafoeY9apQS72 gmiOgvoxDfozhuMZUHPKb1bajT0gVYCta/ESYHL/Ybx4/Cu7FhM1cuk17v8gUxol/Mx96 UY9yFAF8M77QI9ogINcnmpW5fB9kmTFilXW4acAku4VcP6JdnyzLh2SVa2NIjULNR2Lvt DLyNazZgTuJe8MzDc+32BBQyNFHo516jVTt8QO3A6HCkB43W3FqCg06wg4bTXakjWorQy PMzXo1pgLSmbrTJKGrB7w8WRAXZCly359y2Tp0OAgcmTCvANetfh9DkHZtV7WYdQofQ== 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=V3euVlpn; 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 A656D606A333 for ; Tue, 17 Nov 2026 04:06:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A656D606A333 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=V3euVlpn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1794888400; 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=va/mnMTqx710thSJTM0Z8CocDpxShRf7Hl6EIOOUmGE=; b=V3euVlpn6td8Nynoxddx60zh4BegjQu5NJ/dl/zoLHuQ0oUcDZZwEb941feU8OrykCiEVg fV+cYb84C/iHtpl+xnWbMdIS4M/F0WPP45+cTKKf4ojvOi0gBKB+dqkWL9iYL58O9siJjo 4bOwTqTU5DLU2Hnag7ZtP4gmazTO8lk= 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-362-CViUN3KmOXme1qAmpHQ0cQ-1; Mon, 16 Nov 2026 23:06:37 -0500 X-MC-Unique: CViUN3KmOXme1qAmpHQ0cQ-1 X-Mimecast-MFC-AGG-ID: CViUN3KmOXme1qAmpHQ0cQ_1794888395 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 12CA818001EF; Tue, 17 Nov 2026 04:06:35 +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 6EFCD180055C; Tue, 17 Nov 2026 04:06:33 +0000 (UTC) Message-ID: Date: Mon, 16 Nov 2026 23:06:32 -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 6/6] cgroup/cpuset: Fix lockdep_is_cpuset_held() 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 References: <20261116012330.2271010-1-longman@redhat.com> <20261116012330.2271010-7-longman@redhat.com> Content-Language: en-US From: Waiman Long In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 On 11/16/26 2:24 AM, Ridong Chen wrote: > > > On 11/16/2026 9:23 AM, Waiman Long wrote: >> Commit a84097e625f2 ("cgroup/cpuset: Call housekeeping_update() >> without holding cpus_read_lock") changes lockdep_is_cpuset_held() >> to return true if either cpuset_mutex or cpuset_top_mutex is held. >> lockdep_is_cpuset_held() is used by housekeeping_dereference_check() >> as one of the conditions that rcu_read_lock() is not needed to >> access HK_TYPE_DOMAIN cpumask that can be changed at run time. >> In reality, it should return true only if cpuset_top_mutex is held as >> housekeeping_update() is called with only cpuset_top_mutex held. >> >> If only cpuset_mutex is held, it is possible that there can be a >> parallel >> housekeeping_update() call leading to a potential use-after-free >> situation >> when HK_TYPE_DOMAIN housekeeping cpumask is being accessed. It also >> means that rcu_read_lock will be required if only cpuset_mutex is being >> held like when calling from hotplug, scheduler or cgroup. >> >> Fixes: a84097e625f2 ("cgroup/cpuset: Call housekeeping_update() >> without holding cpus_read_lock") >> Signed-off-by: Waiman Long >> --- >>   kernel/cgroup/cpuset-v1.c | 16 ++++++++++------ >>   kernel/cgroup/cpuset.c    |  9 +++++++-- >>   2 files changed, 17 insertions(+), 8 deletions(-) >> >> diff --git a/kernel/cgroup/cpuset-v1.c b/kernel/cgroup/cpuset-v1.c >> index 7c7f2887dfaf..6bf6da639fec 100644 >> --- a/kernel/cgroup/cpuset-v1.c >> +++ b/kernel/cgroup/cpuset-v1.c >> @@ -686,6 +686,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t >> **domains, >>       int csn;        /* how many cpuset ptrs in csa so far */ >>       int i, j;        /* indices for partition finding loops */ >>       cpumask_var_t *doms;    /* resulting partition; i.e. sched >> domains */ >> +    cpumask_var_t hk_cpus;    /* HK_TYPE_DOMAIN housekeeping CPUs */ >>       struct sched_domain_attr *dattr;  /* attributes for custom >> domains */ >>       int ndoms = 0;        /* number of sched domains in result */ >>       int nslot;        /* next empty doms[] struct cpumask slot */ >> @@ -698,6 +699,11 @@ int cpuset1_generate_sched_domains(cpumask_var_t >> **domains, >>       dattr = NULL; >>       csa = NULL; >>   +    alloc_cpumask_var(&hk_cpus, GFP_KERNEL); >> +    scoped_guard(rcu) { >> +        cpumask_copy(hk_cpus, housekeeping_cpumask(HK_TYPE_DOMAIN)); >> +    } >> + > > The return value of alloc_cpumask_var() isn't checked. With > CONFIG_CPUMASK_OFFSTACK=y, hk_cpus is NULL on failure. Maybe goto done > like the other allocation failures here? > > Also, rebuild_sched_domains() can be called from outside cpuset, e.g. > arch_topology and the energy model, with only cpus_read_lock and > cpuset_mutex held. partition_sched_domains_locked() reads > HK_TYPE_DOMAIN in asym_cpu_capacity_scan() and in its fallback path. > Will these trigger a lockdep warning after this change? If so, do they > need an RCU read lock as well? > > Yes, I realize that some additional scheduler functions will need to be updated as well for this to work. I am planning to have an alternative solution to work around this problem. I am going to drop this patch and send out another patch soon. Cheers, Longman >>       /* Special case for the 99% of systems with one, full, sched >> domain */ >>       if (is_sched_load_balance(&top_cpuset)) { >>           ndoms = 1; >> @@ -710,9 +716,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t >> **domains, >>               *dattr = SD_ATTR_INIT; >>               update_domain_attr_tree(dattr, &top_cpuset); >>           } >> -        cpumask_and(doms[0], top_cpuset.effective_cpus, >> -                housekeeping_cpumask(HK_TYPE_DOMAIN)); >> - >> +        cpumask_and(doms[0], top_cpuset.effective_cpus, hk_cpus); >>           goto done; >>       } >>   @@ -736,8 +740,7 @@ int >> cpuset1_generate_sched_domains(cpumask_var_t **domains, >>            */ >>           if (!cpumask_empty(cp->cpus_allowed) && >>               !(is_sched_load_balance(cp) && >> -              cpumask_intersects(cp->cpus_allowed, >> -                     housekeeping_cpumask(HK_TYPE_DOMAIN)))) >> +              cpumask_intersects(cp->cpus_allowed, hk_cpus))) >>               continue; >>             if (is_sched_load_balance(cp) && >> @@ -794,7 +797,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t >> **domains, >>                           *(dattr + nslot) = SD_ATTR_INIT; >>                   } >>                   cpumask_or(dp, dp, csa[j]->effective_cpus); >> -                cpumask_and(dp, dp, >> housekeeping_cpumask(HK_TYPE_DOMAIN)); >> +                cpumask_and(dp, dp, hk_cpus); >>                   if (dattr) >>                       update_domain_attr_tree(dattr + nslot, csa[j]); >>               } >> @@ -806,6 +809,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t >> **domains, >>     done: >>       kfree(csa); >> +    free_cpumask_var(hk_cpus); >>         /* >>        * Fallback to the default domain if kmalloc() failed. >> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c >> index 64cbcbdbf6da..d18439e13bce 100644 >> --- a/kernel/cgroup/cpuset.c >> +++ b/kernel/cgroup/cpuset.c >> @@ -343,10 +343,13 @@ void cpuset_full_unlock(void) >>   } >>     #ifdef CONFIG_LOCKDEP >> +/* >> + * Holding cpuset_top_mutex will guarantee that a parallel >> + * housekeeping_update() call modifying housekeeping cpumasks is not >> possible. >> + */ >>   bool lockdep_is_cpuset_held(void) >>   { >> -    return lockdep_is_held(&cpuset_mutex) || >> -           lockdep_is_held(&cpuset_top_mutex); >> +    return lockdep_is_held(&cpuset_top_mutex); >>   } >>   #endif >>   @@ -1416,8 +1419,10 @@ static bool >> prstate_housekeeping_conflict(int new_prs, int parent_prs, >>           } >>       } >>   +    rcu_read_lock(); >>       cpumask_and(full_hk_cpus, >> housekeeping_cpumask(HK_TYPE_KERNEL_NOISE), >>               housekeeping_cpumask(HK_TYPE_DOMAIN)); >> +    rcu_read_unlock(); >>       cpumask_andnot(full_hk_cpus, full_hk_cpus, isolated_cpus); >>       cpumask_and(full_hk_cpus, full_hk_cpus, cpu_active_mask); >>       res = !cpumask_weight_andnot(full_hk_cpus, new_cpus); >