Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f24080e authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

ipv4: use indirect call wrappers for {tcp, udp}_{recv, send}msg() 



This avoids an indirect call per syscall for common ipv4 transports

v1 -> v2:
 - avoid unneeded reclaration for udp_sendmsg, as suggested by Willem

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 164c51fe

net/ipv4/af_inet.c

+7 −3
Original line number Diff line number Diff line
@@ -804,7 +804,8 @@ int inet_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
	if (unlikely(inet_send_prepare(sk)))

		return -EAGAIN;



	return sk->sk_prot->sendmsg(sk, msg, size);

	return INDIRECT_CALL_2(sk->sk_prot->sendmsg, tcp_sendmsg, udp_sendmsg,

			       sk, msg, size);

}

EXPORT_SYMBOL(inet_sendmsg);
@@ -822,6 +823,8 @@ ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, 
}

EXPORT_SYMBOL(inet_sendpage);



INDIRECT_CALLABLE_DECLARE(int udp_recvmsg(struct sock *, struct msghdr *,

					  size_t, int, int, int *));

int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,

		 int flags)

{
@@ -832,7 +835,8 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, 
	if (likely(!(flags & MSG_ERRQUEUE)))

		sock_rps_record_flow(sk);



	err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,

	err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udp_recvmsg,

			      sk, msg, size, flags & MSG_DONTWAIT,

			      flags & ~MSG_DONTWAIT, &addr_len);

	if (err >= 0)

		msg->msg_namelen = addr_len;