diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/Makefile | 2 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/gss_spkm3_seal.c | 13 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 69 | ||||
-rw-r--r-- | net/sunrpc/pmap_clnt.c | 383 | ||||
-rw-r--r-- | net/sunrpc/rpcb_clnt.c | 625 | ||||
-rw-r--r-- | net/sunrpc/sched.c | 65 | ||||
-rw-r--r-- | net/sunrpc/svc.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprt.c | 4 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 4 |
9 files changed, 714 insertions, 453 deletions
diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile index cdcab9ca4c60..8ebfc4db7f51 100644 --- a/net/sunrpc/Makefile +++ b/net/sunrpc/Makefile | |||
@@ -9,7 +9,7 @@ obj-$(CONFIG_SUNRPC_GSS) += auth_gss/ | |||
9 | sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ | 9 | sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ |
10 | auth.o auth_null.o auth_unix.o \ | 10 | auth.o auth_null.o auth_unix.o \ |
11 | svc.o svcsock.o svcauth.o svcauth_unix.o \ | 11 | svc.o svcsock.o svcauth.o svcauth_unix.o \ |
12 | pmap_clnt.o timer.o xdr.o \ | 12 | rpcb_clnt.o timer.o xdr.o \ |
13 | sunrpc_syms.o cache.o rpc_pipe.o | 13 | sunrpc_syms.o cache.o rpc_pipe.o |
14 | sunrpc-$(CONFIG_PROC_FS) += stats.o | 14 | sunrpc-$(CONFIG_PROC_FS) += stats.o |
15 | sunrpc-$(CONFIG_SYSCTL) += sysctl.o | 15 | sunrpc-$(CONFIG_SYSCTL) += sysctl.o |
diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c index 104cbf4f769f..d158635de6c0 100644 --- a/net/sunrpc/auth_gss/gss_spkm3_seal.c +++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c | |||
@@ -123,9 +123,6 @@ spkm3_make_token(struct spkm3_ctx *ctx, | |||
123 | 123 | ||
124 | return GSS_S_COMPLETE; | 124 | return GSS_S_COMPLETE; |
125 | out_err: | 125 | out_err: |
126 | if (md5cksum.data) | ||
127 | kfree(md5cksum.data); | ||
128 | |||
129 | token->data = NULL; | 126 | token->data = NULL; |
130 | token->len = 0; | 127 | token->len = 0; |
131 | return GSS_S_FAILURE; | 128 | return GSS_S_FAILURE; |
@@ -152,7 +149,7 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header, | |||
152 | 149 | ||
153 | switch (cksumtype) { | 150 | switch (cksumtype) { |
154 | case CKSUMTYPE_HMAC_MD5: | 151 | case CKSUMTYPE_HMAC_MD5: |
155 | cksumname = "md5"; | 152 | cksumname = "hmac(md5)"; |
156 | break; | 153 | break; |
157 | default: | 154 | default: |
158 | dprintk("RPC: spkm3_make_checksum:" | 155 | dprintk("RPC: spkm3_make_checksum:" |
@@ -172,8 +169,12 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header, | |||
172 | if (err) | 169 | if (err) |
173 | goto out; | 170 | goto out; |
174 | 171 | ||
172 | err = crypto_hash_init(&desc); | ||
173 | if (err) | ||
174 | goto out; | ||
175 | |||
175 | sg_set_buf(sg, header, hdrlen); | 176 | sg_set_buf(sg, header, hdrlen); |
176 | crypto_hash_update(&desc, sg, 1); | 177 | crypto_hash_update(&desc, sg, sg->length); |
177 | 178 | ||
178 | xdr_process_buf(body, body_offset, body->len - body_offset, | 179 | xdr_process_buf(body, body_offset, body->len - body_offset, |
179 | spkm3_checksummer, &desc); | 180 | spkm3_checksummer, &desc); |
@@ -184,5 +185,3 @@ out: | |||
184 | 185 | ||
185 | return err ? GSS_S_FAILURE : 0; | 186 | return err ? GSS_S_FAILURE : 0; |
186 | } | 187 | } |
187 | |||
188 | EXPORT_SYMBOL(make_spkm3_checksum); | ||
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 396cdbe249d1..d8fbee40a19c 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -36,8 +36,6 @@ | |||
36 | #include <linux/sunrpc/metrics.h> | 36 | #include <linux/sunrpc/metrics.h> |
37 | 37 | ||
38 | 38 | ||
39 | #define RPC_SLACK_SPACE (1024) /* total overkill */ | ||
40 | |||
41 | #ifdef RPC_DEBUG | 39 | #ifdef RPC_DEBUG |
42 | # define RPCDBG_FACILITY RPCDBG_CALL | 40 | # define RPCDBG_FACILITY RPCDBG_CALL |
43 | #endif | 41 | #endif |
@@ -747,21 +745,38 @@ call_reserveresult(struct rpc_task *task) | |||
747 | static void | 745 | static void |
748 | call_allocate(struct rpc_task *task) | 746 | call_allocate(struct rpc_task *task) |
749 | { | 747 | { |
748 | unsigned int slack = task->tk_auth->au_cslack; | ||
750 | struct rpc_rqst *req = task->tk_rqstp; | 749 | struct rpc_rqst *req = task->tk_rqstp; |
751 | struct rpc_xprt *xprt = task->tk_xprt; | 750 | struct rpc_xprt *xprt = task->tk_xprt; |
752 | unsigned int bufsiz; | 751 | struct rpc_procinfo *proc = task->tk_msg.rpc_proc; |
753 | 752 | ||
754 | dprint_status(task); | 753 | dprint_status(task); |
755 | 754 | ||
755 | task->tk_status = 0; | ||
756 | task->tk_action = call_bind; | 756 | task->tk_action = call_bind; |
757 | |||
757 | if (req->rq_buffer) | 758 | if (req->rq_buffer) |
758 | return; | 759 | return; |
759 | 760 | ||
760 | /* FIXME: compute buffer requirements more exactly using | 761 | if (proc->p_proc != 0) { |
761 | * auth->au_wslack */ | 762 | BUG_ON(proc->p_arglen == 0); |
762 | bufsiz = task->tk_msg.rpc_proc->p_bufsiz + RPC_SLACK_SPACE; | 763 | if (proc->p_decode != NULL) |
764 | BUG_ON(proc->p_replen == 0); | ||
765 | } | ||
763 | 766 | ||
764 | if (xprt->ops->buf_alloc(task, bufsiz << 1) != NULL) | 767 | /* |
768 | * Calculate the size (in quads) of the RPC call | ||
769 | * and reply headers, and convert both values | ||
770 | * to byte sizes. | ||
771 | */ | ||
772 | req->rq_callsize = RPC_CALLHDRSIZE + (slack << 1) + proc->p_arglen; | ||
773 | req->rq_callsize <<= 2; | ||
774 | req->rq_rcvsize = RPC_REPHDRSIZE + slack + proc->p_replen; | ||
775 | req->rq_rcvsize <<= 2; | ||
776 | |||
777 | req->rq_buffer = xprt->ops->buf_alloc(task, | ||
778 | req->rq_callsize + req->rq_rcvsize); | ||
779 | if (req->rq_buffer != NULL) | ||
765 | return; | 780 | return; |
766 | 781 | ||
767 | dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid); | 782 | dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid); |
@@ -788,6 +803,17 @@ rpc_task_force_reencode(struct rpc_task *task) | |||
788 | task->tk_rqstp->rq_snd_buf.len = 0; | 803 | task->tk_rqstp->rq_snd_buf.len = 0; |
789 | } | 804 | } |
790 | 805 | ||
806 | static inline void | ||
807 | rpc_xdr_buf_init(struct xdr_buf *buf, void *start, size_t len) | ||
808 | { | ||
809 | buf->head[0].iov_base = start; | ||
810 | buf->head[0].iov_len = len; | ||
811 | buf->tail[0].iov_len = 0; | ||
812 | buf->page_len = 0; | ||
813 | buf->len = 0; | ||
814 | buf->buflen = len; | ||
815 | } | ||
816 | |||
791 | /* | 817 | /* |
792 | * 3. Encode arguments of an RPC call | 818 | * 3. Encode arguments of an RPC call |
793 | */ | 819 | */ |
@@ -795,28 +821,17 @@ static void | |||
795 | call_encode(struct rpc_task *task) | 821 | call_encode(struct rpc_task *task) |
796 | { | 822 | { |
797 | struct rpc_rqst *req = task->tk_rqstp; | 823 | struct rpc_rqst *req = task->tk_rqstp; |
798 | struct xdr_buf *sndbuf = &req->rq_snd_buf; | ||
799 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | ||
800 | unsigned int bufsiz; | ||
801 | kxdrproc_t encode; | 824 | kxdrproc_t encode; |
802 | __be32 *p; | 825 | __be32 *p; |
803 | 826 | ||
804 | dprint_status(task); | 827 | dprint_status(task); |
805 | 828 | ||
806 | /* Default buffer setup */ | 829 | rpc_xdr_buf_init(&req->rq_snd_buf, |
807 | bufsiz = req->rq_bufsize >> 1; | 830 | req->rq_buffer, |
808 | sndbuf->head[0].iov_base = (void *)req->rq_buffer; | 831 | req->rq_callsize); |
809 | sndbuf->head[0].iov_len = bufsiz; | 832 | rpc_xdr_buf_init(&req->rq_rcv_buf, |
810 | sndbuf->tail[0].iov_len = 0; | 833 | (char *)req->rq_buffer + req->rq_callsize, |
811 | sndbuf->page_len = 0; | 834 | req->rq_rcvsize); |
812 | sndbuf->len = 0; | ||
813 | sndbuf->buflen = bufsiz; | ||
814 | rcvbuf->head[0].iov_base = (void *)((char *)req->rq_buffer + bufsiz); | ||
815 | rcvbuf->head[0].iov_len = bufsiz; | ||
816 | rcvbuf->tail[0].iov_len = 0; | ||
817 | rcvbuf->page_len = 0; | ||
818 | rcvbuf->len = 0; | ||
819 | rcvbuf->buflen = bufsiz; | ||
820 | 835 | ||
821 | /* Encode header and provided arguments */ | 836 | /* Encode header and provided arguments */ |
822 | encode = task->tk_msg.rpc_proc->p_encode; | 837 | encode = task->tk_msg.rpc_proc->p_encode; |
@@ -887,9 +902,11 @@ call_bind_status(struct rpc_task *task) | |||
887 | task->tk_pid); | 902 | task->tk_pid); |
888 | break; | 903 | break; |
889 | case -EPROTONOSUPPORT: | 904 | case -EPROTONOSUPPORT: |
890 | dprintk("RPC: %5u remote rpcbind version 2 unavailable\n", | 905 | dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n", |
891 | task->tk_pid); | 906 | task->tk_pid); |
892 | break; | 907 | task->tk_status = 0; |
908 | task->tk_action = call_bind; | ||
909 | return; | ||
893 | default: | 910 | default: |
894 | dprintk("RPC: %5u unrecognized rpcbind error (%d)\n", | 911 | dprintk("RPC: %5u unrecognized rpcbind error (%d)\n", |
895 | task->tk_pid, -task->tk_status); | 912 | task->tk_pid, -task->tk_status); |
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c deleted file mode 100644 index d9f765344589..000000000000 --- a/net/sunrpc/pmap_clnt.c +++ /dev/null | |||
@@ -1,383 +0,0 @@ | |||
1 | /* | ||
2 | * linux/net/sunrpc/pmap_clnt.c | ||
3 | * | ||
4 | * In-kernel RPC portmapper client. | ||
5 | * | ||
6 | * Portmapper supports version 2 of the rpcbind protocol (RFC 1833). | ||
7 | * | ||
8 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | ||
9 | */ | ||
10 | |||
11 | #include <linux/types.h> | ||
12 | #include <linux/socket.h> | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/errno.h> | ||
15 | #include <linux/uio.h> | ||
16 | #include <linux/in.h> | ||
17 | #include <linux/sunrpc/clnt.h> | ||
18 | #include <linux/sunrpc/sched.h> | ||
19 | |||
20 | #ifdef RPC_DEBUG | ||
21 | # define RPCDBG_FACILITY RPCDBG_PMAP | ||
22 | #endif | ||
23 | |||
24 | #define PMAP_SET 1 | ||
25 | #define PMAP_UNSET 2 | ||
26 | #define PMAP_GETPORT 3 | ||
27 | |||
28 | struct portmap_args { | ||
29 | u32 pm_prog; | ||
30 | u32 pm_vers; | ||
31 | u32 pm_prot; | ||
32 | unsigned short pm_port; | ||
33 | struct rpc_xprt * pm_xprt; | ||
34 | }; | ||
35 | |||
36 | static struct rpc_procinfo pmap_procedures[]; | ||
37 | static struct rpc_clnt * pmap_create(char *, struct sockaddr_in *, int, int); | ||
38 | static void pmap_getport_done(struct rpc_task *, void *); | ||
39 | static struct rpc_program pmap_program; | ||
40 | |||
41 | static void pmap_getport_prepare(struct rpc_task *task, void *calldata) | ||
42 | { | ||
43 | struct portmap_args *map = calldata; | ||
44 | struct rpc_message msg = { | ||
45 | .rpc_proc = &pmap_procedures[PMAP_GETPORT], | ||
46 | .rpc_argp = map, | ||
47 | .rpc_resp = &map->pm_port, | ||
48 | }; | ||
49 | |||
50 | rpc_call_setup(task, &msg, 0); | ||
51 | } | ||
52 | |||
53 | static inline struct portmap_args *pmap_map_alloc(void) | ||
54 | { | ||
55 | return kmalloc(sizeof(struct portmap_args), GFP_NOFS); | ||
56 | } | ||
57 | |||
58 | static inline void pmap_map_free(struct portmap_args *map) | ||
59 | { | ||
60 | kfree(map); | ||
61 | } | ||
62 | |||
63 | static void pmap_map_release(void *data) | ||
64 | { | ||
65 | struct portmap_args *map = data; | ||
66 | |||
67 | xprt_put(map->pm_xprt); | ||
68 | pmap_map_free(map); | ||
69 | } | ||
70 | |||
71 | static const struct rpc_call_ops pmap_getport_ops = { | ||
72 | .rpc_call_prepare = pmap_getport_prepare, | ||
73 | .rpc_call_done = pmap_getport_done, | ||
74 | .rpc_release = pmap_map_release, | ||
75 | }; | ||
76 | |||
77 | static inline void pmap_wake_portmap_waiters(struct rpc_xprt *xprt, int status) | ||
78 | { | ||
79 | xprt_clear_binding(xprt); | ||
80 | rpc_wake_up_status(&xprt->binding, status); | ||
81 | } | ||
82 | |||
83 | /** | ||
84 | * rpc_getport - obtain the port for a given RPC service on a given host | ||
85 | * @task: task that is waiting for portmapper request | ||
86 | * | ||
87 | * This one can be called for an ongoing RPC request, and can be used in | ||
88 | * an async (rpciod) context. | ||
89 | */ | ||
90 | void rpc_getport(struct rpc_task *task) | ||
91 | { | ||
92 | struct rpc_clnt *clnt = task->tk_client; | ||
93 | struct rpc_xprt *xprt = task->tk_xprt; | ||
94 | struct sockaddr_in addr; | ||
95 | struct portmap_args *map; | ||
96 | struct rpc_clnt *pmap_clnt; | ||
97 | struct rpc_task *child; | ||
98 | int status; | ||
99 | |||
100 | dprintk("RPC: %5u rpc_getport(%s, %u, %u, %d)\n", | ||
101 | task->tk_pid, clnt->cl_server, | ||
102 | clnt->cl_prog, clnt->cl_vers, xprt->prot); | ||
103 | |||
104 | /* Autobind on cloned rpc clients is discouraged */ | ||
105 | BUG_ON(clnt->cl_parent != clnt); | ||
106 | |||
107 | status = -EACCES; /* tell caller to check again */ | ||
108 | if (xprt_test_and_set_binding(xprt)) | ||
109 | goto bailout_nowake; | ||
110 | |||
111 | /* Put self on queue before sending rpcbind request, in case | ||
112 | * pmap_getport_done completes before we return from rpc_run_task */ | ||
113 | rpc_sleep_on(&xprt->binding, task, NULL, NULL); | ||
114 | |||
115 | /* Someone else may have bound if we slept */ | ||
116 | status = 0; | ||
117 | if (xprt_bound(xprt)) | ||
118 | goto bailout_nofree; | ||
119 | |||
120 | status = -ENOMEM; | ||
121 | map = pmap_map_alloc(); | ||
122 | if (!map) | ||
123 | goto bailout_nofree; | ||
124 | map->pm_prog = clnt->cl_prog; | ||
125 | map->pm_vers = clnt->cl_vers; | ||
126 | map->pm_prot = xprt->prot; | ||
127 | map->pm_port = 0; | ||
128 | map->pm_xprt = xprt_get(xprt); | ||
129 | |||
130 | rpc_peeraddr(clnt, (struct sockaddr *) &addr, sizeof(addr)); | ||
131 | pmap_clnt = pmap_create(clnt->cl_server, &addr, map->pm_prot, 0); | ||
132 | status = PTR_ERR(pmap_clnt); | ||
133 | if (IS_ERR(pmap_clnt)) | ||
134 | goto bailout; | ||
135 | |||
136 | status = -EIO; | ||
137 | child = rpc_run_task(pmap_clnt, RPC_TASK_ASYNC, &pmap_getport_ops, map); | ||
138 | if (IS_ERR(child)) | ||
139 | goto bailout_nofree; | ||
140 | rpc_put_task(child); | ||
141 | |||
142 | task->tk_xprt->stat.bind_count++; | ||
143 | return; | ||
144 | |||
145 | bailout: | ||
146 | pmap_map_free(map); | ||
147 | xprt_put(xprt); | ||
148 | bailout_nofree: | ||
149 | pmap_wake_portmap_waiters(xprt, status); | ||
150 | bailout_nowake: | ||
151 | task->tk_status = status; | ||
152 | } | ||
153 | |||
154 | #ifdef CONFIG_ROOT_NFS | ||
155 | /** | ||
156 | * rpc_getport_external - obtain the port for a given RPC service on a given host | ||
157 | * @sin: address of remote peer | ||
158 | * @prog: RPC program number to bind | ||
159 | * @vers: RPC version number to bind | ||
160 | * @prot: transport protocol to use to make this request | ||
161 | * | ||
162 | * This one is called from outside the RPC client in a synchronous task context. | ||
163 | */ | ||
164 | int rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot) | ||
165 | { | ||
166 | struct portmap_args map = { | ||
167 | .pm_prog = prog, | ||
168 | .pm_vers = vers, | ||
169 | .pm_prot = prot, | ||
170 | .pm_port = 0 | ||
171 | }; | ||
172 | struct rpc_message msg = { | ||
173 | .rpc_proc = &pmap_procedures[PMAP_GETPORT], | ||
174 | .rpc_argp = &map, | ||
175 | .rpc_resp = &map.pm_port, | ||
176 | }; | ||
177 | struct rpc_clnt *pmap_clnt; | ||
178 | char hostname[32]; | ||
179 | int status; | ||
180 | |||
181 | dprintk("RPC: rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n", | ||
182 | NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); | ||
183 | |||
184 | sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr)); | ||
185 | pmap_clnt = pmap_create(hostname, sin, prot, 0); | ||
186 | if (IS_ERR(pmap_clnt)) | ||
187 | return PTR_ERR(pmap_clnt); | ||
188 | |||
189 | /* Setup the call info struct */ | ||
190 | status = rpc_call_sync(pmap_clnt, &msg, 0); | ||
191 | |||
192 | if (status >= 0) { | ||
193 | if (map.pm_port != 0) | ||
194 | return map.pm_port; | ||
195 | status = -EACCES; | ||
196 | } | ||
197 | return status; | ||
198 | } | ||
199 | #endif | ||
200 | |||
201 | /* | ||
202 | * Portmapper child task invokes this callback via tk_exit. | ||
203 | */ | ||
204 | static void pmap_getport_done(struct rpc_task *child, void *data) | ||
205 | { | ||
206 | struct portmap_args *map = data; | ||
207 | struct rpc_xprt *xprt = map->pm_xprt; | ||
208 | int status = child->tk_status; | ||
209 | |||
210 | if (status < 0) { | ||
211 | /* Portmapper not available */ | ||
212 | xprt->ops->set_port(xprt, 0); | ||
213 | } else if (map->pm_port == 0) { | ||
214 | /* Requested RPC service wasn't registered */ | ||
215 | xprt->ops->set_port(xprt, 0); | ||
216 | status = -EACCES; | ||
217 | } else { | ||
218 | /* Succeeded */ | ||
219 | xprt->ops->set_port(xprt, map->pm_port); | ||
220 | xprt_set_bound(xprt); | ||
221 | status = 0; | ||
222 | } | ||
223 | |||
224 | dprintk("RPC: %5u pmap_getport_done(status %d, port %u)\n", | ||
225 | child->tk_pid, status, map->pm_port); | ||
226 | |||
227 | pmap_wake_portmap_waiters(xprt, status); | ||
228 | } | ||
229 | |||
230 | /** | ||
231 | * rpc_register - set or unset a port registration with the local portmapper | ||
232 | * @prog: RPC program number to bind | ||
233 | * @vers: RPC version number to bind | ||
234 | * @prot: transport protocol to use to make this request | ||
235 | * @port: port value to register | ||
236 | * @okay: result code | ||
237 | * | ||
238 | * port == 0 means unregister, port != 0 means register. | ||
239 | */ | ||
240 | int rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay) | ||
241 | { | ||
242 | struct sockaddr_in sin = { | ||
243 | .sin_family = AF_INET, | ||
244 | .sin_addr.s_addr = htonl(INADDR_LOOPBACK), | ||
245 | }; | ||
246 | struct portmap_args map = { | ||
247 | .pm_prog = prog, | ||
248 | .pm_vers = vers, | ||
249 | .pm_prot = prot, | ||
250 | .pm_port = port, | ||
251 | }; | ||
252 | struct rpc_message msg = { | ||
253 | .rpc_proc = &pmap_procedures[port ? PMAP_SET : PMAP_UNSET], | ||
254 | .rpc_argp = &map, | ||
255 | .rpc_resp = okay, | ||
256 | }; | ||
257 | struct rpc_clnt *pmap_clnt; | ||
258 | int error = 0; | ||
259 | |||
260 | dprintk("RPC: registering (%u, %u, %d, %u) with portmapper.\n", | ||
261 | prog, vers, prot, port); | ||
262 | |||
263 | pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1); | ||
264 | if (IS_ERR(pmap_clnt)) { | ||
265 | error = PTR_ERR(pmap_clnt); | ||
266 | dprintk("RPC: couldn't create pmap client. Error = %d\n", | ||
267 | error); | ||
268 | return error; | ||
269 | } | ||
270 | |||
271 | error = rpc_call_sync(pmap_clnt, &msg, 0); | ||
272 | |||
273 | if (error < 0) { | ||
274 | printk(KERN_WARNING | ||
275 | "RPC: failed to contact portmap (errno %d).\n", | ||
276 | error); | ||
277 | } | ||
278 | dprintk("RPC: registration status %d/%d\n", error, *okay); | ||
279 | |||
280 | /* Client deleted automatically because cl_oneshot == 1 */ | ||
281 | return error; | ||
282 | } | ||
283 | |||
284 | static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileged) | ||
285 | { | ||
286 | struct rpc_create_args args = { | ||
287 | .protocol = proto, | ||
288 | .address = (struct sockaddr *)srvaddr, | ||
289 | .addrsize = sizeof(*srvaddr), | ||
290 | .servername = hostname, | ||
291 | .program = &pmap_program, | ||
292 | .version = RPC_PMAP_VERSION, | ||
293 | .authflavor = RPC_AUTH_UNIX, | ||
294 | .flags = (RPC_CLNT_CREATE_ONESHOT | | ||
295 | RPC_CLNT_CREATE_NOPING), | ||
296 | }; | ||
297 | |||
298 | srvaddr->sin_port = htons(RPC_PMAP_PORT); | ||
299 | if (!privileged) | ||
300 | args.flags |= RPC_CLNT_CREATE_NONPRIVPORT; | ||
301 | return rpc_create(&args); | ||
302 | } | ||
303 | |||
304 | /* | ||
305 | * XDR encode/decode functions for PMAP | ||
306 | */ | ||
307 | static int xdr_encode_mapping(struct rpc_rqst *req, __be32 *p, struct portmap_args *map) | ||
308 | { | ||
309 | dprintk("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n", | ||
310 | map->pm_prog, map->pm_vers, | ||
311 | map->pm_prot, map->pm_port); | ||
312 | *p++ = htonl(map->pm_prog); | ||
313 | *p++ = htonl(map->pm_vers); | ||
314 | *p++ = htonl(map->pm_prot); | ||
315 | *p++ = htonl(map->pm_port); | ||
316 | |||
317 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
318 | return 0; | ||
319 | } | ||
320 | |||
321 | static int xdr_decode_port(struct rpc_rqst *req, __be32 *p, unsigned short *portp) | ||
322 | { | ||
323 | *portp = (unsigned short) ntohl(*p++); | ||
324 | return 0; | ||
325 | } | ||
326 | |||
327 | static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp) | ||
328 | { | ||
329 | *boolp = (unsigned int) ntohl(*p++); | ||
330 | return 0; | ||
331 | } | ||
332 | |||
333 | static struct rpc_procinfo pmap_procedures[] = { | ||
334 | [PMAP_SET] = { | ||
335 | .p_proc = PMAP_SET, | ||
336 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | ||
337 | .p_decode = (kxdrproc_t) xdr_decode_bool, | ||
338 | .p_bufsiz = 4, | ||
339 | .p_count = 1, | ||
340 | .p_statidx = PMAP_SET, | ||
341 | .p_name = "SET", | ||
342 | }, | ||
343 | [PMAP_UNSET] = { | ||
344 | .p_proc = PMAP_UNSET, | ||
345 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | ||
346 | .p_decode = (kxdrproc_t) xdr_decode_bool, | ||
347 | .p_bufsiz = 4, | ||
348 | .p_count = 1, | ||
349 | .p_statidx = PMAP_UNSET, | ||
350 | .p_name = "UNSET", | ||
351 | }, | ||
352 | [PMAP_GETPORT] = { | ||
353 | .p_proc = PMAP_GETPORT, | ||
354 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | ||
355 | .p_decode = (kxdrproc_t) xdr_decode_port, | ||
356 | .p_bufsiz = 4, | ||
357 | .p_count = 1, | ||
358 | .p_statidx = PMAP_GETPORT, | ||
359 | .p_name = "GETPORT", | ||
360 | }, | ||
361 | }; | ||
362 | |||
363 | static struct rpc_version pmap_version2 = { | ||
364 | .number = 2, | ||
365 | .nrprocs = 4, | ||
366 | .procs = pmap_procedures | ||
367 | }; | ||
368 | |||
369 | static struct rpc_version * pmap_version[] = { | ||
370 | NULL, | ||
371 | NULL, | ||
372 | &pmap_version2 | ||
373 | }; | ||
374 | |||
375 | static struct rpc_stat pmap_stats; | ||
376 | |||
377 | static struct rpc_program pmap_program = { | ||
378 | .name = "portmap", | ||
379 | .number = RPC_PMAP_PROGRAM, | ||
380 | .nrvers = ARRAY_SIZE(pmap_version), | ||
381 | .version = pmap_version, | ||
382 | .stats = &pmap_stats, | ||
383 | }; | ||
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c new file mode 100644 index 000000000000..6c7aa8a1f0c6 --- /dev/null +++ b/net/sunrpc/rpcb_clnt.c | |||
@@ -0,0 +1,625 @@ | |||
1 | /* | ||
2 | * In-kernel rpcbind client supporting versions 2, 3, and 4 of the rpcbind | ||
3 | * protocol | ||
4 | * | ||
5 | * Based on RFC 1833: "Binding Protocols for ONC RPC Version 2" and | ||
6 | * RFC 3530: "Network File System (NFS) version 4 Protocol" | ||
7 | * | ||
8 | * Original: Gilles Quillard, Bull Open Source, 2005 <gilles.quillard@bull.net> | ||
9 | * Updated: Chuck Lever, Oracle Corporation, 2007 <chuck.lever@oracle.com> | ||
10 | * | ||
11 | * Descended from net/sunrpc/pmap_clnt.c, | ||
12 | * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> | ||
13 | */ | ||
14 | |||
15 | #include <linux/types.h> | ||
16 | #include <linux/socket.h> | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/errno.h> | ||
19 | |||
20 | #include <linux/sunrpc/clnt.h> | ||
21 | #include <linux/sunrpc/sched.h> | ||
22 | |||
23 | #ifdef RPC_DEBUG | ||
24 | # define RPCDBG_FACILITY RPCDBG_BIND | ||
25 | #endif | ||
26 | |||
27 | #define RPCBIND_PROGRAM (100000u) | ||
28 | #define RPCBIND_PORT (111u) | ||
29 | |||
30 | enum { | ||
31 | RPCBPROC_NULL, | ||
32 | RPCBPROC_SET, | ||
33 | RPCBPROC_UNSET, | ||
34 | RPCBPROC_GETPORT, | ||
35 | RPCBPROC_GETADDR = 3, /* alias for GETPORT */ | ||
36 | RPCBPROC_DUMP, | ||
37 | RPCBPROC_CALLIT, | ||
38 | RPCBPROC_BCAST = 5, /* alias for CALLIT */ | ||
39 | RPCBPROC_GETTIME, | ||
40 | RPCBPROC_UADDR2TADDR, | ||
41 | RPCBPROC_TADDR2UADDR, | ||
42 | RPCBPROC_GETVERSADDR, | ||
43 | RPCBPROC_INDIRECT, | ||
44 | RPCBPROC_GETADDRLIST, | ||
45 | RPCBPROC_GETSTAT, | ||
46 | }; | ||
47 | |||
48 | #define RPCB_HIGHPROC_2 RPCBPROC_CALLIT | ||
49 | #define RPCB_HIGHPROC_3 RPCBPROC_TADDR2UADDR | ||
50 | #define RPCB_HIGHPROC_4 RPCBPROC_GETSTAT | ||
51 | |||
52 | /* | ||
53 | * r_addr | ||
54 | * | ||
55 | * Quoting RFC 3530, section 2.2: | ||
56 | * | ||
57 | * For TCP over IPv4 and for UDP over IPv4, the format of r_addr is the | ||
58 | * US-ASCII string: | ||
59 | * | ||
60 | * h1.h2.h3.h4.p1.p2 | ||
61 | * | ||
62 | * The prefix, "h1.h2.h3.h4", is the standard textual form for | ||
63 | * representing an IPv4 address, which is always four octets long. | ||
64 | * Assuming big-endian ordering, h1, h2, h3, and h4, are respectively, | ||
65 | * the first through fourth octets each converted to ASCII-decimal. | ||
66 | * Assuming big-endian ordering, p1 and p2 are, respectively, the first | ||
67 | * and second octets each converted to ASCII-decimal. For example, if a | ||
68 | * host, in big-endian order, has an address of 0x0A010307 and there is | ||
69 | * a service listening on, in big endian order, port 0x020F (decimal | ||
70 | * 527), then the complete universal address is "10.1.3.7.2.15". | ||
71 | * | ||
72 | * ... | ||
73 | * | ||
74 | * For TCP over IPv6 and for UDP over IPv6, the format of r_addr is the | ||
75 | * US-ASCII string: | ||
76 | * | ||
77 | * x1:x2:x3:x4:x5:x6:x7:x8.p1.p2 | ||
78 | * | ||
79 | * The suffix "p1.p2" is the service port, and is computed the same way | ||
80 | * as with universal addresses for TCP and UDP over IPv4. The prefix, | ||
81 | * "x1:x2:x3:x4:x5:x6:x7:x8", is the standard textual form for | ||
82 | * representing an IPv6 address as defined in Section 2.2 of [RFC2373]. | ||
83 | * Additionally, the two alternative forms specified in Section 2.2 of | ||
84 | * [RFC2373] are also acceptable. | ||
85 | * | ||
86 | * XXX: Currently this implementation does not explicitly convert the | ||
87 | * stored address to US-ASCII on non-ASCII systems. | ||
88 | */ | ||
89 | #define RPCB_MAXADDRLEN (128u) | ||
90 | |||
91 | /* | ||
92 | * r_netid | ||
93 | * | ||
94 | * Quoting RFC 3530, section 2.2: | ||
95 | * | ||
96 | * For TCP over IPv4 the value of r_netid is the string "tcp". For UDP | ||
97 | * over IPv4 the value of r_netid is the string "udp". | ||
98 | * | ||
99 | * ... | ||
100 | * | ||
101 | * For TCP over IPv6 the value of r_netid is the string "tcp6". For UDP | ||
102 | * over IPv6 the value of r_netid is the string "udp6". | ||
103 | */ | ||
104 | #define RPCB_NETID_UDP "\165\144\160" /* "udp" */ | ||
105 | #define RPCB_NETID_TCP "\164\143\160" /* "tcp" */ | ||
106 | #define RPCB_NETID_UDP6 "\165\144\160\066" /* "udp6" */ | ||
107 | #define RPCB_NETID_TCP6 "\164\143\160\066" /* "tcp6" */ | ||
108 | |||
109 | #define RPCB_MAXNETIDLEN (4u) | ||
110 | |||
111 | /* | ||
112 | * r_owner | ||
113 | * | ||
114 | * The "owner" is allowed to unset a service in the rpcbind database. | ||
115 | * We always use the following (arbitrary) fixed string. | ||
116 | */ | ||
117 | #define RPCB_OWNER_STRING "rpcb" | ||
118 | #define RPCB_MAXOWNERLEN sizeof(RPCB_OWNER_STRING) | ||
119 | |||
120 | static void rpcb_getport_done(struct rpc_task *, void *); | ||
121 | extern struct rpc_program rpcb_program; | ||
122 | |||
123 | struct rpcbind_args { | ||
124 | struct rpc_xprt * r_xprt; | ||
125 | |||
126 | u32 r_prog; | ||
127 | u32 r_vers; | ||
128 | u32 r_prot; | ||
129 | unsigned short r_port; | ||
130 | char * r_netid; | ||
131 | char r_addr[RPCB_MAXADDRLEN]; | ||
132 | char * r_owner; | ||
133 | }; | ||
134 | |||
135 | static struct rpc_procinfo rpcb_procedures2[]; | ||
136 | static struct rpc_procinfo rpcb_procedures3[]; | ||
137 | |||
138 | static struct rpcb_info { | ||
139 | int rpc_vers; | ||
140 | struct rpc_procinfo * rpc_proc; | ||
141 | } rpcb_next_version[]; | ||
142 | |||
143 | static void rpcb_getport_prepare(struct rpc_task *task, void *calldata) | ||
144 | { | ||
145 | struct rpcbind_args *map = calldata; | ||
146 | struct rpc_xprt *xprt = map->r_xprt; | ||
147 | struct rpc_message msg = { | ||
148 | .rpc_proc = rpcb_next_version[xprt->bind_index].rpc_proc, | ||
149 | .rpc_argp = map, | ||
150 | .rpc_resp = &map->r_port, | ||
151 | }; | ||
152 | |||
153 | rpc_call_setup(task, &msg, 0); | ||
154 | } | ||
155 | |||
156 | static void rpcb_map_release(void *data) | ||
157 | { | ||
158 | struct rpcbind_args *map = data; | ||
159 | |||
160 | xprt_put(map->r_xprt); | ||
161 | kfree(map); | ||
162 | } | ||
163 | |||
164 | static const struct rpc_call_ops rpcb_getport_ops = { | ||
165 | .rpc_call_prepare = rpcb_getport_prepare, | ||
166 | .rpc_call_done = rpcb_getport_done, | ||
167 | .rpc_release = rpcb_map_release, | ||
168 | }; | ||
169 | |||
170 | static void rpcb_wake_rpcbind_waiters(struct rpc_xprt *xprt, int status) | ||
171 | { | ||
172 | xprt_clear_binding(xprt); | ||
173 | rpc_wake_up_status(&xprt->binding, status); | ||
174 | } | ||
175 | |||
176 | static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr, | ||
177 | int proto, int version, int privileged) | ||
178 | { | ||
179 | struct rpc_create_args args = { | ||
180 | .protocol = proto, | ||
181 | .address = srvaddr, | ||
182 | .addrsize = sizeof(struct sockaddr_in), | ||
183 | .servername = hostname, | ||
184 | .program = &rpcb_program, | ||
185 | .version = version, | ||
186 | .authflavor = RPC_AUTH_UNIX, | ||
187 | .flags = (RPC_CLNT_CREATE_ONESHOT | | ||
188 | RPC_CLNT_CREATE_NOPING), | ||
189 | }; | ||
190 | |||
191 | ((struct sockaddr_in *)srvaddr)->sin_port = htons(RPCBIND_PORT); | ||
192 | if (!privileged) | ||
193 | args.flags |= RPC_CLNT_CREATE_NONPRIVPORT; | ||
194 | return rpc_create(&args); | ||
195 | } | ||
196 | |||
197 | /** | ||
198 | * rpcb_register - set or unset a port registration with the local rpcbind svc | ||
199 | * @prog: RPC program number to bind | ||
200 | * @vers: RPC version number to bind | ||
201 | * @prot: transport protocol to use to make this request | ||
202 | * @port: port value to register | ||
203 | * @okay: result code | ||
204 | * | ||
205 | * port == 0 means unregister, port != 0 means register. | ||
206 | * | ||
207 | * This routine supports only rpcbind version 2. | ||
208 | */ | ||
209 | int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay) | ||
210 | { | ||
211 | struct sockaddr_in sin = { | ||
212 | .sin_family = AF_INET, | ||
213 | .sin_addr.s_addr = htonl(INADDR_LOOPBACK), | ||
214 | }; | ||
215 | struct rpcbind_args map = { | ||
216 | .r_prog = prog, | ||
217 | .r_vers = vers, | ||
218 | .r_prot = prot, | ||
219 | .r_port = port, | ||
220 | }; | ||
221 | struct rpc_message msg = { | ||
222 | .rpc_proc = &rpcb_procedures2[port ? | ||
223 | RPCBPROC_SET : RPCBPROC_UNSET], | ||
224 | .rpc_argp = &map, | ||
225 | .rpc_resp = okay, | ||
226 | }; | ||
227 | struct rpc_clnt *rpcb_clnt; | ||
228 | int error = 0; | ||
229 | |||
230 | dprintk("RPC: %sregistering (%u, %u, %d, %u) with local " | ||
231 | "rpcbind\n", (port ? "" : "un"), | ||
232 | prog, vers, prot, port); | ||
233 | |||
234 | rpcb_clnt = rpcb_create("localhost", (struct sockaddr *) &sin, | ||
235 | IPPROTO_UDP, 2, 1); | ||
236 | if (IS_ERR(rpcb_clnt)) | ||
237 | return PTR_ERR(rpcb_clnt); | ||
238 | |||
239 | error = rpc_call_sync(rpcb_clnt, &msg, 0); | ||
240 | |||
241 | if (error < 0) | ||
242 | printk(KERN_WARNING "RPC: failed to contact local rpcbind " | ||
243 | "server (errno %d).\n", -error); | ||
244 | dprintk("RPC: registration status %d/%d\n", error, *okay); | ||
245 | |||
246 | return error; | ||
247 | } | ||
248 | |||
249 | #ifdef CONFIG_ROOT_NFS | ||
250 | /** | ||
251 | * rpcb_getport_external - obtain the port for an RPC service on a given host | ||
252 | * @sin: address of remote peer | ||
253 | * @prog: RPC program number to bind | ||
254 | * @vers: RPC version number to bind | ||
255 | * @prot: transport protocol to use to make this request | ||
256 | * | ||
257 | * Called from outside the RPC client in a synchronous task context. | ||
258 | * | ||
259 | * For now, this supports only version 2 queries, but is used only by | ||
260 | * mount_clnt for NFS_ROOT. | ||
261 | */ | ||
262 | int rpcb_getport_external(struct sockaddr_in *sin, __u32 prog, | ||
263 | __u32 vers, int prot) | ||
264 | { | ||
265 | struct rpcbind_args map = { | ||
266 | .r_prog = prog, | ||
267 | .r_vers = vers, | ||
268 | .r_prot = prot, | ||
269 | .r_port = 0, | ||
270 | }; | ||
271 | struct rpc_message msg = { | ||
272 | .rpc_proc = &rpcb_procedures2[RPCBPROC_GETPORT], | ||
273 | .rpc_argp = &map, | ||
274 | .rpc_resp = &map.r_port, | ||
275 | }; | ||
276 | struct rpc_clnt *rpcb_clnt; | ||
277 | char hostname[40]; | ||
278 | int status; | ||
279 | |||
280 | dprintk("RPC: rpcb_getport_external(%u.%u.%u.%u, %u, %u, %d)\n", | ||
281 | NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); | ||
282 | |||
283 | sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr)); | ||
284 | rpcb_clnt = rpcb_create(hostname, (struct sockaddr *)sin, prot, 2, 0); | ||
285 | if (IS_ERR(rpcb_clnt)) | ||
286 | return PTR_ERR(rpcb_clnt); | ||
287 | |||
288 | status = rpc_call_sync(rpcb_clnt, &msg, 0); | ||
289 | |||
290 | if (status >= 0) { | ||
291 | if (map.r_port != 0) | ||
292 | return map.r_port; | ||
293 | status = -EACCES; | ||
294 | } | ||
295 | return status; | ||
296 | } | ||
297 | #endif | ||
298 | |||
299 | /** | ||
300 | * rpcb_getport - obtain the port for a given RPC service on a given host | ||
301 | * @task: task that is waiting for portmapper request | ||
302 | * | ||
303 | * This one can be called for an ongoing RPC request, and can be used in | ||
304 | * an async (rpciod) context. | ||
305 | */ | ||
306 | void rpcb_getport(struct rpc_task *task) | ||
307 | { | ||
308 | struct rpc_clnt *clnt = task->tk_client; | ||
309 | int bind_version; | ||
310 | struct rpc_xprt *xprt = task->tk_xprt; | ||
311 | struct rpc_clnt *rpcb_clnt; | ||
312 | static struct rpcbind_args *map; | ||
313 | struct rpc_task *child; | ||
314 | struct sockaddr addr; | ||
315 | int status; | ||
316 | |||
317 | dprintk("RPC: %5u rpcb_getport(%s, %u, %u, %d)\n", | ||
318 | task->tk_pid, clnt->cl_server, | ||
319 | clnt->cl_prog, clnt->cl_vers, xprt->prot); | ||
320 | |||
321 | /* Autobind on cloned rpc clients is discouraged */ | ||
322 | BUG_ON(clnt->cl_parent != clnt); | ||
323 | |||
324 | if (xprt_test_and_set_binding(xprt)) { | ||
325 | status = -EACCES; /* tell caller to check again */ | ||
326 | dprintk("RPC: %5u rpcb_getport waiting for another binder\n", | ||
327 | task->tk_pid); | ||
328 | goto bailout_nowake; | ||
329 | } | ||
330 | |||
331 | /* Put self on queue before sending rpcbind request, in case | ||
332 | * rpcb_getport_done completes before we return from rpc_run_task */ | ||
333 | rpc_sleep_on(&xprt->binding, task, NULL, NULL); | ||
334 | |||
335 | /* Someone else may have bound if we slept */ | ||
336 | if (xprt_bound(xprt)) { | ||
337 | status = 0; | ||
338 | dprintk("RPC: %5u rpcb_getport already bound\n", task->tk_pid); | ||
339 | goto bailout_nofree; | ||
340 | } | ||
341 | |||
342 | if (rpcb_next_version[xprt->bind_index].rpc_proc == NULL) { | ||
343 | xprt->bind_index = 0; | ||
344 | status = -EACCES; /* tell caller to try again later */ | ||
345 | dprintk("RPC: %5u rpcb_getport no more getport versions " | ||
346 | "available\n", task->tk_pid); | ||
347 | goto bailout_nofree; | ||
348 | } | ||
349 | bind_version = rpcb_next_version[xprt->bind_index].rpc_vers; | ||
350 | |||
351 | dprintk("RPC: %5u rpcb_getport trying rpcbind version %u\n", | ||
352 | task->tk_pid, bind_version); | ||
353 | |||
354 | map = kzalloc(sizeof(struct rpcbind_args), GFP_ATOMIC); | ||
355 | if (!map) { | ||
356 | status = -ENOMEM; | ||
357 | dprintk("RPC: %5u rpcb_getport no memory available\n", | ||
358 | task->tk_pid); | ||
359 | goto bailout_nofree; | ||
360 | } | ||
361 | map->r_prog = clnt->cl_prog; | ||
362 | map->r_vers = clnt->cl_vers; | ||
363 | map->r_prot = xprt->prot; | ||
364 | map->r_port = 0; | ||
365 | map->r_xprt = xprt_get(xprt); | ||
366 | map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCB_NETID_TCP : | ||
367 | RPCB_NETID_UDP; | ||
368 | memcpy(&map->r_addr, rpc_peeraddr2str(clnt, RPC_DISPLAY_ADDR), | ||
369 | sizeof(map->r_addr)); | ||
370 | map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */ | ||
371 | |||
372 | rpc_peeraddr(clnt, (void *)&addr, sizeof(addr)); | ||
373 | rpcb_clnt = rpcb_create(clnt->cl_server, &addr, xprt->prot, bind_version, 0); | ||
374 | if (IS_ERR(rpcb_clnt)) { | ||
375 | status = PTR_ERR(rpcb_clnt); | ||
376 | dprintk("RPC: %5u rpcb_getport rpcb_create failed, error %ld\n", | ||
377 | task->tk_pid, PTR_ERR(rpcb_clnt)); | ||
378 | goto bailout; | ||
379 | } | ||
380 | |||
381 | child = rpc_run_task(rpcb_clnt, RPC_TASK_ASYNC, &rpcb_getport_ops, map); | ||
382 | if (IS_ERR(child)) { | ||
383 | status = -EIO; | ||
384 | dprintk("RPC: %5u rpcb_getport rpc_run_task failed\n", | ||
385 | task->tk_pid); | ||
386 | goto bailout_nofree; | ||
387 | } | ||
388 | rpc_put_task(child); | ||
389 | |||
390 | task->tk_xprt->stat.bind_count++; | ||
391 | return; | ||
392 | |||
393 | bailout: | ||
394 | kfree(map); | ||
395 | xprt_put(xprt); | ||
396 | bailout_nofree: | ||
397 | rpcb_wake_rpcbind_waiters(xprt, status); | ||
398 | bailout_nowake: | ||
399 | task->tk_status = status; | ||
400 | } | ||
401 | |||
402 | /* | ||
403 | * Rpcbind child task calls this callback via tk_exit. | ||
404 | */ | ||
405 | static void rpcb_getport_done(struct rpc_task *child, void *data) | ||
406 | { | ||
407 | struct rpcbind_args *map = data; | ||
408 | struct rpc_xprt *xprt = map->r_xprt; | ||
409 | int status = child->tk_status; | ||
410 | |||
411 | /* rpcbind server doesn't support this rpcbind protocol version */ | ||
412 | if (status == -EPROTONOSUPPORT) | ||
413 | xprt->bind_index++; | ||
414 | |||
415 | if (status < 0) { | ||
416 | /* rpcbind server not available on remote host? */ | ||
417 | xprt->ops->set_port(xprt, 0); | ||
418 | } else if (map->r_port == 0) { | ||
419 | /* Requested RPC service wasn't registered on remote host */ | ||
420 | xprt->ops->set_port(xprt, 0); | ||
421 | status = -EACCES; | ||
422 | } else { | ||
423 | /* Succeeded */ | ||
424 | xprt->ops->set_port(xprt, map->r_port); | ||
425 | xprt_set_bound(xprt); | ||
426 | status = 0; | ||
427 | } | ||
428 | |||
429 | dprintk("RPC: %5u rpcb_getport_done(status %d, port %u)\n", | ||
430 | child->tk_pid, status, map->r_port); | ||
431 | |||
432 | rpcb_wake_rpcbind_waiters(xprt, status); | ||
433 | } | ||
434 | |||
435 | static int rpcb_encode_mapping(struct rpc_rqst *req, __be32 *p, | ||
436 | struct rpcbind_args *rpcb) | ||
437 | { | ||
438 | dprintk("RPC: rpcb_encode_mapping(%u, %u, %d, %u)\n", | ||
439 | rpcb->r_prog, rpcb->r_vers, rpcb->r_prot, rpcb->r_port); | ||
440 | *p++ = htonl(rpcb->r_prog); | ||
441 | *p++ = htonl(rpcb->r_vers); | ||
442 | *p++ = htonl(rpcb->r_prot); | ||
443 | *p++ = htonl(rpcb->r_port); | ||
444 | |||
445 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
446 | return 0; | ||
447 | } | ||
448 | |||
449 | static int rpcb_decode_getport(struct rpc_rqst *req, __be32 *p, | ||
450 | unsigned short *portp) | ||
451 | { | ||
452 | *portp = (unsigned short) ntohl(*p++); | ||
453 | dprintk("RPC: rpcb_decode_getport result %u\n", | ||
454 | *portp); | ||
455 | return 0; | ||
456 | } | ||
457 | |||
458 | static int rpcb_decode_set(struct rpc_rqst *req, __be32 *p, | ||
459 | unsigned int *boolp) | ||
460 | { | ||
461 | *boolp = (unsigned int) ntohl(*p++); | ||
462 | dprintk("RPC: rpcb_decode_set result %u\n", | ||
463 | *boolp); | ||
464 | return 0; | ||
465 | } | ||
466 | |||
467 | static int rpcb_encode_getaddr(struct rpc_rqst *req, __be32 *p, | ||
468 | struct rpcbind_args *rpcb) | ||
469 | { | ||
470 | dprintk("RPC: rpcb_encode_getaddr(%u, %u, %s)\n", | ||
471 | rpcb->r_prog, rpcb->r_vers, rpcb->r_addr); | ||
472 | *p++ = htonl(rpcb->r_prog); | ||
473 | *p++ = htonl(rpcb->r_vers); | ||
474 | |||
475 | p = xdr_encode_string(p, rpcb->r_netid); | ||
476 | p = xdr_encode_string(p, rpcb->r_addr); | ||
477 | p = xdr_encode_string(p, rpcb->r_owner); | ||
478 | |||
479 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
480 | |||
481 | return 0; | ||
482 | } | ||
483 | |||
484 | static int rpcb_decode_getaddr(struct rpc_rqst *req, __be32 *p, | ||
485 | unsigned short *portp) | ||
486 | { | ||
487 | char *addr; | ||
488 | int addr_len, c, i, f, first, val; | ||
489 | |||
490 | *portp = 0; | ||
491 | addr_len = (unsigned int) ntohl(*p++); | ||
492 | if (addr_len > RPCB_MAXADDRLEN) /* sanity */ | ||
493 | return -EINVAL; | ||
494 | |||
495 | dprintk("RPC: rpcb_decode_getaddr returned string: '%s'\n", | ||
496 | (char *) p); | ||
497 | |||
498 | addr = (char *)p; | ||
499 | val = 0; | ||
500 | first = 1; | ||
501 | f = 1; | ||
502 | for (i = addr_len - 1; i > 0; i--) { | ||
503 | c = addr[i]; | ||
504 | if (c >= '0' && c <= '9') { | ||
505 | val += (c - '0') * f; | ||
506 | f *= 10; | ||
507 | } else if (c == '.') { | ||
508 | if (first) { | ||
509 | *portp = val; | ||
510 | val = first = 0; | ||
511 | f = 1; | ||
512 | } else { | ||
513 | *portp |= (val << 8); | ||
514 | break; | ||
515 | } | ||
516 | } | ||
517 | } | ||
518 | |||
519 | dprintk("RPC: rpcb_decode_getaddr port=%u\n", *portp); | ||
520 | return 0; | ||
521 | } | ||
522 | |||
523 | #define RPCB_program_sz (1u) | ||
524 | #define RPCB_version_sz (1u) | ||
525 | #define RPCB_protocol_sz (1u) | ||
526 | #define RPCB_port_sz (1u) | ||
527 | #define RPCB_boolean_sz (1u) | ||
528 | |||
529 | #define RPCB_netid_sz (1+XDR_QUADLEN(RPCB_MAXNETIDLEN)) | ||
530 | #define RPCB_addr_sz (1+XDR_QUADLEN(RPCB_MAXADDRLEN)) | ||
531 | #define RPCB_ownerstring_sz (1+XDR_QUADLEN(RPCB_MAXOWNERLEN)) | ||
532 | |||
533 | #define RPCB_mappingargs_sz RPCB_program_sz+RPCB_version_sz+ \ | ||
534 | RPCB_protocol_sz+RPCB_port_sz | ||
535 | #define RPCB_getaddrargs_sz RPCB_program_sz+RPCB_version_sz+ \ | ||
536 | RPCB_netid_sz+RPCB_addr_sz+ \ | ||
537 | RPCB_ownerstring_sz | ||
538 | |||
539 | #define RPCB_setres_sz RPCB_boolean_sz | ||
540 | #define RPCB_getportres_sz RPCB_port_sz | ||
541 | |||
542 | /* | ||
543 | * Note that RFC 1833 does not put any size restrictions on the | ||
544 | * address string returned by the remote rpcbind database. | ||
545 | */ | ||
546 | #define RPCB_getaddrres_sz RPCB_addr_sz | ||
547 | |||
548 | #define PROC(proc, argtype, restype) \ | ||
549 | [RPCBPROC_##proc] = { \ | ||
550 | .p_proc = RPCBPROC_##proc, \ | ||
551 | .p_encode = (kxdrproc_t) rpcb_encode_##argtype, \ | ||
552 | .p_decode = (kxdrproc_t) rpcb_decode_##restype, \ | ||
553 | .p_arglen = RPCB_##argtype##args_sz, \ | ||
554 | .p_replen = RPCB_##restype##res_sz, \ | ||
555 | .p_statidx = RPCBPROC_##proc, \ | ||
556 | .p_timer = 0, \ | ||
557 | .p_name = #proc, \ | ||
558 | } | ||
559 | |||
560 | /* | ||
561 | * Not all rpcbind procedures described in RFC 1833 are implemented | ||
562 | * since the Linux kernel RPC code requires only these. | ||
563 | */ | ||
564 | static struct rpc_procinfo rpcb_procedures2[] = { | ||
565 | PROC(SET, mapping, set), | ||
566 | PROC(UNSET, mapping, set), | ||
567 | PROC(GETADDR, mapping, getport), | ||
568 | }; | ||
569 | |||
570 | static struct rpc_procinfo rpcb_procedures3[] = { | ||
571 | PROC(SET, mapping, set), | ||
572 | PROC(UNSET, mapping, set), | ||
573 | PROC(GETADDR, getaddr, getaddr), | ||
574 | }; | ||
575 | |||
576 | static struct rpc_procinfo rpcb_procedures4[] = { | ||
577 | PROC(SET, mapping, set), | ||
578 | PROC(UNSET, mapping, set), | ||
579 | PROC(GETVERSADDR, getaddr, getaddr), | ||
580 | }; | ||
581 | |||
582 | static struct rpcb_info rpcb_next_version[] = { | ||
583 | #ifdef CONFIG_SUNRPC_BIND34 | ||
584 | { 4, &rpcb_procedures4[RPCBPROC_GETVERSADDR] }, | ||
585 | { 3, &rpcb_procedures3[RPCBPROC_GETADDR] }, | ||
586 | #endif | ||
587 | { 2, &rpcb_procedures2[RPCBPROC_GETPORT] }, | ||
588 | { 0, NULL }, | ||
589 | }; | ||
590 | |||
591 | static struct rpc_version rpcb_version2 = { | ||
592 | .number = 2, | ||
593 | .nrprocs = RPCB_HIGHPROC_2, | ||
594 | .procs = rpcb_procedures2 | ||
595 | }; | ||
596 | |||
597 | static struct rpc_version rpcb_version3 = { | ||
598 | .number = 3, | ||
599 | .nrprocs = RPCB_HIGHPROC_3, | ||
600 | .procs = rpcb_procedures3 | ||
601 | }; | ||
602 | |||
603 | static struct rpc_version rpcb_version4 = { | ||
604 | .number = 4, | ||
605 | .nrprocs = RPCB_HIGHPROC_4, | ||
606 | .procs = rpcb_procedures4 | ||
607 | }; | ||
608 | |||
609 | static struct rpc_version *rpcb_version[] = { | ||
610 | NULL, | ||
611 | NULL, | ||
612 | &rpcb_version2, | ||
613 | &rpcb_version3, | ||
614 | &rpcb_version4 | ||
615 | }; | ||
616 | |||
617 | static struct rpc_stat rpcb_stats; | ||
618 | |||
619 | struct rpc_program rpcb_program = { | ||
620 | .name = "rpcbind", | ||
621 | .number = RPCBIND_PROGRAM, | ||
622 | .nrvers = ARRAY_SIZE(rpcb_version), | ||
623 | .version = rpcb_version, | ||
624 | .stats = &rpcb_stats, | ||
625 | }; | ||
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 6d87320074b1..4a53e94f8134 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c | |||
@@ -741,50 +741,53 @@ static void rpc_async_schedule(struct work_struct *work) | |||
741 | * @task: RPC task that will use this buffer | 741 | * @task: RPC task that will use this buffer |
742 | * @size: requested byte size | 742 | * @size: requested byte size |
743 | * | 743 | * |
744 | * We try to ensure that some NFS reads and writes can always proceed | 744 | * To prevent rpciod from hanging, this allocator never sleeps, |
745 | * by using a mempool when allocating 'small' buffers. | 745 | * returning NULL if the request cannot be serviced immediately. |
746 | * The caller can arrange to sleep in a way that is safe for rpciod. | ||
747 | * | ||
748 | * Most requests are 'small' (under 2KiB) and can be serviced from a | ||
749 | * mempool, ensuring that NFS reads and writes can always proceed, | ||
750 | * and that there is good locality of reference for these buffers. | ||
751 | * | ||
746 | * In order to avoid memory starvation triggering more writebacks of | 752 | * In order to avoid memory starvation triggering more writebacks of |
747 | * NFS requests, we use GFP_NOFS rather than GFP_KERNEL. | 753 | * NFS requests, we avoid using GFP_KERNEL. |
748 | */ | 754 | */ |
749 | void * rpc_malloc(struct rpc_task *task, size_t size) | 755 | void *rpc_malloc(struct rpc_task *task, size_t size) |
750 | { | 756 | { |
751 | struct rpc_rqst *req = task->tk_rqstp; | 757 | size_t *buf; |
752 | gfp_t gfp; | 758 | gfp_t gfp = RPC_IS_SWAPPER(task) ? GFP_ATOMIC : GFP_NOWAIT; |
753 | 759 | ||
754 | if (task->tk_flags & RPC_TASK_SWAPPER) | 760 | size += sizeof(size_t); |
755 | gfp = GFP_ATOMIC; | 761 | if (size <= RPC_BUFFER_MAXSIZE) |
762 | buf = mempool_alloc(rpc_buffer_mempool, gfp); | ||
756 | else | 763 | else |
757 | gfp = GFP_NOFS; | 764 | buf = kmalloc(size, gfp); |
758 | 765 | *buf = size; | |
759 | if (size > RPC_BUFFER_MAXSIZE) { | 766 | dprintk("RPC: %5u allocated buffer of size %u at %p\n", |
760 | req->rq_buffer = kmalloc(size, gfp); | 767 | task->tk_pid, size, buf); |
761 | if (req->rq_buffer) | 768 | return (void *) ++buf; |
762 | req->rq_bufsize = size; | ||
763 | } else { | ||
764 | req->rq_buffer = mempool_alloc(rpc_buffer_mempool, gfp); | ||
765 | if (req->rq_buffer) | ||
766 | req->rq_bufsize = RPC_BUFFER_MAXSIZE; | ||
767 | } | ||
768 | return req->rq_buffer; | ||
769 | } | 769 | } |
770 | 770 | ||
771 | /** | 771 | /** |
772 | * rpc_free - free buffer allocated via rpc_malloc | 772 | * rpc_free - free buffer allocated via rpc_malloc |
773 | * @task: RPC task with a buffer to be freed | 773 | * @buffer: buffer to free |
774 | * | 774 | * |
775 | */ | 775 | */ |
776 | void rpc_free(struct rpc_task *task) | 776 | void rpc_free(void *buffer) |
777 | { | 777 | { |
778 | struct rpc_rqst *req = task->tk_rqstp; | 778 | size_t size, *buf = (size_t *) buffer; |
779 | 779 | ||
780 | if (req->rq_buffer) { | 780 | if (!buffer) |
781 | if (req->rq_bufsize == RPC_BUFFER_MAXSIZE) | 781 | return; |
782 | mempool_free(req->rq_buffer, rpc_buffer_mempool); | 782 | size = *buf; |
783 | else | 783 | buf--; |
784 | kfree(req->rq_buffer); | 784 | |
785 | req->rq_buffer = NULL; | 785 | dprintk("RPC: freeing buffer of size %u at %p\n", |
786 | req->rq_bufsize = 0; | 786 | size, buf); |
787 | } | 787 | if (size <= RPC_BUFFER_MAXSIZE) |
788 | mempool_free(buf, rpc_buffer_mempool); | ||
789 | else | ||
790 | kfree(buf); | ||
788 | } | 791 | } |
789 | 792 | ||
790 | /* | 793 | /* |
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index b4db53ff1435..b7503c103ae8 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -757,7 +757,7 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port) | |||
757 | if (progp->pg_vers[i]->vs_hidden) | 757 | if (progp->pg_vers[i]->vs_hidden) |
758 | continue; | 758 | continue; |
759 | 759 | ||
760 | error = rpc_register(progp->pg_prog, i, proto, port, &dummy); | 760 | error = rpcb_register(progp->pg_prog, i, proto, port, &dummy); |
761 | if (error < 0) | 761 | if (error < 0) |
762 | break; | 762 | break; |
763 | if (port && !dummy) { | 763 | if (port && !dummy) { |
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 456a14510308..5b05b73e4c1d 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -823,7 +823,6 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt) | |||
823 | req->rq_task = task; | 823 | req->rq_task = task; |
824 | req->rq_xprt = xprt; | 824 | req->rq_xprt = xprt; |
825 | req->rq_buffer = NULL; | 825 | req->rq_buffer = NULL; |
826 | req->rq_bufsize = 0; | ||
827 | req->rq_xid = xprt_alloc_xid(xprt); | 826 | req->rq_xid = xprt_alloc_xid(xprt); |
828 | req->rq_release_snd_buf = NULL; | 827 | req->rq_release_snd_buf = NULL; |
829 | xprt_reset_majortimeo(req); | 828 | xprt_reset_majortimeo(req); |
@@ -855,7 +854,7 @@ void xprt_release(struct rpc_task *task) | |||
855 | mod_timer(&xprt->timer, | 854 | mod_timer(&xprt->timer, |
856 | xprt->last_used + xprt->idle_timeout); | 855 | xprt->last_used + xprt->idle_timeout); |
857 | spin_unlock_bh(&xprt->transport_lock); | 856 | spin_unlock_bh(&xprt->transport_lock); |
858 | xprt->ops->buf_free(task); | 857 | xprt->ops->buf_free(req->rq_buffer); |
859 | task->tk_rqstp = NULL; | 858 | task->tk_rqstp = NULL; |
860 | if (req->rq_release_snd_buf) | 859 | if (req->rq_release_snd_buf) |
861 | req->rq_release_snd_buf(req); | 860 | req->rq_release_snd_buf(req); |
@@ -928,6 +927,7 @@ struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t si | |||
928 | xprt->timer.data = (unsigned long) xprt; | 927 | xprt->timer.data = (unsigned long) xprt; |
929 | xprt->last_used = jiffies; | 928 | xprt->last_used = jiffies; |
930 | xprt->cwnd = RPC_INITCWND; | 929 | xprt->cwnd = RPC_INITCWND; |
930 | xprt->bind_index = 0; | ||
931 | 931 | ||
932 | rpc_init_wait_queue(&xprt->binding, "xprt_binding"); | 932 | rpc_init_wait_queue(&xprt->binding, "xprt_binding"); |
933 | rpc_init_wait_queue(&xprt->pending, "xprt_pending"); | 933 | rpc_init_wait_queue(&xprt->pending, "xprt_pending"); |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index a5a32029e728..cc33c5880abb 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1476,7 +1476,7 @@ static struct rpc_xprt_ops xs_udp_ops = { | |||
1476 | .set_buffer_size = xs_udp_set_buffer_size, | 1476 | .set_buffer_size = xs_udp_set_buffer_size, |
1477 | .reserve_xprt = xprt_reserve_xprt_cong, | 1477 | .reserve_xprt = xprt_reserve_xprt_cong, |
1478 | .release_xprt = xprt_release_xprt_cong, | 1478 | .release_xprt = xprt_release_xprt_cong, |
1479 | .rpcbind = rpc_getport, | 1479 | .rpcbind = rpcb_getport, |
1480 | .set_port = xs_set_port, | 1480 | .set_port = xs_set_port, |
1481 | .connect = xs_connect, | 1481 | .connect = xs_connect, |
1482 | .buf_alloc = rpc_malloc, | 1482 | .buf_alloc = rpc_malloc, |
@@ -1493,7 +1493,7 @@ static struct rpc_xprt_ops xs_udp_ops = { | |||
1493 | static struct rpc_xprt_ops xs_tcp_ops = { | 1493 | static struct rpc_xprt_ops xs_tcp_ops = { |
1494 | .reserve_xprt = xprt_reserve_xprt, | 1494 | .reserve_xprt = xprt_reserve_xprt, |
1495 | .release_xprt = xs_tcp_release_xprt, | 1495 | .release_xprt = xs_tcp_release_xprt, |
1496 | .rpcbind = rpc_getport, | 1496 | .rpcbind = rpcb_getport, |
1497 | .set_port = xs_set_port, | 1497 | .set_port = xs_set_port, |
1498 | .connect = xs_connect, | 1498 | .connect = xs_connect, |
1499 | .buf_alloc = rpc_malloc, | 1499 | .buf_alloc = rpc_malloc, |