Merge tag 'perf-core-for-mingo-5.3-20190529' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

BPF:

  Jiri Olsa:

  - Preserve eBPF maps when loading kcore.

  - Fix up DSO name padding in 'perf script --call-trace', as BPF DSO names are
    much larger than what we used to have there.

  - Add --show-bpf-events to 'perf script'.

perf trace:

  Arnaldo Carvalho de Melo:

  - Add string table generators and beautify arguments for the new fspick,
    fsmount, fsconfig, fsopen, move_mount and open_tree syscalls, as well
    as new values for arguments of clone and sync_file_range syscalls.

perf version:

  Arnaldo Carvalho de Melo:

  - Append 12 git SHA chars to the version string.

Namespaces:

  Namhyung Kim:

  - Add missing --namespaces option to 'perf top', to generate and process
    namespace events, just like present for 'perf record'.

Intel PT:

  Andrian Hunter:

  - Fix itrace defaults for 'perf script', not using the 'use_browser' variable
    to figure out what options are better for 'script' and 'report'

  - Allow root fixing up buildid cache permissions in the perf-with-kcore.sh
    script when sharing that cache with another user.

  - Improve sync_switch, a facility used to synchronize decoding of HW
    traces more closely with the point in the kerne where a context
    switch took place, by processing the PERF_RECORD_CONTEXT_SWITCH "in"
    metadata records too.

  - Make the exported-sql-viewer.py GUI also support pyside2, which
    upgrades from qt4 used in pyside to qt5. Use the argparser module
    for more easily addition of new command line args.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 109 insertions, 29 deletions

diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py
index c3eae1d77d36..b2f481b0d28d 100644
--- a/tools/perf/scripts/python/export-to-postgresql.py
+++ b/tools/perf/scripts/python/export-to-postgresql.py
@@ -27,18 +27,31 @@ import datetime
 #
 # fedora:
 #
-#       $ sudo yum install postgresql postgresql-server python-pyside qt-postgresql
+#       $ sudo yum install postgresql postgresql-server qt-postgresql
 #       $ sudo su - postgres -c initdb
 #       $ sudo service postgresql start
 #       $ sudo su - postgres
-#       $ createuser <your user id here>
+#       $ createuser -s <your user id here>    # Older versions may not support -s, in which case answer the prompt below:
 #       Shall the new role be a superuser? (y/n) y
+#       $ sudo yum install python-pyside
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#               $ sudo yum install python3-pyside
+#               $ pip install --user PySide2
+#               $ pip3 install --user PySide2
 #
 # ubuntu:
 #
-#       $ sudo apt-get install postgresql python-pyside.qtsql libqt4-sql-psql
+#       $ sudo apt-get install postgresql
 #       $ sudo su - postgres
 #       $ createuser -s <your user id here>
+#       $ sudo apt-get install python-pyside.qtsql libqt4-sql-psql
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#
+#               $ sudo apt-get install python3-pyside.qtsql libqt4-sql-psql
+#               $ sudo apt-get install python-pyside2.qtsql libqt5sql5-psql
+#               $ sudo apt-get install python3-pyside2.qtsql libqt5sql5-psql
 #
 # An example of using this script with Intel PT:
 #
@@ -199,7 +212,16 @@ import datetime
 #                   print "{0:>6}  {1:>10}  {2:>9}  {3:<30}  {4:>6}  {5:<30}".format(query.value(0), query.value(1), query.value(2), query.value(3), query.value(4), query.value(5))
 #                   call_path_id = query.value(6)
 
-from PySide.QtSql import *
+pyside_version_1 = True
+if not "pyside-version-1" in sys.argv:
+        try:
+                from PySide2.QtSql import *
+                pyside_version_1 = False
+        except:
+                pass
+
+if pyside_version_1:
+        from PySide.QtSql import *
 
 if sys.version_info < (3, 0):
         def toserverstr(str):
@@ -255,11 +277,12 @@ def printdate(*args, **kw_args):
         print(datetime.datetime.today(), *args, sep=' ', **kw_args)
 
 def usage():
