1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* Client connection-specific management code. 2 /* Client connection-specific management code.
3 * 3 *
4 * Copyright (C) 2016, 2020 Red Hat, Inc. All 4 * Copyright (C) 2016, 2020 Red Hat, Inc. All Rights Reserved.
5 * Written by David Howells (dhowells@redhat.c 5 * Written by David Howells (dhowells@redhat.com)
6 * 6 *
7 * Client connections need to be cached for a 7 * Client connections need to be cached for a little while after they've made a
8 * call so as to handle retransmitted DATA pac 8 * call so as to handle retransmitted DATA packets in case the server didn't
9 * receive the final ACK or terminating ABORT 9 * receive the final ACK or terminating ABORT we sent it.
10 * 10 *
11 * There are flags of relevance to the cache: 11 * There are flags of relevance to the cache:
12 * 12 *
13 * (2) DONT_REUSE - The connection should be 13 * (2) DONT_REUSE - The connection should be discarded as soon as possible and
14 * should not be reused. This is set whe 14 * should not be reused. This is set when an exclusive connection is used
15 * or a call ID counter overflows. 15 * or a call ID counter overflows.
16 * 16 *
17 * The caching state may only be changed if th 17 * The caching state may only be changed if the cache lock is held.
18 * 18 *
19 * There are two idle client connection expiry 19 * There are two idle client connection expiry durations. If the total number
20 * of connections is below the reap threshold, 20 * of connections is below the reap threshold, we use the normal duration; if
21 * it's above, we use the fast duration. 21 * it's above, we use the fast duration.
22 */ 22 */
23 23
24 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 24 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
25 25
26 #include <linux/slab.h> 26 #include <linux/slab.h>
27 #include <linux/idr.h> 27 #include <linux/idr.h>
28 #include <linux/timer.h> 28 #include <linux/timer.h>
29 #include <linux/sched/signal.h> 29 #include <linux/sched/signal.h>
30 30
31 #include "ar-internal.h" 31 #include "ar-internal.h"
32 32
33 __read_mostly unsigned int rxrpc_reap_client_c 33 __read_mostly unsigned int rxrpc_reap_client_connections = 900;
34 __read_mostly unsigned long rxrpc_conn_idle_cl 34 __read_mostly unsigned long rxrpc_conn_idle_client_expiry = 2 * 60 * HZ;
35 __read_mostly unsigned long rxrpc_conn_idle_cl 35 __read_mostly unsigned long rxrpc_conn_idle_client_fast_expiry = 2 * HZ;
36 36
37 static void rxrpc_activate_bundle(struct rxrpc 37 static void rxrpc_activate_bundle(struct rxrpc_bundle *bundle)
38 { 38 {
39 atomic_inc(&bundle->active); 39 atomic_inc(&bundle->active);
40 } 40 }
41 41
42 /* 42 /*
43 * Release a connection ID for a client connec 43 * Release a connection ID for a client connection.
44 */ 44 */
45 static void rxrpc_put_client_connection_id(str 45 static void rxrpc_put_client_connection_id(struct rxrpc_local *local,
46 str 46 struct rxrpc_connection *conn)
47 { 47 {
48 idr_remove(&local->conn_ids, conn->pro 48 idr_remove(&local->conn_ids, conn->proto.cid >> RXRPC_CIDSHIFT);
49 } 49 }
50 50
51 /* 51 /*
52 * Destroy the client connection ID tree. 52 * Destroy the client connection ID tree.
53 */ 53 */
54 static void rxrpc_destroy_client_conn_ids(stru 54 static void rxrpc_destroy_client_conn_ids(struct rxrpc_local *local)
55 { 55 {
56 struct rxrpc_connection *conn; 56 struct rxrpc_connection *conn;
57 int id; 57 int id;
58 58
59 if (!idr_is_empty(&local->conn_ids)) { 59 if (!idr_is_empty(&local->conn_ids)) {
60 idr_for_each_entry(&local->con 60 idr_for_each_entry(&local->conn_ids, conn, id) {
61 pr_err("AF_RXRPC: Leak 61 pr_err("AF_RXRPC: Leaked client conn %p {%d}\n",
62 conn, refcount_ 62 conn, refcount_read(&conn->ref));
63 } 63 }
64 BUG(); 64 BUG();
65 } 65 }
66 66
67 idr_destroy(&local->conn_ids); 67 idr_destroy(&local->conn_ids);
68 } 68 }
69 69
70 /* 70 /*
71 * Allocate a connection bundle. 71 * Allocate a connection bundle.
72 */ 72 */
73 static struct rxrpc_bundle *rxrpc_alloc_bundle 73 static struct rxrpc_bundle *rxrpc_alloc_bundle(struct rxrpc_call *call,
74 74 gfp_t gfp)
75 { 75 {
76 static atomic_t rxrpc_bundle_id; <<
77 struct rxrpc_bundle *bundle; 76 struct rxrpc_bundle *bundle;
78 77
79 bundle = kzalloc(sizeof(*bundle), gfp) 78 bundle = kzalloc(sizeof(*bundle), gfp);
80 if (bundle) { 79 if (bundle) {
81 bundle->local = call 80 bundle->local = call->local;
82 bundle->peer = rxrp 81 bundle->peer = rxrpc_get_peer(call->peer, rxrpc_peer_get_bundle);
83 bundle->key = key_ 82 bundle->key = key_get(call->key);
84 bundle->security = call 83 bundle->security = call->security;
85 bundle->exclusive = test 84 bundle->exclusive = test_bit(RXRPC_CALL_EXCLUSIVE, &call->flags);
86 bundle->upgrade = test 85 bundle->upgrade = test_bit(RXRPC_CALL_UPGRADE, &call->flags);
87 bundle->service_id = call 86 bundle->service_id = call->dest_srx.srx_service;
88 bundle->security_level = call 87 bundle->security_level = call->security_level;
89 bundle->debug_id = atom <<
90 refcount_set(&bundle->ref, 1); 88 refcount_set(&bundle->ref, 1);
91 atomic_set(&bundle->active, 1) 89 atomic_set(&bundle->active, 1);
92 INIT_LIST_HEAD(&bundle->waitin 90 INIT_LIST_HEAD(&bundle->waiting_calls);
93 trace_rxrpc_bundle(bundle->deb 91 trace_rxrpc_bundle(bundle->debug_id, 1, rxrpc_bundle_new);
94 <<
95 write_lock(&bundle->local->rxn <<
96 list_add_tail(&bundle->proc_li <<
97 write_unlock(&bundle->local->r <<
98 } 92 }
99 return bundle; 93 return bundle;
100 } 94 }
101 95
102 struct rxrpc_bundle *rxrpc_get_bundle(struct r 96 struct rxrpc_bundle *rxrpc_get_bundle(struct rxrpc_bundle *bundle,
103 enum rxr 97 enum rxrpc_bundle_trace why)
104 { 98 {
105 int r; 99 int r;
106 100
107 __refcount_inc(&bundle->ref, &r); 101 __refcount_inc(&bundle->ref, &r);
108 trace_rxrpc_bundle(bundle->debug_id, r 102 trace_rxrpc_bundle(bundle->debug_id, r + 1, why);
109 return bundle; 103 return bundle;
110 } 104 }
111 105
112 static void rxrpc_free_bundle(struct rxrpc_bun 106 static void rxrpc_free_bundle(struct rxrpc_bundle *bundle)
113 { 107 {
114 trace_rxrpc_bundle(bundle->debug_id, r !! 108 trace_rxrpc_bundle(bundle->debug_id, 1, rxrpc_bundle_free);
115 rxrpc_bundle_free); <<
116 write_lock(&bundle->local->rxnet->conn <<
117 list_del(&bundle->proc_link); <<
118 write_unlock(&bundle->local->rxnet->co <<
119 rxrpc_put_peer(bundle->peer, rxrpc_pee 109 rxrpc_put_peer(bundle->peer, rxrpc_peer_put_bundle);
120 key_put(bundle->key); 110 key_put(bundle->key);
121 kfree(bundle); 111 kfree(bundle);
122 } 112 }
123 113
124 void rxrpc_put_bundle(struct rxrpc_bundle *bun 114 void rxrpc_put_bundle(struct rxrpc_bundle *bundle, enum rxrpc_bundle_trace why)
125 { 115 {
126 unsigned int id; 116 unsigned int id;
127 bool dead; 117 bool dead;
128 int r; 118 int r;
129 119
130 if (bundle) { 120 if (bundle) {
131 id = bundle->debug_id; 121 id = bundle->debug_id;
132 dead = __refcount_dec_and_test 122 dead = __refcount_dec_and_test(&bundle->ref, &r);
133 trace_rxrpc_bundle(id, r - 1, 123 trace_rxrpc_bundle(id, r - 1, why);
134 if (dead) 124 if (dead)
135 rxrpc_free_bundle(bund 125 rxrpc_free_bundle(bundle);
136 } 126 }
137 } 127 }
138 128
139 /* 129 /*
140 * Get rid of outstanding client connection pr 130 * Get rid of outstanding client connection preallocations when a local
141 * endpoint is destroyed. 131 * endpoint is destroyed.
142 */ 132 */
143 void rxrpc_purge_client_connections(struct rxr 133 void rxrpc_purge_client_connections(struct rxrpc_local *local)
144 { 134 {
145 rxrpc_destroy_client_conn_ids(local); 135 rxrpc_destroy_client_conn_ids(local);
146 } 136 }
147 137
148 /* 138 /*
149 * Allocate a client connection. 139 * Allocate a client connection.
150 */ 140 */
151 static struct rxrpc_connection * 141 static struct rxrpc_connection *
152 rxrpc_alloc_client_connection(struct rxrpc_bun 142 rxrpc_alloc_client_connection(struct rxrpc_bundle *bundle)
153 { 143 {
154 struct rxrpc_connection *conn; 144 struct rxrpc_connection *conn;
155 struct rxrpc_local *local = bundle->lo 145 struct rxrpc_local *local = bundle->local;
156 struct rxrpc_net *rxnet = local->rxnet 146 struct rxrpc_net *rxnet = local->rxnet;
157 int id; 147 int id;
158 148
159 _enter(""); 149 _enter("");
160 150
161 conn = rxrpc_alloc_connection(rxnet, G 151 conn = rxrpc_alloc_connection(rxnet, GFP_ATOMIC | __GFP_NOWARN);
162 if (!conn) 152 if (!conn)
163 return ERR_PTR(-ENOMEM); 153 return ERR_PTR(-ENOMEM);
164 154
165 id = idr_alloc_cyclic(&local->conn_ids 155 id = idr_alloc_cyclic(&local->conn_ids, conn, 1, 0x40000000,
166 GFP_ATOMIC | __G 156 GFP_ATOMIC | __GFP_NOWARN);
167 if (id < 0) { 157 if (id < 0) {
168 kfree(conn); 158 kfree(conn);
169 return ERR_PTR(id); 159 return ERR_PTR(id);
170 } 160 }
171 161
172 refcount_set(&conn->ref, 1); 162 refcount_set(&conn->ref, 1);
173 conn->proto.cid = id << RXRPC_ 163 conn->proto.cid = id << RXRPC_CIDSHIFT;
174 conn->proto.epoch = local->rxnet 164 conn->proto.epoch = local->rxnet->epoch;
175 conn->out_clientflag = RXRPC_CLIENT 165 conn->out_clientflag = RXRPC_CLIENT_INITIATED;
176 conn->bundle = rxrpc_get_bu 166 conn->bundle = rxrpc_get_bundle(bundle, rxrpc_bundle_get_client_conn);
177 conn->local = rxrpc_get_lo 167 conn->local = rxrpc_get_local(bundle->local, rxrpc_local_get_client_conn);
178 conn->peer = rxrpc_get_pe 168 conn->peer = rxrpc_get_peer(bundle->peer, rxrpc_peer_get_client_conn);
179 conn->key = key_get(bund 169 conn->key = key_get(bundle->key);
180 conn->security = bundle->secu 170 conn->security = bundle->security;
181 conn->exclusive = bundle->excl 171 conn->exclusive = bundle->exclusive;
182 conn->upgrade = bundle->upgr 172 conn->upgrade = bundle->upgrade;
183 conn->orig_service_id = bundle->serv 173 conn->orig_service_id = bundle->service_id;
184 conn->security_level = bundle->secu 174 conn->security_level = bundle->security_level;
185 conn->state = RXRPC_CONN_C 175 conn->state = RXRPC_CONN_CLIENT_UNSECURED;
186 conn->service_id = conn->orig_s 176 conn->service_id = conn->orig_service_id;
187 177
188 if (conn->security == &rxrpc_no_securi 178 if (conn->security == &rxrpc_no_security)
189 conn->state = RXRPC_CONN_C 179 conn->state = RXRPC_CONN_CLIENT;
190 180
191 atomic_inc(&rxnet->nr_conns); 181 atomic_inc(&rxnet->nr_conns);
192 write_lock(&rxnet->conn_lock); 182 write_lock(&rxnet->conn_lock);
193 list_add_tail(&conn->proc_link, &rxnet 183 list_add_tail(&conn->proc_link, &rxnet->conn_proc_list);
194 write_unlock(&rxnet->conn_lock); 184 write_unlock(&rxnet->conn_lock);
195 185
196 rxrpc_see_connection(conn, rxrpc_conn_ 186 rxrpc_see_connection(conn, rxrpc_conn_new_client);
197 187
198 atomic_inc(&rxnet->nr_client_conns); 188 atomic_inc(&rxnet->nr_client_conns);
199 trace_rxrpc_client(conn, -1, rxrpc_cli 189 trace_rxrpc_client(conn, -1, rxrpc_client_alloc);
200 return conn; 190 return conn;
201 } 191 }
202 192
203 /* 193 /*
204 * Determine if a connection may be reused. 194 * Determine if a connection may be reused.
205 */ 195 */
206 static bool rxrpc_may_reuse_conn(struct rxrpc_ 196 static bool rxrpc_may_reuse_conn(struct rxrpc_connection *conn)
207 { 197 {
208 struct rxrpc_net *rxnet; 198 struct rxrpc_net *rxnet;
209 int id_cursor, id, distance, limit; 199 int id_cursor, id, distance, limit;
210 200
211 if (!conn) 201 if (!conn)
212 goto dont_reuse; 202 goto dont_reuse;
213 203
214 rxnet = conn->rxnet; 204 rxnet = conn->rxnet;
215 if (test_bit(RXRPC_CONN_DONT_REUSE, &c 205 if (test_bit(RXRPC_CONN_DONT_REUSE, &conn->flags))
216 goto dont_reuse; 206 goto dont_reuse;
217 207
218 if ((conn->state != RXRPC_CONN_CLIENT_ 208 if ((conn->state != RXRPC_CONN_CLIENT_UNSECURED &&
219 conn->state != RXRPC_CONN_CLIENT) 209 conn->state != RXRPC_CONN_CLIENT) ||
220 conn->proto.epoch != rxnet->epoch) 210 conn->proto.epoch != rxnet->epoch)
221 goto mark_dont_reuse; 211 goto mark_dont_reuse;
222 212
223 /* The IDR tree gets very expensive on 213 /* The IDR tree gets very expensive on memory if the connection IDs are
224 * widely scattered throughout the num 214 * widely scattered throughout the number space, so we shall want to
225 * kill off connections that, say, hav 215 * kill off connections that, say, have an ID more than about four
226 * times the maximum number of client 216 * times the maximum number of client conns away from the current
227 * allocation point to try and keep th 217 * allocation point to try and keep the IDs concentrated.
228 */ 218 */
229 id_cursor = idr_get_cursor(&conn->loca 219 id_cursor = idr_get_cursor(&conn->local->conn_ids);
230 id = conn->proto.cid >> RXRPC_CIDSHIFT 220 id = conn->proto.cid >> RXRPC_CIDSHIFT;
231 distance = id - id_cursor; 221 distance = id - id_cursor;
232 if (distance < 0) 222 if (distance < 0)
233 distance = -distance; 223 distance = -distance;
234 limit = max_t(unsigned long, atomic_re 224 limit = max_t(unsigned long, atomic_read(&rxnet->nr_conns) * 4, 1024);
235 if (distance > limit) 225 if (distance > limit)
236 goto mark_dont_reuse; 226 goto mark_dont_reuse;
237 227
238 return true; 228 return true;
239 229
240 mark_dont_reuse: 230 mark_dont_reuse:
241 set_bit(RXRPC_CONN_DONT_REUSE, &conn-> 231 set_bit(RXRPC_CONN_DONT_REUSE, &conn->flags);
242 dont_reuse: 232 dont_reuse:
243 return false; 233 return false;
244 } 234 }
245 235
246 /* 236 /*
247 * Look up the conn bundle that matches the co 237 * Look up the conn bundle that matches the connection parameters, adding it if
248 * it doesn't yet exist. 238 * it doesn't yet exist.
249 */ 239 */
250 int rxrpc_look_up_bundle(struct rxrpc_call *ca 240 int rxrpc_look_up_bundle(struct rxrpc_call *call, gfp_t gfp)
251 { 241 {
>> 242 static atomic_t rxrpc_bundle_id;
252 struct rxrpc_bundle *bundle, *candidat 243 struct rxrpc_bundle *bundle, *candidate;
253 struct rxrpc_local *local = call->loca 244 struct rxrpc_local *local = call->local;
254 struct rb_node *p, **pp, *parent; 245 struct rb_node *p, **pp, *parent;
255 long diff; 246 long diff;
256 bool upgrade = test_bit(RXRPC_CALL_UPG 247 bool upgrade = test_bit(RXRPC_CALL_UPGRADE, &call->flags);
257 248
258 _enter("{%px,%x,%u,%u}", 249 _enter("{%px,%x,%u,%u}",
259 call->peer, key_serial(call->ke 250 call->peer, key_serial(call->key), call->security_level,
260 upgrade); 251 upgrade);
261 252
262 if (test_bit(RXRPC_CALL_EXCLUSIVE, &ca 253 if (test_bit(RXRPC_CALL_EXCLUSIVE, &call->flags)) {
263 call->bundle = rxrpc_alloc_bun 254 call->bundle = rxrpc_alloc_bundle(call, gfp);
264 return call->bundle ? 0 : -ENO 255 return call->bundle ? 0 : -ENOMEM;
265 } 256 }
266 257
267 /* First, see if the bundle is already 258 /* First, see if the bundle is already there. */
268 _debug("search 1"); 259 _debug("search 1");
269 spin_lock(&local->client_bundles_lock) 260 spin_lock(&local->client_bundles_lock);
270 p = local->client_bundles.rb_node; 261 p = local->client_bundles.rb_node;
271 while (p) { 262 while (p) {
272 bundle = rb_entry(p, struct rx 263 bundle = rb_entry(p, struct rxrpc_bundle, local_node);
273 264
274 #define cmp(X, Y) ((long)(X) - (long)(Y)) 265 #define cmp(X, Y) ((long)(X) - (long)(Y))
275 diff = (cmp(bundle->peer, call 266 diff = (cmp(bundle->peer, call->peer) ?:
276 cmp(bundle->key, call- 267 cmp(bundle->key, call->key) ?:
277 cmp(bundle->security_l 268 cmp(bundle->security_level, call->security_level) ?:
278 cmp(bundle->upgrade, u 269 cmp(bundle->upgrade, upgrade));
279 #undef cmp 270 #undef cmp
280 if (diff < 0) 271 if (diff < 0)
281 p = p->rb_left; 272 p = p->rb_left;
282 else if (diff > 0) 273 else if (diff > 0)
283 p = p->rb_right; 274 p = p->rb_right;
284 else 275 else
285 goto found_bundle; 276 goto found_bundle;
286 } 277 }
287 spin_unlock(&local->client_bundles_loc 278 spin_unlock(&local->client_bundles_lock);
288 _debug("not found"); 279 _debug("not found");
289 280
290 /* It wasn't. We need to add one. */ 281 /* It wasn't. We need to add one. */
291 candidate = rxrpc_alloc_bundle(call, g 282 candidate = rxrpc_alloc_bundle(call, gfp);
292 if (!candidate) 283 if (!candidate)
293 return -ENOMEM; 284 return -ENOMEM;
294 285
295 _debug("search 2"); 286 _debug("search 2");
296 spin_lock(&local->client_bundles_lock) 287 spin_lock(&local->client_bundles_lock);
297 pp = &local->client_bundles.rb_node; 288 pp = &local->client_bundles.rb_node;
298 parent = NULL; 289 parent = NULL;
299 while (*pp) { 290 while (*pp) {
300 parent = *pp; 291 parent = *pp;
301 bundle = rb_entry(parent, stru 292 bundle = rb_entry(parent, struct rxrpc_bundle, local_node);
302 293
303 #define cmp(X, Y) ((long)(X) - (long)(Y)) 294 #define cmp(X, Y) ((long)(X) - (long)(Y))
304 diff = (cmp(bundle->peer, call 295 diff = (cmp(bundle->peer, call->peer) ?:
305 cmp(bundle->key, call- 296 cmp(bundle->key, call->key) ?:
306 cmp(bundle->security_l 297 cmp(bundle->security_level, call->security_level) ?:
307 cmp(bundle->upgrade, u 298 cmp(bundle->upgrade, upgrade));
308 #undef cmp 299 #undef cmp
309 if (diff < 0) 300 if (diff < 0)
310 pp = &(*pp)->rb_left; 301 pp = &(*pp)->rb_left;
311 else if (diff > 0) 302 else if (diff > 0)
312 pp = &(*pp)->rb_right; 303 pp = &(*pp)->rb_right;
313 else 304 else
314 goto found_bundle_free 305 goto found_bundle_free;
315 } 306 }
316 307
317 _debug("new bundle"); 308 _debug("new bundle");
>> 309 candidate->debug_id = atomic_inc_return(&rxrpc_bundle_id);
318 rb_link_node(&candidate->local_node, p 310 rb_link_node(&candidate->local_node, parent, pp);
319 rb_insert_color(&candidate->local_node 311 rb_insert_color(&candidate->local_node, &local->client_bundles);
320 call->bundle = rxrpc_get_bundle(candid 312 call->bundle = rxrpc_get_bundle(candidate, rxrpc_bundle_get_client_call);
321 spin_unlock(&local->client_bundles_loc 313 spin_unlock(&local->client_bundles_lock);
322 _leave(" = B=%u [new]", call->bundle-> 314 _leave(" = B=%u [new]", call->bundle->debug_id);
323 return 0; 315 return 0;
324 316
325 found_bundle_free: 317 found_bundle_free:
326 rxrpc_free_bundle(candidate); 318 rxrpc_free_bundle(candidate);
327 found_bundle: 319 found_bundle:
328 call->bundle = rxrpc_get_bundle(bundle 320 call->bundle = rxrpc_get_bundle(bundle, rxrpc_bundle_get_client_call);
329 rxrpc_activate_bundle(bundle); 321 rxrpc_activate_bundle(bundle);
330 spin_unlock(&local->client_bundles_loc 322 spin_unlock(&local->client_bundles_lock);
331 _leave(" = B=%u [found]", call->bundle 323 _leave(" = B=%u [found]", call->bundle->debug_id);
332 return 0; 324 return 0;
333 } 325 }
334 326
335 /* 327 /*
336 * Allocate a new connection and add it into a 328 * Allocate a new connection and add it into a bundle.
337 */ 329 */
338 static bool rxrpc_add_conn_to_bundle(struct rx 330 static bool rxrpc_add_conn_to_bundle(struct rxrpc_bundle *bundle,
339 unsigned 331 unsigned int slot)
340 { 332 {
341 struct rxrpc_connection *conn, *old; 333 struct rxrpc_connection *conn, *old;
342 unsigned int shift = slot * RXRPC_MAXC 334 unsigned int shift = slot * RXRPC_MAXCALLS;
343 unsigned int i; 335 unsigned int i;
344 336
345 old = bundle->conns[slot]; 337 old = bundle->conns[slot];
346 if (old) { 338 if (old) {
347 bundle->conns[slot] = NULL; 339 bundle->conns[slot] = NULL;
348 bundle->conn_ids[slot] = 0; <<
349 trace_rxrpc_client(old, -1, rx 340 trace_rxrpc_client(old, -1, rxrpc_client_replace);
350 rxrpc_put_connection(old, rxrp 341 rxrpc_put_connection(old, rxrpc_conn_put_noreuse);
351 } 342 }
352 343
353 conn = rxrpc_alloc_client_connection(b 344 conn = rxrpc_alloc_client_connection(bundle);
354 if (IS_ERR(conn)) { 345 if (IS_ERR(conn)) {
355 bundle->alloc_error = PTR_ERR( 346 bundle->alloc_error = PTR_ERR(conn);
356 return false; 347 return false;
357 } 348 }
358 349
359 rxrpc_activate_bundle(bundle); 350 rxrpc_activate_bundle(bundle);
360 conn->bundle_shift = shift; 351 conn->bundle_shift = shift;
361 bundle->conns[slot] = conn; 352 bundle->conns[slot] = conn;
362 bundle->conn_ids[slot] = conn->debug_i <<
363 for (i = 0; i < RXRPC_MAXCALLS; i++) 353 for (i = 0; i < RXRPC_MAXCALLS; i++)
364 set_bit(shift + i, &bundle->av 354 set_bit(shift + i, &bundle->avail_chans);
365 return true; 355 return true;
366 } 356 }
367 357
368 /* 358 /*
369 * Add a connection to a bundle if there are n 359 * Add a connection to a bundle if there are no usable connections or we have
370 * connections waiting for extra capacity. 360 * connections waiting for extra capacity.
371 */ 361 */
372 static bool rxrpc_bundle_has_space(struct rxrp 362 static bool rxrpc_bundle_has_space(struct rxrpc_bundle *bundle)
373 { 363 {
374 int slot = -1, i, usable; 364 int slot = -1, i, usable;
375 365
376 _enter(""); 366 _enter("");
377 367
378 bundle->alloc_error = 0; 368 bundle->alloc_error = 0;
379 369
380 /* See if there are any usable connect 370 /* See if there are any usable connections. */
381 usable = 0; 371 usable = 0;
382 for (i = 0; i < ARRAY_SIZE(bundle->con 372 for (i = 0; i < ARRAY_SIZE(bundle->conns); i++) {
383 if (rxrpc_may_reuse_conn(bundl 373 if (rxrpc_may_reuse_conn(bundle->conns[i]))
384 usable++; 374 usable++;
385 else if (slot == -1) 375 else if (slot == -1)
386 slot = i; 376 slot = i;
387 } 377 }
388 378
389 if (!usable && bundle->upgrade) 379 if (!usable && bundle->upgrade)
390 bundle->try_upgrade = true; 380 bundle->try_upgrade = true;
391 381
392 if (!usable) 382 if (!usable)
393 goto alloc_conn; 383 goto alloc_conn;
394 384
395 if (!bundle->avail_chans && 385 if (!bundle->avail_chans &&
396 !bundle->try_upgrade && 386 !bundle->try_upgrade &&
397 usable < ARRAY_SIZE(bundle->conns) 387 usable < ARRAY_SIZE(bundle->conns))
398 goto alloc_conn; 388 goto alloc_conn;
399 389
400 _leave(""); 390 _leave("");
401 return usable; 391 return usable;
402 392
403 alloc_conn: 393 alloc_conn:
404 return slot >= 0 ? rxrpc_add_conn_to_b 394 return slot >= 0 ? rxrpc_add_conn_to_bundle(bundle, slot) : false;
405 } 395 }
406 396
407 /* 397 /*
408 * Assign a channel to the call at the front o 398 * Assign a channel to the call at the front of the queue and wake the call up.
409 * We don't increment the callNumber counter u 399 * We don't increment the callNumber counter until this number has been exposed
410 * to the world. 400 * to the world.
411 */ 401 */
412 static void rxrpc_activate_one_channel(struct 402 static void rxrpc_activate_one_channel(struct rxrpc_connection *conn,
413 unsigne 403 unsigned int channel)
414 { 404 {
415 struct rxrpc_channel *chan = &conn->ch 405 struct rxrpc_channel *chan = &conn->channels[channel];
416 struct rxrpc_bundle *bundle = conn->bu 406 struct rxrpc_bundle *bundle = conn->bundle;
417 struct rxrpc_call *call = list_entry(b 407 struct rxrpc_call *call = list_entry(bundle->waiting_calls.next,
418 s 408 struct rxrpc_call, wait_link);
419 u32 call_id = chan->call_counter + 1; 409 u32 call_id = chan->call_counter + 1;
420 410
421 _enter("C=%x,%u", conn->debug_id, chan 411 _enter("C=%x,%u", conn->debug_id, channel);
422 412
423 list_del_init(&call->wait_link); 413 list_del_init(&call->wait_link);
424 414
425 trace_rxrpc_client(conn, channel, rxrp 415 trace_rxrpc_client(conn, channel, rxrpc_client_chan_activate);
426 416
427 /* Cancel the final ACK on the previou 417 /* Cancel the final ACK on the previous call if it hasn't been sent yet
428 * as the DATA packet will implicitly 418 * as the DATA packet will implicitly ACK it.
429 */ 419 */
430 clear_bit(RXRPC_CONN_FINAL_ACK_0 + cha 420 clear_bit(RXRPC_CONN_FINAL_ACK_0 + channel, &conn->flags);
431 clear_bit(conn->bundle_shift + channel 421 clear_bit(conn->bundle_shift + channel, &bundle->avail_chans);
432 422
433 rxrpc_see_call(call, rxrpc_call_see_ac 423 rxrpc_see_call(call, rxrpc_call_see_activate_client);
434 call->conn = rxrpc_get_connection 424 call->conn = rxrpc_get_connection(conn, rxrpc_conn_get_activate_call);
435 call->cid = conn->proto.cid | ch 425 call->cid = conn->proto.cid | channel;
436 call->call_id = call_id; 426 call->call_id = call_id;
437 call->dest_srx.srx_service = conn->ser 427 call->dest_srx.srx_service = conn->service_id;
438 call->cong_ssthresh = call->peer->cong 428 call->cong_ssthresh = call->peer->cong_ssthresh;
439 if (call->cong_cwnd >= call->cong_ssth 429 if (call->cong_cwnd >= call->cong_ssthresh)
440 call->cong_mode = RXRPC_CALL_C 430 call->cong_mode = RXRPC_CALL_CONGEST_AVOIDANCE;
441 else 431 else
442 call->cong_mode = RXRPC_CALL_S 432 call->cong_mode = RXRPC_CALL_SLOW_START;
443 433
444 chan->call_id = call_id; 434 chan->call_id = call_id;
445 chan->call_debug_id = call->debug_ 435 chan->call_debug_id = call->debug_id;
446 chan->call = call; 436 chan->call = call;
447 437
448 rxrpc_see_call(call, rxrpc_call_see_co 438 rxrpc_see_call(call, rxrpc_call_see_connected);
449 trace_rxrpc_connect_call(call); 439 trace_rxrpc_connect_call(call);
450 call->tx_last_sent = ktime_get_real(); 440 call->tx_last_sent = ktime_get_real();
451 rxrpc_start_call_timer(call); 441 rxrpc_start_call_timer(call);
452 rxrpc_set_call_state(call, RXRPC_CALL_ 442 rxrpc_set_call_state(call, RXRPC_CALL_CLIENT_SEND_REQUEST);
453 wake_up(&call->waitq); 443 wake_up(&call->waitq);
454 } 444 }
455 445
456 /* 446 /*
457 * Remove a connection from the idle list if i 447 * Remove a connection from the idle list if it's on it.
458 */ 448 */
459 static void rxrpc_unidle_conn(struct rxrpc_con 449 static void rxrpc_unidle_conn(struct rxrpc_connection *conn)
460 { 450 {
461 if (!list_empty(&conn->cache_link)) { 451 if (!list_empty(&conn->cache_link)) {
462 list_del_init(&conn->cache_lin 452 list_del_init(&conn->cache_link);
463 rxrpc_put_connection(conn, rxr 453 rxrpc_put_connection(conn, rxrpc_conn_put_unidle);
464 } 454 }
465 } 455 }
466 456
467 /* 457 /*
468 * Assign channels and callNumbers to waiting 458 * Assign channels and callNumbers to waiting calls.
469 */ 459 */
470 static void rxrpc_activate_channels(struct rxr 460 static void rxrpc_activate_channels(struct rxrpc_bundle *bundle)
471 { 461 {
472 struct rxrpc_connection *conn; 462 struct rxrpc_connection *conn;
473 unsigned long avail, mask; 463 unsigned long avail, mask;
474 unsigned int channel, slot; 464 unsigned int channel, slot;
475 465
476 trace_rxrpc_client(NULL, -1, rxrpc_cli 466 trace_rxrpc_client(NULL, -1, rxrpc_client_activate_chans);
477 467
478 if (bundle->try_upgrade) 468 if (bundle->try_upgrade)
479 mask = 1; 469 mask = 1;
480 else 470 else
481 mask = ULONG_MAX; 471 mask = ULONG_MAX;
482 472
483 while (!list_empty(&bundle->waiting_ca 473 while (!list_empty(&bundle->waiting_calls)) {
484 avail = bundle->avail_chans & 474 avail = bundle->avail_chans & mask;
485 if (!avail) 475 if (!avail)
486 break; 476 break;
487 channel = __ffs(avail); 477 channel = __ffs(avail);
488 clear_bit(channel, &bundle->av 478 clear_bit(channel, &bundle->avail_chans);
489 479
490 slot = channel / RXRPC_MAXCALL 480 slot = channel / RXRPC_MAXCALLS;
491 conn = bundle->conns[slot]; 481 conn = bundle->conns[slot];
492 if (!conn) 482 if (!conn)
493 break; 483 break;
494 484
495 if (bundle->try_upgrade) 485 if (bundle->try_upgrade)
496 set_bit(RXRPC_CONN_PRO 486 set_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags);
497 rxrpc_unidle_conn(conn); 487 rxrpc_unidle_conn(conn);
498 488
499 channel &= (RXRPC_MAXCALLS - 1 489 channel &= (RXRPC_MAXCALLS - 1);
500 conn->act_chans |= 1 << channe 490 conn->act_chans |= 1 << channel;
501 rxrpc_activate_one_channel(con 491 rxrpc_activate_one_channel(conn, channel);
502 } 492 }
503 } 493 }
504 494
505 /* 495 /*
506 * Connect waiting channels (called from the I 496 * Connect waiting channels (called from the I/O thread).
507 */ 497 */
508 void rxrpc_connect_client_calls(struct rxrpc_l 498 void rxrpc_connect_client_calls(struct rxrpc_local *local)
509 { 499 {
510 struct rxrpc_call *call; 500 struct rxrpc_call *call;
511 501
512 while ((call = list_first_entry_or_nul 502 while ((call = list_first_entry_or_null(&local->new_client_calls,
513 503 struct rxrpc_call, wait_link))
514 ) { 504 ) {
515 struct rxrpc_bundle *bundle = 505 struct rxrpc_bundle *bundle = call->bundle;
516 506
517 spin_lock(&local->client_call_ 507 spin_lock(&local->client_call_lock);
518 list_move_tail(&call->wait_lin 508 list_move_tail(&call->wait_link, &bundle->waiting_calls);
519 rxrpc_see_call(call, rxrpc_cal <<
520 spin_unlock(&local->client_cal 509 spin_unlock(&local->client_call_lock);
521 510
522 if (rxrpc_bundle_has_space(bun 511 if (rxrpc_bundle_has_space(bundle))
523 rxrpc_activate_channel 512 rxrpc_activate_channels(bundle);
524 } 513 }
525 } 514 }
526 515
527 /* 516 /*
528 * Note that a call, and thus a connection, is 517 * Note that a call, and thus a connection, is about to be exposed to the
529 * world. 518 * world.
530 */ 519 */
531 void rxrpc_expose_client_call(struct rxrpc_cal 520 void rxrpc_expose_client_call(struct rxrpc_call *call)
532 { 521 {
533 unsigned int channel = call->cid & RXR 522 unsigned int channel = call->cid & RXRPC_CHANNELMASK;
534 struct rxrpc_connection *conn = call-> 523 struct rxrpc_connection *conn = call->conn;
535 struct rxrpc_channel *chan = &conn->ch 524 struct rxrpc_channel *chan = &conn->channels[channel];
536 525
537 if (!test_and_set_bit(RXRPC_CALL_EXPOS 526 if (!test_and_set_bit(RXRPC_CALL_EXPOSED, &call->flags)) {
538 /* Mark the call ID as being u 527 /* Mark the call ID as being used. If the callNumber counter
539 * exceeds ~2 billion, we kill 528 * exceeds ~2 billion, we kill the connection after its
540 * outstanding calls have fini 529 * outstanding calls have finished so that the counter doesn't
541 * wrap. 530 * wrap.
542 */ 531 */
543 chan->call_counter++; 532 chan->call_counter++;
544 if (chan->call_counter >= INT_ 533 if (chan->call_counter >= INT_MAX)
545 set_bit(RXRPC_CONN_DON 534 set_bit(RXRPC_CONN_DONT_REUSE, &conn->flags);
546 trace_rxrpc_client(conn, chann 535 trace_rxrpc_client(conn, channel, rxrpc_client_exposed);
547 536
548 spin_lock(&call->peer->lock); 537 spin_lock(&call->peer->lock);
549 hlist_add_head(&call->error_li 538 hlist_add_head(&call->error_link, &call->peer->error_targets);
550 spin_unlock(&call->peer->lock) 539 spin_unlock(&call->peer->lock);
551 } 540 }
552 } 541 }
553 542
554 /* 543 /*
555 * Set the reap timer. 544 * Set the reap timer.
556 */ 545 */
557 static void rxrpc_set_client_reap_timer(struct 546 static void rxrpc_set_client_reap_timer(struct rxrpc_local *local)
558 { 547 {
559 if (!local->kill_all_client_conns) { 548 if (!local->kill_all_client_conns) {
560 unsigned long now = jiffies; 549 unsigned long now = jiffies;
561 unsigned long reap_at = now + 550 unsigned long reap_at = now + rxrpc_conn_idle_client_expiry;
562 551
563 if (local->rxnet->live) 552 if (local->rxnet->live)
564 timer_reduce(&local->c 553 timer_reduce(&local->client_conn_reap_timer, reap_at);
565 } 554 }
566 } 555 }
567 556
568 /* 557 /*
569 * Disconnect a client call. 558 * Disconnect a client call.
570 */ 559 */
571 void rxrpc_disconnect_client_call(struct rxrpc 560 void rxrpc_disconnect_client_call(struct rxrpc_bundle *bundle, struct rxrpc_call *call)
572 { 561 {
573 struct rxrpc_connection *conn; 562 struct rxrpc_connection *conn;
574 struct rxrpc_channel *chan = NULL; 563 struct rxrpc_channel *chan = NULL;
575 struct rxrpc_local *local = bundle->lo 564 struct rxrpc_local *local = bundle->local;
576 unsigned int channel; 565 unsigned int channel;
577 bool may_reuse; 566 bool may_reuse;
578 u32 cid; 567 u32 cid;
579 568
580 _enter("c=%x", call->debug_id); 569 _enter("c=%x", call->debug_id);
581 570
582 /* Calls that have never actually been 571 /* Calls that have never actually been assigned a channel can simply be
583 * discarded. 572 * discarded.
584 */ 573 */
585 conn = call->conn; 574 conn = call->conn;
586 if (!conn) { 575 if (!conn) {
587 _debug("call is waiting"); 576 _debug("call is waiting");
588 ASSERTCMP(call->call_id, ==, 0 577 ASSERTCMP(call->call_id, ==, 0);
589 ASSERT(!test_bit(RXRPC_CALL_EX 578 ASSERT(!test_bit(RXRPC_CALL_EXPOSED, &call->flags));
590 /* May still be on ->new_clien <<
591 spin_lock(&local->client_call_ <<
592 list_del_init(&call->wait_link 579 list_del_init(&call->wait_link);
593 spin_unlock(&local->client_cal <<
594 return; 580 return;
595 } 581 }
596 582
597 cid = call->cid; 583 cid = call->cid;
598 channel = cid & RXRPC_CHANNELMASK; 584 channel = cid & RXRPC_CHANNELMASK;
599 chan = &conn->channels[channel]; 585 chan = &conn->channels[channel];
600 trace_rxrpc_client(conn, channel, rxrp 586 trace_rxrpc_client(conn, channel, rxrpc_client_chan_disconnect);
601 587
602 if (WARN_ON(chan->call != call)) 588 if (WARN_ON(chan->call != call))
603 return; 589 return;
604 590
605 may_reuse = rxrpc_may_reuse_conn(conn) 591 may_reuse = rxrpc_may_reuse_conn(conn);
606 592
607 /* If a client call was exposed to the 593 /* If a client call was exposed to the world, we save the result for
608 * retransmission. 594 * retransmission.
609 * 595 *
610 * We use a barrier here so that the c 596 * We use a barrier here so that the call number and abort code can be
611 * read without needing to take a lock 597 * read without needing to take a lock.
612 * 598 *
613 * TODO: Make the incoming packet hand 599 * TODO: Make the incoming packet handler check this and handle
614 * terminal retransmission without req 600 * terminal retransmission without requiring access to the call.
615 */ 601 */
616 if (test_bit(RXRPC_CALL_EXPOSED, &call 602 if (test_bit(RXRPC_CALL_EXPOSED, &call->flags)) {
617 _debug("exposed %u,%u", call-> 603 _debug("exposed %u,%u", call->call_id, call->abort_code);
618 __rxrpc_disconnect_call(conn, 604 __rxrpc_disconnect_call(conn, call);
619 605
620 if (test_and_clear_bit(RXRPC_C 606 if (test_and_clear_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags)) {
621 trace_rxrpc_client(con 607 trace_rxrpc_client(conn, channel, rxrpc_client_to_active);
622 bundle->try_upgrade = 608 bundle->try_upgrade = false;
623 if (may_reuse) 609 if (may_reuse)
624 rxrpc_activate 610 rxrpc_activate_channels(bundle);
625 } 611 }
626 } 612 }
627 613
628 /* See if we can pass the channel dire 614 /* See if we can pass the channel directly to another call. */
629 if (may_reuse && !list_empty(&bundle-> 615 if (may_reuse && !list_empty(&bundle->waiting_calls)) {
630 trace_rxrpc_client(conn, chann 616 trace_rxrpc_client(conn, channel, rxrpc_client_chan_pass);
631 rxrpc_activate_one_channel(con 617 rxrpc_activate_one_channel(conn, channel);
632 return; 618 return;
633 } 619 }
634 620
635 /* Schedule the final ACK to be transm 621 /* Schedule the final ACK to be transmitted in a short while so that it
636 * can be skipped if we find a follow- 622 * can be skipped if we find a follow-on call. The first DATA packet
637 * of the follow on call will implicit 623 * of the follow on call will implicitly ACK this call.
638 */ 624 */
639 if (call->completion == RXRPC_CALL_SUC 625 if (call->completion == RXRPC_CALL_SUCCEEDED &&
640 test_bit(RXRPC_CALL_EXPOSED, &call 626 test_bit(RXRPC_CALL_EXPOSED, &call->flags)) {
641 unsigned long final_ack_at = j 627 unsigned long final_ack_at = jiffies + 2;
642 628
643 chan->final_ack_at = final_ack !! 629 WRITE_ONCE(chan->final_ack_at, final_ack_at);
644 smp_wmb(); /* vs rxrpc_process 630 smp_wmb(); /* vs rxrpc_process_delayed_final_acks() */
645 set_bit(RXRPC_CONN_FINAL_ACK_0 631 set_bit(RXRPC_CONN_FINAL_ACK_0 + channel, &conn->flags);
646 rxrpc_reduce_conn_timer(conn, 632 rxrpc_reduce_conn_timer(conn, final_ack_at);
647 } 633 }
648 634
649 /* Deactivate the channel. */ 635 /* Deactivate the channel. */
650 chan->call = NULL; 636 chan->call = NULL;
651 set_bit(conn->bundle_shift + channel, 637 set_bit(conn->bundle_shift + channel, &conn->bundle->avail_chans);
652 conn->act_chans &= ~(1 << channel); 638 conn->act_chans &= ~(1 << channel);
653 639
654 /* If no channels remain active, then 640 /* If no channels remain active, then put the connection on the idle
655 * list for a short while. Give it a 641 * list for a short while. Give it a ref to stop it going away if it
656 * becomes unbundled. 642 * becomes unbundled.
657 */ 643 */
658 if (!conn->act_chans) { 644 if (!conn->act_chans) {
659 trace_rxrpc_client(conn, chann 645 trace_rxrpc_client(conn, channel, rxrpc_client_to_idle);
660 conn->idle_timestamp = jiffies 646 conn->idle_timestamp = jiffies;
661 647
662 rxrpc_get_connection(conn, rxr 648 rxrpc_get_connection(conn, rxrpc_conn_get_idle);
663 list_move_tail(&conn->cache_li 649 list_move_tail(&conn->cache_link, &local->idle_client_conns);
664 650
665 rxrpc_set_client_reap_timer(lo 651 rxrpc_set_client_reap_timer(local);
666 } 652 }
667 } 653 }
668 654
669 /* 655 /*
670 * Remove a connection from a bundle. 656 * Remove a connection from a bundle.
671 */ 657 */
672 static void rxrpc_unbundle_conn(struct rxrpc_c 658 static void rxrpc_unbundle_conn(struct rxrpc_connection *conn)
673 { 659 {
674 struct rxrpc_bundle *bundle = conn->bu 660 struct rxrpc_bundle *bundle = conn->bundle;
675 unsigned int bindex; 661 unsigned int bindex;
676 int i; 662 int i;
677 663
678 _enter("C=%x", conn->debug_id); 664 _enter("C=%x", conn->debug_id);
679 665
680 if (conn->flags & RXRPC_CONN_FINAL_ACK 666 if (conn->flags & RXRPC_CONN_FINAL_ACK_MASK)
681 rxrpc_process_delayed_final_ac 667 rxrpc_process_delayed_final_acks(conn, true);
682 668
683 bindex = conn->bundle_shift / RXRPC_MA 669 bindex = conn->bundle_shift / RXRPC_MAXCALLS;
684 if (bundle->conns[bindex] == conn) { 670 if (bundle->conns[bindex] == conn) {
685 _debug("clear slot %u", bindex 671 _debug("clear slot %u", bindex);
686 bundle->conns[bindex] = NULL; 672 bundle->conns[bindex] = NULL;
687 bundle->conn_ids[bindex] = 0; <<
688 for (i = 0; i < RXRPC_MAXCALLS 673 for (i = 0; i < RXRPC_MAXCALLS; i++)
689 clear_bit(conn->bundle 674 clear_bit(conn->bundle_shift + i, &bundle->avail_chans);
690 rxrpc_put_client_connection_id 675 rxrpc_put_client_connection_id(bundle->local, conn);
691 rxrpc_deactivate_bundle(bundle 676 rxrpc_deactivate_bundle(bundle);
692 rxrpc_put_connection(conn, rxr 677 rxrpc_put_connection(conn, rxrpc_conn_put_unbundle);
693 } 678 }
694 } 679 }
695 680
696 /* 681 /*
697 * Drop the active count on a bundle. 682 * Drop the active count on a bundle.
698 */ 683 */
699 void rxrpc_deactivate_bundle(struct rxrpc_bund 684 void rxrpc_deactivate_bundle(struct rxrpc_bundle *bundle)
700 { 685 {
701 struct rxrpc_local *local; 686 struct rxrpc_local *local;
702 bool need_put = false; 687 bool need_put = false;
703 688
704 if (!bundle) 689 if (!bundle)
705 return; 690 return;
706 691
707 local = bundle->local; 692 local = bundle->local;
708 if (atomic_dec_and_lock(&bundle->activ 693 if (atomic_dec_and_lock(&bundle->active, &local->client_bundles_lock)) {
709 if (!bundle->exclusive) { 694 if (!bundle->exclusive) {
710 _debug("erase bundle") 695 _debug("erase bundle");
711 rb_erase(&bundle->loca 696 rb_erase(&bundle->local_node, &local->client_bundles);
712 need_put = true; 697 need_put = true;
713 } 698 }
714 699
715 spin_unlock(&local->client_bun 700 spin_unlock(&local->client_bundles_lock);
716 if (need_put) 701 if (need_put)
717 rxrpc_put_bundle(bundl 702 rxrpc_put_bundle(bundle, rxrpc_bundle_put_discard);
718 } 703 }
719 } 704 }
720 705
721 /* 706 /*
722 * Clean up a dead client connection. 707 * Clean up a dead client connection.
723 */ 708 */
724 void rxrpc_kill_client_conn(struct rxrpc_conne 709 void rxrpc_kill_client_conn(struct rxrpc_connection *conn)
725 { 710 {
726 struct rxrpc_local *local = conn->loca 711 struct rxrpc_local *local = conn->local;
727 struct rxrpc_net *rxnet = local->rxnet 712 struct rxrpc_net *rxnet = local->rxnet;
728 713
729 _enter("C=%x", conn->debug_id); 714 _enter("C=%x", conn->debug_id);
730 715
731 trace_rxrpc_client(conn, -1, rxrpc_cli 716 trace_rxrpc_client(conn, -1, rxrpc_client_cleanup);
732 atomic_dec(&rxnet->nr_client_conns); 717 atomic_dec(&rxnet->nr_client_conns);
733 718
734 rxrpc_put_client_connection_id(local, 719 rxrpc_put_client_connection_id(local, conn);
735 } 720 }
736 721
737 /* 722 /*
738 * Discard expired client connections from the 723 * Discard expired client connections from the idle list. Each conn in the
739 * idle list has been exposed and holds an ext 724 * idle list has been exposed and holds an extra ref because of that.
740 * 725 *
741 * This may be called from conn setup or from 726 * This may be called from conn setup or from a work item so cannot be
742 * considered non-reentrant. 727 * considered non-reentrant.
743 */ 728 */
744 void rxrpc_discard_expired_client_conns(struct 729 void rxrpc_discard_expired_client_conns(struct rxrpc_local *local)
745 { 730 {
746 struct rxrpc_connection *conn; 731 struct rxrpc_connection *conn;
747 unsigned long expiry, conn_expires_at, 732 unsigned long expiry, conn_expires_at, now;
748 unsigned int nr_conns; 733 unsigned int nr_conns;
749 734
750 _enter(""); 735 _enter("");
751 736
752 /* We keep an estimate of what the num 737 /* We keep an estimate of what the number of conns ought to be after
753 * we've discarded some so that we don 738 * we've discarded some so that we don't overdo the discarding.
754 */ 739 */
755 nr_conns = atomic_read(&local->rxnet-> 740 nr_conns = atomic_read(&local->rxnet->nr_client_conns);
756 741
757 next: 742 next:
758 conn = list_first_entry_or_null(&local 743 conn = list_first_entry_or_null(&local->idle_client_conns,
759 struct 744 struct rxrpc_connection, cache_link);
760 if (!conn) 745 if (!conn)
761 return; 746 return;
762 747
763 if (!local->kill_all_client_conns) { 748 if (!local->kill_all_client_conns) {
764 /* If the number of connection 749 /* If the number of connections is over the reap limit, we
765 * expedite discard by reducin 750 * expedite discard by reducing the expiry timeout. We must,
766 * however, have at least a sh 751 * however, have at least a short grace period to be able to do
767 * final-ACK or ABORT retransm 752 * final-ACK or ABORT retransmission.
768 */ 753 */
769 expiry = rxrpc_conn_idle_clien 754 expiry = rxrpc_conn_idle_client_expiry;
770 if (nr_conns > rxrpc_reap_clie 755 if (nr_conns > rxrpc_reap_client_connections)
771 expiry = rxrpc_conn_id 756 expiry = rxrpc_conn_idle_client_fast_expiry;
772 if (conn->local->service_close 757 if (conn->local->service_closed)
773 expiry = rxrpc_closed_ 758 expiry = rxrpc_closed_conn_expiry * HZ;
774 759
775 conn_expires_at = conn->idle_t 760 conn_expires_at = conn->idle_timestamp + expiry;
776 761
777 now = jiffies; !! 762 now = READ_ONCE(jiffies);
778 if (time_after(conn_expires_at 763 if (time_after(conn_expires_at, now))
779 goto not_yet_expired; 764 goto not_yet_expired;
780 } 765 }
781 766
782 atomic_dec(&conn->active); 767 atomic_dec(&conn->active);
783 trace_rxrpc_client(conn, -1, rxrpc_cli 768 trace_rxrpc_client(conn, -1, rxrpc_client_discard);
784 list_del_init(&conn->cache_link); 769 list_del_init(&conn->cache_link);
785 770
786 rxrpc_unbundle_conn(conn); 771 rxrpc_unbundle_conn(conn);
787 /* Drop the ->cache_link ref */ 772 /* Drop the ->cache_link ref */
788 rxrpc_put_connection(conn, rxrpc_conn_ 773 rxrpc_put_connection(conn, rxrpc_conn_put_discard_idle);
789 774
790 nr_conns--; 775 nr_conns--;
791 goto next; 776 goto next;
792 777
793 not_yet_expired: 778 not_yet_expired:
794 /* The connection at the front of the 779 /* The connection at the front of the queue hasn't yet expired, so
795 * schedule the work item for that poi 780 * schedule the work item for that point if we discarded something.
796 * 781 *
797 * We don't worry if the work item is 782 * We don't worry if the work item is already scheduled - it can look
798 * after rescheduling itself at a late 783 * after rescheduling itself at a later time. We could cancel it, but
799 * then things get messier. 784 * then things get messier.
800 */ 785 */
801 _debug("not yet"); 786 _debug("not yet");
802 if (!local->kill_all_client_conns) 787 if (!local->kill_all_client_conns)
803 timer_reduce(&local->client_co 788 timer_reduce(&local->client_conn_reap_timer, conn_expires_at);
804 789
805 _leave(""); 790 _leave("");
806 } 791 }
807 792
808 /* 793 /*
809 * Clean up the client connections on a local 794 * Clean up the client connections on a local endpoint.
810 */ 795 */
811 void rxrpc_clean_up_local_conns(struct rxrpc_l 796 void rxrpc_clean_up_local_conns(struct rxrpc_local *local)
812 { 797 {
813 struct rxrpc_connection *conn; 798 struct rxrpc_connection *conn;
814 799
815 _enter(""); 800 _enter("");
816 801
817 local->kill_all_client_conns = true; 802 local->kill_all_client_conns = true;
818 803
819 del_timer_sync(&local->client_conn_rea 804 del_timer_sync(&local->client_conn_reap_timer);
820 805
821 while ((conn = list_first_entry_or_nul 806 while ((conn = list_first_entry_or_null(&local->idle_client_conns,
822 807 struct rxrpc_connection, cache_link))) {
823 list_del_init(&conn->cache_lin 808 list_del_init(&conn->cache_link);
824 atomic_dec(&conn->active); 809 atomic_dec(&conn->active);
825 trace_rxrpc_client(conn, -1, r 810 trace_rxrpc_client(conn, -1, rxrpc_client_discard);
826 rxrpc_unbundle_conn(conn); 811 rxrpc_unbundle_conn(conn);
827 rxrpc_put_connection(conn, rxr 812 rxrpc_put_connection(conn, rxrpc_conn_put_local_dead);
828 } 813 }
829 814
830 _leave(" [culled]"); 815 _leave(" [culled]");
831 } 816 }
832 817
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.