d40fc181eb
Switch all of the sample code to use the function names from tools/lib/bpf so that they're consistent with that, and to declare their own log buffers. This allow the next commit to be purely devoted to getting rid of the duplicate library in samples/bpf. Committer notes: Testing it: On a fedora rawhide container, with clang/llvm 3.9, sharing the host linux kernel git tree: # make O=/tmp/build/linux/ headers_install # make O=/tmp/build/linux -C samples/bpf/ Since I forgot to make it privileged, just tested it outside the container, using what it generated: # uname -a Linux jouet 4.9.0-rc8+ #1 SMP Mon Dec 12 11:20:49 BRT 2016 x86_64 x86_64 x86_64 GNU/Linux # cd /var/lib/docker/devicemapper/mnt/c43e09a53ff56c86a07baf79847f00e2cc2a17a1e2220e1adbf8cbc62734feda/rootfs/tmp/build/linux/samples/bpf/ # ls -la offwaketime -rwxr-xr-x. 1 root root 24200 Dec 15 12:19 offwaketime # file offwaketime offwaketime: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=c940d3f127d5e66cdd680e42d885cb0b64f8a0e4, not stripped # readelf -SW offwaketime_kern.o | grep PROGBITS [ 2] .text PROGBITS 0000000000000000 000040 000000 00 AX 0 0 4 [ 3] kprobe/try_to_wake_up PROGBITS 0000000000000000 000040 0000d8 00 AX 0 0 8 [ 5] tracepoint/sched/sched_switch PROGBITS 0000000000000000 000118 000318 00 AX 0 0 8 [ 7] maps PROGBITS 0000000000000000 000430 000050 00 WA 0 0 4 [ 8] license PROGBITS 0000000000000000 000480 000004 00 WA 0 0 1 [ 9] version PROGBITS 0000000000000000 000484 000004 00 WA 0 0 4 # ./offwaketime | head -5 swapper/1;start_secondary;cpu_startup_entry;schedule_preempt_disabled;schedule;__schedule;-;---;; 106 CPU 0/KVM;entry_SYSCALL_64_fastpath;sys_ioctl;do_vfs_ioctl;kvm_vcpu_ioctl;kvm_arch_vcpu_ioctl_run;kvm_vcpu_block;schedule;__schedule;-;try_to_wake_up;swake_up_locked;swake_up;apic_timer_expired;apic_timer_fn;__hrtimer_run_queues;hrtimer_interrupt;local_apic_timer_interrupt;smp_apic_timer_interrupt;__irqentry_text_start;cpuidle_enter;call_cpuidle;cpu_startup_entry;start_secondary;;swapper/3 2 Compositor;entry_SYSCALL_64_fastpath;sys_futex;do_futex;futex_wait;futex_wait_queue_me;schedule;__schedule;-;try_to_wake_up;futex_requeue;do_futex;sys_futex;entry_SYSCALL_64_fastpath;;SoftwareVsyncTh 5 firefox;entry_SYSCALL_64_fastpath;sys_poll;do_sys_poll;poll_schedule_timeout;schedule_hrtimeout_range;schedule_hrtimeout_range_clock;schedule;__schedule;-;try_to_wake_up;pollwake;__wake_up_common;__wake_up_sync_key;pipe_write;__vfs_write;vfs_write;sys_write;entry_SYSCALL_64_fastpath;;Timer 13 JS Helper;entry_SYSCALL_64_fastpath;sys_futex;do_futex;futex_wait;futex_wait_queue_me;schedule;__schedule;-;try_to_wake_up;do_futex;sys_futex;entry_SYSCALL_64_fastpath;;firefox 2 # Signed-off-by: Joe Stringer <joe@ovn.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Wang Nan <wangnan0@huawei.com> Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/20161214224342.12858-2-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
86 lines
1.7 KiB
C
86 lines
1.7 KiB
C
/* Copyright (c) 2016 Sargun Dhillon <sargun@sargun.me>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
* License as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#define _GNU_SOURCE
|
|
#include <stdio.h>
|
|
#include <linux/bpf.h>
|
|
#include <unistd.h>
|
|
#include "libbpf.h"
|
|
#include "bpf_load.h"
|
|
#include <linux/bpf.h>
|
|
#include "cgroup_helpers.h"
|
|
|
|
#define CGROUP_PATH "/my-cgroup"
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
pid_t remote_pid, local_pid = getpid();
|
|
int cg2, idx = 0, rc = 0;
|
|
char filename[256];
|
|
|
|
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
|
|
if (load_bpf_file(filename)) {
|
|
printf("%s", bpf_log_buf);
|
|
return 1;
|
|
}
|
|
|
|
if (setup_cgroup_environment())
|
|
goto err;
|
|
|
|
cg2 = create_and_get_cgroup(CGROUP_PATH);
|
|
|
|
if (!cg2)
|
|
goto err;
|
|
|
|
if (bpf_map_update_elem(map_fd[0], &idx, &cg2, BPF_ANY)) {
|
|
log_err("Adding target cgroup to map");
|
|
goto err;
|
|
}
|
|
|
|
if (join_cgroup(CGROUP_PATH))
|
|
goto err;
|
|
|
|
/*
|
|
* The installed helper program catched the sync call, and should
|
|
* write it to the map.
|
|
*/
|
|
|
|
sync();
|
|
bpf_map_lookup_elem(map_fd[1], &idx, &remote_pid);
|
|
|
|
if (local_pid != remote_pid) {
|
|
fprintf(stderr,
|
|
"BPF Helper didn't write correct PID to map, but: %d\n",
|
|
remote_pid);
|
|
goto err;
|
|
}
|
|
|
|
/* Verify the negative scenario; leave the cgroup */
|
|
if (join_cgroup("/"))
|
|
goto err;
|
|
|
|
remote_pid = 0;
|
|
bpf_map_update_elem(map_fd[1], &idx, &remote_pid, BPF_ANY);
|
|
|
|
sync();
|
|
bpf_map_lookup_elem(map_fd[1], &idx, &remote_pid);
|
|
|
|
if (local_pid == remote_pid) {
|
|
fprintf(stderr, "BPF cgroup negative test did not work\n");
|
|
goto err;
|
|
}
|
|
|
|
goto out;
|
|
err:
|
|
rc = 1;
|
|
|
|
out:
|
|
close(cg2);
|
|
cleanup_cgroup_environment();
|
|
return rc;
|
|
}
|