All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Tucker <tom@opengridcomputing.com>
To: nfs@lists.sourceforge.net
Subject: [RFC,PATCH 04/20] svc: sko_has_wspace
Date: Tue, 10 Jul 2007 00:34:28 -0500	[thread overview]
Message-ID: <20070710053428.28979.58102.stgit@dell3.ogc.int> (raw)
In-Reply-To: <20070710052711.28979.70843.stgit@dell3.ogc.int>


Move the code in svc_sock_enqueue() that checks for available
write space on the socket, into a new sko_has_wspace method
in svc_sock_ops.

Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: Peter Leckie <pleckie@melbourne.sgi.com>
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
---

 include/linux/sunrpc/svcsock.h |    4 ++
 net/sunrpc/svcsock.c           |   79 +++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index fa92f3f..e4f2936 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -31,6 +31,10 @@ struct svc_sock_ops {
 	 * Prepare any transport-specific RPC header.
 	 */
 	int                     (*sko_prep_reply_hdr)(struct svc_rqst *);
+	/*
+	 * Return 1 if sufficient space to write reply to network.
+	 */
+	int			(*sko_has_wspace)(struct svc_sock *);
 };
 
 /*
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 4ff1a62..a959824 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -205,22 +205,6 @@ svc_release_skb(struct svc_rqst *rqstp)
 }
 
 /*
- * Any space to write?
- */
-static inline unsigned long
-svc_sock_wspace(struct svc_sock *svsk)
-{
-	int wspace;
-
-	if (svsk->sk_sock->type == SOCK_STREAM)
-		wspace = sk_stream_wspace(svsk->sk_sk);
-	else
-		wspace = sock_wspace(svsk->sk_sk);
-
-	return wspace;
-}
-
-/*
  * Queue up a socket with data pending. If there are idle nfsd
  * processes, wake 'em up.
  *
@@ -269,21 +253,13 @@ svc_sock_enqueue(struct svc_sock *svsk)
 	BUG_ON(svsk->sk_pool != NULL);
 	svsk->sk_pool = pool;
 
-	set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
-	if (((atomic_read(&svsk->sk_reserved) + serv->sv_max_mesg)*2
-	     > svc_sock_wspace(svsk))
-	    && !test_bit(SK_CLOSE, &svsk->sk_flags)
-	    && !test_bit(SK_CONN, &svsk->sk_flags)) {
-		/* Don't enqueue while not enough space for reply */
-		dprintk("svc: socket %p  no space, %d*2 > %ld, not enqueued\n",
-			svsk->sk_sk, atomic_read(&svsk->sk_reserved)+serv->sv_max_mesg,
-			svc_sock_wspace(svsk));
+	if (!test_bit(SK_CLOSE, &svsk->sk_flags)
+	    && !test_bit(SK_CONN, &svsk->sk_flags)
+	    && !svsk->sk_ops->sko_has_wspace(svsk)) {
 		svsk->sk_pool = NULL;
 		clear_bit(SK_BUSY, &svsk->sk_flags);
 		goto out_unlock;
 	}
