Commit 8341c989 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: remove addr_len argument of recvmsg() handlers 



Use msg->msg_namelen as a place holder instead of a
temporary variable, notably in inet[6]_recvmsg().

This removes stack canaries and allows tail-calls.

$ scripts/bloat-o-meter -t vmlinux.old vmlinux
add/remove: 0/0 grow/shrink: 2/19 up/down: 26/-532 (-506)
Function                                     old     new   delta
rawv6_recvmsg                                744     767     +23
vsock_dgram_recvmsg                           55      58      +3
vsock_connectible_recvmsg                     50      47      -3
unix_stream_recvmsg                          161     158      -3
unix_seqpacket_recvmsg                        62      59      -3
unix_dgram_recvmsg                            42      39      -3
tcp_recvmsg                                  546     543      -3
mptcp_recvmsg                               1568    1565      -3
ping_recvmsg                                 806     800      -6
tcp_bpf_recvmsg_parser                       983     974      -9
ip_recv_error                                588     576     -12
ipv6_recv_rxpmtu                             442     428     -14
udp_recvmsg                                 1243    1224     -19
ipv6_recv_error                             1046    1024     -22
udpv6_recvmsg                               1487    1461     -26
raw_recvmsg                                  465     437     -28
udp_bpf_recvmsg                             1027     984     -43
sock_common_recvmsg                          103      27     -76
inet_recvmsg                                 257     175     -82
inet6_recvmsg                                257     175     -82
tcp_bpf_recvmsg                              663     568     -95
Total: Before=25143834, After=25143328, chg -0.00%

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260227151120.1346573-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f5ada26d

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ void chtls_shutdown(struct sock *sk, int how); 
void chtls_destroy_sock(struct sock *sk);

int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);

int chtls_recvmsg(struct sock *sk, struct msghdr *msg,

		  size_t len, int flags, int *addr_len);

		  size_t len, int flags);

void chtls_splice_eof(struct socket *sock);

int send_tx_flowc_wr(struct sock *sk, int compl,

		     u32 snd_nxt, u32 rcv_nxt);

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c

+4 −4
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ static void chtls_cleanup_rbuf(struct sock *sk, int copied) 
}



static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

			    int flags, int *addr_len)

			    int flags)

{

	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);

	struct chtls_hws *hws = &csk->tlshws;
@@ -1656,7 +1656,7 @@ static int peekmsg(struct sock *sk, struct msghdr *msg, 
}



int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

		  int flags, int *addr_len)

		  int flags)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct chtls_sock *csk;
@@ -1670,7 +1670,7 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
	buffers_freed = 0;



	if (unlikely(flags & MSG_OOB))

		return tcp_prot.recvmsg(sk, msg, len, flags, addr_len);

		return tcp_prot.recvmsg(sk, msg, len, flags);



	if (unlikely(flags & MSG_PEEK))

		return peekmsg(sk, msg, len, flags);
@@ -1684,7 +1684,7 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
	csk = rcu_dereference_sk_user_data(sk);



	if (is_tls_rx(csk))

		return chtls_pt_recvmsg(sk, msg, len, flags, addr_len);

		return chtls_pt_recvmsg(sk, msg, len, flags);



	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);

drivers/net/ovpn/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void ovpn_tcp_rcv(struct strparser *strp, struct sk_buff *skb) 
}



static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

			    int flags, int *addr_len)

			    int flags)

{

	int err = 0, off, copied = 0, ret;

	struct ovpn_socket *sock;

include/net/inet_common.h

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); 
int inet_ctl_sock_create(struct sock **sk, unsigned short family,

			 unsigned short type, unsigned char protocol,

			 struct net *net);

int inet_recv_error(struct sock *sk, struct msghdr *msg, int len,

		    int *addr_len);

int inet_recv_error(struct sock *sk, struct msghdr *msg, int len);



struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb);

int inet_gro_complete(struct sk_buff *skb, int nhoff);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, 
int ip_ra_control(struct sock *sk, unsigned char on,

		  void (*destructor)(struct sock *));



int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len);

int ip_recv_error(struct sock *sk, struct msghdr *msg, int len);

void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port,

		   u32 info, u8 *payload);

void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport,