summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/guest-diag/sempages.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/tools/guest-diag/sempages.py b/tools/guest-diag/sempages.py
index ad4dae6..f8d15b2 100755
--- a/tools/guest-diag/sempages.py
+++ b/tools/guest-diag/sempages.py
@@ -29,9 +29,25 @@ else:
raise SystemExit(1)
fd = os.open('/proc/%d/mem' % pid, os.O_RDONLY)
-sems = m.sem_objs(pid, fd, lo, hi)
+# Pin what libcuda actually polls: the semaphore objects referenced by the
+# client's trackers (and the semaphore memory they point at). Scanning for
+# bare sem-object shapes matches far too many pages once the ring/pushbuffer
+# windows are in range; trackers are a structural reference, so pinning is
+# limited to pages the client really waits on. Fall back to the shape scan
+# only when no tracker resolves.
+pages = set()
+trackers = m.find_trackers(pid, fd, lo, hi, limit=256)
+for _p, _sub, _last, _cur, sem, mem in trackers:
+ if sem:
+ pages.add(sem & ~0xfff)
+ if mem:
+ pages.add(mem & ~0xfff)
+if not pages:
+ sems = m.sem_objs(pid, fd, lo, hi)
+ pages = {va & ~0xfff for va in sems}
os.close(fd)
-pages = sorted({va & ~0xfff for va in sems})
-print('sem VAs: %d pages: %d (window 0x%x..0x%x)' % (len(sems), len(pages), lo, hi))
+pages = sorted(pages)
+print('trackers: %d pages: %d (window 0x%x..0x%x)' %
+ (len(trackers), len(pages), lo, hi))
for pg in pages:
print('0x%x' % pg)