Commit 09fd61d3 authored by David S. Miller's avatar David S. Miller

Merge branch 'perf_net_dropmonitor'

Ben Hutchings says:

====================
Somewhat surprisingly, the net_dropmonitor reporting script doesn't work
at all.  This series fixes it and then makes it slightly more efficient.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
parents 36803542 6b75c735
...@@ -15,34 +15,37 @@ kallsyms = [] ...@@ -15,34 +15,37 @@ kallsyms = []
def get_kallsyms_table(): def get_kallsyms_table():
global kallsyms global kallsyms
try: try:
f = open("/proc/kallsyms", "r") f = open("/proc/kallsyms", "r")
linecount = 0
for line in f:
linecount = linecount+1
f.seek(0)
except: except:
return return
j = 0
for line in f: for line in f:
loc = int(line.split()[0], 16) loc = int(line.split()[0], 16)
name = line.split()[2] name = line.split()[2]
j = j +1 kallsyms.append((loc, name))
if ((j % 100) == 0):
print "\r" + str(j) + "/" + str(linecount),
kallsyms.append({ 'loc': loc, 'name' : name})
print "\r" + str(j) + "/" + str(linecount)
kallsyms.sort() kallsyms.sort()
return
def get_sym(sloc): def get_sym(sloc):
loc = int(sloc) loc = int(sloc)
for i in kallsyms:
if (i['loc'] >= loc): # Invariant: kallsyms[i][0] <= loc for all 0 <= i <= start
return (i['name'], i['loc']-loc) # kallsyms[i][0] > loc for all end <= i < len(kallsyms)
start, end = -1, len(kallsyms)
while end != start + 1:
pivot = (start + end) // 2
if loc < kallsyms[pivot][0]:
end = pivot
else:
start = pivot
# Now (start == -1 or kallsyms[start][0] <= loc)
# and (start == len(kallsyms) - 1 or loc < kallsyms[start + 1][0])
if start >= 0:
symloc, name = kallsyms[start]
return (name, loc - symloc)
else:
return (None, 0) return (None, 0)
def print_drop_table(): def print_drop_table():
...@@ -64,7 +67,7 @@ def trace_end(): ...@@ -64,7 +67,7 @@ def trace_end():
# called from perf, when it finds a correspoinding event # called from perf, when it finds a correspoinding event
def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm,
skbaddr, protocol, location): skbaddr, location, protocol):
slocation = str(location) slocation = str(location)
try: try:
drop_log[slocation] = drop_log[slocation] + 1 drop_log[slocation] = drop_log[slocation] + 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment