From patchwork Sat Apr 1 06:36:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 78060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1061604vqo; Sat, 1 Apr 2023 00:03:23 -0700 (PDT) X-Google-Smtp-Source: AKy350YdVd+HXheGqfCt9DoQA3J4CopPapRXbXak3SGIh/KdB+2BrUWgdFOORJ8ZZuW4IJQ10XhF X-Received: by 2002:a17:903:338e:b0:19e:6b5f:fda9 with SMTP id kb14-20020a170903338e00b0019e6b5ffda9mr25821700plb.16.1680332603114; Sat, 01 Apr 2023 00:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680332603; cv=none; d=google.com; s=arc-20160816; b=ID90CHxyccCLLKOQX7q7uL2aWkYoPEJrLvTzYmTgXCJuyTKy3dg1TMQGpgz34iwCbo 07LlQDuoyx8vrNthGHa57+Zki+N3Huy9OkN+yk24ggvlvkLb8nWTDVhetB2ZLJcouNEx gYr60XWZtz5cUV4/zaVK8F/yIODvxkasb7/l3N84JrN8aSPp1AavJS2vm7xZRTZD+BlH dJJs04wsCSa4EJMeXboGlhzDGcvMYo2KGuIHtkiWRLMe1CsND+eHVNEIUzRFXFUCn8On yrp53pdIzpMLOAaEGYNxl4YSW4uqBN/TV1oSK/AX4vEGaXILzS3haWV0hs6U9eLDsJFN d/Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gsM8JG+0YjKpprMSP0WcpLzh0EmtHSX+OEFp6YWu4DY=; b=QkQr7UY9k7u0xuBGiWhCyFphBVBlWVxN1oEEj53lBK0flj24yTN+Z87dLVM8JbR1OE 4UIMHE3G0y2kxlGZgWE/VLKMQ8QJg7pb6DFz52ALmlnuyOWpOAOp+tIN7mPjrVfNVwc7 eJrl1kHAmlKCqbNSkMGJBFDUlU3kIQPVpWiO66r/tcqkSkQv8Gj8y9ehrWmHrbKvEhjE tqRw63tv9z+y5Zw/PP0Y/noeyUqhF+Nq2MNOdLgDVO7B9tPSy/MwIPBcnTsX5N7t4By2 HerPeBX7ONIF+xnkRrSz2acGFl197f1YT0G/YV0FXvyd/LGVnh6b2ExKEjDhNA7SKs7b LOrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=g8DLE9Ug; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i19-20020a170902eb5300b001967f72c227si3875793pli.390.2023.04.01.00.03.10; Sat, 01 Apr 2023 00:03:23 -0700 (PDT) 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=@suse.com header.s=susede1 header.b=g8DLE9Ug; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233244AbjDAGhI (ORCPT + 99 others); Sat, 1 Apr 2023 02:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233230AbjDAGhG (ORCPT ); Sat, 1 Apr 2023 02:37:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90EC51E73B for ; Fri, 31 Mar 2023 23:37:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 324471FD78; Sat, 1 Apr 2023 06:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680331021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gsM8JG+0YjKpprMSP0WcpLzh0EmtHSX+OEFp6YWu4DY=; b=g8DLE9Ug7PYEkqHVYmdV+X8Cg3YN7OhOO2THjBCiMltqzaduccgavEz5vuQLMoxChKwp7O qiXUoviI00yYbavx/BgEsUy+5Y3Kx9swildIQ6yxKHyyaa7PyZiTk9m953mG3IWXpviIqP GMlpfHJbaMPFJgIH7WxAVxFFzSG57rc= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E29F9134FB; Sat, 1 Apr 2023 06:37:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0IT8NQzRJ2QSdwAAMHmgww (envelope-from ); Sat, 01 Apr 2023 06:37:00 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Michael Kelley Subject: [PATCH v5 01/15] x86/mtrr: split off physical address size calculation Date: Sat, 1 Apr 2023 08:36:38 +0200 Message-Id: <20230401063652.23522-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230401063652.23522-1-jgross@suse.com> References: <20230401063652.23522-1-jgross@suse.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761956439527578358?= X-GMAIL-MSGID: =?utf-8?q?1761956439527578358?= Move the calculation of the physical address size in mtrr_bp_init() into a helper function. This will be needed later. Do only the pure code movement without optimizing it. Signed-off-by: Juergen Gross Tested-by: Michael Kelley --- V2: - new patch V3: - only move code, split off optimizations (Boris Petkov) --- arch/x86/kernel/cpu/mtrr/mtrr.c | 57 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c index 783f3210d582..8310bdb111d0 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.c +++ b/arch/x86/kernel/cpu/mtrr/mtrr.c @@ -620,22 +620,14 @@ static struct syscore_ops mtrr_syscore_ops = { int __initdata changed_by_mtrr_cleanup; #define SIZE_OR_MASK_BITS(n) (~((1ULL << ((n) - PAGE_SHIFT)) - 1)) -/** - * mtrr_bp_init - initialize mtrrs on the boot CPU - * - * This needs to be called early; before any of the other CPUs are - * initialized (i.e. before smp_init()). - * - */ -void __init mtrr_bp_init(void) + +static unsigned int __init mtrr_calc_physbits(bool generic) { - const char *why = "(not available)"; - u32 phys_addr; + unsigned int phys_addr; phys_addr = 32; - if (boot_cpu_has(X86_FEATURE_MTRR)) { - mtrr_if = &generic_mtrr_ops; + if (generic) { size_or_mask = SIZE_OR_MASK_BITS(36); size_and_mask = 0x00f00000; phys_addr = 36; @@ -667,29 +659,44 @@ void __init mtrr_bp_init(void) size_and_mask = 0; phys_addr = 32; } + } else { + size_or_mask = SIZE_OR_MASK_BITS(32); + size_and_mask = 0; + } + + return phys_addr; +} + +/** + * mtrr_bp_init - initialize mtrrs on the boot CPU + * + * This needs to be called early; before any of the other CPUs are + * initialized (i.e. before smp_init()). + * + */ +void __init mtrr_bp_init(void) +{ + const char *why = "(not available)"; + unsigned int phys_addr; + + phys_addr = mtrr_calc_physbits(boot_cpu_has(X86_FEATURE_MTRR)); + + if (boot_cpu_has(X86_FEATURE_MTRR)) { + mtrr_if = &generic_mtrr_ops; } else { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: - if (cpu_feature_enabled(X86_FEATURE_K6_MTRR)) { - /* Pre-Athlon (K6) AMD CPU MTRRs */ + /* Pre-Athlon (K6) AMD CPU MTRRs */ + if (cpu_feature_enabled(X86_FEATURE_K6_MTRR)) mtrr_if = &amd_mtrr_ops; - size_or_mask = SIZE_OR_MASK_BITS(32); - size_and_mask = 0; - } break; case X86_VENDOR_CENTAUR: - if (cpu_feature_enabled(X86_FEATURE_CENTAUR_MCR)) { + if (cpu_feature_enabled(X86_FEATURE_CENTAUR_MCR)) mtrr_if = ¢aur_mtrr_ops; - size_or_mask = SIZE_OR_MASK_BITS(32); - size_and_mask = 0; - } break; case X86_VENDOR_CYRIX: - if (cpu_feature_enabled(X86_FEATURE_CYRIX_ARR)) { + if (cpu_feature_enabled(X86_FEATURE_CYRIX_ARR)) mtrr_if = &cyrix_mtrr_ops; - size_or_mask = SIZE_OR_MASK_BITS(32); - size_and_mask = 0; - } break; default: break;