Skip to contentSkip to conversation

tools/kvm_stat: Fix kvm_exit filter name

PATCH In review Gavin Shan 2 participants 4 messages Dec 17, 2019 – Jan 14, 2020 KVM

lore
Share & tools
lore

Gavin Shan

author
#0 lore raw

PATCH v2 1/1 tools/kvm_stat: Fix kvm_exit filter name

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 by ioctl(fd, SET_FILTER).

---
v2: Rename exit_field to exit_reason_field
Fix the name to esr_ec for aarch64

---
 tools/kvm/kvm_stat/kvm_stat | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tools/kvm/kvm_stat/kvm_stat +6 -2
index ad1b9e646c49..4cf93110c259 100755
@@ -270,6 +270,7 @@ class ArchX86(Arch):
     def __init__(self, exit_reasons):
         self.sc_perf_evt_open = 298
         self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = 'exit_reason'
         self.exit_reasons = exit_reasons
 
     def debugfs_is_child(self, field):
@@ -289,6 +290,7 @@ class ArchPPC(Arch):
         # numbers depend on the wordsize.
         char_ptr_size = ctypes.sizeof(ctypes.c_char_p)
         self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16
+        self.exit_reason_field = 'exit_nr'
         self.exit_reasons = {}
 
     def debugfs_is_child(self, field):
@@ -300,6 +302,7 @@ class ArchA64(Arch):
     def __init__(self):
         self.sc_perf_evt_open = 241
         self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = 'esr_ec'
         self.exit_reasons = AARCH64_EXIT_REASONS
 
     def debugfs_is_child(self, field):
@@ -311,6 +314,7 @@ class ArchS390(Arch):
     def __init__(self):
         self.sc_perf_evt_open = 331
         self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = None
         self.exit_reasons = None
 
     def debugfs_is_child(self, field):
@@ -541,8 +545,8 @@ class TracepointProvider(Provider):
         """
         filters = {}
         filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS)
-        if ARCH.exit_reasons:
-            filters['kvm_exit'] = ('exit_reason', ARCH.exit_reasons)
+        if ARCH.exit_reason_field and ARCH.exit_reasons:
+            filters['kvm_exit'] = (ARCH.exit_reason_field, ARCH.exit_reasons)
         return filters
 
     def _get_available_fields(self):
Signature · 1 line
2.23.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Gavin Shan

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 by ioctl(fd, SET_FILTER).

This wasn't reported by me - I was just the middleman. Credit should go to Jeff Bastian <[email protected]>

Quoted 58 lines

---
v2: Rename exit_field to exit_reason_field
Fix the name to esr_ec for aarch64

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

Looks like a reasonable fix to me.

author
#2 lore raw
Quoted 6 lines · Andrew Jones
Quoted 5 lines · Gavin Shan

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.

Quoted 9 lines
Quoted 5 lines

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 by ioctl(fd, SET_FILTER).

This wasn't reported by me - I was just the middleman. Credit should go to Jeff Bastian <[email protected]>

Sure. Paolo, please let me know if I need post a v3 to fix it up :)

Quoted 54 lines
Quoted 54 lines

---
v2: Rename exit_field to exit_reason_field
Fix the name to esr_ec for aarch64

---
  tools/kvm/kvm_stat/kvm_stat | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
tools/kvm/kvm_stat/kvm_stat +6 -2
index ad1b9e646c49..4cf93110c259 100755
@@ -270,6 +270,7 @@ class ArchX86(Arch):
      def __init__(self, exit_reasons):
          self.sc_perf_evt_open = 298
          self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = 'exit_reason'
          self.exit_reasons = exit_reasons
 
      def debugfs_is_child(self, field):
@@ -289,6 +290,7 @@ class ArchPPC(Arch):
          # numbers depend on the wordsize.
          char_ptr_size = ctypes.sizeof(ctypes.c_char_p)
          self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16
+        self.exit_reason_field = 'exit_nr'
          self.exit_reasons = {}
 
      def debugfs_is_child(self, field):
@@ -300,6 +302,7 @@ class ArchA64(Arch):
      def __init__(self):
          self.sc_perf_evt_open = 241
          self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = 'esr_ec'
          self.exit_reasons = AARCH64_EXIT_REASONS
 
      def debugfs_is_child(self, field):
@@ -311,6 +314,7 @@ class ArchS390(Arch):
      def __init__(self):
          self.sc_perf_evt_open = 331
          self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = None
          self.exit_reasons = None
 
      def debugfs_is_child(self, field):
@@ -541,8 +545,8 @@ class TracepointProvider(Provider):
          """
          filters = {}
          filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS)
