From patchwork Fri Nov 25 04:05:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang, Weijiang" X-Patchwork-Id: 25835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3796847wrr; Thu, 24 Nov 2022 22:11:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf4BXSABbeEJUBdUJNX2K8arZy15sgiR+W6K5gxd+LCX2C7AxdNNdpLGWLXHf9KM9FzRbzn7 X-Received: by 2002:a62:16d3:0:b0:562:c1d4:e287 with SMTP id 202-20020a6216d3000000b00562c1d4e287mr16846664pfw.80.1669356676084; Thu, 24 Nov 2022 22:11:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669356676; cv=none; d=google.com; s=arc-20160816; b=DtxR+y+IvlpUapqRi1EX5VVLYL+TYPR1pAUl6qQMM44YvFA2Z0L8iWVK7gjsPrgufu qcEN6ncZ4kKxFGyZzxtFam7rPE0OBUonxVzJxDPD/5aAeFT3aGCb03yio1WK0JdNgKCh BitFY2DR+PBS5UxPm9/AOgKVdqADWoPDQh80EZNd/5Dm7pjvwfYAuvnnphtUSGsBYI4j OaPs/FEmwNJNq7SQk5djYLMz1LLzF6tiXQooVmfTmxbuSUC/lXWL4eQspP6InbJzyzKS eiVAi5sMAbcyqwto3ZM5QqjaOhHPpWlTBDodW1LGcd8MugAjyigpyNSYzWvEwI/vGv9K +5xw== 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=250Psnjf8knNBTjuQuYPP65hzx7sXcXWNZdZTKIffU4=; b=qZ0nWl6BLz5RFtIhrMAYHhNkXC5kfvR9JUwqU0s+zNXt+n0YE+Up4smkfkS0oPQh/o nk0Vu0Dpzy/rLIqlCPI7gONWU4KpqJFiJOH1E3KYD7H+Z4WxGitdU0Z1rVzlZnu3eVM3 3B4n5BUjhRHCfG+Qj7OjBmKOizXN/RXwA4aqsU1JRi3KHcmtg1/3qbGvdp0p4ybrQyQz ynXM8aNypbFioAX14/B4+RNN8q9eBwu/nWHKJ1IJYWuClUXv8mS40DYzfes21VW7jMPR APnONbSnNz53HmghF5vtC9fYdFri1p3q1GwbLAL45TNOLjicJHvXt6Li2YDcN20Zni8i Aaig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Q7NjNOMU; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i7-20020a17090332c700b00186de874df8si3218482plr.442.2022.11.24.22.11.03; Thu, 24 Nov 2022 22:11:16 -0800 (PST) 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=@intel.com header.s=Intel header.b=Q7NjNOMU; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbiKYGK0 (ORCPT + 99 others); Fri, 25 Nov 2022 01:10:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbiKYGKK (ORCPT ); Fri, 25 Nov 2022 01:10:10 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9837321E0A; Thu, 24 Nov 2022 22:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669356609; x=1700892609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9dgyRevU02/WAQF4wQb17DisD5XuSJGZ1MCakKBODE8=; b=Q7NjNOMU/YLxFz32Hs29P0c9gp5MrXGW8SjLMYveXkX/J/n8RxZotiS8 xfh0zLwdkHbPNh7jAbJxavU/8mN5COEDLA7tDTuuTivgjuNWByry6zj7Y 70hcyGS7v/+Ysx+hA2GMOGPHqQ/zx28yUESc+n+N6QC+BQueFNi26Yo1B 1kV1EfaJnjSVHozjHDeVe1/BPLVmChobvPuoVZEBM/jSrBxsYJJWrrodk LuWkdYLYqR3GCTZdbXkQBFfk+7o0s8EjY9hKVhLjiUP5swohlE7p9dIn2 gBe7bA2/b90CJs6JDV9xgB7rIPQannsmEYdmTVY4PpXDnKAZUZ8rzlyKu A==; X-IronPort-AV: E=McAfee;i="6500,9779,10541"; a="313116819" X-IronPort-AV: E=Sophos;i="5.96,192,1665471600"; d="scan'208";a="313116819" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2022 22:10:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10541"; a="784838485" X-IronPort-AV: E=Sophos;i="5.96,192,1665471600"; d="scan'208";a="784838485" Received: from embargo.jf.intel.com ([10.165.9.183]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2022 22:10:05 -0800 From: Yang Weijiang To: seanjc@google.com, pbonzini@redhat.com, jmattson@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: like.xu.linux@gmail.com, kan.liang@linux.intel.com, wei.w.wang@intel.com, weijiang.yang@intel.com Subject: [PATCH v2 08/15] KVM: x86: Add Arch LBR MSRs to msrs_to_save_all list Date: Thu, 24 Nov 2022 23:05:57 -0500 Message-Id: <20221125040604.5051-9-weijiang.yang@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221125040604.5051-1-weijiang.yang@intel.com> References: <20221125040604.5051-1-weijiang.yang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1750447345896023204?= X-GMAIL-MSGID: =?utf-8?q?1750447345896023204?= Arch LBR MSR_ARCH_LBR_DEPTH and MSR_ARCH_LBR_CTL are queried by userspace application before it wants to {save|restore} the Arch LBR data. Other LBR related data MSRs are omitted here intentionally due to lengthy list(32*3). Userspace can still use KVM_{GET|SET}_MSRS to access them if necessary. Suggested-by: Jim Mattson Signed-off-by: Yang Weijiang --- arch/x86/kvm/x86.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 888a153e32bc..74c858eaa1ea 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1466,6 +1466,7 @@ static const u32 msrs_to_save_all[] = { MSR_IA32_XFD, MSR_IA32_XFD_ERR, MSR_IA32_XSS, + MSR_ARCH_LBR_CTL, MSR_ARCH_LBR_DEPTH, }; static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; @@ -3877,6 +3878,8 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_PEBS_ENABLE: case MSR_IA32_DS_AREA: case MSR_PEBS_DATA_CFG: + case MSR_ARCH_LBR_CTL: + case MSR_ARCH_LBR_DEPTH: case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5: if (kvm_pmu_is_valid_msr(vcpu, msr)) return kvm_pmu_set_msr(vcpu, msr_info); @@ -3980,6 +3983,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_PEBS_ENABLE: case MSR_IA32_DS_AREA: case MSR_PEBS_DATA_CFG: + case MSR_ARCH_LBR_CTL: + case MSR_ARCH_LBR_DEPTH: case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5: if (kvm_pmu_is_valid_msr(vcpu, msr_info->index)) return kvm_pmu_get_msr(vcpu, msr_info); @@ -7068,6 +7073,11 @@ static void kvm_init_msr_list(void) if (!kvm_caps.supported_xss) continue; break; + case MSR_ARCH_LBR_DEPTH: + case MSR_ARCH_LBR_CTL: + if (!kvm_cpu_cap_has(X86_FEATURE_ARCH_LBR)) + continue; + break; default: break; }