[bpf-next,v9,2/9] bpf: sync bpf.h to tools/

Message ID	20190627203855.10515-3-sdf@google.com
State	Accepted
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> Date: Thu, 27 Jun 2019 13:38:48 -0700 In-Reply-To: <20190627203855.10515-1-sdf@google.com> Message-Id: <20190627203855.10515-3-sdf@google.com> Mime-Version: 1.0 References: <20190627203855.10515-1-sdf@google.com> Subject: [PATCH bpf-next v9 2/9] bpf: sync bpf.h to tools/ From: Stanislav Fomichev <sdf@google.com> To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev <sdf@google.com>, Andrii Nakryiko <andriin@fb.com>, Martin Lau <kafai@fb.com> Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	bpf: getsockopt and setsockopt hooks \| expand [bpf-next,v9,0/9] bpf: getsockopt and setsockopt hooks [bpf-next,v9,1/9] bpf: implement getsockopt and setsockopt hooks [bpf-next,v9,2/9] bpf: sync bpf.h to tools/ [bpf-next,v9,3/9] libbpf: support sockopt hooks [bpf-next,v9,4/9] selftests/bpf: test sockopt section name [bpf-next,v9,5/9] selftests/bpf: add sockopt test [bpf-next,v9,6/9] selftests/bpf: add sockopt test that exercises sk helpers [bpf-next,v9,7/9] selftests/bpf: add sockopt test that exercises BPF_F_ALLOW_MULTI [bpf-next,v9,8/9] bpf: add sockopt documentation [bpf-next,v9,9/9] bpftool: support cgroup sockopt

Message ID

20190627203855.10515-3-sdf@google.com

State

Accepted

Delegated to:

BPF Maintainers

Headers

Date: Thu, 27 Jun 2019 13:38:48 -0700
In-Reply-To: <20190627203855.10515-1-sdf@google.com>
Message-Id: <20190627203855.10515-3-sdf@google.com>
Mime-Version: 1.0
References: <20190627203855.10515-1-sdf@google.com>
Subject: [PATCH bpf-next v9 2/9] bpf: sync bpf.h to tools/
From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net,
	Stanislav Fomichev <sdf@google.com>,
	Andrii Nakryiko <andriin@fb.com>, Martin Lau <kafai@fb.com>
Content-Type: text/plain; charset="UTF-8"
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

bpf: getsockopt and setsockopt hooks | expand

Commit Message

Stanislav Fomichev June 27, 2019, 8:38 p.m. UTC

Export new prog type and hook points to the libbpf.

Cc: Andrii Nakryiko <andriin@fb.com>
Cc: Martin Lau <kafai@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 tools/include/uapi/linux/bpf.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index b077507efa3f..a396b516a2b2 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -170,6 +170,7 @@  enum bpf_prog_type {
 	BPF_PROG_TYPE_FLOW_DISSECTOR,
 	BPF_PROG_TYPE_CGROUP_SYSCTL,
 	BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
+	BPF_PROG_TYPE_CGROUP_SOCKOPT,
 };
 
 enum bpf_attach_type {
@@ -194,6 +195,8 @@  enum bpf_attach_type {
 	BPF_CGROUP_SYSCTL,
 	BPF_CGROUP_UDP4_RECVMSG,
 	BPF_CGROUP_UDP6_RECVMSG,
+	BPF_CGROUP_GETSOCKOPT,
+	BPF_CGROUP_SETSOCKOPT,
 	__MAX_BPF_ATTACH_TYPE
 };
 
@@ -3541,4 +3544,15 @@  struct bpf_sysctl {
 				 */
 };
 
+struct bpf_sockopt {
+	__bpf_md_ptr(struct bpf_sock *, sk);
+	__bpf_md_ptr(void *, optval);
+	__bpf_md_ptr(void *, optval_end);
+
+	__s32	level;
+	__s32	optname;
+	__s32	optlen;
+	__s32	retval;
+};
+
 #endif /* _UAPI__LINUX_BPF_H__ */

[bpf-next,v9,2/9] bpf: sync bpf.h to tools/

Commit Message

Patch