| Message ID | 20240813232540.408387-1-vinicius.peixoto@canonical.com |
|---|---|
| Headers | show |
| Series | Backport sysctl_tcp_rto_min_us | expand |
Both commits have the same commit hash in the cherry-picked/backported line, which doesn't seem right. Also, I couldn't find 5258da376f3c51332f917087361caf4c76e9e84f in upstream repos. On 13/08/2024 20:25, 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 > * 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 > > 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 + > net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ > net/ipv4/tcp.c | 4 +++- > net/ipv4/tcp_ipv4.c | 1 + > net/ipv4/tcp_output.c | 11 ++--------- > 6 files changed, 28 insertions(+), 10 deletions(-) >
On 8/14/24 10:30, Magali Lemes wrote: > Both commits have the same commit hash in the cherry-picked/backported > line, which doesn't seem right. Also, I couldn't find > 5258da376f3c51332f917087361caf4c76e9e84f in upstream repos. Thanks for catching this, Magali! I'll be sending a v2 shortly. > > On 13/08/2024 20:25, 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 >> * 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 >> >> 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 + >> net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ >> net/ipv4/tcp.c | 4 +++- >> net/ipv4/tcp_ipv4.c | 1 + >> net/ipv4/tcp_output.c | 11 ++--------- >> 6 files changed, 28 insertions(+), 10 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 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 + net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ net/ipv4/tcp.c | 4 +++- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_output.c | 11 ++--------- 6 files changed, 28 insertions(+), 10 deletions(-)