-        printerr("Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]")
-        printerr("where:        columns         'all' or 'branches'")
-        printerr("              calls           'calls' => create calls and call_paths table")
-        printerr("              callchains      'callchains' => create call_paths table")
-        raise Exception("Too few arguments")
+        printerr("Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>] [<pyside-version-1>]");
+        printerr("where:  columns            'all' or 'branches'");
+        printerr("        calls              'calls' => create calls and call_paths table");
+        printerr("        callchains         'callchains' => create call_paths table");
+        printerr("        pyside-version-1   'pyside-version-1' => use pyside version 1");
+        raise Exception("Too few or bad arguments")
 
 if (len(sys.argv) < 2):
         usage()
@@ -281,6 +304,8 @@ for i in range(3,len(sys.argv)):
                 perf_db_export_calls = True
         elif (sys.argv[i] == "callchains"):
                 perf_db_export_callchains = True
+        elif (sys.argv[i] == "pyside-version-1"):
+                pass
         else:
                 usage()
 
diff --git a/tools/perf/scripts/python/export-to-sqlite.py b/tools/perf/scripts/python/export-to-sqlite.py
index bf271fbc3a88..f617e518332f 100644
--- a/tools/perf/scripts/python/export-to-sqlite.py
+++ b/tools/perf/scripts/python/export-to-sqlite.py
@@ -21,6 +21,26 @@ import datetime
 # provides LGPL-licensed Python bindings for Qt.  You will also need the package
 # libqt4-sql-sqlite for Qt sqlite3 support.
 #
+# Examples of installing pyside:
+#
+# ubuntu:
+#
+#       $ sudo apt-get install python-pyside.qtsql libqt4-sql-psql
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#
+#               $ sudo apt-get install python3-pyside.qtsql libqt4-sql-psql
+#               $ sudo apt-get install python-pyside2.qtsql libqt5sql5-psql
+#               $ sudo apt-get install python3-pyside2.qtsql libqt5sql5-psql
+# fedora:
+#
+#       $ sudo yum install python-pyside
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#               $ sudo yum install python3-pyside
+#               $ pip install --user PySide2
+#               $ pip3 install --user PySide2
+#
 # An example of using this script with Intel PT:
 #
 #       $ perf record -e intel_pt//u ls
@@ -49,7 +69,16 @@ import datetime
 # difference is  the 'transaction' column of the 'samples' table which is
 # renamed 'transaction_' in sqlite because 'transaction' is a reserved word.
 
-from PySide.QtSql import *
+pyside_version_1 = True
+if not "pyside-version-1" in sys.argv:
+        try:
+                from PySide2.QtSql import *
+                pyside_version_1 = False
+        except:
+                pass
+
+if pyside_version_1:
+        from PySide.QtSql import *
 
 sys.path.append(os.environ['PERF_EXEC_PATH'] + \
         '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
@@ -69,11 +98,12 @@ def printdate(*args, **kw_args):
         print(datetime.datetime.today(), *args, sep=' ', **kw_args)
 
 def usage():
-        printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>]");
-        printerr("where:        columns         'all' or 'branches'");
-        printerr("              calls           'calls' => create calls and call_paths table");
-        printerr("              callchains      'callchains' => create call_paths table");
-        raise Exception("Too few arguments")
+        printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>] [<pyside-version-1>]");
+        printerr("where:  columns            'all' or 'branches'");
+        printerr("        calls              'calls' => create calls and call_paths table");
+        printerr("        callchains         'callchains' => create call_paths table");
+        printerr("        pyside-version-1   'pyside-version-1' => use pyside version 1");
+        raise Exception("Too few or bad arguments")
 
 if (len(sys.argv) < 2):
         usage()
@@ -95,6 +125,8 @@ for i in range(3,len(sys.argv)):
                 perf_db_export_calls = True
         elif (sys.argv[i] == "callchains"):
                 perf_db_export_callchains = True
