From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v23 07/15] x86/VPMU: Save VPMU state for PV guests during context switch Date: Fri, 29 May 2015 14:42:52 -0400 Message-ID: <1432924980-24281-8-git-send-email-boris.ostrovsky@oracle.com> References: <1432924980-24281-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1432924980-24281-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: JBeulich@suse.com, kevin.tian@intel.com, suravee.suthikulpanit@amd.com, Aravind.Gopalakrishnan@amd.com, dietmar.hahn@ts.fujitsu.com, dgdegra@tycho.nsa.gov, andrew.cooper3@citrix.com, jun.nakajima@intel.com, tim@xen.org, xen-devel@lists.xen.org Cc: boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org Save VPMU state during context switch for both HVM and PV(H) guests. A subsequent patch ("x86/VPMU: NMI-based VPMU support") will make it possible for vpmu_switch_to() to call vmx_vmcs_try_enter()->vcpu_pause() which needs is_running to be correctly set/cleared. To prepare for that, call context_saved() before vpmu_switch_to() is executed. (Note that while this change could have been dalayed until that later patch, the changes are harmless to existing code and so we do it here) Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8e79aca..2b82f61 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1537,17 +1537,14 @@ void context_switch(struct vcpu *prev, struct vcpu *next) } if ( prev != next ) - _update_runstate_area(prev); - - if ( is_hvm_vcpu(prev) ) { - if (prev != next) - vpmu_switch_from(prev); - - if ( !list_empty(&prev->arch.hvm_vcpu.tm_list) ) - pt_save_timer(prev); + _update_runstate_area(prev); + vpmu_switch_from(prev); } + if ( is_hvm_vcpu(prev) && !list_empty(&prev->arch.hvm_vcpu.tm_list) ) + pt_save_timer(prev); + local_irq_disable(); set_current(next); @@ -1585,15 +1582,16 @@ void context_switch(struct vcpu *prev, struct vcpu *next) !is_hardware_domain(next->domain)); } - if (is_hvm_vcpu(next) && (prev != next) ) - /* Must be done with interrupts enabled */ - vpmu_switch_to(next); - context_saved(prev); if ( prev != next ) + { _update_runstate_area(next); + /* Must be done with interrupts enabled */ + vpmu_switch_to(next); + } + /* Ensure that the vcpu has an up-to-date time base. */ update_vcpu_system_time(next); -- 1.8.1.4