From patchwork Thu May 11 23:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 92877 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4735169vqo; Thu, 11 May 2023 16:35:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QxKVXU4C4aqoF3haBUs56ZkDb1T5qxMucXIOSlt8mzuqb+SXkzdK5RjaFaLErUohBCqgH X-Received: by 2002:a05:6a20:4419:b0:100:1044:9ccb with SMTP id ce25-20020a056a20441900b0010010449ccbmr22710230pzb.60.1683848134369; Thu, 11 May 2023 16:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683848134; cv=none; d=google.com; s=arc-20160816; b=G5y25+z83mlEF+KXn5nSRbzWiOIjoqRcF/Idey28Vo0DRzxe87m+Z77GOAtXE3DNgi IM3g59L8+zsA1MtHfqqivYkK8i8l2Cb0Z5aGYYGwNePw21s5I68sIrg3RElV3q9JRtR2 L+YCKO3mqisOvKpC20EtB6Tzl3jOeq6N04uyxOOxD4JilPBxT8RO5D9rO8cQ9YkLu/PA lh5h5qYfR+iviT1EGUjq7ZCC37Nd5+jA84DhGWyT66K/h9SgvTc/O7thywZh1cWKVx4v bVKUqflna0pQNzvHecDiMR2waa6LbHlUsYuQkWV6P8RK4xMOQS3+L3DFvttoyHiGVzNm fZUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=RHS7AeIFZovBrRj7A9l+HBtCSJJvNOkTQRZrmphRUI0=; b=jxruBrMyEeJ+u0evfDMVNgJwBb1urmjG/gUPhA9PZyyUVcJwqnu6kbqB6hCRpMKxjy +LAq3EVFB1HaTeOQe2YFeaVgvaVG3osYZyljoz2XUWl3UCZkxygl63Gru5x4nmPaySAi OkP9OXGoj398UK4dsF7mZNzOnTioP2tlbEE1L9syQkUGSNy7IM0qQONcRV2kw0IwoqGK V2QAEuXcANG4JugJnTdyiPPbi3v1M3/9bZjiXIGA0TsXUtFrfY/07cb3pcd852XZyPiL ls3sdlBpCxa6zydHTQturebE3VKSvSZGJiOajosdngUJhLKYq+w7S2W8E9dZ3Ta+8AAt tPbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=0tx8Ind3; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t17-20020a639551000000b0050bd4b86169si7806673pgn.414.2023.05.11.16.35.21; Thu, 11 May 2023 16:35:34 -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=@google.com header.s=20221208 header.b=0tx8Ind3; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239605AbjEKXeV (ORCPT + 99 others); Thu, 11 May 2023 19:34:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239586AbjEKXeH (ORCPT ); Thu, 11 May 2023 19:34:07 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 835DC65A4 for ; Thu, 11 May 2023 16:34:05 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b8f324b3ef8so11462813276.0 for ; Thu, 11 May 2023 16:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683848044; x=1686440044; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=RHS7AeIFZovBrRj7A9l+HBtCSJJvNOkTQRZrmphRUI0=; b=0tx8Ind3vnPelqhWS3UozQxmgv/3gx2xhExsOSrMCvy8bPHRDHPtRNxqFI1LB+2mi3 pTnJkrK/FNE/JTFksxeHfpfCuQs0kmhmqFVV6MSRUOHa3gyJjRJ/io08JGy6oSUkhQHE WhkGygcckRQomRrhEwQ1Wu1VEU5VOKehDRv6UElAJKU6w/Ji7K4L+ROhhhXmFFC+EBPs RlaphzxWk2POeTxmCS7rvtk/8SqOv8Ha1EqyuJbR+E7va1LjsTcBvsZ7xI1nRflCin6F jirnjWy22JKhM5ebenjTvnhYKFIKfV3jTpf7/UvAWvYYD925l2M+JzZgBeTEBwxowdDH nsRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683848044; x=1686440044; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RHS7AeIFZovBrRj7A9l+HBtCSJJvNOkTQRZrmphRUI0=; b=Hn4PGlhK/BXNOjZ0uG5cGZptLtnzZYUqrxyaQ4m9HydzQ4Rn9ZzTscw/dR05hGagMU QhpUfWxJUXYBH0y0fnK+W93tDHgHQJx2wES94tyvJUGR9D7Ns+66xFXjpT0F56TzkitC js0u+bu4vIBQpt+MvCRuyDHkpDGCv9fbh7S90CDehUTcupJIJRvhWBtxSxZricOTqRCe +1yYSDkbZz+1PRD7HROoiL0O8Dzab017X25LQcUGeQJ0mUAGXFJP4r1wQG3UVM7c4swa 2bkdNAg20591QUu18VAtYYYgVRj+YG8IMMOzf6L2UM7bDyYl8h+VXYRkBNogpIu97XNx 2hWA== X-Gm-Message-State: AC+VfDyC1pgTq7Ht/69sYXvAGNDwnTqal4zylwnA6biCUjbpKEF9TNPD 19qszuDdEUj0TslyDENS5RgyyaRew8E= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:dc43:0:b0:ba1:6f1b:8905 with SMTP id y64-20020a25dc43000000b00ba16f1b8905mr14135026ybe.4.1683848044752; Thu, 11 May 2023 16:34:04 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 11 May 2023 16:33:49 -0700 In-Reply-To: <20230511233351.635053-1-seanjc@google.com> Mime-Version: 1.0 References: <20230511233351.635053-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230511233351.635053-7-seanjc@google.com> Subject: [PATCH v2 6/8] KVM: x86: Move PAT MSR handling out of mtrr.c From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang , Wenyao Hai , Ke Guo X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL 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?1765642741388922686?= X-GMAIL-MSGID: =?utf-8?q?1765642741388922686?= Drop handling of MSR_IA32_CR_PAT from mtrr.c now that SVM and VMX handle writes without bouncing through kvm_set_msr_common(). PAT isn't truly an MTRR even though it affects memory types, and more importantly KVM enables hardware virtualization of guest PAT (by NOT setting "ignore guest PAT") when a guest has non-coherent DMA, i.e. KVM doesn't need to zap SPTEs when the guest PAT changes. The read path is and always has been trivial, i.e. burying it in the MTRR code does more harm than good. WARN and continue for the PAT case in kvm_set_msr_common(), as that code is _currently_ reached if and only if KVM is buggy. Defer cleaning up the lack of symmetry between the read and write paths to a future patch. Signed-off-by: Sean Christopherson Reviewed-by: Kai Huang --- arch/x86/kvm/mtrr.c | 19 ++++++------------- arch/x86/kvm/x86.c | 13 +++++++++++++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index dc213b940141..cdbbb511f940 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -55,7 +55,6 @@ static bool msr_mtrr_valid(unsigned msr) case MSR_MTRRfix4K_F0000: case MSR_MTRRfix4K_F8000: case MSR_MTRRdefType: - case MSR_IA32_CR_PAT: return true; } return false; @@ -74,9 +73,7 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) if (!msr_mtrr_valid(msr)) return false; - if (msr == MSR_IA32_CR_PAT) { - return kvm_pat_valid(data); - } else if (msr == MSR_MTRRdefType) { + if (msr == MSR_MTRRdefType) { if (data & ~0xcff) return false; return valid_mtrr_type(data & 0xff); @@ -324,8 +321,7 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr) struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state; gfn_t start, end; - if (msr == MSR_IA32_CR_PAT || !tdp_enabled || - !kvm_arch_has_noncoherent_dma(vcpu->kvm)) + if (!tdp_enabled || !kvm_arch_has_noncoherent_dma(vcpu->kvm)) return; if (!mtrr_is_enabled(mtrr_state) && msr != MSR_MTRRdefType) @@ -392,8 +388,6 @@ int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) *(u64 *)&vcpu->arch.mtrr_state.fixed_ranges[index] = data; else if (msr == MSR_MTRRdefType) vcpu->arch.mtrr_state.deftype = data; - else if (msr == MSR_IA32_CR_PAT) - vcpu->arch.pat = data; else set_var_mtrr_msr(vcpu, msr, data); @@ -421,13 +415,12 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) return 1; index = fixed_msr_to_range_index(msr); - if (index >= 0) + if (index >= 0) { *pdata = *(u64 *)&vcpu->arch.mtrr_state.fixed_ranges[index]; - else if (msr == MSR_MTRRdefType) + } else if (msr == MSR_MTRRdefType) { *pdata = vcpu->arch.mtrr_state.deftype; - else if (msr == MSR_IA32_CR_PAT) - *pdata = vcpu->arch.pat; - else { /* Variable MTRRs */ + } else { + /* Variable MTRRs */ if (is_mtrr_base_msr(msr)) *pdata = var_mtrr_msr_to_range(vcpu, msr)->base; else diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8b356c9d8a81..d71cf924cd8f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3701,6 +3701,17 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) } break; case MSR_IA32_CR_PAT: + /* + * Writes to PAT should be handled by vendor code as both SVM + * and VMX track the guest's PAT in the VMCB/VMCS. + */ + WARN_ON_ONCE(1); + + if (!kvm_pat_valid(data)) + return 1; + + vcpu->arch.pat = data; + break; case MTRRphysBase_MSR(0) ... MSR_MTRRfix4K_F8000: case MSR_MTRRdefType: return kvm_mtrr_set_msr(vcpu, msr, data); @@ -4110,6 +4121,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) break; } case MSR_IA32_CR_PAT: + msr_info->data = vcpu->arch.pat; + break; case MSR_MTRRcap: case MTRRphysBase_MSR(0) ... MSR_MTRRfix4K_F8000: case MSR_MTRRdefType: