Skip to content

Commit 164c51f

Browse files
Paolo Abenidavem330
authored andcommitted
ipv6: use indirect call wrappers for {tcp, udpv6}_{recv, send}msg()
This avoids an indirect call per syscall for common ipv6 transports Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a648a59 commit 164c51f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

net/ipv6/af_inet6.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,16 +564,21 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
564564
}
565565
EXPORT_SYMBOL(inet6_ioctl);
566566

567+
INDIRECT_CALLABLE_DECLARE(int udpv6_sendmsg(struct sock *, struct msghdr *,
568+
size_t));
567569
int inet6_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
568570
{
569571
struct sock *sk = sock->sk;
570572

571573
if (unlikely(inet_send_prepare(sk)))
572574
return -EAGAIN;
573575

574-
return sk->sk_prot->sendmsg(sk, msg, size);
576+
return INDIRECT_CALL_2(sk->sk_prot->sendmsg, tcp_sendmsg, udpv6_sendmsg,
577+
sk, msg, size);
575578
}
576579

580+
INDIRECT_CALLABLE_DECLARE(int udpv6_recvmsg(struct sock *, struct msghdr *,
581+
size_t, int, int, int *));
577582
int inet6_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
578583
int flags)
579584
{
@@ -584,8 +589,9 @@ int inet6_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
584589
if (likely(!(flags & MSG_ERRQUEUE)))
585590
sock_rps_record_flow(sk);
586591

587-
err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
588-
flags & ~MSG_DONTWAIT, &addr_len);
592+
err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udpv6_recvmsg,
593+
sk, msg, size, flags & MSG_DONTWAIT,
594+
flags & ~MSG_DONTWAIT, &addr_len);
589595
if (err >= 0)
590596
msg->msg_namelen = addr_len;
591597
return err;

0 commit comments

Comments
 (0)