Skip to content

Commit 17d5d6f

Browse files
author
CKI KWF Bot
committed
Merge: selftests/ftrace: Use readelf to find entry point in uprobe test
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1381 # Merge Request Required Information JIRA: https://issues.redhat.com/browse/RHEL-87219 ## Summary of Changes Use "readelf -h" to find the entrypoint of /bin/sh when adding the uprobe event, and add a check to make sure readelf is installed. Signed-off-by: Anubhav Shelat <ashelat@redhat.com> Approved-by: jbrnak <jbrnak@redhat.com> Approved-by: tallison1 <tallison@redhat.com> Approved-by: Michael Petlan <mpetlan@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents c52a1a6 + 7478788 commit 17d5d6f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@
33
# description: Generic dynamic event - add/remove/test uprobe events
44
# requires: uprobe_events
55

6+
if ! which readelf > /dev/null 2>&1 ; then
7+
echo "No readelf found. skipped."
8+
exit_unresolved
9+
fi
10+
611
echo 0 > events/enable
712
echo > dynamic_events
813

9-
echo 'cat /proc/$$/maps' | /bin/sh | \
10-
grep "r-xp .*/bin/.*sh$" | \
11-
awk '{printf "p:myevent %s:0x%s\n", $6,$3 }' >> uprobe_events
14+
REALBIN=`readlink -f /bin/sh`
15+
ENTRYPOINT=`readelf -h ${REALBIN} | grep Entry | sed -e 's/[^0]*//'`
16+
17+
echo "p:myevent ${REALBIN}:${ENTRYPOINT}" >> uprobe_events
1218

1319
grep -q myevent uprobe_events
1420
test -d events/uprobes/myevent

0 commit comments

Comments
 (0)