From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 40A04349CC1 for ; Wed, 1 Jul 2026 19:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782935929; cv=none; b=qBbY8tSPJOUVmNcm3CjK2o8nsIHjdfzBkQqvgJcJjBWjJmAPyAy5KSK7UVw3EroFoka4zGg6IKf3qdFeYWa1ouKOx4iVqbkauYomDO6c+OdHonLBLLvAcIXo4BhkfPX/9MVPDKsRNRSav3rWOZzA8etDcpAdUzb4FgKHK1QTGpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782935929; c=relaxed/simple; bh=vRcES6qnD8ow5+tlbs7w8KAD5cGIYAQNrZh4kKGjK9c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gHHN0JbOdpSXWmfZUD/4tTx9sbfTmkjj55dvLail8zY6ev9XeWwdcydxHPZEF7kQ3MrmguElXAE9HOUH4aEnrKzSQVYTU3TmU5VDX/hL4D3r0au3bzYHPFR1CUR4N+jh8mC5ge2g7X24UwXG6V+e795O8W2r9h5oL50ptvUQWKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FYpXNr8b; arc=none smtp.client-ip=170.10.129.124 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.b="FYpXNr8b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782935927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jmL9cvJctbYXXO6NWuKHxjvEUTK7PCiLobJWSAH4tXE=; b=FYpXNr8bySrqp7NA/47Is4CuVAyiXbN4529uTsF3Qis6eMazY+ZLn3RyEGjvdTlaou40Hy h8RE99/KygH9Ohkk9dV3uBb4HPqA/amYxKHqLF1SZm4QB+MFBlir3amHf7VzOq6xeGKnit oPBfsMlFsoKGKVKaLqtnAI5EcVsiJjU= Received: from mx-prod-mc-05.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-441-RX8uomh4NpC05OjfHRtlcw-1; Wed, 01 Jul 2026 15:58:43 -0400 X-MC-Unique: RX8uomh4NpC05OjfHRtlcw-1 X-Mimecast-MFC-AGG-ID: RX8uomh4NpC05OjfHRtlcw_1782935922 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E2E1719235DA; Wed, 1 Jul 2026 19:58:34 +0000 (UTC) Received: from llong-thinkpadp16vgen1.westford.csb (unknown [10.2.16.170]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D1CE5180060C; Wed, 1 Jul 2026 19:58:30 +0000 (UTC) From: Waiman Long To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , Frederic Weisbecker Cc: linux-kernel@vger.kernel.org, Phil Auld , Waiman Long Subject: [PATCH v4] sched/isolation: Defer freeing of cpumask memblock memory to initcall Date: Wed, 1 Jul 2026 15:58:10 -0400 Message-ID: <20260701195810.477326-1-longman@redhat.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 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 When testing a linux-next kernel with commit 59bd1d914bb5 ("memblock: warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter. Cannot free reserved memory because of deferred initialization of the memory map WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in deferred_init_memmap(). Fix it by saving the housekeeping cpumask memblock memory to be freed into a llist free list in housekeeping_init() and add a new housekeeping_late_init() helper to defer the actual freeing of memblock memory to when initcall's are being processed. The cpumask memblock memory is treated as a llist_node with the size of a "long" type which is also smallest cpumask size that can be allocated. The non-atomic version of the llist APIs are used as there is no contention. This commit depends on the presence of commit 7c2eee9c1367 ("memblock: don't touch memblock arrays when memblock_free() is called late") to prevent a KASAN UAF bug report [1]. [1] https://lore.kernel.org/lkml/20260505051821.1107133-1-longman@redhat.com/ Fixes: 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers") Reviewed-by: Frederic Weisbecker Reviewed-by: Phil Auld Signed-off-by: Waiman Long --- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) [v4] Collect tags and update commit log diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index ef152d401fe2..156025ef81b7 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -8,6 +8,7 @@ * */ #include +#include #include #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { }; static struct housekeeping housekeeping; +static __initdata LLIST_HEAD(memblock_freelist); bool housekeeping_enabled(enum hk_type type) { @@ -189,10 +191,22 @@ void __init housekeeping_init(void) WARN_ON_ONCE(cpumask_empty(omask)); cpumask_copy(nmask, omask); RCU_INIT_POINTER(housekeeping.cpumasks[type], nmask); - memblock_free(omask, cpumask_size()); + __llist_add((struct llist_node *)omask, &memblock_freelist); } } +static int __init housekeeping_late_init(void) +{ + struct llist_node *llnode, *pos, *t; + + /* Free allocated memblock memory, if any */ + llnode = __llist_del_all(&memblock_freelist); + llist_for_each_safe(pos, t, llnode) + memblock_free(pos, cpumask_size()); + return 0; +} +pure_initcall(housekeeping_late_init); + static void __init housekeeping_setup_type(enum hk_type type, cpumask_var_t housekeeping_staging) { -- 2.54.0