+        elif (sys.argv[i] == "pyside-version-1"):
+                pass
         else:
                 usage()
 
diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index affed7d149be..6fe553258ce5 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # SPDX-License-Identifier: GPL-2.0
 # exported-sql-viewer.py: view data from sql database
 # Copyright (c) 2014-2018, Intel Corporation.
@@ -91,6 +91,7 @@
 from __future__ import print_function
 
 import sys
+import argparse
 import weakref
 import threading
 import string
@@ -104,10 +105,23 @@ except ImportError:
         glb_nsz = 16
 import re
 import os
-from PySide.QtCore import *
-from PySide.QtGui import *
-from PySide.QtSql import *
+
 pyside_version_1 = True
+if not "--pyside-version-1" in sys.argv:
+        try:
+                from PySide2.QtCore import *
+                from PySide2.QtGui import *
+                from PySide2.QtSql import *
+                from PySide2.QtWidgets import *
+                pyside_version_1 = False
+        except:
+                pass
+
+if pyside_version_1:
+        from PySide.QtCore import *
+        from PySide.QtGui import *
+        from PySide.QtSql import *
+
 from decimal import *
 from ctypes import *
 from multiprocessing import Process, Array, Value, Event
@@ -2754,7 +2768,7 @@ class WindowMenu():
                         action = self.window_menu.addAction(label)
                         action.setCheckable(True)
                         action.setChecked(sub_window == self.mdi_area.activeSubWindow())
-                        action.triggered.connect(lambda x=nr: self.setActiveSubWindow(x))
+                        action.triggered.connect(lambda a=None,x=nr: self.setActiveSubWindow(x))
                         self.window_menu.addAction(action)
                         nr += 1
 
@@ -3114,14 +3128,14 @@ class MainWindow(QMainWindow):
                         event = event.split(":")[0]
                         if event == "branches":
                                 label = "All branches" if branches_events == 1 else "All branches " + "(id=" + dbid + ")"
-                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda x=dbid: self.NewBranchView(x), self))
+                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda a=None,x=dbid: self.NewBranchView(x), self))
                                 label = "Selected branches" if branches_events == 1 else "Selected branches " + "(id=" + dbid + ")"
-                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda x=dbid: self.NewSelectedBranchView(x), self))
+                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda a=None,x=dbid: self.NewSelectedBranchView(x), self))
 
         def TableMenu(self, tables, menu):
                 table_menu = menu.addMenu("&Tables")
                 for table in tables:
-                        table_menu.addAction(CreateAction(table, "Create a new window containing a table view", lambda t=table: self.NewTableView(t), self))
+                        table_menu.addAction(CreateAction(table, "Create a new window containing a table view", lambda a=None,t=table: self.NewTableView(t), self))
 
         def NewCallGraph(self):
                 CallGraphWindow(self.glb, self)
@@ -3361,18 +3375,27 @@ class DBRef():
 # Main
 
 def Main():
-        if (len(sys.argv) < 2):
-                printerr("Usage is: exported-sql-viewer.py {<database name> | --help-only}");
-                raise Exception("Too few arguments")
-
-        dbname = sys.argv[1]
-        if dbname == "--help-only":
+        usage_str =     "exported-sql-viewer.py [--pyside-version-1] <database name>\n" \
+                        "   or: exported-sql-viewer.py --help-only"
+        ap = argparse.ArgumentParser(usage = usage_str, add_help = False)
+        ap.add_argument("--pyside-version-1", action='store_true')
+        ap.add_argument("dbname", nargs="?")
+        ap.add_argument("--help-only", action='store_true')
+        args = ap.parse_args()
+
+        if args.help_only:
                 app = QApplication(sys.argv)
                 mainwindow = HelpOnlyWindow()
                 mainwindow.show()
                 err = app.exec_()
                 sys.exit(err)
 
+        dbname = args.dbname
+        if dbname is None:
+                ap.print_usage()
+                print("Too few arguments")
+                sys.exit(1)
+
         is_sqlite3 = False
         try:
                 f = open(dbname, "rb")