@@ -2505,7 +2505,8 @@ union bpf_attr {
* **TCP_CONGESTION**, **TCP_BPF_IW**,
* **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
* **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
- * **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**.
+ * **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**,
+ * **TCP_ULP**.
* * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
* * **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
* Return
@@ -4870,6 +4870,14 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname,
name[TCP_CA_NAME_MAX-1] = 0;
return tcp_set_congestion_control(sk, name, false, true);
}
+ case TCP_ULP: {
+ char name[TCP_ULP_NAME_MAX];
+
+ strncpy(name, optval, min_t(long, optlen,
+ TCP_ULP_NAME_MAX - 1));
+ name[TCP_ULP_NAME_MAX - 1] = 0;
+ return tcp_set_ulp(sk, name);
+ }
default:
break;
}
@@ -5000,6 +5008,14 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
strncpy(optval, icsk->icsk_ca_ops->name, optlen);
optval[optlen - 1] = 0;
break;
+ case TCP_ULP:
+ icsk = inet_csk(sk);
+
+ if (!icsk->icsk_ulp_ops || optlen <= 1)
+ goto err_clear;
+ strncpy(optval, icsk->icsk_ulp_ops->name, optlen);
+ optval[optlen - 1] = 0;
+ break;
case TCP_SAVED_SYN:
tp = tcp_sk(sk);
@@ -2505,7 +2505,8 @@ union bpf_attr {
* **TCP_CONGESTION**, **TCP_BPF_IW**,
* **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
* **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
- * **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**.
+ * **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**,
+ * **TCP_ULP**.
* * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
* * **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
* Return
This introduces a new option TCP_ULP for bpf_{set,get}sockopt helper. It helps prog to change TCP_ULP sockopt on demand. People who want to set ULP based on strategies when socket create or other's hook point, they can attach to BPF_CGROUP_INET_SOCK_CREATE or other types, and judge based on user-defined rules to trigger bpf_set_sockopt(.., IPPROTO_TCP, TCP_ULP) and set socket ULP. For example, the bpf prog can control which socket should use tls ULP modules without intrusively modifying the applications. With this, it makes flexible to control ULP strategies with BPF prog. Signed-off-by: Tony Lu <tonylu@linux.alibaba.com> Reviewed-by: Qiao Ma <mqaio@linux.alibaba.com> --- include/uapi/linux/bpf.h | 3 ++- net/core/filter.c | 16 ++++++++++++++++ tools/include/uapi/linux/bpf.h | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-)