Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756883Ab3JIJXK (ORCPT <rfc822;w@1wt.eu>);
	Wed, 9 Oct 2013 05:23:10 -0400
Received: from mail-qc0-f174.google.com ([209.85.216.174]:51927 "EHLO
	mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752534Ab3JIJXI (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 9 Oct 2013 05:23:08 -0400
Message-ID: <52552075.7020104@redhat.com>
Date: Wed, 09 Oct 2013 11:23:01 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130923 Thunderbird/17.0.9
MIME-Version: 1.0
To: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
CC: mingo@redhat.com, hpa@zytor.com, x86@kernel.org, gleb@redhat.com,
        tglx@linutronix.de, konrad.wilk@oracle.com,
        habanero@linux.vnet.ibm.com, linux-kernel@vger.kernel.org,
        kvm@vger.kernel.org, mtosatti@redhat.com,
        Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [PATCH] kvm fix: Enable pvspinlock after jump_label_init() to
 avoid VM hang
References: <y> <1381309401-23663-1-git-send-email-raghavendra.kt@linux.vnet.ibm.com>
In-Reply-To: <1381309401-23663-1-git-send-email-raghavendra.kt@linux.vnet.ibm.com>
X-Enigmail-Version: 1.5.2
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2359
Lines: 60

Il 09/10/2013 11:03, Raghavendra K T ha scritto:
> We use jump label to enable pv-spinlock. With the changes in
> (442e0973e927 Merge branch 'x86/jumplabel'), the jump label behaviour has changed
> that would result in evntual hang of the VM since we would end up in a situation
> where slowpath locks would halt the vcpus but we will not be able to wakeup the
> vcpu by lock releaser using unlock kick.
> 
> Similar problem in Xen and more detailed description is available in
> a945928ea270 (xen: Do not enable spinlocks before jump_label_init() has executed)
> 
> This patch splits kvm_spinlock_init to separate jump label changes with pvops
> patching and also make jump label enabling after jump_label_init().
> 
> Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
> ---
>  Thanks to Andrew Theurer who reported weird behaviour of pvspinlock
>  in 3.12-rc that led to my git bisection and investigation and Konrad
>  for his jump label findings for Xen.
> 
>  arch/x86/kernel/kvm.c | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> index 697b93a..a0e2a8a 100644
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void)
>  	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
>  		return;
>  
> -	printk(KERN_INFO "KVM setup paravirtual spinlock\n");
> +	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
> +	pv_lock_ops.unlock_kick = kvm_unlock_kick;
> +}
> +
> +static __init int kvm_spinlock_init_jump(void)
> +{
> +	if (!kvm_para_available())
> +		return 0;
> +	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
> +		return 0;
>  
>  	static_key_slow_inc(&paravirt_ticketlocks_enabled);
> +	printk(KERN_INFO "KVM setup paravirtual spinlock\n");
>  
> -	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
> -	pv_lock_ops.unlock_kick = kvm_unlock_kick;
> +	return 0;
>  }
> +early_initcall(kvm_spinlock_init_jump);
> +
>  #endif	/* CONFIG_PARAVIRT_SPINLOCKS */
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/