diff options
author | Eliezer Tamir <eliezer.tamir@linux.intel.com> | 2013-06-10 04:39:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-11 00:22:35 -0400 |
commit | 060212928670593fb89243640bf05cf89560b023 (patch) | |
tree | 32ae5c7be094983fb06430dbe09d36e2b317ca9c /net/core | |
parent | af12fa6e46aa651e7b86a4c4117b562518fef184 (diff) |
net: add low latency socket poll
Adds an ndo_ll_poll method and the code that supports it.
This method can be used by low latency applications to busy-poll
Ethernet device queues directly from the socket code.
sysctl_net_ll_poll controls how many microseconds to poll.
Default is zero (disabled).
Individual protocol support will be added by subsequent patches.
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/core')
-rw-r--r-- | net/core/skbuff.c | 4 | ||||
-rw-r--r-- | net/core/sock.c | 6 | ||||
-rw-r--r-- | net/core/sysctl_net_core.c | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 73f57a0e1523..4a4181e16c1a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -733,6 +733,10 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) | |||
733 | new->vlan_tci = old->vlan_tci; | 733 | new->vlan_tci = old->vlan_tci; |
734 | 734 | ||
735 | skb_copy_secmark(new, old); | 735 | skb_copy_secmark(new, old); |
736 | |||
737 | #ifdef CONFIG_NET_LL_RX_POLL | ||
738 | new->napi_id = old->napi_id; | ||
739 | #endif | ||
736 | } | 740 | } |
737 | 741 | ||
738 | /* | 742 | /* |
diff --git a/net/core/sock.c b/net/core/sock.c index 88868a9d21da..788c0da5eed1 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -139,6 +139,8 @@ | |||
139 | #include <net/tcp.h> | 139 | #include <net/tcp.h> |
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | #include <net/ll_poll.h> | ||
143 | |||
142 | static DEFINE_MUTEX(proto_list_mutex); | 144 | static DEFINE_MUTEX(proto_list_mutex); |
143 | static LIST_HEAD(proto_list); | 145 | static LIST_HEAD(proto_list); |
144 | 146 | ||
@@ -2284,6 +2286,10 @@ void sock_init_data(struct socket *sock, struct sock *sk) | |||
2284 | 2286 | ||
2285 | sk->sk_stamp = ktime_set(-1L, 0); | 2287 | sk->sk_stamp = ktime_set(-1L, 0); |
2286 | 2288 | ||
2289 | #ifdef CONFIG_NET_LL_RX_POLL | ||
2290 | sk->sk_napi_id = 0; | ||
2291 | #endif | ||
2292 | |||
2287 | /* | 2293 | /* |
2288 | * Before updating sk_refcnt, we must commit prior changes to memory | 2294 | * Before updating sk_refcnt, we must commit prior changes to memory |
2289 | * (Documentation/RCU/rculist_nulls.txt for details) | 2295 | * (Documentation/RCU/rculist_nulls.txt for details) |
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 741db5fc7806..4b48f39582b0 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <net/ip.h> | 19 | #include <net/ip.h> |
20 | #include <net/sock.h> | 20 | #include <net/sock.h> |
21 | #include <net/net_ratelimit.h> | 21 | #include <net/net_ratelimit.h> |
22 | #include <net/ll_poll.h> | ||
22 | 23 | ||
23 | static int one = 1; | 24 | static int one = 1; |
24 | 25 | ||
@@ -284,6 +285,15 @@ static struct ctl_table net_core_table[] = { | |||
284 | .proc_handler = flow_limit_table_len_sysctl | 285 | .proc_handler = flow_limit_table_len_sysctl |
285 | }, | 286 | }, |
286 | #endif /* CONFIG_NET_FLOW_LIMIT */ | 287 | #endif /* CONFIG_NET_FLOW_LIMIT */ |
288 | #ifdef CONFIG_NET_LL_RX_POLL | ||
289 | { | ||
290 | .procname = "low_latency_poll", | ||
291 | .data = &sysctl_net_ll_poll, | ||
292 | .maxlen = sizeof(unsigned long), | ||
293 | .mode = 0644, | ||
294 | .proc_handler = proc_doulongvec_minmax | ||
295 | }, | ||
296 | #endif | ||
287 | #endif /* CONFIG_NET */ | 297 | #endif /* CONFIG_NET */ |
288 | { | 298 | { |
289 | .procname = "netdev_budget", | 299 | .procname = "netdev_budget", |