From nobody Wed Sep 17 15:57:55 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34F1CC4332F for ; Sat, 17 Dec 2022 18:55:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbiLQSzk (ORCPT ); Sat, 17 Dec 2022 13:55:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbiLQSzd (ORCPT ); Sat, 17 Dec 2022 13:55:33 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92EFA10B6A; Sat, 17 Dec 2022 10:55:32 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303330; 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=7Hl8fIVQ+iann6jMELIl27UvronYuxaCq2Quycexs1I=; b=HdIzZH+vQpv0vtyRjK48wNgbAb8bxc18vngWIRsrlo0cjuy3qmTvBYHbXWSXPxSLZpn+W8 VgiLWAnBTHnwPLleusxeO3bSOAS4LeEMkUF0eOuBi+D3sDjyi88FESCh8hcPh8Xc4BEHaO 0p4WE7EMd/W9Q9tf0dFFyE4wBkWhF3PIefLbhCG9maugIF5X7jZkbuJV2jiWIAyPeB9nK8 yMycOoMgmEPtSDB2rKC4rTjDuMjJTpvuoArsFuH1YXE0Al3x3hXcJIGlujL0M3hGe7E1Hg A5Xc9tpFoay55/qUmp4MmzGgQBt3Ui0Q1z2tzD3iPl14yOhK5Tn0sRAwKGwo3w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303330; 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=7Hl8fIVQ+iann6jMELIl27UvronYuxaCq2Quycexs1I=; b=McswiTeB0AJhm54S0bv6pA1AMXrH16Im2TvxRA3iWJbKE6AUpyA8QIHY6642o4MQOQKR27 dV02/yoCTTrEo0DQ== From: "tip-bot2 for Sean Christopherson" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names Cc: Sean Christopherson , "Peter Zijlstra (Intel)" , Andrey Ryabinin , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221110203504.1985010-4-seanjc@google.com> References: <20221110203504.1985010-4-seanjc@google.com> MIME-Version: 1.0 Message-ID: <167130332996.4906.17918341321563753453.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/mm branch of tip: Commit-ID: 7077d2ccb94dafd00b29cc2d601c9f6891648f5b Gitweb: https://git.kernel.org/tip/7077d2ccb94dafd00b29cc2d601c9f689= 1648f5b Author: Sean Christopherson AuthorDate: Thu, 10 Nov 2022 20:35:02=20 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00 x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names Rename the CPU entry area variables in kasan_init() to shorten their names, a future fix will reference the beginning of the per-CPU portion of the CPU entry area, and shadow_cpu_entry_per_cpu_begin is a bit much. No functional change intended. Signed-off-by: Sean Christopherson Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Andrey Ryabinin Link: https://lkml.kernel.org/r/20221110203504.1985010-4-seanjc@google.com --- arch/x86/mm/kasan_init_64.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index d141692..ad7872a 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -331,7 +331,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, s= ize_t size, int nid) void __init kasan_init(void) { int i; - void *shadow_cpu_entry_begin, *shadow_cpu_entry_end; + void *shadow_cea_begin, *shadow_cea_end; =20 memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); =20 @@ -372,16 +372,16 @@ void __init kasan_init(void) map_range(&pfn_mapped[i]); } =20 - shadow_cpu_entry_begin =3D (void *)CPU_ENTRY_AREA_BASE; - shadow_cpu_entry_begin =3D kasan_mem_to_shadow(shadow_cpu_entry_begin); - shadow_cpu_entry_begin =3D (void *)round_down( - (unsigned long)shadow_cpu_entry_begin, PAGE_SIZE); + shadow_cea_begin =3D (void *)CPU_ENTRY_AREA_BASE; + shadow_cea_begin =3D kasan_mem_to_shadow(shadow_cea_begin); + shadow_cea_begin =3D (void *)round_down( + (unsigned long)shadow_cea_begin, PAGE_SIZE); =20 - shadow_cpu_entry_end =3D (void *)(CPU_ENTRY_AREA_BASE + + shadow_cea_end =3D (void *)(CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE); - shadow_cpu_entry_end =3D kasan_mem_to_shadow(shadow_cpu_entry_end); - shadow_cpu_entry_end =3D (void *)round_up( - (unsigned long)shadow_cpu_entry_end, PAGE_SIZE); + shadow_cea_end =3D kasan_mem_to_shadow(shadow_cea_end); + shadow_cea_end =3D (void *)round_up( + (unsigned long)shadow_cea_end, PAGE_SIZE); =20 kasan_populate_early_shadow( kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM), @@ -403,9 +403,9 @@ void __init kasan_init(void) =20 kasan_populate_early_shadow( kasan_mem_to_shadow((void *)VMALLOC_END + 1), - shadow_cpu_entry_begin); + shadow_cea_begin); =20 - kasan_populate_early_shadow(shadow_cpu_entry_end, + kasan_populate_early_shadow(shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map)); =20 kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),