Skip to content

net/rds: Bug fix ports, part 2

Allison Henderson linux-rdma netdev 2 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 3 repliesApplied 2/2
  2. v14 patches 0 repliesSuperseded

Changes in v2 from the cover letter

- Patch 1: the comment now names rds_send_remove_from_sock() instead of vaguely blaming "the callees", and the restart-time invariant is enforced with a WARN_ON_ONCE(): entries still on the list there would keep their message reference and their RDS_MSG_ON_SOCK accounting, so a silent re-init would orphan them.
- Patch 2: for loopback the field held a live value written by rds_send_queue_rm(), not garbage; rds_loop_xmit() now uses rds_inc_path_init() so the re-initialization keeps it valid, and the commit message describes the two transports accurately.

[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/

Patches in v2 All 2 applied

#Subject and filesSizeRepliesApplied
1/2net/rds: reinitialize to_be_dropped on rds_send_xmit() restartnet/rds/send.c+8 -00 repliesApplied
2/2net/rds: initialize i_conn_path in rds_inc_init()net/rds/loop.c net/rds/recv.c+6 -11 replyApplied

Reviews trailers per patch

None of the 2 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchSimon Horman
SeriesR-b
1/2
2/2

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH net-next v2 0/2] net/rds: Bug fix ports, part 2

Hi all,

This is the next batch of net/rds fixes ported from the Oracle UEK kernel, following up on the first set now in net-next [1].

This is v2 of patches 1 and 2 of "net/rds: Bug fix ports, part 2" [2], which contained two initialization-hardening ports. While re-reviewing v1's patches 3 and 4 (the fastpath-lock teardown changes) I found their locking needs more rework than a respin should carry, so they are split out and will return as their own series together with two companion fixes. The two patches here are independent of them.

[PATCH net 1/2] net/rds: reinitialize to_be_dropped on rds_send_xmit() restart
Port commit 7f52b9968d79 ("net/rds: rds_send_xmit should INIT_LIST_HEAD (&to_be_dropped) on restart")
https://github.com/oracle/linux-uek/commit/7f52b9968d79

[PATCH net 2/2] net/rds: initialize i_conn_path in rds_inc_init()
Port commit 0ec6a520da4f ("rds: rds_inc_init() should initialize the inc->i_conn_path field")
https://github.com/oracle/linux-uek/commit/0ec6a520da4f

Questions and comments appreciated!

Thanks,
Allison

v2:
- Patch 1: the comment now names rds_send_remove_from_sock() instead of vaguely blaming "the callees", and the restart-time invariant is enforced with a WARN_ON_ONCE(): entries still on the list there would keep their message reference and their RDS_MSG_ON_SOCK accounting, so a silent re-init would orphan them.
- Patch 2: for loopback the field held a live value written by rds_send_queue_rm(), not garbage; rds_loop_xmit() now uses rds_inc_path_init() so the re-initialization keeps it valid, and the commit message describes the two transports accurately.

[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/

Sharath Srinivasan (1):
net/rds: reinitialize to_be_dropped on rds_send_xmit() restart

William Kucharski (1):
net/rds: initialize i_conn_path in rds_inc_init()

 net/rds/loop.c | 6 +++++-
 net/rds/recv.c | 1 +
 net/rds/send.c | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

base-commit: 4fa4977a0d900f936bcae5cd2c510be5554e8dd6

Signature · 1 line
2.25.1