From patchwork Wed May 3 18:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 89816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1535100vqo; Wed, 3 May 2023 11:41:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zSFDIZT2pUFIsMOx/dhT7l3r3UIPpSKNlbmDYYppzXgLNijoK45L0g4DFz3So+PycdMaV X-Received: by 2002:a05:6a21:3a86:b0:eb:e22b:efa6 with SMTP id zv6-20020a056a213a8600b000ebe22befa6mr23763778pzb.51.1683139269823; Wed, 03 May 2023 11:41:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683139269; cv=none; d=google.com; s=arc-20160816; b=YlaW8zXB/5ArqDcfbceaJoptKu+oorHkD5nWshf5IsR8tBr1E6r5RNvBJIAVm2b07Z MVwiTEt+Htj351v7zhB4XFVEzPUkgevETcV+cc8EDMN/hyMR7VRi9FCGkfxiumSatnKU n8aCl6W4q1JLuTSeTtOiGJ49upjMLiQqFYg7fEv7jO5QGTbr+xV1tBcLMTVGvM2nUkvt Pooj8rp2FQnf1f+e8LyKB5dinIhVedO72SnIS6isVAMdWYxYDzP4KdEZ6jq0U/yqxvkG 0HtQ9snp4B6ei8GNd9dy6tGMNF7NPapXdJFOyBJ8JGObbxQHkQOOMzZLF6XWA3YRl9sn QBwQ== 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=HR9sDhe1dBWwYsQO66isTNLen+QloTOYlqac4Dib2S0=; b=ycUiK8CTm4iY16cjQEHvE/2AOiDpqf7stzzgQfjGiW5a1JUJjR//+8846pLIjjWali K1VakEyjns1z4vV/1TUhkp1nbk5yYVV9G33kpKAHDLuM0NoI70Ghz4fzI4oYkFArZf0x qjX4aQXhEUJ0Vq9UHBjyMR29h0Z1wJcIwAYlG4KhWH+FfKw558Emw+hV/T6psCG/sSf9 ua/1mRBRKezrHkJ9cJpicPzQc0Tr/1tf7eLp8BQWuWBXJfIgAwjWH8O6bbLGVdS+mtvc JC/w6flE3vPkzOeZdyesQKhPYjFOZSyYlKHRRP3q9F25mW7M8fSzNbdEH1M7HntHNeK9 Bwag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=RpPim3ur; 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 c12-20020aa7952c000000b0063cf9718a24si33283019pfp.388.2023.05.03.11.40.53; Wed, 03 May 2023 11:41:09 -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=RpPim3ur; 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 S229997AbjECS3E (ORCPT + 99 others); Wed, 3 May 2023 14:29:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229878AbjECS3B (ORCPT ); Wed, 3 May 2023 14:29:01 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C64D35B6 for ; Wed, 3 May 2023 11:29:00 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-64115ef7234so4721162b3a.1 for ; Wed, 03 May 2023 11:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683138539; x=1685730539; 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=HR9sDhe1dBWwYsQO66isTNLen+QloTOYlqac4Dib2S0=; b=RpPim3urdDOUWuJ3wzy0utodCmxX0rjPl4mUUzwsMX1hw3s9PCKBeD92U/Flg1VcXo BMbqTLLdj3Gx+nc7TzpBr5JLhosnACTWbU/0TivFrLub70MDUpfAHs0InFAoISRRSUp5 4NlW5AgbyWlxTr1gGf8HlzJWL6KgxFkdynlz8+tHNMBJJlw7ATdALt5US3SEahkdNYd1 dIwiZLYlUblywLajLjSm/9axWRGxsCEhBzqFau67BCzEzwvURmB17++fg+byQc22wiYq iMsyTypPoYLBkHF5sXZ4TQC3Zsjq1YTb/kirR7uPmKL81tsozyRZG93BvGjGArcBuy/8 xDtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683138539; x=1685730539; 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=HR9sDhe1dBWwYsQO66isTNLen+QloTOYlqac4Dib2S0=; b=JBFwPtBtzkgSrYUFLMT7pWEo7wi+ijo4daBR32oLbgOriXQ/cJX4tFwk+xZXt5wGeR ywqdL46Q66OFKvJwjA2WNoqGfH7+kk56Ix9CNAsqwuDeT4JAFcBGrqHVazHsm/8kDmNa kdet7Snxljj60bjEOZUjcPHux8gWciAX5YOfNloBWY3AHUngaQvL8XBxkUvbPnbpNgrq Lr9rGMYBSkyheNNH9+QP3ZJrYcizkRv05qz/QCvpITguLncmKlgvlwxOvtaWNQLTqlmr 69828F3F/YbMCm5UyO6t26Ifu9fY+gqtbe/UCMd8S1BGtfIls0uM2sttH1UmXTkXYSzM Yg6Q== X-Gm-Message-State: AC+VfDxHVsf37k2V2LUAwgnsWmyZumShl/8Q2Uhy9s56AnDFie4QENEs r8h+DBZXCTiaeVtmfSF6RexRzk08jFs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:2c14:0:b0:51a:7d6a:65c9 with SMTP id s20-20020a632c14000000b0051a7d6a65c9mr714454pgs.6.1683138539464; Wed, 03 May 2023 11:28:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 3 May 2023 11:28:48 -0700 In-Reply-To: <20230503182852.3431281-1-seanjc@google.com> Mime-Version: 1.0 References: <20230503182852.3431281-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230503182852.3431281-2-seanjc@google.com> Subject: [PATCH 1/5] 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, 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=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?1764899442866252114?= X-GMAIL-MSGID: =?utf-8?q?1764899442866252114?= 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(). 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(). Signed-off-by: Wenyao Hai [sean: massage changelog] Signed-off-by: Sean Christopherson --- 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..53e249109483 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2294,12 +2294,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 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); + + vcpu->arch.pat = data; break; case MSR_IA32_MCG_EXT_CTL: if ((!msr_info->host_initiated &&