Skip to content

Commit

Permalink
selftests: bpf: modify urandom_read and link it non-statically
Browse files Browse the repository at this point in the history
After some experiences I found that urandom_read does not need to be
linked statically. When the 'read' syscall call is moved to separate
non-inlined function then bpf_get_stackid() is able to find
the executable in stack trace and extract its build_id from it.

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Ivan Vecera authored and Alexei Starovoitov committed Mar 22, 2019
1 parent ab99e7a commit f682752
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read
all: $(TEST_CUSTOM_PROGS)

$(OUTPUT)/urandom_read: $(OUTPUT)/%: %.c
$(CC) -o $@ -static $< -Wl,--build-id
$(CC) -o $@ $< -Wl,--build-id

BPFOBJ := $(OUTPUT)/libbpf.a

Expand Down
15 changes: 11 additions & 4 deletions tools/testing/selftests/bpf/urandom_read.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@

#define BUF_SIZE 256

static __attribute__((noinline))
void urandom_read(int fd, int count)
{
char buf[BUF_SIZE];
int i;

for (i = 0; i < count; ++i)
read(fd, buf, BUF_SIZE);
}

int main(int argc, char *argv[])
{
int fd = open("/dev/urandom", O_RDONLY);
int i;
char buf[BUF_SIZE];
int count = 4;

if (fd < 0)
Expand All @@ -20,8 +28,7 @@ int main(int argc, char *argv[])
if (argc == 2)
count = atoi(argv[1]);

for (i = 0; i < count; ++i)
read(fd, buf, BUF_SIZE);
urandom_read(fd, count);

close(fd);
return 0;
Expand Down

0 comments on commit f682752

Please sign in to comment.