From patchwork Sat Dec 17 18:55:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 34225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1635867wrn; Sat, 17 Dec 2022 10:56:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf4z96VyGC/UBUikkL9F4IRZBSO9CvYEXUVzqRIUondz43xZYTxzaPhK8oUZHRNKQxS0FUE2 X-Received: by 2002:a05:6402:3642:b0:45c:835c:1ecc with SMTP id em2-20020a056402364200b0045c835c1eccmr33694232edb.26.1671303392196; Sat, 17 Dec 2022 10:56:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303392; cv=none; d=google.com; s=arc-20160816; b=Glt7DsLGiHNh+axQaYCe/Br+HsQyjlBLqbWiR5w3DQijR3257dwAJqBMTcLKh0AGSH Li8sS/nl5xoPHEfpg0qx8hVTkLOJrUJhF0Vw9P/F3dvnkb95SGbwkYYBC1EsMUsXr8LC utT4gfSClbi+ronr8zhU7ful9LQEhx7WQ81G/8e0Fnmq6tlxtkdqAUtfKYzz/ywyRUuq TCr4gopLhvQSFR5nPEUSV+E38mpImnUqy3im8+aWF7qry7nDGVLoLp5UMp/V08OHT50c jqnHZ/K/23nI5p+66SpSmU4H1disxJN3uPxR34tP6vCrAo4LJOXzDuYY4JlaWnpLRQfZ pzxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=7Hl8fIVQ+iann6jMELIl27UvronYuxaCq2Quycexs1I=; b=jgetptgKeBKjeLnR4t6T+tsojR7xC2Bi4ZH1o9iRq7crDbYWEXz0bhye2jd1TQPTeU hTiNC0ltPcKWWScKkgq4fd3C1EARSJBnpzMGR9JuQpY2X9HUUUXYop28/L6NIFHFRpeM 2kY4IvB7R9aSRgUPWy4a4o2eOGZdnB/Y/YLNCmc8/lDCOtWOf799JXEjMZB++j4gvm4W lOmfWfBs6UHKn9GJd5dV+2vSzydoCD9gqb5EbrN2mWf5HHarxeUwkKbU1Qn3VpadkzY3 wI3Vc2PGMvtomM/SOquXDiiElZNWrgAHmLc5Sbw+p6OBtKs8rslJZcMpog6MjPPfpRNX 7QFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=HdIzZH+v; dkim=neutral (no key) header.i=@linutronix.de header.b=McswiTeB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs21-20020a170906dc9500b00779e6c93108si6169430ejc.598.2022.12.17.10.56.09; Sat, 17 Dec 2022 10:56:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=HdIzZH+v; dkim=neutral (no key) header.i=@linutronix.de header.b=McswiTeB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230051AbiLQSzj (ORCPT + 99 others); Sat, 17 Dec 2022 13:55:39 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749143110604702838?= X-GMAIL-MSGID: =?utf-8?q?1752488625492897946?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 7077d2ccb94dafd00b29cc2d601c9f6891648f5b Gitweb: https://git.kernel.org/tip/7077d2ccb94dafd00b29cc2d601c9f6891648f5b Author: Sean Christopherson AuthorDate: Thu, 10 Nov 2022 20:35:02 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, size_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; memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); @@ -372,16 +372,16 @@ void __init kasan_init(void) map_range(&pfn_mapped[i]); } - shadow_cpu_entry_begin = (void *)CPU_ENTRY_AREA_BASE; - shadow_cpu_entry_begin = kasan_mem_to_shadow(shadow_cpu_entry_begin); - shadow_cpu_entry_begin = (void *)round_down( - (unsigned long)shadow_cpu_entry_begin, PAGE_SIZE); + shadow_cea_begin = (void *)CPU_ENTRY_AREA_BASE; + shadow_cea_begin = kasan_mem_to_shadow(shadow_cea_begin); + shadow_cea_begin = (void *)round_down( + (unsigned long)shadow_cea_begin, PAGE_SIZE); - shadow_cpu_entry_end = (void *)(CPU_ENTRY_AREA_BASE + + shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE); - shadow_cpu_entry_end = kasan_mem_to_shadow(shadow_cpu_entry_end); - shadow_cpu_entry_end = (void *)round_up( - (unsigned long)shadow_cpu_entry_end, PAGE_SIZE); + shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end); + shadow_cea_end = (void *)round_up( + (unsigned long)shadow_cea_end, PAGE_SIZE); kasan_populate_early_shadow( kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM), @@ -403,9 +403,9 @@ void __init kasan_init(void) kasan_populate_early_shadow( kasan_mem_to_shadow((void *)VMALLOC_END + 1), - shadow_cpu_entry_begin); + shadow_cea_begin); - kasan_populate_early_shadow(shadow_cpu_entry_end, + kasan_populate_early_shadow(shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map)); kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),