Skip to content

Commit 1cc15c3

Browse files
jeromemarchandekyooo
authored andcommitted
tools: Don't use the old bpf_probe_read() helper.
The old bpf_probe_read() helper doesn't work on s390 arch. Use bpf_probe_read_user/kernel() instead. Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
1 parent b63d7e3 commit 1cc15c3

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

tools/filegone.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
bpf_get_current_comm(&data.comm, sizeof(data.comm));
6868
data.pid = pid;
6969
data.action = 'D';
70-
bpf_probe_read(&data.fname, sizeof(data.fname), d_name.name);
70+
bpf_probe_read_kernel(&data.fname, sizeof(data.fname), d_name.name);
7171
7272
currdata.update(&tid, &data);
7373
@@ -92,8 +92,8 @@
9292
bpf_get_current_comm(&data.comm, sizeof(data.comm));
9393
data.pid = pid;
9494
data.action = 'R';
95-
bpf_probe_read(&data.fname, sizeof(data.fname), s_name.name);
96-
bpf_probe_read(&data.fname2, sizeof(data.fname), d_name.name);
95+
bpf_probe_read_kernel(&data.fname, sizeof(data.fname), s_name.name);
96+
bpf_probe_read_kernel(&data.fname2, sizeof(data.fname), d_name.name);
9797
currdata.update(&tid, &data);
9898
9999
return 0;

tools/kvmexit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def valid_args_list(args):
157157
}
158158
// b.* As the cur_pid_tgid meets current pcpu_cache_array for the first time, save it.
159159
cache_p->cache_pid_tgid = cur_pid_tgid;
160-
bpf_probe_read(&cache_p->cache_exit_ct, sizeof(*tmp_info), tmp_info);
160+
bpf_probe_read_kernel(&cache_p->cache_exit_ct, sizeof(*tmp_info), tmp_info);
161161
}
162162
return 0;
163163
}

tools/netqtop.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ static inline int name_filter(struct sk_buff* skb){
3939
/* get device name from skb */
4040
union name_buf real_devname;
4141
struct net_device *dev;
42-
bpf_probe_read(&dev, sizeof(skb->dev), ((char *)skb + offsetof(struct sk_buff, dev)));
43-
bpf_probe_read(&real_devname, IFNAMSIZ, dev->name);
42+
bpf_probe_read_kernel(&dev, sizeof(skb->dev), ((char *)skb + offsetof(struct sk_buff, dev)));
43+
bpf_probe_read_kernel(&real_devname, IFNAMSIZ, dev->name);
4444

4545
int key=0;
4646
union name_buf *leaf = name_map.lookup(&key);
@@ -97,7 +97,7 @@ TRACEPOINT_PROBE(net, net_dev_start_xmit){
9797
TRACEPOINT_PROBE(net, netif_receive_skb){
9898
struct sk_buff skb;
9999

100-
bpf_probe_read(&skb, sizeof(skb), args->skbaddr);
100+
bpf_probe_read_kernel(&skb, sizeof(skb), args->skbaddr);
101101
if(!name_filter(&skb)){
102102
return 0;
103103
}

tools/tcpconnect.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
return 0;
315315
316316
void *iovbase = msghdr->msg_iter.IOV_FIELD->iov_base;
317-
bpf_probe_read(data->pkt, buflen, iovbase);
317+
bpf_probe_read_user(data->pkt, buflen, iovbase);
318318
dns_events.perf_submit(ctx, data, buflen);
319319
320320
delete_and_return:
@@ -343,7 +343,7 @@
343343
if (!event)
344344
return 0;
345345
346-
bpf_probe_read(event->pkt, sizeof(event->pkt), data);
346+
bpf_probe_read_kernel(event->pkt, sizeof(event->pkt), data);
347347
dns_events.perf_submit(ctx, event, sizeof(*event));
348348
return 0;
349349
}

0 commit comments

Comments
 (0)