Linux-HyperV Archive on lore.kernel.org
 help / color / Atom feed
From: Wanpeng Li <kernellwp@gmail.com>
To: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	"the arch/x86 maintainers" <x86@kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Radim Krcmar <rkrcmar@redhat.com>,
	Sean Christopherson <sean.j.christopherson@intel.com>,
	Vitaly Kuznetsov <vkuznets@redhat.com>,
	Wanpeng Li <wanpengli@tencent.com>,
	Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
	Boris Ostrovsky <boris.ostrovsky@oracle.com>,
	Juergen Gross <jgross@suse.com>,
	Peter Zijlstra <peterz@infradead.org>,
	will@kernel.org, linux-hyperv@vger.kernel.org,
	kvm <kvm@vger.kernel.org>,
	mikelley@microsoft.com, "K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	Stephen Hemminger <sthemmin@microsoft.com>,
	Sasha Levin <sashal@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH v8 3/5] x86/kvm: Add "nopvspin" parameter to disable PV spinlocks
Date: Tue, 19 Nov 2019 15:01:45 +0800
Message-ID: <CANRm+CzW=M37QwkVPhkhJHimUG6MtCMZnhcLL+24ujtpv9cPyA@mail.gmail.com> (raw)
In-Reply-To: <1571829384-5309-4-git-send-email-zhenzhong.duan@oracle.com>

On Wed, 23 Oct 2019 at 19:21, Zhenzhong Duan <zhenzhong.duan@oracle.com> wrote:
>
> There are cases where a guest tries to switch spinlocks to bare metal
> behavior (e.g. by setting "xen_nopvspin" on XEN platform and
> "hv_nopvspin" on HYPER_V).
>
> That feature is missed on KVM, add a new parameter "nopvspin" to disable
> PV spinlocks for KVM guest.
>
> The new 'nopvspin' parameter will also replace Xen and Hyper-V specific
> parameters in future patches.
>
> Define variable nopvsin as global because it will be used in future
> patches as above.
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Radim Krcmar <rkrcmar@redhat.com>
> Cc: Sean Christopherson <sean.j.christopherson@intel.com>
> Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
> Cc: Wanpeng Li <wanpengli@tencent.com>
> Cc: Jim Mattson <jmattson@google.com>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Will Deacon <will@kernel.org>

Reviewed-by: Wanpeng Li <wanpengli@tencent.com>

