net: reduce sk_filter() (and friends) bloat
Subsystems (11)
cover net: reduce sk_filter() (and friends) bloat
Some functions return an error by value, and a drop_reason by an output parameter. This extra parameter can force stack canaries.
A drop_reason is enough and more efficient.
This series reduces bloat by 678 bytes on x86_64:
$ scripts/bloat-o-meter -t vmlinux.old vmlinux.final add/remove: 0/0 grow/shrink: 3/18 up/down: 79/-757 (-678) Function old new delta vsock_queue_rcv_skb 50 79 +29 ipmr_cache_report 1290 1315 +25 ip6mr_cache_report 1322 1347 +25 tcp_v6_rcv 3169 3167 -2 packet_rcv_spkt 329 327 -2 unix_dgram_sendmsg 1731 1726 -5 netlink_unicast 957 945 -12 netlink_dump 1372 1359 -13 sk_filter_trim_cap 889 858 -31 netlink_broadcast_filtered 1633 1595 -38 tcp_v4_rcv 3152 3111 -41 raw_rcv_skb 122 80 -42 ping_queue_rcv_skb 109 61 -48 ping_rcv 215 162 -53 rawv6_rcv_skb 278 224 -54 __sk_receive_skb 690 632 -58 raw_rcv 591 527 -64 udpv6_queue_rcv_one_skb 935 869 -66 udp_queue_rcv_one_skb 919 853 -66 tun_net_xmit 1146 1074 -72 sock_queue_rcv_skb_reason 166 76 -90 Total: Before=29722890, After=29722212, chg -0.00%
Future conversions from sock_queue_rcv_skb() to sock_queue_rcv_skb_reason() can be done later.
Eric Dumazet (5):
net: change sock_queue_rcv_skb_reason() to return a drop_reason
net: always set reason in sk_filter_trim_cap()
net: change sk_filter_reason() to return the reason by value
tcp: change tcp_filter() to return the reason by value
net: change sk_filter_trim_cap() to return a drop_reason by value
drivers/net/tun.c | 8 +++++--- include/linux/filter.h | 15 ++++++++------- include/net/sock.h | 17 ++++++++++++++--- include/net/tcp.h | 6 +++--- net/can/bcm.c | 5 ++--- net/can/isotp.c | 3 ++- net/can/j1939/socket.c | 3 ++- net/can/raw.c | 3 ++- net/core/filter.c | 30 +++++++++++++----------------- net/core/sock.c | 29 +++++++++++------------------ net/ipv4/ping.c | 3 ++- net/ipv4/raw.c | 3 ++- net/ipv4/tcp_ipv4.c | 6 ++++-- net/ipv4/udp.c | 3 ++- net/ipv6/raw.c | 3 ++- net/ipv6/tcp_ipv6.c | 6 ++++-- net/ipv6/udp.c | 3 ++- net/rose/rose_in.c | 3 +-- 18 files changed, 81 insertions(+), 68 deletions(-)
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 1/5 net: change sock_queue_rcv_skb_reason() to return a drop_reason
Change sock_queue_rcv_skb_reason() to return the drop_reason directly instead of using a reference.
This is part of an effort to remove stack canaries and reduce bloat.
$ scripts/bloat-o-meter -t vmlinux.old vmlinux.new add/remove: 0/0 grow/shrink: 3/7 up/down: 79/-301 (-222) Function old new delta vsock_queue_rcv_skb 50 79 +29 ipmr_cache_report 1290 1315 +25 ip6mr_cache_report 1322 1347 +25 packet_rcv_spkt 329 327 -2 sock_queue_rcv_skb_reason 166 128 -38 raw_rcv_skb 122 80 -42 ping_queue_rcv_skb 109 61 -48 ping_rcv 215 162 -53 rawv6_rcv_skb 278 224 -54 raw_rcv 591 527 -64 Total: Before=29722890, After=29722668, chg -0.00%
--- include/net/sock.h | 17 ++++++++++++++--- net/can/bcm.c | 5 ++--- net/can/isotp.c | 3 ++- net/can/j1939/socket.c | 3 ++- net/can/raw.c | 3 ++- net/core/sock.c | 20 ++++++-------------- net/ipv4/ping.c | 3 ++- net/ipv4/raw.c | 3 ++- net/ipv6/raw.c | 3 ++- 9 files changed, 34 insertions(+), 26 deletions(-)
include/net/sock.h +14 -3
@@ -2502,12 +2502,23 @@ int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue, struct sk_buff *skb));int __sock_queue_rcv_skb (struct sock *sk,struct sk_buff *skb); -int sock_queue_rcv_skb_reason (struct sock *sk,struct sk_buff *skb, -enum skb_drop_reason *reason); +enum skb_drop_reason +sock_queue_rcv_skb_reason (struct sock *sk,struct sk_buff *skb);static inline int sock_queue_rcv_skb (struct sock *sk,struct sk_buff *skb) { -return sock_queue_rcv_skb_reason (sk, skb,NULL ); +enum skb_drop_reason drop_reason =sock_queue_rcv_skb_reason (sk, skb); + +switch (drop_reason) { +case SKB_DROP_REASON_SOCKET_RCVBUFF : +return -ENOMEM ; +case SKB_DROP_REASON_PROTO_MEM : +return -ENOBUFS ; +case 0 : +return 0 ; +default : +return -EPERM ; + } }int sock_queue_err_skb (struct sock *sk,struct sk_buff *skb);
net/can/bcm.c +2 -3
@@ -363,7 +363,6 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,struct sockaddr_can *addr;struct sock *sk = op->sk;unsigned int datalen = head->nframes * op->cfsiz; -int err;unsigned int *pflags;enum skb_drop_reason reason;
@@ -420,8 +419,8 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head, addr->can_family =AF_CAN ; addr->can_ifindex = op->rx_ifindex; - err =sock_queue_rcv_skb_reason (sk, skb, &reason); -if (err <0 ) { + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason) {struct bcm_sock *bo =bcm_sk (sk);sk_skb_reason_drop (sk, skb, reason);
net/can/isotp.c +2 -1
@@ -291,7 +291,8 @@ static void isotp_rcv_skb(struct sk_buff *skb, struct sock *sk) addr->can_family =AF_CAN ; addr->can_ifindex = skb->dev->ifindex; -if (sock_queue_rcv_skb_reason (sk, skb, &reason) <0 ) + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason)sk_skb_reason_drop (sk, skb, reason); }
net/can/j1939/socket.c +2 -1
@@ -333,7 +333,8 @@ static void j1939_sk_recv_one(struct j1939_sock *jsk, struct sk_buff *oskb)if (skb->sk) skcb->msg_flags |=MSG_DONTROUTE ; -if (sock_queue_rcv_skb_reason (&jsk->sk, skb, &reason) <0 ) + reason =sock_queue_rcv_skb_reason (&jsk->sk, skb); +if (reason)sk_skb_reason_drop (&jsk->sk, skb, reason); }
net/can/raw.c +2 -1
@@ -207,7 +207,8 @@ static void raw_rcv(struct sk_buff *oskb, void *data)if (oskb->sk == sk) *pflags |=MSG_CONFIRM ; -if (sock_queue_rcv_skb_reason (sk, skb, &reason) <0 ) + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason)sk_skb_reason_drop (sk, skb, reason); }
net/core/sock.c +6 -14
@@ -520,32 +520,24 @@ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) }EXPORT_SYMBOL (__sock_queue_rcv_skb); -int sock_queue_rcv_skb_reason (struct sock *sk,struct sk_buff *skb, -enum skb_drop_reason *reason) +enum skb_drop_reason +sock_queue_rcv_skb_reason (struct sock *sk,struct sk_buff *skb) {enum skb_drop_reason drop_reason;int err; err =sk_filter_reason (sk, skb, &drop_reason);if (err) - goto out; +return drop_reason; err =__sock_queue_rcv_skb (sk, skb);switch (err) {case -ENOMEM : - drop_reason =SKB_DROP_REASON_SOCKET_RCVBUFF ; -break ; +return SKB_DROP_REASON_SOCKET_RCVBUFF ;case -ENOBUFS : - drop_reason =SKB_DROP_REASON_PROTO_MEM ; -break ; -default : - drop_reason =SKB_NOT_DROPPED_YET ; -break ; +return SKB_DROP_REASON_PROTO_MEM ; } -out: -if (reason) - *reason = drop_reason; -return err; +return SKB_NOT_DROPPED_YET ; }EXPORT_SYMBOL (sock_queue_rcv_skb_reason);
net/ipv4/ping.c +2 -1
@@ -935,7 +935,8 @@ static enum skb_drop_reason __ping_queue_rcv_skb(struct sock *sk,pr_debug ("ping_queue_rcv_skb(sk=%p,sk->num=%d,skb=%p)\n" ,inet_sk (sk),inet_sk (sk)->inet_num, skb); -if (sock_queue_rcv_skb_reason (sk, skb, &reason) <0 ) { + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason) {sk_skb_reason_drop (sk, skb, reason);pr_debug ("ping_queue_rcv_skb -> failed\n" );return reason;
net/ipv4/raw.c +2 -1
@@ -300,7 +300,8 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)/* Charge it to the socket. */ ipv4_pktinfo_prepare (sk, skb, true); -if (sock_queue_rcv_skb_reason (sk, skb, &reason) <0 ) { + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason) {sk_skb_reason_drop (sk, skb, reason);return NET_RX_DROP ; }
net/ipv6/raw.c +2 -1
@@ -369,7 +369,8 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)/* Charge it to the socket. */ skb_dst_drop (skb); -if (sock_queue_rcv_skb_reason (sk, skb, &reason) <0 ) { + reason =sock_queue_rcv_skb_reason (sk, skb); +if (reason) {sk_skb_reason_drop (sk, skb, reason);return NET_RX_DROP ; }
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 2/5 net: always set reason in sk_filter_trim_cap()
In reply to Eric Dumazetsk_filter_trim_cap() will soon return the drop reason by value.
Make sure *reason is cleared when no error is returned, to ease this conversion.
$ scripts/bloat-o-meter -t vmlinux.old vmlinux.new add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-7 (-7) Function old new delta sk_filter_trim_cap 889 882 -7 Total: Before=29722668, After=29722661, chg -0.00%
--- net/core/filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/core/filter.c +2 -3
@@ -121,7 +121,7 @@ EXPORT_SYMBOL_GPL(copy_bpf_fprog_from_user);* @sk: sock associated with &sk_buff * @skb: buffer to filter * @cap: limit on how short the eBPF program may trim the packet -* @reason: record drop reason on errors (negative return value) +* @reason: record drop reason * * Run the eBPF program and then cut skb->data to correct size returned by * the program. If pkt_len is 0 we toss packet. If skb->len is smaller
@@ -168,11 +168,10 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, pkt_len =bpf_prog_run_save_cb (filter->prog, skb); skb->sk = save_sk; err = pkt_len ?pskb_trim (skb,max (cap, pkt_len)) : -EPERM ; -if (err) - *reason =SKB_DROP_REASON_SOCKET_FILTER ; }rcu_read_unlock (); + *reason = err ?SKB_DROP_REASON_SOCKET_FILTER :0 ;return err; }EXPORT_SYMBOL (sk_filter_trim_cap);
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 3/5 net: change sk_filter_reason() to return the reason by value
In reply to Eric Dumazetsk_filter_trim_cap will soon return the reason by value, do the same for sk_filter_reason().
$ scripts/bloat-o-meter -t vmlinux.old vmlinux.new add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-21 (-21) Function old new delta sock_queue_rcv_skb_reason 128 126 -2 tun_net_xmit 1146 1127 -19 Total: Before=29722661, After=29722640, chg -0.00%
--- drivers/net/tun.c | 8 +++++--- include/linux/filter.h | 9 ++++++--- net/core/sock.c | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/tun.c +5 -3
@@ -1031,9 +1031,11 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) goto drop; } -if (tfile->socket.sk->sk_filter && -sk_filter_reason (tfile->socket.sk, skb, &drop_reason)) - goto drop; +if (tfile->socket.sk->sk_filter) { + drop_reason =sk_filter_reason (tfile->socket.sk, skb); +if (drop_reason) + goto drop; + } len =run_ebpf_filter (tun, skb, len);if (len ==0 ) {
include/linux/filter.h +6 -3
@@ -1102,10 +1102,13 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb)return sk_filter_trim_cap (sk, skb,1 , &ignore_reason); } -static inline int sk_filter_reason (struct sock *sk,struct sk_buff *skb, -enum skb_drop_reason *reason) +static inline enum skb_drop_reason +sk_filter_reason (struct sock *sk,struct sk_buff *skb) { -return sk_filter_trim_cap (sk, skb,1 , reason); +enum skb_drop_reason drop_reason; + +sk_filter_trim_cap (sk, skb,1 , &drop_reason); +return drop_reason; }struct bpf_prog *bpf_prog_select_runtime (struct bpf_prog *fp,int *err);
net/core/sock.c +2 -2
@@ -526,8 +526,8 @@ sock_queue_rcv_skb_reason(struct sock *sk, struct sk_buff *skb)enum skb_drop_reason drop_reason;int err; - err =sk_filter_reason (sk, skb, &drop_reason); -if (err) + drop_reason =sk_filter_reason (sk, skb); +if (drop_reason)return drop_reason; err =__sock_queue_rcv_skb (sk, skb);
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 4/5 tcp: change tcp_filter() to return the reason by value
In reply to Eric Dumazetsk_filter_trim_cap() will soon return the reason by value, do the same for tcp_filter().
Note:
tcp_filter() is no longer inlined. Following patch will inline it again.
$ scripts/bloat-o-meter -t vmlinux.4 vmlinux.5 add/remove: 2/0 grow/shrink: 0/2 up/down: 186/-43 (143) Function old new delta tcp_filter - 154 +154 __pfx_tcp_filter - 32 +32 tcp_v4_rcv 3152 3143 -9 tcp_v6_rcv 3169 3135 -34 Total: Before=29722640, After=29722783, chg +0.00%
--- include/net/tcp.h | 8 +++++--- net/ipv4/tcp_ipv4.c | 6 ++++-- net/ipv6/tcp_ipv6.c | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-)
include/net/tcp.h +5 -3
@@ -1683,12 +1683,14 @@ static inline bool tcp_checksum_complete(struct sk_buff *skb)bool tcp_add_backlog (struct sock *sk,struct sk_buff *skb,enum skb_drop_reason *reason); -static inline int tcp_filter (struct sock *sk,struct sk_buff *skb, -enum skb_drop_reason *reason) +static inline enum skb_drop_reason +tcp_filter (struct sock *sk,struct sk_buff *skb) {const struct tcphdr *th = (const struct tcphdr *)skb->data; +enum skb_drop_reason reason; -return sk_filter_trim_cap (sk, skb,__tcp_hdrlen (th), reason); +sk_filter_trim_cap (sk, skb,__tcp_hdrlen (th), &reason); +return reason; }void tcp_set_state (struct sock *sk,int state);
net/ipv4/tcp_ipv4.c +4 -2
@@ -2164,7 +2164,8 @@ int tcp_v4_rcv(struct sk_buff *skb) } refcounted = true; nsk =NULL ; -if (!tcp_filter (sk, skb, &drop_reason)) { + drop_reason =tcp_filter (sk, skb); +if (!drop_reason) { th = (const struct tcphdr *)skb->data; iph =ip_hdr (skb);tcp_v4_fill_cb (skb, iph, th);
@@ -2225,7 +2226,8 @@ int tcp_v4_rcv(struct sk_buff *skb)nf_reset_ct (skb); -if (tcp_filter (sk, skb, &drop_reason)) + drop_reason =tcp_filter (sk, skb); +if (drop_reason) goto discard_and_relse; th = (const struct tcphdr *)skb->data;
net/ipv6/tcp_ipv6.c +4 -2
@@ -1794,7 +1794,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) } refcounted = true; nsk =NULL ; -if (!tcp_filter (sk, skb, &drop_reason)) { + drop_reason =tcp_filter (sk, skb); +if (!drop_reason) { th = (const struct tcphdr *)skb->data; hdr =ipv6_hdr (skb);tcp_v6_fill_cb (skb, hdr, th);
@@ -1855,7 +1856,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)nf_reset_ct (skb); -if (tcp_filter (sk, skb, &drop_reason)) + drop_reason =tcp_filter (sk, skb); +if (drop_reason) goto discard_and_relse; th = (const struct tcphdr *)skb->data;
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 5/5 net: change sk_filter_trim_cap() to return a drop_reason by value
In reply to Eric DumazetCurrent return value can be replaced with the drop_reason, reducing kernel bloat:
$ scripts/bloat-o-meter -t vmlinux.old vmlinux.new add/remove: 0/2 grow/shrink: 1/11 up/down: 32/-603 (-571) Function old new delta tcp_v6_rcv 3135 3167 +32 unix_dgram_sendmsg 1731 1726 -5 netlink_unicast 957 945 -12 netlink_dump 1372 1359 -13 sk_filter_trim_cap 882 858 -24 tcp_v4_rcv 3143 3111 -32 __pfx_tcp_filter 32 - -32 netlink_broadcast_filtered 1633 1595 -38 sock_queue_rcv_skb_reason 126 76 -50 tun_net_xmit 1127 1074 -53 __sk_receive_skb 690 632 -58 udpv6_queue_rcv_one_skb 935 869 -66 udp_queue_rcv_one_skb 919 853 -66 tcp_filter 154 - -154 Total: Before=29722783, After=29722212, chg -0.00%
--- include/linux/filter.h | 14 ++++++-------- include/net/tcp.h | 4 +--- net/core/filter.c | 31 ++++++++++++++----------------- net/core/sock.c | 5 +++-- net/ipv4/udp.c | 3 ++- net/ipv6/udp.c | 3 ++- net/rose/rose_in.c | 3 +-- 7 files changed, 29 insertions(+), 34 deletions(-)
include/linux/filter.h +6 -8
@@ -1092,23 +1092,21 @@ bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)return set_memory_rox ((unsigned long )hdr, hdr->size >>PAGE_SHIFT ); } -int sk_filter_trim_cap (struct sock *sk,struct sk_buff *skb,unsigned int cap, -enum skb_drop_reason *reason); +enum skb_drop_reason +sk_filter_trim_cap (struct sock *sk,struct sk_buff *skb,unsigned int cap);static inline int sk_filter (struct sock *sk,struct sk_buff *skb) { -enum skb_drop_reason ignore_reason; +enum skb_drop_reason drop_reason; -return sk_filter_trim_cap (sk, skb,1 , &ignore_reason); + drop_reason =sk_filter_trim_cap (sk, skb,1 ); +return drop_reason ? -EPERM :0 ; }static inline enum skb_drop_reason sk_filter_reason (struct sock *sk,struct sk_buff *skb) { -enum skb_drop_reason drop_reason; - -sk_filter_trim_cap (sk, skb,1 , &drop_reason); -return drop_reason; +return sk_filter_trim_cap (sk, skb,1 ); }struct bpf_prog *bpf_prog_select_runtime (struct bpf_prog *fp,int *err);
include/net/tcp.h +1 -3
@@ -1687,10 +1687,8 @@ static inline enum skb_drop_reason tcp_filter(struct sock *sk, struct sk_buff *skb) { const struct tcphdr *th = (const struct tcphdr *)skb->data; -enum skb_drop_reason reason; -sk_filter_trim_cap (sk, skb,__tcp_hdrlen (th), &reason); -return reason; +return sk_filter_trim_cap (sk, skb,__tcp_hdrlen (th)); }void tcp_set_state (struct sock *sk,int state);
net/core/filter.c +14 -17
@@ -121,20 +121,20 @@ EXPORT_SYMBOL_GPL(copy_bpf_fprog_from_user);* @sk: sock associated with &sk_buff * @skb: buffer to filter * @cap: limit on how short the eBPF program may trim the packet -* @reason: record drop reason * * Run the eBPF program and then cut skb->data to correct size returned by * the program. If pkt_len is 0 we toss packet. If skb->len is smaller * than pkt_len we keep whole skb->data. This is the socket level * wrapper to bpf_prog_run. It returns 0 if the packet should -* be accepted or -EPERM if the packet should be tossed. +* be accepted or a drop_reason if the packet should be tossed. * */ -int sk_filter_trim_cap (struct sock *sk,struct sk_buff *skb, -unsigned int cap,enum skb_drop_reason *reason) +enum skb_drop_reason +sk_filter_trim_cap (struct sock *sk,struct sk_buff *skb,unsigned int cap) { -int err; +enum skb_drop_reason drop_reason;struct sk_filter *filter; +int err;/* * If the skb was allocated from pfmemalloc reserves, only
@@ -143,21 +143,17 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb,*/ if (skb_pfmemalloc (skb) && !sock_flag (sk,SOCK_MEMALLOC )) {NET_INC_STATS (sock_net (sk),LINUX_MIB_PFMEMALLOCDROP ); - *reason =SKB_DROP_REASON_PFMEMALLOC ; -return -ENOMEM ; +return SKB_DROP_REASON_PFMEMALLOC ; } err =BPF_CGROUP_RUN_PROG_INET_INGRESS (sk, skb); -if (err) { - *reason =SKB_DROP_REASON_SOCKET_FILTER ; -return err; - } +if (err) +return SKB_DROP_REASON_SOCKET_FILTER ; err =security_sock_rcv_skb (sk, skb); -if (err) { - *reason =SKB_DROP_REASON_SECURITY_HOOK ; -return err; - } +if (err) +return SKB_DROP_REASON_SECURITY_HOOK ; + drop_reason =0 ;rcu_read_lock (); filter =rcu_dereference (sk->sk_filter);if (filter) {
@@ -168,11 +164,12 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, pkt_len =bpf_prog_run_save_cb (filter->prog, skb); skb->sk = save_sk; err = pkt_len ?pskb_trim (skb,max (cap, pkt_len)) : -EPERM ; +if (err) + drop_reason =SKB_DROP_REASON_SOCKET_FILTER ; }rcu_read_unlock (); - *reason = err ?SKB_DROP_REASON_SOCKET_FILTER :0 ; -return err; +return drop_reason; }EXPORT_SYMBOL (sk_filter_trim_cap);
net/core/sock.c +3 -2
@@ -544,11 +544,12 @@ EXPORT_SYMBOL(sock_queue_rcv_skb_reason);int __sk_receive_skb (struct sock *sk,struct sk_buff *skb,const int nested,unsigned int trim_cap,bool refcounted) { -enum skb_drop_reason reason =SKB_DROP_REASON_NOT_SPECIFIED ; +enum skb_drop_reason reason;int rc =NET_RX_SUCCESS ;int err; -if (sk_filter_trim_cap (sk, skb, trim_cap, &reason)) + reason =sk_filter_trim_cap (sk, skb, trim_cap); +if (reason) goto discard_and_relse; skb->dev =NULL ;
net/ipv4/udp.c +2 -1
@@ -2392,7 +2392,8 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb) udp_lib_checksum_complete(skb)) goto csum_error; -if (sk_filter_trim_cap (sk, skb,sizeof (struct udphdr ), &drop_reason)) + drop_reason =sk_filter_trim_cap (sk, skb,sizeof (struct udphdr )); +if (drop_reason) goto drop;udp_csum_pull_header (skb);
net/ipv6/udp.c +2 -1
@@ -853,7 +853,8 @@ static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb) udp_lib_checksum_complete(skb)) goto csum_error; -if (sk_filter_trim_cap (sk, skb,sizeof (struct udphdr ), &drop_reason)) + drop_reason =sk_filter_trim_cap (sk, skb,sizeof (struct udphdr )); +if (drop_reason) goto drop;udp_csum_pull_header (skb);
net/rose/rose_in.c +1 -2
@@ -101,7 +101,6 @@ static int rose_state2_machine(struct sock *sk, struct sk_buff *skb, int framety*/ static int rose_state3_machine (struct sock *sk,struct sk_buff *skb,int frametype,int ns,int nr,int q,int d,int m) { -enum skb_drop_reason dr;/* ignored */ struct rose_sock *rose =rose_sk (sk);int queued =0 ;
@@ -163,7 +162,7 @@ static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyrose_frames_acked (sk, nr);if (ns == rose->vr) {rose_start_idletimer (sk); -if (!sk_filter_trim_cap (sk, skb,ROSE_MIN_LEN , &dr) && +if (!sk_filter_trim_cap (sk, skb,ROSE_MIN_LEN ) &&__sock_queue_rcv_skb (sk, skb) ==0 ) { rose->vr = (rose->vr +1 ) %ROSE_MODULUS ; queued =1 ;
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 9 Apr 2026 14:56:19 +0000 you wrote:
Some functions return an error by value, and a
drop_reasonby an output parameter. This extra parameter can force stack canaries.A
drop_reasonis enough and more efficient.This series reduces bloat by 678 bytes on
x86_64:[...]
Here is the summary with links:
- [net-next,1/5] net: change sock_queue_rcv_skb_reason() to return a drop_reason
https://git.kernel.org/netdev/net-next/c/900f27fb797c - [net-next,2/5] net: always set reason in sk_filter_trim_cap() https://git.kernel.org/netdev/net-next/c/734ea7e324ad - [net-next,3/5] net: change sk_filter_reason() to return the reason by value https://git.kernel.org/netdev/net-next/c/c78bcbd51976 - [net-next,4/5] tcp: change tcp_filter() to return the reason by value https://git.kernel.org/netdev/net-next/c/97449a5f1a58 - [net-next,5/5] net: change sk_filter_trim_cap() to return a drop_reason by value https://git.kernel.org/netdev/net-next/c/fb37aea2a00e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html