From patchwork Tue Nov 15 22:26:22 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: 20614 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2970955wru; Tue, 15 Nov 2022 14:27:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4gEPnkxHuKdfrFhNRcb3aa5oXgWsJA4W5jIHV6zYRzfUsw/hqXyyOpWbcnjbAMXCRcOwcf X-Received: by 2002:a05:6402:3814:b0:461:7d1f:1a7b with SMTP id es20-20020a056402381400b004617d1f1a7bmr16270804edb.400.1668551268339; Tue, 15 Nov 2022 14:27:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668551268; cv=none; d=google.com; s=arc-20160816; b=psDTcenPGRXvSCicq9KnwnSo1e8IHrRE2Yz+D3Nbr/7bkV/SGky9Dvz4ttd5DsA4uf 5qPm8Ht6qUKoQVumyqZCw1LtoCdF7WlxE/dC5wrdqv5VnZJHOef4yJxSOojTjfkLytGF Ae/1x73NuGs+s0HtUYEkP8f+55y3wgFNs1jeACIOaxmsPcgw3Ok/E9QwHgiTyXCrdBXT kPKCCz9YjgGGftQ5jBmIU+lV2Qd1yOc4frHCUIHzd0CqgdSJRH+hKRPNEqeW+IoNoFtn lUE57OC9YVdgPDm6rMI/2duODA3bSjAKqxytNJ3/x+X06AGm0mwYP+fGN67PdksaH/LP HHwQ== 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=NQJGRFSBDlv3J3EfKhwZHOBNJcxKNUsEWHBDltavQDs=; b=QTwUU/vaWf+SrC+x5A/ThXhJiBJoDEl7/hM4tMkooFFpUPjUREDU/FPyzsUBHPPb69 3c2N2+bL5sGbZlE6newgaQGA+N4hiVLqcsftZVT6lqbXV3Tn97Qi5I8beD1pHsEY/qH9 Wer3IBtNoCQIqrMFbW896qTHVhJ5qJFEwPMXw5YU5E7CCs2HfUA8nO0ukL6u8j1FvkC4 pZFA6kh8ZqPMfyI/x4Fgkl0sMG+9BgGb3U04CrHynU3c3ZNNbDYdSQFggRZVyWasvwT2 iZskEHrQtuXBbqlYgAk3AYXXvHQt4Wc3i8ULIpUA14fYu5M2KubhOynrmjr4VcPC4N6y 8wjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Rx8nMrqf; dkim=neutral (no key) header.i=@linutronix.de; 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 du22-20020a17090772d600b007aeff3b0b17si7635653ejc.674.2022.11.15.14.27.24; Tue, 15 Nov 2022 14:27:48 -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=Rx8nMrqf; dkim=neutral (no key) header.i=@linutronix.de; 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 S232447AbiKOW1A (ORCPT + 99 others); Tue, 15 Nov 2022 17:27:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232037AbiKOW0h (ORCPT ); Tue, 15 Nov 2022 17:26:37 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9C0E30577; Tue, 15 Nov 2022 14:26:24 -0800 (PST) Date: Tue, 15 Nov 2022 22:26:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668551183; 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=NQJGRFSBDlv3J3EfKhwZHOBNJcxKNUsEWHBDltavQDs=; b=Rx8nMrqf0FSNz0/ixrtHwb+T+z4MxpsQ2Qu0aRh2s3PxTmR2bQ72iqsHcJ7j3fA3tWx4Sf ZKqnCtpcGc1kTdE8euJTsDme9JvhYlnDvOyJbyaTzLfyGvFANe4X0ZMb2skRP4/jDU8ZtA wV/Df3UKepuK+P60OhxbeyRkfPto97yM3kWce1CJV9fp3puM4jk7pYqLjgumpVih5z54Qk /ffgT77LrmLGTpt1tPJzc68/dMCYXU5NDBDmnYI8L3jXKz51KP7fQbzXiYMKWAmLR6ZUb5 F+4rxZgPtT/7zE8PpmcPeO2GzWG9N5JwP1lPb64ZRWV5GqbYJ25WfQGe9LdA0w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668551183; 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=NQJGRFSBDlv3J3EfKhwZHOBNJcxKNUsEWHBDltavQDs=; b=Wl0CNRiX49iQ3NrHMEKWgWgG9nw4OFw1lS+Znp7Z+364B4+Gobma6xFqyeOqIDYQljIoUD y0vdIl5MgHiWrCCA== 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: <166855118213.4906.10948114639173935510.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?1749602814305700571?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: e93cc3aa893e74ea391e06aba09cc4bf523c12c8 Gitweb: https://git.kernel.org/tip/e93cc3aa893e74ea391e06aba09cc4bf523c12c8 Author: Sean Christopherson AuthorDate: Thu, 10 Nov 2022 20:35:02 Committer: Peter Zijlstra CommitterDate: Tue, 15 Nov 2022 22:29:59 +01: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),