From: Tom Tucker <tom@opengridcomputing.com>
To: nfs@lists.sourceforge.net
Subject: [RFC,PATCH 16/20] svc: sko_create_svc
Date: Tue, 10 Jul 2007 00:34:53 -0500 [thread overview]
Message-ID: <20070710053453.28979.74690.stgit@dell3.ogc.int> (raw)
In-Reply-To: <20070710052711.28979.70843.stgit@dell3.ogc.int>
Add an sko function that makes the creation of a listening endpoint
transport independent.
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
---
include/linux/sunrpc/svcsock.h | 5 +++
net/sunrpc/svcsock.c | 64 +++++++++++++++++++++++++++++++++++++---
2 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index d132dd5..383ac4f 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -14,6 +14,10 @@ #include <linux/sunrpc/svc.h>
struct svc_sock_ops {
const char *sko_name;
struct module *sko_owner;
+ /* Create an svc socket for this transport */
+ int (*sko_create_svc)(struct svc_serv *,
+ struct sockaddr *,
+ int);
int (*sko_recvfrom)(struct svc_rqst *rqstp);
int (*sko_sendto)(struct svc_rqst *rqstp);
/*
@@ -110,6 +114,7 @@ #define SK_LISTENER 11 /* listener (e.
int svc_register_transport(struct svc_sock_ops *xprt);
int svc_unregister_transport(struct svc_sock_ops *xprt);
int svc_makesock(struct svc_serv *, int, unsigned short, int flags);
+int svc_create_svcsock(struct svc_serv *, char *, unsigned short, int);
void svc_force_close_socket(struct svc_sock *);
int svc_recv(struct svc_rqst *, long);
int svc_send(struct svc_rqst *);
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 33aff99..b14dc46 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -87,6 +87,8 @@ static void svc_close_socket(struct svc
static void svc_tcpip_detach(struct svc_sock *);
static void svc_tcpip_free(struct svc_sock *);
+static int
+svc_create_socket(struct svc_serv *, int, struct sockaddr *, int, int);
static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk);
static int svc_deferred_recv(struct svc_rqst *rqstp);
static struct cache_deferred_req *svc_defer(struct cache_req *req);
@@ -434,6 +436,7 @@ __svc_sock_put(struct svc_sock *svsk)
if (svsk->sk_info_authunix != NULL)
svcauth_unix_info_release(svsk->sk_info_authunix);
+ module_put(svsk->sk_ops->sko_owner);
svsk->sk_ops->sko_free(svsk);
}
EXPORT_SYMBOL(__svc_sock_put);
@@ -961,9 +964,17 @@ svc_udp_has_wspace(struct svc_sock *svsk
return svc_sock_has_write_space(svsk, sock_wspace(svsk->sk_sk));
}
+static int
+svc_udp_create_svc(struct svc_serv *serv, struct sockaddr *sa, int flags)
+{
+ return svc_create_socket(serv, IPPROTO_UDP, sa,
+ sizeof(struct sockaddr_in), flags);
+}
+
static struct svc_sock_ops svc_udp_ops = {
.sko_name = "udp",
.sko_owner = THIS_MODULE,
+ .sko_create_svc = svc_udp_create_svc,
.sko_recvfrom = svc_udp_recvfrom,
.sko_sendto = svc_udp_sendto,
.sko_detach = svc_tcpip_detach,
@@ -1421,9 +1432,17 @@ svc_tcp_has_wspace(struct svc_sock *svsk
return svc_sock_has_write_space(svsk, sk_stream_wspace(svsk->sk_sk));
}
+static int
+svc_tcp_create_svc(struct svc_serv *serv, struct sockaddr *sa, int flags)
+{
+ return svc_create_socket(serv, IPPROTO_TCP, sa,
+ sizeof(struct sockaddr_in), flags);
+}
+
static struct svc_sock_ops svc_tcp_ops = {
.sko_name = "tcp",
.sko_owner = THIS_MODULE,
+ .sko_create_svc = svc_tcp_create_svc,
.sko_recvfrom = svc_tcp_recvfrom,
.sko_sendto = svc_tcp_sendto,
.sko_detach = svc_tcpip_detach,
@@ -1605,6 +1624,7 @@ svc_recv(struct svc_rqst *rqstp, long ti
svc_delete_socket(svsk);
} else if (test_bit(SK_LISTENER, &svsk->sk_flags)) {
svsk->sk_ops->sko_accept(svsk);
+ __module_get(svsk->sk_ops->sko_owner);
svc_sock_received(svsk);
} else {
dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
@@ -1884,7 +1904,7 @@ EXPORT_SYMBOL_GPL(svc_addsock);
* Create socket for RPC service.
*/
static int svc_create_socket(struct svc_serv *serv, int protocol,
- struct sockaddr *sin, int len, int flags)
+ struct sockaddr *sin, int len, int flags)
{
struct svc_sock *svsk;
struct socket *sock;
@@ -2036,17 +2056,51 @@ void svc_force_close_socket(struct svc_s
*
*/
int svc_makesock(struct svc_serv *serv, int protocol, unsigned short port,
- int flags)
+ int flags)
{
+ dprintk("svc: creating socket proto = %d\n", protocol);
+ switch (protocol) {
+ case IPPROTO_TCP:
+ return svc_create_svcsock(serv, "tcp", port, flags);
+ case IPPROTO_UDP:
+ return svc_create_svcsock(serv, "udp", port, flags);
+ default:
+ return -EINVAL;
+ }
+}
+
+int svc_create_svcsock(struct svc_serv *serv, char *transport, unsigned short port,
+ int flags)
+{
+ int ret = -ENOENT;
+ struct list_head *le;
struct sockaddr_in sin = {
.sin_family = AF_INET,
.sin_addr.s_addr = INADDR_ANY,
.sin_port = htons(port),
};
+ dprintk("svc: creating transport socket %s[%d]\n", transport, port);
+ spin_lock(&svc_transport_lock);
+ list_for_each(le, &svc_transport_list) {
+ struct svc_sock_ops *op =
+ list_entry(le, struct svc_sock_ops, sko_list);
- dprintk("svc: creating socket proto = %d\n", protocol);
- return svc_create_socket(serv, protocol, (struct sockaddr *) &sin,
- sizeof(sin), flags);
+ if (strcmp(transport, op->sko_name)==0) {
+ spin_unlock(&svc_transport_lock);
+ if (try_module_get(op->sko_owner)) {
+ ret = op->sko_create_svc(serv,
+ (struct sockaddr*)&sin,
+ flags);
+ if (ret < 0)
+ module_put(op->sko_owner);
+ goto out;
+ }
+ }
+ }
+ spin_unlock(&svc_transport_lock);
+ dprintk("svc: transport %s not found\n", transport);
+ out:
+ return ret;
}
/*
-------------------------------------------------------------------------
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
next prev 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 ` [RFC,PATCH 04/20] svc: sko_has_wspace Tom Tucker
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 ` Tom Tucker [this message]
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=20070710053453.28979.74690.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.