public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
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>
Subject: [PATCH bpf-next 2/7] bpf: sync bpf.h to tools/
Date: Tue,  4 Jun 2019 14:35:19 -0700	[thread overview]
Message-ID: <20190604213524.76347-3-sdf@google.com> (raw)
In-Reply-To: <20190604213524.76347-1-sdf@google.com>

Export new prog type and hook points to the libbpf.

Signed-off-by: Stanislav Fomichev <sdf@google•com>
---
 tools/include/uapi/linux/bpf.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 7c6aef253173..b6c3891241ef 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 {
@@ -192,6 +193,8 @@ enum bpf_attach_type {
 	BPF_LIRC_MODE2,
 	BPF_FLOW_DISSECTOR,
 	BPF_CGROUP_SYSCTL,
+	BPF_CGROUP_GETSOCKOPT,
+	BPF_CGROUP_SETSOCKOPT,
 	__MAX_BPF_ATTACH_TYPE
 };
 
@@ -2815,7 +2818,8 @@ union bpf_attr {
 	FN(strtoul),			\
 	FN(sk_storage_get),		\
 	FN(sk_storage_delete),		\
-	FN(send_signal),
+	FN(send_signal),		\
+	FN(sockopt_handled),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
@@ -3533,4 +3537,15 @@ struct bpf_sysctl {
 				 */
 };
 
+struct bpf_sockopt {
+	__bpf_md_ptr(struct bpf_sock *, sk);
+
+	__s32	level;
+	__s32	optname;
+
+	__u32	optlen;
+	__u32	optval;
+	__u32	optval_end;
+};
+
 #endif /* _UAPI__LINUX_BPF_H__ */
-- 
2.22.0.rc1.311.g5d7573a151-goog


  parent reply	other threads:[~2019-06-04 21:35 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-04 21:35 [PATCH bpf-next 0/7] bpf: getsockopt and setsockopt hooks Stanislav Fomichev
2019-06-04 21:35 ` [PATCH bpf-next 1/7] bpf: implement " Stanislav Fomichev
2019-06-05 18:47   ` Martin Lau
2019-06-05 19:17     ` Stanislav Fomichev
2019-06-05 20:50       ` Martin Lau
2019-06-05 21:16         ` Stanislav Fomichev
2019-06-05 21:41           ` Martin Lau
2019-06-05 19:32   ` Andrii Nakryiko
2019-06-05 20:54     ` Stanislav Fomichev
2019-06-05 21:12       ` Andrii Nakryiko
2019-06-05 21:30         ` Stanislav Fomichev
2019-06-04 21:35 ` Stanislav Fomichev [this message]
2019-06-04 21:35 ` [PATCH bpf-next 3/7] libbpf: support sockopt hooks Stanislav Fomichev
2019-06-04 21:35 ` [PATCH bpf-next 4/7] selftests/bpf: test sockopt section name Stanislav Fomichev
2019-06-04 21:35 ` [PATCH bpf-next 5/7] selftests/bpf: add sockopt test Stanislav Fomichev
2019-06-04 21:35 ` [PATCH bpf-next 6/7] bpf: add sockopt documentation Stanislav Fomichev
2019-06-04 21:35 ` [PATCH bpf-next 7/7] bpftool: support cgroup sockopt Stanislav Fomichev
2019-06-04 21:55   ` Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190604213524.76347-3-sdf@google.com \
    --to=sdf@google$(echo .)com \
    --cc=ast@kernel$(echo .)org \
    --cc=bpf@vger$(echo .)kernel.org \
    --cc=daniel@iogearbox$(echo .)net \
    --cc=davem@davemloft$(echo .)net \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox