From: Joao Martins <joao.m.martins@oracle.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Joao Martins <joao.m.martins@oracle.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Radim Krcmar <rkrcmar@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Andy Lutomirski <luto@amacapital.net>,
xen-devel@lists.xenproject.org
Subject: [PATCH v8 1/5] ptp_kvm: probe for kvm guest availability
Date: Wed, 8 Nov 2017 17:19:54 +0000 [thread overview]
Message-ID: <20171108171958.23921-2-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20171108171958.23921-1-joao.m.martins@oracle.com>
In the event of moving pvclock_pvti_cpu0_va() definition to common
pvclock code, this function would return a value on non KVM guests.
Later on this would fail with a GPF on ptp_kvm_init when running on a
Xen guest. Therefore, ptp_kvm_init() should check whether it is running
in a KVM guest.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Acked-by: Radim Krčmář <rkrcmar@redhat.com>
---
Changes since v7:
* Add Radim's Acked-by
---
drivers/ptp/ptp_kvm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm.c
index 2b1b212c219e..e04d7b2ecb3a 100644
--- a/drivers/ptp/ptp_kvm.c
+++ b/drivers/ptp/ptp_kvm.c
@@ -178,6 +178,9 @@ static int __init ptp_kvm_init(void)
{
long ret;
+ if (!kvm_para_available())
+ return -ENODEV;
+
clock_pair_gpa = slow_virt_to_phys(&clock_pair);
hv_clock = pvclock_pvti_cpu0_va();
--
2.11.0
next prev parent reply other threads:[~2017-11-08 17:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 17:19 [PATCH v8 0/5] x86/xen: pvclock vdso support Joao Martins
2017-11-08 17:19 ` Joao Martins [this message]
2017-11-08 17:19 ` [PATCH v8 2/5] x86/pvclock: add setter for pvclock_pvti_cpu0_va Joao Martins
2017-11-08 17:19 ` [PATCH v8 3/5] x86/xen/time: set pvclock flags on xen_time_init() Joao Martins
2017-11-08 17:19 ` [PATCH v8 4/5] x86/xen/time: setup vcpu 0 time info page Joao Martins
2017-11-08 17:19 ` [PATCH v8 5/5] MAINTAINERS: xen, kvm: track pvclock-abi.h changes Joao Martins
2017-11-09 20:21 ` [PATCH v8 0/5] x86/xen: pvclock vdso support Boris Ostrovsky
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=20171108171958.23921-2-joao.m.martins@oracle.com \
--to=joao.m.martins@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=richardcochran@gmail.com \
--cc=rkrcmar@redhat.com \
--cc=xen-devel@lists.xenproject.org \
/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
all inboxes | Powered by JetHome®