From: Eliezer Tamir <eliezer.tamir@linux.intel.com>
To: David Miller <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Don Skidmore <donald.c.skidmore@intel.com>,
e1000-devel@lists.sourceforge.net,
Willem de Bruijn <willemb@google.com>,
Eric Dumazet <erdnetdev@gmail.com>,
Ben Hutchings <bhutchings@solarflare.com>,
Andi Kleen <andi@firstfloor.org>, HPA <hpa@zytor.com>,
Eilon Greenstien <eilong@broadcom.com>,
Or Gerlitz <or.gerlitz@gmail.com>,
Amir Vadai <amirv@mellanox.com>,
Eliezer Tamir <eliezer@tamir.org.il>
Subject: [PATCH v9 net-next 4/7] tcp: add low latency socket poll support.
Date: Wed, 05 Jun 2013 13:34:41 +0300 [thread overview]
Message-ID: <20130605103441.11172.83787.stgit@ladj378.jer.intel.com> (raw)
In-Reply-To: <20130605103400.11172.49099.stgit@ladj378.jer.intel.com>
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>
Tested-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com>
---
net/ipv4/tcp.c | 5 +++++
net/ipv4/tcp_ipv4.c | 2 ++
net/ipv6/tcp_ipv6.c | 2 ++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index b5d4ad9..bf09f6b 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -279,6 +279,7 @@
#include <asm/uaccess.h>
#include <asm/ioctls.h>
+#include <net/ll_poll.h>
int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT;
@@ -1553,6 +1554,10 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
struct sk_buff *skb;
u32 urg_hole = 0;
+ if (sk_valid_ll(sk) && skb_queue_empty(&sk->sk_receive_queue)
+ && (sk->sk_state == TCP_ESTABLISHED))
+ sk_poll_ll(sk, nonblock);
+
lock_sock(sk);
err = -ENOTCONN;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index d20ede0..35fd8bc 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -75,6 +75,7 @@
#include <net/netdma.h>
#include <net/secure_seq.h>
#include <net/tcp_memcontrol.h>
+#include <net/ll_poll.h>
#include <linux/inet.h>
#include <linux/ipv6.h>
@@ -2011,6 +2012,7 @@ process:
if (sk_filter(sk, skb))
goto discard_and_relse;
+ sk_mark_ll(sk, skb);
skb->dev = NULL;
bh_lock_sock_nested(sk);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0a17ed9..5cffa5c 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -63,6 +63,7 @@
#include <net/inet_common.h>
#include <net/secure_seq.h>
#include <net/tcp_memcontrol.h>
+#include <net/ll_poll.h>
#include <asm/uaccess.h>
@@ -1498,6 +1499,7 @@ process:
if (sk_filter(sk, skb))
goto discard_and_relse;
+ sk_mark_ll(sk, skb);
skb->dev = NULL;
bh_lock_sock_nested(sk);
next prev parent reply other threads:[~2013-06-05 10:34 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-05 10:34 [PATCH v9 net-next 0/7] net: low latency Ethernet device polling Eliezer Tamir
2013-06-05 10:34 ` [PATCH v9 net-next 1/7] net: add napi_id and hash Eliezer Tamir
2013-06-05 13:18 ` Eric Dumazet
2013-06-05 10:34 ` [PATCH v9 net-next 2/7] net: add low latency socket poll Eliezer Tamir
2013-06-05 13:23 ` Eric Dumazet
2013-06-05 15:28 ` Willem de Bruijn
2013-06-05 15:31 ` Eliezer Tamir
2013-06-05 15:21 ` Eric Dumazet
2013-06-05 15:30 ` Eliezer Tamir
2013-06-05 15:39 ` Eric Dumazet
2013-06-05 15:46 ` Eliezer Tamir
2013-06-05 15:59 ` Eric Dumazet
2013-06-06 12:50 ` Eliezer Tamir
2013-06-05 10:34 ` [PATCH v9 net-next 3/7] udp: add low latency socket poll support Eliezer Tamir
2013-06-05 13:25 ` Eric Dumazet
2013-06-05 10:34 ` Eliezer Tamir [this message]
2013-06-05 13:25 ` [PATCH v9 net-next 4/7] tcp: " Eric Dumazet
2013-06-05 10:34 ` [PATCH v9 net-next 5/7] net: simple poll/select low latency socket poll Eliezer Tamir
2013-06-05 13:30 ` Eric Dumazet
2013-06-05 13:41 ` Eliezer Tamir
2013-06-05 13:56 ` Eric Dumazet
2013-06-05 14:17 ` Eric Dumazet
2013-06-05 14:56 ` Eliezer Tamir
2013-06-05 15:20 ` Eric Dumazet
2013-06-05 15:47 ` Eliezer Tamir
2013-06-05 13:49 ` David Laight
2013-06-05 14:00 ` Eric Dumazet
2013-06-05 10:35 ` [PATCH v9 net-next 6/7] ixgbe: add support for ndo_ll_poll Eliezer Tamir
2013-06-05 10:35 ` [PATCH v9 net-next 7/7] ixgbe: add extra stats " Eliezer Tamir
2013-06-07 21:48 ` [PATCH v9 net-next 0/7] net: low latency Ethernet device polling David Miller
2013-06-08 18:06 ` Eliezer Tamir
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130605103441.11172.83787.stgit@ladj378.jer.intel.com \
--to=eliezer.tamir@linux.intel.com \
--cc=amirv@mellanox.com \
--cc=andi@firstfloor.org \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=eilong@broadcom.com \
--cc=eliezer@tamir.org.il \
--cc=erdnetdev@gmail.com \
--cc=hpa@zytor.com \
--cc=jesse.brandeburg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=or.gerlitz@gmail.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome