aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-05 15:31:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-05 15:31:59 -0400
commit5518b69b76680a4f2df96b1deca260059db0c2de (patch)
treef33cd1519c8efb4590500f2f9617400be233238c /tools/lib
parent8ad06e56dcbc1984ef0ff8f6e3c19982c5809f73 (diff)
parent0e72582270c07850b92cac351c8b97d4f9c123b9 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller: "Reasonably busy this cycle, but perhaps not as busy as in the 4.12 merge window: 1) Several optimizations for UDP processing under high load from Paolo Abeni. 2) Support pacing internally in TCP when using the sch_fq packet scheduler for this is not practical. From Eric Dumazet. 3) Support mutliple filter chains per qdisc, from Jiri Pirko. 4) Move to 1ms TCP timestamp clock, from Eric Dumazet. 5) Add batch dequeueing to vhost_net, from Jason Wang. 6) Flesh out more completely SCTP checksum offload support, from Davide Caratti. 7) More plumbing of extended netlink ACKs, from David Ahern, Pablo Neira Ayuso, and Matthias Schiffer. 8) Add devlink support to nfp driver, from Simon Horman. 9) Add RTM_F_FIB_MATCH flag to RTM_GETROUTE queries, from Roopa Prabhu. 10) Add stack depth tracking to BPF verifier and use this information in the various eBPF JITs. From Alexei Starovoitov. 11) Support XDP on qed device VFs, from Yuval Mintz. 12) Introduce BPF PROG ID for better introspection of installed BPF programs. From Martin KaFai Lau. 13) Add bpf_set_hash helper for TC bpf programs, from Daniel Borkmann. 14) For loads, allow narrower accesses in bpf verifier checking, from Yonghong Song. 15) Support MIPS in the BPF selftests and samples infrastructure, the MIPS eBPF JIT will be merged in via the MIPS GIT tree. From David Daney. 16) Support kernel based TLS, from Dave Watson and others. 17) Remove completely DST garbage collection, from Wei Wang. 18) Allow installing TCP MD5 rules using prefixes, from Ivan Delalande. 19) Add XDP support to Intel i40e driver, from Björn Töpel 20) Add support for TC flower offload in nfp driver, from Simon Horman, Pieter Jansen van Vuuren, Benjamin LaHaise, Jakub Kicinski, and Bert van Leeuwen. 21) IPSEC offloading support in mlx5, from Ilan Tayari. 22) Add HW PTP support to macb driver, from Rafal Ozieblo. 23) Networking refcount_t conversions, From Elena Reshetova. 24) Add sock_ops support to BPF, from Lawrence Brako. This is useful for tuning the TCP sockopt settings of a group of applications, currently via CGROUPs" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1899 commits) net: phy: dp83867: add workaround for incorrect RX_CTRL pin strap dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strap cxgb4: Support for get_ts_info ethtool method cxgb4: Add PTP Hardware Clock (PHC) support cxgb4: time stamping interface for PTP nfp: default to chained metadata prepend format nfp: remove legacy MAC address lookup nfp: improve order of interfaces in breakout mode net: macb: remove extraneous return when MACB_EXT_DESC is defined bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP case bpf: fix return in load_bpf_file mpls: fix rtm policy in mpls_getroute net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t net, ax25: convert ax25_route.refcount from atomic_t to refcount_t net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_t net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_t net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_t net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_t net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t ...
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/bpf/bpf.c68
-rw-r--r--tools/lib/bpf/bpf.h5
2 files changed, 73 insertions, 0 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 6e178987af8e..7e0405e1651d 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -257,3 +257,71 @@ int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,
257 *duration = attr.test.duration; 257 *duration = attr.test.duration;
258 return ret; 258 return ret;
259} 259}
260
261int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
262{
263 union bpf_attr attr;
264 int err;
265
266 bzero(&attr, sizeof(attr));
267 attr.start_id = start_id;
268
269 err = sys_bpf(BPF_PROG_GET_NEXT_ID, &attr, sizeof(attr));
270 if (!err)
271 *next_id = attr.next_id;
272
273 return err;
274}
275
276int bpf_map_get_next_id(__u32 start_id, __u32 *next_id)
277{
278 union bpf_attr attr;
279 int err;
280
281 bzero(&attr, sizeof(attr));
282 attr.start_id = start_id;
283
284 err = sys_bpf(BPF_MAP_GET_NEXT_ID, &attr, sizeof(attr));
285 if (!err)
286 *next_id = attr.next_id;
287
288 return err;
289}
290
291int bpf_prog_get_fd_by_id(__u32 id)
292{
293 union bpf_attr attr;
294
295 bzero(&attr, sizeof(attr));
296 attr.prog_id = id;
297
298 return sys_bpf(BPF_PROG_GET_FD_BY_ID, &attr, sizeof(attr));
299}
300
301int bpf_map_get_fd_by_id(__u32 id)
302{
303 union bpf_attr attr;
304
305 bzero(&attr, sizeof(attr));
306 attr.map_id = id;
307
308 return sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, sizeof(attr));
309}
310
311int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len)
312{
313 union bpf_attr attr;
314 int err;
315
316 bzero(&attr, sizeof(attr));
317 bzero(info, *info_len);
318 attr.info.bpf_fd = prog_fd;
319 attr.info.info_len = *info_len;
320 attr.info.info = ptr_to_u64(info);
321
322 err = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr));
323 if (!err)
324 *info_len = attr.info.info_len;
325
326 return err;
327}
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 972bd8333eb7..16de44a14b48 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -54,5 +54,10 @@ int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);
54int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size, 54int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,
55 void *data_out, __u32 *size_out, __u32 *retval, 55 void *data_out, __u32 *size_out, __u32 *retval,
56 __u32 *duration); 56 __u32 *duration);
57int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id);
58int bpf_map_get_next_id(__u32 start_id, __u32 *next_id);
59int bpf_prog_get_fd_by_id(__u32 id);
60int bpf_map_get_fd_by_id(__u32 id);
61int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len);
57 62
58#endif 63#endif