-	clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
-
 
 	if (!list_empty(&pool->sp_threads)) {
 		rqstp = list_entry(pool->sp_threads.next,
@@ -882,12 +858,45 @@ svc_udp_sendto(struct svc_rqst *rqstp)
 	return error;
 }
 
+/**
+ * svc_sock_has_write_space - Checks if there is enough space
+ * to send the reply on the socket.
+ * @svsk: the svc_sock to write on
+ * @wspace: the number of bytes available for writing
+ */
+static int svc_sock_has_write_space(struct svc_sock *svsk, int wspace)
+{
+	struct svc_serv	*serv = svsk->sk_server;
+	int required = atomic_read(&svsk->sk_reserved) + serv->sv_max_mesg;
+
+	if (required*2 > wspace) {
+		/* Don't enqueue while not enough space for reply */
+		dprintk("svc: socket %p  no space, %d*2 > %d, not enqueued\n",
+			svsk->sk_sk, required, wspace);
+		return 0;
+	}
+	clear_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
+	return 1;
+}
+
+static int
+svc_udp_has_wspace(struct svc_sock *svsk)
+{
+	/* 
+	 * Set the SOCK_NOSPACE flag before checking the available
+	 * sock space. 
+	 */
+	set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
+	return svc_sock_has_write_space(svsk, sock_wspace(svsk->sk_sk));
+}
+
 static const struct svc_sock_ops svc_udp_ops = {
 	.sko_name = "udp",
 	.sko_recvfrom = svc_udp_recvfrom,
 	.sko_sendto = svc_udp_sendto,
 	.sko_detach = svc_tcpip_detach,
-	.sko_free = svc_tcpip_free
+	.sko_free = svc_tcpip_free,
+	.sko_has_wspace = svc_udp_has_wspace
 };
 
 static void
@@ -1340,13 +1349,25 @@ svc_tcp_prep_reply_hdr(struct svc_rqst *
 	return 0;
 }
 
+static int
+svc_tcp_has_wspace(struct svc_sock *svsk)
+{
+	/* 
+	 * Set the SOCK_NOSPACE flag before checking the available
+	 * sock space. 
+	 */
+	set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
+	return svc_sock_has_write_space(svsk, sk_stream_wspace(svsk->sk_sk));
+}
+
 static const struct svc_sock_ops svc_tcp_ops = {
 	.sko_name = "tcp",
 	.sko_recvfrom = svc_tcp_recvfrom,
 	.sko_sendto = svc_tcp_sendto,
 	.sko_detach = svc_tcpip_detach,
 	.sko_free = svc_tcpip_free,
-	.sko_prep_reply_hdr = svc_tcp_prep_reply_hdr
+	.sko_prep_reply_hdr = svc_tcp_prep_reply_hdr,
+	.sko_has_wspace = svc_tcp_has_wspace
 };
 
 static void

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

  parent reply	other threads:[~2007-07-10  5:34 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-10  5:27 [RFC,PATCH 00/20] svc: sunrpc server side transport switch Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 01/20] svc: Add svc_sock_ops Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 02/20] svc: sko_detach and sko_free Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 03/20] svc: svc_prep_reply_hdr Tom Tucker
2007-07-10  5:34 ` Tom Tucker [this message]
2007-07-10  5:34 ` [RFC,PATCH 05/20] svc: svc_max_payload Tom Tucker
2007-07-10  5:34 ` [RFC, PATCH 06/20] svc: export svc_sock_enqueue, svc_sock_received Tom Tucker
2007-07-10 23:08   ` Trond Myklebust
2007-07-11  0:45     ` Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 07/20] svc: centralise close handling Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 08/20] svc: centralise accept handling Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 09/20] svc: Add SK_LISTENER sock flag Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 10/20] svc: Add generic refcount services Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 11/20] svc: cleanup svc_sock initialization Tom Tucker
2007-07-10  5:34 ` [RFC, PATCH 12/20] scv: Create transport neutral debug bit RPCDBG_SVCTRANS Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 13/20] svc: Add svc_[un]register_transport Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 14/20] svc: Register TCP/UDP Transports Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 15/20] svc: transport file implementation Tom Tucker
2007-07-10 23:30   ` Trond Myklebust
2007-07-10  5:34 ` [RFC,PATCH 16/20] svc: sko_create_svc Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 17/20] svc: Add sko_get_name service Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 18/20] svc: Add sko_defer routine Tom Tucker
2007-07-10  5:35 ` [RFC,PATCH 19/20] knfsd: call svc_create_svcsock Tom Tucker
2007-07-10 23:32   ` Trond Myklebust
2007-07-11  0:48     ` Tom Tucker
2007-07-11  0:59     ` Tom Tucker
2007-07-10  5:35 ` [RFC,PATCH 20/20] knfsd: create listener via portlist write Tom Tucker
2007-07-10 23:36   ` [RFC, PATCH " Trond Myklebust
2007-07-11  1:04     ` Tom Tucker

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=20070710053428.28979.58102.stgit@dell3.ogc.int \
    --to=tom@opengridcomputing.com \
    --cc=nfs@lists.sourceforge.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.