On 01/24/2018 01:42 PM, David Hildenbrand wrote: > On 24.01.2018 12:32, Christian Borntraeger wrote: >> make the diagnose counters also appear as instruction counters. >> >> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> >> --- >> arch/s390/kvm/kvm-s390.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c >> index 3abe177..1f30087 100644 >> --- a/arch/s390/kvm/kvm-s390.c >> +++ b/arch/s390/kvm/kvm-s390.c >> @@ -132,12 +132,12 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { >> { "instruction_sigp_cpu_reset", VCPU_STAT(instruction_sigp_cpu_reset) }, >> { "instruction_sigp_init_cpu_reset", VCPU_STAT(instruction_sigp_init_cpu_reset) }, >> { "instruction_sigp_unknown", VCPU_STAT(instruction_sigp_unknown) }, >> - { "diagnose_10", VCPU_STAT(diagnose_10) }, >> - { "diagnose_44", VCPU_STAT(diagnose_44) }, >> - { "diagnose_9c", VCPU_STAT(diagnose_9c) }, >> - { "diagnose_258", VCPU_STAT(diagnose_258) }, >> - { "diagnose_308", VCPU_STAT(diagnose_308) }, >> - { "diagnose_500", VCPU_STAT(diagnose_500) }, >> + { "instruction_diag_10", VCPU_STAT(diagnose_10) }, >> + { "instruction_diag_44", VCPU_STAT(diagnose_44) }, >> + { "instruction_diag_9c", VCPU_STAT(diagnose_9c) }, >> + { "instruction_diag_258", VCPU_STAT(diagnose_258) }, >> + { "instruction_diag_308", VCPU_STAT(diagnose_308) }, >> + { "instruction_diag_500", VCPU_STAT(diagnose_500) }, >> { NULL } >> }; >> >> > > I guess we can change as this is no kernel API? Dont think so. This contains a lot of implementation detail counts (e.g. attempted poll). The only user seems to be kvm_stat, which will continue to work as is. And Stefan is working on a feature to group instruction_* under exit_instruction when you press x. With this kernel patch you would get the same for diagnoses as well so I though that this patch makes sense. > > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> >