Deleted Added
sdiff udiff text old ( 178112 ) new ( 180025 )
full compact
clnt_rc.c (178112) clnt_rc.c (180025)
1/*-
2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
3 * Authors: Doug Rabson <dfr@rabson.org>
4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
3 * Authors: Doug Rabson <dfr@rabson.org>
4 * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/rpc/clnt_rc.c 178112 2008-04-11 10:34:59Z dfr $");
29__FBSDID("$FreeBSD: head/sys/rpc/clnt_rc.c 180025 2008-06-26 10:21:54Z dfr $");
30
31#include <sys/param.h>
32#include <sys/systm.h>
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/limits.h>
33#include <sys/lock.h>
34#include <sys/malloc.h>
35#include <sys/mbuf.h>
36#include <sys/mutex.h>
37#include <sys/pcpu.h>
38#include <sys/proc.h>
39#include <sys/socket.h>
40#include <sys/socketvar.h>
41#include <sys/time.h>
42#include <sys/uio.h>
43
44#include <rpc/rpc.h>
45#include <rpc/rpc_com.h>
46
34#include <sys/lock.h>
35#include <sys/malloc.h>
36#include <sys/mbuf.h>
37#include <sys/mutex.h>
38#include <sys/pcpu.h>
39#include <sys/proc.h>
40#include <sys/socket.h>
41#include <sys/socketvar.h>
42#include <sys/time.h>
43#include <sys/uio.h>
44
45#include <rpc/rpc.h>
46#include <rpc/rpc_com.h>
47
47static enum clnt_stat clnt_reconnect_call(CLIENT *, rpcproc_t,
48 xdrproc_t, void *, xdrproc_t, void *, struct timeval);
48static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
49 rpcproc_t, xdrproc_t, void *, xdrproc_t, void *, struct timeval);
49static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
50static bool_t clnt_reconnect_freeres(CLIENT *, xdrproc_t, void *);
51static void clnt_reconnect_abort(CLIENT *);
52static bool_t clnt_reconnect_control(CLIENT *, u_int, void *);
53static void clnt_reconnect_destroy(CLIENT *);
54
55static struct clnt_ops clnt_reconnect_ops = {
56 .cl_call = clnt_reconnect_call,
57 .cl_abort = clnt_reconnect_abort,
58 .cl_geterr = clnt_reconnect_geterr,
59 .cl_freeres = clnt_reconnect_freeres,
60 .cl_destroy = clnt_reconnect_destroy,
61 .cl_control = clnt_reconnect_control
62};
63
64struct rc_data {
50static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
51static bool_t clnt_reconnect_freeres(CLIENT *, xdrproc_t, void *);
52static void clnt_reconnect_abort(CLIENT *);
53static bool_t clnt_reconnect_control(CLIENT *, u_int, void *);
54static void clnt_reconnect_destroy(CLIENT *);
55
56static struct clnt_ops clnt_reconnect_ops = {
57 .cl_call = clnt_reconnect_call,
58 .cl_abort = clnt_reconnect_abort,
59 .cl_geterr = clnt_reconnect_geterr,
60 .cl_freeres = clnt_reconnect_freeres,
61 .cl_destroy = clnt_reconnect_destroy,
62 .cl_control = clnt_reconnect_control
63};
64
65struct rc_data {
66 struct mtx rc_lock;
65 struct sockaddr_storage rc_addr; /* server address */
66 struct netconfig* rc_nconf; /* network type */
67 rpcprog_t rc_prog; /* program number */
68 rpcvers_t rc_vers; /* version number */
69 size_t rc_sendsz;
70 size_t rc_recvsz;
71 struct timeval rc_timeout;
72 struct timeval rc_retry;
67 struct sockaddr_storage rc_addr; /* server address */
68 struct netconfig* rc_nconf; /* network type */
69 rpcprog_t rc_prog; /* program number */
70 rpcvers_t rc_vers; /* version number */
71 size_t rc_sendsz;
72 size_t rc_recvsz;
73 struct timeval rc_timeout;
74 struct timeval rc_retry;
75 int rc_retries;
73 const char *rc_waitchan;
74 int rc_intr;
76 const char *rc_waitchan;
77 int rc_intr;
78 int rc_connecting;
75 CLIENT* rc_client; /* underlying RPC client */
76};
77
78CLIENT *
79clnt_reconnect_create(
80 struct netconfig *nconf, /* network type */
81 struct sockaddr *svcaddr, /* servers address */
82 rpcprog_t program, /* program number */

--- 6 unchanged lines hidden (view full) ---

89
90 if (svcaddr == NULL) {
91 rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
92 return (NULL);
93 }
94
95 cl = mem_alloc(sizeof (CLIENT));
96 rc = mem_alloc(sizeof (*rc));
79 CLIENT* rc_client; /* underlying RPC client */
80};
81
82CLIENT *
83clnt_reconnect_create(
84 struct netconfig *nconf, /* network type */
85 struct sockaddr *svcaddr, /* servers address */
86 rpcprog_t program, /* program number */

--- 6 unchanged lines hidden (view full) ---

93
94 if (svcaddr == NULL) {
95 rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
96 return (NULL);
97 }
98
99 cl = mem_alloc(sizeof (CLIENT));
100 rc = mem_alloc(sizeof (*rc));
101 mtx_init(&rc->rc_lock, "rc->rc_lock", NULL, MTX_DEF);
97 (void) memcpy(&rc->rc_addr, svcaddr, (size_t)svcaddr->sa_len);
98 rc->rc_nconf = nconf;
99 rc->rc_prog = program;
100 rc->rc_vers = version;
101 rc->rc_sendsz = sendsz;
102 rc->rc_recvsz = recvsz;
103 rc->rc_timeout.tv_sec = -1;
104 rc->rc_timeout.tv_usec = -1;
102 (void) memcpy(&rc->rc_addr, svcaddr, (size_t)svcaddr->sa_len);
103 rc->rc_nconf = nconf;
104 rc->rc_prog = program;
105 rc->rc_vers = version;
106 rc->rc_sendsz = sendsz;
107 rc->rc_recvsz = recvsz;
108 rc->rc_timeout.tv_sec = -1;
109 rc->rc_timeout.tv_usec = -1;
105 rc->rc_retry.tv_sec = 15;
110 rc->rc_retry.tv_sec = 3;
106 rc->rc_retry.tv_usec = 0;
111 rc->rc_retry.tv_usec = 0;
112 rc->rc_retries = INT_MAX;
107 rc->rc_waitchan = "rpcrecv";
108 rc->rc_intr = 0;
113 rc->rc_waitchan = "rpcrecv";
114 rc->rc_intr = 0;
115 rc->rc_connecting = FALSE;
109 rc->rc_client = NULL;
110
116 rc->rc_client = NULL;
117
118 cl->cl_refs = 1;
111 cl->cl_ops = &clnt_reconnect_ops;
112 cl->cl_private = (caddr_t)(void *)rc;
113 cl->cl_auth = authnone_create();
114 cl->cl_tp = NULL;
115 cl->cl_netid = NULL;
116 return (cl);
117}
118
119static enum clnt_stat
120clnt_reconnect_connect(CLIENT *cl)
121{
122 struct rc_data *rc = (struct rc_data *)cl->cl_private;
123 struct socket *so;
119 cl->cl_ops = &clnt_reconnect_ops;
120 cl->cl_private = (caddr_t)(void *)rc;
121 cl->cl_auth = authnone_create();
122 cl->cl_tp = NULL;
123 cl->cl_netid = NULL;
124 return (cl);
125}
126
127static enum clnt_stat
128clnt_reconnect_connect(CLIENT *cl)
129{
130 struct rc_data *rc = (struct rc_data *)cl->cl_private;
131 struct socket *so;
132 enum clnt_stat stat;
133 int error;
124 int one = 1;
125
134 int one = 1;
135
136 mtx_lock(&rc->rc_lock);
137again:
138 if (rc->rc_connecting) {
139 while (!rc->rc_client) {
140 error = msleep(rc, &rc->rc_lock,
141 rc->rc_intr ? PCATCH : 0, "rpcrecon", 0);
142 if (error) {
143 mtx_unlock(&rc->rc_lock);
144 return (RPC_INTR);
145 }
146 }
147 /*
148 * If the other guy failed to connect, we might as
149 * well have another go.
150 */
151 if (!rc->rc_client && !rc->rc_connecting)
152 goto again;
153 mtx_unlock(&rc->rc_lock);
154 return (RPC_SUCCESS);
155 } else {
156 rc->rc_connecting = TRUE;
157 }
158 mtx_unlock(&rc->rc_lock);
159
126 so = __rpc_nconf2socket(rc->rc_nconf);
127 if (!so) {
160 so = __rpc_nconf2socket(rc->rc_nconf);
161 if (!so) {
128 rpc_createerr.cf_stat = RPC_TLIERROR;
162 stat = rpc_createerr.cf_stat = RPC_TLIERROR;
129 rpc_createerr.cf_error.re_errno = 0;
163 rpc_createerr.cf_error.re_errno = 0;
130 return (RPC_TLIERROR);
164 goto out;
131 }
132
133 if (rc->rc_nconf->nc_semantics == NC_TPI_CLTS)
134 rc->rc_client = clnt_dg_create(so,
135 (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers,
136 rc->rc_sendsz, rc->rc_recvsz);
137 else
138 rc->rc_client = clnt_vc_create(so,
139 (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers,
140 rc->rc_sendsz, rc->rc_recvsz);
141
165 }
166
167 if (rc->rc_nconf->nc_semantics == NC_TPI_CLTS)
168 rc->rc_client = clnt_dg_create(so,
169 (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers,
170 rc->rc_sendsz, rc->rc_recvsz);
171 else
172 rc->rc_client = clnt_vc_create(so,
173 (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers,
174 rc->rc_sendsz, rc->rc_recvsz);
175
142 if (!rc->rc_client)
143 return (rpc_createerr.cf_stat);
176 if (!rc->rc_client) {
177 stat = rpc_createerr.cf_stat;
178 goto out;
179 }
144
145 CLNT_CONTROL(rc->rc_client, CLSET_FD_CLOSE, 0);
146 CLNT_CONTROL(rc->rc_client, CLSET_CONNECT, &one);
147 CLNT_CONTROL(rc->rc_client, CLSET_TIMEOUT, &rc->rc_timeout);
148 CLNT_CONTROL(rc->rc_client, CLSET_RETRY_TIMEOUT, &rc->rc_retry);
149 CLNT_CONTROL(rc->rc_client, CLSET_WAITCHAN, &rc->rc_waitchan);
150 CLNT_CONTROL(rc->rc_client, CLSET_INTERRUPTIBLE, &rc->rc_intr);
180
181 CLNT_CONTROL(rc->rc_client, CLSET_FD_CLOSE, 0);
182 CLNT_CONTROL(rc->rc_client, CLSET_CONNECT, &one);
183 CLNT_CONTROL(rc->rc_client, CLSET_TIMEOUT, &rc->rc_timeout);
184 CLNT_CONTROL(rc->rc_client, CLSET_RETRY_TIMEOUT, &rc->rc_retry);
185 CLNT_CONTROL(rc->rc_client, CLSET_WAITCHAN, &rc->rc_waitchan);
186 CLNT_CONTROL(rc->rc_client, CLSET_INTERRUPTIBLE, &rc->rc_intr);
187 stat = RPC_SUCCESS;
151
188
152 return (RPC_SUCCESS);
189out:
190 mtx_lock(&rc->rc_lock);
191 rc->rc_connecting = FALSE;
192 wakeup(rc);
193 mtx_unlock(&rc->rc_lock);
194
195 return (stat);
153}
154
155static enum clnt_stat
156clnt_reconnect_call(
196}
197
198static enum clnt_stat
199clnt_reconnect_call(
157 CLIENT *cl, /* client handle */
200 CLIENT *cl, /* client handle */
201 struct rpc_callextra *ext, /* call metadata */
158 rpcproc_t proc, /* procedure number */
159 xdrproc_t xargs, /* xdr routine for args */
160 void *argsp, /* pointer to args */
161 xdrproc_t xresults, /* xdr routine for results */
162 void *resultsp, /* pointer to results */
163 struct timeval utimeout) /* seconds to wait before giving up */
164{
165 struct rc_data *rc = (struct rc_data *)cl->cl_private;
202 rpcproc_t proc, /* procedure number */
203 xdrproc_t xargs, /* xdr routine for args */
204 void *argsp, /* pointer to args */
205 xdrproc_t xresults, /* xdr routine for results */
206 void *resultsp, /* pointer to results */
207 struct timeval utimeout) /* seconds to wait before giving up */
208{
209 struct rc_data *rc = (struct rc_data *)cl->cl_private;
210 CLIENT *client;
166 enum clnt_stat stat;
211 enum clnt_stat stat;
212 int tries;
167
213
214 tries = 0;
168 do {
169 if (!rc->rc_client) {
170 stat = clnt_reconnect_connect(cl);
171 if (stat != RPC_SUCCESS)
172 return (stat);
173 }
174
215 do {
216 if (!rc->rc_client) {
217 stat = clnt_reconnect_connect(cl);
218 if (stat != RPC_SUCCESS)
219 return (stat);
220 }
221
175 stat = CLNT_CALL(rc->rc_client, proc, xargs, argsp,
222 mtx_lock(&rc->rc_lock);
223 CLNT_ACQUIRE(rc->rc_client);
224 client = rc->rc_client;
225 mtx_unlock(&rc->rc_lock);
226 stat = CLNT_CALL_EXT(client, ext, proc, xargs, argsp,
176 xresults, resultsp, utimeout);
177
227 xresults, resultsp, utimeout);
228
229 CLNT_RELEASE(client);
178 if (stat == RPC_TIMEDOUT) {
179 /*
180 * Check for async send misfeature for NLM
181 * protocol.
182 */
183 if ((rc->rc_timeout.tv_sec == 0
184 && rc->rc_timeout.tv_usec == 0)
185 || (rc->rc_timeout.tv_sec == -1
186 && utimeout.tv_sec == 0
230 if (stat == RPC_TIMEDOUT) {
231 /*
232 * Check for async send misfeature for NLM
233 * protocol.
234 */
235 if ((rc->rc_timeout.tv_sec == 0
236 && rc->rc_timeout.tv_usec == 0)
237 || (rc->rc_timeout.tv_sec == -1
238 && utimeout.tv_sec == 0
187 && utimeout.tv_usec == 0))
239 && utimeout.tv_usec == 0)) {
188 break;
240 break;
241 }
189 }
190
191 if (stat == RPC_INTR)
192 break;
193
194 if (stat != RPC_SUCCESS) {
242 }
243
244 if (stat == RPC_INTR)
245 break;
246
247 if (stat != RPC_SUCCESS) {
195 CLNT_DESTROY(rc->rc_client);
196 rc->rc_client = NULL;
248 tries++;
249 if (tries >= rc->rc_retries)
250 break;
251
252 if (ext && ext->rc_feedback)
253 ext->rc_feedback(FEEDBACK_RECONNECT, proc,
254 ext->rc_feedback_arg);
255
256 mtx_lock(&rc->rc_lock);
257 /*
258 * Make sure that someone else hasn't already
259 * reconnected.
260 */
261 if (rc->rc_client == client) {
262 CLNT_RELEASE(rc->rc_client);
263 rc->rc_client = NULL;
264 }
265 mtx_unlock(&rc->rc_lock);
197 }
198 } while (stat != RPC_SUCCESS);
199
200 return (stat);
201}
202
203static void
204clnt_reconnect_geterr(CLIENT *cl, struct rpc_err *errp)

--- 84 unchanged lines hidden (view full) ---

289 if (rc->rc_client)
290 CLNT_CONTROL(rc->rc_client, request, info);
291 break;
292
293 case CLGET_INTERRUPTIBLE:
294 *(int *) info = rc->rc_intr;
295 break;
296
266 }
267 } while (stat != RPC_SUCCESS);
268
269 return (stat);
270}
271
272static void
273clnt_reconnect_geterr(CLIENT *cl, struct rpc_err *errp)

--- 84 unchanged lines hidden (view full) ---

358 if (rc->rc_client)
359 CLNT_CONTROL(rc->rc_client, request, info);
360 break;
361
362 case CLGET_INTERRUPTIBLE:
363 *(int *) info = rc->rc_intr;
364 break;
365
366 case CLSET_RETRIES:
367 rc->rc_retries = *(int *) info;
368 break;
369
370 case CLGET_RETRIES:
371 *(int *) info = rc->rc_retries;
372 break;
373
297 default:
298 return (FALSE);
299 }
300
301 return (TRUE);
302}
303
304static void
305clnt_reconnect_destroy(CLIENT *cl)
306{
307 struct rc_data *rc = (struct rc_data *)cl->cl_private;
308
309 if (rc->rc_client)
310 CLNT_DESTROY(rc->rc_client);
311 mem_free(rc, sizeof(*rc));
312 mem_free(cl, sizeof (CLIENT));
313}
374 default:
375 return (FALSE);
376 }
377
378 return (TRUE);
379}
380
381static void
382clnt_reconnect_destroy(CLIENT *cl)
383{
384 struct rc_data *rc = (struct rc_data *)cl->cl_private;
385
386 if (rc->rc_client)
387 CLNT_DESTROY(rc->rc_client);
388 mem_free(rc, sizeof(*rc));
389 mem_free(cl, sizeof (CLIENT));
390}