iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rxrpc fixes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEqG5UsNXhtOCrfGQP+7dXa6fLC2sFAl+IRI8ACgkQ+7dXa6fL
 C2szew//cxlOShaXVprAcS/i5djASCbcL1qoEbz9O0FIXSdNdioeT9+CxSzvAecz
 weHsDtPoNYdLMzcM53KiB1OjBl8CngbV54zoe5jrOqIEyKa7ONzyi6WC3umwQT4I
 tTyr/yKs1XdQXfpICxadyOyVtNUF8cy4LcdAZUpbsNK1dGsRlxLMIzlqX4xMvh3+
 xatBIc/bqJ3SRLq2I/ceA7d+eGsIa7cMhNgnCZYTKpkJN0FAD/e7rp+DmULg5ZY0
 +6Y6G8LNd1yLq9hmFRBKQacx8zp3pV4srmrlDJOE754OMhYld9zw3hXPBBBDczIf
 qjEGxRixkbsNQsPvnPDCsQpzVhtXWTh14I4B/vD6I7uDNEOPLHE4/ootrjcGLakE
 vxd1HGrIpNNZGAVC6aj+nJTVALvZ1lc/u1xK7VNlIl5o5339FN8cOpLLTeE3NhZJ
 lZvcqFrsD59W+eFFdmpOMr3dzUK9o0ZtLEYuRyrHAWPThjpKmXbZZQd6pVGASv2b
 r5xJlgrFxVUAV4XDzbcmsNnuQ7zlfOTIThE+3s1evuckqfvrAg8r/PilXLPT3yCN
 btO8ZiwLZaaiKtKCDo7Iy1Fw7df32PxlBLub05WOC5HZMsTiemTxd20ENwIR8Zrk
 3hJE1IAyCjzry3XsFO9y+UrPlKcXihmmj2UKC8ibRArYNHtDMDc=
 =PsBi
 -----END PGP SIGNATURE-----

Merge tag 'rxrpc-next-20201015' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

David Howells says:

====================
rxrpc fixes

Here are a couple of fixes that need to be applied on top of rxrpc patches
in net-next:

 (1) Fix a bug in the connection bundle changes in the net-next tree.

 (2) Fix the loss of final ACK on socket shutdown.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2020-10-15 11:19:26 -07:00
commit 54086c5a7f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/rxrpc/ar-internal.h
View File

@ -831,6 +831,7 @@ void rxrpc_clean_up_local_conns(struct rxrpc_local *);
* conn_event.c * conn_event.c
*/ */
void rxrpc_process_connection(struct work_struct *); void rxrpc_process_connection(struct work_struct *);
void rxrpc_process_delayed_final_acks(struct rxrpc_connection *, bool);
/* /*
* conn_object.c * conn_object.c

8
net/rxrpc/conn_client.c
View File

@ -901,11 +901,14 @@ static void rxrpc_unbundle_conn(struct rxrpc_connection *conn)
struct rxrpc_bundle *bundle = conn->bundle; struct rxrpc_bundle *bundle = conn->bundle;
struct rxrpc_local *local = bundle->params.local; struct rxrpc_local *local = bundle->params.local;
unsigned int bindex; unsigned int bindex;
bool need_drop = false; bool need_drop = false, need_put = false;
int i; int i;
_enter("C=%x", conn->debug_id); _enter("C=%x", conn->debug_id);
if (conn->flags & RXRPC_CONN_FINAL_ACK_MASK)
rxrpc_process_delayed_final_acks(conn, true);
spin_lock(&bundle->channel_lock); spin_lock(&bundle->channel_lock);
bindex = conn->bundle_shift / RXRPC_MAXCALLS; bindex = conn->bundle_shift / RXRPC_MAXCALLS;
if (bundle->conns[bindex] == conn) { if (bundle->conns[bindex] == conn) {
@ -928,10 +931,11 @@ static void rxrpc_unbundle_conn(struct rxrpc_connection *conn)
if (i == ARRAY_SIZE(bundle->conns) && !bundle->params.exclusive) { if (i == ARRAY_SIZE(bundle->conns) && !bundle->params.exclusive) {
_debug("erase bundle"); _debug("erase bundle");
rb_erase(&bundle->local_node, &local->client_bundles); rb_erase(&bundle->local_node, &local->client_bundles);
need_put = true;
} }
spin_unlock(&local->client_bundles_lock); spin_unlock(&local->client_bundles_lock);
if (i == ARRAY_SIZE(bundle->conns)) if (need_put)
rxrpc_put_bundle(bundle); rxrpc_put_bundle(bundle);
} }

6
net/rxrpc/conn_event.c
View File

@ -397,7 +397,7 @@ abort:
/* /*
* Process delayed final ACKs that we haven't subsumed into a subsequent call. * Process delayed final ACKs that we haven't subsumed into a subsequent call.
*/ */
static void rxrpc_process_delayed_final_acks(struct rxrpc_connection *conn) void rxrpc_process_delayed_final_acks(struct rxrpc_connection *conn, bool force)
{ {
unsigned long j = jiffies, next_j; unsigned long j = jiffies, next_j;
unsigned int channel; unsigned int channel;
@ -416,7 +416,7 @@ again:
smp_rmb(); /* vs rxrpc_disconnect_client_call */ smp_rmb(); /* vs rxrpc_disconnect_client_call */
ack_at = READ_ONCE(chan->final_ack_at); ack_at = READ_ONCE(chan->final_ack_at);
if (time_before(j, ack_at)) { if (time_before(j, ack_at) && !force) {
if (time_before(ack_at, next_j)) { if (time_before(ack_at, next_j)) {
next_j = ack_at; next_j = ack_at;
set = true; set = true;
@ -450,7 +450,7 @@ static void rxrpc_do_process_connection(struct rxrpc_connection *conn)
/* Process delayed ACKs whose time has come. */ /* Process delayed ACKs whose time has come. */
if (conn->flags & RXRPC_CONN_FINAL_ACK_MASK) if (conn->flags & RXRPC_CONN_FINAL_ACK_MASK)
rxrpc_process_delayed_final_acks(conn); rxrpc_process_delayed_final_acks(conn, false);
/* go through the conn-level event packets, releasing the ref on this /* go through the conn-level event packets, releasing the ref on this
* connection that each one has when we've finished with it */ * connection that each one has when we've finished with it */