From: Greg Kroah-Hartman Date: Fri, 18 Oct 2024 10:40:53 +0000 (+0200) Subject: 6.11-stable patches X-Git-Tag: v5.10.228~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=167ed4cc9ad1b4b8e3e06bf1f75b7fcaeba4ded1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.11-stable patches added patches: net-fec-move-fec_ptp_read-to-the-top-of-the-file.patch net-fec-remove-duplicated-code.patch tcp-fix-mptcp-dss-corruption-due-to-large-pmtu-xmit.patch --- diff --git a/queue-6.11/net-fec-move-fec_ptp_read-to-the-top-of-the-file.patch b/queue-6.11/net-fec-move-fec_ptp_read-to-the-top-of-the-file.patch new file mode 100644 index 00000000000..a25060211d2 --- /dev/null +++ b/queue-6.11/net-fec-move-fec_ptp_read-to-the-top-of-the-file.patch @@ -0,0 +1,100 @@ +From 4374a1fe580a14f6152752390c678d90311df247 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cs=C3=B3k=C3=A1s=2C=20Bence?= +Date: Mon, 12 Aug 2024 11:47:13 +0200 +Subject: net: fec: Move `fec_ptp_read()` to the top of the file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Csókás, Bence + +commit 4374a1fe580a14f6152752390c678d90311df247 upstream. + +This function is used in `fec_ptp_enable_pps()` through +struct cyclecounter read(). Moving the declaration makes +it clearer, what's happening. + +Suggested-by: Frank Li +Link: https://lore.kernel.org/netdev/20240805144754.2384663-1-csokas.bence@prolan.hu/T/#ma6c21ad264016c24612048b1483769eaff8cdf20 +Signed-off-by: Csókás, Bence +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20240812094713.2883476-1-csokas.bence@prolan.hu +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/fec_ptp.c | 50 +++++++++++++++---------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +--- a/drivers/net/ethernet/freescale/fec_ptp.c ++++ b/drivers/net/ethernet/freescale/fec_ptp.c +@@ -91,6 +91,30 @@ + #define FEC_PTP_MAX_NSEC_COUNTER 0x80000000ULL + + /** ++ * fec_ptp_read - read raw cycle counter (to be used by time counter) ++ * @cc: the cyclecounter structure ++ * ++ * this function reads the cyclecounter registers and is called by the ++ * cyclecounter structure used to construct a ns counter from the ++ * arbitrary fixed point registers ++ */ ++static u64 fec_ptp_read(const struct cyclecounter *cc) ++{ ++ struct fec_enet_private *fep = ++ container_of(cc, struct fec_enet_private, cc); ++ u32 tempval; ++ ++ tempval = readl(fep->hwp + FEC_ATIME_CTRL); ++ tempval |= FEC_T_CTRL_CAPTURE; ++ writel(tempval, fep->hwp + FEC_ATIME_CTRL); ++ ++ if (fep->quirks & FEC_QUIRK_BUG_CAPTURE) ++ udelay(1); ++ ++ return readl(fep->hwp + FEC_ATIME); ++} ++ ++/** + * fec_ptp_enable_pps + * @fep: the fec_enet_private structure handle + * @enable: enable the channel pps output +@@ -136,7 +160,7 @@ static int fec_ptp_enable_pps(struct fec + * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds + * to current timer would be next second. + */ +- tempval = fep->cc.read(&fep->cc); ++ tempval = fec_ptp_read(&fep->cc); + /* Convert the ptp local counter to 1588 timestamp */ + ns = timecounter_cyc2time(&fep->tc, tempval); + ts = ns_to_timespec64(ns); +@@ -272,30 +296,6 @@ static enum hrtimer_restart fec_ptp_pps_ + } + + /** +- * fec_ptp_read - read raw cycle counter (to be used by time counter) +- * @cc: the cyclecounter structure +- * +- * this function reads the cyclecounter registers and is called by the +- * cyclecounter structure used to construct a ns counter from the +- * arbitrary fixed point registers +- */ +-static u64 fec_ptp_read(const struct cyclecounter *cc) +-{ +- struct fec_enet_private *fep = +- container_of(cc, struct fec_enet_private, cc); +- u32 tempval; +- +- tempval = readl(fep->hwp + FEC_ATIME_CTRL); +- tempval |= FEC_T_CTRL_CAPTURE; +- writel(tempval, fep->hwp + FEC_ATIME_CTRL); +- +- if (fep->quirks & FEC_QUIRK_BUG_CAPTURE) +- udelay(1); +- +- return readl(fep->hwp + FEC_ATIME); +-} +- +-/** + * fec_ptp_start_cyclecounter - create the cycle counter from hw + * @ndev: network device + * diff --git a/queue-6.11/net-fec-remove-duplicated-code.patch b/queue-6.11/net-fec-remove-duplicated-code.patch new file mode 100644 index 00000000000..99619781af9 --- /dev/null +++ b/queue-6.11/net-fec-remove-duplicated-code.patch @@ -0,0 +1,41 @@ +From 713ebaed68d88121cbaf5e74104e2290a9ea74bd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cs=C3=B3k=C3=A1s=2C=20Bence?= +Date: Mon, 12 Aug 2024 11:47:15 +0200 +Subject: net: fec: Remove duplicated code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Csókás, Bence + +commit 713ebaed68d88121cbaf5e74104e2290a9ea74bd upstream. + +`fec_ptp_pps_perout()` reimplements logic already +in `fec_ptp_read()`. Replace with function call. + +Signed-off-by: Csókás, Bence +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20240812094713.2883476-2-csokas.bence@prolan.hu +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/fec_ptp.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +--- a/drivers/net/ethernet/freescale/fec_ptp.c ++++ b/drivers/net/ethernet/freescale/fec_ptp.c +@@ -235,13 +235,7 @@ static int fec_ptp_pps_perout(struct fec + timecounter_read(&fep->tc); + + /* Get the current ptp hardware time counter */ +- temp_val = readl(fep->hwp + FEC_ATIME_CTRL); +- temp_val |= FEC_T_CTRL_CAPTURE; +- writel(temp_val, fep->hwp + FEC_ATIME_CTRL); +- if (fep->quirks & FEC_QUIRK_BUG_CAPTURE) +- udelay(1); +- +- ptp_hc = readl(fep->hwp + FEC_ATIME); ++ ptp_hc = fec_ptp_read(&fep->cc); + + /* Convert the ptp local counter to 1588 timestamp */ + curr_time = timecounter_cyc2time(&fep->tc, ptp_hc); diff --git a/queue-6.11/series b/queue-6.11/series index 2f1b7464c5c..db74095009e 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -29,3 +29,6 @@ mm-khugepaged-fix-the-arguments-order-in-khugepaged_collapse_file-trace-point.pa mm-mglru-only-clear-kswapd_failures-if-reclaimable.patch mm-swapfile-skip-hugetlb-pages-for-unuse_vma.patch mm-damon-tests-sysfs-kunit.h-fix-memory-leak-in-damon_sysfs_test_add_targets.patch +tcp-fix-mptcp-dss-corruption-due-to-large-pmtu-xmit.patch +net-fec-move-fec_ptp_read-to-the-top-of-the-file.patch +net-fec-remove-duplicated-code.patch diff --git a/queue-6.11/tcp-fix-mptcp-dss-corruption-due-to-large-pmtu-xmit.patch b/queue-6.11/tcp-fix-mptcp-dss-corruption-due-to-large-pmtu-xmit.patch new file mode 100644 index 00000000000..c9c8c6dca52 --- /dev/null +++ b/queue-6.11/tcp-fix-mptcp-dss-corruption-due-to-large-pmtu-xmit.patch @@ -0,0 +1,142 @@ +From 4dabcdf581217e60690467a37c956a5b8dbc6bd9 Mon Sep 17 00:00:00 2001 +From: Paolo Abeni +Date: Tue, 8 Oct 2024 13:04:53 +0200 +Subject: tcp: fix mptcp DSS corruption due to large pmtu xmit + +From: Paolo Abeni + +commit 4dabcdf581217e60690467a37c956a5b8dbc6bd9 upstream. + +Syzkaller was able to trigger a DSS corruption: + + TCP: request_sock_subflow_v4: Possible SYN flooding on port [::]:20002. Sending cookies. + ------------[ cut here ]------------ + WARNING: CPU: 0 PID: 5227 at net/mptcp/protocol.c:695 __mptcp_move_skbs_from_subflow+0x20a9/0x21f0 net/mptcp/protocol.c:695 + Modules linked in: + CPU: 0 UID: 0 PID: 5227 Comm: syz-executor350 Not tainted 6.11.0-syzkaller-08829-gaf9c191ac2a0 #0 + Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/06/2024 + RIP: 0010:__mptcp_move_skbs_from_subflow+0x20a9/0x21f0 net/mptcp/protocol.c:695 + Code: 0f b6 dc 31 ff 89 de e8 b5 dd ea f5 89 d8 48 81 c4 50 01 00 00 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc e8 98 da ea f5 90 <0f> 0b 90 e9 47 ff ff ff e8 8a da ea f5 90 0f 0b 90 e9 99 e0 ff ff + RSP: 0018:ffffc90000006db8 EFLAGS: 00010246 + RAX: ffffffff8ba9df18 RBX: 00000000000055f0 RCX: ffff888030023c00 + RDX: 0000000000000100 RSI: 00000000000081e5 RDI: 00000000000055f0 + RBP: 1ffff110062bf1ae R08: ffffffff8ba9cf12 R09: 1ffff110062bf1b8 + R10: dffffc0000000000 R11: ffffed10062bf1b9 R12: 0000000000000000 + R13: dffffc0000000000 R14: 00000000700cec61 R15: 00000000000081e5 + FS: 000055556679c380(0000) GS:ffff8880b8600000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 0000000020287000 CR3: 0000000077892000 CR4: 00000000003506f0 + DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 + DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 + Call Trace: + + move_skbs_to_msk net/mptcp/protocol.c:811 [inline] + mptcp_data_ready+0x29c/0xa90 net/mptcp/protocol.c:854 + subflow_data_ready+0x34a/0x920 net/mptcp/subflow.c:1490 + tcp_data_queue+0x20fd/0x76c0 net/ipv4/tcp_input.c:5283 + tcp_rcv_established+0xfba/0x2020 net/ipv4/tcp_input.c:6237 + tcp_v4_do_rcv+0x96d/0xc70 net/ipv4/tcp_ipv4.c:1915 + tcp_v4_rcv+0x2dc0/0x37f0 net/ipv4/tcp_ipv4.c:2350 + ip_protocol_deliver_rcu+0x22e/0x440 net/ipv4/ip_input.c:205 + ip_local_deliver_finish+0x341/0x5f0 net/ipv4/ip_input.c:233 + NF_HOOK+0x3a4/0x450 include/linux/netfilter.h:314 + NF_HOOK+0x3a4/0x450 include/linux/netfilter.h:314 + __netif_receive_skb_one_core net/core/dev.c:5662 [inline] + __netif_receive_skb+0x2bf/0x650 net/core/dev.c:5775 + process_backlog+0x662/0x15b0 net/core/dev.c:6107 + __napi_poll+0xcb/0x490 net/core/dev.c:6771 + napi_poll net/core/dev.c:6840 [inline] + net_rx_action+0x89b/0x1240 net/core/dev.c:6962 + handle_softirqs+0x2c5/0x980 kernel/softirq.c:554 + do_softirq+0x11b/0x1e0 kernel/softirq.c:455 + + + __local_bh_enable_ip+0x1bb/0x200 kernel/softirq.c:382 + local_bh_enable include/linux/bottom_half.h:33 [inline] + rcu_read_unlock_bh include/linux/rcupdate.h:919 [inline] + __dev_queue_xmit+0x1764/0x3e80 net/core/dev.c:4451 + dev_queue_xmit include/linux/netdevice.h:3094 [inline] + neigh_hh_output include/net/neighbour.h:526 [inline] + neigh_output include/net/neighbour.h:540 [inline] + ip_finish_output2+0xd41/0x1390 net/ipv4/ip_output.c:236 + ip_local_out net/ipv4/ip_output.c:130 [inline] + __ip_queue_xmit+0x118c/0x1b80 net/ipv4/ip_output.c:536 + __tcp_transmit_skb+0x2544/0x3b30 net/ipv4/tcp_output.c:1466 + tcp_transmit_skb net/ipv4/tcp_output.c:1484 [inline] + tcp_mtu_probe net/ipv4/tcp_output.c:2547 [inline] + tcp_write_xmit+0x641d/0x6bf0 net/ipv4/tcp_output.c:2752 + __tcp_push_pending_frames+0x9b/0x360 net/ipv4/tcp_output.c:3015 + tcp_push_pending_frames include/net/tcp.h:2107 [inline] + tcp_data_snd_check net/ipv4/tcp_input.c:5714 [inline] + tcp_rcv_established+0x1026/0x2020 net/ipv4/tcp_input.c:6239 + tcp_v4_do_rcv+0x96d/0xc70 net/ipv4/tcp_ipv4.c:1915 + sk_backlog_rcv include/net/sock.h:1113 [inline] + __release_sock+0x214/0x350 net/core/sock.c:3072 + release_sock+0x61/0x1f0 net/core/sock.c:3626 + mptcp_push_release net/mptcp/protocol.c:1486 [inline] + __mptcp_push_pending+0x6b5/0x9f0 net/mptcp/protocol.c:1625 + mptcp_sendmsg+0x10bb/0x1b10 net/mptcp/protocol.c:1903 + sock_sendmsg_nosec net/socket.c:730 [inline] + __sock_sendmsg+0x1a6/0x270 net/socket.c:745 + ____sys_sendmsg+0x52a/0x7e0 net/socket.c:2603 + ___sys_sendmsg net/socket.c:2657 [inline] + __sys_sendmsg+0x2aa/0x390 net/socket.c:2686 + do_syscall_x64 arch/x86/entry/common.c:52 [inline] + do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + RIP: 0033:0x7fb06e9317f9 + Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 + RSP: 002b:00007ffe2cfd4f98 EFLAGS: 00000246 ORIG_RAX: 000000000000002e + RAX: ffffffffffffffda RBX: 00007fb06e97f468 RCX: 00007fb06e9317f9 + RDX: 0000000000000000 RSI: 0000000020000080 RDI: 0000000000000005 + RBP: 00007fb06e97f446 R08: 0000555500000000 R09: 0000555500000000 + R10: 0000555500000000 R11: 0000000000000246 R12: 00007fb06e97f406 + R13: 0000000000000001 R14: 00007ffe2cfd4fe0 R15: 0000000000000003 + + +Additionally syzkaller provided a nice reproducer. The repro enables +pmtu on the loopback device, leading to tcp_mtu_probe() generating +very large probe packets. + +tcp_can_coalesce_send_queue_head() currently does not check for +mptcp-level invariants, and allowed the creation of cross-DSS probes, +leading to the mentioned corruption. + +Address the issue teaching tcp_can_coalesce_send_queue_head() about +mptcp using the tcp_skb_can_collapse(), also reducing the code +duplication. + +Fixes: 85712484110d ("tcp: coalesce/collapse must respect MPTCP extensions") +Cc: stable@vger.kernel.org +Reported-by: syzbot+d1bff73460e33101f0e7@syzkaller.appspotmail.com +Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/513 +Signed-off-by: Paolo Abeni +Acked-by: Matthieu Baerts (NGI0) +Signed-off-by: Matthieu Baerts (NGI0) +Link: https://patch.msgid.link/20241008-net-mptcp-fallback-fixes-v1-2-c6fb8e93e551@kernel.org +Signed-off-by: Jakub Kicinski +[ Conflict in tcp_output.c, because the commit 65249feb6b3d ("net: add + support for skbs with unreadable frags") is not in this version. This + commit is linked to a new feature (Devmem TCP) and introduces a new + condition which causes the conflicts. Resolving this is easy: we can + ignore the missing new condition, and use tcp_skb_can_collapse() like + in the original patch. ] +Signed-off-by: Matthieu Baerts (NGI0) +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/tcp_output.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -2342,9 +2342,7 @@ static bool tcp_can_coalesce_send_queue_ + if (len <= skb->len) + break; + +- if (unlikely(TCP_SKB_CB(skb)->eor) || +- tcp_has_tx_tstamp(skb) || +- !skb_pure_zcopy_same(skb, next)) ++ if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next)) + return false; + + len -= skb->len;