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-08 15:17:45 -0700 |
| commit | d912557b346099584bbbfa8d3c1e101c46e33b59 (patch) | |
| tree | 2752bc31be26f1c27776a0d52439efdd81f9eed7 /samples/bpf/tracex2_kern.c | |
| parent | net: macb: Add SG support for Zynq SOC family (diff) | |
| download | wireguard-linux-d912557b346099584bbbfa8d3c1e101c46e33b59.tar.xz wireguard-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/tracex2_kern.c')
| -rw-r--r-- | samples/bpf/tracex2_kern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samples/bpf/tracex2_kern.c b/samples/bpf/tracex2_kern.c index dc50f4f2943f..b32367cfbff4 100644 --- a/samples/bpf/tracex2_kern.c +++ b/samples/bpf/tracex2_kern.c @@ -27,10 +27,10 @@ int bpf_prog2(struct pt_regs *ctx) long init_val = 1; long *value; - /* x64 specific: read ip of kfree_skb caller. + /* x64/s390x specific: read ip of kfree_skb caller. * non-portable version of __builtin_return_address(0) */ - bpf_probe_read(&loc, sizeof(loc), (void *)ctx->sp); + bpf_probe_read(&loc, sizeof(loc), (void *)PT_REGS_RET(ctx)); value = bpf_map_lookup_elem(&my_map, &loc); if (value) @@ -79,7 +79,7 @@ struct bpf_map_def SEC("maps") my_hist_map = { SEC("kprobe/sys_write") int bpf_prog3(struct pt_regs *ctx) { - long write_size = ctx->dx; /* arg3 */ + long write_size = PT_REGS_PARM3(ctx); long init_val = 1; long *value; struct hist_key key = {}; |