From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752593AbbJWIty (ORCPT ); Fri, 23 Oct 2015 04:49:54 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:63720 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666AbbJWItv (ORCPT ); Fri, 23 Oct 2015 04:49:51 -0400 From: Jian Zhou To: , , , , , , , CC: , , , , Jian Zhou Subject: [PATCH v2 1/4] KVM: X86: Add arrays to save/restore LBR MSRs Date: Fri, 23 Oct 2015 16:47:00 +0800 Message-ID: <1445590023-2012-2-git-send-email-jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1445590023-2012-1-git-send-email-jianjay.zhou@huawei.com> References: <1445590023-2012-1-git-send-email-jianjay.zhou@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.19.14] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add arrays in kvm_vcpu_arch struct to save/restore LBR MSRs at vm exit/entry time. Add new hooks to set/get DEBUGCTLMSR and LBR MSRs. Signed-off-by: Jian Zhou Signed-off-by: Stephen He --- arch/x86/include/asm/kvm_host.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3a36ee7..dc2c120 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -376,6 +376,12 @@ struct kvm_vcpu_hv { u64 hv_vapic; }; +struct msr_data { + bool host_initiated; + u32 index; + u64 data; +}; + struct kvm_vcpu_arch { /* * rip and regs accesses must go through @@ -516,6 +522,15 @@ struct kvm_vcpu_arch { unsigned long eff_db[KVM_NR_DB_REGS]; unsigned long guest_debug_dr7; + int lbr_status; + int lbr_used; + + struct lbr_msr { + unsigned nr; + struct msr_data guest[MAX_NUM_LBR_MSRS]; + struct msr_data host[MAX_NUM_LBR_MSRS]; + }lbr_msr; + u64 mcg_cap; u64 mcg_status; u64 mcg_ctl; @@ -728,12 +743,6 @@ struct kvm_vcpu_stat { struct x86_instruction_info; -struct msr_data { - bool host_initiated; - u32 index; - u64 data; -}; - struct kvm_lapic_irq { u32 vector; u16 delivery_mode; @@ -887,6 +896,11 @@ struct kvm_x86_ops { gfn_t offset, unsigned long mask); /* pmu operations of sub-arch */ const struct kvm_pmu_ops *pmu_ops; + + int (*set_debugctlmsr)(struct kvm_vcpu *vcpu, u64 value); + u64 (*get_debugctlmsr)(void); + void (*set_lbr_msr)(struct kvm_vcpu *vcpu, u32 msr, u64 data); + u64 (*get_lbr_msr)(struct kvm_vcpu *vcpu, u32 msr); }; struct kvm_arch_async_pf { -- 1.7.12.4