Skip to content

net/tcp: Dynamically disable TCP-MD5 static key

Dmitry Safonov lkml netdev 6 versions – 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 · linked by author and title

  1. v6 Latest5 patches 11 repliesApplied 5/5
  2. v55 patches 3 repliesSuperseded
  3. v45 patches 6 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v33 patches4 repliesSuperseded
v23 patches2 repliesSuperseded
v12 patches8 repliesSuperseded

Changes in v6 from the cover letter

- Corrected comment for static_key_fast_inc_not_negative() (Peter)
- Renamed static_key_fast_inc_not_negative() => static_key_fast_inc_not_disabled() (as suggested by Peter)
- static_key_fast_inc_not_disabled() is exported and declared in the patch 1 that defines it, rather than in patch 3 that uses it (Peter)

Patches in v6 All 5 applied

#Subject and filesSizeRepliesApplied
1/5jump_label: Prevent key->enabled int overflowinclude/linux/jump_label.h kernel/jump_label.c+61 -166 repliesApplied
2/5net/tcp: Separate tcp_md5sig_info allocation into tcp_md5sig_info_add()net/ipv4/tcp_ipv4.c+21 -90 repliesApplied
3/5net/tcp: Disable TCP-MD5 static key on tcp_md5sig_info destructioninclude/net/tcp.h net/ipv4/tcp.c net/ipv4/tcp_ipv4.c +3 more+84 -323 repliesApplied
4/5net/tcp: Do cleanup on tcp_md5_key_copy() failurenet/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c+10 -141 replyApplied
5/5net/tcp: Separate initialization of twsknet/ipv4/tcp_minisocks.c+35 -261 replyApplied

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchJakub KicinskiEric DumazetPeter Zijlstra (Intel)
1/5A-b A-b
2/5A-b R-b
3/5A-b R-b
4/5A-b R-b
5/5A-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/5] net/tcp: Dynamically disable TCP-MD5 static key

Changes from v5:
- Corrected comment for static_key_fast_inc_not_negative() (Peter)
- Renamed static_key_fast_inc_not_negative() => static_key_fast_inc_not_disabled() (as suggested by Peter)
- static_key_fast_inc_not_disabled() is exported and declared in the patch 1 that defines it, rather than in patch 3 that uses it (Peter)

Changes from v4:
- Used rcu_dereference_protected() for tp->md5sig_info in tcp_md5_do_add() and tcp_md5_key_copy() fail paths to make sure there won't be false-positives from sparse (Jakub)
- Added Acked-by: Jakub Kicinski

Changes from v3:
- Used atomic_try_cmpxchg() as suggested by Peter Zijlstra
- Renamed static_key_fast_inc() => static_key_fast_inc_not_negative() (addressing Peter Zijlstra's review)
- Based on linux-tip/master
- tcp_md5_key_copy() now does net_warn_ratelimited() (addressing Peter Zijlstra's review)
tcp_md5_do_add() does not as it returns -EUSERS from setsockopt() syscall back to the userspace
- Corrected WARN_ON_ONCE(!static_key_fast_inc(key)) (Spotted by Jason Baron)
- Moved declaration of static_key_fast_inc_not_negative() and its EXPORT_SYMBOL_GPL() to the patch 3 that uses it, "net/tcp: Disable TCP-MD5 static key on tcp_md5sig_info destruction" (addressing Peter Zijlstra's review)
- Added patch 4 that destroys the newly created request socket if md5 info allocation or static_key increment was unsuccessful. Instead of proceeding to add a socket without TCP-MD5 keys.
- Added patch 5 that separates helper tcp_time_wait_init() and converts BUG_ON() to WARN_ON_ONCE().

Changes from v2:
- Prevent key->enabled from turning negative by overflow from static_key_slow_inc() or static_key_fast_inc() (addressing Peter Zijlstra's review)
- Added checks if static_branch_inc() and static_key_fast_int() were successful to TCP-MD5 code.

Changes from v1:
- Add static_key_fast_inc() helper rather than open-coded atomic_inc() (as suggested by Eric Dumazet)

Version 5:
https://lore.kernel.org/all/[email protected]/T/#u
Version 4:
https://lore.kernel.org/all/[email protected]/T/#u
Version 3:
https://lore.kernel.org/all/[email protected]/T/#u
Version 2:
https://lore.kernel.org/all/[email protected]/T/#u
Version 1:
https://lore.kernel.org/all/[email protected]/T/#u

The static key introduced by commit 6015c71e656b ("tcp: md5: add tcp_md5_needed jump label") is a fast-path optimization aimed at avoiding a cache line miss.
Once an MD5 key is introduced in the system the static key is enabled and never disabled. Address this by disabling the static key when the last tcp_md5sig_info in system is destroyed.

Previously it was submitted as a part of TCP-AO patches set [1]. Now in attempt to split 36 patches submission, I send this independently.

Cc Ard Biesheuvel <[email protected]>
Cc Bob Gilligan <[email protected]>
Cc David Ahern <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dmitry Safonov <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Francesco Ruggeri <[email protected]>
Cc Hideaki YOSHIFUJI <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Jason Baron <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Salam Noureddine <[email protected]>
Cc Steven Rostedt <[email protected]>

[1]: https://lore.kernel.org/all/[email protected]/T/#u

Thanks,
Dmitry

Dmitry Safonov (5):
jump_label: Prevent key->enabled int overflow net/tcp: Separate tcp_md5sig_info allocation into

    tcp_md5sig_info_add()

net/tcp: Disable TCP-MD5 static key on tcp_md5sig_info destruction net/tcp: Do cleanup on tcp_md5_key_copy() failure net/tcp: Separate initialization of twsk

 include/linux/jump_label.h | 21 +++++++--
 include/net/tcp.h          | 10 ++--
 kernel/jump_label.c        | 56 +++++++++++++++++-----
 net/ipv4/tcp.c             |  5 +-
 net/ipv4/tcp_ipv4.c        | 96 +++++++++++++++++++++++++++++---------
 net/ipv4/tcp_minisocks.c   | 61 +++++++++++++++---------
 net/ipv4/tcp_output.c      |  4 +-
 net/ipv6/tcp_ipv6.c        | 21 ++++-----
 8 files changed, 194 insertions(+), 80 deletions(-)

base-commit: 736b6d81d93cf61a0601af90bd552103ef997b3f

Signature · 1 line
2.38.1