diff options
| author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2015-07-06 16:20:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-09 00:17:45 +0200 |
| commit | d912557b346099584bbbfa8d3c1e101c46e33b59 (patch) | |
| tree | 2752bc31be26f1c27776a0d52439efdd81f9eed7 /samples/bpf/tracex4_kern.c | |
| parent | net: macb: Add SG support for Zynq SOC family (diff) | |
| download | linux-d912557b346099584bbbfa8d3c1e101c46e33b59.tar.xz linux-d912557b346099584bbbfa8d3c1e101c46e33b59.zip | |
samples: bpf: enable trace samples for s390x
The trace bpf samples do not compile on s390x because they use x86
specific fields from the "pt_regs" structure.
Fix this and access the fields via new PT_REGS macros.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf/tracex4_kern.c')
| -rw-r--r-- | samples/bpf/tracex4_kern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samples/bpf/tracex4_kern.c b/samples/bpf/tracex4_kern.c index 126b80512228..ac4671420cf1 100644 --- a/samples/bpf/tracex4_kern.c +++ b/samples/bpf/tracex4_kern.c @@ -27,7 +27,7 @@ struct bpf_map_def SEC("maps") my_map = { SEC("kprobe/kmem_cache_free") int bpf_prog1(struct pt_regs *ctx) { - long ptr = ctx->si; + long ptr = PT_REGS_PARM2(ctx); bpf_map_delete_elem(&my_map, &ptr); return 0; @@ -36,11 +36,11 @@ int bpf_prog1(struct pt_regs *ctx) SEC("kretprobe/kmem_cache_alloc_node") int bpf_prog2(struct pt_regs *ctx) { - long ptr = ctx->ax; + long ptr = PT_REGS_RC(ctx); long ip = 0; /* get ip address of kmem_cache_alloc_node() caller */ - bpf_probe_read(&ip, sizeof(ip), (void *)(ctx->bp + sizeof(ip))); + bpf_probe_read(&ip, sizeof(ip), (void *)(PT_REGS_FP(ctx) + sizeof(ip))); struct pair v = { .val = bpf_ktime_get_ns(), |