> ---
>  Documentation/admin-guide/kernel-parameters.txt |  5 ++++
>  arch/x86/include/asm/qspinlock.h                |  1 +
>  arch/x86/kernel/kvm.c                           | 39 ++++++++++++++++++++-----
>  kernel/locking/qspinlock.c                      |  7 +++++
>  4 files changed, 45 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index a84a83f..bd49ed2 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -5334,6 +5334,11 @@
>                         as generic guest with no PV drivers. Currently support
>                         XEN HVM, KVM, HYPER_V and VMWARE guest.
>
> +       nopvspin        [X86,KVM]
> +                       Disables the qspinlock slow path using PV optimizations
> +                       which allow the hypervisor to 'idle' the guest on lock
> +                       contention.
> +
>         xirc2ps_cs=     [NET,PCMCIA]
>                         Format:
>                         <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
> diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h
> index 444d6fd..d86ab94 100644
> --- a/arch/x86/include/asm/qspinlock.h
> +++ b/arch/x86/include/asm/qspinlock.h
> @@ -32,6 +32,7 @@ static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lo
>  extern void __pv_init_lock_hash(void);
>  extern void __pv_queued_spin_lock_slowpath(struct qspinlock *lock, u32 val);
>  extern void __raw_callee_save___pv_queued_spin_unlock(struct qspinlock *lock);
> +extern bool nopvspin;
>
>  #define        queued_spin_unlock queued_spin_unlock
>  /**
> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> index 6562886..9834737 100644
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -825,18 +825,36 @@ __visible bool __kvm_vcpu_is_preempted(long cpu)
>   */
>  void __init kvm_spinlock_init(void)
>  {
> -       /* Does host kernel support KVM_FEATURE_PV_UNHALT? */
> -       if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
> +       /*
> +        * In case host doesn't support KVM_FEATURE_PV_UNHALT there is still an
> +        * advantage of keeping virt_spin_lock_key enabled: virt_spin_lock() is
> +        * preferred over native qspinlock when vCPU is preempted.
> +        */
> +       if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)) {
> +               pr_info("PV spinlocks disabled, no host support\n");
>                 return;
> +       }
>
> +       /*
> +        * Disable PV spinlocks and use native qspinlock when dedicated pCPUs
> +        * are available.
> +        */
>         if (kvm_para_has_hint(KVM_HINTS_REALTIME)) {
> -               static_branch_disable(&virt_spin_lock_key);
> -               return;
> +               pr_info("PV spinlocks disabled with KVM_HINTS_REALTIME hints\n");
> +               goto out;
>         }
>
> -       /* Don't use the pvqspinlock code if there is only 1 vCPU. */
> -       if (num_possible_cpus() == 1)
> -               return;
> +       if (num_possible_cpus() == 1) {
> +               pr_info("PV spinlocks disabled, single CPU\n");
> +               goto out;
> +       }
> +
> +       if (nopvspin) {
> +               pr_info("PV spinlocks disabled, forced by \"nopvspin\" parameter\n");
> +               goto out;
> +       }
> +
> +       pr_info("PV spinlocks enabled\n");
>
>         __pv_init_lock_hash();
>         pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath;
> @@ -849,6 +867,13 @@ void __init kvm_spinlock_init(void)
>                 pv_ops.lock.vcpu_is_preempted =
>                         PV_CALLEE_SAVE(__kvm_vcpu_is_preempted);
>         }
> +       /*
> +        * When PV spinlock is enabled which is preferred over
> +        * virt_spin_lock(), virt_spin_lock_key's value is meaningless.
> +        * Just disable it anyway.
> +        */
> +out:
> +       static_branch_disable(&virt_spin_lock_key);
>  }
>
>  #endif /* CONFIG_PARAVIRT_SPINLOCKS */
> diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c
> index 2473f10..75193d6 100644
> --- a/kernel/locking/qspinlock.c
> +++ b/kernel/locking/qspinlock.c
> @@ -580,4 +580,11 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val)
>  #include "qspinlock_paravirt.h"
>  #include "qspinlock.c"
>
> +bool nopvspin __initdata;
> +static __init int parse_nopvspin(char *arg)
> +{
> +       nopvspin = true;
> +       return 0;
> +}
> +early_param("nopvspin", parse_nopvspin);
>  #endif
> --
> 1.8.3.1
>

  parent reply index

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23 11:16 [PATCH v8 0/5] Add a unified parameter "nopvspin" Zhenzhong Duan
2019-10-23 11:16 ` [PATCH v8 1/5] Revert "KVM: X86: Fix setup the virt_spin_lock_key before static key get initialized" Zhenzhong Duan
2019-11-19  7:00   ` Wanpeng Li
2019-10-23 11:16 ` [PATCH v8 2/5] x86/kvm: Change print code to use pr_*() format Zhenzhong Duan
2019-10-23 15:38   ` Sean Christopherson
2019-11-19  7:01   ` Wanpeng Li
2019-10-23 11:16 ` [PATCH v8 3/5] x86/kvm: Add "nopvspin" parameter to disable PV spinlocks Zhenzhong Duan
2019-10-23 15:40   ` Sean Christopherson
2019-11-19  7:01   ` Wanpeng Li [this message]
2019-10-23 11:16 ` [PATCH v8 4/5] xen: Mark "xen_nopvspin" parameter obsolete Zhenzhong Duan
2019-10-23 11:16 ` [PATCH v8 5/5] x86/hyperv: Mark "hv_nopvspin" " Zhenzhong Duan
2019-10-29  1:33 ` [PATCH v8 0/5] Add a unified parameter "nopvspin" Zhenzhong Duan
2019-11-19  2:01   ` Zhenzhong Duan

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANRm+CzW=M37QwkVPhkhJHimUG6MtCMZnhcLL+24ujtpv9cPyA@mail.gmail.com' \
    --to=kernellwp@gmail.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=bp@alien8.de \
    --cc=corbet@lwn.net \
    --cc=haiyangz@microsoft.com \
    --cc=hpa@zytor.com \
    --cc=jgross@suse.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=kys@microsoft.com \
    --cc=linux-hyperv@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikelley@microsoft.com \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rkrcmar@redhat.com \
    --cc=sashal@kernel.org \
    --cc=sean.j.christopherson@intel.com \
    --cc=sthemmin@microsoft.com \
    --cc=tglx@linutronix.de \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.com \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    --cc=zhenzhong.duan@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-HyperV Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-hyperv/0 linux-hyperv/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-hyperv linux-hyperv/ https://lore.kernel.org/linux-hyperv \
		linux-hyperv@vger.kernel.org
	public-inbox-index linux-hyperv

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-hyperv


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git