linux-stable.git/tools/kvm, branch v4.18.2

tools/kvm_stat: Remove unused function

2018-03-28T20:47:06+00:00

Unused since added in 18e8f4100

Signed-off-by: Cole Robinson 
Reviewed-and-tested-by: Stefan Raspl 
Signed-off-by: Radim Krčmář

tools/kvm_stat: Don't use deprecated file()

2018-03-28T20:47:06+00:00

$ python3 tools/kvm/kvm_stat/kvm_stat
Traceback (most recent call last):
  File "tools/kvm/kvm_stat/kvm_stat", line 1668, in 
    main()
  File "tools/kvm/kvm_stat/kvm_stat", line 1639, in main
    assign_globals()
  File "tools/kvm/kvm_stat/kvm_stat", line 1618, in assign_globals
    for line in file('/proc/mounts'):
NameError: name 'file' is not defined

open() is the python3 way, and works on python2.6+

Signed-off-by: Cole Robinson 
Reviewed-and-tested-by: Stefan Raspl 
Signed-off-by: Radim Krčmář

tools/kvm_stat: Fix python3 syntax

2018-03-28T20:47:06+00:00

$ python3 tools/kvm/kvm_stat/kvm_stat
  File "tools/kvm/kvm_stat/kvm_stat", line 1137
    def sortkey((_k, v)):
                ^
SyntaxError: invalid syntax

Fix it in a way that's compatible with python2 and python3

Signed-off-by: Cole Robinson 
Tested-by: Stefan Raspl 
Signed-off-by: Radim Krčmář

tools/kvm_stat: print 'Total' line for multiple events only

2018-02-24T00:43:46+00:00

The 'Total' line looks a bit weird when we have a single event only. This
can happen e.g. due to filters. Therefore suppress when there's only a
single event in the output.

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: group child events indented after parent

2018-02-24T00:43:45+00:00

We keep the current logic that sorts all events (parent and child), but
re-shuffle the events afterwards, grouping the children after the
respective parent. Note that the percentage column for child events
gives the percentage of the parent's total.
Since we rework the logic anyway, we modify the total average
calculation to use the raw numbers instead of the (rounded) averages.
Note that this can result in differing numbers (between total average
and the sum of the individual averages) due to rounding errors.

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: separate drilldown and fields filtering

2018-02-24T00:43:44+00:00

Drilldown (i.e. toggle display of child trace events) was implemented by
overriding the fields filter. This resulted in inconsistencies: E.g. when
drilldown was not active, adding a filter that also matches child trace
events would not only filter fields according to the filter, but also add
in the child trace events matching the filter. E.g. on x86, setting
'kvm_userspace_exit' as the fields filter after startup would result in
display of kvm_userspace_exit(DCR), although that wasn't previously
present - not exactly what one would expect from a filter.
This patch addresses the issue by keeping drilldown and fields filter
separate. While at it, we also fix a PEP8 issue by adding a blank line
at one place (since we're in the area...).
We implement this by adding a framework that also allows to define a
taxonomy among the debugfs events to identify child trace events. I.e.
drilldown using 'x' can now also work with debugfs. A respective parent-
child relationship is only known for S390 at the moment, but could be
added adjusting other platforms' ARCH.dbg_is_child() methods
accordingly.

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: eliminate extra guest/pid selection dialog

2018-02-24T00:43:44+00:00

We can do with a single dialog that takes both, pids and guest names.
Note that we keep both interactive commands, 'p' and 'g' for now, to
avoid confusion among users used to a specific key.

While at it, we improve on some minor glitches regarding curses usage,
e.g. cursor still visible when not supposed to be.

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: mark private methods as such

2018-02-24T00:43:43+00:00

Helps quite a bit reading the code when it's obvious when a method is
intended for internal use only.

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: fix debugfs handling

2018-02-24T00:43:42+00:00

Te checks for debugfs assumed that debugfs is always mounted at
/sys/kernel/debug - which is likely, but not guaranteed. This is addressed
by checking /proc/mounts for the actual location.
Furthermore, when debugfs was mounted, but the kvm module not loaded, a
misleading error pointing towards debugfs not present was given.
To reproduce,
(a) run kvm_stat with debugfs mounted at a place different from
    /sys/kernel/debug
(b) run kvm_stat with debugfs mounted but kvm module not loaded

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini

tools/kvm_stat: print error on invalid regex

2018-02-24T00:43:41+00:00

Entering an invalid regular expression did not produce any indication of an
error so far.
To reproduce, press 'f' and enter 'foo(' (with an unescaped bracket).

Signed-off-by: Stefan Raspl 
Signed-off-by: Paolo Bonzini