[kernel] r20133 - in dists/wheezy/linux-tools/debian: . patches

[Ben Hutchings]

Author: benh
Date: Tue May 21 01:13:03 2013
New Revision: 20133

Log:
perf script: Fix net_dropmonitor script (Closes: #708994)

Added:
   dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-symbol-relative-addresses.patch
   dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-trace-parameter-order.patch
Modified:
   dists/wheezy/linux-tools/debian/changelog
   dists/wheezy/linux-tools/debian/patches/series

Modified: dists/wheezy/linux-tools/debian/changelog
==============================================================================
--- dists/wheezy/linux-tools/debian/changelog	Sun May 19 00:31:17 2013	(r20132)
+++ dists/wheezy/linux-tools/debian/changelog	Tue May 21 01:13:03 2013	(r20133)
@@ -9,6 +9,7 @@
 
   [ Ben Hutchings ]
   * perf evlist: Fix errno value reporting on failed mmap (Closes: #696957)
+  * perf script: Fix net_dropmonitor script (Closes: #708994)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 20 Jan 2013 15:42:26 +0000
 

Added: dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-symbol-relative-addresses.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-symbol-relative-addresses.patch	Tue May 21 01:13:03 2013	(r20133)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 20 May 2013 05:02:44 +0100
+Subject: [PATCH 2/2] perf: net_dropmonitor: Fix symbol-relative addresses
+Bug-Debian: http://bugs.debian.org/708994
+Forwarded: http://mid.gmane.org/<1369097126.3469.133.camel@deadeye.wl.decadent.org.uk>
+
+The comparison between traced and symbol addresses is backwards: if
+the traced address doesn't exactly match a symbol (which we don't
+expect it to), we'll show the next symbol and the offset to it,
+whereas we should show the previous symbol and the offset from it.
+
+Cc: stable at vger.kernel.org
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ tools/perf/scripts/python/net_dropmonitor.py |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
+index adbfbf0..4c11605 100755
+--- a/tools/perf/scripts/python/net_dropmonitor.py
++++ b/tools/perf/scripts/python/net_dropmonitor.py
+@@ -40,9 +40,9 @@ def get_kallsyms_table():
+ 
+ def get_sym(sloc):
+ 	loc = int(sloc)
+-	for i in kallsyms:
+-		if (i['loc'] >= loc):
+-			return (i['name'], i['loc']-loc)
++	for i in kallsyms[::-1]:
++		if loc >= i['loc']:
++			return (i['name'], loc - i['loc'])
+ 	return (None, 0)
+ 
+ def print_drop_table():

Added: dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-trace-parameter-order.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux-tools/debian/patches/perf-net_dropmonitor-Fix-trace-parameter-order.patch	Tue May 21 01:13:03 2013	(r20133)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 21 May 2013 00:35:15 +0100
+Subject: [PATCH 1/2] perf: net_dropmonitor: Fix trace parameter order
+Bug-Debian: http://bugs.debian.org/708994
+Forwarded: http://mid.gmane.org/<1369097083.3469.132.camel@deadeye.wl.decadent.org.uk>
+
+This works much better if we don't treat protocol numbers as addresses.
+
+Cc: stable at vger.kernel.org
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ tools/perf/scripts/python/net_dropmonitor.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
+index a4ffc95..adbfbf0 100755
+--- a/tools/perf/scripts/python/net_dropmonitor.py
++++ b/tools/perf/scripts/python/net_dropmonitor.py
+@@ -64,7 +64,7 @@ def trace_end():
+ 
+ # called from perf, when it finds a correspoinding event
+ def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm,
+-			skbaddr, protocol, location):
++		   skbaddr, location, protocol):
+ 	slocation = str(location)
+ 	try:
+ 		drop_log[slocation] = drop_log[slocation] + 1

Modified: dists/wheezy/linux-tools/debian/patches/series
==============================================================================
--- dists/wheezy/linux-tools/debian/patches/series	Sun May 19 00:31:17 2013	(r20132)
+++ dists/wheezy/linux-tools/debian/patches/series	Tue May 21 01:13:03 2013	(r20133)
@@ -5,3 +5,5 @@
 usbip-fix-explicit-configure-with-tcp-wrappers.patch
 usbip-document-tcp-wrappers.patch
 perf-evlist-Fix-errno-value-reporting-on-failed-mmap.patch
+perf-net_dropmonitor-Fix-trace-parameter-order.patch
+perf-net_dropmonitor-Fix-symbol-relative-addresses.patch