* [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
Currently, we offen use ntp (sync time with remote network clock)
to sync time in VM. But the precision of ntp is subject to network delay
so it's difficult to sync time in a high precision.
kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM,
as the remote clock locates in the host instead of remote network clock.
It targets to sync time between guest and host in virtualization
environment and in this way, we can keep the time of all the VMs running
in the same host in sync. In general, the delay of communication between
host and guest is quiet small, so ptp_kvm can offer time sync precision
up to in order of nanosecond. Please keep in mind that ptp_kvm just
limits itself to be a channel which transmit the remote clock from
host to guest and leaves the time sync jobs to an application, eg. chrony,
in usersapce in VM.
How ptp_kvm works:
After ptp_kvm initialized, there will be a new device node under
/dev called ptp%d. A guest userspace service, like chrony, can use this
device to get host walltime, sometimes also counter cycle, which depends
on the service it calls. Then this guest userspace service can use those
data to do the time sync for guest.
here is a rough sketch to show how kvm ptp clock works.
|----------------------------| |--------------------------|
| guest userspace | | host |
|ioctl -> /dev/ptp%d | | |
| ^ | | | |
|----------------------------| | |
| | | guest kernel | | |
| | V (get host walltime/counter cycle) |
| ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
| <- - - - - - - - - - - - |
|----------------------------| |--------------------------|
1. time sync service in guest userspace call ptp device through /dev/ptp%d.
2. ptp_kvm module in guest recive this request then invoke hypercall to route
into host kernel to request host walltime/counter cycle.
3. ptp_kvm hypercall service in host response to the request and send data back.
4. ptp (not ptp_kvm) in guest copy the data to userspace.
This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
in guest comparing step 3 works in host kernel.
change log:
from v14 to v15
(1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested
on both arm64 and arm32 guest running on arm64 kvm host.
(2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
(3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it should be
arch agnostic.
(4) add description for KVM_CAP_PTP_KVM in Documentation/virt/kvm/api.rst.
(5) adjust dependency in Kconfig for ptp_kvm.
(6) refine multi-arch process in driver/ptp/Makefile.
(7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
(8) address other issues from comments in v14.
(9) fold hypercall service of ptp_kvm as a function.
(10) rebase to 5.10-rc3.
from v13 to v14
(1) rebase code on 5.9-rc3.
(2) add a document to introduce implementation of PTP_KVM on
arm64.
(3) fix comments issue in hypercall.c.
(4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
(5) fix make issue on x86 reported by kernel test robot.
from v12 to v13:
(1) rebase code on 5.8-rc1.
(2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
(3) remove the change to ptp device code of extend getcrosststamp.
(4) remove the mechanism of letting user choose the counter type in
ptp_kvm for arm64.
(5) add virtual counter option in ptp_kvm service to let user choose
the specific counter explicitly.
from v11 to v12:
(1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
including 1/11 and 2/11. as these patches introduce discover mechanism of
vendor smccc service.
(2) rebase ptp_kvm hypercall service from standard smccc to vendor
smccc and add ptp_kvm to vendor smccc service discover mechanism.
(3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
letter.
from v10 to v11:
(1) rebase code on 5.7-rc2.
(2) remove support for arm32, as kvm support for arm32 will be
removed [1]
(3) add error report in ptp_kvm initialization.
from v9 to v10:
(1) change code base to v5.5.
(2) enable ptp_kvm both for arm32 and arm64.
(3) let user choose which of virtual counter or physical counter
should return when using crosstimestamp mode of ptp_kvm for arm/arm64.
(4) extend input argument for getcrosstimestamp API.
from v8 to v9:
(1) move ptp_kvm.h to driver/ptp/
(2) replace license declaration of ptp_kvm.h the same with other
header files in the same directory.
from v7 to v8:
(1) separate adding clocksource id for arm_arch_counter as a
single patch.
(2) update commit message for patch 4/8.
(3) refine patch 7/8 and patch 8/8 to make them more independent.
from v5 to v6:
(1) apply Mark's patch[4] to get SMCCC conduit.
(2) add mechanism to recognize current clocksource by add
clocksouce_id value into struct clocksource instead of method in patch-v5.
(3) rename kvm_arch_ptp_get_clock_fn into
kvm_arch_ptp_get_crosststamp.
from v4 to v5:
(1) remove hvc delay compensasion as it should leave to userspace.
(2) check current clocksource in hvc call service.
(3) expose current clocksource by adding it to
system_time_snapshot.
(4) add helper to check if clocksource is arm_arch_counter.
(5) rename kvm_ptp.c to ptp_kvm_common.c
from v3 to v4:
(1) fix clocksource of ptp_kvm to arch_sys_counter.
(2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
(3) subtract cntvoff before return cycles from host.
(4) use ktime_get_snapshot instead of getnstimeofday and
get_current_counterval to return time and counter value.
(5) split ktime and counter into two 32-bit block respectively
to avoid Y2038-safe issue.
(6) set time compensation to device time as half of the delay of
hvc call.
(7) add ARM_ARCH_TIMER as dependency of ptp_kvm for
arm64.
from v2 to v3:
(1) fix some issues in commit log.
(2) add some receivers in send list.
from v1 to v2:
(1) move arch-specific code from arch/ to driver/ptp/
(2) offer mechanism to inform userspace if ptp_kvm service is
available.
(3) separate ptp_kvm code for arm64 into hypervisor part and
guest part.
(4) add API to expose monotonic clock and counter value.
(5) refine code: remove no necessary part and reconsitution.
[1] https://patchwork.kernel.org/cover/11373351/
Jianyong Wu (6):
ptp: Reorganize ptp_kvm module to make it arch-independent.
clocksource: Add clocksource id for arm arch counter
arm64/kvm: Add hypercall service for kvm ptp.
ptp: arm/arm64: Enable ptp_kvm for arm/arm64
doc: add ptp_kvm introduction for arm64 support
arm64: Add kvm capability check extension for ptp_kvm
Thomas Gleixner (1):
time: Add mechanism to recognize clocksource in time_get_snapshot
Will Deacon (2):
arm64: Probe for the presence of KVM hypervisor
arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
Documentation/virt/kvm/api.rst | 9 ++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
arch/arm64/kvm/arm.c | 1 +
arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
drivers/clocksource/arm_arch_timer.c | 30 +++++++
drivers/firmware/smccc/smccc.c | 37 ++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 2 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
include/linux/arm-smccc.h | 60 +++++++++++++
include/linux/clocksource.h | 6 ++
include/linux/clocksource_ids.h | 12 +++
include/linux/timekeeping.h | 12 +--
include/uapi/linux/kvm.h | 1 +
kernel/time/clocksource.c | 2 +
kernel/time/timekeeping.c | 1 +
23 files changed, 488 insertions(+), 77 deletions(-)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
create mode 100644 drivers/ptp/ptp_kvm.h
create mode 100644 drivers/ptp/ptp_kvm_arm.c
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
create mode 100644 include/linux/clocksource_ids.h
--
2.17.1
^ permalink raw reply [flat|nested] 81+ messages in thread
* [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Currently, we offen use ntp (sync time with remote network clock)
to sync time in VM. But the precision of ntp is subject to network delay
so it's difficult to sync time in a high precision.
kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM,
as the remote clock locates in the host instead of remote network clock.
It targets to sync time between guest and host in virtualization
environment and in this way, we can keep the time of all the VMs running
in the same host in sync. In general, the delay of communication between
host and guest is quiet small, so ptp_kvm can offer time sync precision
up to in order of nanosecond. Please keep in mind that ptp_kvm just
limits itself to be a channel which transmit the remote clock from
host to guest and leaves the time sync jobs to an application, eg. chrony,
in usersapce in VM.
How ptp_kvm works:
After ptp_kvm initialized, there will be a new device node under
/dev called ptp%d. A guest userspace service, like chrony, can use this
device to get host walltime, sometimes also counter cycle, which depends
on the service it calls. Then this guest userspace service can use those
data to do the time sync for guest.
here is a rough sketch to show how kvm ptp clock works.
|----------------------------| |--------------------------|
| guest userspace | | host |
|ioctl -> /dev/ptp%d | | |
| ^ | | | |
|----------------------------| | |
| | | guest kernel | | |
| | V (get host walltime/counter cycle) |
| ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
| <- - - - - - - - - - - - |
|----------------------------| |--------------------------|
1. time sync service in guest userspace call ptp device through /dev/ptp%d.
2. ptp_kvm module in guest recive this request then invoke hypercall to route
into host kernel to request host walltime/counter cycle.
3. ptp_kvm hypercall service in host response to the request and send data back.
4. ptp (not ptp_kvm) in guest copy the data to userspace.
This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
in guest comparing step 3 works in host kernel.
change log:
from v14 to v15
(1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested
on both arm64 and arm32 guest running on arm64 kvm host.
(2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
(3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it should be
arch agnostic.
(4) add description for KVM_CAP_PTP_KVM in Documentation/virt/kvm/api.rst.
(5) adjust dependency in Kconfig for ptp_kvm.
(6) refine multi-arch process in driver/ptp/Makefile.
(7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
(8) address other issues from comments in v14.
(9) fold hypercall service of ptp_kvm as a function.
(10) rebase to 5.10-rc3.
from v13 to v14
(1) rebase code on 5.9-rc3.
(2) add a document to introduce implementation of PTP_KVM on
arm64.
(3) fix comments issue in hypercall.c.
(4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
(5) fix make issue on x86 reported by kernel test robot.
from v12 to v13:
(1) rebase code on 5.8-rc1.
(2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
(3) remove the change to ptp device code of extend getcrosststamp.
(4) remove the mechanism of letting user choose the counter type in
ptp_kvm for arm64.
(5) add virtual counter option in ptp_kvm service to let user choose
the specific counter explicitly.
from v11 to v12:
(1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
including 1/11 and 2/11. as these patches introduce discover mechanism of
vendor smccc service.
(2) rebase ptp_kvm hypercall service from standard smccc to vendor
smccc and add ptp_kvm to vendor smccc service discover mechanism.
(3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
letter.
from v10 to v11:
(1) rebase code on 5.7-rc2.
(2) remove support for arm32, as kvm support for arm32 will be
removed [1]
(3) add error report in ptp_kvm initialization.
from v9 to v10:
(1) change code base to v5.5.
(2) enable ptp_kvm both for arm32 and arm64.
(3) let user choose which of virtual counter or physical counter
should return when using crosstimestamp mode of ptp_kvm for arm/arm64.
(4) extend input argument for getcrosstimestamp API.
from v8 to v9:
(1) move ptp_kvm.h to driver/ptp/
(2) replace license declaration of ptp_kvm.h the same with other
header files in the same directory.
from v7 to v8:
(1) separate adding clocksource id for arm_arch_counter as a
single patch.
(2) update commit message for patch 4/8.
(3) refine patch 7/8 and patch 8/8 to make them more independent.
from v5 to v6:
(1) apply Mark's patch[4] to get SMCCC conduit.
(2) add mechanism to recognize current clocksource by add
clocksouce_id value into struct clocksource instead of method in patch-v5.
(3) rename kvm_arch_ptp_get_clock_fn into
kvm_arch_ptp_get_crosststamp.
from v4 to v5:
(1) remove hvc delay compensasion as it should leave to userspace.
(2) check current clocksource in hvc call service.
(3) expose current clocksource by adding it to
system_time_snapshot.
(4) add helper to check if clocksource is arm_arch_counter.
(5) rename kvm_ptp.c to ptp_kvm_common.c
from v3 to v4:
(1) fix clocksource of ptp_kvm to arch_sys_counter.
(2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
(3) subtract cntvoff before return cycles from host.
(4) use ktime_get_snapshot instead of getnstimeofday and
get_current_counterval to return time and counter value.
(5) split ktime and counter into two 32-bit block respectively
to avoid Y2038-safe issue.
(6) set time compensation to device time as half of the delay of
hvc call.
(7) add ARM_ARCH_TIMER as dependency of ptp_kvm for
arm64.
from v2 to v3:
(1) fix some issues in commit log.
(2) add some receivers in send list.
from v1 to v2:
(1) move arch-specific code from arch/ to driver/ptp/
(2) offer mechanism to inform userspace if ptp_kvm service is
available.
(3) separate ptp_kvm code for arm64 into hypervisor part and
guest part.
(4) add API to expose monotonic clock and counter value.
(5) refine code: remove no necessary part and reconsitution.
[1] https://patchwork.kernel.org/cover/11373351/
Jianyong Wu (6):
ptp: Reorganize ptp_kvm module to make it arch-independent.
clocksource: Add clocksource id for arm arch counter
arm64/kvm: Add hypercall service for kvm ptp.
ptp: arm/arm64: Enable ptp_kvm for arm/arm64
doc: add ptp_kvm introduction for arm64 support
arm64: Add kvm capability check extension for ptp_kvm
Thomas Gleixner (1):
time: Add mechanism to recognize clocksource in time_get_snapshot
Will Deacon (2):
arm64: Probe for the presence of KVM hypervisor
arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
Documentation/virt/kvm/api.rst | 9 ++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
arch/arm64/kvm/arm.c | 1 +
arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
drivers/clocksource/arm_arch_timer.c | 30 +++++++
drivers/firmware/smccc/smccc.c | 37 ++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 2 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
include/linux/arm-smccc.h | 60 +++++++++++++
include/linux/clocksource.h | 6 ++
include/linux/clocksource_ids.h | 12 +++
include/linux/timekeeping.h | 12 +--
include/uapi/linux/kvm.h | 1 +
kernel/time/clocksource.c | 2 +
kernel/time/timekeeping.c | 1 +
23 files changed, 488 insertions(+), 77 deletions(-)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
create mode 100644 drivers/ptp/ptp_kvm.h
create mode 100644 drivers/ptp/ptp_kvm_arm.c
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
create mode 100644 include/linux/clocksource_ids.h
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
Currently, we offen use ntp (sync time with remote network clock)
to sync time in VM. But the precision of ntp is subject to network delay
so it's difficult to sync time in a high precision.
kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM,
as the remote clock locates in the host instead of remote network clock.
It targets to sync time between guest and host in virtualization
environment and in this way, we can keep the time of all the VMs running
in the same host in sync. In general, the delay of communication between
host and guest is quiet small, so ptp_kvm can offer time sync precision
up to in order of nanosecond. Please keep in mind that ptp_kvm just
limits itself to be a channel which transmit the remote clock from
host to guest and leaves the time sync jobs to an application, eg. chrony,
in usersapce in VM.
How ptp_kvm works:
After ptp_kvm initialized, there will be a new device node under
/dev called ptp%d. A guest userspace service, like chrony, can use this
device to get host walltime, sometimes also counter cycle, which depends
on the service it calls. Then this guest userspace service can use those
data to do the time sync for guest.
here is a rough sketch to show how kvm ptp clock works.
|----------------------------| |--------------------------|
| guest userspace | | host |
|ioctl -> /dev/ptp%d | | |
| ^ | | | |
|----------------------------| | |
| | | guest kernel | | |
| | V (get host walltime/counter cycle) |
| ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
| <- - - - - - - - - - - - |
|----------------------------| |--------------------------|
1. time sync service in guest userspace call ptp device through /dev/ptp%d.
2. ptp_kvm module in guest recive this request then invoke hypercall to route
into host kernel to request host walltime/counter cycle.
3. ptp_kvm hypercall service in host response to the request and send data back.
4. ptp (not ptp_kvm) in guest copy the data to userspace.
This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
in guest comparing step 3 works in host kernel.
change log:
from v14 to v15
(1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested
on both arm64 and arm32 guest running on arm64 kvm host.
(2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
(3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it should be
arch agnostic.
(4) add description for KVM_CAP_PTP_KVM in Documentation/virt/kvm/api.rst.
(5) adjust dependency in Kconfig for ptp_kvm.
(6) refine multi-arch process in driver/ptp/Makefile.
(7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
(8) address other issues from comments in v14.
(9) fold hypercall service of ptp_kvm as a function.
(10) rebase to 5.10-rc3.
from v13 to v14
(1) rebase code on 5.9-rc3.
(2) add a document to introduce implementation of PTP_KVM on
arm64.
(3) fix comments issue in hypercall.c.
(4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
(5) fix make issue on x86 reported by kernel test robot.
from v12 to v13:
(1) rebase code on 5.8-rc1.
(2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
(3) remove the change to ptp device code of extend getcrosststamp.
(4) remove the mechanism of letting user choose the counter type in
ptp_kvm for arm64.
(5) add virtual counter option in ptp_kvm service to let user choose
the specific counter explicitly.
from v11 to v12:
(1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
including 1/11 and 2/11. as these patches introduce discover mechanism of
vendor smccc service.
(2) rebase ptp_kvm hypercall service from standard smccc to vendor
smccc and add ptp_kvm to vendor smccc service discover mechanism.
(3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
letter.
from v10 to v11:
(1) rebase code on 5.7-rc2.
(2) remove support for arm32, as kvm support for arm32 will be
removed [1]
(3) add error report in ptp_kvm initialization.
from v9 to v10:
(1) change code base to v5.5.
(2) enable ptp_kvm both for arm32 and arm64.
(3) let user choose which of virtual counter or physical counter
should return when using crosstimestamp mode of ptp_kvm for arm/arm64.
(4) extend input argument for getcrosstimestamp API.
from v8 to v9:
(1) move ptp_kvm.h to driver/ptp/
(2) replace license declaration of ptp_kvm.h the same with other
header files in the same directory.
from v7 to v8:
(1) separate adding clocksource id for arm_arch_counter as a
single patch.
(2) update commit message for patch 4/8.
(3) refine patch 7/8 and patch 8/8 to make them more independent.
from v5 to v6:
(1) apply Mark's patch[4] to get SMCCC conduit.
(2) add mechanism to recognize current clocksource by add
clocksouce_id value into struct clocksource instead of method in patch-v5.
(3) rename kvm_arch_ptp_get_clock_fn into
kvm_arch_ptp_get_crosststamp.
from v4 to v5:
(1) remove hvc delay compensasion as it should leave to userspace.
(2) check current clocksource in hvc call service.
(3) expose current clocksource by adding it to
system_time_snapshot.
(4) add helper to check if clocksource is arm_arch_counter.
(5) rename kvm_ptp.c to ptp_kvm_common.c
from v3 to v4:
(1) fix clocksource of ptp_kvm to arch_sys_counter.
(2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
(3) subtract cntvoff before return cycles from host.
(4) use ktime_get_snapshot instead of getnstimeofday and
get_current_counterval to return time and counter value.
(5) split ktime and counter into two 32-bit block respectively
to avoid Y2038-safe issue.
(6) set time compensation to device time as half of the delay of
hvc call.
(7) add ARM_ARCH_TIMER as dependency of ptp_kvm for
arm64.
from v2 to v3:
(1) fix some issues in commit log.
(2) add some receivers in send list.
from v1 to v2:
(1) move arch-specific code from arch/ to driver/ptp/
(2) offer mechanism to inform userspace if ptp_kvm service is
available.
(3) separate ptp_kvm code for arm64 into hypervisor part and
guest part.
(4) add API to expose monotonic clock and counter value.
(5) refine code: remove no necessary part and reconsitution.
[1] https://patchwork.kernel.org/cover/11373351/
Jianyong Wu (6):
ptp: Reorganize ptp_kvm module to make it arch-independent.
clocksource: Add clocksource id for arm arch counter
arm64/kvm: Add hypercall service for kvm ptp.
ptp: arm/arm64: Enable ptp_kvm for arm/arm64
doc: add ptp_kvm introduction for arm64 support
arm64: Add kvm capability check extension for ptp_kvm
Thomas Gleixner (1):
time: Add mechanism to recognize clocksource in time_get_snapshot
Will Deacon (2):
arm64: Probe for the presence of KVM hypervisor
arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
Documentation/virt/kvm/api.rst | 9 ++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
arch/arm64/kvm/arm.c | 1 +
arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
drivers/clocksource/arm_arch_timer.c | 30 +++++++
drivers/firmware/smccc/smccc.c | 37 ++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 2 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
include/linux/arm-smccc.h | 60 +++++++++++++
include/linux/clocksource.h | 6 ++
include/linux/clocksource_ids.h | 12 +++
include/linux/timekeeping.h | 12 +--
include/uapi/linux/kvm.h | 1 +
kernel/time/clocksource.c | 2 +
kernel/time/timekeeping.c | 1 +
23 files changed, 488 insertions(+), 77 deletions(-)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
create mode 100644 drivers/ptp/ptp_kvm.h
create mode 100644 drivers/ptp/ptp_kvm_arm.c
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
create mode 100644 include/linux/clocksource_ids.h
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
From: Will Deacon <will@kernel.org>
Although the SMCCC specification provides some limited functionality for
describing the presence of hypervisor and firmware services, this is
generally applicable only to functions designated as "Arm Architecture
Service Functions" and no portable discovery mechanism is provided for
standard hypervisor services, despite having a designated range of
function identifiers reserved by the specification.
In an attempt to avoid the need for additional firmware changes every
time a new function is added, introduce a UID to identify the service
provider as being compatible with KVM. Once this has been established,
additional services can be discovered via a feature bitmap.
Change from Jianyong Wu:
mv kvm_arm_hyp_service_available to common place to let both arm/arm64 touch it.
add kvm_init_hyp_services also under arm arch to let arm kvm guest use this service.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
drivers/firmware/smccc/smccc.c | 37 +++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 43 ++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 3f65d0ac9f63..bbe2e88f8415 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1145,6 +1145,7 @@ void __init setup_arch(char **cmdline_p)
arm_dt_init_cpu_maps();
psci_dt_init();
+ kvm_init_hyp_services();
#ifdef CONFIG_SMP
if (is_smp()) {
if (!mdesc->smp_init || !mdesc->smp_init()) {
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 133257ffd859..d1dbe41620df 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -353,6 +353,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
else
psci_acpi_init();
+ kvm_init_hyp_services();
init_bootcpu_ops();
smp_init_cpus();
smp_build_mpidr_hash();
diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c
index 00c88b809c0c..e153c71ece99 100644
--- a/drivers/firmware/smccc/smccc.c
+++ b/drivers/firmware/smccc/smccc.c
@@ -7,10 +7,47 @@
#include <linux/init.h>
#include <linux/arm-smccc.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
static u32 smccc_version = ARM_SMCCC_VERSION_1_0;
static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE;
+DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS) = { };
+EXPORT_SYMBOL_GPL(__kvm_arm_hyp_services);
+
+void __init kvm_init_hyp_services(void)
+{
+ int i;
+ struct arm_smccc_res res;
+
+ if (arm_smccc_get_version() == ARM_SMCCC_VERSION_1_0)
+ return;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
+ if (res.a0 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 ||
+ res.a1 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 ||
+ res.a2 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 ||
+ res.a3 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3)
+ return;
+
+ memset(&res, 0, sizeof(res));
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID, &res);
+ for (i = 0; i < 32; ++i) {
+ if (res.a0 & (i))
+ set_bit(i + (32 * 0), __kvm_arm_hyp_services);
+ if (res.a1 & (i))
+ set_bit(i + (32 * 1), __kvm_arm_hyp_services);
+ if (res.a2 & (i))
+ set_bit(i + (32 * 2), __kvm_arm_hyp_services);
+ if (res.a3 & (i))
+ set_bit(i + (32 * 3), __kvm_arm_hyp_services);
+ }
+
+ pr_info("KVM hypervisor services detected (0x%08lx 0x%08lx 0x%08lx 0x%08lx)\n",
+ res.a3, res.a2, res.a1, res.a0);
+}
+
void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit)
{
smccc_version = version;
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index f860645f6512..d75408141137 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -55,6 +55,8 @@
#define ARM_SMCCC_OWNER_TRUSTED_OS 50
#define ARM_SMCCC_OWNER_TRUSTED_OS_END 63
+#define ARM_SMCCC_FUNC_QUERY_CALL_UID 0xff01
+
#define ARM_SMCCC_QUIRK_NONE 0
#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */
@@ -87,6 +89,29 @@
ARM_SMCCC_SMC_32, \
0, 0x7fff)
+#define ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_FUNC_QUERY_CALL_UID)
+
+/* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 0xb66fb428U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 0xe911c52eU
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 0x564bcaa9U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3 0x743a004dU
+
+/* KVM "vendor specific" services */
+#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
+#define ARM_SMCCC_KVM_NUM_FUNCS 128
+
+#define ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_KVM_FUNC_FEATURES)
+
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
/* Paravirtualised time calls (defined by ARM DEN0057A) */
@@ -391,5 +416,23 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
method; \
})
+void __init kvm_init_hyp_services(void);
+
+/*
+ * This helper will be called in guest. We put it here then both arm and arm64
+ * guest can touch it.
+ */
+#include <linux/kernel.h>
+#include <linux/err.h>
+static inline bool kvm_arm_hyp_service_available(u32 func_id)
+{
+ extern DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS);
+
+ if (func_id >= ARM_SMCCC_KVM_NUM_FUNCS)
+ return -EINVAL;
+
+ return test_bit(func_id, __kvm_arm_hyp_services);
+}
+
#endif /*__ASSEMBLY__*/
#endif /*__LINUX_ARM_SMCCC_H*/
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
From: Will Deacon <will@kernel.org>
Although the SMCCC specification provides some limited functionality for
describing the presence of hypervisor and firmware services, this is
generally applicable only to functions designated as "Arm Architecture
Service Functions" and no portable discovery mechanism is provided for
standard hypervisor services, despite having a designated range of
function identifiers reserved by the specification.
In an attempt to avoid the need for additional firmware changes every
time a new function is added, introduce a UID to identify the service
provider as being compatible with KVM. Once this has been established,
additional services can be discovered via a feature bitmap.
Change from Jianyong Wu:
mv kvm_arm_hyp_service_available to common place to let both arm/arm64 touch it.
add kvm_init_hyp_services also under arm arch to let arm kvm guest use this service.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
drivers/firmware/smccc/smccc.c | 37 +++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 43 ++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 3f65d0ac9f63..bbe2e88f8415 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1145,6 +1145,7 @@ void __init setup_arch(char **cmdline_p)
arm_dt_init_cpu_maps();
psci_dt_init();
+ kvm_init_hyp_services();
#ifdef CONFIG_SMP
if (is_smp()) {
if (!mdesc->smp_init || !mdesc->smp_init()) {
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 133257ffd859..d1dbe41620df 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -353,6 +353,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
else
psci_acpi_init();
+ kvm_init_hyp_services();
init_bootcpu_ops();
smp_init_cpus();
smp_build_mpidr_hash();
diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c
index 00c88b809c0c..e153c71ece99 100644
--- a/drivers/firmware/smccc/smccc.c
+++ b/drivers/firmware/smccc/smccc.c
@@ -7,10 +7,47 @@
#include <linux/init.h>
#include <linux/arm-smccc.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
static u32 smccc_version = ARM_SMCCC_VERSION_1_0;
static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE;
+DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS) = { };
+EXPORT_SYMBOL_GPL(__kvm_arm_hyp_services);
+
+void __init kvm_init_hyp_services(void)
+{
+ int i;
+ struct arm_smccc_res res;
+
+ if (arm_smccc_get_version() == ARM_SMCCC_VERSION_1_0)
+ return;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
+ if (res.a0 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 ||
+ res.a1 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 ||
+ res.a2 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 ||
+ res.a3 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3)
+ return;
+
+ memset(&res, 0, sizeof(res));
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID, &res);
+ for (i = 0; i < 32; ++i) {
+ if (res.a0 & (i))
+ set_bit(i + (32 * 0), __kvm_arm_hyp_services);
+ if (res.a1 & (i))
+ set_bit(i + (32 * 1), __kvm_arm_hyp_services);
+ if (res.a2 & (i))
+ set_bit(i + (32 * 2), __kvm_arm_hyp_services);
+ if (res.a3 & (i))
+ set_bit(i + (32 * 3), __kvm_arm_hyp_services);
+ }
+
+ pr_info("KVM hypervisor services detected (0x%08lx 0x%08lx 0x%08lx 0x%08lx)\n",
+ res.a3, res.a2, res.a1, res.a0);
+}
+
void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit)
{
smccc_version = version;
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index f860645f6512..d75408141137 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -55,6 +55,8 @@
#define ARM_SMCCC_OWNER_TRUSTED_OS 50
#define ARM_SMCCC_OWNER_TRUSTED_OS_END 63
+#define ARM_SMCCC_FUNC_QUERY_CALL_UID 0xff01
+
#define ARM_SMCCC_QUIRK_NONE 0
#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */
@@ -87,6 +89,29 @@
ARM_SMCCC_SMC_32, \
0, 0x7fff)
+#define ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_FUNC_QUERY_CALL_UID)
+
+/* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 0xb66fb428U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 0xe911c52eU
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 0x564bcaa9U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3 0x743a004dU
+
+/* KVM "vendor specific" services */
+#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
+#define ARM_SMCCC_KVM_NUM_FUNCS 128
+
+#define ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_KVM_FUNC_FEATURES)
+
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
/* Paravirtualised time calls (defined by ARM DEN0057A) */
@@ -391,5 +416,23 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
method; \
})
+void __init kvm_init_hyp_services(void);
+
+/*
+ * This helper will be called in guest. We put it here then both arm and arm64
+ * guest can touch it.
+ */
+#include <linux/kernel.h>
+#include <linux/err.h>
+static inline bool kvm_arm_hyp_service_available(u32 func_id)
+{
+ extern DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS);
+
+ if (func_id >= ARM_SMCCC_KVM_NUM_FUNCS)
+ return -EINVAL;
+
+ return test_bit(func_id, __kvm_arm_hyp_services);
+}
+
#endif /*__ASSEMBLY__*/
#endif /*__LINUX_ARM_SMCCC_H*/
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
From: Will Deacon <will@kernel.org>
Although the SMCCC specification provides some limited functionality for
describing the presence of hypervisor and firmware services, this is
generally applicable only to functions designated as "Arm Architecture
Service Functions" and no portable discovery mechanism is provided for
standard hypervisor services, despite having a designated range of
function identifiers reserved by the specification.
In an attempt to avoid the need for additional firmware changes every
time a new function is added, introduce a UID to identify the service
provider as being compatible with KVM. Once this has been established,
additional services can be discovered via a feature bitmap.
Change from Jianyong Wu:
mv kvm_arm_hyp_service_available to common place to let both arm/arm64 touch it.
add kvm_init_hyp_services also under arm arch to let arm kvm guest use this service.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm/kernel/setup.c | 1 +
arch/arm64/kernel/setup.c | 1 +
drivers/firmware/smccc/smccc.c | 37 +++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 43 ++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 3f65d0ac9f63..bbe2e88f8415 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1145,6 +1145,7 @@ void __init setup_arch(char **cmdline_p)
arm_dt_init_cpu_maps();
psci_dt_init();
+ kvm_init_hyp_services();
#ifdef CONFIG_SMP
if (is_smp()) {
if (!mdesc->smp_init || !mdesc->smp_init()) {
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 133257ffd859..d1dbe41620df 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -353,6 +353,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
else
psci_acpi_init();
+ kvm_init_hyp_services();
init_bootcpu_ops();
smp_init_cpus();
smp_build_mpidr_hash();
diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c
index 00c88b809c0c..e153c71ece99 100644
--- a/drivers/firmware/smccc/smccc.c
+++ b/drivers/firmware/smccc/smccc.c
@@ -7,10 +7,47 @@
#include <linux/init.h>
#include <linux/arm-smccc.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
static u32 smccc_version = ARM_SMCCC_VERSION_1_0;
static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE;
+DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS) = { };
+EXPORT_SYMBOL_GPL(__kvm_arm_hyp_services);
+
+void __init kvm_init_hyp_services(void)
+{
+ int i;
+ struct arm_smccc_res res;
+
+ if (arm_smccc_get_version() == ARM_SMCCC_VERSION_1_0)
+ return;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
+ if (res.a0 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 ||
+ res.a1 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 ||
+ res.a2 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 ||
+ res.a3 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3)
+ return;
+
+ memset(&res, 0, sizeof(res));
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID, &res);
+ for (i = 0; i < 32; ++i) {
+ if (res.a0 & (i))
+ set_bit(i + (32 * 0), __kvm_arm_hyp_services);
+ if (res.a1 & (i))
+ set_bit(i + (32 * 1), __kvm_arm_hyp_services);
+ if (res.a2 & (i))
+ set_bit(i + (32 * 2), __kvm_arm_hyp_services);
+ if (res.a3 & (i))
+ set_bit(i + (32 * 3), __kvm_arm_hyp_services);
+ }
+
+ pr_info("KVM hypervisor services detected (0x%08lx 0x%08lx 0x%08lx 0x%08lx)\n",
+ res.a3, res.a2, res.a1, res.a0);
+}
+
void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit)
{
smccc_version = version;
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index f860645f6512..d75408141137 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -55,6 +55,8 @@
#define ARM_SMCCC_OWNER_TRUSTED_OS 50
#define ARM_SMCCC_OWNER_TRUSTED_OS_END 63
+#define ARM_SMCCC_FUNC_QUERY_CALL_UID 0xff01
+
#define ARM_SMCCC_QUIRK_NONE 0
#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */
@@ -87,6 +89,29 @@
ARM_SMCCC_SMC_32, \
0, 0x7fff)
+#define ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_FUNC_QUERY_CALL_UID)
+
+/* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 0xb66fb428U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 0xe911c52eU
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 0x564bcaa9U
+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3 0x743a004dU
+
+/* KVM "vendor specific" services */
+#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
+#define ARM_SMCCC_KVM_NUM_FUNCS 128
+
+#define ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID \
+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
+ ARM_SMCCC_SMC_32, \
+ ARM_SMCCC_OWNER_VENDOR_HYP, \
+ ARM_SMCCC_KVM_FUNC_FEATURES)
+
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
/* Paravirtualised time calls (defined by ARM DEN0057A) */
@@ -391,5 +416,23 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
method; \
})
+void __init kvm_init_hyp_services(void);
+
+/*
+ * This helper will be called in guest. We put it here then both arm and arm64
+ * guest can touch it.
+ */
+#include <linux/kernel.h>
+#include <linux/err.h>
+static inline bool kvm_arm_hyp_service_available(u32 func_id)
+{
+ extern DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS);
+
+ if (func_id >= ARM_SMCCC_KVM_NUM_FUNCS)
+ return -EINVAL;
+
+ return test_bit(func_id, __kvm_arm_hyp_services);
+}
+
#endif /*__ASSEMBLY__*/
#endif /*__LINUX_ARM_SMCCC_H*/
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 2/9] arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
From: Will Deacon <will@kernel.org>
We can advertise ourselves to guests as KVM and provide a basic features
bitmap for discoverability of future hypervisor services.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 25ea4ecb6449..b9d8607083eb 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -12,13 +12,13 @@
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
- long val = SMCCC_RET_NOT_SUPPORTED;
+ u64 val[4] = {SMCCC_RET_NOT_SUPPORTED};
u32 feature;
gpa_t gpa;
switch (func_id) {
case ARM_SMCCC_VERSION_FUNC_ID:
- val = ARM_SMCCC_VERSION_1_1;
+ val[0] = ARM_SMCCC_VERSION_1_1;
break;
case ARM_SMCCC_ARCH_FEATURES_FUNC_ID:
feature = smccc_get_arg1(vcpu);
@@ -28,10 +28,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case SPECTRE_VULNERABLE:
break;
case SPECTRE_MITIGATED:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
case SPECTRE_UNAFFECTED:
- val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
+ val[0] = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
break;
}
break;
@@ -54,27 +54,36 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
fallthrough;
case SPECTRE_UNAFFECTED:
- val = SMCCC_RET_NOT_REQUIRED;
+ val[0] = SMCCC_RET_NOT_REQUIRED;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = kvm_hypercall_pv_features(vcpu);
+ val[0] = kvm_hypercall_pv_features(vcpu);
break;
case ARM_SMCCC_HV_PV_TIME_ST:
gpa = kvm_init_stolen_time(vcpu);
if (gpa != GPA_INVALID)
- val = gpa;
+ val[0] = gpa;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID:
+ val[0] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0;
+ val[1] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1;
+ val[2] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2;
+ val[3] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
+ val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
break;
default:
return kvm_psci_call(vcpu);
}
- smccc_set_retval(vcpu, val, 0, 0, 0);
+ smccc_set_retval(vcpu, val[0], val[1], val[2], val[3]);
return 1;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 2/9] arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
From: Will Deacon <will@kernel.org>
We can advertise ourselves to guests as KVM and provide a basic features
bitmap for discoverability of future hypervisor services.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 25ea4ecb6449..b9d8607083eb 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -12,13 +12,13 @@
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
- long val = SMCCC_RET_NOT_SUPPORTED;
+ u64 val[4] = {SMCCC_RET_NOT_SUPPORTED};
u32 feature;
gpa_t gpa;
switch (func_id) {
case ARM_SMCCC_VERSION_FUNC_ID:
- val = ARM_SMCCC_VERSION_1_1;
+ val[0] = ARM_SMCCC_VERSION_1_1;
break;
case ARM_SMCCC_ARCH_FEATURES_FUNC_ID:
feature = smccc_get_arg1(vcpu);
@@ -28,10 +28,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case SPECTRE_VULNERABLE:
break;
case SPECTRE_MITIGATED:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
case SPECTRE_UNAFFECTED:
- val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
+ val[0] = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
break;
}
break;
@@ -54,27 +54,36 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
fallthrough;
case SPECTRE_UNAFFECTED:
- val = SMCCC_RET_NOT_REQUIRED;
+ val[0] = SMCCC_RET_NOT_REQUIRED;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = kvm_hypercall_pv_features(vcpu);
+ val[0] = kvm_hypercall_pv_features(vcpu);
break;
case ARM_SMCCC_HV_PV_TIME_ST:
gpa = kvm_init_stolen_time(vcpu);
if (gpa != GPA_INVALID)
- val = gpa;
+ val[0] = gpa;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID:
+ val[0] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0;
+ val[1] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1;
+ val[2] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2;
+ val[3] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
+ val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
break;
default:
return kvm_psci_call(vcpu);
}
- smccc_set_retval(vcpu, val, 0, 0, 0);
+ smccc_set_retval(vcpu, val[0], val[1], val[2], val[3]);
return 1;
}
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 2/9] arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
From: Will Deacon <will@kernel.org>
We can advertise ourselves to guests as KVM and provide a basic features
bitmap for discoverability of future hypervisor services.
Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 25ea4ecb6449..b9d8607083eb 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -12,13 +12,13 @@
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
- long val = SMCCC_RET_NOT_SUPPORTED;
+ u64 val[4] = {SMCCC_RET_NOT_SUPPORTED};
u32 feature;
gpa_t gpa;
switch (func_id) {
case ARM_SMCCC_VERSION_FUNC_ID:
- val = ARM_SMCCC_VERSION_1_1;
+ val[0] = ARM_SMCCC_VERSION_1_1;
break;
case ARM_SMCCC_ARCH_FEATURES_FUNC_ID:
feature = smccc_get_arg1(vcpu);
@@ -28,10 +28,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case SPECTRE_VULNERABLE:
break;
case SPECTRE_MITIGATED:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
case SPECTRE_UNAFFECTED:
- val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
+ val[0] = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
break;
}
break;
@@ -54,27 +54,36 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
fallthrough;
case SPECTRE_UNAFFECTED:
- val = SMCCC_RET_NOT_REQUIRED;
+ val[0] = SMCCC_RET_NOT_REQUIRED;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = kvm_hypercall_pv_features(vcpu);
+ val[0] = kvm_hypercall_pv_features(vcpu);
break;
case ARM_SMCCC_HV_PV_TIME_ST:
gpa = kvm_init_stolen_time(vcpu);
if (gpa != GPA_INVALID)
- val = gpa;
+ val[0] = gpa;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID:
+ val[0] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0;
+ val[1] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1;
+ val[2] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2;
+ val[3] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
+ val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
break;
default:
return kvm_psci_call(vcpu);
}
- smccc_set_retval(vcpu, val, 0, 0, 0);
+ smccc_set_retval(vcpu, val[0], val[1], val[2], val[3]);
return 1;
}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
Currently, ptp_kvm modules implementation is only for x86 which includes
large part of arch-specific code. This patch moves all of this code
into a new arch related file in the same directory.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
4 files changed, 130 insertions(+), 62 deletions(-)
create mode 100644 drivers/ptp/ptp_kvm.h
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 7aff75f745dc..699a4e4d19c2 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -4,6 +4,7 @@
#
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
+ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm.h b/drivers/ptp/ptp_kvm.h
new file mode 100644
index 000000000000..46fe4c7c377d
--- /dev/null
+++ b/drivers/ptp/ptp_kvm.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+int kvm_arch_ptp_init(void);
+int kvm_arch_ptp_get_clock(struct timespec64 *ts);
+int kvm_arch_ptp_get_crosststamp(u64 *cycle,
+ struct timespec64 *tspec, void *cs);
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm_common.c
similarity index 60%
rename from drivers/ptp/ptp_kvm.c
rename to drivers/ptp/ptp_kvm_common.c
index 658d33fc3195..2df4ff3c518f 100644
--- a/drivers/ptp/ptp_kvm.c
+++ b/drivers/ptp/ptp_kvm_common.c
@@ -8,15 +8,16 @@
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <uapi/linux/kvm_para.h>
#include <asm/kvm_para.h>
-#include <asm/pvclock.h>
-#include <asm/kvmclock.h>
#include <uapi/asm/kvm_para.h>
#include <linux/ptp_clock_kernel.h>
+#include "ptp_kvm.h"
+
struct kvm_ptp_clock {
struct ptp_clock *ptp_clock;
struct ptp_clock_info caps;
@@ -24,56 +25,29 @@ struct kvm_ptp_clock {
static DEFINE_SPINLOCK(kvm_ptp_lock);
-static struct pvclock_vsyscall_time_info *hv_clock;
-
-static struct kvm_clock_pairing clock_pair;
-static phys_addr_t clock_pair_gpa;
-
static int ptp_kvm_get_time_fn(ktime_t *device_time,
struct system_counterval_t *system_counter,
void *ctx)
{
- unsigned long ret;
+ long ret;
+ u64 cycle;
struct timespec64 tspec;
- unsigned version;
- int cpu;
- struct pvclock_vcpu_time_info *src;
+ struct clocksource *cs;
spin_lock(&kvm_ptp_lock);
preempt_disable_notrace();
- cpu = smp_processor_id();
- src = &hv_clock[cpu].pvti;
-
- do {
- /*
- * We are using a TSC value read in the hosts
- * kvm_hc_clock_pairing handling.
- * So any changes to tsc_to_system_mul
- * and tsc_shift or any other pvclock
- * data invalidate that measurement.
- */
- version = pvclock_read_begin(src);
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
- spin_unlock(&kvm_ptp_lock);
- preempt_enable_notrace();
- return -EOPNOTSUPP;
- }
-
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
- ret = __pvclock_read_cycles(src, clock_pair.tsc);
- } while (pvclock_read_retry(src, version));
+ ret = kvm_arch_ptp_get_crosststamp(&cycle, &tspec, &cs);
+ if (ret) {
+ spin_unlock(&kvm_ptp_lock);
+ preempt_enable_notrace();
+ return ret;
+ }
preempt_enable_notrace();
- system_counter->cycles = ret;
- system_counter->cs = &kvm_clock;
+ system_counter->cycles = cycle;
+ system_counter->cs = cs;
*device_time = timespec64_to_ktime(tspec);
@@ -111,22 +85,17 @@ static int ptp_kvm_settime(struct ptp_clock_info *ptp,
static int ptp_kvm_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{
- unsigned long ret;
+ long ret;
struct timespec64 tspec;
spin_lock(&kvm_ptp_lock);
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ ret = kvm_arch_ptp_get_clock(&tspec);
+ if (ret) {
spin_unlock(&kvm_ptp_lock);
- return -EOPNOTSUPP;
+ return ret;
}
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
spin_unlock(&kvm_ptp_lock);
memcpy(ts, &tspec, sizeof(struct timespec64));
@@ -168,19 +137,11 @@ 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_get_pvti_cpu0_va();
-
- if (!hv_clock)
- return -ENODEV;
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
- return -ENODEV;
+ ret = kvm_arch_ptp_init();
+ if (ret) {
+ pr_err("fail to initialize ptp_kvm");
+ return ret;
+ }
kvm_ptp_clock.caps = ptp_kvm_caps;
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c
new file mode 100644
index 000000000000..ed19083653a4
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_x86.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <asm/pvclock.h>
+#include <asm/kvmclock.h>
+#include <linux/module.h>
+#include <uapi/asm/kvm_para.h>
+#include <uapi/linux/kvm_para.h>
+#include <linux/ptp_clock_kernel.h>
+
+phys_addr_t clock_pair_gpa;
+struct kvm_clock_pairing clock_pair;
+struct pvclock_vsyscall_time_info *hv_clock;
+
+int kvm_arch_ptp_init(void)
+{
+ long ret;
+
+ if (!kvm_para_available())
+ return -ENODEV;
+
+ clock_pair_gpa = slow_virt_to_phys(&clock_pair);
+ hv_clock = pvclock_get_pvti_cpu0_va();
+ if (!hv_clock)
+ return -ENODEV;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
+ return -ENODEV;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ unsigned long ret;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+
+ ts->tv_sec = clock_pair.sec;
+ ts->tv_nsec = clock_pair.nsec;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
+ struct clocksource **cs)
+{
+ unsigned long ret;
+ unsigned int version;
+ int cpu;
+ struct pvclock_vcpu_time_info *src;
+
+ cpu = smp_processor_id();
+ src = &hv_clock[cpu].pvti;
+
+ do {
+ /*
+ * We are using a TSC value read in the hosts
+ * kvm_hc_clock_pairing handling.
+ * So any changes to tsc_to_system_mul
+ * and tsc_shift or any other pvclock
+ * data invalidate that measurement.
+ */
+ version = pvclock_read_begin(src);
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+ tspec->tv_sec = clock_pair.sec;
+ tspec->tv_nsec = clock_pair.nsec;
+ *cycle = __pvclock_read_cycles(src, clock_pair.tsc);
+ } while (pvclock_read_retry(src, version));
+
+ *cs = &kvm_clock;
+
+ return 0;
+}
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Currently, ptp_kvm modules implementation is only for x86 which includes
large part of arch-specific code. This patch moves all of this code
into a new arch related file in the same directory.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
4 files changed, 130 insertions(+), 62 deletions(-)
create mode 100644 drivers/ptp/ptp_kvm.h
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 7aff75f745dc..699a4e4d19c2 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -4,6 +4,7 @@
#
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
+ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm.h b/drivers/ptp/ptp_kvm.h
new file mode 100644
index 000000000000..46fe4c7c377d
--- /dev/null
+++ b/drivers/ptp/ptp_kvm.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+int kvm_arch_ptp_init(void);
+int kvm_arch_ptp_get_clock(struct timespec64 *ts);
+int kvm_arch_ptp_get_crosststamp(u64 *cycle,
+ struct timespec64 *tspec, void *cs);
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm_common.c
similarity index 60%
rename from drivers/ptp/ptp_kvm.c
rename to drivers/ptp/ptp_kvm_common.c
index 658d33fc3195..2df4ff3c518f 100644
--- a/drivers/ptp/ptp_kvm.c
+++ b/drivers/ptp/ptp_kvm_common.c
@@ -8,15 +8,16 @@
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <uapi/linux/kvm_para.h>
#include <asm/kvm_para.h>
-#include <asm/pvclock.h>
-#include <asm/kvmclock.h>
#include <uapi/asm/kvm_para.h>
#include <linux/ptp_clock_kernel.h>
+#include "ptp_kvm.h"
+
struct kvm_ptp_clock {
struct ptp_clock *ptp_clock;
struct ptp_clock_info caps;
@@ -24,56 +25,29 @@ struct kvm_ptp_clock {
static DEFINE_SPINLOCK(kvm_ptp_lock);
-static struct pvclock_vsyscall_time_info *hv_clock;
-
-static struct kvm_clock_pairing clock_pair;
-static phys_addr_t clock_pair_gpa;
-
static int ptp_kvm_get_time_fn(ktime_t *device_time,
struct system_counterval_t *system_counter,
void *ctx)
{
- unsigned long ret;
+ long ret;
+ u64 cycle;
struct timespec64 tspec;
- unsigned version;
- int cpu;
- struct pvclock_vcpu_time_info *src;
+ struct clocksource *cs;
spin_lock(&kvm_ptp_lock);
preempt_disable_notrace();
- cpu = smp_processor_id();
- src = &hv_clock[cpu].pvti;
-
- do {
- /*
- * We are using a TSC value read in the hosts
- * kvm_hc_clock_pairing handling.
- * So any changes to tsc_to_system_mul
- * and tsc_shift or any other pvclock
- * data invalidate that measurement.
- */
- version = pvclock_read_begin(src);
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
- spin_unlock(&kvm_ptp_lock);
- preempt_enable_notrace();
- return -EOPNOTSUPP;
- }
-
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
- ret = __pvclock_read_cycles(src, clock_pair.tsc);
- } while (pvclock_read_retry(src, version));
+ ret = kvm_arch_ptp_get_crosststamp(&cycle, &tspec, &cs);
+ if (ret) {
+ spin_unlock(&kvm_ptp_lock);
+ preempt_enable_notrace();
+ return ret;
+ }
preempt_enable_notrace();
- system_counter->cycles = ret;
- system_counter->cs = &kvm_clock;
+ system_counter->cycles = cycle;
+ system_counter->cs = cs;
*device_time = timespec64_to_ktime(tspec);
@@ -111,22 +85,17 @@ static int ptp_kvm_settime(struct ptp_clock_info *ptp,
static int ptp_kvm_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{
- unsigned long ret;
+ long ret;
struct timespec64 tspec;
spin_lock(&kvm_ptp_lock);
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ ret = kvm_arch_ptp_get_clock(&tspec);
+ if (ret) {
spin_unlock(&kvm_ptp_lock);
- return -EOPNOTSUPP;
+ return ret;
}
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
spin_unlock(&kvm_ptp_lock);
memcpy(ts, &tspec, sizeof(struct timespec64));
@@ -168,19 +137,11 @@ 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_get_pvti_cpu0_va();
-
- if (!hv_clock)
- return -ENODEV;
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
- return -ENODEV;
+ ret = kvm_arch_ptp_init();
+ if (ret) {
+ pr_err("fail to initialize ptp_kvm");
+ return ret;
+ }
kvm_ptp_clock.caps = ptp_kvm_caps;
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c
new file mode 100644
index 000000000000..ed19083653a4
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_x86.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <asm/pvclock.h>
+#include <asm/kvmclock.h>
+#include <linux/module.h>
+#include <uapi/asm/kvm_para.h>
+#include <uapi/linux/kvm_para.h>
+#include <linux/ptp_clock_kernel.h>
+
+phys_addr_t clock_pair_gpa;
+struct kvm_clock_pairing clock_pair;
+struct pvclock_vsyscall_time_info *hv_clock;
+
+int kvm_arch_ptp_init(void)
+{
+ long ret;
+
+ if (!kvm_para_available())
+ return -ENODEV;
+
+ clock_pair_gpa = slow_virt_to_phys(&clock_pair);
+ hv_clock = pvclock_get_pvti_cpu0_va();
+ if (!hv_clock)
+ return -ENODEV;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
+ return -ENODEV;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ unsigned long ret;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+
+ ts->tv_sec = clock_pair.sec;
+ ts->tv_nsec = clock_pair.nsec;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
+ struct clocksource **cs)
+{
+ unsigned long ret;
+ unsigned int version;
+ int cpu;
+ struct pvclock_vcpu_time_info *src;
+
+ cpu = smp_processor_id();
+ src = &hv_clock[cpu].pvti;
+
+ do {
+ /*
+ * We are using a TSC value read in the hosts
+ * kvm_hc_clock_pairing handling.
+ * So any changes to tsc_to_system_mul
+ * and tsc_shift or any other pvclock
+ * data invalidate that measurement.
+ */
+ version = pvclock_read_begin(src);
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+ tspec->tv_sec = clock_pair.sec;
+ tspec->tv_nsec = clock_pair.nsec;
+ *cycle = __pvclock_read_cycles(src, clock_pair.tsc);
+ } while (pvclock_read_retry(src, version));
+
+ *cs = &kvm_clock;
+
+ return 0;
+}
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
Currently, ptp_kvm modules implementation is only for x86 which includes
large part of arch-specific code. This patch moves all of this code
into a new arch related file in the same directory.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm.h | 11 +++
drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
4 files changed, 130 insertions(+), 62 deletions(-)
create mode 100644 drivers/ptp/ptp_kvm.h
rename drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} (60%)
create mode 100644 drivers/ptp/ptp_kvm_x86.c
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 7aff75f745dc..699a4e4d19c2 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -4,6 +4,7 @@
#
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
+ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm.h b/drivers/ptp/ptp_kvm.h
new file mode 100644
index 000000000000..46fe4c7c377d
--- /dev/null
+++ b/drivers/ptp/ptp_kvm.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+int kvm_arch_ptp_init(void);
+int kvm_arch_ptp_get_clock(struct timespec64 *ts);
+int kvm_arch_ptp_get_crosststamp(u64 *cycle,
+ struct timespec64 *tspec, void *cs);
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm_common.c
similarity index 60%
rename from drivers/ptp/ptp_kvm.c
rename to drivers/ptp/ptp_kvm_common.c
index 658d33fc3195..2df4ff3c518f 100644
--- a/drivers/ptp/ptp_kvm.c
+++ b/drivers/ptp/ptp_kvm_common.c
@@ -8,15 +8,16 @@
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <uapi/linux/kvm_para.h>
#include <asm/kvm_para.h>
-#include <asm/pvclock.h>
-#include <asm/kvmclock.h>
#include <uapi/asm/kvm_para.h>
#include <linux/ptp_clock_kernel.h>
+#include "ptp_kvm.h"
+
struct kvm_ptp_clock {
struct ptp_clock *ptp_clock;
struct ptp_clock_info caps;
@@ -24,56 +25,29 @@ struct kvm_ptp_clock {
static DEFINE_SPINLOCK(kvm_ptp_lock);
-static struct pvclock_vsyscall_time_info *hv_clock;
-
-static struct kvm_clock_pairing clock_pair;
-static phys_addr_t clock_pair_gpa;
-
static int ptp_kvm_get_time_fn(ktime_t *device_time,
struct system_counterval_t *system_counter,
void *ctx)
{
- unsigned long ret;
+ long ret;
+ u64 cycle;
struct timespec64 tspec;
- unsigned version;
- int cpu;
- struct pvclock_vcpu_time_info *src;
+ struct clocksource *cs;
spin_lock(&kvm_ptp_lock);
preempt_disable_notrace();
- cpu = smp_processor_id();
- src = &hv_clock[cpu].pvti;
-
- do {
- /*
- * We are using a TSC value read in the hosts
- * kvm_hc_clock_pairing handling.
- * So any changes to tsc_to_system_mul
- * and tsc_shift or any other pvclock
- * data invalidate that measurement.
- */
- version = pvclock_read_begin(src);
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
- spin_unlock(&kvm_ptp_lock);
- preempt_enable_notrace();
- return -EOPNOTSUPP;
- }
-
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
- ret = __pvclock_read_cycles(src, clock_pair.tsc);
- } while (pvclock_read_retry(src, version));
+ ret = kvm_arch_ptp_get_crosststamp(&cycle, &tspec, &cs);
+ if (ret) {
+ spin_unlock(&kvm_ptp_lock);
+ preempt_enable_notrace();
+ return ret;
+ }
preempt_enable_notrace();
- system_counter->cycles = ret;
- system_counter->cs = &kvm_clock;
+ system_counter->cycles = cycle;
+ system_counter->cs = cs;
*device_time = timespec64_to_ktime(tspec);
@@ -111,22 +85,17 @@ static int ptp_kvm_settime(struct ptp_clock_info *ptp,
static int ptp_kvm_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{
- unsigned long ret;
+ long ret;
struct timespec64 tspec;
spin_lock(&kvm_ptp_lock);
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
- clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret != 0) {
- pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ ret = kvm_arch_ptp_get_clock(&tspec);
+ if (ret) {
spin_unlock(&kvm_ptp_lock);
- return -EOPNOTSUPP;
+ return ret;
}
- tspec.tv_sec = clock_pair.sec;
- tspec.tv_nsec = clock_pair.nsec;
spin_unlock(&kvm_ptp_lock);
memcpy(ts, &tspec, sizeof(struct timespec64));
@@ -168,19 +137,11 @@ 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_get_pvti_cpu0_va();
-
- if (!hv_clock)
- return -ENODEV;
-
- ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
- KVM_CLOCK_PAIRING_WALLCLOCK);
- if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
- return -ENODEV;
+ ret = kvm_arch_ptp_init();
+ if (ret) {
+ pr_err("fail to initialize ptp_kvm");
+ return ret;
+ }
kvm_ptp_clock.caps = ptp_kvm_caps;
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c
new file mode 100644
index 000000000000..ed19083653a4
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_x86.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <asm/pvclock.h>
+#include <asm/kvmclock.h>
+#include <linux/module.h>
+#include <uapi/asm/kvm_para.h>
+#include <uapi/linux/kvm_para.h>
+#include <linux/ptp_clock_kernel.h>
+
+phys_addr_t clock_pair_gpa;
+struct kvm_clock_pairing clock_pair;
+struct pvclock_vsyscall_time_info *hv_clock;
+
+int kvm_arch_ptp_init(void)
+{
+ long ret;
+
+ if (!kvm_para_available())
+ return -ENODEV;
+
+ clock_pair_gpa = slow_virt_to_phys(&clock_pair);
+ hv_clock = pvclock_get_pvti_cpu0_va();
+ if (!hv_clock)
+ return -ENODEV;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
+ return -ENODEV;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ unsigned long ret;
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+
+ ts->tv_sec = clock_pair.sec;
+ ts->tv_nsec = clock_pair.nsec;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
+ struct clocksource **cs)
+{
+ unsigned long ret;
+ unsigned int version;
+ int cpu;
+ struct pvclock_vcpu_time_info *src;
+
+ cpu = smp_processor_id();
+ src = &hv_clock[cpu].pvti;
+
+ do {
+ /*
+ * We are using a TSC value read in the hosts
+ * kvm_hc_clock_pairing handling.
+ * So any changes to tsc_to_system_mul
+ * and tsc_shift or any other pvclock
+ * data invalidate that measurement.
+ */
+ version = pvclock_read_begin(src);
+
+ ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
+ clock_pair_gpa,
+ KVM_CLOCK_PAIRING_WALLCLOCK);
+ if (ret != 0) {
+ pr_err_ratelimited("clock pairing hypercall ret %lu\n", ret);
+ return -EOPNOTSUPP;
+ }
+ tspec->tv_sec = clock_pair.sec;
+ tspec->tv_nsec = clock_pair.nsec;
+ *cycle = __pvclock_read_cycles(src, clock_pair.tsc);
+ } while (pvclock_read_retry(src, version));
+
+ *cs = &kvm_clock;
+
+ return 0;
+}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 4/9] time: Add mechanism to recognize clocksource in time_get_snapshot
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
From: Thomas Gleixner <tglx@linutronix.de>
System time snapshots are not conveying information about the current
clocksource which was used, but callers like the PTP KVM guest
implementation have the requirement to evaluate the clocksource type to
select the appropriate mechanism.
Introduce a clocksource id field in struct clocksource which is by default
set to CSID_GENERIC (0). Clocksource implementations can set that field to
a value which allows to identify the clocksource.
Store the clocksource id of the current clocksource in the
system_time_snapshot so callers can evaluate which clocksource was used to
take the snapshot and act accordingly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
include/linux/clocksource.h | 6 ++++++
include/linux/clocksource_ids.h | 11 +++++++++++
include/linux/timekeeping.h | 12 +++++++-----
kernel/time/clocksource.c | 2 ++
kernel/time/timekeeping.c | 1 +
5 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 include/linux/clocksource_ids.h
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 86d143db6523..1290d0dce840 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -17,6 +17,7 @@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/clocksource_ids.h>
#include <asm/div64.h>
#include <asm/io.h>
@@ -62,6 +63,10 @@ struct module;
* 400-499: Perfect
* The ideal clocksource. A must-use where
* available.
+ * @id: Defaults to CSID_GENERIC. The id value is captured
+ * in certain snapshot functions to allow callers to
+ * validate the clocksource from which the snapshot was
+ * taken.
* @flags: Flags describing special properties
* @enable: Optional function to enable the clocksource
* @disable: Optional function to disable the clocksource
@@ -100,6 +105,7 @@ struct clocksource {
const char *name;
struct list_head list;
int rating;
+ enum clocksource_ids id;
enum vdso_clock_mode vdso_clock_mode;
unsigned long flags;
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
new file mode 100644
index 000000000000..4d8e19e05328
--- /dev/null
+++ b/include/linux/clocksource_ids.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_CLOCKSOURCE_IDS_H
+#define _LINUX_CLOCKSOURCE_IDS_H
+
+/* Enum to give clocksources a unique identifier */
+enum clocksource_ids {
+ CSID_GENERIC = 0,
+ CSID_MAX,
+};
+
+#endif
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 7f7e4a3f4394..2ee05355333f 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -3,6 +3,7 @@
#define _LINUX_TIMEKEEPING_H
#include <linux/errno.h>
+#include <linux/clocksource_ids.h>
/* Included from linux/ktime.h */
@@ -244,11 +245,12 @@ struct ktime_timestamps {
* @cs_was_changed_seq: The sequence number of clocksource change events
*/
struct system_time_snapshot {
- u64 cycles;
- ktime_t real;
- ktime_t raw;
- unsigned int clock_was_set_seq;
- u8 cs_was_changed_seq;
+ u64 cycles;
+ ktime_t real;
+ ktime_t raw;
+ enum clocksource_ids cs_id;
+ unsigned int clock_was_set_seq;
+ u8 cs_was_changed_seq;
};
/**
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 02441ead3c3b..6b38d4993214 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -928,6 +928,8 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)
clocksource_arch_init(cs);
+ if (WARN_ON_ONCE((unsigned int)cs->id >= CSID_MAX))
+ cs->id = CSID_GENERIC;
if (cs->vdso_clock_mode < 0 ||
cs->vdso_clock_mode >= VDSO_CLOCKMODE_MAX) {
pr_warn("clocksource %s registered with invalid VDSO mode %d. Disabling VDSO support.\n",
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6858a31364b6..eb04a2d74911 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1053,6 +1053,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
do {
seq = read_seqcount_begin(&tk_core.seq);
now = tk_clock_read(&tk->tkr_mono);
+ systime_snapshot->cs_id = tk->tkr_mono.clock->id;
systime_snapshot->cs_was_changed_seq = tk->cs_was_changed_seq;
systime_snapshot->clock_was_set_seq = tk->clock_was_set_seq;
base_real = ktime_add(tk->tkr_mono.base,
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 4/9] time: Add mechanism to recognize clocksource in time_get_snapshot
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
From: Thomas Gleixner <tglx@linutronix.de>
System time snapshots are not conveying information about the current
clocksource which was used, but callers like the PTP KVM guest
implementation have the requirement to evaluate the clocksource type to
select the appropriate mechanism.
Introduce a clocksource id field in struct clocksource which is by default
set to CSID_GENERIC (0). Clocksource implementations can set that field to
a value which allows to identify the clocksource.
Store the clocksource id of the current clocksource in the
system_time_snapshot so callers can evaluate which clocksource was used to
take the snapshot and act accordingly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
include/linux/clocksource.h | 6 ++++++
include/linux/clocksource_ids.h | 11 +++++++++++
include/linux/timekeeping.h | 12 +++++++-----
kernel/time/clocksource.c | 2 ++
kernel/time/timekeeping.c | 1 +
5 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 include/linux/clocksource_ids.h
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 86d143db6523..1290d0dce840 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -17,6 +17,7 @@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/clocksource_ids.h>
#include <asm/div64.h>
#include <asm/io.h>
@@ -62,6 +63,10 @@ struct module;
* 400-499: Perfect
* The ideal clocksource. A must-use where
* available.
+ * @id: Defaults to CSID_GENERIC. The id value is captured
+ * in certain snapshot functions to allow callers to
+ * validate the clocksource from which the snapshot was
+ * taken.
* @flags: Flags describing special properties
* @enable: Optional function to enable the clocksource
* @disable: Optional function to disable the clocksource
@@ -100,6 +105,7 @@ struct clocksource {
const char *name;
struct list_head list;
int rating;
+ enum clocksource_ids id;
enum vdso_clock_mode vdso_clock_mode;
unsigned long flags;
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
new file mode 100644
index 000000000000..4d8e19e05328
--- /dev/null
+++ b/include/linux/clocksource_ids.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_CLOCKSOURCE_IDS_H
+#define _LINUX_CLOCKSOURCE_IDS_H
+
+/* Enum to give clocksources a unique identifier */
+enum clocksource_ids {
+ CSID_GENERIC = 0,
+ CSID_MAX,
+};
+
+#endif
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 7f7e4a3f4394..2ee05355333f 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -3,6 +3,7 @@
#define _LINUX_TIMEKEEPING_H
#include <linux/errno.h>
+#include <linux/clocksource_ids.h>
/* Included from linux/ktime.h */
@@ -244,11 +245,12 @@ struct ktime_timestamps {
* @cs_was_changed_seq: The sequence number of clocksource change events
*/
struct system_time_snapshot {
- u64 cycles;
- ktime_t real;
- ktime_t raw;
- unsigned int clock_was_set_seq;
- u8 cs_was_changed_seq;
+ u64 cycles;
+ ktime_t real;
+ ktime_t raw;
+ enum clocksource_ids cs_id;
+ unsigned int clock_was_set_seq;
+ u8 cs_was_changed_seq;
};
/**
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 02441ead3c3b..6b38d4993214 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -928,6 +928,8 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)
clocksource_arch_init(cs);
+ if (WARN_ON_ONCE((unsigned int)cs->id >= CSID_MAX))
+ cs->id = CSID_GENERIC;
if (cs->vdso_clock_mode < 0 ||
cs->vdso_clock_mode >= VDSO_CLOCKMODE_MAX) {
pr_warn("clocksource %s registered with invalid VDSO mode %d. Disabling VDSO support.\n",
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6858a31364b6..eb04a2d74911 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1053,6 +1053,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
do {
seq = read_seqcount_begin(&tk_core.seq);
now = tk_clock_read(&tk->tkr_mono);
+ systime_snapshot->cs_id = tk->tkr_mono.clock->id;
systime_snapshot->cs_was_changed_seq = tk->cs_was_changed_seq;
systime_snapshot->clock_was_set_seq = tk->clock_was_set_seq;
base_real = ktime_add(tk->tkr_mono.base,
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 4/9] time: Add mechanism to recognize clocksource in time_get_snapshot
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
From: Thomas Gleixner <tglx@linutronix.de>
System time snapshots are not conveying information about the current
clocksource which was used, but callers like the PTP KVM guest
implementation have the requirement to evaluate the clocksource type to
select the appropriate mechanism.
Introduce a clocksource id field in struct clocksource which is by default
set to CSID_GENERIC (0). Clocksource implementations can set that field to
a value which allows to identify the clocksource.
Store the clocksource id of the current clocksource in the
system_time_snapshot so callers can evaluate which clocksource was used to
take the snapshot and act accordingly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
include/linux/clocksource.h | 6 ++++++
include/linux/clocksource_ids.h | 11 +++++++++++
include/linux/timekeeping.h | 12 +++++++-----
kernel/time/clocksource.c | 2 ++
kernel/time/timekeeping.c | 1 +
5 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 include/linux/clocksource_ids.h
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 86d143db6523..1290d0dce840 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -17,6 +17,7 @@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/clocksource_ids.h>
#include <asm/div64.h>
#include <asm/io.h>
@@ -62,6 +63,10 @@ struct module;
* 400-499: Perfect
* The ideal clocksource. A must-use where
* available.
+ * @id: Defaults to CSID_GENERIC. The id value is captured
+ * in certain snapshot functions to allow callers to
+ * validate the clocksource from which the snapshot was
+ * taken.
* @flags: Flags describing special properties
* @enable: Optional function to enable the clocksource
* @disable: Optional function to disable the clocksource
@@ -100,6 +105,7 @@ struct clocksource {
const char *name;
struct list_head list;
int rating;
+ enum clocksource_ids id;
enum vdso_clock_mode vdso_clock_mode;
unsigned long flags;
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
new file mode 100644
index 000000000000..4d8e19e05328
--- /dev/null
+++ b/include/linux/clocksource_ids.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_CLOCKSOURCE_IDS_H
+#define _LINUX_CLOCKSOURCE_IDS_H
+
+/* Enum to give clocksources a unique identifier */
+enum clocksource_ids {
+ CSID_GENERIC = 0,
+ CSID_MAX,
+};
+
+#endif
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 7f7e4a3f4394..2ee05355333f 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -3,6 +3,7 @@
#define _LINUX_TIMEKEEPING_H
#include <linux/errno.h>
+#include <linux/clocksource_ids.h>
/* Included from linux/ktime.h */
@@ -244,11 +245,12 @@ struct ktime_timestamps {
* @cs_was_changed_seq: The sequence number of clocksource change events
*/
struct system_time_snapshot {
- u64 cycles;
- ktime_t real;
- ktime_t raw;
- unsigned int clock_was_set_seq;
- u8 cs_was_changed_seq;
+ u64 cycles;
+ ktime_t real;
+ ktime_t raw;
+ enum clocksource_ids cs_id;
+ unsigned int clock_was_set_seq;
+ u8 cs_was_changed_seq;
};
/**
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 02441ead3c3b..6b38d4993214 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -928,6 +928,8 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)
clocksource_arch_init(cs);
+ if (WARN_ON_ONCE((unsigned int)cs->id >= CSID_MAX))
+ cs->id = CSID_GENERIC;
if (cs->vdso_clock_mode < 0 ||
cs->vdso_clock_mode >= VDSO_CLOCKMODE_MAX) {
pr_warn("clocksource %s registered with invalid VDSO mode %d. Disabling VDSO support.\n",
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6858a31364b6..eb04a2d74911 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1053,6 +1053,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
do {
seq = read_seqcount_begin(&tk_core.seq);
now = tk_clock_read(&tk->tkr_mono);
+ systime_snapshot->cs_id = tk->tkr_mono.clock->id;
systime_snapshot->cs_was_changed_seq = tk->cs_was_changed_seq;
systime_snapshot->clock_was_set_seq = tk->clock_was_set_seq;
base_real = ktime_add(tk->tkr_mono.base,
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 5/9] clocksource: Add clocksource id for arm arch counter
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
Add clocksource id for arm arch counter to let it be identified easily and
elegantly in ptp_kvm implementation for arm.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 2 ++
include/linux/clocksource_ids.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6c3e84180146..d55acffb0b90 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -16,6 +16,7 @@
#include <linux/cpu_pm.h>
#include <linux/clockchips.h>
#include <linux/clocksource.h>
+#include <linux/clocksource_ids.h>
#include <linux/interrupt.h>
#include <linux/of_irq.h>
#include <linux/of_address.h>
@@ -191,6 +192,7 @@ static u64 arch_counter_read_cc(const struct cyclecounter *cc)
static struct clocksource clocksource_counter = {
.name = "arch_sys_counter",
+ .id = CSID_ARM_ARCH_COUNTER,
.rating = 400,
.read = arch_counter_read,
.mask = CLOCKSOURCE_MASK(56),
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
index 4d8e19e05328..16775d7d8f8d 100644
--- a/include/linux/clocksource_ids.h
+++ b/include/linux/clocksource_ids.h
@@ -5,6 +5,7 @@
/* Enum to give clocksources a unique identifier */
enum clocksource_ids {
CSID_GENERIC = 0,
+ CSID_ARM_ARCH_COUNTER,
CSID_MAX,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 5/9] clocksource: Add clocksource id for arm arch counter
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Add clocksource id for arm arch counter to let it be identified easily and
elegantly in ptp_kvm implementation for arm.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 2 ++
include/linux/clocksource_ids.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6c3e84180146..d55acffb0b90 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -16,6 +16,7 @@
#include <linux/cpu_pm.h>
#include <linux/clockchips.h>
#include <linux/clocksource.h>
+#include <linux/clocksource_ids.h>
#include <linux/interrupt.h>
#include <linux/of_irq.h>
#include <linux/of_address.h>
@@ -191,6 +192,7 @@ static u64 arch_counter_read_cc(const struct cyclecounter *cc)
static struct clocksource clocksource_counter = {
.name = "arch_sys_counter",
+ .id = CSID_ARM_ARCH_COUNTER,
.rating = 400,
.read = arch_counter_read,
.mask = CLOCKSOURCE_MASK(56),
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
index 4d8e19e05328..16775d7d8f8d 100644
--- a/include/linux/clocksource_ids.h
+++ b/include/linux/clocksource_ids.h
@@ -5,6 +5,7 @@
/* Enum to give clocksources a unique identifier */
enum clocksource_ids {
CSID_GENERIC = 0,
+ CSID_ARM_ARCH_COUNTER,
CSID_MAX,
};
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 5/9] clocksource: Add clocksource id for arm arch counter
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
Add clocksource id for arm arch counter to let it be identified easily and
elegantly in ptp_kvm implementation for arm.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 2 ++
include/linux/clocksource_ids.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6c3e84180146..d55acffb0b90 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -16,6 +16,7 @@
#include <linux/cpu_pm.h>
#include <linux/clockchips.h>
#include <linux/clocksource.h>
+#include <linux/clocksource_ids.h>
#include <linux/interrupt.h>
#include <linux/of_irq.h>
#include <linux/of_address.h>
@@ -191,6 +192,7 @@ static u64 arch_counter_read_cc(const struct cyclecounter *cc)
static struct clocksource clocksource_counter = {
.name = "arch_sys_counter",
+ .id = CSID_ARM_ARCH_COUNTER,
.rating = 400,
.read = arch_counter_read,
.mask = CLOCKSOURCE_MASK(56),
diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h
index 4d8e19e05328..16775d7d8f8d 100644
--- a/include/linux/clocksource_ids.h
+++ b/include/linux/clocksource_ids.h
@@ -5,6 +5,7 @@
/* Enum to give clocksources a unique identifier */
enum clocksource_ids {
CSID_GENERIC = 0,
+ CSID_ARM_ARCH_COUNTER,
CSID_MAX,
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
ptp_kvm will get this service through SMCC call.
The service offers wall time and cycle count of host to guest.
The caller must specify whether they want the host cycle count
or the difference between host cycle count and cntvoff.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 17 +++++++++++
2 files changed, 78 insertions(+)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index b9d8607083eb..f7d189563f3d 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -9,6 +9,51 @@
#include <kvm/arm_hypercalls.h>
#include <kvm/arm_psci.h>
+static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
+{
+ struct system_time_snapshot systime_snapshot;
+ u64 cycles = ~0UL;
+ u32 feature;
+
+ /*
+ * system time and counter value must captured in the same
+ * time to keep consistency and precision.
+ */
+ ktime_get_snapshot(&systime_snapshot);
+
+ // binding ptp_kvm clocksource to arm_arch_counter
+ if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
+ return;
+
+ val[0] = upper_32_bits(systime_snapshot.real);
+ val[1] = lower_32_bits(systime_snapshot.real);
+
+ /*
+ * which of virtual counter or physical counter being
+ * asked for is decided by the r1 value of SMCCC
+ * call. If no invalid r1 value offered, default cycle
+ * value(-1) will be returned.
+ * Note: keep in mind that feature is u32 and smccc_get_arg1
+ * will return u64, so need auto cast here.
+ */
+ feature = smccc_get_arg1(vcpu);
+ switch (feature) {
+ case ARM_PTP_VIRT_COUNTER:
+ cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu, CNTVOFF_EL2);
+ break;
+ case ARM_PTP_PHY_COUNTER:
+ cycles = systime_snapshot.cycles;
+ break;
+ case ARM_PTP_NONE_COUNTER:
+ break;
+ default:
+ val[0] = SMCCC_RET_NOT_SUPPORTED;
+ break;
+ }
+ val[2] = upper_32_bits(cycles);
+ val[3] = lower_32_bits(cycles);
+}
+
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
@@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
+ val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ break;
+ /*
+ * This serves virtual kvm_ptp.
+ * Four values will be passed back.
+ * reg0 stores high 32-bits of host ktime;
+ * reg1 stores low 32-bits of host ktime;
+ * For ARM_PTP_VIRT_COUNTER:
+ * reg2 stores high 32-bits of difference of host cycles and cntvoff;
+ * reg3 stores low 32-bits of difference of host cycles and cntvoff.
+ * For ARM_PTP_PHY_COUNTER:
+ * reg2 stores the high 32-bits of host cycles;
+ * reg3 stores the low 32-bits of host cycles.
+ */
+ case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
+ kvm_ptp_get_time(vcpu, val);
break;
default:
return kvm_psci_call(vcpu);
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index d75408141137..a03c5dd409d3 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -103,6 +103,7 @@
/* KVM "vendor specific" services */
#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
#define ARM_SMCCC_KVM_NUM_FUNCS 128
@@ -114,6 +115,22 @@
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
+/*
+ * ptp_kvm is a feature used for time sync between vm and host.
+ * ptp_kvm module in guest kernel will get service from host using
+ * this hypercall ID.
+ */
+#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_FUNC_KVM_PTP)
+
+/* ptp_kvm counter type ID */
+#define ARM_PTP_VIRT_COUNTER 0
+#define ARM_PTP_PHY_COUNTER 1
+#define ARM_PTP_NONE_COUNTER 2
+
/* Paravirtualised time calls (defined by ARM DEN0057A) */
#define ARM_SMCCC_HV_PV_TIME_FEATURES \
ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
ptp_kvm will get this service through SMCC call.
The service offers wall time and cycle count of host to guest.
The caller must specify whether they want the host cycle count
or the difference between host cycle count and cntvoff.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 17 +++++++++++
2 files changed, 78 insertions(+)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index b9d8607083eb..f7d189563f3d 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -9,6 +9,51 @@
#include <kvm/arm_hypercalls.h>
#include <kvm/arm_psci.h>
+static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
+{
+ struct system_time_snapshot systime_snapshot;
+ u64 cycles = ~0UL;
+ u32 feature;
+
+ /*
+ * system time and counter value must captured in the same
+ * time to keep consistency and precision.
+ */
+ ktime_get_snapshot(&systime_snapshot);
+
+ // binding ptp_kvm clocksource to arm_arch_counter
+ if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
+ return;
+
+ val[0] = upper_32_bits(systime_snapshot.real);
+ val[1] = lower_32_bits(systime_snapshot.real);
+
+ /*
+ * which of virtual counter or physical counter being
+ * asked for is decided by the r1 value of SMCCC
+ * call. If no invalid r1 value offered, default cycle
+ * value(-1) will be returned.
+ * Note: keep in mind that feature is u32 and smccc_get_arg1
+ * will return u64, so need auto cast here.
+ */
+ feature = smccc_get_arg1(vcpu);
+ switch (feature) {
+ case ARM_PTP_VIRT_COUNTER:
+ cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu, CNTVOFF_EL2);
+ break;
+ case ARM_PTP_PHY_COUNTER:
+ cycles = systime_snapshot.cycles;
+ break;
+ case ARM_PTP_NONE_COUNTER:
+ break;
+ default:
+ val[0] = SMCCC_RET_NOT_SUPPORTED;
+ break;
+ }
+ val[2] = upper_32_bits(cycles);
+ val[3] = lower_32_bits(cycles);
+}
+
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
@@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
+ val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ break;
+ /*
+ * This serves virtual kvm_ptp.
+ * Four values will be passed back.
+ * reg0 stores high 32-bits of host ktime;
+ * reg1 stores low 32-bits of host ktime;
+ * For ARM_PTP_VIRT_COUNTER:
+ * reg2 stores high 32-bits of difference of host cycles and cntvoff;
+ * reg3 stores low 32-bits of difference of host cycles and cntvoff.
+ * For ARM_PTP_PHY_COUNTER:
+ * reg2 stores the high 32-bits of host cycles;
+ * reg3 stores the low 32-bits of host cycles.
+ */
+ case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
+ kvm_ptp_get_time(vcpu, val);
break;
default:
return kvm_psci_call(vcpu);
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index d75408141137..a03c5dd409d3 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -103,6 +103,7 @@
/* KVM "vendor specific" services */
#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
#define ARM_SMCCC_KVM_NUM_FUNCS 128
@@ -114,6 +115,22 @@
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
+/*
+ * ptp_kvm is a feature used for time sync between vm and host.
+ * ptp_kvm module in guest kernel will get service from host using
+ * this hypercall ID.
+ */
+#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_FUNC_KVM_PTP)
+
+/* ptp_kvm counter type ID */
+#define ARM_PTP_VIRT_COUNTER 0
+#define ARM_PTP_PHY_COUNTER 1
+#define ARM_PTP_NONE_COUNTER 2
+
/* Paravirtualised time calls (defined by ARM DEN0057A) */
#define ARM_SMCCC_HV_PV_TIME_FEATURES \
ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
ptp_kvm will get this service through SMCC call.
The service offers wall time and cycle count of host to guest.
The caller must specify whether they want the host cycle count
or the difference between host cycle count and cntvoff.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
include/linux/arm-smccc.h | 17 +++++++++++
2 files changed, 78 insertions(+)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index b9d8607083eb..f7d189563f3d 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -9,6 +9,51 @@
#include <kvm/arm_hypercalls.h>
#include <kvm/arm_psci.h>
+static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
+{
+ struct system_time_snapshot systime_snapshot;
+ u64 cycles = ~0UL;
+ u32 feature;
+
+ /*
+ * system time and counter value must captured in the same
+ * time to keep consistency and precision.
+ */
+ ktime_get_snapshot(&systime_snapshot);
+
+ // binding ptp_kvm clocksource to arm_arch_counter
+ if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
+ return;
+
+ val[0] = upper_32_bits(systime_snapshot.real);
+ val[1] = lower_32_bits(systime_snapshot.real);
+
+ /*
+ * which of virtual counter or physical counter being
+ * asked for is decided by the r1 value of SMCCC
+ * call. If no invalid r1 value offered, default cycle
+ * value(-1) will be returned.
+ * Note: keep in mind that feature is u32 and smccc_get_arg1
+ * will return u64, so need auto cast here.
+ */
+ feature = smccc_get_arg1(vcpu);
+ switch (feature) {
+ case ARM_PTP_VIRT_COUNTER:
+ cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu, CNTVOFF_EL2);
+ break;
+ case ARM_PTP_PHY_COUNTER:
+ cycles = systime_snapshot.cycles;
+ break;
+ case ARM_PTP_NONE_COUNTER:
+ break;
+ default:
+ val[0] = SMCCC_RET_NOT_SUPPORTED;
+ break;
+ }
+ val[2] = upper_32_bits(cycles);
+ val[3] = lower_32_bits(cycles);
+}
+
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
@@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
+ val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ break;
+ /*
+ * This serves virtual kvm_ptp.
+ * Four values will be passed back.
+ * reg0 stores high 32-bits of host ktime;
+ * reg1 stores low 32-bits of host ktime;
+ * For ARM_PTP_VIRT_COUNTER:
+ * reg2 stores high 32-bits of difference of host cycles and cntvoff;
+ * reg3 stores low 32-bits of difference of host cycles and cntvoff.
+ * For ARM_PTP_PHY_COUNTER:
+ * reg2 stores the high 32-bits of host cycles;
+ * reg3 stores the low 32-bits of host cycles.
+ */
+ case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
+ kvm_ptp_get_time(vcpu, val);
break;
default:
return kvm_psci_call(vcpu);
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index d75408141137..a03c5dd409d3 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -103,6 +103,7 @@
/* KVM "vendor specific" services */
#define ARM_SMCCC_KVM_FUNC_FEATURES 0
+#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
#define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
#define ARM_SMCCC_KVM_NUM_FUNCS 128
@@ -114,6 +115,22 @@
#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
+/*
+ * ptp_kvm is a feature used for time sync between vm and host.
+ * ptp_kvm module in guest kernel will get service from host using
+ * this hypercall ID.
+ */
+#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_FUNC_KVM_PTP)
+
+/* ptp_kvm counter type ID */
+#define ARM_PTP_VIRT_COUNTER 0
+#define ARM_PTP_PHY_COUNTER 1
+#define ARM_PTP_NONE_COUNTER 2
+
/* Paravirtualised time calls (defined by ARM DEN0057A) */
#define ARM_SMCCC_HV_PV_TIME_FEATURES \
ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
Currently, there is no mechanism to keep time sync between guest and host
in arm/arm64 virtualization environment. Time in guest will drift compared
with host after boot up as they may both use third party time sources
to correct their time respectively. The time deviation will be in order
of milliseconds. But in some scenarios,like in cloud envirenment, we ask
for higher time precision.
kvm ptp clock, which chooses the host clock source as a reference
clock to sync time between guest and host, has been adopted by x86
which takes the time sync order from milliseconds to nanoseconds.
This patch enables kvm ptp clock for arm/arm64 and improves clock sync precison
significantly.
Test result comparisons between with kvm ptp clock and without it in arm/arm64
are as follows. This test derived from the result of command 'chronyc
sources'. we should take more care of the last sample column which shows
the offset between the local clock and the source at the last measurement.
no kvm ptp in guest:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/- 21ms
in host:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/- 17ms
The dns1.synet.edu.cn is the network reference clock for guest and
120.25.115.20 is the network reference clock for host. we can't get the
clock error between guest and host directly, but a roughly estimated value
will be in order of hundreds of us to ms.
with kvm ptp in guest:
chrony has been disabled in host to remove the disturb by network clock.
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
* PHC0 0 3 377 8 -7ns[ +1ns] +/- 3ns
* PHC0 0 3 377 8 +1ns[ +16ns] +/- 3ns
* PHC0 0 3 377 6 -4ns[ -0ns] +/- 6ns
* PHC0 0 3 377 6 -8ns[ -12ns] +/- 5ns
* PHC0 0 3 377 5 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 13 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 12 -4ns[ -6ns] +/- 4ns
* PHC0 0 3 377 11 -8ns[ -11ns] +/- 6ns
* PHC0 0 3 377 10 -14ns[ -20ns] +/- 4ns
* PHC0 0 3 377 8 +4ns[ +5ns] +/- 4ns
The PHC0 is the ptp clock which choose the host clock as its source
clock. So we can see that the clock difference between host and guest
is in order of ns.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 drivers/ptp/ptp_kvm_arm.c
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index d55acffb0b90..b33c5a663d30 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -25,6 +25,7 @@
#include <linux/sched/clock.h>
#include <linux/sched_clock.h>
#include <linux/acpi.h>
+#include <linux/arm-smccc.h>
#include <asm/arch_timer.h>
#include <asm/virt.h>
@@ -1650,3 +1651,30 @@ 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
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
+ struct clocksource **cs)
+{
+ struct arm_smccc_res hvc_res;
+ ktime_t ktime;
+ u32 ptp_counter;
+
+ if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
+ ptp_counter = ARM_PTP_VIRT_COUNTER;
+ else
+ ptp_counter = ARM_PTP_PHY_COUNTER;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ptp_counter, &hvc_res);
+
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+ *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
+ *cs = &clocksource_counter;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 942f72d8151d..677c7f696b70 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
config PTP_1588_CLOCK_KVM
tristate "KVM virtual PTP clock"
depends on PTP_1588_CLOCK
- depends on KVM_GUEST && X86
+ depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY && ARM_ARCH_TIMER)
default y
help
This driver adds support for using kvm infrastructure as a PTP
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 699a4e4d19c2..9fa5ede44b2b 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -5,6 +5,7 @@
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
+ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
new file mode 100644
index 000000000000..2212827c0384
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_arm.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ * Copyright (C) 2019 ARM Ltd.
+ * All Rights Reserved
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <asm/hypervisor.h>
+#include <linux/module.h>
+#include <linux/psci.h>
+#include <linux/arm-smccc.h>
+#include <linux/timecounter.h>
+#include <linux/sched/clock.h>
+#include <asm/arch_timer.h>
+#include <asm/hypervisor.h>
+
+int kvm_arch_ptp_init(void)
+{
+ int ret;
+
+ ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ if (ret <= 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ ktime_t ktime;
+ struct arm_smccc_res hvc_res;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ARM_PTP_NONE_COUNTER, &hvc_res);
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+
+ return 0;
+}
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Currently, there is no mechanism to keep time sync between guest and host
in arm/arm64 virtualization environment. Time in guest will drift compared
with host after boot up as they may both use third party time sources
to correct their time respectively. The time deviation will be in order
of milliseconds. But in some scenarios,like in cloud envirenment, we ask
for higher time precision.
kvm ptp clock, which chooses the host clock source as a reference
clock to sync time between guest and host, has been adopted by x86
which takes the time sync order from milliseconds to nanoseconds.
This patch enables kvm ptp clock for arm/arm64 and improves clock sync precison
significantly.
Test result comparisons between with kvm ptp clock and without it in arm/arm64
are as follows. This test derived from the result of command 'chronyc
sources'. we should take more care of the last sample column which shows
the offset between the local clock and the source at the last measurement.
no kvm ptp in guest:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/- 21ms
in host:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/- 17ms
The dns1.synet.edu.cn is the network reference clock for guest and
120.25.115.20 is the network reference clock for host. we can't get the
clock error between guest and host directly, but a roughly estimated value
will be in order of hundreds of us to ms.
with kvm ptp in guest:
chrony has been disabled in host to remove the disturb by network clock.
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
* PHC0 0 3 377 8 -7ns[ +1ns] +/- 3ns
* PHC0 0 3 377 8 +1ns[ +16ns] +/- 3ns
* PHC0 0 3 377 6 -4ns[ -0ns] +/- 6ns
* PHC0 0 3 377 6 -8ns[ -12ns] +/- 5ns
* PHC0 0 3 377 5 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 13 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 12 -4ns[ -6ns] +/- 4ns
* PHC0 0 3 377 11 -8ns[ -11ns] +/- 6ns
* PHC0 0 3 377 10 -14ns[ -20ns] +/- 4ns
* PHC0 0 3 377 8 +4ns[ +5ns] +/- 4ns
The PHC0 is the ptp clock which choose the host clock as its source
clock. So we can see that the clock difference between host and guest
is in order of ns.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 drivers/ptp/ptp_kvm_arm.c
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index d55acffb0b90..b33c5a663d30 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -25,6 +25,7 @@
#include <linux/sched/clock.h>
#include <linux/sched_clock.h>
#include <linux/acpi.h>
+#include <linux/arm-smccc.h>
#include <asm/arch_timer.h>
#include <asm/virt.h>
@@ -1650,3 +1651,30 @@ 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
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
+ struct clocksource **cs)
+{
+ struct arm_smccc_res hvc_res;
+ ktime_t ktime;
+ u32 ptp_counter;
+
+ if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
+ ptp_counter = ARM_PTP_VIRT_COUNTER;
+ else
+ ptp_counter = ARM_PTP_PHY_COUNTER;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ptp_counter, &hvc_res);
+
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+ *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
+ *cs = &clocksource_counter;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 942f72d8151d..677c7f696b70 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
config PTP_1588_CLOCK_KVM
tristate "KVM virtual PTP clock"
depends on PTP_1588_CLOCK
- depends on KVM_GUEST && X86
+ depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY && ARM_ARCH_TIMER)
default y
help
This driver adds support for using kvm infrastructure as a PTP
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 699a4e4d19c2..9fa5ede44b2b 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -5,6 +5,7 @@
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
+ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
new file mode 100644
index 000000000000..2212827c0384
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_arm.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ * Copyright (C) 2019 ARM Ltd.
+ * All Rights Reserved
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <asm/hypervisor.h>
+#include <linux/module.h>
+#include <linux/psci.h>
+#include <linux/arm-smccc.h>
+#include <linux/timecounter.h>
+#include <linux/sched/clock.h>
+#include <asm/arch_timer.h>
+#include <asm/hypervisor.h>
+
+int kvm_arch_ptp_init(void)
+{
+ int ret;
+
+ ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ if (ret <= 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ ktime_t ktime;
+ struct arm_smccc_res hvc_res;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ARM_PTP_NONE_COUNTER, &hvc_res);
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+
+ return 0;
+}
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
Currently, there is no mechanism to keep time sync between guest and host
in arm/arm64 virtualization environment. Time in guest will drift compared
with host after boot up as they may both use third party time sources
to correct their time respectively. The time deviation will be in order
of milliseconds. But in some scenarios,like in cloud envirenment, we ask
for higher time precision.
kvm ptp clock, which chooses the host clock source as a reference
clock to sync time between guest and host, has been adopted by x86
which takes the time sync order from milliseconds to nanoseconds.
This patch enables kvm ptp clock for arm/arm64 and improves clock sync precison
significantly.
Test result comparisons between with kvm ptp clock and without it in arm/arm64
are as follows. This test derived from the result of command 'chronyc
sources'. we should take more care of the last sample column which shows
the offset between the local clock and the source at the last measurement.
no kvm ptp in guest:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/- 21ms
^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/- 21ms
in host:
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/- 18ms
^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/- 17ms
^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/- 17ms
The dns1.synet.edu.cn is the network reference clock for guest and
120.25.115.20 is the network reference clock for host. we can't get the
clock error between guest and host directly, but a roughly estimated value
will be in order of hundreds of us to ms.
with kvm ptp in guest:
chrony has been disabled in host to remove the disturb by network clock.
MS Name/IP address Stratum Poll Reach LastRx Last sample
========================================================================
* PHC0 0 3 377 8 -7ns[ +1ns] +/- 3ns
* PHC0 0 3 377 8 +1ns[ +16ns] +/- 3ns
* PHC0 0 3 377 6 -4ns[ -0ns] +/- 6ns
* PHC0 0 3 377 6 -8ns[ -12ns] +/- 5ns
* PHC0 0 3 377 5 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 13 +2ns[ +4ns] +/- 4ns
* PHC0 0 3 377 12 -4ns[ -6ns] +/- 4ns
* PHC0 0 3 377 11 -8ns[ -11ns] +/- 6ns
* PHC0 0 3 377 10 -14ns[ -20ns] +/- 4ns
* PHC0 0 3 377 8 +4ns[ +5ns] +/- 4ns
The PHC0 is the ptp clock which choose the host clock as its source
clock. So we can see that the clock difference between host and guest
is in order of ns.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
drivers/ptp/Kconfig | 2 +-
drivers/ptp/Makefile | 1 +
drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 drivers/ptp/ptp_kvm_arm.c
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index d55acffb0b90..b33c5a663d30 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -25,6 +25,7 @@
#include <linux/sched/clock.h>
#include <linux/sched_clock.h>
#include <linux/acpi.h>
+#include <linux/arm-smccc.h>
#include <asm/arch_timer.h>
#include <asm/virt.h>
@@ -1650,3 +1651,30 @@ 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
+
+int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
+ struct clocksource **cs)
+{
+ struct arm_smccc_res hvc_res;
+ ktime_t ktime;
+ u32 ptp_counter;
+
+ if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
+ ptp_counter = ARM_PTP_VIRT_COUNTER;
+ else
+ ptp_counter = ARM_PTP_PHY_COUNTER;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ptp_counter, &hvc_res);
+
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+ *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
+ *cs = &clocksource_counter;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 942f72d8151d..677c7f696b70 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
config PTP_1588_CLOCK_KVM
tristate "KVM virtual PTP clock"
depends on PTP_1588_CLOCK
- depends on KVM_GUEST && X86
+ depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY && ARM_ARCH_TIMER)
default y
help
This driver adds support for using kvm infrastructure as a PTP
diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
index 699a4e4d19c2..9fa5ede44b2b 100644
--- a/drivers/ptp/Makefile
+++ b/drivers/ptp/Makefile
@@ -5,6 +5,7 @@
ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
+ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
new file mode 100644
index 000000000000..2212827c0384
--- /dev/null
+++ b/drivers/ptp/ptp_kvm_arm.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Virtual PTP 1588 clock for use with KVM guests
+ * Copyright (C) 2019 ARM Ltd.
+ * All Rights Reserved
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <asm/hypervisor.h>
+#include <linux/module.h>
+#include <linux/psci.h>
+#include <linux/arm-smccc.h>
+#include <linux/timecounter.h>
+#include <linux/sched/clock.h>
+#include <asm/arch_timer.h>
+#include <asm/hypervisor.h>
+
+int kvm_arch_ptp_init(void)
+{
+ int ret;
+
+ ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
+ if (ret <= 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+int kvm_arch_ptp_get_clock(struct timespec64 *ts)
+{
+ ktime_t ktime;
+ struct arm_smccc_res hvc_res;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
+ ARM_PTP_NONE_COUNTER, &hvc_res);
+ if ((int)(hvc_res.a0) < 0)
+ return -EOPNOTSUPP;
+
+ ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
+ *ts = ktime_to_timespec64(ktime);
+
+ return 0;
+}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
PTP_KVM implementation depends on hypercall using SMCCC. So we
introduce a new SMCCC service ID. This doc explains how does the
ID define and how does PTP_KVM works on arm/arm64.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
Documentation/virt/kvm/api.rst | 9 +++++++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 36d5f1f3c6dd..9843dbcbf770 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual features provided to the
guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
(0x40000001). Otherwise, a guest may use the paravirtual features
regardless of what has actually been exposed through the CPUID leaf.
+
+8.27 KVM_CAP_PTP_KVM
+--------------------
+
+:Architectures: arm64
+
+This capability indicates that KVM virtual PTP service is supported in host.
+It must company with the implementation of KVM virtual PTP service in host
+so VMM can probe if there is the service in host by checking this capability.
diff --git a/Documentation/virt/kvm/arm/index.rst b/Documentation/virt/kvm/arm/index.rst
index 3e2b2aba90fc..78a9b670aafe 100644
--- a/Documentation/virt/kvm/arm/index.rst
+++ b/Documentation/virt/kvm/arm/index.rst
@@ -10,3 +10,4 @@ ARM
hyp-abi
psci
pvtime
+ ptp_kvm
diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst b/Documentation/virt/kvm/arm/ptp_kvm.rst
new file mode 100644
index 000000000000..bb1e6cfefe44
--- /dev/null
+++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
@@ -0,0 +1,29 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+PTP_KVM support for arm/arm64
+=============================
+
+PTP_KVM is used for time sync between guest and host in a high precision.
+It needs to get the wall time and counter value from the host and transfer these
+to guest via hypercall service. So one more hypercall service has been added.
+
+This new SMCCC hypercall is defined as:
+
+* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
+
+As both 32 and 64-bits ptp_kvm client should be supported, we choose SMC32/HVC32
+calling convention.
+
+ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
+
+ ============= ========== ==========
+ Function ID: (uint32) 0x86000001
+ Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or ARM_PTP_VIRT_COUNTER(0)
+ which indicate acquiring physical counter or
+ virtual counter respectively.
+ return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1 represent
+ wall clock time and val2 and val3 represent
+ counter cycle.
+ ============= ========== ==========
+
+More info see section 5 in Documentation/virt/kvm/timekeeping.rst.
diff --git a/Documentation/virt/kvm/timekeeping.rst b/Documentation/virt/kvm/timekeeping.rst
index 21ae7efa29ba..c81383e38372 100644
--- a/Documentation/virt/kvm/timekeeping.rst
+++ b/Documentation/virt/kvm/timekeeping.rst
@@ -13,6 +13,7 @@ Timekeeping Virtualization for X86-Based Architectures
2) Timing Devices
3) TSC Hardware
4) Virtualization Problems
+ 5) KVM virtual PTP clock
1. Overview
===========
@@ -643,3 +644,37 @@ by using CPU utilization itself as a signalling channel. Preventing such
problems would require completely isolated virtual time which may not track
real time any longer. This may be useful in certain security or QA contexts,
but in general isn't recommended for real-world deployment scenarios.
+
+5. KVM virtual PTP clock
+========================
+
+NTP (Network Time Protocol) is often used to sync time in a VM. Unfortunately,
+the precision of NTP is limited due to unknown delays in the network.
+
+KVM virtual PTP clock (PTP_KVM) offers another way to sync time in VM; use the
+host's clock rather than one from a remote machine. Having a synchronization
+mechanism for the virtualization environment allows us to keep all the guests
+running on the same host in sync.
+In general, the delay of communication between host and guest is quite
+small, so ptp_kvm can offer time sync precision up to in order of nanoseconds.
+Please keep in mind that ptp_kvm just limits itself to be a channel which
+transmits the remote clock from host to guest. An application, eg. chrony, is
+needed in usersapce of VM in order to set the guest time.
+
+After ptp_kvm is initialized, there will be a new device node under /dev called
+ptp%d. A guest userspace service, like chrony, can use this device to get host
+walltime, sometimes also counter cycle, which depends on the service it calls.
+Then this guest userspace service can use those data to do the time sync for
+the guest.
+The following is the work flow of ptp_kvm:
+
+a) time sync service in guest userspace call ioctl on ptp device /dev/ptp%d.
+b) ptp_kvm module in guest receives this request then invokes hypercall to
+ route into host kernel to request host's walltime/counter cycle.
+c) ptp_kvm hypercall service on the host responds to the request and sends data
+ back.
+d) ptp in guest copies the data to userspace.
+
+ptp_kvm consists of components running on the guest and host. Step 2 consists of
+a guest driver making a hypercall whilst step 3 involves the hypervisor responding
+with information.
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
PTP_KVM implementation depends on hypercall using SMCCC. So we
introduce a new SMCCC service ID. This doc explains how does the
ID define and how does PTP_KVM works on arm/arm64.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
Documentation/virt/kvm/api.rst | 9 +++++++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 36d5f1f3c6dd..9843dbcbf770 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual features provided to the
guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
(0x40000001). Otherwise, a guest may use the paravirtual features
regardless of what has actually been exposed through the CPUID leaf.
+
+8.27 KVM_CAP_PTP_KVM
+--------------------
+
+:Architectures: arm64
+
+This capability indicates that KVM virtual PTP service is supported in host.
+It must company with the implementation of KVM virtual PTP service in host
+so VMM can probe if there is the service in host by checking this capability.
diff --git a/Documentation/virt/kvm/arm/index.rst b/Documentation/virt/kvm/arm/index.rst
index 3e2b2aba90fc..78a9b670aafe 100644
--- a/Documentation/virt/kvm/arm/index.rst
+++ b/Documentation/virt/kvm/arm/index.rst
@@ -10,3 +10,4 @@ ARM
hyp-abi
psci
pvtime
+ ptp_kvm
diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst b/Documentation/virt/kvm/arm/ptp_kvm.rst
new file mode 100644
index 000000000000..bb1e6cfefe44
--- /dev/null
+++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
@@ -0,0 +1,29 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+PTP_KVM support for arm/arm64
+=============================
+
+PTP_KVM is used for time sync between guest and host in a high precision.
+It needs to get the wall time and counter value from the host and transfer these
+to guest via hypercall service. So one more hypercall service has been added.
+
+This new SMCCC hypercall is defined as:
+
+* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
+
+As both 32 and 64-bits ptp_kvm client should be supported, we choose SMC32/HVC32
+calling convention.
+
+ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
+
+ ============= ========== ==========
+ Function ID: (uint32) 0x86000001
+ Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or ARM_PTP_VIRT_COUNTER(0)
+ which indicate acquiring physical counter or
+ virtual counter respectively.
+ return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1 represent
+ wall clock time and val2 and val3 represent
+ counter cycle.
+ ============= ========== ==========
+
+More info see section 5 in Documentation/virt/kvm/timekeeping.rst.
diff --git a/Documentation/virt/kvm/timekeeping.rst b/Documentation/virt/kvm/timekeeping.rst
index 21ae7efa29ba..c81383e38372 100644
--- a/Documentation/virt/kvm/timekeeping.rst
+++ b/Documentation/virt/kvm/timekeeping.rst
@@ -13,6 +13,7 @@ Timekeeping Virtualization for X86-Based Architectures
2) Timing Devices
3) TSC Hardware
4) Virtualization Problems
+ 5) KVM virtual PTP clock
1. Overview
===========
@@ -643,3 +644,37 @@ by using CPU utilization itself as a signalling channel. Preventing such
problems would require completely isolated virtual time which may not track
real time any longer. This may be useful in certain security or QA contexts,
but in general isn't recommended for real-world deployment scenarios.
+
+5. KVM virtual PTP clock
+========================
+
+NTP (Network Time Protocol) is often used to sync time in a VM. Unfortunately,
+the precision of NTP is limited due to unknown delays in the network.
+
+KVM virtual PTP clock (PTP_KVM) offers another way to sync time in VM; use the
+host's clock rather than one from a remote machine. Having a synchronization
+mechanism for the virtualization environment allows us to keep all the guests
+running on the same host in sync.
+In general, the delay of communication between host and guest is quite
+small, so ptp_kvm can offer time sync precision up to in order of nanoseconds.
+Please keep in mind that ptp_kvm just limits itself to be a channel which
+transmits the remote clock from host to guest. An application, eg. chrony, is
+needed in usersapce of VM in order to set the guest time.
+
+After ptp_kvm is initialized, there will be a new device node under /dev called
+ptp%d. A guest userspace service, like chrony, can use this device to get host
+walltime, sometimes also counter cycle, which depends on the service it calls.
+Then this guest userspace service can use those data to do the time sync for
+the guest.
+The following is the work flow of ptp_kvm:
+
+a) time sync service in guest userspace call ioctl on ptp device /dev/ptp%d.
+b) ptp_kvm module in guest receives this request then invokes hypercall to
+ route into host kernel to request host's walltime/counter cycle.
+c) ptp_kvm hypercall service on the host responds to the request and sends data
+ back.
+d) ptp in guest copies the data to userspace.
+
+ptp_kvm consists of components running on the guest and host. Step 2 consists of
+a guest driver making a hypercall whilst step 3 involves the hypervisor responding
+with information.
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
PTP_KVM implementation depends on hypercall using SMCCC. So we
introduce a new SMCCC service ID. This doc explains how does the
ID define and how does PTP_KVM works on arm/arm64.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
Documentation/virt/kvm/api.rst | 9 +++++++
Documentation/virt/kvm/arm/index.rst | 1 +
Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 36d5f1f3c6dd..9843dbcbf770 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual features provided to the
guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
(0x40000001). Otherwise, a guest may use the paravirtual features
regardless of what has actually been exposed through the CPUID leaf.
+
+8.27 KVM_CAP_PTP_KVM
+--------------------
+
+:Architectures: arm64
+
+This capability indicates that KVM virtual PTP service is supported in host.
+It must company with the implementation of KVM virtual PTP service in host
+so VMM can probe if there is the service in host by checking this capability.
diff --git a/Documentation/virt/kvm/arm/index.rst b/Documentation/virt/kvm/arm/index.rst
index 3e2b2aba90fc..78a9b670aafe 100644
--- a/Documentation/virt/kvm/arm/index.rst
+++ b/Documentation/virt/kvm/arm/index.rst
@@ -10,3 +10,4 @@ ARM
hyp-abi
psci
pvtime
+ ptp_kvm
diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst b/Documentation/virt/kvm/arm/ptp_kvm.rst
new file mode 100644
index 000000000000..bb1e6cfefe44
--- /dev/null
+++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
@@ -0,0 +1,29 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+PTP_KVM support for arm/arm64
+=============================
+
+PTP_KVM is used for time sync between guest and host in a high precision.
+It needs to get the wall time and counter value from the host and transfer these
+to guest via hypercall service. So one more hypercall service has been added.
+
+This new SMCCC hypercall is defined as:
+
+* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
+
+As both 32 and 64-bits ptp_kvm client should be supported, we choose SMC32/HVC32
+calling convention.
+
+ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
+
+ ============= ========== ==========
+ Function ID: (uint32) 0x86000001
+ Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or ARM_PTP_VIRT_COUNTER(0)
+ which indicate acquiring physical counter or
+ virtual counter respectively.
+ return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1 represent
+ wall clock time and val2 and val3 represent
+ counter cycle.
+ ============= ========== ==========
+
+More info see section 5 in Documentation/virt/kvm/timekeeping.rst.
diff --git a/Documentation/virt/kvm/timekeeping.rst b/Documentation/virt/kvm/timekeeping.rst
index 21ae7efa29ba..c81383e38372 100644
--- a/Documentation/virt/kvm/timekeeping.rst
+++ b/Documentation/virt/kvm/timekeeping.rst
@@ -13,6 +13,7 @@ Timekeeping Virtualization for X86-Based Architectures
2) Timing Devices
3) TSC Hardware
4) Virtualization Problems
+ 5) KVM virtual PTP clock
1. Overview
===========
@@ -643,3 +644,37 @@ by using CPU utilization itself as a signalling channel. Preventing such
problems would require completely isolated virtual time which may not track
real time any longer. This may be useful in certain security or QA contexts,
but in general isn't recommended for real-world deployment scenarios.
+
+5. KVM virtual PTP clock
+========================
+
+NTP (Network Time Protocol) is often used to sync time in a VM. Unfortunately,
+the precision of NTP is limited due to unknown delays in the network.
+
+KVM virtual PTP clock (PTP_KVM) offers another way to sync time in VM; use the
+host's clock rather than one from a remote machine. Having a synchronization
+mechanism for the virtualization environment allows us to keep all the guests
+running on the same host in sync.
+In general, the delay of communication between host and guest is quite
+small, so ptp_kvm can offer time sync precision up to in order of nanoseconds.
+Please keep in mind that ptp_kvm just limits itself to be a channel which
+transmits the remote clock from host to guest. An application, eg. chrony, is
+needed in usersapce of VM in order to set the guest time.
+
+After ptp_kvm is initialized, there will be a new device node under /dev called
+ptp%d. A guest userspace service, like chrony, can use this device to get host
+walltime, sometimes also counter cycle, which depends on the service it calls.
+Then this guest userspace service can use those data to do the time sync for
+the guest.
+The following is the work flow of ptp_kvm:
+
+a) time sync service in guest userspace call ioctl on ptp device /dev/ptp%d.
+b) ptp_kvm module in guest receives this request then invokes hypercall to
+ route into host kernel to request host's walltime/counter cycle.
+c) ptp_kvm hypercall service on the host responds to the request and sends data
+ back.
+d) ptp in guest copies the data to userspace.
+
+ptp_kvm consists of components running on the guest and host. Step 2 consists of
+a guest driver making a hypercall whilst step 3 involves the hypervisor responding
+with information.
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 9/9] arm64: Add kvm capability check extension for ptp_kvm
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-11 6:22 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve.Capper,
justin.he, jianyong.wu, nd
Let userspace check if there is kvm ptp service in host.
Before VMs migrate to another host, VMM may check if this
cap is available to determine the next behavior.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Suggested-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kvm/arm.c | 1 +
include/uapi/linux/kvm.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 5750ec34960e..c05279de507d 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -182,6 +182,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2:
case KVM_CAP_ARM_NISV_TO_USER:
case KVM_CAP_ARM_INJECT_EXT_DABT:
+ case KVM_CAP_PTP_KVM:
r = 1;
break;
case KVM_CAP_ARM_SET_DEVICE_ADDR:
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index ca41220b40b8..797c40bbc31f 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1053,6 +1053,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_X86_USER_SPACE_MSR 188
#define KVM_CAP_X86_MSR_FILTER 189
#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190
+#define KVM_CAP_PTP_KVM 191
#ifdef KVM_CAP_IRQ_ROUTING
--
2.17.1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 9/9] arm64: Add kvm capability check extension for ptp_kvm
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Let userspace check if there is kvm ptp service in host.
Before VMs migrate to another host, VMM may check if this
cap is available to determine the next behavior.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Suggested-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kvm/arm.c | 1 +
include/uapi/linux/kvm.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 5750ec34960e..c05279de507d 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -182,6 +182,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2:
case KVM_CAP_ARM_NISV_TO_USER:
case KVM_CAP_ARM_INJECT_EXT_DABT:
+ case KVM_CAP_PTP_KVM:
r = 1;
break;
case KVM_CAP_ARM_SET_DEVICE_ADDR:
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index ca41220b40b8..797c40bbc31f 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1053,6 +1053,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_X86_USER_SPACE_MSR 188
#define KVM_CAP_X86_MSR_FILTER 189
#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190
+#define KVM_CAP_PTP_KVM 191
#ifdef KVM_CAP_IRQ_ROUTING
--
2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [PATCH v15 9/9] arm64: Add kvm capability check extension for ptp_kvm
@ 2020-11-11 6:22 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-11 6:22 UTC (permalink / raw)
To: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price
Cc: justin.he, kvm, Steve.Capper, jianyong.wu, linux-kernel, nd,
kvmarm, linux-arm-kernel
Let userspace check if there is kvm ptp service in host.
Before VMs migrate to another host, VMM may check if this
cap is available to determine the next behavior.
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Suggested-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kvm/arm.c | 1 +
include/uapi/linux/kvm.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 5750ec34960e..c05279de507d 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -182,6 +182,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2:
case KVM_CAP_ARM_NISV_TO_USER:
case KVM_CAP_ARM_INJECT_EXT_DABT:
+ case KVM_CAP_PTP_KVM:
r = 1;
break;
case KVM_CAP_ARM_SET_DEVICE_ADDR:
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index ca41220b40b8..797c40bbc31f 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1053,6 +1053,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_X86_USER_SPACE_MSR 188
#define KVM_CAP_X86_MSR_FILTER 189
#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190
+#define KVM_CAP_PTP_KVM 191
#ifdef KVM_CAP_IRQ_ROUTING
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-11 6:22 ` Jianyong Wu
@ 2020-11-11 8:52 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 8:52 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will
Cc: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2462 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201110]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm64-randconfig-r016-20201111 (attached as .config)
compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/94d44d1bc7bec0d91d4c4851dd935a752bffe07d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 94d44d1bc7bec0d91d4c4851dd935a752bffe07d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/clocksource/arm_arch_timer.c:1655:5: warning: no previous prototype for 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
1655 | int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
>> drivers/ptp/ptp_kvm_arm.c:19:5: warning: no previous prototype for 'kvm_arch_ptp_init' [-Wmissing-prototypes]
19 | int kvm_arch_ptp_init(void)
| ^~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_arm.c:30:5: warning: no previous prototype for 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
30 | int kvm_arch_ptp_get_clock(struct timespec64 *ts)
| ^~~~~~~~~~~~~~~~~~~~~~
vim +/kvm_arch_ptp_get_crosststamp +1655 drivers/clocksource/arm_arch_timer.c
1654
> 1655 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 32497 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-11 8:52 ` kernel test robot
0 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 8:52 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2513 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201110]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm64-randconfig-r016-20201111 (attached as .config)
compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/94d44d1bc7bec0d91d4c4851dd935a752bffe07d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 94d44d1bc7bec0d91d4c4851dd935a752bffe07d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/clocksource/arm_arch_timer.c:1655:5: warning: no previous prototype for 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
1655 | int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
>> drivers/ptp/ptp_kvm_arm.c:19:5: warning: no previous prototype for 'kvm_arch_ptp_init' [-Wmissing-prototypes]
19 | int kvm_arch_ptp_init(void)
| ^~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_arm.c:30:5: warning: no previous prototype for 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
30 | int kvm_arch_ptp_get_clock(struct timespec64 *ts)
| ^~~~~~~~~~~~~~~~~~~~~~
vim +/kvm_arch_ptp_get_crosststamp +1655 drivers/clocksource/arm_arch_timer.c
1654
> 1655 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 32497 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
2020-11-11 6:22 ` Jianyong Wu
(?)
(?)
@ 2020-11-11 10:38 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 10:38 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2730 bytes --]
Hi Jianyong,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm-randconfig-c004-20201111 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/863f46b4f315744c8460d39c4e212737fecb4de9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 863f46b4f315744c8460d39c4e212737fecb4de9
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
arm-linux-gnueabi-ld: arch/arm/kernel/sleep.o: in function `__cpu_suspend':
(.text+0x60): undefined reference to `cpu_sa110_suspend_size'
arm-linux-gnueabi-ld: arch/arm/kernel/setup.o: in function `setup_arch':
>> setup.c:(.init.text+0xb6c): undefined reference to `kvm_init_hyp_services'
arm-linux-gnueabi-ld: arch/arm/kernel/suspend.o: in function `__cpu_suspend_save':
suspend.c:(.text+0x138): undefined reference to `cpu_sa110_do_suspend'
arm-linux-gnueabi-ld: suspend.c:(.text+0x170): undefined reference to `cpu_sa110_do_resume'
arm-linux-gnueabi-ld: drivers/firmware/qcom_scm-smc.o: in function `__scm_smc_do_quirk':
qcom_scm-smc.c:(.text+0x54): undefined reference to `__arm_smccc_smc'
arm-linux-gnueabi-ld: drivers/firmware/qcom_scm-legacy.o: in function `scm_legacy_call':
qcom_scm-legacy.c:(.text+0x168): undefined reference to `__arm_smccc_smc'
arm-linux-gnueabi-ld: drivers/firmware/qcom_scm-legacy.o: in function `scm_legacy_call_atomic':
qcom_scm-legacy.c:(.text+0x2e0): undefined reference to `__arm_smccc_smc'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 39923 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
2020-11-11 6:22 ` Jianyong Wu
` (2 preceding siblings ...)
(?)
@ 2020-11-11 12:23 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 12:23 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2037 bytes --]
Hi Jianyong,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm-randconfig-r015-20201111 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 874b0a0b9db93f5d3350ffe6b5efda2d908415d0)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/863f46b4f315744c8460d39c4e212737fecb4de9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 863f46b4f315744c8460d39c4e212737fecb4de9
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> ld.lld: error: undefined symbol: kvm_init_hyp_services
>>> referenced by setup.c:1148 (arch/arm/kernel/setup.c:1148)
>>> kernel/setup.o:(setup_arch) in archive arch/arm/built-in.a
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 30618 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
2020-11-11 6:22 ` Jianyong Wu
@ 2020-11-11 13:10 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 13:10 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will
Cc: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3256 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: i386-randconfig-p002-20201111 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/8cc52e023b81a9f561cc2094ecdd7266f5e29230
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 8cc52e023b81a9f561cc2094ecdd7266f5e29230
# save the attached .config to linux build tree
make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/ptp/ptp_kvm_x86.c:21:5: warning: no previous prototype for 'kvm_arch_ptp_init' [-Wmissing-prototypes]
21 | int kvm_arch_ptp_init(void)
| ^~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_x86.c:41:5: warning: no previous prototype for 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
41 | int kvm_arch_ptp_get_clock(struct timespec64 *ts)
| ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_x86.c:59:5: warning: no previous prototype for 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
59 | int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/kvm_arch_ptp_init +21 drivers/ptp/ptp_kvm_x86.c
20
> 21 int kvm_arch_ptp_init(void)
22 {
23 long ret;
24
25 if (!kvm_para_available())
26 return -ENODEV;
27
28 clock_pair_gpa = slow_virt_to_phys(&clock_pair);
29 hv_clock = pvclock_get_pvti_cpu0_va();
30 if (!hv_clock)
31 return -ENODEV;
32
33 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
34 KVM_CLOCK_PAIRING_WALLCLOCK);
35 if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
36 return -ENODEV;
37
38 return 0;
39 }
40
> 41 int kvm_arch_ptp_get_clock(struct timespec64 *ts)
42 {
43 unsigned long ret;
44
45 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
46 clock_pair_gpa,
47 KVM_CLOCK_PAIRING_WALLCLOCK);
48 if (ret != 0) {
49 pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
50 return -EOPNOTSUPP;
51 }
52
53 ts->tv_sec = clock_pair.sec;
54 ts->tv_nsec = clock_pair.nsec;
55
56 return 0;
57 }
58
> 59 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 25507 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
@ 2020-11-11 13:10 ` kernel test robot
0 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 13:10 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3342 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: i386-randconfig-p002-20201111 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/8cc52e023b81a9f561cc2094ecdd7266f5e29230
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 8cc52e023b81a9f561cc2094ecdd7266f5e29230
# save the attached .config to linux build tree
make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/ptp/ptp_kvm_x86.c:21:5: warning: no previous prototype for 'kvm_arch_ptp_init' [-Wmissing-prototypes]
21 | int kvm_arch_ptp_init(void)
| ^~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_x86.c:41:5: warning: no previous prototype for 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
41 | int kvm_arch_ptp_get_clock(struct timespec64 *ts)
| ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/ptp/ptp_kvm_x86.c:59:5: warning: no previous prototype for 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
59 | int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/kvm_arch_ptp_init +21 drivers/ptp/ptp_kvm_x86.c
20
> 21 int kvm_arch_ptp_init(void)
22 {
23 long ret;
24
25 if (!kvm_para_available())
26 return -ENODEV;
27
28 clock_pair_gpa = slow_virt_to_phys(&clock_pair);
29 hv_clock = pvclock_get_pvti_cpu0_va();
30 if (!hv_clock)
31 return -ENODEV;
32
33 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
34 KVM_CLOCK_PAIRING_WALLCLOCK);
35 if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
36 return -ENODEV;
37
38 return 0;
39 }
40
> 41 int kvm_arch_ptp_get_clock(struct timespec64 *ts)
42 {
43 unsigned long ret;
44
45 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
46 clock_pair_gpa,
47 KVM_CLOCK_PAIRING_WALLCLOCK);
48 if (ret != 0) {
49 pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
50 return -EOPNOTSUPP;
51 }
52
53 ts->tv_sec = clock_pair.sec;
54 ts->tv_nsec = clock_pair.nsec;
55
56 return 0;
57 }
58
> 59 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 25507 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-11 6:22 ` Jianyong Wu
@ 2020-11-11 13:44 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 13:44 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will
Cc: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2189 bytes --]
Hi Jianyong,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm-milbeaut_m10v_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/94d44d1bc7bec0d91d4c4851dd935a752bffe07d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 94d44d1bc7bec0d91d4c4851dd935a752bffe07d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
arch/arm/vfp/vfphw.o: in function `vfp_support_entry':
(.text+0xa): relocation truncated to fit: R_ARM_THM_JUMP19 against symbol `vfp_kmode_exception' defined in .text.unlikely section in arch/arm/vfp/vfpmodule.o
arm-linux-gnueabi-ld: arch/arm/kernel/setup.o: in function `setup_arch':
setup.c:(.init.text+0xaa2): undefined reference to `kvm_init_hyp_services'
arm-linux-gnueabi-ld: drivers/clocksource/arm_arch_timer.o: in function `kvm_arch_ptp_get_crosststamp':
>> arm_arch_timer.c:(.text+0x202): undefined reference to `arm_smccc_1_1_get_conduit'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 13137 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-11 13:44 ` kernel test robot
0 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 13:44 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2231 bytes --]
Hi Jianyong,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm-milbeaut_m10v_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/94d44d1bc7bec0d91d4c4851dd935a752bffe07d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 94d44d1bc7bec0d91d4c4851dd935a752bffe07d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
arch/arm/vfp/vfphw.o: in function `vfp_support_entry':
(.text+0xa): relocation truncated to fit: R_ARM_THM_JUMP19 against symbol `vfp_kmode_exception' defined in .text.unlikely section in arch/arm/vfp/vfpmodule.o
arm-linux-gnueabi-ld: arch/arm/kernel/setup.o: in function `setup_arch':
setup.c:(.init.text+0xaa2): undefined reference to `kvm_init_hyp_services'
arm-linux-gnueabi-ld: drivers/clocksource/arm_arch_timer.o: in function `kvm_arch_ptp_get_crosststamp':
>> arm_arch_timer.c:(.text+0x202): undefined reference to `arm_smccc_1_1_get_conduit'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 13137 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
2020-11-11 6:22 ` Jianyong Wu
@ 2020-11-11 14:36 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 14:36 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark.Rutland, will
Cc: kbuild-all, clang-built-linux
[-- Attachment #1: Type: text/plain, Size: 4183 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: x86_64-randconfig-a005-20201111 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 874b0a0b9db93f5d3350ffe6b5efda2d908415d0)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/8cc52e023b81a9f561cc2094ecdd7266f5e29230
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 8cc52e023b81a9f561cc2094ecdd7266f5e29230
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/ptp/ptp_kvm_x86.c:21:5: warning: no previous prototype for function 'kvm_arch_ptp_init' [-Wmissing-prototypes]
int kvm_arch_ptp_init(void)
^
drivers/ptp/ptp_kvm_x86.c:21:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_init(void)
^
static
>> drivers/ptp/ptp_kvm_x86.c:41:5: warning: no previous prototype for function 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
int kvm_arch_ptp_get_clock(struct timespec64 *ts)
^
drivers/ptp/ptp_kvm_x86.c:41:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_get_clock(struct timespec64 *ts)
^
static
>> drivers/ptp/ptp_kvm_x86.c:59:5: warning: no previous prototype for function 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
^
drivers/ptp/ptp_kvm_x86.c:59:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
^
static
3 warnings generated.
vim +/kvm_arch_ptp_init +21 drivers/ptp/ptp_kvm_x86.c
20
> 21 int kvm_arch_ptp_init(void)
22 {
23 long ret;
24
25 if (!kvm_para_available())
26 return -ENODEV;
27
28 clock_pair_gpa = slow_virt_to_phys(&clock_pair);
29 hv_clock = pvclock_get_pvti_cpu0_va();
30 if (!hv_clock)
31 return -ENODEV;
32
33 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
34 KVM_CLOCK_PAIRING_WALLCLOCK);
35 if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
36 return -ENODEV;
37
38 return 0;
39 }
40
> 41 int kvm_arch_ptp_get_clock(struct timespec64 *ts)
42 {
43 unsigned long ret;
44
45 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
46 clock_pair_gpa,
47 KVM_CLOCK_PAIRING_WALLCLOCK);
48 if (ret != 0) {
49 pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
50 return -EOPNOTSUPP;
51 }
52
53 ts->tv_sec = clock_pair.sec;
54 ts->tv_nsec = clock_pair.nsec;
55
56 return 0;
57 }
58
> 59 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 35330 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent.
@ 2020-11-11 14:36 ` kernel test robot
0 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 14:36 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 4286 bytes --]
Hi Jianyong,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: x86_64-randconfig-a005-20201111 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 874b0a0b9db93f5d3350ffe6b5efda2d908415d0)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/8cc52e023b81a9f561cc2094ecdd7266f5e29230
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 8cc52e023b81a9f561cc2094ecdd7266f5e29230
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/ptp/ptp_kvm_x86.c:21:5: warning: no previous prototype for function 'kvm_arch_ptp_init' [-Wmissing-prototypes]
int kvm_arch_ptp_init(void)
^
drivers/ptp/ptp_kvm_x86.c:21:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_init(void)
^
static
>> drivers/ptp/ptp_kvm_x86.c:41:5: warning: no previous prototype for function 'kvm_arch_ptp_get_clock' [-Wmissing-prototypes]
int kvm_arch_ptp_get_clock(struct timespec64 *ts)
^
drivers/ptp/ptp_kvm_x86.c:41:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_get_clock(struct timespec64 *ts)
^
static
>> drivers/ptp/ptp_kvm_x86.c:59:5: warning: no previous prototype for function 'kvm_arch_ptp_get_crosststamp' [-Wmissing-prototypes]
int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
^
drivers/ptp/ptp_kvm_x86.c:59:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
^
static
3 warnings generated.
vim +/kvm_arch_ptp_init +21 drivers/ptp/ptp_kvm_x86.c
20
> 21 int kvm_arch_ptp_init(void)
22 {
23 long ret;
24
25 if (!kvm_para_available())
26 return -ENODEV;
27
28 clock_pair_gpa = slow_virt_to_phys(&clock_pair);
29 hv_clock = pvclock_get_pvti_cpu0_va();
30 if (!hv_clock)
31 return -ENODEV;
32
33 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
34 KVM_CLOCK_PAIRING_WALLCLOCK);
35 if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)
36 return -ENODEV;
37
38 return 0;
39 }
40
> 41 int kvm_arch_ptp_get_clock(struct timespec64 *ts)
42 {
43 unsigned long ret;
44
45 ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING,
46 clock_pair_gpa,
47 KVM_CLOCK_PAIRING_WALLCLOCK);
48 if (ret != 0) {
49 pr_err_ratelimited("clock offset hypercall ret %lu\n", ret);
50 return -EOPNOTSUPP;
51 }
52
53 ts->tv_sec = clock_pair.sec;
54 ts->tv_nsec = clock_pair.nsec;
55
56 return 0;
57 }
58
> 59 int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 35330 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor
2020-11-11 6:22 ` Jianyong Wu
` (3 preceding siblings ...)
(?)
@ 2020-11-11 16:54 ` kernel test robot
-1 siblings, 0 replies; 81+ messages in thread
From: kernel test robot @ 2020-11-11 16:54 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 4576 bytes --]
Hi Jianyong,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.10-rc3 next-20201111]
[cannot apply to tip/timers/core kvmarm/next kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c
config: arm-randconfig-r006-20201111 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/863f46b4f315744c8460d39c4e212737fecb4de9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-arm64/20201111-142600
git checkout 863f46b4f315744c8460d39c4e212737fecb4de9
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
arm-linux-gnueabi-ld: arch/arm/kernel/setup.o: in function `setup_arch':
>> arch/arm/kernel/setup.c:1148: undefined reference to `kvm_init_hyp_services'
vim +1148 arch/arm/kernel/setup.c
1081
1082 void __init setup_arch(char **cmdline_p)
1083 {
1084 const struct machine_desc *mdesc;
1085
1086 setup_processor();
1087 mdesc = setup_machine_fdt(__atags_pointer);
1088 if (!mdesc)
1089 mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
1090 if (!mdesc) {
1091 early_print("\nError: invalid dtb and unrecognized/unsupported machine ID\n");
1092 early_print(" r1=0x%08x, r2=0x%08x\n", __machine_arch_type,
1093 __atags_pointer);
1094 if (__atags_pointer)
1095 early_print(" r2[]=%*ph\n", 16,
1096 phys_to_virt(__atags_pointer));
1097 dump_machine_table();
1098 }
1099
1100 machine_desc = mdesc;
1101 machine_name = mdesc->name;
1102 dump_stack_set_arch_desc("%s", mdesc->name);
1103
1104 if (mdesc->reboot_mode != REBOOT_HARD)
1105 reboot_mode = mdesc->reboot_mode;
1106
1107 init_mm.start_code = (unsigned long) _text;
1108 init_mm.end_code = (unsigned long) _etext;
1109 init_mm.end_data = (unsigned long) _edata;
1110 init_mm.brk = (unsigned long) _end;
1111
1112 /* populate cmd_line too for later use, preserving boot_command_line */
1113 strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
1114 *cmdline_p = cmd_line;
1115
1116 early_fixmap_init();
1117 early_ioremap_init();
1118
1119 parse_early_param();
1120
1121 #ifdef CONFIG_MMU
1122 early_mm_init(mdesc);
1123 #endif
1124 setup_dma_zone(mdesc);
1125 xen_early_init();
1126 efi_init();
1127 /*
1128 * Make sure the calculation for lowmem/highmem is set appropriately
1129 * before reserving/allocating any mmeory
1130 */
1131 adjust_lowmem_bounds();
1132 arm_memblock_init(mdesc);
1133 /* Memory may have been removed so recalculate the bounds. */
1134 adjust_lowmem_bounds();
1135
1136 early_ioremap_reset();
1137
1138 paging_init(mdesc);
1139 request_standard_resources(mdesc);
1140
1141 if (mdesc->restart)
1142 arm_pm_restart = mdesc->restart;
1143
1144 unflatten_device_tree();
1145
1146 arm_dt_init_cpu_maps();
1147 psci_dt_init();
> 1148 kvm_init_hyp_services();
1149 #ifdef CONFIG_SMP
1150 if (is_smp()) {
1151 if (!mdesc->smp_init || !mdesc->smp_init()) {
1152 if (psci_smp_available())
1153 smp_set_ops(&psci_smp_ops);
1154 else if (mdesc->smp)
1155 smp_set_ops(mdesc->smp);
1156 }
1157 smp_init_cpus();
1158 smp_build_mpidr_hash();
1159 }
1160 #endif
1161
1162 if (!is_smp())
1163 hyp_mode_check();
1164
1165 reserve_crashkernel();
1166
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 27426 bytes --]
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-23 9:26 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-23 9:26 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price
Cc: linux-kernel, linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi,
Ping ...
Any comments?
> -----Original Message-----
> From: Jianyong Wu <jianyong.wu@arm.com>
> Sent: Wednesday, November 11, 2020 2:22 PM
> 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
> <Mark.Rutland@arm.com>; will@kernel.org; Suzuki Poulose
> <Suzuki.Poulose@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> Steven Price <Steven.Price@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
> <Steve.Capper@arm.com>; Justin He <Justin.He@arm.com>; Jianyong Wu
> <Jianyong.Wu@arm.com>; nd <nd@arm.com>
> Subject: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
>
> Currently, we offen use ntp (sync time with remote network clock) to sync
> time in VM. But the precision of ntp is subject to network delay so it's difficult
> to sync time in a high precision.
>
> kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM, as
> the remote clock locates in the host instead of remote network clock.
> It targets to sync time between guest and host in virtualization environment
> and in this way, we can keep the time of all the VMs running in the same host
> in sync. In general, the delay of communication between host and guest is
> quiet small, so ptp_kvm can offer time sync precision up to in order of
> nanosecond. Please keep in mind that ptp_kvm just limits itself to be a
> channel which transmit the remote clock from host to guest and leaves the
> time sync jobs to an application, eg. chrony, in usersapce in VM.
>
> How ptp_kvm works:
> After ptp_kvm initialized, there will be a new device node under /dev called
> ptp%d. A guest userspace service, like chrony, can use this device to get host
> walltime, sometimes also counter cycle, which depends on the service it calls.
> Then this guest userspace service can use those data to do the time sync for
> guest.
> here is a rough sketch to show how kvm ptp clock works.
>
> |----------------------------| |--------------------------|
> | guest userspace | | host |
> |ioctl -> /dev/ptp%d | | |
> | ^ | | | |
> |----------------------------| | |
> | | | guest kernel | | |
> | | V (get host walltime/counter cycle) |
> | ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
> | <- - - - - - - - - - - - |
> |----------------------------| |--------------------------|
>
> 1. time sync service in guest userspace call ptp device through /dev/ptp%d.
> 2. ptp_kvm module in guest recive this request then invoke hypercall to
> route into host kernel to request host walltime/counter cycle.
> 3. ptp_kvm hypercall service in host response to the request and send data
> back.
> 4. ptp (not ptp_kvm) in guest copy the data to userspace.
>
> This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
> in guest comparing step 3 works in host kernel.
>
> change log:
>
> from v14 to v15
> (1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested on
> both arm64 and arm32 guest running on arm64 kvm host.
> (2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
> (3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it
> should be arch agnostic.
> (4) add description for KVM_CAP_PTP_KVM in
> Documentation/virt/kvm/api.rst.
> (5) adjust dependency in Kconfig for ptp_kvm.
> (6) refine multi-arch process in driver/ptp/Makefile.
> (7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
> (8) address other issues from comments in v14.
> (9) fold hypercall service of ptp_kvm as a function.
> (10) rebase to 5.10-rc3.
>
> from v13 to v14
> (1) rebase code on 5.9-rc3.
> (2) add a document to introduce implementation of PTP_KVM on arm64.
> (3) fix comments issue in hypercall.c.
> (4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
> (5) fix make issue on x86 reported by kernel test robot.
>
> from v12 to v13:
> (1) rebase code on 5.8-rc1.
> (2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
> (3) remove the change to ptp device code of extend getcrosststamp.
> (4) remove the mechanism of letting user choose the counter type in
> ptp_kvm for arm64.
> (5) add virtual counter option in ptp_kvm service to let user choose the
> specific counter explicitly.
>
> from v11 to v12:
> (1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
> including 1/11 and 2/11. as these patches introduce discover mechanism of
> vendor smccc service.
> (2) rebase ptp_kvm hypercall service from standard smccc to vendor
> smccc and add ptp_kvm to vendor smccc service discover mechanism.
> (3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
> letter.
>
> from v10 to v11:
> (1) rebase code on 5.7-rc2.
> (2) remove support for arm32, as kvm support for arm32 will be removed
> [1]
> (3) add error report in ptp_kvm initialization.
>
> from v9 to v10:
> (1) change code base to v5.5.
> (2) enable ptp_kvm both for arm32 and arm64.
> (3) let user choose which of virtual counter or physical counter should
> return when using crosstimestamp mode of ptp_kvm for arm/arm64.
> (4) extend input argument for getcrosstimestamp API.
>
> from v8 to v9:
> (1) move ptp_kvm.h to driver/ptp/
> (2) replace license declaration of ptp_kvm.h the same with other header
> files in the same directory.
>
> from v7 to v8:
> (1) separate adding clocksource id for arm_arch_counter as a single patch.
> (2) update commit message for patch 4/8.
> (3) refine patch 7/8 and patch 8/8 to make them more independent.
>
> from v5 to v6:
> (1) apply Mark's patch[4] to get SMCCC conduit.
> (2) add mechanism to recognize current clocksource by add
> clocksouce_id value into struct clocksource instead of method in patch-v5.
> (3) rename kvm_arch_ptp_get_clock_fn into
> kvm_arch_ptp_get_crosststamp.
>
> from v4 to v5:
> (1) remove hvc delay compensasion as it should leave to userspace.
> (2) check current clocksource in hvc call service.
> (3) expose current clocksource by adding it to system_time_snapshot.
> (4) add helper to check if clocksource is arm_arch_counter.
> (5) rename kvm_ptp.c to ptp_kvm_common.c
>
> from v3 to v4:
> (1) fix clocksource of ptp_kvm to arch_sys_counter.
> (2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
> (3) subtract cntvoff before return cycles from host.
> (4) use ktime_get_snapshot instead of getnstimeofday and
> get_current_counterval to return time and counter value.
> (5) split ktime and counter into two 32-bit block respectively to avoid
> Y2038-safe issue.
> (6) set time compensation to device time as half of the delay of hvc call.
> (7) add ARM_ARCH_TIMER as dependency of ptp_kvm for arm64.
>
> from v2 to v3:
> (1) fix some issues in commit log.
> (2) add some receivers in send list.
>
> from v1 to v2:
> (1) move arch-specific code from arch/ to driver/ptp/
> (2) offer mechanism to inform userspace if ptp_kvm service is available.
> (3) separate ptp_kvm code for arm64 into hypervisor part and guest part.
> (4) add API to expose monotonic clock and counter value.
> (5) refine code: remove no necessary part and reconsitution.
>
> [1] https://patchwork.kernel.org/cover/11373351/
>
>
> Jianyong Wu (6):
> ptp: Reorganize ptp_kvm module to make it arch-independent.
> clocksource: Add clocksource id for arm arch counter
> arm64/kvm: Add hypercall service for kvm ptp.
> ptp: arm/arm64: Enable ptp_kvm for arm/arm64
> doc: add ptp_kvm introduction for arm64 support
> arm64: Add kvm capability check extension for ptp_kvm
>
> Thomas Gleixner (1):
> time: Add mechanism to recognize clocksource in time_get_snapshot
>
> Will Deacon (2):
> arm64: Probe for the presence of KVM hypervisor
> arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
>
> Documentation/virt/kvm/api.rst | 9 ++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
> arch/arm/kernel/setup.c | 1 +
> arch/arm64/kernel/setup.c | 1 +
> arch/arm64/kvm/arm.c | 1 +
> arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
> drivers/clocksource/arm_arch_timer.c | 30 +++++++
> drivers/firmware/smccc/smccc.c | 37 ++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 2 +
> drivers/ptp/ptp_kvm.h | 11 +++
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
> drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
> drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
> include/linux/arm-smccc.h | 60 +++++++++++++
> include/linux/clocksource.h | 6 ++
> include/linux/clocksource_ids.h | 12 +++
> include/linux/timekeeping.h | 12 +--
> include/uapi/linux/kvm.h | 1 +
> kernel/time/clocksource.c | 2 +
> kernel/time/timekeeping.c | 1 +
> 23 files changed, 488 insertions(+), 77 deletions(-) create mode 100644
> Documentation/virt/kvm/arm/ptp_kvm.rst
> create mode 100644 drivers/ptp/ptp_kvm.h create mode 100644
> drivers/ptp/ptp_kvm_arm.c rename drivers/ptp/{ptp_kvm.c =>
> ptp_kvm_common.c} (60%) create mode 100644
> drivers/ptp/ptp_kvm_x86.c create mode 100644
> include/linux/clocksource_ids.h
>
> --
> 2.17.1
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
@ 2020-11-23 9:26 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-23 9:26 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price
Cc: Justin He, kvm, linux-kernel, nd, kvmarm, linux-arm-kernel
Hi,
Ping ...
Any comments?
> -----Original Message-----
> From: Jianyong Wu <jianyong.wu@arm.com>
> Sent: Wednesday, November 11, 2020 2:22 PM
> 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
> <Mark.Rutland@arm.com>; will@kernel.org; Suzuki Poulose
> <Suzuki.Poulose@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> Steven Price <Steven.Price@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
> <Steve.Capper@arm.com>; Justin He <Justin.He@arm.com>; Jianyong Wu
> <Jianyong.Wu@arm.com>; nd <nd@arm.com>
> Subject: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
>
> Currently, we offen use ntp (sync time with remote network clock) to sync
> time in VM. But the precision of ntp is subject to network delay so it's difficult
> to sync time in a high precision.
>
> kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM, as
> the remote clock locates in the host instead of remote network clock.
> It targets to sync time between guest and host in virtualization environment
> and in this way, we can keep the time of all the VMs running in the same host
> in sync. In general, the delay of communication between host and guest is
> quiet small, so ptp_kvm can offer time sync precision up to in order of
> nanosecond. Please keep in mind that ptp_kvm just limits itself to be a
> channel which transmit the remote clock from host to guest and leaves the
> time sync jobs to an application, eg. chrony, in usersapce in VM.
>
> How ptp_kvm works:
> After ptp_kvm initialized, there will be a new device node under /dev called
> ptp%d. A guest userspace service, like chrony, can use this device to get host
> walltime, sometimes also counter cycle, which depends on the service it calls.
> Then this guest userspace service can use those data to do the time sync for
> guest.
> here is a rough sketch to show how kvm ptp clock works.
>
> |----------------------------| |--------------------------|
> | guest userspace | | host |
> |ioctl -> /dev/ptp%d | | |
> | ^ | | | |
> |----------------------------| | |
> | | | guest kernel | | |
> | | V (get host walltime/counter cycle) |
> | ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
> | <- - - - - - - - - - - - |
> |----------------------------| |--------------------------|
>
> 1. time sync service in guest userspace call ptp device through /dev/ptp%d.
> 2. ptp_kvm module in guest recive this request then invoke hypercall to
> route into host kernel to request host walltime/counter cycle.
> 3. ptp_kvm hypercall service in host response to the request and send data
> back.
> 4. ptp (not ptp_kvm) in guest copy the data to userspace.
>
> This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
> in guest comparing step 3 works in host kernel.
>
> change log:
>
> from v14 to v15
> (1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested on
> both arm64 and arm32 guest running on arm64 kvm host.
> (2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
> (3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it
> should be arch agnostic.
> (4) add description for KVM_CAP_PTP_KVM in
> Documentation/virt/kvm/api.rst.
> (5) adjust dependency in Kconfig for ptp_kvm.
> (6) refine multi-arch process in driver/ptp/Makefile.
> (7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
> (8) address other issues from comments in v14.
> (9) fold hypercall service of ptp_kvm as a function.
> (10) rebase to 5.10-rc3.
>
> from v13 to v14
> (1) rebase code on 5.9-rc3.
> (2) add a document to introduce implementation of PTP_KVM on arm64.
> (3) fix comments issue in hypercall.c.
> (4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
> (5) fix make issue on x86 reported by kernel test robot.
>
> from v12 to v13:
> (1) rebase code on 5.8-rc1.
> (2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
> (3) remove the change to ptp device code of extend getcrosststamp.
> (4) remove the mechanism of letting user choose the counter type in
> ptp_kvm for arm64.
> (5) add virtual counter option in ptp_kvm service to let user choose the
> specific counter explicitly.
>
> from v11 to v12:
> (1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
> including 1/11 and 2/11. as these patches introduce discover mechanism of
> vendor smccc service.
> (2) rebase ptp_kvm hypercall service from standard smccc to vendor
> smccc and add ptp_kvm to vendor smccc service discover mechanism.
> (3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
> letter.
>
> from v10 to v11:
> (1) rebase code on 5.7-rc2.
> (2) remove support for arm32, as kvm support for arm32 will be removed
> [1]
> (3) add error report in ptp_kvm initialization.
>
> from v9 to v10:
> (1) change code base to v5.5.
> (2) enable ptp_kvm both for arm32 and arm64.
> (3) let user choose which of virtual counter or physical counter should
> return when using crosstimestamp mode of ptp_kvm for arm/arm64.
> (4) extend input argument for getcrosstimestamp API.
>
> from v8 to v9:
> (1) move ptp_kvm.h to driver/ptp/
> (2) replace license declaration of ptp_kvm.h the same with other header
> files in the same directory.
>
> from v7 to v8:
> (1) separate adding clocksource id for arm_arch_counter as a single patch.
> (2) update commit message for patch 4/8.
> (3) refine patch 7/8 and patch 8/8 to make them more independent.
>
> from v5 to v6:
> (1) apply Mark's patch[4] to get SMCCC conduit.
> (2) add mechanism to recognize current clocksource by add
> clocksouce_id value into struct clocksource instead of method in patch-v5.
> (3) rename kvm_arch_ptp_get_clock_fn into
> kvm_arch_ptp_get_crosststamp.
>
> from v4 to v5:
> (1) remove hvc delay compensasion as it should leave to userspace.
> (2) check current clocksource in hvc call service.
> (3) expose current clocksource by adding it to system_time_snapshot.
> (4) add helper to check if clocksource is arm_arch_counter.
> (5) rename kvm_ptp.c to ptp_kvm_common.c
>
> from v3 to v4:
> (1) fix clocksource of ptp_kvm to arch_sys_counter.
> (2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
> (3) subtract cntvoff before return cycles from host.
> (4) use ktime_get_snapshot instead of getnstimeofday and
> get_current_counterval to return time and counter value.
> (5) split ktime and counter into two 32-bit block respectively to avoid
> Y2038-safe issue.
> (6) set time compensation to device time as half of the delay of hvc call.
> (7) add ARM_ARCH_TIMER as dependency of ptp_kvm for arm64.
>
> from v2 to v3:
> (1) fix some issues in commit log.
> (2) add some receivers in send list.
>
> from v1 to v2:
> (1) move arch-specific code from arch/ to driver/ptp/
> (2) offer mechanism to inform userspace if ptp_kvm service is available.
> (3) separate ptp_kvm code for arm64 into hypervisor part and guest part.
> (4) add API to expose monotonic clock and counter value.
> (5) refine code: remove no necessary part and reconsitution.
>
> [1] https://patchwork.kernel.org/cover/11373351/
>
>
> Jianyong Wu (6):
> ptp: Reorganize ptp_kvm module to make it arch-independent.
> clocksource: Add clocksource id for arm arch counter
> arm64/kvm: Add hypercall service for kvm ptp.
> ptp: arm/arm64: Enable ptp_kvm for arm/arm64
> doc: add ptp_kvm introduction for arm64 support
> arm64: Add kvm capability check extension for ptp_kvm
>
> Thomas Gleixner (1):
> time: Add mechanism to recognize clocksource in time_get_snapshot
>
> Will Deacon (2):
> arm64: Probe for the presence of KVM hypervisor
> arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
>
> Documentation/virt/kvm/api.rst | 9 ++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
> arch/arm/kernel/setup.c | 1 +
> arch/arm64/kernel/setup.c | 1 +
> arch/arm64/kvm/arm.c | 1 +
> arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
> drivers/clocksource/arm_arch_timer.c | 30 +++++++
> drivers/firmware/smccc/smccc.c | 37 ++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 2 +
> drivers/ptp/ptp_kvm.h | 11 +++
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
> drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
> drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
> include/linux/arm-smccc.h | 60 +++++++++++++
> include/linux/clocksource.h | 6 ++
> include/linux/clocksource_ids.h | 12 +++
> include/linux/timekeeping.h | 12 +--
> include/uapi/linux/kvm.h | 1 +
> kernel/time/clocksource.c | 2 +
> kernel/time/timekeeping.c | 1 +
> 23 files changed, 488 insertions(+), 77 deletions(-) create mode 100644
> Documentation/virt/kvm/arm/ptp_kvm.rst
> create mode 100644 drivers/ptp/ptp_kvm.h create mode 100644
> drivers/ptp/ptp_kvm_arm.c rename drivers/ptp/{ptp_kvm.c =>
> ptp_kvm_common.c} (60%) create mode 100644
> drivers/ptp/ptp_kvm_x86.c create mode 100644
> include/linux/clocksource_ids.h
>
> --
> 2.17.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
@ 2020-11-23 9:26 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-23 9:26 UTC (permalink / raw)
To: Jianyong Wu, netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, maz, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price
Cc: Justin He, kvm, Steve Capper, linux-kernel, nd, kvmarm, linux-arm-kernel
Hi,
Ping ...
Any comments?
> -----Original Message-----
> From: Jianyong Wu <jianyong.wu@arm.com>
> Sent: Wednesday, November 11, 2020 2:22 PM
> 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
> <Mark.Rutland@arm.com>; will@kernel.org; Suzuki Poulose
> <Suzuki.Poulose@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> Steven Price <Steven.Price@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
> <Steve.Capper@arm.com>; Justin He <Justin.He@arm.com>; Jianyong Wu
> <Jianyong.Wu@arm.com>; nd <nd@arm.com>
> Subject: [PATCH v15 0/9] Enable ptp_kvm for arm/arm64
>
> Currently, we offen use ntp (sync time with remote network clock) to sync
> time in VM. But the precision of ntp is subject to network delay so it's difficult
> to sync time in a high precision.
>
> kvm virtual ptp clock (ptp_kvm) offers another way to sync time in VM, as
> the remote clock locates in the host instead of remote network clock.
> It targets to sync time between guest and host in virtualization environment
> and in this way, we can keep the time of all the VMs running in the same host
> in sync. In general, the delay of communication between host and guest is
> quiet small, so ptp_kvm can offer time sync precision up to in order of
> nanosecond. Please keep in mind that ptp_kvm just limits itself to be a
> channel which transmit the remote clock from host to guest and leaves the
> time sync jobs to an application, eg. chrony, in usersapce in VM.
>
> How ptp_kvm works:
> After ptp_kvm initialized, there will be a new device node under /dev called
> ptp%d. A guest userspace service, like chrony, can use this device to get host
> walltime, sometimes also counter cycle, which depends on the service it calls.
> Then this guest userspace service can use those data to do the time sync for
> guest.
> here is a rough sketch to show how kvm ptp clock works.
>
> |----------------------------| |--------------------------|
> | guest userspace | | host |
> |ioctl -> /dev/ptp%d | | |
> | ^ | | | |
> |----------------------------| | |
> | | | guest kernel | | |
> | | V (get host walltime/counter cycle) |
> | ptp_kvm -> hypercall - - - - - - - - - - ->hypercall service |
> | <- - - - - - - - - - - - |
> |----------------------------| |--------------------------|
>
> 1. time sync service in guest userspace call ptp device through /dev/ptp%d.
> 2. ptp_kvm module in guest recive this request then invoke hypercall to
> route into host kernel to request host walltime/counter cycle.
> 3. ptp_kvm hypercall service in host response to the request and send data
> back.
> 4. ptp (not ptp_kvm) in guest copy the data to userspace.
>
> This ptp_kvm implementation focuses itself to step 2 and 3 and step 2 works
> in guest comparing step 3 works in host kernel.
>
> change log:
>
> from v14 to v15
> (1) enable ptp_kvm on arm32 guest, also ptp_kvm has been tested on
> both arm64 and arm32 guest running on arm64 kvm host.
> (2) move arch-agnostic part of ptp_kvm.rst into timekeeping.rst.
> (3) rename KVM_CAP_ARM_PTP_KVM to KVM_CAP_PTP_KVM as it
> should be arch agnostic.
> (4) add description for KVM_CAP_PTP_KVM in
> Documentation/virt/kvm/api.rst.
> (5) adjust dependency in Kconfig for ptp_kvm.
> (6) refine multi-arch process in driver/ptp/Makefile.
> (7) fix make pdfdocs htmldocs issue for ptp_kvm doc.
> (8) address other issues from comments in v14.
> (9) fold hypercall service of ptp_kvm as a function.
> (10) rebase to 5.10-rc3.
>
> from v13 to v14
> (1) rebase code on 5.9-rc3.
> (2) add a document to introduce implementation of PTP_KVM on arm64.
> (3) fix comments issue in hypercall.c.
> (4) export arm_smccc_1_1_get_conduit using EXPORT_SYMBOL_GPL.
> (5) fix make issue on x86 reported by kernel test robot.
>
> from v12 to v13:
> (1) rebase code on 5.8-rc1.
> (2) this patch set base on 2 patches of 1/8 and 2/8 from Will Decon.
> (3) remove the change to ptp device code of extend getcrosststamp.
> (4) remove the mechanism of letting user choose the counter type in
> ptp_kvm for arm64.
> (5) add virtual counter option in ptp_kvm service to let user choose the
> specific counter explicitly.
>
> from v11 to v12:
> (1) rebase code on 5.7-rc6 and rebase 2 patches from Will Decon
> including 1/11 and 2/11. as these patches introduce discover mechanism of
> vendor smccc service.
> (2) rebase ptp_kvm hypercall service from standard smccc to vendor
> smccc and add ptp_kvm to vendor smccc service discover mechanism.
> (3) add detail of why we need ptp_kvm and how ptp_kvm works in cover
> letter.
>
> from v10 to v11:
> (1) rebase code on 5.7-rc2.
> (2) remove support for arm32, as kvm support for arm32 will be removed
> [1]
> (3) add error report in ptp_kvm initialization.
>
> from v9 to v10:
> (1) change code base to v5.5.
> (2) enable ptp_kvm both for arm32 and arm64.
> (3) let user choose which of virtual counter or physical counter should
> return when using crosstimestamp mode of ptp_kvm for arm/arm64.
> (4) extend input argument for getcrosstimestamp API.
>
> from v8 to v9:
> (1) move ptp_kvm.h to driver/ptp/
> (2) replace license declaration of ptp_kvm.h the same with other header
> files in the same directory.
>
> from v7 to v8:
> (1) separate adding clocksource id for arm_arch_counter as a single patch.
> (2) update commit message for patch 4/8.
> (3) refine patch 7/8 and patch 8/8 to make them more independent.
>
> from v5 to v6:
> (1) apply Mark's patch[4] to get SMCCC conduit.
> (2) add mechanism to recognize current clocksource by add
> clocksouce_id value into struct clocksource instead of method in patch-v5.
> (3) rename kvm_arch_ptp_get_clock_fn into
> kvm_arch_ptp_get_crosststamp.
>
> from v4 to v5:
> (1) remove hvc delay compensasion as it should leave to userspace.
> (2) check current clocksource in hvc call service.
> (3) expose current clocksource by adding it to system_time_snapshot.
> (4) add helper to check if clocksource is arm_arch_counter.
> (5) rename kvm_ptp.c to ptp_kvm_common.c
>
> from v3 to v4:
> (1) fix clocksource of ptp_kvm to arch_sys_counter.
> (2) move kvm_arch_ptp_get_clock_fn into arm_arch_timer.c
> (3) subtract cntvoff before return cycles from host.
> (4) use ktime_get_snapshot instead of getnstimeofday and
> get_current_counterval to return time and counter value.
> (5) split ktime and counter into two 32-bit block respectively to avoid
> Y2038-safe issue.
> (6) set time compensation to device time as half of the delay of hvc call.
> (7) add ARM_ARCH_TIMER as dependency of ptp_kvm for arm64.
>
> from v2 to v3:
> (1) fix some issues in commit log.
> (2) add some receivers in send list.
>
> from v1 to v2:
> (1) move arch-specific code from arch/ to driver/ptp/
> (2) offer mechanism to inform userspace if ptp_kvm service is available.
> (3) separate ptp_kvm code for arm64 into hypervisor part and guest part.
> (4) add API to expose monotonic clock and counter value.
> (5) refine code: remove no necessary part and reconsitution.
>
> [1] https://patchwork.kernel.org/cover/11373351/
>
>
> Jianyong Wu (6):
> ptp: Reorganize ptp_kvm module to make it arch-independent.
> clocksource: Add clocksource id for arm arch counter
> arm64/kvm: Add hypercall service for kvm ptp.
> ptp: arm/arm64: Enable ptp_kvm for arm/arm64
> doc: add ptp_kvm introduction for arm64 support
> arm64: Add kvm capability check extension for ptp_kvm
>
> Thomas Gleixner (1):
> time: Add mechanism to recognize clocksource in time_get_snapshot
>
> Will Deacon (2):
> arm64: Probe for the presence of KVM hypervisor
> arm/arm64: KVM: Advertise KVM UID to guests via SMCCC
>
> Documentation/virt/kvm/api.rst | 9 ++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++
> arch/arm/kernel/setup.c | 1 +
> arch/arm64/kernel/setup.c | 1 +
> arch/arm64/kvm/arm.c | 1 +
> arch/arm64/kvm/hypercalls.c | 88 +++++++++++++++++--
> drivers/clocksource/arm_arch_timer.c | 30 +++++++
> drivers/firmware/smccc/smccc.c | 37 ++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 2 +
> drivers/ptp/ptp_kvm.h | 11 +++
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++
> drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +++++-------------
> drivers/ptp/ptp_kvm_x86.c | 95 +++++++++++++++++++++
> include/linux/arm-smccc.h | 60 +++++++++++++
> include/linux/clocksource.h | 6 ++
> include/linux/clocksource_ids.h | 12 +++
> include/linux/timekeeping.h | 12 +--
> include/uapi/linux/kvm.h | 1 +
> kernel/time/clocksource.c | 2 +
> kernel/time/timekeeping.c | 1 +
> 23 files changed, 488 insertions(+), 77 deletions(-) create mode 100644
> Documentation/virt/kvm/arm/ptp_kvm.rst
> create mode 100644 drivers/ptp/ptp_kvm.h create mode 100644
> drivers/ptp/ptp_kvm_arm.c rename drivers/ptp/{ptp_kvm.c =>
> ptp_kvm_common.c} (60%) create mode 100644
> drivers/ptp/ptp_kvm_x86.c create mode 100644
> include/linux/clocksource_ids.h
>
> --
> 2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-23 10:44 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:44 UTC (permalink / raw)
To: Jianyong Wu
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve.Capper, justin.he, nd
On 2020-11-11 06:22, Jianyong Wu wrote:
> ptp_kvm will get this service through SMCC call.
> The service offers wall time and cycle count of host to guest.
> The caller must specify whether they want the host cycle count
> or the difference between host cycle count and cntvoff.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
> include/linux/arm-smccc.h | 17 +++++++++++
> 2 files changed, 78 insertions(+)
>
> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> index b9d8607083eb..f7d189563f3d 100644
> --- a/arch/arm64/kvm/hypercalls.c
> +++ b/arch/arm64/kvm/hypercalls.c
> @@ -9,6 +9,51 @@
> #include <kvm/arm_hypercalls.h>
> #include <kvm/arm_psci.h>
>
> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
> +{
> + struct system_time_snapshot systime_snapshot;
> + u64 cycles = ~0UL;
> + u32 feature;
> +
> + /*
> + * system time and counter value must captured in the same
> + * time to keep consistency and precision.
> + */
> + ktime_get_snapshot(&systime_snapshot);
> +
> + // binding ptp_kvm clocksource to arm_arch_counter
> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> + return;
> +
> + val[0] = upper_32_bits(systime_snapshot.real);
> + val[1] = lower_32_bits(systime_snapshot.real);
What is the endianness of these values? I can't see it defined
anywhere, and this is likely not to work if guest and hypervisor
don't align.
> +
> + /*
> + * which of virtual counter or physical counter being
> + * asked for is decided by the r1 value of SMCCC
> + * call. If no invalid r1 value offered, default cycle
> + * value(-1) will be returned.
> + * Note: keep in mind that feature is u32 and smccc_get_arg1
> + * will return u64, so need auto cast here.
> + */
> + feature = smccc_get_arg1(vcpu);
> + switch (feature) {
> + case ARM_PTP_VIRT_COUNTER:
> + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> CNTVOFF_EL2);
> + break;
> + case ARM_PTP_PHY_COUNTER:
> + cycles = systime_snapshot.cycles;
> + break;
> + case ARM_PTP_NONE_COUNTER:
What is this "NONE" counter?
> + break;
> + default:
> + val[0] = SMCCC_RET_NOT_SUPPORTED;
> + break;
> + }
> + val[2] = upper_32_bits(cycles);
> + val[3] = lower_32_bits(cycles);
Same problem as above.
> +}
> +
> int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> {
> u32 func_id = smccc_get_function(vcpu);
> @@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> break;
> case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + break;
> + /*
> + * This serves virtual kvm_ptp.
> + * Four values will be passed back.
> + * reg0 stores high 32-bits of host ktime;
> + * reg1 stores low 32-bits of host ktime;
> + * For ARM_PTP_VIRT_COUNTER:
> + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> + * For ARM_PTP_PHY_COUNTER:
> + * reg2 stores the high 32-bits of host cycles;
> + * reg3 stores the low 32-bits of host cycles.
> + */
> + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> + kvm_ptp_get_time(vcpu, val);
> break;
> default:
> return kvm_psci_call(vcpu);
> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> index d75408141137..a03c5dd409d3 100644
> --- a/include/linux/arm-smccc.h
> +++ b/include/linux/arm-smccc.h
> @@ -103,6 +103,7 @@
>
> /* KVM "vendor specific" services */
> #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
I think having KVM once in the name is enough.
> #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> #define ARM_SMCCC_KVM_NUM_FUNCS 128
>
> @@ -114,6 +115,22 @@
>
> #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
>
> +/*
> + * ptp_kvm is a feature used for time sync between vm and host.
> + * ptp_kvm module in guest kernel will get service from host using
> + * this hypercall ID.
> + */
> +#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_FUNC_KVM_PTP)
> +
> +/* ptp_kvm counter type ID */
> +#define ARM_PTP_VIRT_COUNTER 0
> +#define ARM_PTP_PHY_COUNTER 1
> +#define ARM_PTP_NONE_COUNTER 2
The architecture definitely doesn't have this last counter.
> +
> /* Paravirtualised time calls (defined by ARM DEN0057A) */
> #define ARM_SMCCC_HV_PV_TIME_FEATURES \
> ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-23 10:44 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:44 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> ptp_kvm will get this service through SMCC call.
> The service offers wall time and cycle count of host to guest.
> The caller must specify whether they want the host cycle count
> or the difference between host cycle count and cntvoff.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
> include/linux/arm-smccc.h | 17 +++++++++++
> 2 files changed, 78 insertions(+)
>
> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> index b9d8607083eb..f7d189563f3d 100644
> --- a/arch/arm64/kvm/hypercalls.c
> +++ b/arch/arm64/kvm/hypercalls.c
> @@ -9,6 +9,51 @@
> #include <kvm/arm_hypercalls.h>
> #include <kvm/arm_psci.h>
>
> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
> +{
> + struct system_time_snapshot systime_snapshot;
> + u64 cycles = ~0UL;
> + u32 feature;
> +
> + /*
> + * system time and counter value must captured in the same
> + * time to keep consistency and precision.
> + */
> + ktime_get_snapshot(&systime_snapshot);
> +
> + // binding ptp_kvm clocksource to arm_arch_counter
> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> + return;
> +
> + val[0] = upper_32_bits(systime_snapshot.real);
> + val[1] = lower_32_bits(systime_snapshot.real);
What is the endianness of these values? I can't see it defined
anywhere, and this is likely not to work if guest and hypervisor
don't align.
> +
> + /*
> + * which of virtual counter or physical counter being
> + * asked for is decided by the r1 value of SMCCC
> + * call. If no invalid r1 value offered, default cycle
> + * value(-1) will be returned.
> + * Note: keep in mind that feature is u32 and smccc_get_arg1
> + * will return u64, so need auto cast here.
> + */
> + feature = smccc_get_arg1(vcpu);
> + switch (feature) {
> + case ARM_PTP_VIRT_COUNTER:
> + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> CNTVOFF_EL2);
> + break;
> + case ARM_PTP_PHY_COUNTER:
> + cycles = systime_snapshot.cycles;
> + break;
> + case ARM_PTP_NONE_COUNTER:
What is this "NONE" counter?
> + break;
> + default:
> + val[0] = SMCCC_RET_NOT_SUPPORTED;
> + break;
> + }
> + val[2] = upper_32_bits(cycles);
> + val[3] = lower_32_bits(cycles);
Same problem as above.
> +}
> +
> int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> {
> u32 func_id = smccc_get_function(vcpu);
> @@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> break;
> case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + break;
> + /*
> + * This serves virtual kvm_ptp.
> + * Four values will be passed back.
> + * reg0 stores high 32-bits of host ktime;
> + * reg1 stores low 32-bits of host ktime;
> + * For ARM_PTP_VIRT_COUNTER:
> + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> + * For ARM_PTP_PHY_COUNTER:
> + * reg2 stores the high 32-bits of host cycles;
> + * reg3 stores the low 32-bits of host cycles.
> + */
> + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> + kvm_ptp_get_time(vcpu, val);
> break;
> default:
> return kvm_psci_call(vcpu);
> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> index d75408141137..a03c5dd409d3 100644
> --- a/include/linux/arm-smccc.h
> +++ b/include/linux/arm-smccc.h
> @@ -103,6 +103,7 @@
>
> /* KVM "vendor specific" services */
> #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
I think having KVM once in the name is enough.
> #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> #define ARM_SMCCC_KVM_NUM_FUNCS 128
>
> @@ -114,6 +115,22 @@
>
> #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
>
> +/*
> + * ptp_kvm is a feature used for time sync between vm and host.
> + * ptp_kvm module in guest kernel will get service from host using
> + * this hypercall ID.
> + */
> +#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_FUNC_KVM_PTP)
> +
> +/* ptp_kvm counter type ID */
> +#define ARM_PTP_VIRT_COUNTER 0
> +#define ARM_PTP_PHY_COUNTER 1
> +#define ARM_PTP_NONE_COUNTER 2
The architecture definitely doesn't have this last counter.
> +
> /* Paravirtualised time calls (defined by ARM DEN0057A) */
> #define ARM_SMCCC_HV_PV_TIME_FEATURES \
> ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-23 10:44 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:44 UTC (permalink / raw)
To: Jianyong Wu
Cc: Mark.Rutland, justin.he, kvm, suzuki.poulose, netdev,
richardcochran, Steve.Capper, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> ptp_kvm will get this service through SMCC call.
> The service offers wall time and cycle count of host to guest.
> The caller must specify whether they want the host cycle count
> or the difference between host cycle count and cntvoff.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> arch/arm64/kvm/hypercalls.c | 61 +++++++++++++++++++++++++++++++++++++
> include/linux/arm-smccc.h | 17 +++++++++++
> 2 files changed, 78 insertions(+)
>
> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> index b9d8607083eb..f7d189563f3d 100644
> --- a/arch/arm64/kvm/hypercalls.c
> +++ b/arch/arm64/kvm/hypercalls.c
> @@ -9,6 +9,51 @@
> #include <kvm/arm_hypercalls.h>
> #include <kvm/arm_psci.h>
>
> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
> +{
> + struct system_time_snapshot systime_snapshot;
> + u64 cycles = ~0UL;
> + u32 feature;
> +
> + /*
> + * system time and counter value must captured in the same
> + * time to keep consistency and precision.
> + */
> + ktime_get_snapshot(&systime_snapshot);
> +
> + // binding ptp_kvm clocksource to arm_arch_counter
> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> + return;
> +
> + val[0] = upper_32_bits(systime_snapshot.real);
> + val[1] = lower_32_bits(systime_snapshot.real);
What is the endianness of these values? I can't see it defined
anywhere, and this is likely not to work if guest and hypervisor
don't align.
> +
> + /*
> + * which of virtual counter or physical counter being
> + * asked for is decided by the r1 value of SMCCC
> + * call. If no invalid r1 value offered, default cycle
> + * value(-1) will be returned.
> + * Note: keep in mind that feature is u32 and smccc_get_arg1
> + * will return u64, so need auto cast here.
> + */
> + feature = smccc_get_arg1(vcpu);
> + switch (feature) {
> + case ARM_PTP_VIRT_COUNTER:
> + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> CNTVOFF_EL2);
> + break;
> + case ARM_PTP_PHY_COUNTER:
> + cycles = systime_snapshot.cycles;
> + break;
> + case ARM_PTP_NONE_COUNTER:
What is this "NONE" counter?
> + break;
> + default:
> + val[0] = SMCCC_RET_NOT_SUPPORTED;
> + break;
> + }
> + val[2] = upper_32_bits(cycles);
> + val[3] = lower_32_bits(cycles);
Same problem as above.
> +}
> +
> int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> {
> u32 func_id = smccc_get_function(vcpu);
> @@ -79,6 +124,22 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> break;
> case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + break;
> + /*
> + * This serves virtual kvm_ptp.
> + * Four values will be passed back.
> + * reg0 stores high 32-bits of host ktime;
> + * reg1 stores low 32-bits of host ktime;
> + * For ARM_PTP_VIRT_COUNTER:
> + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> + * For ARM_PTP_PHY_COUNTER:
> + * reg2 stores the high 32-bits of host cycles;
> + * reg3 stores the low 32-bits of host cycles.
> + */
> + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> + kvm_ptp_get_time(vcpu, val);
> break;
> default:
> return kvm_psci_call(vcpu);
> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> index d75408141137..a03c5dd409d3 100644
> --- a/include/linux/arm-smccc.h
> +++ b/include/linux/arm-smccc.h
> @@ -103,6 +103,7 @@
>
> /* KVM "vendor specific" services */
> #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
I think having KVM once in the name is enough.
> #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> #define ARM_SMCCC_KVM_NUM_FUNCS 128
>
> @@ -114,6 +115,22 @@
>
> #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
>
> +/*
> + * ptp_kvm is a feature used for time sync between vm and host.
> + * ptp_kvm module in guest kernel will get service from host using
> + * this hypercall ID.
> + */
> +#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_FUNC_KVM_PTP)
> +
> +/* ptp_kvm counter type ID */
> +#define ARM_PTP_VIRT_COUNTER 0
> +#define ARM_PTP_PHY_COUNTER 1
> +#define ARM_PTP_NONE_COUNTER 2
The architecture definitely doesn't have this last counter.
> +
> /* Paravirtualised time calls (defined by ARM DEN0057A) */
> #define ARM_SMCCC_HV_PV_TIME_FEATURES \
> ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-23 10:49 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:49 UTC (permalink / raw)
To: Jianyong Wu
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve.Capper, justin.he, nd
On 2020-11-11 06:22, Jianyong Wu wrote:
> Currently, there is no mechanism to keep time sync between guest and
> host
> in arm/arm64 virtualization environment. Time in guest will drift
> compared
> with host after boot up as they may both use third party time sources
> to correct their time respectively. The time deviation will be in order
> of milliseconds. But in some scenarios,like in cloud envirenment, we
> ask
environment
> for higher time precision.
>
> kvm ptp clock, which chooses the host clock source as a reference
> clock to sync time between guest and host, has been adopted by x86
> which takes the time sync order from milliseconds to nanoseconds.
>
> This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> precison
precision
> significantly.
>
> Test result comparisons between with kvm ptp clock and without it in
> arm/arm64
> are as follows. This test derived from the result of command 'chronyc
> sources'. we should take more care of the last sample column which
> shows
> the offset between the local clock and the source at the last
> measurement.
>
> no kvm ptp in guest:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> 21ms
>
> in host:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> 17ms
>
> The dns1.synet.edu.cn is the network reference clock for guest and
> 120.25.115.20 is the network reference clock for host. we can't get the
> clock error between guest and host directly, but a roughly estimated
> value
> will be in order of hundreds of us to ms.
>
> with kvm ptp in guest:
> chrony has been disabled in host to remove the disturb by network
> clock.
>
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> 3ns
> * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> 3ns
> * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> 6ns
> * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> 5ns
> * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> 4ns
> * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> 6ns
> * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> 4ns
> * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> 4ns
>
> The PHC0 is the ptp clock which choose the host clock as its source
> clock. So we can see that the clock difference between host and guest
> is in order of ns.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 1 +
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+), 1 deletion(-)
> create mode 100644 drivers/ptp/ptp_kvm_arm.c
>
> diff --git a/drivers/clocksource/arm_arch_timer.c
> b/drivers/clocksource/arm_arch_timer.c
> index d55acffb0b90..b33c5a663d30 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -25,6 +25,7 @@
> #include <linux/sched/clock.h>
> #include <linux/sched_clock.h>
> #include <linux/acpi.h>
> +#include <linux/arm-smccc.h>
>
> #include <asm/arch_timer.h>
> #include <asm/virt.h>
> @@ -1650,3 +1651,30 @@ 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
> +
> +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> + struct clocksource **cs)
> +{
> + struct arm_smccc_res hvc_res;
> + ktime_t ktime;
> + u32 ptp_counter;
> +
> + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> + ptp_counter = ARM_PTP_VIRT_COUNTER;
> + else
> + ptp_counter = ARM_PTP_PHY_COUNTER;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ptp_counter, &hvc_res);
> +
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> + *ts = ktime_to_timespec64(ktime);
> + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
Endianness.
> + *cs = &clocksource_counter;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
> index 942f72d8151d..677c7f696b70 100644
> --- a/drivers/ptp/Kconfig
> +++ b/drivers/ptp/Kconfig
> @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
> config PTP_1588_CLOCK_KVM
> tristate "KVM virtual PTP clock"
> depends on PTP_1588_CLOCK
> - depends on KVM_GUEST && X86
> + depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY &&
> ARM_ARCH_TIMER)
> default y
> help
> This driver adds support for using kvm infrastructure as a PTP
> diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
> index 699a4e4d19c2..9fa5ede44b2b 100644
> --- a/drivers/ptp/Makefile
> +++ b/drivers/ptp/Makefile
> @@ -5,6 +5,7 @@
>
> ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
> ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
> +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
> obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
> new file mode 100644
> index 000000000000..2212827c0384
> --- /dev/null
> +++ b/drivers/ptp/ptp_kvm_arm.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Virtual PTP 1588 clock for use with KVM guests
> + * Copyright (C) 2019 ARM Ltd.
> + * All Rights Reserved
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/err.h>
> +#include <asm/hypervisor.h>
> +#include <linux/module.h>
> +#include <linux/psci.h>
> +#include <linux/arm-smccc.h>
> +#include <linux/timecounter.h>
> +#include <linux/sched/clock.h>
> +#include <asm/arch_timer.h>
> +#include <asm/hypervisor.h>
> +
> +int kvm_arch_ptp_init(void)
> +{
> + int ret;
> +
> + ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + if (ret <= 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> +}
> +
> +int kvm_arch_ptp_get_clock(struct timespec64 *ts)
> +{
> + ktime_t ktime;
> + struct arm_smccc_res hvc_res;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ARM_PTP_NONE_COUNTER, &hvc_res);
I really don't see the need to use a non-architectural counter ID.
Using the virtual counter ID should just be fine, and shouldn't
lead to any issue.
Am I missing something?
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
Endianness.
> + *ts = ktime_to_timespec64(ktime);
> +
> + return 0;
> +}
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-23 10:49 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:49 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> Currently, there is no mechanism to keep time sync between guest and
> host
> in arm/arm64 virtualization environment. Time in guest will drift
> compared
> with host after boot up as they may both use third party time sources
> to correct their time respectively. The time deviation will be in order
> of milliseconds. But in some scenarios,like in cloud envirenment, we
> ask
environment
> for higher time precision.
>
> kvm ptp clock, which chooses the host clock source as a reference
> clock to sync time between guest and host, has been adopted by x86
> which takes the time sync order from milliseconds to nanoseconds.
>
> This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> precison
precision
> significantly.
>
> Test result comparisons between with kvm ptp clock and without it in
> arm/arm64
> are as follows. This test derived from the result of command 'chronyc
> sources'. we should take more care of the last sample column which
> shows
> the offset between the local clock and the source at the last
> measurement.
>
> no kvm ptp in guest:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> 21ms
>
> in host:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> 17ms
>
> The dns1.synet.edu.cn is the network reference clock for guest and
> 120.25.115.20 is the network reference clock for host. we can't get the
> clock error between guest and host directly, but a roughly estimated
> value
> will be in order of hundreds of us to ms.
>
> with kvm ptp in guest:
> chrony has been disabled in host to remove the disturb by network
> clock.
>
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> 3ns
> * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> 3ns
> * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> 6ns
> * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> 5ns
> * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> 4ns
> * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> 6ns
> * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> 4ns
> * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> 4ns
>
> The PHC0 is the ptp clock which choose the host clock as its source
> clock. So we can see that the clock difference between host and guest
> is in order of ns.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 1 +
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+), 1 deletion(-)
> create mode 100644 drivers/ptp/ptp_kvm_arm.c
>
> diff --git a/drivers/clocksource/arm_arch_timer.c
> b/drivers/clocksource/arm_arch_timer.c
> index d55acffb0b90..b33c5a663d30 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -25,6 +25,7 @@
> #include <linux/sched/clock.h>
> #include <linux/sched_clock.h>
> #include <linux/acpi.h>
> +#include <linux/arm-smccc.h>
>
> #include <asm/arch_timer.h>
> #include <asm/virt.h>
> @@ -1650,3 +1651,30 @@ 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
> +
> +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> + struct clocksource **cs)
> +{
> + struct arm_smccc_res hvc_res;
> + ktime_t ktime;
> + u32 ptp_counter;
> +
> + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> + ptp_counter = ARM_PTP_VIRT_COUNTER;
> + else
> + ptp_counter = ARM_PTP_PHY_COUNTER;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ptp_counter, &hvc_res);
> +
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> + *ts = ktime_to_timespec64(ktime);
> + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
Endianness.
> + *cs = &clocksource_counter;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
> index 942f72d8151d..677c7f696b70 100644
> --- a/drivers/ptp/Kconfig
> +++ b/drivers/ptp/Kconfig
> @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
> config PTP_1588_CLOCK_KVM
> tristate "KVM virtual PTP clock"
> depends on PTP_1588_CLOCK
> - depends on KVM_GUEST && X86
> + depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY &&
> ARM_ARCH_TIMER)
> default y
> help
> This driver adds support for using kvm infrastructure as a PTP
> diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
> index 699a4e4d19c2..9fa5ede44b2b 100644
> --- a/drivers/ptp/Makefile
> +++ b/drivers/ptp/Makefile
> @@ -5,6 +5,7 @@
>
> ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
> ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
> +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
> obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
> new file mode 100644
> index 000000000000..2212827c0384
> --- /dev/null
> +++ b/drivers/ptp/ptp_kvm_arm.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Virtual PTP 1588 clock for use with KVM guests
> + * Copyright (C) 2019 ARM Ltd.
> + * All Rights Reserved
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/err.h>
> +#include <asm/hypervisor.h>
> +#include <linux/module.h>
> +#include <linux/psci.h>
> +#include <linux/arm-smccc.h>
> +#include <linux/timecounter.h>
> +#include <linux/sched/clock.h>
> +#include <asm/arch_timer.h>
> +#include <asm/hypervisor.h>
> +
> +int kvm_arch_ptp_init(void)
> +{
> + int ret;
> +
> + ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + if (ret <= 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> +}
> +
> +int kvm_arch_ptp_get_clock(struct timespec64 *ts)
> +{
> + ktime_t ktime;
> + struct arm_smccc_res hvc_res;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ARM_PTP_NONE_COUNTER, &hvc_res);
I really don't see the need to use a non-architectural counter ID.
Using the virtual counter ID should just be fine, and shouldn't
lead to any issue.
Am I missing something?
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
Endianness.
> + *ts = ktime_to_timespec64(ktime);
> +
> + return 0;
> +}
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-23 10:49 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:49 UTC (permalink / raw)
To: Jianyong Wu
Cc: Mark.Rutland, justin.he, kvm, suzuki.poulose, netdev,
richardcochran, Steve.Capper, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> Currently, there is no mechanism to keep time sync between guest and
> host
> in arm/arm64 virtualization environment. Time in guest will drift
> compared
> with host after boot up as they may both use third party time sources
> to correct their time respectively. The time deviation will be in order
> of milliseconds. But in some scenarios,like in cloud envirenment, we
> ask
environment
> for higher time precision.
>
> kvm ptp clock, which chooses the host clock source as a reference
> clock to sync time between guest and host, has been adopted by x86
> which takes the time sync order from milliseconds to nanoseconds.
>
> This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> precison
precision
> significantly.
>
> Test result comparisons between with kvm ptp clock and without it in
> arm/arm64
> are as follows. This test derived from the result of command 'chronyc
> sources'. we should take more care of the last sample column which
> shows
> the offset between the local clock and the source at the last
> measurement.
>
> no kvm ptp in guest:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> 21ms
> ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> 21ms
>
> in host:
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> 18ms
> ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> 17ms
> ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> 17ms
>
> The dns1.synet.edu.cn is the network reference clock for guest and
> 120.25.115.20 is the network reference clock for host. we can't get the
> clock error between guest and host directly, but a roughly estimated
> value
> will be in order of hundreds of us to ms.
>
> with kvm ptp in guest:
> chrony has been disabled in host to remove the disturb by network
> clock.
>
> MS Name/IP address Stratum Poll Reach LastRx Last sample
> ========================================================================
> * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> 3ns
> * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> 3ns
> * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> 6ns
> * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> 5ns
> * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> 4ns
> * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> 4ns
> * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> 6ns
> * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> 4ns
> * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> 4ns
>
> The PHC0 is the ptp clock which choose the host clock as its source
> clock. So we can see that the clock difference between host and guest
> is in order of ns.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> drivers/ptp/Kconfig | 2 +-
> drivers/ptp/Makefile | 1 +
> drivers/ptp/ptp_kvm_arm.c | 44 ++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+), 1 deletion(-)
> create mode 100644 drivers/ptp/ptp_kvm_arm.c
>
> diff --git a/drivers/clocksource/arm_arch_timer.c
> b/drivers/clocksource/arm_arch_timer.c
> index d55acffb0b90..b33c5a663d30 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -25,6 +25,7 @@
> #include <linux/sched/clock.h>
> #include <linux/sched_clock.h>
> #include <linux/acpi.h>
> +#include <linux/arm-smccc.h>
>
> #include <asm/arch_timer.h>
> #include <asm/virt.h>
> @@ -1650,3 +1651,30 @@ 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
> +
> +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> + struct clocksource **cs)
> +{
> + struct arm_smccc_res hvc_res;
> + ktime_t ktime;
> + u32 ptp_counter;
> +
> + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> + ptp_counter = ARM_PTP_VIRT_COUNTER;
> + else
> + ptp_counter = ARM_PTP_PHY_COUNTER;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ptp_counter, &hvc_res);
> +
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> + *ts = ktime_to_timespec64(ktime);
> + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
Endianness.
> + *cs = &clocksource_counter;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
> index 942f72d8151d..677c7f696b70 100644
> --- a/drivers/ptp/Kconfig
> +++ b/drivers/ptp/Kconfig
> @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH
> config PTP_1588_CLOCK_KVM
> tristate "KVM virtual PTP clock"
> depends on PTP_1588_CLOCK
> - depends on KVM_GUEST && X86
> + depends on KVM_GUEST && X86 || (HAVE_ARM_SMCCC_DISCOVERY &&
> ARM_ARCH_TIMER)
> default y
> help
> This driver adds support for using kvm infrastructure as a PTP
> diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile
> index 699a4e4d19c2..9fa5ede44b2b 100644
> --- a/drivers/ptp/Makefile
> +++ b/drivers/ptp/Makefile
> @@ -5,6 +5,7 @@
>
> ptp-y := ptp_clock.o ptp_chardev.o ptp_sysfs.o
> ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o ptp_kvm_common.o
> +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o ptp_kvm_common.o
> obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c
> new file mode 100644
> index 000000000000..2212827c0384
> --- /dev/null
> +++ b/drivers/ptp/ptp_kvm_arm.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Virtual PTP 1588 clock for use with KVM guests
> + * Copyright (C) 2019 ARM Ltd.
> + * All Rights Reserved
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/err.h>
> +#include <asm/hypervisor.h>
> +#include <linux/module.h>
> +#include <linux/psci.h>
> +#include <linux/arm-smccc.h>
> +#include <linux/timecounter.h>
> +#include <linux/sched/clock.h>
> +#include <asm/arch_timer.h>
> +#include <asm/hypervisor.h>
> +
> +int kvm_arch_ptp_init(void)
> +{
> + int ret;
> +
> + ret = kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> + if (ret <= 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> +}
> +
> +int kvm_arch_ptp_get_clock(struct timespec64 *ts)
> +{
> + ktime_t ktime;
> + struct arm_smccc_res hvc_res;
> +
> + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID,
> + ARM_PTP_NONE_COUNTER, &hvc_res);
I really don't see the need to use a non-architectural counter ID.
Using the virtual counter ID should just be fine, and shouldn't
lead to any issue.
Am I missing something?
> + if ((int)(hvc_res.a0) < 0)
> + return -EOPNOTSUPP;
> +
> + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
Endianness.
> + *ts = ktime_to_timespec64(ktime);
> +
> + return 0;
> +}
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
2020-11-11 6:22 ` Jianyong Wu
(?)
@ 2020-11-23 10:58 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:58 UTC (permalink / raw)
To: Jianyong Wu
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark.Rutland, will,
suzuki.poulose, Andre.Przywara, steven.price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve.Capper, justin.he, nd
On 2020-11-11 06:22, Jianyong Wu wrote:
> PTP_KVM implementation depends on hypercall using SMCCC. So we
> introduce a new SMCCC service ID. This doc explains how does the
> ID define and how does PTP_KVM works on arm/arm64.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> Documentation/virt/kvm/api.rst | 9 +++++++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
>
> diff --git a/Documentation/virt/kvm/api.rst
> b/Documentation/virt/kvm/api.rst
> index 36d5f1f3c6dd..9843dbcbf770 100644
> --- a/Documentation/virt/kvm/api.rst
> +++ b/Documentation/virt/kvm/api.rst
> @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> features provided to the
> guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
> (0x40000001). Otherwise, a guest may use the paravirtual features
> regardless of what has actually been exposed through the CPUID leaf.
> +
> +8.27 KVM_CAP_PTP_KVM
> +--------------------
> +
> +:Architectures: arm64
> +
> +This capability indicates that KVM virtual PTP service is supported in
> host.
> +It must company with the implementation of KVM virtual PTP service in
> host
> +so VMM can probe if there is the service in host by checking this
> capability.
> diff --git a/Documentation/virt/kvm/arm/index.rst
> b/Documentation/virt/kvm/arm/index.rst
> index 3e2b2aba90fc..78a9b670aafe 100644
> --- a/Documentation/virt/kvm/arm/index.rst
> +++ b/Documentation/virt/kvm/arm/index.rst
> @@ -10,3 +10,4 @@ ARM
> hyp-abi
> psci
> pvtime
> + ptp_kvm
> diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> b/Documentation/virt/kvm/arm/ptp_kvm.rst
> new file mode 100644
> index 000000000000..bb1e6cfefe44
> --- /dev/null
> +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> @@ -0,0 +1,29 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +PTP_KVM support for arm/arm64
> +=============================
> +
> +PTP_KVM is used for time sync between guest and host in a high
> precision.
> +It needs to get the wall time and counter value from the host and
> transfer these
> +to guest via hypercall service. So one more hypercall service has been
> added.
> +
> +This new SMCCC hypercall is defined as:
> +
> +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> +
> +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> SMC32/HVC32
> +calling convention.
> +
> +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> +
> + ============= ========== ==========
> + Function ID: (uint32) 0x86000001
> + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> ARM_PTP_VIRT_COUNTER(0)
> + which indicate acquiring physical
> counter or
> + virtual counter respectively.
> + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> represent
> + wall clock time and val2 and val3
> represent
> + counter cycle.
This needs a lot more description:
- Which word contains what part of the data (upper/lower part of the
64bit data)
- The endianness of the data returned
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-23 10:58 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:58 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> PTP_KVM implementation depends on hypercall using SMCCC. So we
> introduce a new SMCCC service ID. This doc explains how does the
> ID define and how does PTP_KVM works on arm/arm64.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> Documentation/virt/kvm/api.rst | 9 +++++++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
>
> diff --git a/Documentation/virt/kvm/api.rst
> b/Documentation/virt/kvm/api.rst
> index 36d5f1f3c6dd..9843dbcbf770 100644
> --- a/Documentation/virt/kvm/api.rst
> +++ b/Documentation/virt/kvm/api.rst
> @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> features provided to the
> guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
> (0x40000001). Otherwise, a guest may use the paravirtual features
> regardless of what has actually been exposed through the CPUID leaf.
> +
> +8.27 KVM_CAP_PTP_KVM
> +--------------------
> +
> +:Architectures: arm64
> +
> +This capability indicates that KVM virtual PTP service is supported in
> host.
> +It must company with the implementation of KVM virtual PTP service in
> host
> +so VMM can probe if there is the service in host by checking this
> capability.
> diff --git a/Documentation/virt/kvm/arm/index.rst
> b/Documentation/virt/kvm/arm/index.rst
> index 3e2b2aba90fc..78a9b670aafe 100644
> --- a/Documentation/virt/kvm/arm/index.rst
> +++ b/Documentation/virt/kvm/arm/index.rst
> @@ -10,3 +10,4 @@ ARM
> hyp-abi
> psci
> pvtime
> + ptp_kvm
> diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> b/Documentation/virt/kvm/arm/ptp_kvm.rst
> new file mode 100644
> index 000000000000..bb1e6cfefe44
> --- /dev/null
> +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> @@ -0,0 +1,29 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +PTP_KVM support for arm/arm64
> +=============================
> +
> +PTP_KVM is used for time sync between guest and host in a high
> precision.
> +It needs to get the wall time and counter value from the host and
> transfer these
> +to guest via hypercall service. So one more hypercall service has been
> added.
> +
> +This new SMCCC hypercall is defined as:
> +
> +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> +
> +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> SMC32/HVC32
> +calling convention.
> +
> +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> +
> + ============= ========== ==========
> + Function ID: (uint32) 0x86000001
> + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> ARM_PTP_VIRT_COUNTER(0)
> + which indicate acquiring physical
> counter or
> + virtual counter respectively.
> + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> represent
> + wall clock time and val2 and val3
> represent
> + counter cycle.
This needs a lot more description:
- Which word contains what part of the data (upper/lower part of the
64bit data)
- The endianness of the data returned
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-23 10:58 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 10:58 UTC (permalink / raw)
To: Jianyong Wu
Cc: Mark.Rutland, justin.he, kvm, suzuki.poulose, netdev,
richardcochran, Steve.Capper, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-11 06:22, Jianyong Wu wrote:
> PTP_KVM implementation depends on hypercall using SMCCC. So we
> introduce a new SMCCC service ID. This doc explains how does the
> ID define and how does PTP_KVM works on arm/arm64.
>
> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> ---
> Documentation/virt/kvm/api.rst | 9 +++++++
> Documentation/virt/kvm/arm/index.rst | 1 +
> Documentation/virt/kvm/arm/ptp_kvm.rst | 29 +++++++++++++++++++++
> Documentation/virt/kvm/timekeeping.rst | 35 ++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
>
> diff --git a/Documentation/virt/kvm/api.rst
> b/Documentation/virt/kvm/api.rst
> index 36d5f1f3c6dd..9843dbcbf770 100644
> --- a/Documentation/virt/kvm/api.rst
> +++ b/Documentation/virt/kvm/api.rst
> @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> features provided to the
> guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf
> (0x40000001). Otherwise, a guest may use the paravirtual features
> regardless of what has actually been exposed through the CPUID leaf.
> +
> +8.27 KVM_CAP_PTP_KVM
> +--------------------
> +
> +:Architectures: arm64
> +
> +This capability indicates that KVM virtual PTP service is supported in
> host.
> +It must company with the implementation of KVM virtual PTP service in
> host
> +so VMM can probe if there is the service in host by checking this
> capability.
> diff --git a/Documentation/virt/kvm/arm/index.rst
> b/Documentation/virt/kvm/arm/index.rst
> index 3e2b2aba90fc..78a9b670aafe 100644
> --- a/Documentation/virt/kvm/arm/index.rst
> +++ b/Documentation/virt/kvm/arm/index.rst
> @@ -10,3 +10,4 @@ ARM
> hyp-abi
> psci
> pvtime
> + ptp_kvm
> diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> b/Documentation/virt/kvm/arm/ptp_kvm.rst
> new file mode 100644
> index 000000000000..bb1e6cfefe44
> --- /dev/null
> +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> @@ -0,0 +1,29 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +PTP_KVM support for arm/arm64
> +=============================
> +
> +PTP_KVM is used for time sync between guest and host in a high
> precision.
> +It needs to get the wall time and counter value from the host and
> transfer these
> +to guest via hypercall service. So one more hypercall service has been
> added.
> +
> +This new SMCCC hypercall is defined as:
> +
> +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> +
> +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> SMC32/HVC32
> +calling convention.
> +
> +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> +
> + ============= ========== ==========
> + Function ID: (uint32) 0x86000001
> + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> ARM_PTP_VIRT_COUNTER(0)
> + which indicate acquiring physical
> counter or
> + virtual counter respectively.
> + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> represent
> + wall clock time and val2 and val3
> represent
> + counter cycle.
This needs a lot more description:
- Which word contains what part of the data (upper/lower part of the
64bit data)
- The endianness of the data returned
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-23 10:44 ` Marc Zyngier
(?)
@ 2020-11-23 11:59 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 11:59 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, steven.price, Andre.Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-23 10:44, Marc Zyngier wrote:
> On 2020-11-11 06:22, Jianyong Wu wrote:
>> ptp_kvm will get this service through SMCC call.
>> The service offers wall time and cycle count of host to guest.
>> The caller must specify whether they want the host cycle count
>> or the difference between host cycle count and cntvoff.
>>
>> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
>> ---
>> arch/arm64/kvm/hypercalls.c | 61
>> +++++++++++++++++++++++++++++++++++++
>> include/linux/arm-smccc.h | 17 +++++++++++
>> 2 files changed, 78 insertions(+)
>>
>> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
>> index b9d8607083eb..f7d189563f3d 100644
>> --- a/arch/arm64/kvm/hypercalls.c
>> +++ b/arch/arm64/kvm/hypercalls.c
>> @@ -9,6 +9,51 @@
>> #include <kvm/arm_hypercalls.h>
>> #include <kvm/arm_psci.h>
>>
>> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
>> +{
>> + struct system_time_snapshot systime_snapshot;
>> + u64 cycles = ~0UL;
>> + u32 feature;
>> +
>> + /*
>> + * system time and counter value must captured in the same
>> + * time to keep consistency and precision.
>> + */
>> + ktime_get_snapshot(&systime_snapshot);
>> +
>> + // binding ptp_kvm clocksource to arm_arch_counter
>> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
>> + return;
>> +
>> + val[0] = upper_32_bits(systime_snapshot.real);
>> + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined
> anywhere, and this is likely not to work if guest and hypervisor
> don't align.
Scratch that. This is all passed via registers, so the endianness
of the data is irrelevant. Please discard any comment about endianness
I made in this review.
The documentation aspect still requires to be beefed up.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-23 11:59 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 11:59 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, yangbo.lu, linux-kernel,
sean.j.christopherson, steven.price, john.stultz, Andre.Przywara,
pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-23 10:44, Marc Zyngier wrote:
> On 2020-11-11 06:22, Jianyong Wu wrote:
>> ptp_kvm will get this service through SMCC call.
>> The service offers wall time and cycle count of host to guest.
>> The caller must specify whether they want the host cycle count
>> or the difference between host cycle count and cntvoff.
>>
>> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
>> ---
>> arch/arm64/kvm/hypercalls.c | 61
>> +++++++++++++++++++++++++++++++++++++
>> include/linux/arm-smccc.h | 17 +++++++++++
>> 2 files changed, 78 insertions(+)
>>
>> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
>> index b9d8607083eb..f7d189563f3d 100644
>> --- a/arch/arm64/kvm/hypercalls.c
>> +++ b/arch/arm64/kvm/hypercalls.c
>> @@ -9,6 +9,51 @@
>> #include <kvm/arm_hypercalls.h>
>> #include <kvm/arm_psci.h>
>>
>> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
>> +{
>> + struct system_time_snapshot systime_snapshot;
>> + u64 cycles = ~0UL;
>> + u32 feature;
>> +
>> + /*
>> + * system time and counter value must captured in the same
>> + * time to keep consistency and precision.
>> + */
>> + ktime_get_snapshot(&systime_snapshot);
>> +
>> + // binding ptp_kvm clocksource to arm_arch_counter
>> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
>> + return;
>> +
>> + val[0] = upper_32_bits(systime_snapshot.real);
>> + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined
> anywhere, and this is likely not to work if guest and hypervisor
> don't align.
Scratch that. This is all passed via registers, so the endianness
of the data is irrelevant. Please discard any comment about endianness
I made in this review.
The documentation aspect still requires to be beefed up.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-23 11:59 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-23 11:59 UTC (permalink / raw)
To: Jianyong Wu
Cc: justin.he, kvm, netdev, richardcochran, yangbo.lu, linux-kernel,
sean.j.christopherson, steven.price, john.stultz, Andre.Przywara,
pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-23 10:44, Marc Zyngier wrote:
> On 2020-11-11 06:22, Jianyong Wu wrote:
>> ptp_kvm will get this service through SMCC call.
>> The service offers wall time and cycle count of host to guest.
>> The caller must specify whether they want the host cycle count
>> or the difference between host cycle count and cntvoff.
>>
>> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
>> ---
>> arch/arm64/kvm/hypercalls.c | 61
>> +++++++++++++++++++++++++++++++++++++
>> include/linux/arm-smccc.h | 17 +++++++++++
>> 2 files changed, 78 insertions(+)
>>
>> diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
>> index b9d8607083eb..f7d189563f3d 100644
>> --- a/arch/arm64/kvm/hypercalls.c
>> +++ b/arch/arm64/kvm/hypercalls.c
>> @@ -9,6 +9,51 @@
>> #include <kvm/arm_hypercalls.h>
>> #include <kvm/arm_psci.h>
>>
>> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val)
>> +{
>> + struct system_time_snapshot systime_snapshot;
>> + u64 cycles = ~0UL;
>> + u32 feature;
>> +
>> + /*
>> + * system time and counter value must captured in the same
>> + * time to keep consistency and precision.
>> + */
>> + ktime_get_snapshot(&systime_snapshot);
>> +
>> + // binding ptp_kvm clocksource to arm_arch_counter
>> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
>> + return;
>> +
>> + val[0] = upper_32_bits(systime_snapshot.real);
>> + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined
> anywhere, and this is likely not to work if guest and hypervisor
> don't align.
Scratch that. This is all passed via registers, so the endianness
of the data is irrelevant. Please discard any comment about endianness
I made in this review.
The documentation aspect still requires to be beefed up.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-23 11:59 ` Marc Zyngier
(?)
@ 2020-11-24 5:11 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:11 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 7:59 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: Justin He <Justin.He@arm.com>; kvm@vger.kernel.org;
> netdev@vger.kernel.org; richardcochran@gmail.com; linux-
> kernel@vger.kernel.org; sean.j.christopherson@intel.com; Steven Price
> <Steven.Price@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> john.stultz@linaro.org; yangbo.lu@nxp.com; pbonzini@redhat.com;
> tglx@linutronix.de; nd <nd@arm.com>; will@kernel.org;
> kvmarm@lists.cs.columbia.edu; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-23 10:44, Marc Zyngier wrote:
> > On 2020-11-11 06:22, Jianyong Wu wrote:
> >> ptp_kvm will get this service through SMCC call.
> >> The service offers wall time and cycle count of host to guest.
> >> The caller must specify whether they want the host cycle count or the
> >> difference between host cycle count and cntvoff.
> >>
> >> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> >> ---
> >> arch/arm64/kvm/hypercalls.c | 61
> >> +++++++++++++++++++++++++++++++++++++
> >> include/linux/arm-smccc.h | 17 +++++++++++
> >> 2 files changed, 78 insertions(+)
> >>
> >> diff --git a/arch/arm64/kvm/hypercalls.c
> >> b/arch/arm64/kvm/hypercalls.c index b9d8607083eb..f7d189563f3d
> 100644
> >> --- a/arch/arm64/kvm/hypercalls.c
> >> +++ b/arch/arm64/kvm/hypercalls.c
> >> @@ -9,6 +9,51 @@
> >> #include <kvm/arm_hypercalls.h>
> >> #include <kvm/arm_psci.h>
> >>
> >> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> >> + struct system_time_snapshot systime_snapshot;
> >> + u64 cycles = ~0UL;
> >> + u32 feature;
> >> +
> >> + /*
> >> + * system time and counter value must captured in the same
> >> + * time to keep consistency and precision.
> >> + */
> >> + ktime_get_snapshot(&systime_snapshot);
> >> +
> >> + // binding ptp_kvm clocksource to arm_arch_counter
> >> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> >> + return;
> >> +
> >> + val[0] = upper_32_bits(systime_snapshot.real);
> >> + val[1] = lower_32_bits(systime_snapshot.real);
> >
> > What is the endianness of these values? I can't see it defined
> > anywhere, and this is likely not to work if guest and hypervisor don't
> > align.
>
> Scratch that. This is all passed via registers, so the endianness of the data is
> irrelevant. Please discard any comment about endianness I made in this
> review.
>
Yeah, these data process and transfer are no relationship with endianness. Thanks.
> The documentation aspect still requires to be beefed up.
So the endianness description will be "no endianness restriction".
Thanks
Jianyong
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 5:11 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:11 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, yangbo.lu, linux-kernel,
sean.j.christopherson, Steven Price, john.stultz, Andre Przywara,
pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 7:59 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: Justin He <Justin.He@arm.com>; kvm@vger.kernel.org;
> netdev@vger.kernel.org; richardcochran@gmail.com; linux-
> kernel@vger.kernel.org; sean.j.christopherson@intel.com; Steven Price
> <Steven.Price@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> john.stultz@linaro.org; yangbo.lu@nxp.com; pbonzini@redhat.com;
> tglx@linutronix.de; nd <nd@arm.com>; will@kernel.org;
> kvmarm@lists.cs.columbia.edu; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-23 10:44, Marc Zyngier wrote:
> > On 2020-11-11 06:22, Jianyong Wu wrote:
> >> ptp_kvm will get this service through SMCC call.
> >> The service offers wall time and cycle count of host to guest.
> >> The caller must specify whether they want the host cycle count or the
> >> difference between host cycle count and cntvoff.
> >>
> >> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> >> ---
> >> arch/arm64/kvm/hypercalls.c | 61
> >> +++++++++++++++++++++++++++++++++++++
> >> include/linux/arm-smccc.h | 17 +++++++++++
> >> 2 files changed, 78 insertions(+)
> >>
> >> diff --git a/arch/arm64/kvm/hypercalls.c
> >> b/arch/arm64/kvm/hypercalls.c index b9d8607083eb..f7d189563f3d
> 100644
> >> --- a/arch/arm64/kvm/hypercalls.c
> >> +++ b/arch/arm64/kvm/hypercalls.c
> >> @@ -9,6 +9,51 @@
> >> #include <kvm/arm_hypercalls.h>
> >> #include <kvm/arm_psci.h>
> >>
> >> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> >> + struct system_time_snapshot systime_snapshot;
> >> + u64 cycles = ~0UL;
> >> + u32 feature;
> >> +
> >> + /*
> >> + * system time and counter value must captured in the same
> >> + * time to keep consistency and precision.
> >> + */
> >> + ktime_get_snapshot(&systime_snapshot);
> >> +
> >> + // binding ptp_kvm clocksource to arm_arch_counter
> >> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> >> + return;
> >> +
> >> + val[0] = upper_32_bits(systime_snapshot.real);
> >> + val[1] = lower_32_bits(systime_snapshot.real);
> >
> > What is the endianness of these values? I can't see it defined
> > anywhere, and this is likely not to work if guest and hypervisor don't
> > align.
>
> Scratch that. This is all passed via registers, so the endianness of the data is
> irrelevant. Please discard any comment about endianness I made in this
> review.
>
Yeah, these data process and transfer are no relationship with endianness. Thanks.
> The documentation aspect still requires to be beefed up.
So the endianness description will be "no endianness restriction".
Thanks
Jianyong
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 5:11 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:11 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, yangbo.lu, linux-kernel,
sean.j.christopherson, Steven Price, john.stultz, Andre Przywara,
pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 7:59 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: Justin He <Justin.He@arm.com>; kvm@vger.kernel.org;
> netdev@vger.kernel.org; richardcochran@gmail.com; linux-
> kernel@vger.kernel.org; sean.j.christopherson@intel.com; Steven Price
> <Steven.Price@arm.com>; Andre Przywara <Andre.Przywara@arm.com>;
> john.stultz@linaro.org; yangbo.lu@nxp.com; pbonzini@redhat.com;
> tglx@linutronix.de; nd <nd@arm.com>; will@kernel.org;
> kvmarm@lists.cs.columbia.edu; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-23 10:44, Marc Zyngier wrote:
> > On 2020-11-11 06:22, Jianyong Wu wrote:
> >> ptp_kvm will get this service through SMCC call.
> >> The service offers wall time and cycle count of host to guest.
> >> The caller must specify whether they want the host cycle count or the
> >> difference between host cycle count and cntvoff.
> >>
> >> Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> >> ---
> >> arch/arm64/kvm/hypercalls.c | 61
> >> +++++++++++++++++++++++++++++++++++++
> >> include/linux/arm-smccc.h | 17 +++++++++++
> >> 2 files changed, 78 insertions(+)
> >>
> >> diff --git a/arch/arm64/kvm/hypercalls.c
> >> b/arch/arm64/kvm/hypercalls.c index b9d8607083eb..f7d189563f3d
> 100644
> >> --- a/arch/arm64/kvm/hypercalls.c
> >> +++ b/arch/arm64/kvm/hypercalls.c
> >> @@ -9,6 +9,51 @@
> >> #include <kvm/arm_hypercalls.h>
> >> #include <kvm/arm_psci.h>
> >>
> >> +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> >> + struct system_time_snapshot systime_snapshot;
> >> + u64 cycles = ~0UL;
> >> + u32 feature;
> >> +
> >> + /*
> >> + * system time and counter value must captured in the same
> >> + * time to keep consistency and precision.
> >> + */
> >> + ktime_get_snapshot(&systime_snapshot);
> >> +
> >> + // binding ptp_kvm clocksource to arm_arch_counter
> >> + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> >> + return;
> >> +
> >> + val[0] = upper_32_bits(systime_snapshot.real);
> >> + val[1] = lower_32_bits(systime_snapshot.real);
> >
> > What is the endianness of these values? I can't see it defined
> > anywhere, and this is likely not to work if guest and hypervisor don't
> > align.
>
> Scratch that. This is all passed via registers, so the endianness of the data is
> irrelevant. Please discard any comment about endianness I made in this
> review.
>
Yeah, these data process and transfer are no relationship with endianness. Thanks.
> The documentation aspect still requires to be beefed up.
So the endianness description will be "no endianness restriction".
Thanks
Jianyong
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-23 10:44 ` Marc Zyngier
(?)
@ 2020-11-24 5:20 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:20 UTC (permalink / raw)
To: Marc Zyngier
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:44 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > ptp_kvm will get this service through SMCC call.
> > The service offers wall time and cycle count of host to guest.
> > The caller must specify whether they want the host cycle count or the
> > difference between host cycle count and cntvoff.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > arch/arm64/kvm/hypercalls.c | 61
> +++++++++++++++++++++++++++++++++++++
> > include/linux/arm-smccc.h | 17 +++++++++++
> > 2 files changed, 78 insertions(+)
> >
> > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> > index b9d8607083eb..f7d189563f3d 100644
> > --- a/arch/arm64/kvm/hypercalls.c
> > +++ b/arch/arm64/kvm/hypercalls.c
> > @@ -9,6 +9,51 @@
> > #include <kvm/arm_hypercalls.h>
> > #include <kvm/arm_psci.h>
> >
> > +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> > + struct system_time_snapshot systime_snapshot;
> > + u64 cycles = ~0UL;
> > + u32 feature;
> > +
> > + /*
> > + * system time and counter value must captured in the same
> > + * time to keep consistency and precision.
> > + */
> > + ktime_get_snapshot(&systime_snapshot);
> > +
> > + // binding ptp_kvm clocksource to arm_arch_counter
> > + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> > + return;
> > +
> > + val[0] = upper_32_bits(systime_snapshot.real);
> > + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined anywhere, and
> this is likely not to work if guest and hypervisor don't align.
>
> > +
> > + /*
> > + * which of virtual counter or physical counter being
> > + * asked for is decided by the r1 value of SMCCC
> > + * call. If no invalid r1 value offered, default cycle
> > + * value(-1) will be returned.
> > + * Note: keep in mind that feature is u32 and smccc_get_arg1
> > + * will return u64, so need auto cast here.
> > + */
> > + feature = smccc_get_arg1(vcpu);
> > + switch (feature) {
> > + case ARM_PTP_VIRT_COUNTER:
> > + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> > CNTVOFF_EL2);
> > + break;
> > + case ARM_PTP_PHY_COUNTER:
> > + cycles = systime_snapshot.cycles;
> > + break;
> > + case ARM_PTP_NONE_COUNTER:
>
> What is this "NONE" counter?
Yeah, there is no counter named "NONE". this is not a counter, and only means no counter data needed for guest and just do nothing.
If no this arm here, it will go to the default one and return "NOT_SUPPORTED"
>
> > + break;
> > + default:
> > + val[0] = SMCCC_RET_NOT_SUPPORTED;
> > + break;
> > + }
> > + val[2] = upper_32_bits(cycles);
> > + val[3] = lower_32_bits(cycles);
>
> Same problem as above.
>
> > +}
> > +
> > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) {
> > u32 func_id = smccc_get_function(vcpu); @@ -79,6 +124,22 @@ int
> > kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> > break;
> > case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> > val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + break;
> > + /*
> > + * This serves virtual kvm_ptp.
> > + * Four values will be passed back.
> > + * reg0 stores high 32-bits of host ktime;
> > + * reg1 stores low 32-bits of host ktime;
> > + * For ARM_PTP_VIRT_COUNTER:
> > + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> > + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> > + * For ARM_PTP_PHY_COUNTER:
> > + * reg2 stores the high 32-bits of host cycles;
> > + * reg3 stores the low 32-bits of host cycles.
> > + */
> > + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> > + kvm_ptp_get_time(vcpu, val);
> > break;
> > default:
> > return kvm_psci_call(vcpu);
> > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> > index d75408141137..a03c5dd409d3 100644
> > --- a/include/linux/arm-smccc.h
> > +++ b/include/linux/arm-smccc.h
> > @@ -103,6 +103,7 @@
> >
> > /* KVM "vendor specific" services */
> > #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> > +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
>
> I think having KVM once in the name is enough.
>
> > #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> > #define ARM_SMCCC_KVM_NUM_FUNCS 128
> >
> > @@ -114,6 +115,22 @@
> >
> > #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
> >
> > +/*
> > + * ptp_kvm is a feature used for time sync between vm and host.
> > + * ptp_kvm module in guest kernel will get service from host using
> > + * this hypercall ID.
> > + */
> > +#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_FUNC_KVM_PTP)
> > +
> > +/* ptp_kvm counter type ID */
> > +#define ARM_PTP_VIRT_COUNTER 0
> > +#define ARM_PTP_PHY_COUNTER 1
> > +#define ARM_PTP_NONE_COUNTER 2
>
> The architecture definitely doesn't have this last counter.
Yeah, this is just represent no counter data needed from guest.
Some annotation should be added here.
Thanks
Jianyong
>
> > +
> > /* Paravirtualised time calls (defined by ARM DEN0057A) */
> > #define ARM_SMCCC_HV_PV_TIME_FEATURES
> \
> > ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,
> \
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 5:20 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:20 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:44 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > ptp_kvm will get this service through SMCC call.
> > The service offers wall time and cycle count of host to guest.
> > The caller must specify whether they want the host cycle count or the
> > difference between host cycle count and cntvoff.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > arch/arm64/kvm/hypercalls.c | 61
> +++++++++++++++++++++++++++++++++++++
> > include/linux/arm-smccc.h | 17 +++++++++++
> > 2 files changed, 78 insertions(+)
> >
> > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> > index b9d8607083eb..f7d189563f3d 100644
> > --- a/arch/arm64/kvm/hypercalls.c
> > +++ b/arch/arm64/kvm/hypercalls.c
> > @@ -9,6 +9,51 @@
> > #include <kvm/arm_hypercalls.h>
> > #include <kvm/arm_psci.h>
> >
> > +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> > + struct system_time_snapshot systime_snapshot;
> > + u64 cycles = ~0UL;
> > + u32 feature;
> > +
> > + /*
> > + * system time and counter value must captured in the same
> > + * time to keep consistency and precision.
> > + */
> > + ktime_get_snapshot(&systime_snapshot);
> > +
> > + // binding ptp_kvm clocksource to arm_arch_counter
> > + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> > + return;
> > +
> > + val[0] = upper_32_bits(systime_snapshot.real);
> > + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined anywhere, and
> this is likely not to work if guest and hypervisor don't align.
>
> > +
> > + /*
> > + * which of virtual counter or physical counter being
> > + * asked for is decided by the r1 value of SMCCC
> > + * call. If no invalid r1 value offered, default cycle
> > + * value(-1) will be returned.
> > + * Note: keep in mind that feature is u32 and smccc_get_arg1
> > + * will return u64, so need auto cast here.
> > + */
> > + feature = smccc_get_arg1(vcpu);
> > + switch (feature) {
> > + case ARM_PTP_VIRT_COUNTER:
> > + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> > CNTVOFF_EL2);
> > + break;
> > + case ARM_PTP_PHY_COUNTER:
> > + cycles = systime_snapshot.cycles;
> > + break;
> > + case ARM_PTP_NONE_COUNTER:
>
> What is this "NONE" counter?
Yeah, there is no counter named "NONE". this is not a counter, and only means no counter data needed for guest and just do nothing.
If no this arm here, it will go to the default one and return "NOT_SUPPORTED"
>
> > + break;
> > + default:
> > + val[0] = SMCCC_RET_NOT_SUPPORTED;
> > + break;
> > + }
> > + val[2] = upper_32_bits(cycles);
> > + val[3] = lower_32_bits(cycles);
>
> Same problem as above.
>
> > +}
> > +
> > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) {
> > u32 func_id = smccc_get_function(vcpu); @@ -79,6 +124,22 @@ int
> > kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> > break;
> > case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> > val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + break;
> > + /*
> > + * This serves virtual kvm_ptp.
> > + * Four values will be passed back.
> > + * reg0 stores high 32-bits of host ktime;
> > + * reg1 stores low 32-bits of host ktime;
> > + * For ARM_PTP_VIRT_COUNTER:
> > + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> > + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> > + * For ARM_PTP_PHY_COUNTER:
> > + * reg2 stores the high 32-bits of host cycles;
> > + * reg3 stores the low 32-bits of host cycles.
> > + */
> > + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> > + kvm_ptp_get_time(vcpu, val);
> > break;
> > default:
> > return kvm_psci_call(vcpu);
> > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> > index d75408141137..a03c5dd409d3 100644
> > --- a/include/linux/arm-smccc.h
> > +++ b/include/linux/arm-smccc.h
> > @@ -103,6 +103,7 @@
> >
> > /* KVM "vendor specific" services */
> > #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> > +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
>
> I think having KVM once in the name is enough.
>
> > #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> > #define ARM_SMCCC_KVM_NUM_FUNCS 128
> >
> > @@ -114,6 +115,22 @@
> >
> > #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
> >
> > +/*
> > + * ptp_kvm is a feature used for time sync between vm and host.
> > + * ptp_kvm module in guest kernel will get service from host using
> > + * this hypercall ID.
> > + */
> > +#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_FUNC_KVM_PTP)
> > +
> > +/* ptp_kvm counter type ID */
> > +#define ARM_PTP_VIRT_COUNTER 0
> > +#define ARM_PTP_PHY_COUNTER 1
> > +#define ARM_PTP_NONE_COUNTER 2
>
> The architecture definitely doesn't have this last counter.
Yeah, this is just represent no counter data needed from guest.
Some annotation should be added here.
Thanks
Jianyong
>
> > +
> > /* Paravirtualised time calls (defined by ARM DEN0057A) */
> > #define ARM_SMCCC_HV_PV_TIME_FEATURES
> \
> > ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,
> \
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 5:20 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:20 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:44 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > ptp_kvm will get this service through SMCC call.
> > The service offers wall time and cycle count of host to guest.
> > The caller must specify whether they want the host cycle count or the
> > difference between host cycle count and cntvoff.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > arch/arm64/kvm/hypercalls.c | 61
> +++++++++++++++++++++++++++++++++++++
> > include/linux/arm-smccc.h | 17 +++++++++++
> > 2 files changed, 78 insertions(+)
> >
> > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
> > index b9d8607083eb..f7d189563f3d 100644
> > --- a/arch/arm64/kvm/hypercalls.c
> > +++ b/arch/arm64/kvm/hypercalls.c
> > @@ -9,6 +9,51 @@
> > #include <kvm/arm_hypercalls.h>
> > #include <kvm/arm_psci.h>
> >
> > +static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) {
> > + struct system_time_snapshot systime_snapshot;
> > + u64 cycles = ~0UL;
> > + u32 feature;
> > +
> > + /*
> > + * system time and counter value must captured in the same
> > + * time to keep consistency and precision.
> > + */
> > + ktime_get_snapshot(&systime_snapshot);
> > +
> > + // binding ptp_kvm clocksource to arm_arch_counter
> > + if (systime_snapshot.cs_id != CSID_ARM_ARCH_COUNTER)
> > + return;
> > +
> > + val[0] = upper_32_bits(systime_snapshot.real);
> > + val[1] = lower_32_bits(systime_snapshot.real);
>
> What is the endianness of these values? I can't see it defined anywhere, and
> this is likely not to work if guest and hypervisor don't align.
>
> > +
> > + /*
> > + * which of virtual counter or physical counter being
> > + * asked for is decided by the r1 value of SMCCC
> > + * call. If no invalid r1 value offered, default cycle
> > + * value(-1) will be returned.
> > + * Note: keep in mind that feature is u32 and smccc_get_arg1
> > + * will return u64, so need auto cast here.
> > + */
> > + feature = smccc_get_arg1(vcpu);
> > + switch (feature) {
> > + case ARM_PTP_VIRT_COUNTER:
> > + cycles = systime_snapshot.cycles - vcpu_read_sys_reg(vcpu,
> > CNTVOFF_EL2);
> > + break;
> > + case ARM_PTP_PHY_COUNTER:
> > + cycles = systime_snapshot.cycles;
> > + break;
> > + case ARM_PTP_NONE_COUNTER:
>
> What is this "NONE" counter?
Yeah, there is no counter named "NONE". this is not a counter, and only means no counter data needed for guest and just do nothing.
If no this arm here, it will go to the default one and return "NOT_SUPPORTED"
>
> > + break;
> > + default:
> > + val[0] = SMCCC_RET_NOT_SUPPORTED;
> > + break;
> > + }
> > + val[2] = upper_32_bits(cycles);
> > + val[3] = lower_32_bits(cycles);
>
> Same problem as above.
>
> > +}
> > +
> > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) {
> > u32 func_id = smccc_get_function(vcpu); @@ -79,6 +124,22 @@ int
> > kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
> > break;
> > case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
> > val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
> > + val[0] |= BIT(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + break;
> > + /*
> > + * This serves virtual kvm_ptp.
> > + * Four values will be passed back.
> > + * reg0 stores high 32-bits of host ktime;
> > + * reg1 stores low 32-bits of host ktime;
> > + * For ARM_PTP_VIRT_COUNTER:
> > + * reg2 stores high 32-bits of difference of host cycles and cntvoff;
> > + * reg3 stores low 32-bits of difference of host cycles and cntvoff.
> > + * For ARM_PTP_PHY_COUNTER:
> > + * reg2 stores the high 32-bits of host cycles;
> > + * reg3 stores the low 32-bits of host cycles.
> > + */
> > + case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
> > + kvm_ptp_get_time(vcpu, val);
> > break;
> > default:
> > return kvm_psci_call(vcpu);
> > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
> > index d75408141137..a03c5dd409d3 100644
> > --- a/include/linux/arm-smccc.h
> > +++ b/include/linux/arm-smccc.h
> > @@ -103,6 +103,7 @@
> >
> > /* KVM "vendor specific" services */
> > #define ARM_SMCCC_KVM_FUNC_FEATURES 0
> > +#define ARM_SMCCC_KVM_FUNC_KVM_PTP 1
>
> I think having KVM once in the name is enough.
>
> > #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127
> > #define ARM_SMCCC_KVM_NUM_FUNCS 128
> >
> > @@ -114,6 +115,22 @@
> >
> > #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1
> >
> > +/*
> > + * ptp_kvm is a feature used for time sync between vm and host.
> > + * ptp_kvm module in guest kernel will get service from host using
> > + * this hypercall ID.
> > + */
> > +#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_FUNC_KVM_PTP)
> > +
> > +/* ptp_kvm counter type ID */
> > +#define ARM_PTP_VIRT_COUNTER 0
> > +#define ARM_PTP_PHY_COUNTER 1
> > +#define ARM_PTP_NONE_COUNTER 2
>
> The architecture definitely doesn't have this last counter.
Yeah, this is just represent no counter data needed from guest.
Some annotation should be added here.
Thanks
Jianyong
>
> > +
> > /* Paravirtualised time calls (defined by ARM DEN0057A) */
> > #define ARM_SMCCC_HV_PV_TIME_FEATURES
> \
> > ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,
> \
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
2020-11-23 10:58 ` Marc Zyngier
(?)
@ 2020-11-24 5:21 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:21 UTC (permalink / raw)
To: Marc Zyngier
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:58 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64
> support
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > PTP_KVM implementation depends on hypercall using SMCCC. So we
> > introduce a new SMCCC service ID. This doc explains how does the ID
> > define and how does PTP_KVM works on arm/arm64.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > Documentation/virt/kvm/api.rst | 9 +++++++
> > Documentation/virt/kvm/arm/index.rst | 1 +
> > Documentation/virt/kvm/arm/ptp_kvm.rst | 29
> +++++++++++++++++++++
> > Documentation/virt/kvm/timekeeping.rst | 35
> ++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+)
> > create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
> >
> > diff --git a/Documentation/virt/kvm/api.rst
> > b/Documentation/virt/kvm/api.rst index 36d5f1f3c6dd..9843dbcbf770
> > 100644
> > --- a/Documentation/virt/kvm/api.rst
> > +++ b/Documentation/virt/kvm/api.rst
> > @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> > features provided to the guest according to the bits in the
> > KVM_CPUID_FEATURES CPUID leaf (0x40000001). Otherwise, a guest may
> > use the paravirtual features regardless of what has actually been
> > exposed through the CPUID leaf.
> > +
> > +8.27 KVM_CAP_PTP_KVM
> > +--------------------
> > +
> > +:Architectures: arm64
> > +
> > +This capability indicates that KVM virtual PTP service is supported
> > +in
> > host.
> > +It must company with the implementation of KVM virtual PTP service in
> > host
> > +so VMM can probe if there is the service in host by checking this
> > capability.
> > diff --git a/Documentation/virt/kvm/arm/index.rst
> > b/Documentation/virt/kvm/arm/index.rst
> > index 3e2b2aba90fc..78a9b670aafe 100644
> > --- a/Documentation/virt/kvm/arm/index.rst
> > +++ b/Documentation/virt/kvm/arm/index.rst
> > @@ -10,3 +10,4 @@ ARM
> > hyp-abi
> > psci
> > pvtime
> > + ptp_kvm
> > diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> > b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > new file mode 100644
> > index 000000000000..bb1e6cfefe44
> > --- /dev/null
> > +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > @@ -0,0 +1,29 @@
> > +.. SPDX-License-Identifier: GPL-2.0
> > +
> > +PTP_KVM support for arm/arm64
> > +=============================
> > +
> > +PTP_KVM is used for time sync between guest and host in a high
> > precision.
> > +It needs to get the wall time and counter value from the host and
> > transfer these
> > +to guest via hypercall service. So one more hypercall service has
> > +been
> > added.
> > +
> > +This new SMCCC hypercall is defined as:
> > +
> > +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> > +
> > +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> > SMC32/HVC32
> > +calling convention.
> > +
> > +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> > +
> > + ============= ========== ==========
> > + Function ID: (uint32) 0x86000001
> > + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> > ARM_PTP_VIRT_COUNTER(0)
> > + which indicate acquiring physical
> > counter or
> > + virtual counter respectively.
> > + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> > represent
> > + wall clock time and val2 and val3
> > represent
> > + counter cycle.
>
> This needs a lot more description:
>
> - Which word contains what part of the data (upper/lower part of the 64bit
> data)
> - The endianness of the data returned
OK.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-24 5:21 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:21 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:58 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64
> support
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > PTP_KVM implementation depends on hypercall using SMCCC. So we
> > introduce a new SMCCC service ID. This doc explains how does the ID
> > define and how does PTP_KVM works on arm/arm64.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > Documentation/virt/kvm/api.rst | 9 +++++++
> > Documentation/virt/kvm/arm/index.rst | 1 +
> > Documentation/virt/kvm/arm/ptp_kvm.rst | 29
> +++++++++++++++++++++
> > Documentation/virt/kvm/timekeeping.rst | 35
> ++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+)
> > create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
> >
> > diff --git a/Documentation/virt/kvm/api.rst
> > b/Documentation/virt/kvm/api.rst index 36d5f1f3c6dd..9843dbcbf770
> > 100644
> > --- a/Documentation/virt/kvm/api.rst
> > +++ b/Documentation/virt/kvm/api.rst
> > @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> > features provided to the guest according to the bits in the
> > KVM_CPUID_FEATURES CPUID leaf (0x40000001). Otherwise, a guest may
> > use the paravirtual features regardless of what has actually been
> > exposed through the CPUID leaf.
> > +
> > +8.27 KVM_CAP_PTP_KVM
> > +--------------------
> > +
> > +:Architectures: arm64
> > +
> > +This capability indicates that KVM virtual PTP service is supported
> > +in
> > host.
> > +It must company with the implementation of KVM virtual PTP service in
> > host
> > +so VMM can probe if there is the service in host by checking this
> > capability.
> > diff --git a/Documentation/virt/kvm/arm/index.rst
> > b/Documentation/virt/kvm/arm/index.rst
> > index 3e2b2aba90fc..78a9b670aafe 100644
> > --- a/Documentation/virt/kvm/arm/index.rst
> > +++ b/Documentation/virt/kvm/arm/index.rst
> > @@ -10,3 +10,4 @@ ARM
> > hyp-abi
> > psci
> > pvtime
> > + ptp_kvm
> > diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> > b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > new file mode 100644
> > index 000000000000..bb1e6cfefe44
> > --- /dev/null
> > +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > @@ -0,0 +1,29 @@
> > +.. SPDX-License-Identifier: GPL-2.0
> > +
> > +PTP_KVM support for arm/arm64
> > +=============================
> > +
> > +PTP_KVM is used for time sync between guest and host in a high
> > precision.
> > +It needs to get the wall time and counter value from the host and
> > transfer these
> > +to guest via hypercall service. So one more hypercall service has
> > +been
> > added.
> > +
> > +This new SMCCC hypercall is defined as:
> > +
> > +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> > +
> > +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> > SMC32/HVC32
> > +calling convention.
> > +
> > +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> > +
> > + ============= ========== ==========
> > + Function ID: (uint32) 0x86000001
> > + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> > ARM_PTP_VIRT_COUNTER(0)
> > + which indicate acquiring physical
> > counter or
> > + virtual counter respectively.
> > + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> > represent
> > + wall clock time and val2 and val3
> > represent
> > + counter cycle.
>
> This needs a lot more description:
>
> - Which word contains what part of the data (upper/lower part of the 64bit
> data)
> - The endianness of the data returned
OK.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support
@ 2020-11-24 5:21 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:21 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:58 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64
> support
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > PTP_KVM implementation depends on hypercall using SMCCC. So we
> > introduce a new SMCCC service ID. This doc explains how does the ID
> > define and how does PTP_KVM works on arm/arm64.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > Documentation/virt/kvm/api.rst | 9 +++++++
> > Documentation/virt/kvm/arm/index.rst | 1 +
> > Documentation/virt/kvm/arm/ptp_kvm.rst | 29
> +++++++++++++++++++++
> > Documentation/virt/kvm/timekeeping.rst | 35
> ++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+)
> > create mode 100644 Documentation/virt/kvm/arm/ptp_kvm.rst
> >
> > diff --git a/Documentation/virt/kvm/api.rst
> > b/Documentation/virt/kvm/api.rst index 36d5f1f3c6dd..9843dbcbf770
> > 100644
> > --- a/Documentation/virt/kvm/api.rst
> > +++ b/Documentation/virt/kvm/api.rst
> > @@ -6391,3 +6391,12 @@ When enabled, KVM will disable paravirtual
> > features provided to the guest according to the bits in the
> > KVM_CPUID_FEATURES CPUID leaf (0x40000001). Otherwise, a guest may
> > use the paravirtual features regardless of what has actually been
> > exposed through the CPUID leaf.
> > +
> > +8.27 KVM_CAP_PTP_KVM
> > +--------------------
> > +
> > +:Architectures: arm64
> > +
> > +This capability indicates that KVM virtual PTP service is supported
> > +in
> > host.
> > +It must company with the implementation of KVM virtual PTP service in
> > host
> > +so VMM can probe if there is the service in host by checking this
> > capability.
> > diff --git a/Documentation/virt/kvm/arm/index.rst
> > b/Documentation/virt/kvm/arm/index.rst
> > index 3e2b2aba90fc..78a9b670aafe 100644
> > --- a/Documentation/virt/kvm/arm/index.rst
> > +++ b/Documentation/virt/kvm/arm/index.rst
> > @@ -10,3 +10,4 @@ ARM
> > hyp-abi
> > psci
> > pvtime
> > + ptp_kvm
> > diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst
> > b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > new file mode 100644
> > index 000000000000..bb1e6cfefe44
> > --- /dev/null
> > +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst
> > @@ -0,0 +1,29 @@
> > +.. SPDX-License-Identifier: GPL-2.0
> > +
> > +PTP_KVM support for arm/arm64
> > +=============================
> > +
> > +PTP_KVM is used for time sync between guest and host in a high
> > precision.
> > +It needs to get the wall time and counter value from the host and
> > transfer these
> > +to guest via hypercall service. So one more hypercall service has
> > +been
> > added.
> > +
> > +This new SMCCC hypercall is defined as:
> > +
> > +* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001
> > +
> > +As both 32 and 64-bits ptp_kvm client should be supported, we choose
> > SMC32/HVC32
> > +calling convention.
> > +
> > +ARM_SMCCC_HYP_KVM_PTP_FUNC_ID:
> > +
> > + ============= ========== ==========
> > + Function ID: (uint32) 0x86000001
> > + Arguments: (uint32) ARM_PTP_PHY_COUNTER(1) or
> > ARM_PTP_VIRT_COUNTER(0)
> > + which indicate acquiring physical
> > counter or
> > + virtual counter respectively.
> > + return value: (uint32) NOT_SUPPORTED(-1) or val0 and val1
> > represent
> > + wall clock time and val2 and val3
> > represent
> > + counter cycle.
>
> This needs a lot more description:
>
> - Which word contains what part of the data (upper/lower part of the 64bit
> data)
> - The endianness of the data returned
OK.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-23 10:49 ` Marc Zyngier
(?)
@ 2020-11-24 5:37 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:37 UTC (permalink / raw)
To: Marc Zyngier
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:49 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > Currently, there is no mechanism to keep time sync between guest and
> > host in arm/arm64 virtualization environment. Time in guest will drift
> > compared with host after boot up as they may both use third party time
> > sources to correct their time respectively. The time deviation will be
> > in order of milliseconds. But in some scenarios,like in cloud
> > envirenment, we ask
>
> environment
>
OK
> > for higher time precision.
> >
> > kvm ptp clock, which chooses the host clock source as a reference
> > clock to sync time between guest and host, has been adopted by x86
> > which takes the time sync order from milliseconds to nanoseconds.
> >
> > This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> > precison
>
> precision
>
OK
> > significantly.
> >
> > Test result comparisons between with kvm ptp clock and without it in
> > arm/arm64
> > are as follows. This test derived from the result of command 'chronyc
> > sources'. we should take more care of the last sample column which
> > shows the offset between the local clock and the source at the last
> > measurement.
> >
> > no kvm ptp in guest:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> > 21ms
> >
> > in host:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> > 17ms
> >
> > The dns1.synet.edu.cn is the network reference clock for guest and
> > 120.25.115.20 is the network reference clock for host. we can't get
> > the clock error between guest and host directly, but a roughly
> > estimated value will be in order of hundreds of us to ms.
> >
> > with kvm ptp in guest:
> > chrony has been disabled in host to remove the disturb by network
> > clock.
> >
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> > 3ns
> > * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> > 3ns
> > * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> > 6ns
> > * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> > 5ns
> > * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> > 4ns
> > * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> > 6ns
> > * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> > 4ns
> > * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> > 4ns
> >
> > The PHC0 is the ptp clock which choose the host clock as its source
> > clock. So we can see that the clock difference between host and guest
> > is in order of ns.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> > drivers/ptp/Kconfig | 2 +-
> > drivers/ptp/Makefile | 1 +
> > drivers/ptp/ptp_kvm_arm.c | 44
> ++++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644
> > drivers/ptp/ptp_kvm_arm.c
> >
> > diff --git a/drivers/clocksource/arm_arch_timer.c
> > b/drivers/clocksource/arm_arch_timer.c
> > index d55acffb0b90..b33c5a663d30 100644
> > --- a/drivers/clocksource/arm_arch_timer.c
> > +++ b/drivers/clocksource/arm_arch_timer.c
> > @@ -25,6 +25,7 @@
> > #include <linux/sched/clock.h>
> > #include <linux/sched_clock.h>
> > #include <linux/acpi.h>
> > +#include <linux/arm-smccc.h>
> >
> > #include <asm/arch_timer.h>
> > #include <asm/virt.h>
> > @@ -1650,3 +1651,30 @@ 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
> > +
> > +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> > + struct clocksource **cs)
> > +{
> > + struct arm_smccc_res hvc_res;
> > + ktime_t ktime;
> > + u32 ptp_counter;
> > +
> > + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> > + ptp_counter = ARM_PTP_VIRT_COUNTER;
> > + else
> > + ptp_counter = ARM_PTP_PHY_COUNTER;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ptp_counter, &hvc_res);
> > +
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> > + *ts = ktime_to_timespec64(ktime);
> > + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
>
> Endianness.
>
> > + *cs = &clocksource_counter;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> > diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index
> > 942f72d8151d..677c7f696b70 100644
> > --- a/drivers/ptp/Kconfig
> > +++ b/drivers/ptp/Kconfig
> > @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH config
> > PTP_1588_CLOCK_KVM
> > tristate "KVM virtual PTP clock"
> > depends on PTP_1588_CLOCK
> > - depends on KVM_GUEST && X86
> > + depends on KVM_GUEST && X86 ||
> (HAVE_ARM_SMCCC_DISCOVERY &&
> > ARM_ARCH_TIMER)
> > default y
> > help
> > This driver adds support for using kvm infrastructure as a PTP
> > diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile index
> > 699a4e4d19c2..9fa5ede44b2b 100644
> > --- a/drivers/ptp/Makefile
> > +++ b/drivers/ptp/Makefile
> > @@ -5,6 +5,7 @@
> >
> > ptp-y := ptp_clock.o ptp_chardev.o
> ptp_sysfs.o
> > ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o
> ptp_kvm_common.o
> > +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o
> ptp_kvm_common.o
> > obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> > obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> > obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> > diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c new
> > file mode 100644 index 000000000000..2212827c0384
> > --- /dev/null
> > +++ b/drivers/ptp/ptp_kvm_arm.c
> > @@ -0,0 +1,44 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Virtual PTP 1588 clock for use with KVM guests
> > + * Copyright (C) 2019 ARM Ltd.
> > + * All Rights Reserved
> > + */
> > +
> > +#include <linux/kernel.h>
> > +#include <linux/err.h>
> > +#include <asm/hypervisor.h>
> > +#include <linux/module.h>
> > +#include <linux/psci.h>
> > +#include <linux/arm-smccc.h>
> > +#include <linux/timecounter.h>
> > +#include <linux/sched/clock.h>
> > +#include <asm/arch_timer.h>
> > +#include <asm/hypervisor.h>
> > +
> > +int kvm_arch_ptp_init(void)
> > +{
> > + int ret;
> > +
> > + ret =
> kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + if (ret <= 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > +}
> > +
> > +int kvm_arch_ptp_get_clock(struct timespec64 *ts) {
> > + ktime_t ktime;
> > + struct arm_smccc_res hvc_res;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>
> I really don't see the need to use a non-architectural counter ID.
> Using the virtual counter ID should just be fine, and shouldn't lead to any
> issue.
>
> Am I missing something?
In this function, no counter data is needed. If virtual counter ID is used here, user may be confused with why we get virtual counter
data and do nothing with it. So I explicitly add a new "NONE" counter ID to make it clear.
WDYT?
Thanks
Jianyong
>
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
>
> Endianness.
>
> > + *ts = ktime_to_timespec64(ktime);
> > +
> > + return 0;
> > +}
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 5:37 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:37 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:49 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > Currently, there is no mechanism to keep time sync between guest and
> > host in arm/arm64 virtualization environment. Time in guest will drift
> > compared with host after boot up as they may both use third party time
> > sources to correct their time respectively. The time deviation will be
> > in order of milliseconds. But in some scenarios,like in cloud
> > envirenment, we ask
>
> environment
>
OK
> > for higher time precision.
> >
> > kvm ptp clock, which chooses the host clock source as a reference
> > clock to sync time between guest and host, has been adopted by x86
> > which takes the time sync order from milliseconds to nanoseconds.
> >
> > This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> > precison
>
> precision
>
OK
> > significantly.
> >
> > Test result comparisons between with kvm ptp clock and without it in
> > arm/arm64
> > are as follows. This test derived from the result of command 'chronyc
> > sources'. we should take more care of the last sample column which
> > shows the offset between the local clock and the source at the last
> > measurement.
> >
> > no kvm ptp in guest:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> > 21ms
> >
> > in host:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> > 17ms
> >
> > The dns1.synet.edu.cn is the network reference clock for guest and
> > 120.25.115.20 is the network reference clock for host. we can't get
> > the clock error between guest and host directly, but a roughly
> > estimated value will be in order of hundreds of us to ms.
> >
> > with kvm ptp in guest:
> > chrony has been disabled in host to remove the disturb by network
> > clock.
> >
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> > 3ns
> > * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> > 3ns
> > * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> > 6ns
> > * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> > 5ns
> > * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> > 4ns
> > * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> > 6ns
> > * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> > 4ns
> > * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> > 4ns
> >
> > The PHC0 is the ptp clock which choose the host clock as its source
> > clock. So we can see that the clock difference between host and guest
> > is in order of ns.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> > drivers/ptp/Kconfig | 2 +-
> > drivers/ptp/Makefile | 1 +
> > drivers/ptp/ptp_kvm_arm.c | 44
> ++++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644
> > drivers/ptp/ptp_kvm_arm.c
> >
> > diff --git a/drivers/clocksource/arm_arch_timer.c
> > b/drivers/clocksource/arm_arch_timer.c
> > index d55acffb0b90..b33c5a663d30 100644
> > --- a/drivers/clocksource/arm_arch_timer.c
> > +++ b/drivers/clocksource/arm_arch_timer.c
> > @@ -25,6 +25,7 @@
> > #include <linux/sched/clock.h>
> > #include <linux/sched_clock.h>
> > #include <linux/acpi.h>
> > +#include <linux/arm-smccc.h>
> >
> > #include <asm/arch_timer.h>
> > #include <asm/virt.h>
> > @@ -1650,3 +1651,30 @@ 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
> > +
> > +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> > + struct clocksource **cs)
> > +{
> > + struct arm_smccc_res hvc_res;
> > + ktime_t ktime;
> > + u32 ptp_counter;
> > +
> > + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> > + ptp_counter = ARM_PTP_VIRT_COUNTER;
> > + else
> > + ptp_counter = ARM_PTP_PHY_COUNTER;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ptp_counter, &hvc_res);
> > +
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> > + *ts = ktime_to_timespec64(ktime);
> > + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
>
> Endianness.
>
> > + *cs = &clocksource_counter;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> > diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index
> > 942f72d8151d..677c7f696b70 100644
> > --- a/drivers/ptp/Kconfig
> > +++ b/drivers/ptp/Kconfig
> > @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH config
> > PTP_1588_CLOCK_KVM
> > tristate "KVM virtual PTP clock"
> > depends on PTP_1588_CLOCK
> > - depends on KVM_GUEST && X86
> > + depends on KVM_GUEST && X86 ||
> (HAVE_ARM_SMCCC_DISCOVERY &&
> > ARM_ARCH_TIMER)
> > default y
> > help
> > This driver adds support for using kvm infrastructure as a PTP
> > diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile index
> > 699a4e4d19c2..9fa5ede44b2b 100644
> > --- a/drivers/ptp/Makefile
> > +++ b/drivers/ptp/Makefile
> > @@ -5,6 +5,7 @@
> >
> > ptp-y := ptp_clock.o ptp_chardev.o
> ptp_sysfs.o
> > ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o
> ptp_kvm_common.o
> > +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o
> ptp_kvm_common.o
> > obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> > obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> > obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> > diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c new
> > file mode 100644 index 000000000000..2212827c0384
> > --- /dev/null
> > +++ b/drivers/ptp/ptp_kvm_arm.c
> > @@ -0,0 +1,44 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Virtual PTP 1588 clock for use with KVM guests
> > + * Copyright (C) 2019 ARM Ltd.
> > + * All Rights Reserved
> > + */
> > +
> > +#include <linux/kernel.h>
> > +#include <linux/err.h>
> > +#include <asm/hypervisor.h>
> > +#include <linux/module.h>
> > +#include <linux/psci.h>
> > +#include <linux/arm-smccc.h>
> > +#include <linux/timecounter.h>
> > +#include <linux/sched/clock.h>
> > +#include <asm/arch_timer.h>
> > +#include <asm/hypervisor.h>
> > +
> > +int kvm_arch_ptp_init(void)
> > +{
> > + int ret;
> > +
> > + ret =
> kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + if (ret <= 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > +}
> > +
> > +int kvm_arch_ptp_get_clock(struct timespec64 *ts) {
> > + ktime_t ktime;
> > + struct arm_smccc_res hvc_res;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>
> I really don't see the need to use a non-architectural counter ID.
> Using the virtual counter ID should just be fine, and shouldn't lead to any
> issue.
>
> Am I missing something?
In this function, no counter data is needed. If virtual counter ID is used here, user may be confused with why we get virtual counter
data and do nothing with it. So I explicitly add a new "NONE" counter ID to make it clear.
WDYT?
Thanks
Jianyong
>
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
>
> Endianness.
>
> > + *ts = ktime_to_timespec64(ktime);
> > +
> > + return 0;
> > +}
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 5:37 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 5:37 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Monday, November 23, 2020 6:49 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> On 2020-11-11 06:22, Jianyong Wu wrote:
> > Currently, there is no mechanism to keep time sync between guest and
> > host in arm/arm64 virtualization environment. Time in guest will drift
> > compared with host after boot up as they may both use third party time
> > sources to correct their time respectively. The time deviation will be
> > in order of milliseconds. But in some scenarios,like in cloud
> > envirenment, we ask
>
> environment
>
OK
> > for higher time precision.
> >
> > kvm ptp clock, which chooses the host clock source as a reference
> > clock to sync time between guest and host, has been adopted by x86
> > which takes the time sync order from milliseconds to nanoseconds.
> >
> > This patch enables kvm ptp clock for arm/arm64 and improves clock sync
> > precison
>
> precision
>
OK
> > significantly.
> >
> > Test result comparisons between with kvm ptp clock and without it in
> > arm/arm64
> > are as follows. This test derived from the result of command 'chronyc
> > sources'. we should take more care of the last sample column which
> > shows the offset between the local clock and the source at the last
> > measurement.
> >
> > no kvm ptp in guest:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* dns1.synet.edu.cn 2 6 377 13 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 21 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 29 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 37 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 45 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 53 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 61 +1040us[+1581us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 4 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 12 -130us[ +796us] +/-
> > 21ms
> > ^* dns1.synet.edu.cn 2 6 377 20 -130us[ +796us] +/-
> > 21ms
> >
> > in host:
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > ^* 120.25.115.20 2 7 377 72 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 92 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 112 -470us[ -603us] +/-
> > 18ms
> > ^* 120.25.115.20 2 7 377 2 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 22 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 43 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 63 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 83 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 103 +872ns[-6808ns] +/-
> > 17ms
> > ^* 120.25.115.20 2 7 377 123 +872ns[-6808ns] +/-
> > 17ms
> >
> > The dns1.synet.edu.cn is the network reference clock for guest and
> > 120.25.115.20 is the network reference clock for host. we can't get
> > the clock error between guest and host directly, but a roughly
> > estimated value will be in order of hundreds of us to ms.
> >
> > with kvm ptp in guest:
> > chrony has been disabled in host to remove the disturb by network
> > clock.
> >
> > MS Name/IP address Stratum Poll Reach LastRx Last sample
> >
> ==========================================================
> ==============
> > * PHC0 0 3 377 8 -7ns[ +1ns] +/-
> > 3ns
> > * PHC0 0 3 377 8 +1ns[ +16ns] +/-
> > 3ns
> > * PHC0 0 3 377 6 -4ns[ -0ns] +/-
> > 6ns
> > * PHC0 0 3 377 6 -8ns[ -12ns] +/-
> > 5ns
> > * PHC0 0 3 377 5 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 13 +2ns[ +4ns] +/-
> > 4ns
> > * PHC0 0 3 377 12 -4ns[ -6ns] +/-
> > 4ns
> > * PHC0 0 3 377 11 -8ns[ -11ns] +/-
> > 6ns
> > * PHC0 0 3 377 10 -14ns[ -20ns] +/-
> > 4ns
> > * PHC0 0 3 377 8 +4ns[ +5ns] +/-
> > 4ns
> >
> > The PHC0 is the ptp clock which choose the host clock as its source
> > clock. So we can see that the clock difference between host and guest
> > is in order of ns.
> >
> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
> > ---
> > drivers/clocksource/arm_arch_timer.c | 28 ++++++++++++++++++
> > drivers/ptp/Kconfig | 2 +-
> > drivers/ptp/Makefile | 1 +
> > drivers/ptp/ptp_kvm_arm.c | 44
> ++++++++++++++++++++++++++++
> > 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644
> > drivers/ptp/ptp_kvm_arm.c
> >
> > diff --git a/drivers/clocksource/arm_arch_timer.c
> > b/drivers/clocksource/arm_arch_timer.c
> > index d55acffb0b90..b33c5a663d30 100644
> > --- a/drivers/clocksource/arm_arch_timer.c
> > +++ b/drivers/clocksource/arm_arch_timer.c
> > @@ -25,6 +25,7 @@
> > #include <linux/sched/clock.h>
> > #include <linux/sched_clock.h>
> > #include <linux/acpi.h>
> > +#include <linux/arm-smccc.h>
> >
> > #include <asm/arch_timer.h>
> > #include <asm/virt.h>
> > @@ -1650,3 +1651,30 @@ 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
> > +
> > +int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *ts,
> > + struct clocksource **cs)
> > +{
> > + struct arm_smccc_res hvc_res;
> > + ktime_t ktime;
> > + u32 ptp_counter;
> > +
> > + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI)
> > + ptp_counter = ARM_PTP_VIRT_COUNTER;
> > + else
> > + ptp_counter = ARM_PTP_PHY_COUNTER;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ptp_counter, &hvc_res);
> > +
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
> > + *ts = ktime_to_timespec64(ktime);
> > + *cycle = (u64)hvc_res.a2 << 32 | hvc_res.a3;
>
> Endianness.
>
> > + *cs = &clocksource_counter;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(kvm_arch_ptp_get_crosststamp);
> > diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index
> > 942f72d8151d..677c7f696b70 100644
> > --- a/drivers/ptp/Kconfig
> > +++ b/drivers/ptp/Kconfig
> > @@ -106,7 +106,7 @@ config PTP_1588_CLOCK_PCH config
> > PTP_1588_CLOCK_KVM
> > tristate "KVM virtual PTP clock"
> > depends on PTP_1588_CLOCK
> > - depends on KVM_GUEST && X86
> > + depends on KVM_GUEST && X86 ||
> (HAVE_ARM_SMCCC_DISCOVERY &&
> > ARM_ARCH_TIMER)
> > default y
> > help
> > This driver adds support for using kvm infrastructure as a PTP
> > diff --git a/drivers/ptp/Makefile b/drivers/ptp/Makefile index
> > 699a4e4d19c2..9fa5ede44b2b 100644
> > --- a/drivers/ptp/Makefile
> > +++ b/drivers/ptp/Makefile
> > @@ -5,6 +5,7 @@
> >
> > ptp-y := ptp_clock.o ptp_chardev.o
> ptp_sysfs.o
> > ptp_kvm-$(CONFIG_X86) := ptp_kvm_x86.o
> ptp_kvm_common.o
> > +ptp_kvm-$(CONFIG_HAVE_ARM_SMCCC) := ptp_kvm_arm.o
> ptp_kvm_common.o
> > obj-$(CONFIG_PTP_1588_CLOCK) += ptp.o
> > obj-$(CONFIG_PTP_1588_CLOCK_DTE) += ptp_dte.o
> > obj-$(CONFIG_PTP_1588_CLOCK_INES) += ptp_ines.o
> > diff --git a/drivers/ptp/ptp_kvm_arm.c b/drivers/ptp/ptp_kvm_arm.c new
> > file mode 100644 index 000000000000..2212827c0384
> > --- /dev/null
> > +++ b/drivers/ptp/ptp_kvm_arm.c
> > @@ -0,0 +1,44 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Virtual PTP 1588 clock for use with KVM guests
> > + * Copyright (C) 2019 ARM Ltd.
> > + * All Rights Reserved
> > + */
> > +
> > +#include <linux/kernel.h>
> > +#include <linux/err.h>
> > +#include <asm/hypervisor.h>
> > +#include <linux/module.h>
> > +#include <linux/psci.h>
> > +#include <linux/arm-smccc.h>
> > +#include <linux/timecounter.h>
> > +#include <linux/sched/clock.h>
> > +#include <asm/arch_timer.h>
> > +#include <asm/hypervisor.h>
> > +
> > +int kvm_arch_ptp_init(void)
> > +{
> > + int ret;
> > +
> > + ret =
> kvm_arm_hyp_service_available(ARM_SMCCC_KVM_FUNC_KVM_PTP);
> > + if (ret <= 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > +}
> > +
> > +int kvm_arch_ptp_get_clock(struct timespec64 *ts) {
> > + ktime_t ktime;
> > + struct arm_smccc_res hvc_res;
> > +
> > +
> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> NC_ID,
> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>
> I really don't see the need to use a non-architectural counter ID.
> Using the virtual counter ID should just be fine, and shouldn't lead to any
> issue.
>
> Am I missing something?
In this function, no counter data is needed. If virtual counter ID is used here, user may be confused with why we get virtual counter
data and do nothing with it. So I explicitly add a new "NONE" counter ID to make it clear.
WDYT?
Thanks
Jianyong
>
> > + if ((int)(hvc_res.a0) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + ktime = (u64)hvc_res.a0 << 32 | hvc_res.a1;
>
> Endianness.
>
> > + *ts = ktime_to_timespec64(ktime);
> > +
> > + return 0;
> > +}
>
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-24 5:37 ` Jianyong Wu
(?)
@ 2020-11-24 9:04 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:04 UTC (permalink / raw)
To: Jianyong Wu
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Jianyong,
On 2020-11-24 05:37, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +
>> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
>> NC_ID,
>> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>>
>> I really don't see the need to use a non-architectural counter ID.
>> Using the virtual counter ID should just be fine, and shouldn't lead
>> to any
>> issue.
>>
>
>> Am I missing something?
>
> In this function, no counter data is needed. If virtual counter ID is
> used here, user may be confused with why we get virtual counter
> data and do nothing with it. So I explicitly add a new "NONE" counter
> ID to make it clear.
>
> WDYT?
ITIABI (I Think It's A Bad Idea). There are two counters, and the API
allows to retrieve the data for any of these two. If the "user" doesn't
want to do anything with the data, that's their problem.
Here, you can just sue the virtual counter, and that will give you the
exact same semantic, without inventing non-architectural state.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 9:04 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:04 UTC (permalink / raw)
To: Jianyong Wu
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Jianyong,
On 2020-11-24 05:37, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +
>> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
>> NC_ID,
>> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>>
>> I really don't see the need to use a non-architectural counter ID.
>> Using the virtual counter ID should just be fine, and shouldn't lead
>> to any
>> issue.
>>
>
>> Am I missing something?
>
> In this function, no counter data is needed. If virtual counter ID is
> used here, user may be confused with why we get virtual counter
> data and do nothing with it. So I explicitly add a new "NONE" counter
> ID to make it clear.
>
> WDYT?
ITIABI (I Think It's A Bad Idea). There are two counters, and the API
allows to retrieve the data for any of these two. If the "user" doesn't
want to do anything with the data, that's their problem.
Here, you can just sue the virtual counter, and that will give you the
exact same semantic, without inventing non-architectural state.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 9:04 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:04 UTC (permalink / raw)
To: Jianyong Wu
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Jianyong,
On 2020-11-24 05:37, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +
>> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
>> NC_ID,
>> > + ARM_PTP_NONE_COUNTER, &hvc_res);
>>
>> I really don't see the need to use a non-architectural counter ID.
>> Using the virtual counter ID should just be fine, and shouldn't lead
>> to any
>> issue.
>>
>
>> Am I missing something?
>
> In this function, no counter data is needed. If virtual counter ID is
> used here, user may be confused with why we get virtual counter
> data and do nothing with it. So I explicitly add a new "NONE" counter
> ID to make it clear.
>
> WDYT?
ITIABI (I Think It's A Bad Idea). There are two counters, and the API
allows to retrieve the data for any of these two. If the "user" doesn't
want to do anything with the data, that's their problem.
Here, you can just sue the virtual counter, and that will give you the
exact same semantic, without inventing non-architectural state.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-24 5:20 ` Jianyong Wu
(?)
@ 2020-11-24 9:07 ` Marc Zyngier
-1 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:07 UTC (permalink / raw)
To: Jianyong Wu
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
On 2020-11-24 05:20, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +/* ptp_kvm counter type ID */
>> > +#define ARM_PTP_VIRT_COUNTER 0
>> > +#define ARM_PTP_PHY_COUNTER 1
>> > +#define ARM_PTP_NONE_COUNTER 2
>>
>> The architecture definitely doesn't have this last counter.
>
> Yeah, this is just represent no counter data needed from guest.
> Some annotation should be added here.
I'd rather you remove it entirely, or explain why you really cannot
do without a fake counter.
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 9:07 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:07 UTC (permalink / raw)
To: Jianyong Wu
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-24 05:20, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +/* ptp_kvm counter type ID */
>> > +#define ARM_PTP_VIRT_COUNTER 0
>> > +#define ARM_PTP_PHY_COUNTER 1
>> > +#define ARM_PTP_NONE_COUNTER 2
>>
>> The architecture definitely doesn't have this last counter.
>
> Yeah, this is just represent no counter data needed from guest.
> Some annotation should be added here.
I'd rather you remove it entirely, or explain why you really cannot
do without a fake counter.
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 9:07 ` Marc Zyngier
0 siblings, 0 replies; 81+ messages in thread
From: Marc Zyngier @ 2020-11-24 9:07 UTC (permalink / raw)
To: Jianyong Wu
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
On 2020-11-24 05:20, Jianyong Wu wrote:
> Hi Marc,
[...]
>> > +/* ptp_kvm counter type ID */
>> > +#define ARM_PTP_VIRT_COUNTER 0
>> > +#define ARM_PTP_PHY_COUNTER 1
>> > +#define ARM_PTP_NONE_COUNTER 2
>>
>> The architecture definitely doesn't have this last counter.
>
> Yeah, this is just represent no counter data needed from guest.
> Some annotation should be added here.
I'd rather you remove it entirely, or explain why you really cannot
do without a fake counter.
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
2020-11-24 9:07 ` Marc Zyngier
(?)
@ 2020-11-24 10:14 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:14 UTC (permalink / raw)
To: Marc Zyngier
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:07 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-24 05:20, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +/* ptp_kvm counter type ID */
> >> > +#define ARM_PTP_VIRT_COUNTER 0
> >> > +#define ARM_PTP_PHY_COUNTER 1
> >> > +#define ARM_PTP_NONE_COUNTER 2
> >>
> >> The architecture definitely doesn't have this last counter.
> >
> > Yeah, this is just represent no counter data needed from guest.
> > Some annotation should be added here.
>
> I'd rather you remove it entirely, or explain why you really cannot do without
> a fake counter.
OK, I will remove it.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 10:14 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:14 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:07 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-24 05:20, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +/* ptp_kvm counter type ID */
> >> > +#define ARM_PTP_VIRT_COUNTER 0
> >> > +#define ARM_PTP_PHY_COUNTER 1
> >> > +#define ARM_PTP_NONE_COUNTER 2
> >>
> >> The architecture definitely doesn't have this last counter.
> >
> > Yeah, this is just represent no counter data needed from guest.
> > Some annotation should be added here.
>
> I'd rather you remove it entirely, or explain why you really cannot do without
> a fake counter.
OK, I will remove it.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
@ 2020-11-24 10:14 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:14 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:07 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp.
>
> On 2020-11-24 05:20, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +/* ptp_kvm counter type ID */
> >> > +#define ARM_PTP_VIRT_COUNTER 0
> >> > +#define ARM_PTP_PHY_COUNTER 1
> >> > +#define ARM_PTP_NONE_COUNTER 2
> >>
> >> The architecture definitely doesn't have this last counter.
> >
> > Yeah, this is just represent no counter data needed from guest.
> > Some annotation should be added here.
>
> I'd rather you remove it entirely, or explain why you really cannot do without
> a fake counter.
OK, I will remove it.
Thanks
Jianyong
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-24 9:04 ` Marc Zyngier
(?)
@ 2020-11-24 10:18 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:18 UTC (permalink / raw)
To: Marc Zyngier
Cc: netdev, yangbo.lu, john.stultz, tglx, pbonzini,
sean.j.christopherson, richardcochran, Mark Rutland, will,
Suzuki Poulose, Andre Przywara, Steven Price, linux-kernel,
linux-arm-kernel, kvmarm, kvm, Steve Capper, Justin He, nd
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:05 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> Jianyong,
>
> On 2020-11-24 05:37, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +
> >> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> >> NC_ID,
> >> > + ARM_PTP_NONE_COUNTER, &hvc_res);
> >>
> >> I really don't see the need to use a non-architectural counter ID.
> >> Using the virtual counter ID should just be fine, and shouldn't lead
> >> to any issue.
> >>
> >
> >> Am I missing something?
> >
> > In this function, no counter data is needed. If virtual counter ID is
> > used here, user may be confused with why we get virtual counter
> > data and do nothing with it. So I explicitly add a new "NONE" counter
> > ID to make it clear.
> >
> > WDYT?
>
> ITIABI (I Think It's A Bad Idea). There are two counters, and the API
> allows to retrieve the data for any of these two. If the "user" doesn't
> want to do anything with the data, that's their problem.
>
> Here, you can just sue the virtual counter, and that will give you the
> exact same semantic, without inventing non-architectural state.
>
OK, that's it.
Thanks
Jianyong Wu
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 10:18 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:18 UTC (permalink / raw)
To: Marc Zyngier
Cc: Justin He, kvm, netdev, richardcochran, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:05 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> Jianyong,
>
> On 2020-11-24 05:37, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +
> >> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> >> NC_ID,
> >> > + ARM_PTP_NONE_COUNTER, &hvc_res);
> >>
> >> I really don't see the need to use a non-architectural counter ID.
> >> Using the virtual counter ID should just be fine, and shouldn't lead
> >> to any issue.
> >>
> >
> >> Am I missing something?
> >
> > In this function, no counter data is needed. If virtual counter ID is
> > used here, user may be confused with why we get virtual counter
> > data and do nothing with it. So I explicitly add a new "NONE" counter
> > ID to make it clear.
> >
> > WDYT?
>
> ITIABI (I Think It's A Bad Idea). There are two counters, and the API
> allows to retrieve the data for any of these two. If the "user" doesn't
> want to do anything with the data, that's their problem.
>
> Here, you can just sue the virtual counter, and that will give you the
> exact same semantic, without inventing non-architectural state.
>
OK, that's it.
Thanks
Jianyong Wu
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 81+ messages in thread
* RE: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
@ 2020-11-24 10:18 ` Jianyong Wu
0 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-11-24 10:18 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Justin He, kvm, Suzuki Poulose, netdev,
richardcochran, Steve Capper, linux-kernel,
sean.j.christopherson, Steven Price, Andre Przywara, john.stultz,
yangbo.lu, pbonzini, tglx, nd, will, kvmarm, linux-arm-kernel
Hi Marc,
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Tuesday, November 24, 2020 5:05 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>
> Cc: netdev@vger.kernel.org; yangbo.lu@nxp.com; john.stultz@linaro.org;
> tglx@linutronix.de; pbonzini@redhat.com; sean.j.christopherson@intel.com;
> richardcochran@gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will@kernel.org; Suzuki Poulose <Suzuki.Poulose@arm.com>; Andre
> Przywara <Andre.Przywara@arm.com>; Steven Price
> <Steven.Price@arm.com>; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; kvmarm@lists.cs.columbia.edu;
> kvm@vger.kernel.org; Steve Capper <Steve.Capper@arm.com>; Justin He
> <Justin.He@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> Jianyong,
>
> On 2020-11-24 05:37, Jianyong Wu wrote:
> > Hi Marc,
>
> [...]
>
> >> > +
> >> arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_PTP_FU
> >> NC_ID,
> >> > + ARM_PTP_NONE_COUNTER, &hvc_res);
> >>
> >> I really don't see the need to use a non-architectural counter ID.
> >> Using the virtual counter ID should just be fine, and shouldn't lead
> >> to any issue.
> >>
> >
> >> Am I missing something?
> >
> > In this function, no counter data is needed. If virtual counter ID is
> > used here, user may be confused with why we get virtual counter
> > data and do nothing with it. So I explicitly add a new "NONE" counter
> > ID to make it clear.
> >
> > WDYT?
>
> ITIABI (I Think It's A Bad Idea). There are two counters, and the API
> allows to retrieve the data for any of these two. If the "user" doesn't
> want to do anything with the data, that's their problem.
>
> Here, you can just sue the virtual counter, and that will give you the
> exact same semantic, without inventing non-architectural state.
>
OK, that's it.
Thanks
Jianyong Wu
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 81+ messages in thread
* Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64
2020-11-11 13:44 ` kernel test robot
(?)
@ 2020-12-04 9:46 ` Jianyong Wu
-1 siblings, 0 replies; 81+ messages in thread
From: Jianyong Wu @ 2020-12-04 9:46 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
Hi Marc,
I see the CI robot complains. There are two issues to be addressed.
One is about "No prototype for kvm_ptp_arch_xxx". As all of the prototype of these functions lie in "driver/ptp/ptp_kvm.h" for now. we can include the header file in the source code file where define these functions to cancel that issue. But the " kvm_arch_ptp_get_crosststamp" lies in "driver/clocksource/arm_arch_timer.c" which is also need include "ptp_kvm.h". so what about move "ptp_kvm.h" to other place under "linux/include", eg. "include/kvm/".
Another problem shows in the end of this page. It derives from the patch 1/9. Will introduces " kvm_init_hyp_services" in arch/arm64/kernel/setup.c and I moved its definition into "driver/firmware/smccc/smccc.c" to let both arm and arm64 can use it. But it is also called in "setup.c", so it seems that setup.c depends on smccc.c. However, I find that it's difficult to add the dependency for setup.c , so what about adding a macro switch for "kvm_init_hyp_services" in setup.c like:
"
#ifdef HAVE_ARM_SMCCC_DISCOVERY
kvm_init_hyp_services();
#endif
"
Also it seems "arm_arch_timer.c" depends on "smccc.c" as kvm_arch_ptp_get_crosststamp is defined in it. Therefore, can " HAVE_ARM_SMCCC_DISCOVERY' be added to the dependency of "ARM_ARCH_TIMER"?
Thanks
Jianyong
> -----Original Message-----
> From: kernel test robot <lkp@intel.com>
> Sent: Wednesday, November 11, 2020 9:44 PM
> To: Jianyong Wu <Jianyong.Wu@arm.com>; netdev(a)vger.kernel.org;
> yangbo.lu(a)nxp.com; john.stultz(a)linaro.org; tglx(a)linutronix.de;
> pbonzini(a)redhat.com; sean.j.christopherson(a)intel.com; maz(a)kernel.org;
> richardcochran(a)gmail.com; Mark Rutland <Mark.Rutland@arm.com>;
> will(a)kernel.org
> Cc: kbuild-all(a)lists.01.org
> Subject: Re: [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for
> arm/arm64
>
> Hi Jianyong,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on linus/master]
> [also build test ERROR on v5.10-rc3 next-20201111] [cannot apply to
> tip/timers/core kvmarm/next kvm/linux-next] [If your patch is applied to the
> wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch]
>
> url: https://github.com/0day-ci/linux/commits/Jianyong-Wu/Enable-
> ptp_kvm-for-arm-arm64/20201111-142600
> base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> eccc876724927ff3b9ff91f36f7b6b159e948f0c
> config: arm-milbeaut_m10v_defconfig (attached as .config)
> compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0 reproduce (this is a W=1 build):
> wget https://raw.githubusercontent.com/intel/lkp-
> tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # https://github.com/0day-
> ci/linux/commit/94d44d1bc7bec0d91d4c4851dd935a752bffe07d
> git remote add linux-review https://github.com/0day-ci/linux
> git fetch --no-tags linux-review Jianyong-Wu/Enable-ptp_kvm-for-arm-
> arm64/20201111-142600
> git checkout 94d44d1bc7bec0d91d4c4851dd935a752bffe07d
> # save the attached .config to linux build tree
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0
> make.cross ARCH=arm
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> arch/arm/vfp/vfphw.o: in function `vfp_support_entry':
> (.text+0xa): relocation truncated to fit: R_ARM_THM_JUMP19 against
> symbol `vfp_kmode_exception' defined in .text.unlikely section in
> arch/arm/vfp/vfpmodule.o
> arm-linux-gnueabi-ld: arch/arm/kernel/setup.o: in function `setup_arch':
> setup.c:(.init.text+0xaa2): undefined reference to `kvm_init_hyp_services'
> arm-linux-gnueabi-ld: drivers/clocksource/arm_arch_timer.o: in function
> `kvm_arch_ptp_get_crosststamp':
> >> arm_arch_timer.c:(.text+0x202): undefined reference to
> `arm_smccc_1_1_get_conduit'
>
> ---
> 0-DAY CI Kernel Test Service, Intel Corporation
> https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 81+ messages in thread
end of thread, other threads:[~2020-12-04 9:46 UTC | newest]
Thread overview: 81+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 6:22 [PATCH v15 0/9] Enable ptp_kvm for arm/arm64 Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 1/9] arm64: Probe for the presence of KVM hypervisor Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 10:38 ` kernel test robot
2020-11-11 12:23 ` kernel test robot
2020-11-11 16:54 ` kernel test robot
2020-11-11 6:22 ` [PATCH v15 2/9] arm/arm64: KVM: Advertise KVM UID to guests via SMCCC Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 3/9] ptp: Reorganize ptp_kvm module to make it arch-independent Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 13:10 ` kernel test robot
2020-11-11 13:10 ` kernel test robot
2020-11-11 14:36 ` kernel test robot
2020-11-11 14:36 ` kernel test robot
2020-11-11 6:22 ` [PATCH v15 4/9] time: Add mechanism to recognize clocksource in time_get_snapshot Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 5/9] clocksource: Add clocksource id for arm arch counter Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 6/9] arm64/kvm: Add hypercall service for kvm ptp Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-23 10:44 ` Marc Zyngier
2020-11-23 10:44 ` Marc Zyngier
2020-11-23 10:44 ` Marc Zyngier
2020-11-23 11:59 ` Marc Zyngier
2020-11-23 11:59 ` Marc Zyngier
2020-11-23 11:59 ` Marc Zyngier
2020-11-24 5:11 ` Jianyong Wu
2020-11-24 5:11 ` Jianyong Wu
2020-11-24 5:11 ` Jianyong Wu
2020-11-24 5:20 ` Jianyong Wu
2020-11-24 5:20 ` Jianyong Wu
2020-11-24 5:20 ` Jianyong Wu
2020-11-24 9:07 ` Marc Zyngier
2020-11-24 9:07 ` Marc Zyngier
2020-11-24 9:07 ` Marc Zyngier
2020-11-24 10:14 ` Jianyong Wu
2020-11-24 10:14 ` Jianyong Wu
2020-11-24 10:14 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 7/9] ptp: arm/arm64: Enable ptp_kvm for arm/arm64 Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 8:52 ` kernel test robot
2020-11-11 8:52 ` kernel test robot
2020-11-11 13:44 ` kernel test robot
2020-11-11 13:44 ` kernel test robot
2020-12-04 9:46 ` Jianyong Wu
2020-11-23 10:49 ` Marc Zyngier
2020-11-23 10:49 ` Marc Zyngier
2020-11-23 10:49 ` Marc Zyngier
2020-11-24 5:37 ` Jianyong Wu
2020-11-24 5:37 ` Jianyong Wu
2020-11-24 5:37 ` Jianyong Wu
2020-11-24 9:04 ` Marc Zyngier
2020-11-24 9:04 ` Marc Zyngier
2020-11-24 9:04 ` Marc Zyngier
2020-11-24 10:18 ` Jianyong Wu
2020-11-24 10:18 ` Jianyong Wu
2020-11-24 10:18 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 8/9] doc: add ptp_kvm introduction for arm64 support Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-23 10:58 ` Marc Zyngier
2020-11-23 10:58 ` Marc Zyngier
2020-11-23 10:58 ` Marc Zyngier
2020-11-24 5:21 ` Jianyong Wu
2020-11-24 5:21 ` Jianyong Wu
2020-11-24 5:21 ` Jianyong Wu
2020-11-11 6:22 ` [PATCH v15 9/9] arm64: Add kvm capability check extension for ptp_kvm Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-11 6:22 ` Jianyong Wu
2020-11-23 9:26 ` [PATCH v15 0/9] Enable ptp_kvm for arm/arm64 Jianyong Wu
2020-11-23 9:26 ` Jianyong Wu
2020-11-23 9:26 ` Jianyong Wu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.