-        if ARCH.exit_reasons:
-            filters['kvm_exit'] = ('exit_reason', ARCH.exit_reasons)
+        if ARCH.exit_reason_field and ARCH.exit_reasons:
+            filters['kvm_exit'] = (ARCH.exit_reason_field, ARCH.exit_reasons)
          return filters
 
Quoted 9 lines
Quoted 4 lines
tools/kvm/kvm_stat/kvm_stat +0 -0
      def _get_available_fields(self):
Signature · 1 line
2.23.0

Looks like a reasonable fix to me.

Thanks for the review and comments.

Regards,
Gavin

author
#3 lore raw
Quoted 11 lines · Gavin Shan
Quoted 10 lines · Andrew Jones
Quoted 9 lines · Gavin Shan

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 by ioctl(fd, SET_FILTER).

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

This wasn't reported by me - I was just the middleman. Credit should go to Jeff Bastian <[email protected]>

Sure. Paolo, please let me know if I need post a v3 to fix it up :)

Ping, Paolo :)

Quoted 64 lines
Quoted 56 lines
Quoted 42 lines

---
v2: Rename exit_field to exit_reason_field
     Fix the name to esr_ec for aarch64
---
  tools/kvm/kvm_stat/kvm_stat | 8 ++++++--

  1 file changed, 6 insertions(+), 2 deletions(-)
tools/kvm/kvm_stat/kvm_stat +0 -0
index ad1b9e646c49..4cf93110c259 100755
@@ -270,6 +270,7 @@ class ArchX86(Arch):

      def __init__(self, exit_reasons):
          self.sc_perf_evt_open = 298
          self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = 'exit_reason'
          self.exit_reasons = exit_reasons
      def debugfs_is_child(self, field):

tools/kvm/kvm_stat/kvm_stat +0 -0
@@ -289,6 +290,7 @@ class ArchPPC(Arch):
           # numbers depend on the wordsize.
           char_ptr_size = ctypes.sizeof(ctypes.c_char_p)

          self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16 +        self.exit_reason_field = 'exit_nr'
          self.exit_reasons = {}
      def debugfs_is_child(self, field):

tools/kvm/kvm_stat/kvm_stat +0 -0
@@ -300,6 +302,7 @@ class ArchA64(Arch):

      def __init__(self):
          self.sc_perf_evt_open = 241 self.ioctl_numbers = IOCTL_NUMBERS +        self.exit_reason_field = 'esr_ec' self.exit_reasons = AARCH64_EXIT_REASONS def debugfs_is_child(self, field):

tools/kvm/kvm_stat/kvm_stat +0 -0
@@ -311,6 +314,7 @@ class ArchS390(Arch):

      def __init__(self):
          self.sc_perf_evt_open = 331
          self.ioctl_numbers = IOCTL_NUMBERS
+        self.exit_reason_field = None
          self.exit_reasons = None
      def debugfs_is_child(self, field):

tools/kvm/kvm_stat/kvm_stat +0 -0
@@ -541,8 +545,8 @@ class TracepointProvider(Provider):

          """

Quoted 11 lines

          filters = {}
          filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS) -        if ARCH.exit_reasons:
-            filters['kvm_exit'] = ('exit_reason', ARCH.exit_reasons) +        if ARCH.exit_reason_field and ARCH.exit_reasons:
+            filters['kvm_exit'] = (ARCH.exit_reason_field, ARCH.exit_reasons) return filters
      def _get_available_fields(self):

Signature · 1 line
2.23.0

Looks like a reasonable fix to me.

Quoted 2 lines

Thanks for the review and comments.

Regards,
Gavin