diff options
author | Tom Tucker <tom@opengridcomputing.com> | 2007-12-30 22:07:15 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:07 -0500 |
commit | 1d8206b97a09e7ff2fbef17d8d1ea008d764eeaa (patch) | |
tree | 0975483e82fab57c25fdbb19a9946985659a8ca2 | |
parent | cb5c7d668e1af269a9409721268f027b86abf29c (diff) |
svc: Add an svc transport class
The transport class (svc_xprt_class) represents a type of transport, e.g.
udp, tcp, rdma. A transport class has a unique name and a set of transport
operations kept in the svc_xprt_ops structure.
A transport class can be dynamically registered and unregisterd. The
svc_xprt_class represents the module that implements the transport
type and keeps reference counts on the module to avoid unloading while
there are active users.
The endpoint (svc_xprt) is a generic, transport independent endpoint that can
be used to send and receive data for an RPC service. It inherits it's
operations from the transport class.
A transport driver module registers and unregisters itself with svc sunrpc
by calling svc_reg_xprt_class, and svc_unreg_xprt_class respectively.
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Neil Brown <neilb@suse.de>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Greg Banks <gnb@sgi.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r-- | include/linux/sunrpc/debug.h | 1 | ||||
-rw-r--r-- | include/linux/sunrpc/svc_xprt.h | 31 | ||||
-rw-r--r-- | net/sunrpc/Makefile | 3 | ||||
-rw-r--r-- | net/sunrpc/svc_xprt.c | 83 |
4 files changed, 117 insertions, 1 deletions
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index 3912cf16361e..092fcfa9ceb9 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #define RPCDBG_SCHED 0x0040 | 21 | #define RPCDBG_SCHED 0x0040 |
22 | #define RPCDBG_TRANS 0x0080 | 22 | #define RPCDBG_TRANS 0x0080 |
23 | #define RPCDBG_SVCSOCK 0x0100 | 23 | #define RPCDBG_SVCSOCK 0x0100 |
24 | #define RPCDBG_SVCXPRT 0x0100 | ||
24 | #define RPCDBG_SVCDSP 0x0200 | 25 | #define RPCDBG_SVCDSP 0x0200 |
25 | #define RPCDBG_MISC 0x0400 | 26 | #define RPCDBG_MISC 0x0400 |
26 | #define RPCDBG_CACHE 0x0800 | 27 | #define RPCDBG_CACHE 0x0800 |
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h new file mode 100644 index 000000000000..fe8e787bb95d --- /dev/null +++ b/include/linux/sunrpc/svc_xprt.h | |||
@@ -0,0 +1,31 @@ | |||
1 | /* | ||
2 | * linux/include/linux/sunrpc/svc_xprt.h | ||
3 | * | ||
4 | * RPC server transport I/O | ||
5 | */ | ||
6 | |||
7 | #ifndef SUNRPC_SVC_XPRT_H | ||
8 | #define SUNRPC_SVC_XPRT_H | ||
9 | |||
10 | #include <linux/sunrpc/svc.h> | ||
11 | |||
12 | struct svc_xprt_ops { | ||
13 | }; | ||
14 | |||
15 | struct svc_xprt_class { | ||
16 | const char *xcl_name; | ||
17 | struct module *xcl_owner; | ||
18 | struct svc_xprt_ops *xcl_ops; | ||
19 | struct list_head xcl_list; | ||
20 | }; | ||
21 | |||
22 | struct svc_xprt { | ||
23 | struct svc_xprt_class *xpt_class; | ||
24 | struct svc_xprt_ops *xpt_ops; | ||
25 | }; | ||
26 | |||
27 | int svc_reg_xprt_class(struct svc_xprt_class *); | ||
28 | void svc_unreg_xprt_class(struct svc_xprt_class *); | ||
29 | void svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *); | ||
30 | |||
31 | #endif /* SUNRPC_SVC_XPRT_H */ | ||
diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile index 5c69a725e530..92e1dbe50947 100644 --- a/net/sunrpc/Makefile +++ b/net/sunrpc/Makefile | |||
@@ -11,6 +11,7 @@ sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ | |||
11 | auth.o auth_null.o auth_unix.o \ | 11 | auth.o auth_null.o auth_unix.o \ |
12 | svc.o svcsock.o svcauth.o svcauth_unix.o \ | 12 | svc.o svcsock.o svcauth.o svcauth_unix.o \ |
13 | rpcb_clnt.o timer.o xdr.o \ | 13 | rpcb_clnt.o timer.o xdr.o \ |
14 | sunrpc_syms.o cache.o rpc_pipe.o | 14 | sunrpc_syms.o cache.o rpc_pipe.o \ |
15 | svc_xprt.o | ||
15 | sunrpc-$(CONFIG_PROC_FS) += stats.o | 16 | sunrpc-$(CONFIG_PROC_FS) += stats.o |
16 | sunrpc-$(CONFIG_SYSCTL) += sysctl.o | 17 | sunrpc-$(CONFIG_SYSCTL) += sysctl.o |
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c new file mode 100644 index 000000000000..fe5270fae336 --- /dev/null +++ b/net/sunrpc/svc_xprt.c | |||
@@ -0,0 +1,83 @@ | |||
1 | /* | ||
2 | * linux/net/sunrpc/svc_xprt.c | ||
3 | * | ||
4 | * Author: Tom Tucker <tom@opengridcomputing.com> | ||
5 | */ | ||
6 | |||
7 | #include <linux/sched.h> | ||
8 | #include <linux/errno.h> | ||
9 | #include <linux/fcntl.h> | ||
10 | #include <linux/net.h> | ||
11 | #include <linux/in.h> | ||
12 | #include <linux/inet.h> | ||
13 | #include <linux/udp.h> | ||
14 | #include <linux/tcp.h> | ||
15 | #include <linux/unistd.h> | ||
16 | #include <linux/slab.h> | ||
17 | #include <linux/netdevice.h> | ||
18 | #include <linux/skbuff.h> | ||
19 | #include <linux/file.h> | ||
20 | #include <linux/freezer.h> | ||
21 | #include <net/sock.h> | ||
22 | #include <net/checksum.h> | ||
23 | #include <net/ip.h> | ||
24 | #include <net/ipv6.h> | ||
25 | #include <net/tcp_states.h> | ||
26 | #include <linux/uaccess.h> | ||
27 | #include <asm/ioctls.h> | ||
28 | |||
29 | #include <linux/sunrpc/types.h> | ||
30 | #include <linux/sunrpc/clnt.h> | ||
31 | #include <linux/sunrpc/xdr.h> | ||
32 | #include <linux/sunrpc/svcsock.h> | ||
33 | #include <linux/sunrpc/stats.h> | ||
34 | #include <linux/sunrpc/svc_xprt.h> | ||
35 | |||
36 | #define RPCDBG_FACILITY RPCDBG_SVCXPRT | ||
37 | |||
38 | /* List of registered transport classes */ | ||
39 | static DEFINE_SPINLOCK(svc_xprt_class_lock); | ||
40 | static LIST_HEAD(svc_xprt_class_list); | ||
41 | |||
42 | int svc_reg_xprt_class(struct svc_xprt_class *xcl) | ||
43 | { | ||
44 | struct svc_xprt_class *cl; | ||
45 | int res = -EEXIST; | ||
46 | |||
47 | dprintk("svc: Adding svc transport class '%s'\n", xcl->xcl_name); | ||
48 | |||
49 | INIT_LIST_HEAD(&xcl->xcl_list); | ||
50 | spin_lock(&svc_xprt_class_lock); | ||
51 | /* Make sure there isn't already a class with the same name */ | ||
52 | list_for_each_entry(cl, &svc_xprt_class_list, xcl_list) { | ||
53 | if (strcmp(xcl->xcl_name, cl->xcl_name) == 0) | ||
54 | goto out; | ||
55 | } | ||
56 | list_add_tail(&xcl->xcl_list, &svc_xprt_class_list); | ||
57 | res = 0; | ||
58 | out: | ||
59 | spin_unlock(&svc_xprt_class_lock); | ||
60 | return res; | ||
61 | } | ||
62 | EXPORT_SYMBOL_GPL(svc_reg_xprt_class); | ||
63 | |||
64 | void svc_unreg_xprt_class(struct svc_xprt_class *xcl) | ||
65 | { | ||
66 | dprintk("svc: Removing svc transport class '%s'\n", xcl->xcl_name); | ||
67 | spin_lock(&svc_xprt_class_lock); | ||
68 | list_del_init(&xcl->xcl_list); | ||
69 | spin_unlock(&svc_xprt_class_lock); | ||
70 | } | ||
71 | EXPORT_SYMBOL_GPL(svc_unreg_xprt_class); | ||
72 | |||
73 | /* | ||
74 | * Called by transport drivers to initialize the transport independent | ||
75 | * portion of the transport instance. | ||
76 | */ | ||
77 | void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt) | ||
78 | { | ||
79 | memset(xprt, 0, sizeof(*xprt)); | ||
80 | xprt->xpt_class = xcl; | ||
81 | xprt->xpt_ops = xcl->xcl_ops; | ||
82 | } | ||
83 | EXPORT_SYMBOL_GPL(svc_xprt_init); | ||