KVM: s390: diag9c forwarding
Subsystems (4)
v2 cover KVM: s390: diag9c forwarding
This patch will forward the yieldto hypercall (diag9c) if in the host the target CPU is also not running. As we do not yet have performance data (and recommendations) the default is turned off, but this can be changed during runtime.
Pierre Morel (1):
s390:kvm: diag9c forwarding
Documentation/virt/kvm/s390-diag.rst | 33 ++++++++++++++++++++++++++++ arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/smp.h | 1 + arch/s390/kernel/smp.c | 1 + arch/s390/kvm/diag.c | 31 +++++++++++++++++++++++--- arch/s390/kvm/kvm-s390.c | 6 +++++ arch/s390/kvm/kvm-s390.h | 8 +++++++ 7 files changed, 78 insertions(+), 3 deletions(-)
Signature · 9 lines
2.17.1 Changelog: - more precise comments (Connie) - Documentation (Janosch)
PATCH v2 1/1 s390:kvm: diag9c forwarding
When we receive intercept a DIAG_9C from the guest we verify that the target real CPU associated with the virtual CPU designated by the guest is running and if not we forward the DIAG_9C to the target real CPU.
To avoid a diag9c storm we allow a maximal rate of diag9c forwarding.
The rate is calculated as a count per second defined as a new parameter of the s390 kvm module: diag9c_forwarding_hz .
The default value is to not forward diag9c.
--- Documentation/virt/kvm/s390-diag.rst | 33 ++++++++++++++++++++++++++++ arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/smp.h | 1 + arch/s390/kernel/smp.c | 1 + arch/s390/kvm/diag.c | 31 +++++++++++++++++++++++--- arch/s390/kvm/kvm-s390.c | 6 +++++ arch/s390/kvm/kvm-s390.h | 8 +++++++ 7 files changed, 78 insertions(+), 3 deletions(-)
Documentation/virt/kvm/s390-diag.rst +33 -0
@@ -84,3 +84,36 @@ If the function code specifies 0x501, breakpoint functions may be performed. This function code is handled by userspace. This diagnose function code has no subfunctions and uses no parameters. + + +DIAGNOSE function code 'X'9C - Voluntary Time Slice Yield +--------------------------------------------------------- + +General register 1 contains the target CPU address. + +In a guest of a hypervisor like LPAR, KVM or z/VM using shared host CPUs, +DIAGNOSE with function code 'X'9C may improve system performance by +yielding the host CPU on which the guest CPU is running to be assigned +to another guest CPU, preferably the logical CPU containing the specified +target CPU. + + +DIAG 'X'9C forwarding ++++++++++++++++++++++ + +Under KVM, the guest operating system may send a DIAGNOSE code 'X'9C to +the host when it fails to acquire a spinlock for a virtual CPU +and detects that the host CPU on which the virtual guest CPU owner is +assigned to is not running to try to get this host CPU running and +consequently the guest virtual CPU running and freeing the lock. + +However, on the logical partition the real CPU on which the previously +targeted host CPU is assign may itself not be running. +By forwarding the DIAGNOSE code 'X'9C, initially sent by the guest, +from the host to LPAR hypervisor, this one will hopefully schedule +the host CPU which will let KVM run the target guest CPU. + +diag9c_forwarding_hz + KVM kernel parameter allowing to specify the maximum number of DIAGNOSE + 'X'9C forwarding per second in the purpose of avoiding a DIAGNOSE 'X'9C + forwarding storm.
arch/s390/include/asm/kvm_host.h +1 -0
@@ -456,6 +456,7 @@ struct kvm_vcpu_stat {u64 diagnose_44;u64 diagnose_9c;u64 diagnose_9c_ignored; +u64 diagnose_9c_forward;u64 diagnose_258;u64 diagnose_308;u64 diagnose_500;
arch/s390/include/asm/smp.h +1 -0
@@ -63,5 +63,6 @@ extern void __noreturn cpu_die(void);extern void __cpu_die (unsigned int cpu);extern int __cpu_disable (void );extern void schedule_mcck_handler (void ); +void notrace smp_yield_cpu(int cpu);#endif /* __ASM_SMP_H */
arch/s390/kernel/smp.c +1 -0
@@ -422,6 +422,7 @@ void notrace smp_yield_cpu(int cpu) asmvolatile ("diag %0,0,0x9c" : :"d" (pcpu_devices[cpu].address)); } +EXPORT_SYMBOL (smp_yield_cpu);/* * Send cpus emergency shutdown signal. This gives the cpus the
arch/s390/kvm/diag.c +28 -3
@@ -150,6 +150,19 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)return 0 ; } +static unsigned int forward_cnt; +static unsigned long cur_slice; + +static int diag9c_forwarding_overrun (void ) +{ +/* Reset the count on a new slice */ +if (time_after (jiffies, cur_slice)) { + cur_slice = jiffies; + forward_cnt = diag9c_forwarding_hz /HZ ; + } +return forward_cnt-- ?1 :0 ; +} +static int __diag_time_slice_end_directed (struct kvm_vcpu *vcpu) {struct kvm_vcpu *tcpu;
@@ -167,9 +180,21 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu)if (!tcpu) goto no_yield; -/* target already running */ -if (READ_ONCE (tcpu->cpu) >=0 ) - goto no_yield; +/* target guest VCPU already running */ +if (READ_ONCE (tcpu->cpu) >=0 ) { +if (!diag9c_forwarding_hz ||diag9c_forwarding_overrun ()) + goto no_yield; + +/* target host CPU already running */ +if (!vcpu_is_preempted (tcpu->cpu)) + goto no_yield; +smp_yield_cpu (tcpu->cpu); +VCPU_EVENT (vcpu,5 , +"diag time slice end directed to %d: yield forwarded" , + tid); + vcpu->stat.diagnose_9c_forward++; +return 0 ; + }if (kvm_vcpu_yield_to (tcpu) <=0 ) goto no_yield;
arch/s390/kvm/kvm-s390.c +6 -0
@@ -157,6 +157,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {VCPU_STAT ("instruction_diag_44" , diagnose_44),VCPU_STAT ("instruction_diag_9c" , diagnose_9c),VCPU_STAT ("diag_9c_ignored" , diagnose_9c_ignored), +VCPU_STAT ("diag_9c_forward" , diagnose_9c_forward),VCPU_STAT ("instruction_diag_258" , diagnose_258),VCPU_STAT ("instruction_diag_308" , diagnose_308), VCPU_STAT("instruction_diag_500", diagnose_500),
@@ -190,6 +191,11 @@ static bool use_gisa = true;module_param (use_gisa, bool,0644 );MODULE_PARM_DESC (use_gisa,"Use the GISA if the host supports it." ); +/* maximum diag9c forwarding per second */ +unsigned int diag9c_forwarding_hz; +module_param (diag9c_forwarding_hz, uint,0644 ); +MODULE_PARM_DESC (diag9c_forwarding_hz,"Maximum diag9c forwarding per second" ); +/* * For now we handle at most 16 double words as this is what the s390 base * kernel handles and stores in the prefix page. If we ever need to go beyond
arch/s390/kvm/kvm-s390.h +8 -0
@@ -471,4 +471,12 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,* @kvm: the KVM guest */ void kvm_s390_vcpu_crypto_reset_all (struct kvm *kvm); + +/** +* diag9c_forwarding_hz +* +* Set the maximum number of diag9c forwarding per second +*/ +extern unsigned int diag9c_forwarding_hz; +#endif
Signature · 1 line
2.17.1
Re: [PATCH v2 1/1] s390:kvm: diag9c forwarding
Quoted 108 lines · Pierre Morel
When we receive intercept a
DIAG_9Cfrom the guest we verify that the target real CPU associated with the virtual CPU designated by the guest is running and if not we forward theDIAG_9Cto the target real CPU.To avoid a diag9c storm we allow a maximal rate of diag9c forwarding.
The rate is calculated as a count per second defined as a new parameter of the s390 kvm module:
diag9c_forwarding_hz.The default value is to not forward diag9c.
Signed-off-by Pierre Morel <[email protected]>--- Documentation/virt/kvm/s390-diag.rst | 33 ++++++++++++++++++++++++++++ arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/smp.h | 1 + arch/s390/kernel/smp.c | 1 + arch/s390/kvm/diag.c | 31 +++++++++++++++++++++++--- arch/s390/kvm/kvm-s390.c | 6 +++++ arch/s390/kvm/kvm-s390.h | 8 +++++++ 7 files changed, 78 insertions(+), 3 deletions(-)Documentation/virt/kvm/s390-diag.rst +33
-0@@ -84,3 +84,36 @@ If the function code specifies 0x501, breakpoint functions may be performed. This function code is handled by userspace. This diagnose function code has no subfunctions and uses no parameters. + + +DIAGNOSE function code 'X'9C - Voluntary Time Slice Yield +--------------------------------------------------------- + +General register 1 contains the target CPU address. + +In a guest of a hypervisor like LPAR, KVM or z/VM using shared host CPUs, +DIAGNOSE with function code 'X'9C may improve system performance by +yielding the host CPU on which the guest CPU is running to be assigned +to another guest CPU, preferably the logical CPU containing the specified +target CPU. + + +DIAG 'X'9C forwarding ++++++++++++++++++++++ + +Under KVM, the guest operating system may send a DIAGNOSE code 'X'9C to +the host when it fails to acquire a spinlock for a virtual CPU +and detects that the host CPU on which the virtual guest CPU owner is +assigned to is not running to try to get this host CPU running and +consequently the guest virtual CPU running and freeing the lock. + +However, on the logical partition the real CPU on which the previously +targeted host CPU is assign may itself not be running. +By forwarding the DIAGNOSE code 'X'9C, initially sent by the guest, +from the host to LPAR hypervisor, this one will hopefully schedule +the host CPU which will let KVM run the target guest CPU. + +diag9c_forwarding_hz + KVM kernel parameter allowing to specify the maximum number of DIAGNOSE + 'X'9C forwarding per second in the purpose of avoiding a DIAGNOSE 'X'9C + forwarding storm.arch/s390/include/asm/kvm_host.h +1
-0@@ -456,6 +456,7 @@ struct kvm_vcpu_stat {u64 diagnose_44;u64 diagnose_9c;u64 diagnose_9c_ignored; +u64 diagnose_9c_forward;u64 diagnose_258;u64 diagnose_308;u64 diagnose_500;arch/s390/include/asm/smp.h +1
-0@@ -63,5 +63,6 @@ extern void __noreturn cpu_die(void);extern void __cpu_die (unsigned int cpu);extern int __cpu_disable (void );extern void schedule_mcck_handler (void ); +void notrace smp_yield_cpu(int cpu);#endif /* __ASM_SMP_H */ arch/s390/kernel/smp.c +1
-0@@ -422,6 +422,7 @@ void notrace smp_yield_cpu(int cpu) asmvolatile ("diag %0,0,0x9c" : :"d" (pcpu_devices[cpu].address)); } +EXPORT_SYMBOL (smp_yield_cpu);/* * Send cpus emergency shutdown signal. This gives the cpus the arch/s390/kvm/diag.c +1
-0@@ -150,6 +150,19 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)return 0 ; } +static unsigned int forward_cnt;
arch/s390/kvm/diag.c static int __diag_time_slice_end(struct kvm_vcpu *vcpu) · line 163
Quoted 10 lines
arch/s390/kvm/diag.c +10
-0+static unsigned long cur_slice; + +static int diag9c_forwarding_overrun (void ) +{ +/* Reset the count on a new slice */ +if (time_after (jiffies, cur_slice)) { + cur_slice = jiffies; + forward_cnt = diag9c_forwarding_hz /HZ ; + } +return forward_cnt-- ?1 :0 ;
/o\
seems a "<= 0 " has been forgotten here
I send the update asap.
regards,
Pierre
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen