inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()
Subsystems (4)
PATCH 1/1 inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()
inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()
a new boolean flag no_autobind is added to structure proto to avoid the autobind calls when the protocol is TCP. Then sock_rps_record_flow() is called int the TCP's sendmsg() and sendpage() pathes.
----
include/net/inet_common.h | 53 +++++++++++++++++++--------------------------- include/net/sock.h | 1 include/net/tcp.h | 47 ++++++++++++++++++---------------------- net/ipv4/af_inet.c | 15 +++++++------ net/ipv4/tcp.c | 9 +++---- net/ipv4/tcp_ipv4.c | 3 ++ net/ipv6/af_inet6.c | 8 +++--- net/ipv6/tcp_ipv6.c | 3 ++ 8 files changed, 67 insertions(+), 72 deletions(-)
include/net/inet_common.h +22 -31
@@ -13,37 +13,28 @@ struct sock;struct sockaddr ;struct socket ; -extern int inet_release (struct socket *sock); -extern int inet_stream_connect (struct socket *sock, -struct sockaddr * uaddr, -int addr_len,int flags); -extern int inet_dgram_connect (struct socket *sock, -struct sockaddr * uaddr, -int addr_len,int flags); -extern int inet_accept (struct socket *sock, -struct socket *newsock,int flags); -extern int inet_sendmsg (struct kiocb *iocb, -struct socket *sock, -struct msghdr *msg, -size_t size); -extern int inet_shutdown (struct socket *sock,int how); -extern int inet_listen (struct socket *sock,int backlog); - -extern void inet_sock_destruct (struct sock *sk); - -extern int inet_bind (struct socket *sock, -struct sockaddr *uaddr,int addr_len); -extern int inet_getname (struct socket *sock, -struct sockaddr *uaddr, -int *uaddr_len,int peer); -extern int inet_ioctl (struct socket *sock, -unsigned int cmd,unsigned long arg); - -extern int inet_ctl_sock_create (struct sock **sk, -unsigned short family, -unsigned short type, -unsigned char protocol, -struct net *net); +extern int inet_release (struct socket *sock); +extern int inet_stream_connect (struct socket *sock,struct sockaddr * uaddr, +int addr_len,int flags); +extern int inet_dgram_connect (struct socket *sock,struct sockaddr * uaddr, +int addr_len,int flags); +extern int inet_accept (struct socket *sock,struct socket *newsock,int flags); +extern int inet_sendmsg (struct kiocb *iocb,struct socket *sock, +struct msghdr *msg,size_t size); +extern int inet_recvmsg (struct kiocb *iocb,struct socket *sock, +struct msghdr *msg,size_t size,int flags); +extern ssize_t inet_sendpage (struct socket *sock,struct page *page,int offset, +size_t size,int flags); +extern int inet_shutdown (struct socket *sock,int how); +extern int inet_listen (struct socket *sock,int backlog); +extern void inet_sock_destruct (struct sock *sk); +extern int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len); +extern int inet_getname (struct socket *sock,struct sockaddr *uaddr, +int *uaddr_len,int peer); +extern int inet_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg); +extern int inet_ctl_sock_create (struct sock **sk,unsigned short family, +unsigned short type,unsigned char protocol, +struct net *net);static inline void inet_ctl_sock_destroy (struct sock *sk) {
include/net/sock.h +1 -0
@@ -772,6 +772,7 @@ struct proto {int *sysctl_wmem;int *sysctl_rmem;int max_header; +bool no_autobind;struct kmem_cache *slab;unsigned int obj_size;
include/net/tcp.h +21 -26
66 lines not on this page · raw message
net/ipv4/af_inet.c +9 -6
@@ -727,28 +727,31 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,sock_rps_record_flow (sk);/* We may need to bind the socket. */ -if (!inet_sk (sk)->inet_num &&inet_autobind (sk)) +if (!sk->sk_prot->no_autobind && + !inet_sk (sk)->inet_num &&inet_autobind (sk))return -EAGAIN ;return sk->sk_prot->sendmsg (iocb, sk, msg, size); }EXPORT_SYMBOL (inet_sendmsg); -static ssize_t inet_sendpage (struct socket *sock,struct page *page,int offset, -size_t size,int flags) +ssize_t inet_sendpage (struct socket *sock,struct page *page,int offset, +size_t size,int flags) {struct sock *sk = sock->sk;sock_rps_record_flow (sk);/* We may need to bind the socket. */ -if (!inet_sk (sk)->inet_num &&inet_autobind (sk)) +if (!sk->sk_prot->no_autobind && + !inet_sk (sk)->inet_num &&inet_autobind (sk))return -EAGAIN ;if (sk->sk_prot->sendpage)return sk->sk_prot->sendpage (sk, page, offset, size, flags);return sock_no_sendpage (sock, page, offset, size, flags); } +EXPORT_SYMBOL (inet_sendpage);int inet_recvmsg (struct kiocb *iocb,struct socket *sock,struct msghdr *msg,size_t size,int flags)
@@ -894,10 +897,10 @@ const struct proto_ops inet_stream_ops = { .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, .getsockopt = sock_common_getsockopt, - .sendmsg = tcp_sendmsg, + .sendmsg = inet_sendmsg, .recvmsg = inet_recvmsg, .mmap = sock_no_mmap, - .sendpage = tcp_sendpage, + .sendpage = inet_sendpage, .splice_read = tcp_splice_read, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_sock_common_setsockopt,
net/ipv4/tcp.c +4 -5
@@ -856,15 +856,15 @@ out_err:return sk_stream_error (sk, flags, err); } -ssize_t tcp_sendpage (struct socket *sock,struct page *page,int offset, +int tcp_sendpage (struct sock *sk,struct page *page,int offset,size_t size,int flags) {ssize_t res; -struct sock *sk = sock->sk;if (!(sk->sk_route_caps &NETIF_F_SG ) || !(sk->sk_route_caps &NETIF_F_ALL_CSUM )) -return sock_no_sendpage (sock, page, offset, size, flags); +return sock_no_sendpage (sk->sk_socket, page, offset, size, + flags);lock_sock (sk);TCP_CHECK_TIMER (sk);
@@ -897,10 +897,9 @@ static inline int select_size(struct sock *sk, int sg)return tmp; } -int tcp_sendmsg (struct kiocb *iocb,struct socket *sock,struct msghdr *msg, +int tcp_sendmsg (struct kiocb *iocb,struct sock *sk,struct msghdr *msg,size_t size) { -struct sock *sk = sock->sk;struct iovec *iov;struct tcp_sock *tp =tcp_sk (sk);struct sk_buff *skb;
net/ipv4/tcp_ipv4.c +3 -0
@@ -2595,6 +2595,8 @@ struct proto tcp_prot = { .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, .recvmsg = tcp_recvmsg, + .sendmsg = tcp_sendmsg, + .sendpage = tcp_sendpage, .backlog_rcv = tcp_v4_do_rcv, .hash = inet_hash, .unhash = inet_unhash,
@@ -2613,6 +2615,7 @@ struct proto tcp_prot = { .twsk_prot = &tcp_timewait_sock_ops, .rsk_prot = &tcp_request_sock_ops, .h.hashinfo = &tcp_hashinfo, + .no_autobind = true, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_tcp_setsockopt, .compat_getsockopt = compat_tcp_getsockopt,
net/ipv6/af_inet6.c +4 -4
@@ -522,10 +522,10 @@ const struct proto_ops inet6_stream_ops = { .shutdown = inet_shutdown, /* ok */ .setsockopt = sock_common_setsockopt, /* ok */ .getsockopt = sock_common_getsockopt, /* ok */ - .sendmsg = tcp_sendmsg, /* ok */ - .recvmsg = sock_common_recvmsg, /* ok */ + .sendmsg = inet_sendmsg, /* ok */ + .recvmsg = inet_recvmsg, /* ok */ .mmap = sock_no_mmap, - .sendpage = tcp_sendpage, + .sendpage = inet_sendpage, .splice_read = tcp_splice_read, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_sock_common_setsockopt,
@@ -549,7 +549,7 @@ const struct proto_ops inet6_dgram_ops = { .setsockopt = sock_common_setsockopt, /* ok */ .getsockopt = sock_common_getsockopt, /* ok */ .sendmsg = inet_sendmsg, /* ok */ - .recvmsg = sock_common_recvmsg, /* ok */ + .recvmsg = inet_recvmsg, /* ok */ .mmap = sock_no_mmap, .sendpage = sock_no_sendpage,#ifdef CONFIG_COMPAT
net/ipv6/tcp_ipv6.c +3 -0
@@ -2142,6 +2142,8 @@ struct proto tcpv6_prot = { .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, .recvmsg = tcp_recvmsg, + .sendmsg = tcp_sendmsg, + .sendpage = tcp_sendpage, .backlog_rcv = tcp_v6_do_rcv, .hash = tcp_v6_hash, .unhash = inet_unhash,
@@ -2160,6 +2162,7 @@ struct proto tcpv6_prot = { .twsk_prot = &tcp6_timewait_sock_ops, .rsk_prot = &tcp6_request_sock_ops, .h.hashinfo = &tcp_hashinfo, + .no_autobind = true, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_tcp_setsockopt, .compat_getsockopt = compat_tcp_getsockopt,
net/ipv4/af_inet.c int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, · line 732
Quoted 12 lines · Changli Gao
net/ipv4/af_inet.c +2
-1@@ -727,28 +727,31 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,sock_rps_record_flow (sk);/* We may need to bind the socket. */ -if (!inet_sk (sk)->inet_num &&inet_autobind (sk)) +if (!sk->sk_prot->no_autobind && + !inet_sk (sk)->inet_num &&inet_autobind (sk))return -EAGAIN ;
I think it's better to test inet_num first since usually it's not 0. With the above ordering protocols with no_autobind==false end up making two comparisons.
David Miller
maintainerFrom: Dimitris Michailidis <[email protected]>
Date: Sat, 10 Jul 2010 21:45:18 -0700
Quoted 18 lines
net/ipv4/af_inet.c int inet_sendmsg(struct kiocb *iocb, struct · line 732
Quoted 12 lines · Changli Gao
net/ipv4/af_inet.c +2
-1@@ -727,28 +727,31 @@ int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,sock_rps_record_flow (sk );/* We may need to bind the socket. */ -if (!inet_sk (sk)->inet_num &&inet_autobind (sk)) +if (!sk->sk_prot->no_autobind && + !inet_sk (sk)->inet_num &&inet_autobind (sk))return -EAGAIN ;I think it's better to test
inet_numfirst since usually it's not 0. With the above ordering protocols with no_autobind==false end up making two comparisons.
Agreed, Changli please make this change.
Thanky ou.