diff options
author | Eliezer Tamir <eliezer.tamir@linux.intel.com> | 2013-06-10 04:40:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-11 00:22:36 -0400 |
commit | d30e383bb856f614ddb5bbbb5a7d3f86240e41ec (patch) | |
tree | cae914154ff4a50fcf9ac314a70b347e09f20efe /net/ipv4 | |
parent | a5b50476f77a8fcc8055c955720d05a7c2d9c532 (diff) |
tcp: add low latency socket poll support.
Adds low latency socket poll support for TCP.
In tcp_v[46]_rcv() add a call to sk_mark_ll() to copy the napi_id
from the skb to the sk.
In tcp_recvmsg(), when there is no data in the socket we busy-poll.
This is a good example of how to add busy-poll support to more protocols.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Tested-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp.c | 5 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index bc4246940f6c..46ed9afd1f5e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -279,6 +279,7 @@ | |||
279 | 279 | ||
280 | #include <asm/uaccess.h> | 280 | #include <asm/uaccess.h> |
281 | #include <asm/ioctls.h> | 281 | #include <asm/ioctls.h> |
282 | #include <net/ll_poll.h> | ||
282 | 283 | ||
283 | int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; | 284 | int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; |
284 | 285 | ||
@@ -1553,6 +1554,10 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1553 | struct sk_buff *skb; | 1554 | struct sk_buff *skb; |
1554 | u32 urg_hole = 0; | 1555 | u32 urg_hole = 0; |
1555 | 1556 | ||
1557 | if (sk_valid_ll(sk) && skb_queue_empty(&sk->sk_receive_queue) | ||
1558 | && (sk->sk_state == TCP_ESTABLISHED)) | ||
1559 | sk_poll_ll(sk, nonblock); | ||
1560 | |||
1556 | lock_sock(sk); | 1561 | lock_sock(sk); |
1557 | 1562 | ||
1558 | err = -ENOTCONN; | 1563 | err = -ENOTCONN; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 289039b4d8de..1063bb83e342 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -75,6 +75,7 @@ | |||
75 | #include <net/netdma.h> | 75 | #include <net/netdma.h> |
76 | #include <net/secure_seq.h> | 76 | #include <net/secure_seq.h> |
77 | #include <net/tcp_memcontrol.h> | 77 | #include <net/tcp_memcontrol.h> |
78 | #include <net/ll_poll.h> | ||
78 | 79 | ||
79 | #include <linux/inet.h> | 80 | #include <linux/inet.h> |
80 | #include <linux/ipv6.h> | 81 | #include <linux/ipv6.h> |
@@ -1993,6 +1994,7 @@ process: | |||
1993 | if (sk_filter(sk, skb)) | 1994 | if (sk_filter(sk, skb)) |
1994 | goto discard_and_relse; | 1995 | goto discard_and_relse; |
1995 | 1996 | ||
1997 | sk_mark_ll(sk, skb); | ||
1996 | skb->dev = NULL; | 1998 | skb->dev = NULL; |
1997 | 1999 | ||
1998 | bh_lock_sock_nested(sk); | 2000 | bh_lock_sock_nested(sk); |