Skip to content

rxrpc: Increasing SACK size and moving away from softirq, part 5

David Howells lkml netdev 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest13 patches 1 replyApplied 13/13

Patches in v1 All 13 applied

#Subject and filesSizeRepliesApplied
1/13rxrpc: Fix trace stringinclude/trace/events/rxrpc.h net/rxrpc/call_accept.c+2 -20 repliesApplied
2/13rxrpc: Remove whitespace before ')' in trace headerinclude/trace/events/rxrpc.h+213 -2130 repliesApplied
3/13rxrpc: Shrink the tabulation in the rxrpc trace header a bitinclude/trace/events/rxrpc.h+98 -980 repliesApplied
4/13rxrpc: Convert call->recvmsg_lock to a spinlocknet/rxrpc/af_rxrpc.c net/rxrpc/ar-internal.h net/rxrpc/call_object.c +1 more+10 -100 repliesApplied
5/13rxrpc: Allow a delay to be injected into packet receptionnet/rxrpc/Kconfig net/rxrpc/ar-internal.h net/rxrpc/io_thread.c +3 more+91 -20 repliesApplied
6/13rxrpc: Generate extra pings for RTT during heavy-receive callinclude/trace/events/rxrpc.h net/rxrpc/call_event.c net/rxrpc/output.c+19 -60 repliesApplied
7/13rxrpc: De-atomic call->ackr_window and call->ackr_nr_unackedinclude/trace/events/rxrpc.h net/rxrpc/ar-internal.h net/rxrpc/call_event.c +5 more+28 -290 repliesApplied
8/13rxrpc: Simplify ACK handlinginclude/trace/events/rxrpc.h net/rxrpc/ar-internal.h net/rxrpc/input.c +1 more+73 -560 repliesApplied
9/13rxrpc: Don't lock call->tx_lock to access call->tx_buffernet/rxrpc/txbuf.c+2 -100 repliesApplied
10/13rxrpc: Remove local->defrag_semnet/rxrpc/ar-internal.h net/rxrpc/local_object.c net/rxrpc/output.c+0 -90 repliesApplied
11/13rxrpc: Show consumed and freed packets as non-dropped in dropwatchnet/rxrpc/skbuff.c+2 -21 replyApplied
12/13rxrpc: Change rx_packet tracepoint to display securityIndex not type twiceinclude/trace/events/rxrpc.h+2 -30 repliesApplied
13/13rxrpc: Kill service bundlenet/rxrpc/conn_service.c+0 -70 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH net-next 00/13] rxrpc: Increasing SACK size and moving away from softirq, part 5

Here's the fifth part of patches in the process of moving rxrpc from doing a lot of its stuff in softirq context to doing it in an I/O thread in process context and thereby making it easier to support a larger SACK table.

The full description is in the description for the first part[1] which is now upstream. The second and third parts are also upstream[2]. A subset of the original fourth part[3] got applied as a fix for a race[4].

The fifth part includes some cleanups:

(1) Miscellaneous trace header cleanups: fix a trace string, display the security index in rx_packet rather than displaying the type twice, remove some whitespace to make checkpatch happier and remove some excess tabulation.

(2) Convert ->recvmsg_lock to a spinlock as it's only ever locked exclusively.

(3) Make ->ackr_window and ->ackr_nr_unacked non-atomic as they're only used in the I/O thread.

(4) Don't use call->tx_lock to access ->tx_buffer as that is only accessed inside the I/O thread. sendmsg() loads onto ->tx_sendmsg and the I/O thread decants from that to the buffer.

(5) Remove local->defrag_sem as DATA packets are transmitted serially by the I/O thread.

(6) Remove the service connection bundle is it was only used for its channel_lock - which has now gone.

And some more significant changes:

(7) Add a debugging option to allow a delay to be injected into packet reception to help investigate the behaviour over longer links than just a few cm.

(8) Generate occasional PING ACKs to probe for RTT information during a receive heavy call.

(9) Simplify the SACK table maintenance and ACK generation. Now that both parts are done in the same thread, there's no possibility of a race and no need to try and be cunning to avoid taking a BH spinlock whilst copying the SACK table (which in the future will be up to 2K) and no need to rotate the copy to fit the ACK packet table.

(10) Use SKB_CONSUMED when freeing received DATA packets (stop dropwatch complaining).

The patches are tagged here:

	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/rxrpc-next-20230131

And can be found on this branch:

http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=rxrpc-next

David

David Howells (13):
rxrpc: Fix trace string
rxrpc: Remove whitespace before ')' in trace header
rxrpc: Shrink the tabulation in the rxrpc trace header a bit
rxrpc: Convert call->recvmsg_lock to a spinlock
rxrpc: Allow a delay to be injected into packet reception
rxrpc: Generate extra pings for RTT during heavy-receive call
rxrpc: De-atomic call->ackr_window and call->ackr_nr_unacked
rxrpc: Simplify ACK handling
rxrpc: Don't lock call->tx_lock to access call->tx_buffer
rxrpc: Remove local->defrag_sem
rxrpc: Show consumed and freed packets as non-dropped in dropwatch
rxrpc: Change rx_packet tracepoint to display securityIndex not type
twice
rxrpc: Kill service bundle

 include/trace/events/rxrpc.h | 480 +++++++++++++++++++----------------
 net/rxrpc/Kconfig            |   9 +
 net/rxrpc/af_rxrpc.c         |   2 +-
 net/rxrpc/ar-internal.h      |  15 +-
 net/rxrpc/call_accept.c      |   2 +-
 net/rxrpc/call_event.c       |  15 +-
 net/rxrpc/call_object.c      |   7 +-
 net/rxrpc/conn_service.c     |   7 -
 net/rxrpc/input.c            |  60 ++---
 net/rxrpc/io_thread.c        |  48 +++-
 net/rxrpc/local_object.c     |   7 +-
 net/rxrpc/misc.c             |   7 +
 net/rxrpc/output.c           |  69 ++---
 net/rxrpc/proc.c             |   4 +-
 net/rxrpc/recvmsg.c          |  18 +-
 net/rxrpc/skbuff.c           |   4 +-
 net/rxrpc/sysctl.c           |  17 +-
 net/rxrpc/txbuf.c            |  12 +-
 18 files changed, 438 insertions(+), 345 deletions(-)