From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 810074A5C34 for ; Wed, 16 Sep 2026 13:45:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789566338; cv=none; b=RE42zYa0ztxnbFs6lzf2Hsew8zyo1teZv9YF1qBydmRhB+qN3c8z1I0IBWXfxpeKJdQOASMu8DQ9scmibONNlPJP8TQK5O4OOjtznsm8KEutYh6/wC41/LrDh7XzprpkYwYMUoW2USHNDURMK9314fSGZvsdLlZs9IDS9UrE8OU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789566338; c=relaxed/simple; bh=cSvOuwzUhUCCpZOp3LACYO6bCBjLAM6v63no8jsFevQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YeA32Qa3VdRigg0LkRw4rdRjVxjUbHMKO7SuvvwMwm2ncEPhuzsFbsAueSSLICJWI26Zx8WaLRtELu9XDjrwYYhasqdZ5KsK2np4Ix21xiIt2yctiZ9jCJc75BiE3H0eczHUuWj3r+4HQneahHCbh4bn/XOmcTREvXhdw/0vRE0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=rAmVI+mE; arc=none smtp.client-ip=209.85.221.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rAmVI+mE" Received: by mail-vk1-f170.google.com with SMTP id 71dfb90a1353d-5c985f055b9so2296130e0c.0 for ; Wed, 16 Sep 2026 06:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789566325; x=1790171125; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ck3kqnGFwURHR7AM181gzyy+0qq9NWGY55jHx9dGdQI=; b=rAmVI+mEdQfhuIkJ+Dkzi3WRps4AoT7VxaloJ5GHa8YivhrfyTO5zXK8v7aZ8reg5j GO+tt/MdFPACkwpeqMhlM9AHs+fyaac+xrMoWi7PdubCBfc4Jzvm9XICCDrIsAm0Ebg1 tY97LcT2+0Cz9kejYAn+iwxUXuYsEtaKBxmW2EGVd+lOiHj7sMglfQbH/lo9C2RXKvdv fozvpiKpBnZt8UI8Tu+hp15HE5YVTJ/bOB0JCegWPuOLEioLD21QuzOUMoAsN09x55Pb JE/8HUCp+P/HjvGU7aQkVOjF718jd/KtdPUWqU3HYLT3O+sCRsFl062pEcvxwZxvYlSW qdOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789566325; x=1790171125; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ck3kqnGFwURHR7AM181gzyy+0qq9NWGY55jHx9dGdQI=; b=W2iK5YmAdj5oyb1IPM+QsGk1vuT/J6Ul/KPb/iystOCWPvdrGP9iKZGkjrG05dW6vD bFX5godC0M7YU0zcFckOaMnShq4AHUilVXfZnOvNsQkpChEla65oIfSlxtbos0LVk4Kh D5miYYpP8gGFyRzQsewMxwI7T0F1t83nO/xJkiDvGeuWG306W/5RwuPTkyrXKHaE7lwB xvF4FeZP74XvsCUWpn06/U1Li/7nnyQIclb9WLs+VKjpWvlazKlZFEk7P5qxJBwXuf/h 1tpppt2shl/OC7cTazFt5/8vI++PVR4hvVOsKZzNwst4mIe5bFWiZia+zC68oHlF1M5F QVcg== X-Forwarded-Encrypted: i=1; AKwUvBzQNk7mI0hfapTf/UDggyOa6j6fc45dKFW7W5N0bYazLdvnodWBtq5jteAfKowqgjPjhvgoPsjSOH9Fju8=@vger.kernel.org X-Gm-Message-State: AFuF++l+XUvX6dhYcpng7m62uNmdtroZ7LSUJm5r24A56Vr7Cr4mgRTO eFrgKxw/xUBWrRbLlkCrA2PAak+jgyaRw94unQMfe4KG9XtfUkEbfwqF X-Gm-Gg: AYBFou3Cb4moWjueC9F5xi3pJpm+lIsmH/SWkSwlf3wnQXrVlnVKvgym6CzOPdixB0H plkSmfiDd6T/h7JDfilpWWPgzIMj7O8zPLgefnWGJkh1mqgSt66tT2Sh0ndjsZSPnVXQCW1Bhkn nP6eq0CnfvIje//i+9kcEQj23jBuSokf8gEHZWSFKzsIMrh3Hu1r/XCXhFCeRdUaAemvLGdKSRw x5NtcE6PmX0JiFNQxE3uLlpydpx1TwjZN6n2WuSVbRzuX9nFcuUo+XmN70FaAGgZFTO/P+dO5O6 0mobgmbkHEeFeYsYMp8QuTtanP+dAWGI1eR+dUGJTLFIFXOLMH8Qb0IeyKXUk8Qq8FzDQw4E0Si MuhPs/BZyCKXIXphs4D6K7134nAvJU338ltpnkiuwwgxqf9jnG+CSIj7uoYJk90jEYcptc1hhJW wIwESabPO7VWp+3EbmLEbRZrd938EBtcFyh9PYpUwURVYSuNlv5kN3FAvj+cW5dA6kD+aC5deDq 17szc2yCLfMglSrqlKD/pwAD114Vg== X-Received: by 2002:a05:6122:6202:b0:5c8:38b8:44a0 with SMTP id 71dfb90a1353d-5c98a4ff79bmr4643563e0c.8.1789566325042; Wed, 16 Sep 2026 06:45:25 -0700 (PDT) Received: from localhost ([148.227.86.192]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-5c998aa36cfsm2729594e0c.12.2026.09.16.06.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 06:45:24 -0700 (PDT) From: Davi Chaves Azevedo To: peterz@infradead.org, mingo@redhat.com Cc: Chen Yu , Vincent Guittot , Valentin Schneider , K Prateek Nayak , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Tim Chen , chen.yu@linux.dev, driver-core@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3] sched/cache: Refresh LLC capacity across CPU hotplug Date: Wed, 16 Sep 2026 10:44:32 -0300 Message-ID: <20260916134432.11767-1-davichazbh@gmail.com> In-Reply-To: <20260911134825.420748-1-davichazbh@gmail.com> References: <20260911134825.420748-1-davichazbh@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The scheduler scales LLC capacity by the fraction of cache-sharing CPUs covered by a domain: llc_bytes = cache_size * span_weight / shared_weight During CPU teardown, sched_cpu_deactivate() rebuilds scheduler domains before cacheinfo_cpu_pre_down() removes the CPU from shared_cpu_map. The new domains therefore use the old sharing weight. The later call to sched_update_llc_bytes() looks up the departing CPU's sd_llc, which has already been detached, and returns without correcting the surviving CPUs. On a Ryzen 5 7535U with twelve logical CPUs sharing a 16 MiB LLC, offlining one SMT sibling left the remaining CPUs with: llc_bytes = floor(16777216 * 11 / 12) = 15379114 bytes The correct capacity is still 16777216 bytes. On systems with active cache-aware scheduling, an underestimated capacity can cause exceed_llc_capacity() to reject aggregation for a process whose footprint would fit. Unchanged cpuset partitions sharing the physical cache can also retain stale capacity when a CPU comes online in another partition. Pass the cache-sharing mask already retained by cacheinfo to the scheduler update. Refresh every surviving CPU using its own LLC domain so that each partition receives the correct share. This also preserves the correction needed as cache-sharing maps grow during boot. Keep the existing CPU-hotplug and scheduler-domain synchronization. The update remains on the hotplug path; no steady-state scheduling operation or persistent allocation is added. Fixes: 7030513a0877 ("sched/cache: Calculate the LLC size and store it in sched_domain") Signed-off-by: Davi Chaves Azevedo Reviewed-by: Chen Yu Tested-by: Chen Yu Reviewed-by: Tim Chen Reviewed-by: K Prateek Nayak Tested-by: K Prateek Nayak --- Changes in v3: - Add K Prateek Nayak's Reviewed-by and Tested-by tags, Tim Chen's Reviewed-by, and Chen Yu's Tested-by. No functional changes from v2. Changes in v2: - Restore the original boot-time shared_cpu_map explanation, as Chen Yu suggested, alongside the CPU-offline and cpuset-partition rationale. No functional changes from v1. - Add Chen Yu's Reviewed-by tag and document his multi-LLC testing. v1: https://lore.kernel.org/r/20260911134825.420748-1-davichazbh@gmail.com v2: https://lore.kernel.org/r/20260911220229.1368887-1-davichazbh@gmail.com Review: https://lore.kernel.org/r/a3433e6a-0d1f-44a8-99bd-bc63d1a15913@intel.com The issue was identified by tracing the scheduler/cacheinfo teardown ordering, then checking live llc_bytes values using the running kernel's BTF layout and /proc/kcore. Local validation performed for v1 (no functional changes in v2 or v3): - Reproduced the stale value on 7.2.3-arch1-3 on the Ryzen system above. The patched kernel retained 16777216 bytes on every surviving CPU. - Ten SMT-thread and ten whole-core hotplug cycles passed on the patched kernel, including capacity checks after each removal and restoration. The existing limited CPU-hotplug selftest also passed. - Source-level state fixtures: five failures in eight scenarios before the fix, eight passes after it. These cover partition changes, unequal spans, sparse CPU IDs and boot-time map growth, but not concurrency. - Full x86-64 baseline and patched bzImage/modules builds passed with matched configs apart from LOCALVERSION. Focused ARM64, x86 without CONFIG_SCHED_CACHE, and x86 UP builds also passed. Thanks to Chen Yu for the additional verification and review. He reproduced the issue and confirmed that v1 restored the expected sd->llc_bytes on: - AMD Ryzen 8945HX: two LLCs, eight cores per LLC. - Xeon: four LLCs per node. Thanks to K Prateek Nayak for reviewing and testing, and to Tim Chen for the review. The local tests used a single-LLC host; Chen Yu reported the multi-LLC results above. These checks validate LLC accounting. Builds and hotplug tests were not rerun for this tag-only revision. drivers/base/cacheinfo.c | 11 ++++++----- include/linux/sched/topology.h | 4 ++-- kernel/sched/topology.c | 22 +++++++++++++--------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 9f9c72727a05..7a47a392568a 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -1040,9 +1040,10 @@ static int cacheinfo_cpu_online(unsigned int cpu) rc = cache_add_dev(cpu); if (rc) goto err; - if (cpu_map_shared_cache(true, cpu, &cpu_map)) + if (cpu_map_shared_cache(true, cpu, &cpu_map)) { update_per_cpu_data_slice_size(true, cpu, cpu_map); - sched_update_llc_bytes(cpu); + sched_update_llc_bytes(cpu_map); + } return 0; err: free_cache_attributes(cpu); @@ -1059,10 +1060,10 @@ static int cacheinfo_cpu_pre_down(unsigned int cpu) cpu_cache_sysfs_exit(cpu); free_cache_attributes(cpu); - if (nr_shared > 1) + if (nr_shared > 1) { update_per_cpu_data_slice_size(false, cpu, cpu_map); - - sched_update_llc_bytes(cpu); + sched_update_llc_bytes(cpu_map); + } return 0; } diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index b5d9d7c2b8ad..f96812d71c51 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -281,9 +281,9 @@ static inline int task_node(const struct task_struct *p) } #ifdef CONFIG_SCHED_CACHE -extern void sched_update_llc_bytes(unsigned int cpu); +extern void sched_update_llc_bytes(const struct cpumask *cpus); #else -static inline void sched_update_llc_bytes(unsigned int cpu) { } +static inline void sched_update_llc_bytes(const struct cpumask *cpus) { } #endif #endif /* _LINUX_SCHED_TOPOLOGY_H */ diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 0248227d983a..3dab0253976f 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -985,8 +985,8 @@ void sched_cache_active_set(void) } /* - * Update the bottom sched_domain's llc_bytes for @cpu and all its - * LLC siblings. Called from cacheinfo_cpu_online() or + * Update the bottom sched_domain's llc_bytes for @cpus sharing a physical + * LLC. Called from cacheinfo_cpu_online() or * cacheinfo_cpu_pre_down() with cpu hotplug lock held. * * Note: get_effective_llc_bytes() returns 0 on PowerPC. @@ -996,17 +996,13 @@ void sched_cache_active_set(void) * and does not populates the per-CPU struct cpu_cacheinfo array * that get_cpu_cacheinfo_llc() reads. */ -void sched_update_llc_bytes(unsigned int cpu) +void sched_update_llc_bytes(const struct cpumask *cpus) { struct sched_domain *sd, *sdp; unsigned int i; sched_domains_mutex_lock(); - sdp = rcu_dereference_sched_domain(per_cpu(sd_llc, cpu)); - if (!sdp) - goto unlock; - /* * ci->shared_cpu_map is built incrementally as CPUs come * online, so the first CPU in an LLC initially sees @@ -1014,14 +1010,22 @@ void sched_update_llc_bytes(unsigned int cpu) * get_effective_llc_bytes(). Re-evaluating every LLC * sibling on each online event corrects this once the full * shared_cpu_map is known. + * + * The departing CPU's domains have already been detached when + * cacheinfo removes it. Use the surviving cache siblings instead. + * They may belong to different cpuset partitions, so use each CPU's + * own LLC domain to scale its share of the physical cache. */ - for_each_cpu(i, sched_domain_span(sdp)) { + for_each_cpu(i, cpus) { + sdp = rcu_dereference_sched_domain(per_cpu(sd_llc, i)); + if (!sdp) + continue; + sd = rcu_dereference_sched_domain(cpu_rq(i)->sd); if (sd) sd->llc_bytes = get_effective_llc_bytes(i, sdp); } -unlock: sched_domains_mutex_unlock(); } base-commit: 50d05c7c76c96b90462f24debacca971d2e86713