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

Message

Dmitry Safonov Nov. 23, 2022, 5:38 p.m. UTC

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/[e-mail]/T/#u
Version 4:
https://lore.kernel.org/all/[e-mail]/T/#u
Version 3:
https://lore.kernel.org/all/[e-mail]/T/#u
Version 2: 
https://lore.kernel.org/all/[e-mail]/T/#u
Version 1: 
https://lore.kernel.org/all/[e-mail]/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 <[e-mail]>
Cc: Bob Gilligan <[e-mail]>
Cc: David Ahern <[e-mail]>
Cc: "David S. Miller" <[e-mail]>
Cc: Dmitry Safonov <[e-mail]>
Cc: Eric Dumazet <[e-mail]>
Cc: Francesco Ruggeri <[e-mail]>
Cc: Hideaki YOSHIFUJI <[e-mail]>
Cc: Jakub Kicinski <[e-mail]>
Cc: Jason Baron <[e-mail]>
Cc: Josh Poimboeuf <[e-mail]>
Cc: Paolo Abeni <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Salam Noureddine <[e-mail]>
Cc: Steven Rostedt <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]

[1]: https://lore.kernel.org/all/[e-mail]/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

Comments

[e-mail] Dec. 2, 2022, 4:10 a.m. UTC | #1

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <[e-mail]>:

On Wed, 23 Nov 2022 17:38:54 +0000 you wrote:
> 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)
> 
> [...]

Here is the summary with links:
  - [v6,1/5] jump_label: Prevent key->enabled int overflow
    https://git.kernel.org/netdev/net-next/c/eb8c507296f6
  - [v6,2/5] net/tcp: Separate tcp_md5sig_info allocation into tcp_md5sig_info_add()
    https://git.kernel.org/netdev/net-next/c/f62c7517ffa1
  - [v6,3/5] net/tcp: Disable TCP-MD5 static key on tcp_md5sig_info destruction
    https://git.kernel.org/netdev/net-next/c/459837b522f7
  - [v6,4/5] net/tcp: Do cleanup on tcp_md5_key_copy() failure
    https://git.kernel.org/netdev/net-next/c/b389d1affc2c
  - [v6,5/5] net/tcp: Separate initialization of twsk
    https://git.kernel.org/netdev/net-next/c/c5b8b515a211

You are awesome, thank you!