From: Jianyong Wu <jianyong.wu@arm.com>
To: netdev@vger.kernel.org, yangbo.lu@nxp.com,
john.stultz@linaro.org, tglx@linutronix.de, pbonzini@redhat.com,
sean.j.christopherson@intel.com, maz@kernel.org,
richardcochran@gmail.com, Mark.Rutland@arm.com, will@kernel.org,
suzuki.poulose@arm.com
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
Steve.Capper@arm.com, Kaly.Xin@arm.com, justin.he@arm.com,
jianyong.wu@arm.com, nd@arm.com
Subject: [PATCH v5 4/6] psci: Add hvc call service for ptp_kvm.
Date: Tue, 15 Oct 2019 18:48:20 +0800 [thread overview]
Message-ID: <20191015104822.13890-5-jianyong.wu@arm.com> (raw)
In-Reply-To: <20191015104822.13890-1-jianyong.wu@arm.com>
This patch is the base of ptp_kvm for arm64.
ptp_kvm modules will call hvc to get this service.
The service offers real time and counter cycle of host for guest.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 5 +++++
include/clocksource/arm_arch_timer.h | 5 +++++
include/linux/arm-smccc.h | 12 ++++++++++++
virt/kvm/arm/psci.c | 21 +++++++++++++++++++++
4 files changed, 43 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 07e57a49d1e8..3597f1f27b10 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1634,3 +1634,8 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
}
TIMER_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
#endif
+
+bool is_arm_arch_counter(void *cs)
+{
+ return (struct clocksource *)cs == &clocksource_counter;
+}
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 1d68d5613dae..5895d10a6148 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -86,6 +86,7 @@ extern u32 arch_timer_get_rate(void);
extern u64 (*arch_timer_read_counter)(void);
extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void);
extern bool arch_timer_evtstrm_available(void);
+extern bool is_arm_arch_counter(void *);
#else
@@ -104,6 +105,10 @@ static inline bool arch_timer_evtstrm_available(void)
return false;
}
+bool is_arm_arch_counter(void *unuse)
+{
+ return false;
+}
#endif
#endif
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index a6e4d3e3d10a..bc0cdad10f35 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -94,6 +94,7 @@
/* KVM "vendor specific" services */
#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_PTP 1
#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
#define ARM_SMCCC_KVM_NUM_FUNCS 128
@@ -103,6 +104,17 @@
ARM_SMCCC_OWNER_VENDOR_HYP, \
ARM_SMCCC_KVM_FUNC_FEATURES)
+/*
+ * This ID used for virtual ptp kvm clock and it will pass second value
+ * and nanosecond value of host real time and system counter by vcpu
+ * register to guest.
+ */
+#define ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_KVM_PTP)
+
#ifndef __ASSEMBLY__
#include <linux/linkage.h>
diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c
index 0debf49bf259..f0ef388ebbfa 100644
--- a/virt/kvm/arm/psci.c
+++ b/virt/kvm/arm/psci.c
@@ -392,6 +392,8 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
u32 func_id = smccc_get_function(vcpu);
u32 val[4] = {};
u32 option;
+ u64 cycles;
+ struct system_time_snapshot systime_snapshot;
val[0] = SMCCC_RET_NOT_SUPPORTED;
@@ -431,6 +433,25 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
break;
+ /*
+ * This will used for virtual ptp kvm clock. three
+ * values will be passed back.
+ * reg0 stores high 32-bit host ktime;
+ * reg1 stores low 32-bit host ktime;
+ * reg2 stores high 32-bit difference of host cycles and cntvoff;
+ * reg3 stores low 32-bit difference of host cycles and cntvoff.
+ */
+ case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
+ ktime_get_snapshot(&systime_snapshot);
+ if (!is_arm_arch_counter(systime_snapshot.sc.cs))
+ return kvm_psci_call(vcpu);
+ val[0] = systime_snapshot.real >> 32;
+ val[1] = systime_snapshot.real << 32 >> 32;
+ cycles = systime_snapshot.sc.cycles -
+ vcpu_vtimer(vcpu)->cntvoff;
+ val[2] = cycles >> 32;
+ val[3] = cycles << 32 >> 32;
+ break;
default:
return kvm_psci_call(vcpu);
}
--
2.17.1
next prev parent reply other threads:[~2019-10-15 10:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 10:48 [RFC PATCH v5 0/6] Enable ptp_kvm for arm64 Jianyong Wu
2019-10-15 10:48 ` [PATCH v5 1/6] psci: Export psci_ops.conduit symbol as modules will use it Jianyong Wu
2019-10-15 17:24 ` Mark Rutland
2019-10-16 3:54 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 2/6] ptp: Reorganize ptp_kvm modules to make it arch-independent Jianyong Wu
2019-10-16 7:10 ` Paolo Bonzini
2019-10-16 10:04 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 3/6] timekeeping: Add clocksource to system_time_snapshot Jianyong Wu
2019-10-15 16:37 ` Paolo Bonzini
2019-10-15 20:13 ` Thomas Gleixner
2019-10-15 22:36 ` Paolo Bonzini
2019-10-16 7:28 ` Thomas Gleixner
2019-10-16 9:48 ` Jianyong Wu (Arm Technology China)
2019-10-16 10:23 ` Thomas Gleixner
2019-10-15 20:12 ` Thomas Gleixner
2019-10-15 22:35 ` Paolo Bonzini
2019-10-16 10:01 ` Jianyong Wu (Arm Technology China)
2019-10-16 10:26 ` Thomas Gleixner
2019-10-15 10:48 ` Jianyong Wu [this message]
2019-10-16 7:24 ` [PATCH v5 4/6] psci: Add hvc call service for ptp_kvm Paolo Bonzini
2019-10-16 7:31 ` Thomas Gleixner
2019-10-16 7:42 ` Paolo Bonzini
2019-10-16 10:20 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 5/6] ptp: arm64: Enable ptp_kvm for arm64 Jianyong Wu
2019-10-15 16:39 ` Paolo Bonzini
2019-10-16 3:52 ` Jianyong Wu (Arm Technology China)
2019-10-16 7:10 ` Paolo Bonzini
2019-10-16 7:13 ` Paolo Bonzini
2019-10-16 10:11 ` Jianyong Wu (Arm Technology China)
2019-10-15 10:48 ` [PATCH v5 6/6] kvm: arm64: Add capability check extension for ptp_kvm Jianyong Wu
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=20191015104822.13890-5-jianyong.wu@arm.com \
--to=jianyong.wu@arm.com \
--cc=Kaly.Xin@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Steve.Capper@arm.com \
--cc=john.stultz@linaro.org \
--cc=justin.he@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=nd@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sean.j.christopherson@intel.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=yangbo.lu@nxp.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).