linux-kernel - [PATCH] perf script: Align kfree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230426104149.14089-1-sriram.yagnaraman@est.tech>
Date:   Wed, 26 Apr 2023 12:41:49 +0200
From:   Sriram Yagnaraman <sriram.yagnaraman@....tech>
To:     linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Jiri Olsa <jolsa@...nel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        Ian Rogers <irogers@...gle.com>,
        Adrian Hunter <adrian.hunter@...el.com>,
        Sriram Yagnaraman <sriram.yagnaraman@....tech>
Subject: [PATCH] perf script: Align kfree_skb tracepoint parameters

Not sure if the scripts changed in this patch are used, but nevertheless
here is a patch with a minor bug fix.
---

Include reason parameter that was added in
commit c504e5c2f964 ("net: skb: introduce kfree_skb_reason()")

Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@....tech>
---
 tools/perf/scripts/python/net_dropmonitor.py | 4 ++--
 tools/perf/scripts/python/netdev-times.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
index 101059971738..a97e7a6e0940 100755
--- a/tools/perf/scripts/python/net_dropmonitor.py
+++ b/tools/perf/scripts/python/net_dropmonitor.py
@@ -68,9 +68,9 @@ def trace_end():
 	get_kallsyms_table()
 	print_drop_table()
 
-# called from perf, when it finds a correspoinding event
+# called from perf, when it finds a corresponding event
 def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain,
-		   skbaddr, location, protocol):
+		   skbaddr, location, protocol, reason):
 	slocation = str(location)
 	try:
 		drop_log[slocation] = drop_log[slocation] + 1
diff --git a/tools/perf/scripts/python/netdev-times.py b/tools/perf/scripts/python/netdev-times.py
index a0cfc7fe5908..00552eeb7178 100644
--- a/tools/perf/scripts/python/netdev-times.py
+++ b/tools/perf/scripts/python/netdev-times.py
@@ -288,9 +288,9 @@ def net__net_dev_xmit(name, context, cpu, sec, nsec, pid, comm, callchain,
 	all_event_list.append(event_info)
 
 def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain,
-			skbaddr, protocol, location):
+			skbaddr, location, protocol, reason):
 	event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
-			skbaddr, protocol, location)
+			skbaddr, location, protocol, reason)
 	all_event_list.append(event_info)
 
 def skb__consume_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr):
@@ -430,7 +430,7 @@ def handle_net_dev_xmit(event_info):
 
 def handle_kfree_skb(event_info):
 	(name, context, cpu, time, pid, comm,
-		skbaddr, protocol, location) = event_info
+		skbaddr, location, protocol, reason) = event_info
 	for i in range(len(tx_queue_list)):
 		skb = tx_queue_list[i]
 		if skb['skbaddr'] == skbaddr:
-- 
2.34.1