From patchwork Thu May 11 23:33:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 92880 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4736788vqo; Thu, 11 May 2023 16:39:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6tqCg2CtscjeOtz9YNChSbpy/Jbn96qWK5WmOT9aEbeXsUcskV59WBXimgT5SGKp49+Xbn X-Received: by 2002:a17:90b:198b:b0:24b:8480:39d6 with SMTP id mv11-20020a17090b198b00b0024b848039d6mr22247087pjb.0.1683848389661; Thu, 11 May 2023 16:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683848389; cv=none; d=google.com; s=arc-20160816; b=G1E1g/0wbTMcOqb5+8GTYJC80ZJoZlYH/uM8y4xc9i57KnCrAF+qR8J/FjnRGVX7kc /pzjDERLyMcdUiM6Uy3Iezcwblshl+A4DWo+27G5eAUXfIeL86xrTuBMxMp55zHPoINQ A6llO/3hocpyBs5+cL0Jb52zX099ihd3mcPaoaOk76wkFiHnb2B0NmUSLAa9mZO/lmJX XBATRlmvULjeggT2ITkmU46n+Y9WtcWQeQlD4pSN6jjdhVF4+OrKKdwnijKFcFv4kAWA AUT4JZ2Wvv0cN0Y0RNQQs/PlBzFIorrE6rRYtHE8KkVSZddNcGY43m3CyGOZ/Tb74fU4 0caQ== 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=izzWvJrvZ+wq2quseVrGnV9xDpgTViMwy/x29y6d3lY=; b=XtGpfbzeRjUNg9A97FLBtAi9BO8+CIK0z4Nr2eDMBwrYLQlndxLDYD2y+TtKGSXD7E 7oi6prkkn2MeNw865/XDvAin1tvVsHniR8ipddSfgXWSycvHQvmCMVQ0aI7CdwcqWGgB DC6rVi1huwy5w34s+93XvQrXhXQPMYlMJjMnIH+/lzEydWFuv1dB6DofVLb027AM0gv6 aYNZTxcdnsSa/G6phjPU9sRa8auxD4PzUBi+UqwVYkA8yzN/5Sh6anYjnQ/wBdePvaL/ MXKx6N42reewlgxBqdTK8XrDLIIY6S4GXFT5ee2EZSS+YII/9+puZtmX2HpNr40COlkm n2IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="wPABa2//"; 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 e9-20020a63aa09000000b0052c68c1d88asi7558325pgf.597.2023.05.11.16.39.36; Thu, 11 May 2023 16:39:49 -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="wPABa2//"; 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 S239565AbjEKXd6 (ORCPT + 99 others); Thu, 11 May 2023 19:33:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239536AbjEKXd5 (ORCPT ); Thu, 11 May 2023 19:33:57 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50AD6170D for ; Thu, 11 May 2023 16:33:56 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1aafb2766e0so52303175ad.3 for ; Thu, 11 May 2023 16:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683848036; x=1686440036; 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=izzWvJrvZ+wq2quseVrGnV9xDpgTViMwy/x29y6d3lY=; b=wPABa2//xybhgaoz98n4fU3sMtb97lbp9QoLDf5XJKyMW955uetOUGpIsxhf2D0+h1 kn+5jyba6p1ZvP7/COis+n2CawHWe2XRffkjGaagvUbmm2HFIGP2rF6yDfs7B6b+OQtA +FaseZz3SixBibyBK2Hdk21BQdHgwRuIKfsf7hrMx021SjUXh2peFZPML3T1QS1uT6u1 Y7c3aWGR5rMfVK0sfD+mc3R21HqD1m1VSKrviyxnAaXS/bO7WgypDVdI9hQ9j8g51gWb In3EiL1mjn50YsA1vD0/xMgDrVMpYUkrAKjfu0HBpTltWE2RZB0FT8bg3uzmIvyZWVD3 Q3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683848036; x=1686440036; 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=izzWvJrvZ+wq2quseVrGnV9xDpgTViMwy/x29y6d3lY=; b=dpswfmUuQEKXDelIcbyWhbnvEkpykiFIFaiMz4/2lFnwGOOJ5wF8W+fQAE+RbPlJn1 f1pjkyPNc5JwWnpK0Ofzq9Q4WwSZcKxKZWUSIAroYBhtYEWYVSyNr2oSkWxos1fjc5Ff X86tGQfLnsg+z5Gl2AN3m5woYTz28uEzi6uKCjV8TkR/UuR/+O+QEAlyJjG9p4AM7udX CJ1qVA812776aJaXo0q5UP7gOZbreM01aeZdghBbYxpRpdpHzCA0AmeipGF6SzRk1I/W rZF9g/DX2qFQv8iaS7bIxB5Wi/ph9O+FERzPw+soOv2Bt8fd2qJ8ElU98lPuCK1bu7a4 LMXg== X-Gm-Message-State: AC+VfDyV+m69TodJUpkV9GnO984ZsgVr2zujdgwcAWYzCPymTkBRuSNX xV6+2DwTuBS9bJRxCLe1w+FfJDY2dwI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:8f98:b0:1ad:c1ca:55ae with SMTP id z24-20020a1709028f9800b001adc1ca55aemr1398487plo.13.1683848035878; Thu, 11 May 2023 16:33:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 11 May 2023 16:33:44 -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-2-seanjc@google.com> Subject: [PATCH v2 1/8] KVM: VMX: Open code writing vCPU's PAT in VMX's MSR handler 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?1765643009447685255?= X-GMAIL-MSGID: =?utf-8?q?1765643009447685255?= From: Wenyao Hai Open code setting "vcpu->arch.pat" in vmx_set_msr() instead of bouncing through kvm_set_msr_common() to get to the same code in kvm_mtrr_set_msr(). This aligns VMX with SVM, avoids hiding a very simple operation behind a relatively complicated function call (finding the PAT MSR case in kvm_set_msr_common() is non-trivial), and most importantly, makes it clear that not unwinding the VMCS updates if kvm_set_msr_common() isn't a bug (because kvm_set_msr_common() can never fail for PAT). Opportunistically set vcpu->arch.pat before updating the VMCS info so that a future patch can move the common bits (back) into kvm_set_msr_common() without a functional change. Note, MSR_IA32_CR_PAT is 0x277, and is very subtly handled by case 0x200 ... MSR_IA32_MC0_CTL2 - 1: in kvm_set_msr_common(). Cc: Kai Huang Signed-off-by: Wenyao Hai [sean: massage changelog, hoist setting vcpu->arch.pat up] Signed-off-by: Sean Christopherson Reviewed-by: Kai Huang --- arch/x86/kvm/vmx/vmx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 44fb619803b8..33b8625d3541 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2290,16 +2290,14 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) if (!kvm_pat_valid(data)) return 1; + vcpu->arch.pat = data; + if (is_guest_mode(vcpu) && get_vmcs12(vcpu)->vm_exit_controls & VM_EXIT_SAVE_IA32_PAT) get_vmcs12(vcpu)->guest_ia32_pat = data; - if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { + if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) vmcs_write64(GUEST_IA32_PAT, data); - vcpu->arch.pat = data; - break; - } - ret = kvm_set_msr_common(vcpu, msr_info); break; case MSR_IA32_MCG_EXT_CTL: if ((!msr_info->host_initiated &&