From patchwork Wed Nov 2 07:46:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 1008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3469162wru; Wed, 2 Nov 2022 00:51:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM602/7OVsMDwIQLK8eIbexH+6QtqHeYpZHvPX0qzqW0cQqDtQoBwfpLZOqCwGPcm5sCdp25 X-Received: by 2002:a05:6402:90a:b0:458:ca4d:a2f8 with SMTP id g10-20020a056402090a00b00458ca4da2f8mr23261723edz.230.1667375467912; Wed, 02 Nov 2022 00:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667375467; cv=none; d=google.com; s=arc-20160816; b=mX0Nb5FH3Hk7B2wBTET6vsQaRPYnWgA8ipC464m1TTW4hnAg1bl4v2CSR92F52ZMYG U+59iPhF94MwXvyBsYES4/J8FWagFIC8/yoDi8CgsJtDxVJ9ierREfGMfPcezkejetNM OmlQrbEUcLRJ0gcwJlBCkZz/vPBklsSOxkJEir/gf++/x/t5mRvMyiu8jZ+qbS9H30rd Rs1C9KIB92lWP9ew1hmEdMDZgzinEqYB2ju42Ip1y703qBocf6euJ2D6I9cz2Y8mUMg2 s/uGRYQJ7nDHuMS/iNRYVnJsJTWvrRG0NbdVMtXckysUes27mCYE2nX4DCbbDATQW9oV s4BQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=QXxgpBh7/7Ngps7X8Ud2Cswcq3gje0X5VBuwnN65KQc=; b=r9S7sMtKQ9cdadZ4ZAeod7OutUechTsLwa/TvPX0gkNkvjoMv9XNLchp8m0IyxHyJQ 54HfEuw1oHmgHWAYfajhdHOiaF44VsUmkiMGCP5ZqL8WdSKkv0KK7kKhB51dx7nxSJcv 4CqIXq0MUl7mInJjO5jzXxpsOQ0XP3gYWMIoYC6BFQmLSKeM8eNRxcHCffdR16rZCzY3 vnxaaXdPFp6D8Swk0oenqhr2HK0r3Kj1Udn2iejtIc9GEDqzuvd76ZUJs0O2xHk/waKI wZ+Fr+vnyh5QvRdbPZQMuGiqM0mtH9qBRct+0fAeCGlAmn33JXeC+RukAPll7XjIME3j WHpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=n8TLRKVn; 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 du5-20020a17090772c500b007a8c58b51a1si15708255ejc.179.2022.11.02.00.50.44; Wed, 02 Nov 2022 00:51:07 -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=n8TLRKVn; 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 S230416AbiKBHrU (ORCPT + 99 others); Wed, 2 Nov 2022 03:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230026AbiKBHrS (ORCPT ); Wed, 2 Nov 2022 03:47:18 -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 6C89025E8C; Wed, 2 Nov 2022 00:47:17 -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 AB4A31F8B0; Wed, 2 Nov 2022 07:47:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1667375235; 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; bh=QXxgpBh7/7Ngps7X8Ud2Cswcq3gje0X5VBuwnN65KQc=; b=n8TLRKVn9h8Rnp5Qz1eBqnKdpz+LlW+wk2cr0jH2R9Mf0D6vec0wj4098jH0FEygWoopCM Q5RZbiPcLUOekkdwOsPUF5q5FEqI7LAbyV7+H26oaUgT5DwGL0giJK6ol20V5ZG91ZcSQO DoOjkLWZ/z8qlJoUOLpd9l1cZ5vykT4= 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 52AB51376E; Wed, 2 Nov 2022 07:47:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Hyq9EoMgYmOBcgAAMHmgww (envelope-from ); Wed, 02 Nov 2022 07:47:15 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-pm@vger.kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , "Rafael J. Wysocki" , Pavel Machek , Andy Lutomirski , Peter Zijlstra Subject: [PATCH v5 00/16] x86: make PAT and MTRR independent from each other Date: Wed, 2 Nov 2022 08:46:57 +0100 Message-Id: <20221102074713.21493-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 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?1748369898734159475?= X-GMAIL-MSGID: =?utf-8?q?1748369898734159475?= Today PAT can't be used without MTRR being available, unless MTRR is at least configured via CONFIG_MTRR and the system is running as Xen PV guest. In this case PAT is automatically available via the hypervisor, but the PAT MSR can't be modified by the kernel and MTRR is disabled. The same applies to a kernel built with no MTRR support: it won't allow to use the PAT MSR, even if there is no technical reason for that, other than setting up PAT on all CPUs the same way (which is a requirement of the processor's cache management) is relying on some MTRR specific code. Fix all of that by: - moving the function needed by PAT from MTRR specific code one level up - reworking the init sequences of MTRR and PAT to be more similar to each other without calling PAT from MTRR code - removing the dependency of PAT on MTRR There is some more cleanup done reducing code size. Note that patches 1+2 have already been applied to tip.git x86/cpu. They are included in this series only for reference. Changes in V5: - addressed comments Changes in V4: - new patches 10, 14, 15, 16 - split up old patch 4 into 3 patches - addressed comments Changes in V3: - replace patch 1 by just adding a comment Changes in V2: - complete rework of the patches based on comments by Boris Petkov - added several patches to the series Juergen Gross (16): x86/mtrr: add comment for set_mtrr_state() serialization x86/mtrr: remove unused cyrix_set_all() function x86/mtrr: replace use_intel() with a local flag x86/mtrr: rename prepare_set() and post_set() x86/mtrr: split MTRR specific handling from cache dis/enabling x86: move some code out of arch/x86/kernel/cpu/mtrr x86/mtrr: Disentangle MTRR init from PAT init. x86/mtrr: remove set_all callback from struct mtrr_ops x86/mtrr: simplify mtrr_bp_init() x86/mtrr: get rid of __mtrr_enabled bool x86/mtrr: let cache_aps_delayed_init replace mtrr_aps_delayed_init x86/mtrr: add a stop_machine() handler calling only cache_cpu_init() x86: decouple PAT and MTRR handling x86: switch cache_ap_init() to hotplug callback x86: do MTRR/PAT setup on all secondary CPUs in parallel x86/mtrr: simplify mtrr_ops initialization arch/x86/include/asm/cacheinfo.h | 19 ++++ arch/x86/include/asm/memtype.h | 5 +- arch/x86/include/asm/mtrr.h | 17 +-- arch/x86/kernel/cpu/cacheinfo.c | 173 +++++++++++++++++++++++++++++ arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/mtrr/amd.c | 8 +- arch/x86/kernel/cpu/mtrr/centaur.c | 8 +- arch/x86/kernel/cpu/mtrr/cyrix.c | 42 +------ arch/x86/kernel/cpu/mtrr/generic.c | 127 ++++----------------- arch/x86/kernel/cpu/mtrr/mtrr.c | 171 ++++------------------------ arch/x86/kernel/cpu/mtrr/mtrr.h | 15 +-- arch/x86/kernel/setup.c | 14 +-- arch/x86/kernel/smpboot.c | 9 +- arch/x86/mm/pat/memtype.c | 152 +++++++++---------------- arch/x86/power/cpu.c | 3 +- include/linux/cpuhotplug.h | 1 + 16 files changed, 308 insertions(+), 458 deletions(-)