From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Zhenzhong Duan <zhenzhong.duan@oracle.com>, linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
x86@kernel.org, pbonzini@redhat.com, rkrcmar@redhat.com,
sean.j.christopherson@intel.com, wanpengli@tencent.com,
jmattson@google.com, joro@8bytes.org, boris.ostrovsky@oracle.com,
jgross@suse.com, peterz@infradead.org, will@kernel.org,
linux-hyperv@vger.kernel.org, kvm@vger.kernel.org,
mikelley@microsoft.com, kys@microsoft.com,
haiyangz@microsoft.com, sthemmin@microsoft.com,
sashal@kernel.org, Jonathan Corbet <corbet@lwn.net>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH v7 3/5] x86/kvm: Add "nopvspin" parameter to disable PV spinlocks
Date: Tue, 22 Oct 2019 15:11:19 +0200 [thread overview]
Message-ID: <87tv81ylfs.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <dbc50272-a4f5-ce7c-ba71-75031521f420@oracle.com>
Zhenzhong Duan <zhenzhong.duan@oracle.com> writes:
> Hi Vitaly,
>
> On 2019/10/22 19:36, Vitaly Kuznetsov wrote:
>
>> Zhenzhong Duan<zhenzhong.duan@oracle.com> writes:
>>
> ...snip
>
>>> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
>>> index 249f14a..3945aa5 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 qspinlock 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,8 @@ void __init kvm_spinlock_init(void)
>>> pv_ops.lock.vcpu_is_preempted =
>>> PV_CALLEE_SAVE(__kvm_vcpu_is_preempted);
>>> }
>>> +out:
>>> + static_branch_disable(&virt_spin_lock_key);
>> You probably need to add 'return' before 'out:' as it seems you're
>> disabling virt_spin_lock_key in all cases now).
>
> virt_spin_lock_key is kept enabled in !kvm_para_has_feature(KVM_FEATURE_PV_UNHALT)
> case which is the only case virt_spin_lock() optimization is used.
>
> When PV qspinlock is enabled, virt_spin_lock() isn't called in
> __pv_queued_spin_lock_slowpath() in which case we don't care
> virt_spin_lock_key's value.
>
True, my bad: I though we still need it enabled for something.
> So adding 'return' or not are both ok, I chosed to save a line,
> let me know if you prefer to add a 'return' and I'll change it.
No, please ignore.
>
> btw: __pv_queued_spin_lock_slowpath() is alias of queued_spin_lock_slowpath()
>
> Thanks
> Zhenzhong
>
--
Vitaly
next prev parent reply other threads:[~2019-10-22 13:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 9:11 [PATCH v7 0/5] Add a unified parameter "nopvspin" Zhenzhong Duan
2019-10-21 9:11 ` [PATCH v7 1/5] Revert "KVM: X86: Fix setup the virt_spin_lock_key before static key get initialized" Zhenzhong Duan
2019-10-21 9:11 ` [PATCH v7 2/5] x86/kvm: Change print code to use pr_*() format Zhenzhong Duan
2019-10-22 21:01 ` Sean Christopherson
2019-10-23 1:29 ` Zhenzhong Duan
2019-10-21 9:11 ` [PATCH v7 3/5] x86/kvm: Add "nopvspin" parameter to disable PV spinlocks Zhenzhong Duan
2019-10-22 11:36 ` Vitaly Kuznetsov
2019-10-22 12:46 ` Zhenzhong Duan
2019-10-22 13:11 ` Vitaly Kuznetsov [this message]
2019-10-22 21:03 ` Sean Christopherson
2019-10-23 1:36 ` Zhenzhong Duan
2019-10-21 9:11 ` [PATCH v7 4/5] xen: Mark "xen_nopvspin" parameter obsolete Zhenzhong Duan
2019-10-21 9:11 ` [PATCH v7 5/5] x86/hyperv: Mark "hv_nopvspin" " Zhenzhong Duan
Reply instructions:
You may reply publicly 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=87tv81ylfs.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.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=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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).