[bpf-next,v9,09/12] bpf: Add sock_ops R/W access to tclass

Message ID	20180125023712.3038949-10-brakmo@fb.com
State	Changes Requested, archived
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> Smtp-Origin-Hostprefix: dev From: Lawrence Brakmo <brakmo@fb.com> Smtp-Origin-Hostname: dev15893.prn1.facebook.com To: netdev <netdev@vger.kernel.org> CC: Kernel Team <kernel-team@fb.com>, Blake Matheny <bmatheny@fb.com>, "Alexei Starovoitov" <ast@fb.com>, Daniel Borkmann <daniel@iogearbox.net>, "Eric Dumazet" <eric.dumazet@gmail.com>, Neal Cardwell <ncardwell@google.com>, Yuchung Cheng <ycheng@google.com> Smtp-Origin-Cluster: prn1c29 Subject: [PATCH bpf-next v9 09/12] bpf: Add sock_ops R/W access to tclass Date: Wed, 24 Jan 2018 18:37:09 -0800 Message-ID: <20180125023712.3038949-10-brakmo@fb.com> In-Reply-To: <20180125023712.3038949-1-brakmo@fb.com> References: <20180125023712.3038949-1-brakmo@fb.com> MIME-Version: 1.0 Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	bpf: More sock_ops callbacks \| expand [bpf-next,v9,00/12] bpf: More sock_ops callbacks [bpf-next,v9,01/12] bpf: Only reply field should be writeable [bpf-next,v9,02/12] bpf: Make SOCK_OPS_GET_TCP size independent [bpf-next,v9,03/12] bpf: Make SOCK_OPS_GET_TCP struct independent [bpf-next,v9,04/12] bpf: Add write access to tcp_sock and sock fields [bpf-next,v9,05/12] bpf: Support passing args to sock_ops bpf function [bpf-next,v9,06/12] bpf: Adds field bpf_sock_ops_cb_flags to tcp_sock [bpf-next,v9,07/12] bpf: Add sock_ops RTO callback [bpf-next,v9,08/12] bpf: Add support for reading sk_state and more [bpf-next,v9,09/12] bpf: Add sock_ops R/W access to tclass [bpf-next,v9,10/12] bpf: Add BPF_SOCK_OPS_RETRANS_CB [bpf-next,v9,11/12] bpf: Add BPF_SOCK_OPS_STATE_CB [bpf-next,v9,12/12] bpf: add selftest for tcpbpf

Message ID

20180125023712.3038949-10-brakmo@fb.com

State

Changes Requested, archived

Delegated to:

BPF Maintainers

Headers

Smtp-Origin-Hostprefix: dev
From: Lawrence Brakmo <brakmo@fb.com>
Smtp-Origin-Hostname: dev15893.prn1.facebook.com
To: netdev <netdev@vger.kernel.org>
CC: Kernel Team <kernel-team@fb.com>, Blake Matheny <bmatheny@fb.com>,
	"Alexei Starovoitov" <ast@fb.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	"Eric Dumazet" <eric.dumazet@gmail.com>,
	Neal Cardwell <ncardwell@google.com>, Yuchung Cheng <ycheng@google.com>
Smtp-Origin-Cluster: prn1c29
Subject: [PATCH bpf-next v9 09/12] bpf: Add sock_ops R/W access to tclass
Date: Wed, 24 Jan 2018 18:37:09 -0800
Message-ID: <20180125023712.3038949-10-brakmo@fb.com>
In-Reply-To: <20180125023712.3038949-1-brakmo@fb.com>
References: <20180125023712.3038949-1-brakmo@fb.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

bpf: More sock_ops callbacks | expand

Commit Message

Lawrence Brakmo Jan. 25, 2018, 2:37 a.m. UTC

Adds direct write access to sk_txhash and access to tclass for ipv6
flows through getsockopt and setsockopt. Sample usage for tclass:

  bpf_getsockopt(skops, SOL_IPV6, IPV6_TCLASS, &v, sizeof(v))

where skops is a pointer to the ctx (struct bpf_sock_ops).

Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
---
 net/core/filter.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index a858ebc..fe2c793 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -3232,6 +3232,29 @@  BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
 			ret = -EINVAL;
 		}
 #ifdef CONFIG_INET
+#if IS_ENABLED(CONFIG_IPV6)
+	} else if (level == SOL_IPV6) {
+		if (optlen != sizeof(int) || sk->sk_family != AF_INET6)
+			return -EINVAL;
+
+		val = *((int *)optval);
+		/* Only some options are supported */
+		switch (optname) {
+		case IPV6_TCLASS:
+			if (val < -1 || val > 0xff) {
+				ret = -EINVAL;
+			} else {
+				struct ipv6_pinfo *np = inet6_sk(sk);
+
+				if (val == -1)
+					val = 0;
+				np->tclass = val;
+			}
+			break;
+		default:
+			ret = -EINVAL;
+		}
+#endif
 	} else if (level == SOL_TCP &&
 		   sk->sk_prot->setsockopt == tcp_setsockopt) {
 		if (optname == TCP_CONGESTION) {
@@ -3241,7 +3264,8 @@  BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
 			strncpy(name, optval, min_t(long, optlen,
 						    TCP_CA_NAME_MAX-1));
 			name[TCP_CA_NAME_MAX-1] = 0;
-			ret = tcp_set_congestion_control(sk, name, false, reinit);
+			ret = tcp_set_congestion_control(sk, name, false,
+							 reinit);
 		} else {
 			struct tcp_sock *tp = tcp_sk(sk);
 
@@ -3307,6 +3331,22 @@  BPF_CALL_5(bpf_getsockopt, struct bpf_sock_ops_kern *, bpf_sock,
 		} else {
 			goto err_clear;
 		}
+#if IS_ENABLED(CONFIG_IPV6)
+	} else if (level == SOL_IPV6) {
+		struct ipv6_pinfo *np = inet6_sk(sk);
+
+		if (optlen != sizeof(int) || sk->sk_family != AF_INET6)
+			goto err_clear;
+
+		/* Only some options are supported */
+		switch (optname) {
+		case IPV6_TCLASS:
+			*((int *)optval) = (int)np->tclass;
+			break;
+		default:
+			goto err_clear;
+		}
+#endif
 	} else {
 		goto err_clear;
 	}
@@ -3871,6 +3911,7 @@  static bool sock_ops_is_valid_access(int off, int size,
 	if (type == BPF_WRITE) {
 		switch (off) {
 		case offsetof(struct bpf_sock_ops, reply):
+		case offsetof(struct bpf_sock_ops, sk_txhash):
 			if (size != size_default)
 				return false;
 			break;
@@ -4690,7 +4731,8 @@  static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,
 		break;
 
 	case offsetof(struct bpf_sock_ops, sk_txhash):
-		SOCK_OPS_GET_FIELD(sk_txhash, sk_txhash, struct sock);
+		SOCK_OPS_GET_OR_SET_FIELD(sk_txhash, sk_txhash,
+					  struct sock, type);
 		break;
 
 	case offsetof(struct bpf_sock_ops, bytes_received):
@@ -4701,6 +4743,7 @@  static u32 sock_ops_convert_ctx_access(enum bpf_access_type type,
 	case offsetof(struct bpf_sock_ops, bytes_acked):
 		SOCK_OPS_GET_FIELD(bytes_acked, bytes_acked, struct tcp_sock);
 		break;
+
 	}
 	return insn - insn_buf;
 }

[bpf-next,v9,09/12] bpf: Add sock_ops R/W access to tclass

Commit Message

Patch