lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/kvm_stat: Fix kvm_exit filter name

Browse Source 
commit 5fcf3a55a62afb0760ccb6f391d62f20bce4a42f upstream.

The filter name is fixed to "exit_reason" for some kvm_exit events, no
matter what architect we have. Actually, the filter name ("exit_reason")
is only applicable to x86, meaning it's broken on other architects
including aarch64.

This fixes the issue by providing various kvm_exit filter names, depending
on architect we're on. Afterwards, the variable filter name is picked and
applied through ioctl(fd, SET_FILTER).

Reported-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Gavin Shan <gshan@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gavin Shan 2019-12-10 15:48:29 +11:00 committed by Greg Kroah-Hartman
parent 7a19bd6fe2
commit 726599c637
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/kvm/kvm_stat/kvm_stat
View File

@ -270,6 +270,7 @@ class ArchX86(Arch):
def __init__(self, exit_reasons): def __init__(self, exit_reasons):
self.sc_perf_evt_open = 298 self.sc_perf_evt_open = 298
self.ioctl_numbers = IOCTL_NUMBERS self.ioctl_numbers = IOCTL_NUMBERS
self.exit_reason_field = 'exit_reason'
self.exit_reasons = exit_reasons self.exit_reasons = exit_reasons
def debugfs_is_child(self, field): def debugfs_is_child(self, field):
@ -289,6 +290,7 @@ class ArchPPC(Arch):
# numbers depend on the wordsize. # numbers depend on the wordsize.
char_ptr_size = ctypes.sizeof(ctypes.c_char_p) char_ptr_size = ctypes.sizeof(ctypes.c_char_p)
self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16 self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16
self.exit_reason_field = 'exit_nr'
self.exit_reasons = {} self.exit_reasons = {}
def debugfs_is_child(self, field): def debugfs_is_child(self, field):
@ -300,6 +302,7 @@ class ArchA64(Arch):
def __init__(self): def __init__(self):
self.sc_perf_evt_open = 241 self.sc_perf_evt_open = 241
self.ioctl_numbers = IOCTL_NUMBERS self.ioctl_numbers = IOCTL_NUMBERS
self.exit_reason_field = 'esr_ec'
self.exit_reasons = AARCH64_EXIT_REASONS self.exit_reasons = AARCH64_EXIT_REASONS
def debugfs_is_child(self, field): def debugfs_is_child(self, field):
@ -311,6 +314,7 @@ class ArchS390(Arch):
def __init__(self): def __init__(self):
self.sc_perf_evt_open = 331 self.sc_perf_evt_open = 331
self.ioctl_numbers = IOCTL_NUMBERS self.ioctl_numbers = IOCTL_NUMBERS
self.exit_reason_field = None
self.exit_reasons = None self.exit_reasons = None
def debugfs_is_child(self, field): def debugfs_is_child(self, field):
@ -541,8 +545,8 @@ class TracepointProvider(Provider):
""" """
filters = {} filters = {}
filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS) filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS)
if ARCH.exit_reasons: if ARCH.exit_reason_field and ARCH.exit_reasons:
filters['kvm_exit'] = ('exit_reason', ARCH.exit_reasons) filters['kvm_exit'] = (ARCH.exit_reason_field, ARCH.exit_reasons)
return filters return filters
def _get_available_fields(self): def _get_available_fields(self):