tools: sync bpf.h

This adds BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, and fixes up the error: enumeration value ‘BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE’ not handled in switch [-Werror=switch-enum] build errors it would otherwise cause in libbpf.

Matt Mullins committed 7 years ago

Commit 4635b0a1 parent 2abd2de3 files · +11 −1Browse files

Unified · Split

3 files

tools/include/uapi/linux/bpf.h +9 −1
tools/lib/bpf/libbpf.c +1 −0
tools/lib/bpf/libbpf_probes.c +1 −0

tools/include/uapi/linux/bpf.h+9−1

 	BPF_PROG_TYPE_SK_REUSEPORT,
 	BPF_PROG_TYPE_FLOW_DISSECTOR,
 	BPF_PROG_TYPE_CGROUP_SYSCTL,
+	BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
 };
 enum bpf_attach_type {
  * 		error if an eBPF program tries to set a callback that is not
  * 		supported in the current kernel.
  *
- * 		The supported callback values that *argval* can combine are:
+ * 		*argval* is a flag array which can combine these flags:
  *
  * 		* **BPF_SOCK_OPS_RTO_CB_FLAG** (retransmission time out)
  * 		* **BPF_SOCK_OPS_RETRANS_CB_FLAG** (retransmission)
  * 		* **BPF_SOCK_OPS_STATE_CB_FLAG** (TCP state change)
  *
+ * 		Therefore, this function can be used to clear a callback flag by
+ * 		setting the appropriate bit to zero. e.g. to disable the RTO
+ * 		callback:
+ *
+ * 		**bpf_sock_ops_cb_flags_set(bpf_sock,**
+ * 			**bpf_sock->bpf_sock_ops_cb_flags & ~BPF_SOCK_OPS_RTO_CB_FLAG)**
+ *
  * 		Here are some examples of where one could call such eBPF
  * 		program:
  *

tools/lib/bpf/libbpf.c+1−0

@@ -2136,6 +2136,7 @@ static bool bpf_prog_type__needs_kver(enum bpf_prog_type type) · 2135 unmodified lines
2136	case BPF_PROG_TYPE_UNSPEC:	2136	case BPF_PROG_TYPE_UNSPEC:
2137	case BPF_PROG_TYPE_TRACEPOINT:	2137	case BPF_PROG_TYPE_TRACEPOINT:
2138	case BPF_PROG_TYPE_RAW_TRACEPOINT:	2138	case BPF_PROG_TYPE_RAW_TRACEPOINT:
		2139	case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
2139	case BPF_PROG_TYPE_PERF_EVENT:	2140	case BPF_PROG_TYPE_PERF_EVENT:
2140	case BPF_PROG_TYPE_CGROUP_SYSCTL:	2141	case BPF_PROG_TYPE_CGROUP_SYSCTL:
2141	return false;	2142	return false;

tools/lib/bpf/libbpf_probes.c+1−0

@@ -93,6 +93,7 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, · 92 unmodified lines
93	case BPF_PROG_TYPE_CGROUP_DEVICE:	93	case BPF_PROG_TYPE_CGROUP_DEVICE:
94	case BPF_PROG_TYPE_SK_MSG:	94	case BPF_PROG_TYPE_SK_MSG:
95	case BPF_PROG_TYPE_RAW_TRACEPOINT:	95	case BPF_PROG_TYPE_RAW_TRACEPOINT:
		96	case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
96	case BPF_PROG_TYPE_LWT_SEG6LOCAL:	97	case BPF_PROG_TYPE_LWT_SEG6LOCAL:
97	case BPF_PROG_TYPE_LIRC_MODE2:	98	case BPF_PROG_TYPE_LIRC_MODE2:
98	case BPF_PROG_TYPE_SK_REUSEPORT:	99	case BPF_PROG_TYPE_SK_REUSEPORT: