bpf: misc performance improvements for cgroup hooks
Subsystems (9)
v7 cover bpf: misc performance improvements for cgroup hooks
First patch adds custom getsockopt for TCP_ZEROCOPY_RECEIVE to remove kmalloc and lock_sock overhead from the dat path.
Second patch removes kzalloc/kfree from getsockopt for the common cases.
Third patch switches cgroup_bpf_enabled to be per-attach to to add only overhead for the cgroup attach types used on the system.
No visible user-side changes.
v7:
- add comment about buffer contents for retval != 0 (Martin KaFai Lau)
- export tcp.h into tools/include/uapi (Martin KaFai Lau)
- note that v7 depends on the commit 4be34f3d0731 ("bpf: Don't leak memory in bpf getsockopt when optlen == 0") from bpf tree
v6:
- avoid indirect cost for new bpf_bypass_getsockopt (Eric Dumazet)
v5:
- reorder patches to reduce the churn (Martin KaFai Lau)
v4:
- update performance numbers
- bypass_bpf_getsockopt (Martin KaFai Lau)
v3:
- remove extra newline, add comment about sizeof tcp_zerocopy_receive (Martin KaFai Lau)
- add another patch to remove lock_sock overhead from TCP_ZEROCOPY_RECEIVE; technically, this makes patch #1 obsolete, but I'd still prefer to keep it to help with other socket options
v2:
- perf numbers for getsockopt kmalloc reduction (Song Liu)
- (sk) in BPF_CGROUP_PRE_CONNECT_ENABLED (Song Liu)
- 128 -> 64 buffer size, BUILD_BUG_ON (Martin KaFai Lau)
Stanislav Fomichev (4):
bpf: remove extra lock_sock for TCP_ZEROCOPY_RECEIVE tools, bpf: add tcp.h to tools/uapi
bpf: try to avoid kzalloc in cgroup/{s,g}etsockopt
bpf: split cgroup_bpf_enabled per attach type
include/linux/bpf-cgroup.h | 63 ++-- include/linux/filter.h | 5 + include/linux/indirect_call_wrapper.h | 6 + include/net/sock.h | 2 + include/net/tcp.h | 1 + kernel/bpf/cgroup.c | 112 +++++- net/ipv4/af_inet.c | 9 +- net/ipv4/tcp.c | 14 + net/ipv4/tcp_ipv4.c | 1 + net/ipv4/udp.c | 7 +- net/ipv6/af_inet6.c | 9 +- net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 7 +- net/socket.c | 3 + tools/include/uapi/linux/tcp.h | 357 ++++++++++++++++++ .../selftests/bpf/prog_tests/sockopt_sk.c | 22 ++ .../testing/selftests/bpf/progs/sockopt_sk.c | 15 + 17 files changed, 582 insertions(+), 52 deletions(-) create mode 100644 tools/include/uapi/linux/tcp.h
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
PATCH v7 1/4 bpf: remove extra lock_sock for TCP_ZEROCOPY_RECEIVE
Add custom implementation of getsockopt hook for TCP_ZEROCOPY_RECEIVE. We skip generic hooks for TCP_ZEROCOPY_RECEIVE and have a custom call in do_tcp_getsockopt using the on-stack data. This removes 3% overhead for locking/unlocking the socket.
Without this patch:
3.38% 0.07% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt
|
--3.30%--__cgroup_bpf_run_filter_getsockopt
|
--0.81%--__kmallocWith the patch applied:
0.52% 0.12% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt_kern
--- include/linux/bpf-cgroup.h | 27 +++++++++-- include/linux/indirect_call_wrapper.h | 6 +++ include/net/sock.h | 2 + include/net/tcp.h | 1 + kernel/bpf/cgroup.c | 46 +++++++++++++++++++ net/ipv4/tcp.c | 14 ++++++ net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/socket.c | 3 ++ .../selftests/bpf/prog_tests/sockopt_sk.c | 22 +++++++++ .../testing/selftests/bpf/progs/sockopt_sk.c | 15 ++++++ 11 files changed, 134 insertions(+), 4 deletions(-)
include/linux/bpf-cgroup.h +23 -4
@@ -147,6 +147,10 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, int __user *optlen, int max_optlen, int retval); +int __cgroup_bpf_run_filter_getsockopt_kern (struct sock *sk,int level, +int optname,void *optval, +int *optlen,int retval); +static inline enum bpf_cgroup_storage_type cgroup_storage_type (struct bpf_map *map) {
@@ -364,10 +368,23 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, ({ \int __ret = retval; \if (cgroup_bpf_enabled) \ - __ret =__cgroup_bpf_run_filter_getsockopt (sock, level, \ - optname, optval, \ - optlen, max_optlen, \ - retval); \ +if (!(sock)->sk_prot->bpf_bypass_getsockopt || \ + !INDIRECT_CALL_INET_1 ((sock)->sk_prot->bpf_bypass_getsockopt, \ + tcp_bpf_bypass_getsockopt, \ + level, optname)) \ + __ret =__cgroup_bpf_run_filter_getsockopt ( \ + sock, level, optname, optval, optlen, \ + max_optlen, retval); \ + __ret; \ +}) + +#define BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sock, level, optname, optval, \ + optlen, retval) \ +({ \ + int __ret = retval; \ + if (cgroup_bpf_enabled) \ + __ret = __cgroup_bpf_run_filter_getsockopt_kern( \ + sock, level, optname, optval, optlen, retval); \ __ret; \ })
@@ -452,6 +469,8 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,#define BPF_CGROUP_GETSOCKOPT_MAX_OPTLEN (optlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_GETSOCKOPT (sock, level, optname, optval, \ optlen, max_optlen, retval) ({ retval; }) +#define BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sock, level, optname, optval, \ + optlen, retval) ({ retval; })#define BPF_CGROUP_RUN_PROG_SETSOCKOPT (sock, level, optname, optval, optlen, \ kernel_optval) ({ 0; })
include/linux/indirect_call_wrapper.h +6 -0
@@ -60,4 +60,10 @@#define INDIRECT_CALL_INET (f, f2, f1, ...) f(__VA_ARGS__)#endif +#if IS_ENABLED (CONFIG_INET ) +#define INDIRECT_CALL_INET_1 (f, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__) +#else +#define INDIRECT_CALL_INET_1 (f, f1, ...) f(__VA_ARGS__) +#endif +#endif
include/net/sock.h +2 -0
@@ -1174,6 +1174,8 @@ struct proto {int (*backlog_rcv) (struct sock *sk,struct sk_buff *skb); +bool (*bpf_bypass_getsockopt)(int level, +int optname);void (*release_cb)(struct sock *sk);
include/net/tcp.h +1 -0
@@ -403,6 +403,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait);int tcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen); +bool tcp_bpf_bypass_getsockopt (int level,int optname);int tcp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen);void tcp_set_keepalive (struct sock *sk,int val);
kernel/bpf/cgroup.c +46 -0
52 lines not on this page · raw message
net/ipv4/tcp.c +14 -0
@@ -4098,6 +4098,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level,return -EFAULT ;lock_sock (sk); err =tcp_zerocopy_receive (sk, &zc); + err =BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sk, level, optname, + &zc, &len, err);release_sock (sk); if (len >= offsetofend(struct tcp_zerocopy_receive, err)) goto zerocopy_rcv_sk_err;
@@ -4132,6 +4134,18 @@ static int do_tcp_getsockopt(struct sock *sk, int level,return 0 ; } +bool tcp_bpf_bypass_getsockopt (int level,int optname) +{ +/* TCP do_tcp_getsockopt has optimized getsockopt implementation +* to avoid extra socket lock for TCP_ZEROCOPY_RECEIVE. +*/ +if (level ==SOL_TCP && optname ==TCP_ZEROCOPY_RECEIVE ) +return true; + +return false; +} +EXPORT_SYMBOL (tcp_bpf_bypass_getsockopt); +int tcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen) {
net/ipv4/tcp_ipv4.c +1 -0
@@ -2792,6 +2792,7 @@ struct proto tcp_prot = { .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, + .bpf_bypass_getsockopt = tcp_bpf_bypass_getsockopt, .keepalive = tcp_set_keepalive, .recvmsg = tcp_recvmsg, .sendmsg = tcp_sendmsg,
net/ipv6/tcp_ipv6.c +1 -0
@@ -2121,6 +2121,7 @@ struct proto tcpv6_prot = { .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, + .bpf_bypass_getsockopt = tcp_bpf_bypass_getsockopt, .keepalive = tcp_set_keepalive, .recvmsg = tcp_recvmsg, .sendmsg = tcp_sendmsg,
net/socket.c +3 -0
@@ -2126,6 +2126,9 @@ SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,return __sys_setsockopt (fd, level, optname, optval, optlen); } +INDIRECT_CALLABLE_DECLARE(bool tcp_bpf_bypass_getsockopt(int level, +int optname)); +/* * Get a socket option. Because we don't know the option lengths we have * to pass a user mode parameter for the protocols to sort out.
tools/testing/selftests/bpf/prog_tests/sockopt_sk.c +22 -0
@@ -11,6 +11,7 @@ static int getsetsockopt(void)char u8[4 ];__u32 u32;char cc[16 ];/* TCP_CA_NAME_MAX */ +struct tcp_zerocopy_receive zc; } buf = {};socklen_t optlen;char *big_buf =NULL ;
@@ -154,6 +155,27 @@ static int getsetsockopt(void) goto err; } +/* TCP_ZEROCOPY_RECEIVE triggers */ +memset (&buf,0 ,sizeof (buf)); + optlen =sizeof (buf.zc); + err =getsockopt (fd,SOL_TCP ,TCP_ZEROCOPY_RECEIVE , &buf, &optlen); +if (err) { +log_err ("Unexpected getsockopt(TCP_ZEROCOPY_RECEIVE) err=%d errno=%d" , + err, errno); + goto err; + } + +memset (&buf,0 ,sizeof (buf)); + buf.zc.address =12345 ;/* rejected by BPF */ + optlen =sizeof (buf.zc); + errno =0 ; + err =getsockopt (fd,SOL_TCP ,TCP_ZEROCOPY_RECEIVE , &buf, &optlen); +if (errno !=EPERM ) { +log_err ("Unexpected getsockopt(TCP_ZEROCOPY_RECEIVE) err=%d errno=%d" , + err, errno); + goto err; + } +free (big_buf);close (fd);return 0 ;
tools/testing/selftests/bpf/progs/sockopt_sk.c +15 -0
@@ -57,6 +57,21 @@ int _getsockopt(struct bpf_sockopt *ctx)return 1 ; } +if (ctx->level ==SOL_TCP && ctx->optname ==TCP_ZEROCOPY_RECEIVE ) { +/* Verify that TCP_ZEROCOPY_RECEIVE triggers. +* It has a custom implementation for performance +* reasons. +*/ + +if (optval +sizeof (struct tcp_zerocopy_receive ) > optval_end) +return 0 ;/* EPERM, bounds check */ + +if (((struct tcp_zerocopy_receive *)optval)->address !=0 ) +return 0 ;/* EPERM, unexpected data */ + +return 1 ; + } +if (ctx->level ==SOL_IP && ctx->optname ==IP_FREEBIND ) {if (optval +1 > optval_end)return 0 ;/* EPERM, bounds check */
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
PATCH v7 2/4 tools, bpf: add tcp.h to tools/uapi
In reply to Stanislav FomichevNext test is using struct tcp_zerocopy_receive which was added in v4.18.
--- tools/include/uapi/linux/tcp.h | 357 +++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 tools/include/uapi/linux/tcp.h
tools/include/uapi/linux/tcp.h new file +357 -0
@@ -0,0 +1,357 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* INET An implementation of the TCP/IP protocol suite for the LINUX +* operating system. INET is implemented using the BSD Socket +* interface as the means of communication with the user level. +* +* Definitions for the TCP protocol. +* +* Version: @(#)tcp.h 1.0.2 04/28/93 +* +* Author: Fred N. van Kempen, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ +#ifndef _UAPI_LINUX_TCP_H +#define _UAPI_LINUX_TCP_H + +#include <linux/types.h> +#include <asm/byteorder.h> +#include <linux/socket.h> + +struct tcphdr { +__be16 source; +__be16 dest; +__be32 seq; +__be32 ack_seq; +#if defined(__LITTLE_ENDIAN_BITFIELD) +__u16 res1:4 , + doff:4 , + fin:1 , + syn:1 , + rst:1 , + psh:1 , + ack:1 , + urg:1 , + ece:1 , + cwr:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +__u16 doff:4 , + res1:4 , + cwr:1 , + ece:1 , + urg:1 , + ack:1 , + psh:1 , + rst:1 , + syn:1 , + fin:1 ; +#else +#error "Adjust your <asm/byteorder.h> defines" +#endif +__be16 window; +__sum16 check; +__be16 urg_ptr; +}; + +/* +* The union cast uses a gcc extension to avoid aliasing problems +* (union is compatible to any of its members) +* This means this part of the code is -fstrict-aliasing safe now. +*/ +union tcp_word_hdr { +struct tcphdr hdr; +__be32 words[5 ]; +}; + +#define tcp_flag_word (tp) ( ((union tcp_word_hdr *)(tp))->words [3]) + +enum { +TCP_FLAG_CWR =__constant_cpu_to_be32 (0x00800000 ), +TCP_FLAG_ECE =__constant_cpu_to_be32 (0x00400000 ), +TCP_FLAG_URG =__constant_cpu_to_be32 (0x00200000 ), +TCP_FLAG_ACK =__constant_cpu_to_be32 (0x00100000 ), +TCP_FLAG_PSH =__constant_cpu_to_be32 (0x00080000 ), +TCP_FLAG_RST =__constant_cpu_to_be32 (0x00040000 ), +TCP_FLAG_SYN =__constant_cpu_to_be32 (0x00020000 ), +TCP_FLAG_FIN =__constant_cpu_to_be32 (0x00010000 ), +TCP_RESERVED_BITS =__constant_cpu_to_be32 (0x0F000000 ), +TCP_DATA_OFFSET =__constant_cpu_to_be32 (0xF0000000 ) +}; + +/* +* TCP general constants +*/ +#define TCP_MSS_DEFAULT 536U/* IPv4 (RFC1122, RFC2581) */ +#define TCP_MSS_DESIRED 1220U/* IPv6 (tunneled), EDNS0 (RFC3226) */ + +/* TCP socket options */ +#define TCP_NODELAY 1/* Turn off Nagle's algorithm. */ +#define TCP_MAXSEG 2/* Limit MSS */ +#define TCP_CORK 3/* Never send partially complete segments */ +#define TCP_KEEPIDLE 4/* Start keeplives after this period */ +#define TCP_KEEPINTVL 5/* Interval between keepalives */ +#define TCP_KEEPCNT 6/* Number of keepalives before death */ +#define TCP_SYNCNT 7/* Number of SYN retransmits */ +#define TCP_LINGER2 8/* Life time of orphaned FIN-WAIT-2 state */ +#define TCP_DEFER_ACCEPT 9/* Wake up listener only when data arrive */ +#define TCP_WINDOW_CLAMP 10/* Bound advertised window */ +#define TCP_INFO 11/* Information about this connection. */ +#define TCP_QUICKACK 12/* Block/reenable quick acks */ +#define TCP_CONGESTION 13/* Congestion control algorithm */ +#define TCP_MD5SIG 14/* TCP MD5 Signature (RFC2385) */ +#define TCP_THIN_LINEAR_TIMEOUTS 16/* Use linear timeouts for thin streams*/ +#define TCP_THIN_DUPACK 17/* Fast retrans. after 1 dupack */ +#define TCP_USER_TIMEOUT 18/* How long for loss retry before timeout */ +#define TCP_REPAIR 19/* TCP sock is under repair right now */ +#define TCP_REPAIR_QUEUE 20 +#define TCP_QUEUE_SEQ 21 +#define TCP_REPAIR_OPTIONS 22 +#define TCP_FASTOPEN 23/* Enable FastOpen on listeners */ +#define TCP_TIMESTAMP 24 +#define TCP_NOTSENT_LOWAT 25/* limit number of unsent bytes in write queue */ +#define TCP_CC_INFO 26/* Get Congestion Control (optional) info */ +#define TCP_SAVE_SYN 27/* Record SYN headers for new connections */ +#define TCP_SAVED_SYN 28/* Get SYN headers recorded for connection */ +#define TCP_REPAIR_WINDOW 29/* Get/set window parameters */ +#define TCP_FASTOPEN_CONNECT 30/* Attempt FastOpen with connect */ +#define TCP_ULP 31/* Attach a ULP to a TCP connection */ +#define TCP_MD5SIG_EXT 32/* TCP MD5 Signature with extensions */ +#define TCP_FASTOPEN_KEY 33/* Set the key for Fast Open (cookie) */ +#define TCP_FASTOPEN_NO_COOKIE 34/* Enable TFO without a TFO cookie */ +#define TCP_ZEROCOPY_RECEIVE 35 +#define TCP_INQ 36/* Notify bytes available to read as a cmsg on read */ + +#define TCP_CM_INQ TCP_INQ + +#define TCP_TX_DELAY 37/* delay outgoing packets by XX usec */ + + +#define TCP_REPAIR_ON 1 +#define TCP_REPAIR_OFF 0 +#define TCP_REPAIR_OFF_NO_WP -1/* Turn off without window probes */ + +struct tcp_repair_opt { +__u32 opt_code; +__u32 opt_val; +}; + +struct tcp_repair_window { +__u32 snd_wl1; +__u32 snd_wnd; +__u32 max_window; + +__u32 rcv_wnd; +__u32 rcv_wup; +}; + +enum { +TCP_NO_QUEUE , +TCP_RECV_QUEUE , +TCP_SEND_QUEUE , +TCP_QUEUES_NR , +}; + +/* why fastopen failed from client perspective */ +enum tcp_fastopen_client_fail { +TFO_STATUS_UNSPEC ,/* catch-all */ +TFO_COOKIE_UNAVAILABLE ,/* if not in TFO_CLIENT_NO_COOKIE mode */ +TFO_DATA_NOT_ACKED ,/* SYN-ACK did not ack SYN data */ +TFO_SYN_RETRANSMITTED ,/* SYN-ACK did not ack SYN data after timeout */ +}; + +/* for TCP_INFO socket option */ +#define TCPI_OPT_TIMESTAMPS 1 +#define TCPI_OPT_SACK 2 +#define TCPI_OPT_WSCALE 4 +#define TCPI_OPT_ECN 8/* ECN was negociated at TCP session init */ +#define TCPI_OPT_ECN_SEEN 16/* we received at least one packet with ECT */ +#define TCPI_OPT_SYN_DATA 32/* SYN-ACK acked data in SYN sent or rcvd */ + +/* +* Sender's congestion state indicating normal or abnormal situations +* in the last round of packets sent. The state is driven by the ACK +* information and timer events. +*/ +enum tcp_ca_state { +/* +* Nothing bad has been observed recently. +* No apparent reordering, packet loss, or ECN marks. +*/ + TCP_CA_Open =0 , +#define TCPF_CA_Open (1<<TCP_CA_Open) +/* +* The sender enters disordered state when it has received DUPACKs or +* SACKs in the last round of packets sent. This could be due to packet +* loss or reordering but needs further information to confirm packets +* have been lost. + */ + TCP_CA_Disorder =1 , +#define TCPF_CA_Disorder (1<<TCP_CA_Disorder) +/* +* The sender enters Congestion Window Reduction (CWR) state when it +* has received ACKs with ECN-ECE marks, or has experienced congestion +* or packet discard on the sender host (e.g. qdisc). + */ +TCP_CA_CWR =2 , +#define TCPF_CA_CWR (1<<TCP_CA_CWR) +/* +* The sender is in fast recovery and retransmitting lost packets, +* typically triggered by ACK events. + */ + TCP_CA_Recovery =3 , +#define TCPF_CA_Recovery (1<<TCP_CA_Recovery) +/* +* The sender is in loss recovery triggered by retransmission timeout. + */ + TCP_CA_Loss =4 +#define TCPF_CA_Loss (1<<TCP_CA_Loss) +}; + +struct tcp_info { +__u8 tcpi_state; +__u8 tcpi_ca_state; +__u8 tcpi_retransmits; +__u8 tcpi_probes; +__u8 tcpi_backoff; +__u8 tcpi_options; +__u8 tcpi_snd_wscale :4 , tcpi_rcv_wscale :4 ; +__u8 tcpi_delivery_rate_app_limited:1 , tcpi_fastopen_client_fail:2 ; + +__u32 tcpi_rto; +__u32 tcpi_ato; +__u32 tcpi_snd_mss; +__u32 tcpi_rcv_mss; + +__u32 tcpi_unacked; +__u32 tcpi_sacked; +__u32 tcpi_lost; +__u32 tcpi_retrans; +__u32 tcpi_fackets; + +/* Times. */ +__u32 tcpi_last_data_sent; +__u32 tcpi_last_ack_sent;/* Not remembered, sorry. */ +__u32 tcpi_last_data_recv; +__u32 tcpi_last_ack_recv; + +/* Metrics. */ +__u32 tcpi_pmtu; +__u32 tcpi_rcv_ssthresh; +__u32 tcpi_rtt; +__u32 tcpi_rttvar; +__u32 tcpi_snd_ssthresh; +__u32 tcpi_snd_cwnd; +__u32 tcpi_advmss; +__u32 tcpi_reordering; + +__u32 tcpi_rcv_rtt; +__u32 tcpi_rcv_space; + +__u32 tcpi_total_retrans; + +__u64 tcpi_pacing_rate; +__u64 tcpi_max_pacing_rate; +__u64 tcpi_bytes_acked;/* RFC4898 tcpEStatsAppHCThruOctetsAcked */ +__u64 tcpi_bytes_received;/* RFC4898 tcpEStatsAppHCThruOctetsReceived */ +__u32 tcpi_segs_out;/* RFC4898 tcpEStatsPerfSegsOut */ +__u32 tcpi_segs_in;/* RFC4898 tcpEStatsPerfSegsIn */ + +__u32 tcpi_notsent_bytes; +__u32 tcpi_min_rtt; +__u32 tcpi_data_segs_in;/* RFC4898 tcpEStatsDataSegsIn */ +__u32 tcpi_data_segs_out;/* RFC4898 tcpEStatsDataSegsOut */ + +__u64 tcpi_delivery_rate; + +__u64 tcpi_busy_time;/* Time (usec) busy sending data */ +__u64 tcpi_rwnd_limited;/* Time (usec) limited by receive window */ +__u64 tcpi_sndbuf_limited;/* Time (usec) limited by send buffer */ + +__u32 tcpi_delivered; +__u32 tcpi_delivered_ce; + +__u64 tcpi_bytes_sent;/* RFC4898 tcpEStatsPerfHCDataOctetsOut */ +__u64 tcpi_bytes_retrans;/* RFC4898 tcpEStatsPerfOctetsRetrans */ +__u32 tcpi_dsack_dups;/* RFC4898 tcpEStatsStackDSACKDups */ +__u32 tcpi_reord_seen;/* reordering events seen */ + +__u32 tcpi_rcv_ooopack;/* Out-of-order packets received */ + +__u32 tcpi_snd_wnd;/* peer's advertised receive window after +* scaling (bytes) +*/ +}; + +/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */ +enum { +TCP_NLA_PAD , +TCP_NLA_BUSY ,/* Time (usec) busy sending data */ +TCP_NLA_RWND_LIMITED ,/* Time (usec) limited by receive window */ +TCP_NLA_SNDBUF_LIMITED ,/* Time (usec) limited by send buffer */ +TCP_NLA_DATA_SEGS_OUT ,/* Data pkts sent including retransmission */ +TCP_NLA_TOTAL_RETRANS ,/* Data pkts retransmitted */ +TCP_NLA_PACING_RATE ,/* Pacing rate in bytes per second */ +TCP_NLA_DELIVERY_RATE ,/* Delivery rate in bytes per second */ +TCP_NLA_SND_CWND ,/* Sending congestion window */ +TCP_NLA_REORDERING ,/* Reordering metric */ +TCP_NLA_MIN_RTT ,/* minimum RTT */ +TCP_NLA_RECUR_RETRANS ,/* Recurring retransmits for the current pkt */ +TCP_NLA_DELIVERY_RATE_APP_LMT ,/* delivery rate application limited ? */ +TCP_NLA_SNDQ_SIZE ,/* Data (bytes) pending in send queue */ +TCP_NLA_CA_STATE ,/* ca_state of socket */ +TCP_NLA_SND_SSTHRESH ,/* Slow start size threshold */ +TCP_NLA_DELIVERED ,/* Data pkts delivered incl. out-of-order */ +TCP_NLA_DELIVERED_CE ,/* Like above but only ones w/ CE marks */ +TCP_NLA_BYTES_SENT ,/* Data bytes sent including retransmission */ +TCP_NLA_BYTES_RETRANS ,/* Data bytes retransmitted */ +TCP_NLA_DSACK_DUPS ,/* DSACK blocks received */ +TCP_NLA_REORD_SEEN ,/* reordering events seen */ +TCP_NLA_SRTT ,/* smoothed RTT in usecs */ +TCP_NLA_TIMEOUT_REHASH ,/* Timeout-triggered rehash attempts */ +TCP_NLA_BYTES_NOTSENT ,/* Bytes in write queue not yet sent */ +TCP_NLA_EDT ,/* Earliest departure time (CLOCK_MONOTONIC) */ +}; + +/* for TCP_MD5SIG socket option */ +#define TCP_MD5SIG_MAXKEYLEN 80 + +/* tcp_md5sig extension flags for TCP_MD5SIG_EXT */ +#define TCP_MD5SIG_FLAG_PREFIX 0x1/* address prefix length */ +#define TCP_MD5SIG_FLAG_IFINDEX 0x2/* ifindex set */ + +struct tcp_md5sig { +struct __kernel_sockaddr_storage tcpm_addr;/* address associated */ +__u8 tcpm_flags;/* extension flags */ +__u8 tcpm_prefixlen;/* address prefix */ +__u16 tcpm_keylen;/* key length */ +int tcpm_ifindex;/* device index for scope */ +__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN ];/* key (binary) */ +}; + +/* INET_DIAG_MD5SIG */ +struct tcp_diag_md5sig { +__u8 tcpm_family; +__u8 tcpm_prefixlen; +__u16 tcpm_keylen; +__be32 tcpm_addr[4 ]; +__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN ]; +}; + +/* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */ + +#define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1 +struct tcp_zerocopy_receive { +__u64 address;/* in: address of mapping */ +__u32 length;/* in/out: number of bytes to map/mapped */ +__u32 recv_skip_hint;/* out: amount of bytes to skip */ +__u32 inq;/* out: amount of bytes in read queue */ +__s32 err;/* out: socket error */ +__u64 copybuf_address;/* in: copybuf address (small reads) */ +__s32 copybuf_len;/* in/out: copybuf bytes avail/used or error */ +__u32 flags;/* in: flags */ +}; +#endif /* _UAPI_LINUX_TCP_H */
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
Re: [PATCH bpf-next v7 2/4] tools, bpf: add tcp.h to tools/uapi
Quoted 1 line · Stanislav Fomichev
Next test is using struct
tcp_zerocopy_receivewhich was added in v4.18.
Instead of "Next", it is the test in the previous patch.
Instead of having patch 2 fixing patch 1,
the changes in testing/selftests/bpf/* in patch 1 make more sense to merge it with this patch. With this change, for patch 1 and 2:
Re: [PATCH bpf-next v7 2/4] tools, bpf: add tcp.h to tools/uapi
Quoted 8 lines · Martin KaFai Lau
Quoted 1 line · Stanislav Fomichev
Next test is using struct
tcp_zerocopy_receivewhich was added in v4.18.Instead of "Next", it is the test in the previous patch.
Instead of having patch 2 fixing patch 1,
the changes in testing/selftests/bpf/* in patch 1 make more sense to merge it with this patch. With this change, for patch 1 and 2:
Ah, I messed up the ordering. Sure, let's just merge them together, will resend. Thank you!
Quoted 1 line
Acked-by Martin KaFai Lau
PATCH v7 3/4 bpf: try to avoid kzalloc in cgroup/{s,g}etsockopt
In reply to Stanislav FomichevWhen we attach a bpf program to cgroup/getsockopt any other getsockopt() syscall starts incurring kzalloc/kfree cost.
Let add a small buffer on the stack and use it for small (majority) {s,g}etsockopt values. The buffer is small enough to fit into the cache line and cover the majority of simple options (most of them are 4 byte ints).
It seems natural to do the same for setsockopt, but it's a bit more involved when the BPF program modifies the data (where we have to kmalloc). The assumption is that for the majority of setsockopt calls (which are doing pure BPF options or apply policy) this will bring some benefit as well.
Without this patch (we remove about 1% __kmalloc):
3.38% 0.07% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt
|
--3.30%--__cgroup_bpf_run_filter_getsockopt
|
--0.81%--__kmalloc--- include/linux/filter.h | 5 ++++ kernel/bpf/cgroup.c | 52 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 7 deletions(-)
include/linux/filter.h +5 -0
@@ -1281,6 +1281,11 @@ struct bpf_sysctl_kern {u64 tmp_reg; }; +#define BPF_SOCKOPT_KERN_BUF_SIZE 32 +struct bpf_sockopt_buf { +u8 data[BPF_SOCKOPT_KERN_BUF_SIZE ]; +}; +struct bpf_sockopt_kern {struct sock *sk;u8 *optval;
kernel/bpf/cgroup.c +45 -7
115 lines not on this page · raw message
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
Re: [PATCH bpf-next v7 3/4] bpf: try to avoid kzalloc in cgroup/{s,g}etsockopt
Quoted 115 lines · Stanislav Fomichev
When we attach a bpf program to cgroup/getsockopt any other
getsockopt()syscall starts incurring kzalloc/kfree cost.Let add a small buffer on the stack and use it for small (majority) {s,g}etsockopt values. The buffer is small enough to fit into the cache line and cover the majority of simple options (most of them are 4 byte ints).
It seems natural to do the same for setsockopt, but it's a bit more involved when the BPF program modifies the data (where we have to kmalloc). The assumption is that for the majority of setsockopt calls (which are doing pure BPF options or apply policy) this will bring some benefit as well.
Without this patch (we remove about 1%
__kmalloc):3.38% 0.07% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt | --3.30%--__cgroup_bpf_run_filter_getsockopt | --0.81%--__kmallocSigned-off-by Stanislav Fomichev <[email protected]>Cc Martin KaFai Lau <[email protected]>Cc Song Liu <[email protected]>--- include/linux/filter.h | 5 ++++ kernel/bpf/cgroup.c | 52 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 7 deletions(-)include/linux/filter.h +5
-0@@ -1281,6 +1281,11 @@ struct bpf_sysctl_kern {u64 tmp_reg; }; +#define BPF_SOCKOPT_KERN_BUF_SIZE 32 +struct bpf_sockopt_buf { +u8 data[BPF_SOCKOPT_KERN_BUF_SIZE ]; +}; +struct bpf_sockopt_kern {struct sock *sk;u8 *optval;kernel/bpf/cgroup.c +23
-3@@ -1298,7 +1298,8 @@ static bool __cgroup_bpf_prog_array_is_empty(struct cgroup *cgrp,return empty; } -static int sockopt_alloc_buf (struct bpf_sockopt_kern *ctx,int max_optlen) +static int sockopt_alloc_buf (struct bpf_sockopt_kern *ctx,int max_optlen, +struct bpf_sockopt_buf *buf) {if (unlikely (max_optlen <0 ))return -EINVAL ;@@ -1310,6 +1311,15 @@ static int sockopt_alloc_buf(struct bpf_sockopt_kern *ctx, int max_optlen) max_optlen =PAGE_SIZE ; } +if (max_optlen <=sizeof (buf->data)) { +/* When the optval fits into BPF_SOCKOPT_KERN_BUF_SIZE +* bytes avoid the cost of kzalloc. +*/ + ctx->optval = buf->data; + ctx->optval_end = ctx->optval + max_optlen; +return max_optlen; + } + ctx->optval =kzalloc (max_optlen,GFP_USER );if (!ctx->optval)return -ENOMEM ;@@ -1319,16 +1329,26 @@ static int sockopt_alloc_buf(struct bpf_sockopt_kern *ctx, int max_optlen)return max_optlen; } -static void sockopt_free_buf (struct bpf_sockopt_kern *ctx) +static void sockopt_free_buf (struct bpf_sockopt_kern *ctx, +struct bpf_sockopt_buf *buf) { +if (ctx->optval == buf->data) +return ;kfree (ctx->optval); } +static bool sockopt_buf_allocated (struct bpf_sockopt_kern *ctx, +struct bpf_sockopt_buf *buf) +{ +return ctx->optval != buf->data; +} +int __cgroup_bpf_run_filter_setsockopt (struct sock *sk,int *level,int *optname,char __user *optval,int *optlen,char **kernel_optval) {struct cgroup *cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); +struct bpf_sockopt_buf buf = {};struct bpf_sockopt_kern ctx = { .sk = sk, .level = *level,@@ -1350,7 +1370,7 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,*/ max_optlen =max_t (int,16 , *optlen); - max_optlen =sockopt_alloc_buf (&ctx, max_optlen); + max_optlen =sockopt_alloc_buf (&ctx, max_optlen, &buf);if (max_optlen <0 )return max_optlen;@@ -1390,14 +1410,31 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,*/ if (ctx.optlen !=0 ) {
kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level, · line 1420
Quoted 10 lines
kernel/bpf/cgroup.c +8
-1*optlen = ctx.optlen; - *kernel_optval = ctx.optval; +/* We've used bpf_sockopt_kern->buf as an intermediary +* storage, but the BPF program indicates that we need +* to pass this data to the kernel setsockopt handler. +* No way to export on-stack buf, have to allocate a +* new buffer. +*/ +if (!sockopt_buf_allocated (&ctx, &buf)) { +void *p =kzalloc (ctx.optlen,GFP_USER );
nit. zero-ing is unnecessary when memcpy() will be done later.
Re: [PATCH bpf-next v7 3/4] bpf: try to avoid kzalloc in cgroup/{s,g}etsockopt
Quoted 114 lines · Martin KaFai Lau
Quoted 112 lines · Stanislav Fomichev
When we attach a bpf program to cgroup/getsockopt any other
getsockopt()syscall starts incurring kzalloc/kfree cost.Let add a small buffer on the stack and use it for small (majority) {s,g}etsockopt values. The buffer is small enough to fit into the cache line and cover the majority of simple options (most of them are 4 byte ints).
It seems natural to do the same for setsockopt, but it's a bit more involved when the BPF program modifies the data (where we have to kmalloc). The assumption is that for the majority of setsockopt calls (which are doing pure BPF options or apply policy) this will bring some benefit as well.
Without this patch (we remove about 1%
__kmalloc):3.38% 0.07% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt | --3.30%--__cgroup_bpf_run_filter_getsockopt | --0.81%--__kmallocSigned-off-by Stanislav Fomichev <[email protected]>Cc Martin KaFai Lau <[email protected]>Cc Song Liu <[email protected]>--- include/linux/filter.h | 5 ++++ kernel/bpf/cgroup.c | 52 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 7 deletions(-)include/linux/filter.h +5
-0@@ -1281,6 +1281,11 @@ struct bpf_sysctl_kern {u64 tmp_reg; }; +#define BPF_SOCKOPT_KERN_BUF_SIZE 32 +struct bpf_sockopt_buf { +u8 data[BPF_SOCKOPT_KERN_BUF_SIZE ]; +}; +struct bpf_sockopt_kern {struct sock *sk;u8 *optval;kernel/bpf/cgroup.c +23
-3@@ -1298,7 +1298,8 @@ static bool __cgroup_bpf_prog_array_is_empty(struct cgroup *cgrp,return empty; } -static int sockopt_alloc_buf (struct bpf_sockopt_kern *ctx,int max_optlen) +static int sockopt_alloc_buf (struct bpf_sockopt_kern *ctx,int max_optlen, +struct bpf_sockopt_buf *buf) {if (unlikely (max_optlen <0 ))return -EINVAL ;@@ -1310,6 +1311,15 @@ static int sockopt_alloc_buf(struct bpf_sockopt_kern *ctx, int max_optlen) max_optlen =PAGE_SIZE ; } +if (max_optlen <=sizeof (buf->data)) { +/* When the optval fits into BPF_SOCKOPT_KERN_BUF_SIZE +* bytes avoid the cost of kzalloc. +*/ + ctx->optval = buf->data; + ctx->optval_end = ctx->optval + max_optlen; +return max_optlen; + } + ctx->optval =kzalloc (max_optlen,GFP_USER );if (!ctx->optval)return -ENOMEM ;@@ -1319,16 +1329,26 @@ static int sockopt_alloc_buf(struct bpf_sockopt_kern *ctx, int max_optlen)return max_optlen; } -static void sockopt_free_buf (struct bpf_sockopt_kern *ctx) +static void sockopt_free_buf (struct bpf_sockopt_kern *ctx, +struct bpf_sockopt_buf *buf) { +if (ctx->optval == buf->data) +return ;kfree (ctx->optval); } +static bool sockopt_buf_allocated (struct bpf_sockopt_kern *ctx, +struct bpf_sockopt_buf *buf) +{ +return ctx->optval != buf->data; +} +int __cgroup_bpf_run_filter_setsockopt (struct sock *sk,int *level,int *optname,char __user *optval,int *optlen,char **kernel_optval) {struct cgroup *cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); +struct bpf_sockopt_buf buf = {};struct bpf_sockopt_kern ctx = { .sk = sk, .level = *level,@@ -1350,7 +1370,7 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,*/ max_optlen =max_t (int,16 , *optlen); - max_optlen =sockopt_alloc_buf (&ctx, max_optlen); + max_optlen =sockopt_alloc_buf (&ctx, max_optlen, &buf);if (max_optlen <0 )return max_optlen;
Quoted 14 lines
kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level, · line 1420
Quoted 13 lines
kernel/bpf/cgroup.c +8
-1@@ -1390,14 +1410,31 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,*/ if (ctx.optlen !=0 ) { *optlen = ctx.optlen; - *kernel_optval = ctx.optval; +/* We've used bpf_sockopt_kern->buf as an intermediary +* storage, but the BPF program indicates that we need +* to pass this data to the kernel setsockopt handler. +* No way to export on-stack buf, have to allocate a +* new buffer. +*/ +if (!sockopt_buf_allocated (&ctx, &buf)) { +void *p =kzalloc (ctx.optlen,GFP_USER );nit. zero-ing is unnecessary when
memcpy()will be done later.
SG, will switch to kmalloc, thanks!
Quoted 1 line
Acked-by Martin KaFai Lau <[email protected]>
PATCH v7 4/4 bpf: split cgroup_bpf_enabled per attach type
In reply to Stanislav FomichevWhen we attach any cgroup hook, the rest (even if unused/unattached) start to contribute small overhead. In particular, the one we want to avoid is __cgroup_bpf_run_filter_skb which does two redirections to get to the cgroup and pushes/pulls skb.
Let's split cgroup_bpf_enabled to be per-attach to make sure only used attach types trigger.
I've dropped some existing high-level cgroup_bpf_enabled in some places because BPF_PROG_CGROUP_XXX_RUN macros usually have another cgroup_bpf_enabled check.
I also had to copy-paste BPF_CGROUP_RUN_SA_PROG_LOCK for GETPEERNAME/GETSOCKNAME because type for cgroup_bpf_enabled[type] has to be constant and known at compile time.
--- include/linux/bpf-cgroup.h | 38 ++++++++++++++++++++------------------ kernel/bpf/cgroup.c | 14 ++++++-------- net/ipv4/af_inet.c | 9 +++++---- net/ipv4/udp.c | 7 +++---- net/ipv6/af_inet6.c | 9 +++++---- net/ipv6/udp.c | 7 +++---- 6 files changed, 42 insertions(+), 42 deletions(-)
include/linux/bpf-cgroup.h +20 -18
@@ -23,8 +23,8 @@ struct ctl_table_header;#ifdef CONFIG_CGROUP_BPF -extern struct static_key_false cgroup_bpf_enabled_key; -#define cgroup_bpf_enabled static_branch_unlikely(&cgroup_bpf_enabled_key) +extern struct static_key_false cgroup_bpf_enabled_key[MAX_BPF_ATTACH_TYPE ]; +#define cgroup_bpf_enabled (type) static_branch_unlikely(&cgroup_bpf_enabled_key[type]) DECLARE_PER_CPU(struct bpf_cgroup_storage*, bpf_cgroup_storage[MAX_BPF_CGROUP_STORAGE_TYPE ]);
@@ -189,7 +189,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_INET_INGRESS (sk, skb) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_INET_INGRESS)) \ __ret = __cgroup_bpf_run_filter_skb(sk, skb, \ BPF_CGROUP_INET_INGRESS); \ \
@@ -199,7 +199,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_INET_EGRESS (sk, skb) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled && sk && sk == skb->sk) { \ + if (cgroup_bpf_enabled(BPF_CGROUP_INET_EGRESS) && sk && sk == skb->sk) { \ typeof(sk) __sk = sk_to_full_sk(sk); \ if (sk_fullsock(__sk)) \ __ret = __cgroup_bpf_run_filter_skb(__sk, skb, \
@@ -211,7 +211,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_SK_PROG (sk, type) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) { \ + if (cgroup_bpf_enabled(type)) { \ __ret = __cgroup_bpf_run_filter_sk(sk, type); \ } \ __ret; \
@@ -232,7 +232,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, type) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(type)) \ __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, type, \ NULL); \ __ret; \
@@ -241,7 +241,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, type, t_ctx) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) { \ + if (cgroup_bpf_enabled(type)) { \ lock_sock(sk); \ __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, type, \ t_ctx); \
@@ -256,8 +256,10 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK (sk, uaddr) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET6_BIND, NULL) -#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) (cgroup_bpf_enabled && \ - sk->sk_prot->pre_connect) +#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) \ + ((cgroup_bpf_enabled(BPF_CGROUP_INET4_CONNECT) || \ + cgroup_bpf_enabled(BPF_CGROUP_INET6_CONNECT)) && \ + (sk)->sk_prot->pre_connect)#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr) \ BPF_CGROUP_RUN_SA_PROG(sk, uaddr, BPF_CGROUP_INET4_CONNECT)
@@ -301,7 +303,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_SOCK_OPS_SK (sock_ops, sk) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_SOCK_OPS)) \ __ret = __cgroup_bpf_run_filter_sock_ops(sk, \ sock_ops, \ BPF_CGROUP_SOCK_OPS); \
@@ -311,7 +313,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_SOCK_OPS (sock_ops) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled && (sock_ops)->sk) { \ + if (cgroup_bpf_enabled(BPF_CGROUP_SOCK_OPS) && (sock_ops)->sk) { \ typeof(sk) __sk = sk_to_full_sk((sock_ops)->sk); \ if (__sk && sk_fullsock(__sk)) \ __ret = __cgroup_bpf_run_filter_sock_ops(__sk, \
@@ -324,7 +326,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP (type, major, minor, access) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_DEVICE)) \ __ret = __cgroup_bpf_check_dev_permission(type, major, minor, \ access, \ BPF_CGROUP_DEVICE); \
@@ -336,7 +338,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_RUN_PROG_SYSCTL (head, table, write, buf, count, pos) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_SYSCTL)) \ __ret = __cgroup_bpf_run_filter_sysctl(head, table, write, \ buf, count, pos, \ BPF_CGROUP_SYSCTL); \
@@ -347,7 +349,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, kernel_optval) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_SETSOCKOPT)) \ __ret = __cgroup_bpf_run_filter_setsockopt(sock, level, \ optname, optval, \ optlen, \
@@ -358,7 +360,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,#define BPF_CGROUP_GETSOCKOPT_MAX_OPTLEN (optlen) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_GETSOCKOPT)) \ get_user(__ret, optlen); \ __ret; \ })
@@ -367,7 +369,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, max_optlen, retval) \ ({ \ int __ret = retval; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_GETSOCKOPT)) \ if (!(sock)->sk_prot->bpf_bypass_getsockopt || \ !INDIRECT_CALL_INET_1((sock)->sk_prot->bpf_bypass_getsockopt, \ tcp_bpf_bypass_getsockopt, \
@@ -382,7 +384,7 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, optlen, retval) \ ({ \ int __ret = retval; \ - if (cgroup_bpf_enabled) \ + if (cgroup_bpf_enabled(BPF_CGROUP_GETSOCKOPT)) \ __ret = __cgroup_bpf_run_filter_getsockopt_kern( \ sock, level, optname, optval, optlen, retval); \ __ret; \
@@ -444,7 +446,7 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,return 0 ; } -#define cgroup_bpf_enabled (0) +#define cgroup_bpf_enabled (type) (0)#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, type, t_ctx) ({ 0; })#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) (0)#define BPF_CGROUP_RUN_PROG_INET_INGRESS (sk,skb) ({ 0; })
kernel/bpf/cgroup.c +6 -8
@@ -19,7 +19,7 @@#include "../cgroup/cgroup-internal.h" -DEFINE_STATIC_KEY_FALSE (cgroup_bpf_enabled_key); +DEFINE_STATIC_KEY_ARRAY_FALSE (cgroup_bpf_enabled_key,MAX_BPF_ATTACH_TYPE );EXPORT_SYMBOL (cgroup_bpf_enabled_key);void cgroup_bpf_offline (struct cgroup *cgrp)
@@ -128,7 +128,7 @@ static void cgroup_bpf_release(struct work_struct *work)if (pl->link)bpf_cgroup_link_auto_detach (pl->link);kfree (pl); -static_branch_dec (&cgroup_bpf_enabled_key); +static_branch_dec (&cgroup_bpf_enabled_key[type]); } old_array = rcu_dereference_protected( cgrp->bpf.effective[type],
@@ -499,7 +499,7 @@ int __cgroup_bpf_attach(struct cgroup *cgrp,if (old_prog)bpf_prog_put (old_prog);else -static_branch_inc (&cgroup_bpf_enabled_key); +static_branch_inc (&cgroup_bpf_enabled_key[type]);bpf_cgroup_storages_link (new_storage, cgrp, type);return 0 ;
@@ -698,7 +698,7 @@ int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, cgrp->bpf.flags[type] =0 ;if (old_prog)bpf_prog_put (old_prog); -static_branch_dec (&cgroup_bpf_enabled_key); +static_branch_dec (&cgroup_bpf_enabled_key[type]);return 0 ; cleanup:
@@ -1360,8 +1360,7 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,* attached to the hook so we don't waste time allocating * memory and locking the socket. */ -if (!cgroup_bpf_enabled || -__cgroup_bpf_prog_array_is_empty (cgrp,BPF_CGROUP_SETSOCKOPT )) +if (__cgroup_bpf_prog_array_is_empty (cgrp,BPF_CGROUP_SETSOCKOPT ))return 0 ;/* Allocate a bit more than the initial user buffer for
@@ -1457,8 +1456,7 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level,* attached to the hook so we don't waste time allocating * memory and locking the socket. */ -if (!cgroup_bpf_enabled || -__cgroup_bpf_prog_array_is_empty (cgrp,BPF_CGROUP_GETSOCKOPT )) +if (__cgroup_bpf_prog_array_is_empty (cgrp,BPF_CGROUP_GETSOCKOPT ))return retval; ctx.optlen = max_optlen;
net/ipv4/af_inet.c +5 -4
@@ -777,18 +777,19 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,return -ENOTCONN ; sin->sin_port = inet->inet_dport; sin->sin_addr.s_addr = inet->inet_daddr; +BPF_CGROUP_RUN_SA_PROG_LOCK (sk, (struct sockaddr *)sin, +BPF_CGROUP_INET4_GETPEERNAME , +NULL ); }else {__be32 addr = inet->inet_rcv_saddr;if (!addr) addr = inet->inet_saddr; sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; - } -if (cgroup_bpf_enabled)BPF_CGROUP_RUN_SA_PROG_LOCK (sk, (struct sockaddr *)sin, - peer ?BPF_CGROUP_INET4_GETPEERNAME : -BPF_CGROUP_INET4_GETSOCKNAME , +BPF_CGROUP_INET4_GETSOCKNAME ,NULL ); + }memset (sin->sin_zero,0 ,sizeof (sin->sin_zero));return sizeof (*sin); }
net/ipv4/udp.c +3 -4
@@ -1124,7 +1124,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)rcu_read_unlock (); } -if (cgroup_bpf_enabled && !connected) { +if (cgroup_bpf_enabled (BPF_CGROUP_UDP4_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, (struct sockaddr *)usin, &ipc.addr);if (err)
@@ -1858,9 +1858,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,memset (sin->sin_zero,0 ,sizeof (sin->sin_zero)); *addr_len =sizeof (*sin); -if (cgroup_bpf_enabled) -BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, - (struct sockaddr *)sin); +BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, + (struct sockaddr *)sin); }if (udp_sk (sk)->gro_enabled)
net/ipv6/af_inet6.c +5 -4
@@ -527,18 +527,19 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, sin->sin6_addr = sk->sk_v6_daddr;if (np->sndflow) sin->sin6_flowinfo = np->flow_label; +BPF_CGROUP_RUN_SA_PROG_LOCK (sk, (struct sockaddr *)sin, +BPF_CGROUP_INET6_GETPEERNAME , +NULL ); }else {if (ipv6_addr_any (&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr;else sin->sin6_addr = sk->sk_v6_rcv_saddr; sin->sin6_port = inet->inet_sport; - } -if (cgroup_bpf_enabled)BPF_CGROUP_RUN_SA_PROG_LOCK (sk, (struct sockaddr *)sin, - peer ?BPF_CGROUP_INET6_GETPEERNAME : -BPF_CGROUP_INET6_GETSOCKNAME , +BPF_CGROUP_INET6_GETSOCKNAME ,NULL ); + } sin->sin6_scope_id =ipv6_iface_scope_id (&sin->sin6_addr, sk->sk_bound_dev_if);return sizeof (*sin);
net/ipv6/udp.c +3 -4
@@ -409,9 +409,8 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, } *addr_len =sizeof (*sin6); -if (cgroup_bpf_enabled) -BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, - (struct sockaddr *)sin6); +BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, + (struct sockaddr *)sin6); }if (udp_sk (sk)->gro_enabled)
@@ -1462,7 +1461,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) fl6.saddr = np->saddr; fl6.fl6_sport = inet->inet_sport; -if (cgroup_bpf_enabled && !connected) { +if (cgroup_bpf_enabled (BPF_CGROUP_UDP6_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, (struct sockaddr *)sin6, &fl6.saddr);if (err)
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog