Merge tag 'v4.17-rc3' into apparmor-next

Linux v4.17-rc3

Merge in v4.17 for LSM updates

Signed-off-by: John Johansen <john.johansen@canonical.com>

4 files changed, 148 insertions, 3 deletions

diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c
index fcd1dd667906..1a0d27757eec 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c
+++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c
@@ -23,7 +23,17 @@
 #include "../../../perf.h"
 #include "../../../util/trace-event.h"
 
+#if PY_MAJOR_VERSION < 3
+#define _PyCapsule_GetPointer(arg1, arg2) \
+  PyCObject_AsVoidPtr(arg1)
+
 PyMODINIT_FUNC initperf_trace_context(void);
+#else
+#define _PyCapsule_GetPointer(arg1, arg2) \
+  PyCapsule_GetPointer((arg1), (arg2))
+
+PyMODINIT_FUNC PyInit_perf_trace_context(void);
+#endif
 
 static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args)
 {
@@ -34,7 +44,7 @@ static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args)
         if (!PyArg_ParseTuple(args, "O", &context))
                 return NULL;
 
-        scripting_context = PyCObject_AsVoidPtr(context);
+        scripting_context = _PyCapsule_GetPointer(context, NULL);
         retval = common_pc(scripting_context);
 
         return Py_BuildValue("i", retval);
@@ -50,7 +60,7 @@ static PyObject *perf_trace_context_common_flags(PyObject *obj,
         if (!PyArg_ParseTuple(args, "O", &context))
                 return NULL;
 
-        scripting_context = PyCObject_AsVoidPtr(context);
+        scripting_context = _PyCapsule_GetPointer(context, NULL);
         retval = common_flags(scripting_context);
 
         return Py_BuildValue("i", retval);
@@ -66,7 +76,7 @@ static PyObject *perf_trace_context_common_lock_depth(PyObject *obj,
         if (!PyArg_ParseTuple(args, "O", &context))
                 return NULL;
 
-        scripting_context = PyCObject_AsVoidPtr(context);
+        scripting_context = _PyCapsule_GetPointer(context, NULL);
         retval = common_lock_depth(scripting_context);
 
         return Py_BuildValue("i", retval);
@@ -82,7 +92,25 @@ static PyMethodDef ContextMethods[] = {
         { NULL, NULL, 0, NULL}
 };
 
+#if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC initperf_trace_context(void)
 {
         (void) Py_InitModule("perf_trace_context", ContextMethods);
 }
+#else
+PyMODINIT_FUNC PyInit_perf_trace_context(void)
+{
+        static struct PyModuleDef moduledef = {
+                PyModuleDef_HEAD_INIT,
+                "perf_trace_context",   /* m_name */
+                "",                     /* m_doc */
+                -1,                     /* m_size */
+                ContextMethods,         /* m_methods */
+                NULL,                   /* m_reload */
+                NULL,                   /* m_traverse */
+                NULL,                   /* m_clear */
+                NULL,                   /* m_free */
+        };
+        return PyModule_Create(&moduledef);
+}
+#endif
diff --git a/tools/perf/scripts/python/bin/mem-phys-addr-record b/tools/perf/scripts/python/bin/mem-phys-addr-record
new file mode 100644
index 000000000000..5a875122a904
--- /dev/null
+++ b/tools/perf/scripts/python/bin/mem-phys-addr-record
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+#
+# Profiling physical memory by all retired load instructions/uops event
+# MEM_INST_RETIRED.ALL_LOADS or MEM_UOPS_RETIRED.ALL_LOADS
+#
+
+load=`perf list | grep mem_inst_retired.all_loads`
+if [ -z "$load" ]; then
+        load=`perf list | grep mem_uops_retired.all_loads`
+fi
+if [ -z "$load" ]; then
+        echo "There is no event to count all retired load instructions/uops."
+        exit 1
+fi
+
+arg=$(echo $load | tr -d ' ')
+arg="$arg:P"
+perf record --phys-data -e $arg $@
diff --git a/tools/perf/scripts/python/bin/mem-phys-addr-report b/tools/perf/scripts/python/bin/mem-phys-addr-report
new file mode 100644
index 000000000000..3f2b847e2eab
--- /dev/null
+++ b/tools/perf/scripts/python/bin/mem-phys-addr-report
@@ -0,0 +1,3 @@
+#!/bin/bash
+# description: resolve physical address samples
+perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/mem-phys-addr.py
diff --git a/tools/perf/scripts/python/mem-phys-addr.py b/tools/perf/scripts/python/mem-phys-addr.py
new file mode 100644
index 000000000000..ebee2c5ae496
--- /dev/null
+++ b/tools/perf/scripts/python/mem-phys-addr.py
@@ -0,0 +1,95 @@
+# mem-phys-addr.py: Resolve physical address samples
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2018, Intel Corporation.
+
+from __future__ import division
+import os
+import sys
+import struct
+import re
+import bisect
+import collections
+
+sys.path.append(os.environ['PERF_EXEC_PATH'] + \
+        '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
+
+#physical address ranges for System RAM
+system_ram = []
+#physical address ranges for Persistent Memory
+pmem = []
+#file object for proc iomem
+f = None
+#Count for each type of memory
+load_mem_type_cnt = collections.Counter()
+#perf event name
+event_name = None
+
+def parse_iomem():
+        global f
+        f = open('/proc/iomem', 'r')
+        for i, j in enumerate(f):
+                m = re.split('-|:',j,2)
+                if m[2].strip() == 'System RAM':
+                        system_ram.append(long(m[0], 16))
+                        system_ram.append(long(m[1], 16))
+                if m[2].strip() == 'Persistent Memory':
+                        pmem.append(long(m[0], 16))
+                        pmem.append(long(m[1], 16))
+
+def print_memory_type():
+        print "Event: %s" % (event_name)
+        print "%-40s  %10s  %10s\n" % ("Memory type", "count", "percentage"),
+        print "%-40s  %10s  %10s\n" % ("----------------------------------------", \
+                                        "-----------", "-----------"),
+        total = sum(load_mem_type_cnt.values())
+        for mem_type, count in sorted(load_mem_type_cnt.most_common(), \
+                                        key = lambda(k, v): (v, k), reverse = True):
+                print "%-40s  %10d  %10.1f%%\n" % (mem_type, count, 100 * count / total),
+
+def trace_begin():
+        parse_iomem()
+
+def trace_end():
+        print_memory_type()
+        f.close()
+
+def is_system_ram(phys_addr):
+        #/proc/iomem is sorted
+        position = bisect.bisect(system_ram, phys_addr)
+        if position % 2 == 0:
+                return False
+        return True
+
+def is_persistent_mem(phys_addr):
+        position = bisect.bisect(pmem, phys_addr)
+        if position % 2 == 0:
+                return False
+        return True
+
+def find_memory_type(phys_addr):
+        if phys_addr == 0:
+                return "N/A"
+        if is_system_ram(phys_addr):
+                return "System RAM"
+
+        if is_persistent_mem(phys_addr):
+                return "Persistent Memory"
+
+        #slow path, search all
+        f.seek(0, 0)
+        for j in f:
+                m = re.split('-|:',j,2)
+                if long(m[0], 16) <= phys_addr <= long(m[1], 16):
+                        return m[2]
+        return "N/A"
+
+def process_event(param_dict):
+        name       = param_dict["ev_name"]
+        sample     = param_dict["sample"]
+        phys_addr  = sample["phys_addr"]
+
+        global event_name
+        if event_name == None:
+                event_name = name
+        load_mem_type_cnt[find_memory_type(phys_addr)] += 1