| Message ID | 20240813232628.408515-1-vinicius.peixoto@canonical.com |
|---|---|
| Headers | show |
| Series | Backport sysctl_tcp_rto_min_us | expand |
The commit hash in the `cherry picked from` line from patch "tcp: derive
delack_max with tcp_rto_min helper" points to a different upstream
commit ("netns-ipv4: reorganize netns_ipv4 fast path variables") instead.
On 13/08/2024 20:26, Vinicius Peixoto wrote:
> BugLink: https://bugs.launchpad.net/bugs/2076950
>
> [Impact]
>
> Google has requested backports for the following upstream patches:
>
> f086edef71be7174a16c1ed67ac65a085cda28b1 tcp: add sysctl_tcp_rto_min_us
> 5258da376f3c51332f917087361caf4c76e9e84f tcp: derive delack_max with tcp_rto_min helper
>
> [Fix]
>
> Noble:
> * Backported due to context conflicts
> Jammy:
> * Clean cherry-pick for pre-req commit f086edef71be
Is f086edef71be the pre-req commit or would that be upstream commit
bbf80d713fe7 ("tcp: derive delack_max from rto_min")?
> * Fixed context the same context conflicts as Noble, plus a few others
> due to other missing commits that add unrelated TCP sysctls
>
> [Test plan]
> * Build and boot tested
> * Tested if the new sysctl was added:
> $ sysctl net.ipv4.tcp_rto_min_us
> net.ipv4.tcp_rto_min_us = 200000
> $ sysctl -w net.ipv4.tcp_rto_min_us=50000
> net.ipv4.tcp_rto_min_us = 50000
> * Ran the kernel selftests in tools/testing/selftests/net to ensure
> basic network functionality wasn't compromised
>
> [Where problems could occur]
> Since this this adds new networking functionality, any problems here
> would impact networking on affected systems.
>
> [Other info]
> #SF 00392021
>
> Eric Dumazet (1):
> tcp: derive delack_max from rto_min
>
> Kevin Yang (2):
> tcp: derive delack_max with tcp_rto_min helper
> tcp: add sysctl_tcp_rto_min_us
>
> Documentation/networking/ip-sysctl.rst | 13 +++++++++++++
> include/net/netns/ipv4.h | 1 +
> include/net/tcp.h | 2 ++
> net/ipv4/sysctl_net_ipv4.c | 8 ++++++++
> net/ipv4/tcp.c | 7 +++++--
> net/ipv4/tcp_ipv4.c | 2 ++
> net/ipv4/tcp_output.c | 9 ++++++++-
> 7 files changed, 39 insertions(+), 3 deletions(-)
>
BugLink: https://bugs.launchpad.net/bugs/2076950 [Impact] Google has requested backports for the following upstream patches: f086edef71be7174a16c1ed67ac65a085cda28b1 tcp: add sysctl_tcp_rto_min_us 5258da376f3c51332f917087361caf4c76e9e84f tcp: derive delack_max with tcp_rto_min helper [Fix] Noble: * Backported due to context conflicts Jammy: * Clean cherry-pick for pre-req commit f086edef71be * Fixed context the same context conflicts as Noble, plus a few others due to other missing commits that add unrelated TCP sysctls [Test plan] * Build and boot tested * Tested if the new sysctl was added: $ sysctl net.ipv4.tcp_rto_min_us net.ipv4.tcp_rto_min_us = 200000 $ sysctl -w net.ipv4.tcp_rto_min_us=50000 net.ipv4.tcp_rto_min_us = 50000 * Ran the kernel selftests in tools/testing/selftests/net to ensure basic network functionality wasn't compromised [Where problems could occur] Since this this adds new networking functionality, any problems here would impact networking on affected systems. [Other info] #SF 00392021 Eric Dumazet (1): tcp: derive delack_max from rto_min Kevin Yang (2): tcp: derive delack_max with tcp_rto_min helper tcp: add sysctl_tcp_rto_min_us Documentation/networking/ip-sysctl.rst | 13 +++++++++++++ include/net/netns/ipv4.h | 1 + include/net/tcp.h | 2 ++ net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ net/ipv4/tcp.c | 7 +++++-- net/ipv4/tcp_ipv4.c | 2 ++ net/ipv4/tcp_output.c | 9 ++++++++- 7 files changed, 39 insertions(+), 3 deletions(-)