From nobody Mon Feb 9 09:16:00 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B0AF92E3391; Tue, 4 Mar 2025 19:43:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741117434; cv=none; b=vB38vA9WTVE1idqDX9gLP0p+Bln2Q5/0wLVcfgDWN+QtIq/gqek7Rop7SxOQCav2YMkYHF4zDVeZPWArrSPtSWNkQeMOOHzqoTkToyyw8708Jyu7yQtz8P0Rmjt/AgPmzQ2Pi6z6wj6WEtStoTQnuEQUqtmkvlOY6Fez8uR99fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741117434; c=relaxed/simple; bh=Fr+6TVjkqNlHZj4oVGI/5hVk0MY9E/et8UcABbDyo3Q=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MCCEPkjw5BnubNl50OnYd4LOLON3K9BUz4U5XwZWqDXO1Q2kmZnX1QRV/r3GwvPo3g6AZwN0jlumHhrC5kSwBRxEF0bqNJ7ZI36no94gYqKX3q7PA4FBT4mHw9KIhlDDrRz+YRSAOFkrvkB8YaVsa9eE3MJTUFFsDn2/HyxsrwU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=XAZLExen; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=r40VNe6Q; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="XAZLExen"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="r40VNe6Q" Date: Tue, 04 Mar 2025 19:43:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741117431; h=from:from:sender:sender:reply-to: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=CQNEB3FKuBLVkVRBUXyLia8f3JFS/l1cUQsvBp1q9QE=; b=XAZLExenvD+SckXLsoasZERXl/RWeboPPyZvuGBI5EwPkNOasB9PgZAW3jv2GAaR3WmEuR fR85D4QoEDWAADQLc22/IiDu3+2bYeHn3wAZgNcCmtfi/QTLFwkm+foZtUtFg2Dw+tNBfM R5R114mRa+jIgALgWcCQgILlcR2HqHS9o2C+0h1IsYhJN+m6jPvhOpDmiYmo5DJuGmJIPw JUNQ/HwQVppEMcpO1df8czJVjr3p0gox6L6c1wmEHP+Okv4jvQCd2L1ZTil5QM5L1YMHyM vnSPWFIAXUbwLqAEWMRd4VcHXVqUG8TNPsORJqL3zPxBoH+NLwBHrrN2i0Wvfw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741117431; h=from:from:sender:sender:reply-to: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=CQNEB3FKuBLVkVRBUXyLia8f3JFS/l1cUQsvBp1q9QE=; b=r40VNe6QI8tcmlnHDiWXAD0jaIA57PIfp97EK1Z8i3Hs7W9weSctxanQ5z9LBT6FcZh7Mi qbG9Hh9T015jcMCg== From: "tip-bot2 for Uros Bizjak" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/percpu: Fix __per_cpu_hot_end marker Cc: Ingo Molnar , Uros Bizjak , Brian Gerst , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250304173455.89361-1-ubizjak@gmail.com> References: <20250304173455.89361-1-ubizjak@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174111743016.14745.17638610905298562615.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/core branch of tip: Commit-ID: 6d536cad0d55e71442b6d65500f74eb85544269e Gitweb: https://git.kernel.org/tip/6d536cad0d55e71442b6d65500f74eb85= 544269e Author: Uros Bizjak AuthorDate: Tue, 04 Mar 2025 18:34:36 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Mar 2025 20:30:33 +01:00 x86/percpu: Fix __per_cpu_hot_end marker Make __per_cpu_hot_end marker point to the end of the percpu cache hot data, not to the end of the percpu cache hot section. This fixes CONFIG_MPENTIUM4 case where X86_L1_CACHE_SHIFT is set to 7 (128 bytes). Also update assert message accordingly. Reported-by: Ingo Molnar Signed-off-by: Uros Bizjak Signed-off-by: Ingo Molnar Cc: Brian Gerst Link: https://lore.kernel.org/r/20250304173455.89361-1-ubizjak@gmail.com Closes: https://lore.kernel.org/lkml/Z8a-NVJs-pm5W-mG@gmail.com/ --- arch/x86/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 31f9102..ccdc45e 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -331,7 +331,7 @@ SECTIONS } =20 PERCPU_SECTION(L1_CACHE_BYTES) - ASSERT(__per_cpu_hot_end - __per_cpu_hot_start <=3D 64, "percpu cache hot= section too large") + ASSERT(__per_cpu_hot_end - __per_cpu_hot_start <=3D 64, "percpu cache hot= data too large") =20 RUNTIME_CONST_VARIABLES RUNTIME_CONST(ptr, USER_PTR_MAX) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinu= x.lds.h index c4e8fac..4925441 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -1072,9 +1072,8 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPE= LLER_CLANG) . =3D ALIGN(cacheline); \ __per_cpu_hot_start =3D .; \ *(SORT_BY_ALIGNMENT(.data..percpu..hot.*)) \ - __per_cpu_hot_pad =3D .; \ - . =3D ALIGN(cacheline); \ __per_cpu_hot_end =3D .; \ + . =3D ALIGN(cacheline); \ *(.data..percpu..read_mostly) \ . =3D ALIGN(cacheline); \ *(.data..percpu) \