From d1cc1656f5205460ffb7210967d845165941fc8f Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Thu, 19 Dec 2024 21:07:33 +0300 Subject: [PATCH] release 6.12.6 --- debian/changelog | 7 +++ ...ail-the-kernel-build-on-fatal-errors.patch | 2 +- ...napshot-packets-in-flight-at-transmi.patch | 2 +- ...djust-skb-tx.in_flight-upon-split-in.patch | 4 +- ...alize-TSO-sizing-in-TCP-CC-module-AP.patch | 2 +- ...ecord-app-limited-status-of-TLP-repa.patch | 2 +- ...ble-LPM-only-for-non-suspended-ports.patch | 45 +++++++++++++++++++ .../0001-xfs-fix-chown-with-rt-quota.patch | 4 +- ...-rq_affinity-to-force-complete-I-O-r.patch | 2 +- debian/patches/series | 1 + 10 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 debian/patches/patchset-pf/fixes/0003-USB-core-Disable-LPM-only-for-non-suspended-ports.patch diff --git a/debian/changelog b/debian/changelog index 295a979..6fa8c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (6.12.6-1) sid; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.6 + + -- Konstantin Demin Thu, 19 Dec 2024 21:00:52 +0300 + linux (6.12.5-1) sid; urgency=medium * New upstream stable update: diff --git a/debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch b/debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch index d36cde4..be3c74e 100644 --- a/debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch +++ b/debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch @@ -30,7 +30,7 @@ this reverts following commit: --- a/tools/objtool/check.c +++ b/tools/objtool/check.c -@@ -4922,10 +4922,14 @@ int check(struct objtool_file *file) +@@ -4925,10 +4925,14 @@ int check(struct objtool_file *file) } out: diff --git a/debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch b/debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch index 4545e16..39ea0ce 100644 --- a/debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch +++ b/debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch @@ -56,7 +56,7 @@ Signed-off-by: Alexandre Frade struct rate_sample *rs); --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -2765,6 +2765,7 @@ static bool tcp_write_xmit(struct sock * +@@ -2767,6 +2767,7 @@ static bool tcp_write_xmit(struct sock * skb_set_delivery_time(skb, tp->tcp_wstamp_ns, SKB_CLOCK_MONOTONIC); list_move_tail(&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue); tcp_init_tso_segs(skb, mss_now); diff --git a/debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch b/debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch index d666068..58b9d70 100644 --- a/debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch +++ b/debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch @@ -55,7 +55,7 @@ Signed-off-by: Alexandre Frade * between different flows. --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1601,7 +1601,7 @@ int tcp_fragment(struct sock *sk, enum t +@@ -1603,7 +1603,7 @@ int tcp_fragment(struct sock *sk, enum t { struct tcp_sock *tp = tcp_sk(sk); struct sk_buff *buff; @@ -64,7 +64,7 @@ Signed-off-by: Alexandre Frade long limit; int nlen; u8 flags; -@@ -1676,6 +1676,30 @@ int tcp_fragment(struct sock *sk, enum t +@@ -1678,6 +1678,30 @@ int tcp_fragment(struct sock *sk, enum t if (diff) tcp_adjust_pcount(sk, skb, diff); diff --git a/debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch b/debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch index f8c1025..c4e6e8e 100644 --- a/debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch +++ b/debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch @@ -97,7 +97,7 @@ Signed-off-by: Alexandre Frade }; --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -2057,13 +2057,12 @@ static u32 tcp_tso_autosize(const struct +@@ -2059,13 +2059,12 @@ static u32 tcp_tso_autosize(const struct static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now) { const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; diff --git a/debian/patches/misc-bbr3/0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch b/debian/patches/misc-bbr3/0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch index b2cf516..5895197 100644 --- a/debian/patches/misc-bbr3/0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch +++ b/debian/patches/misc-bbr3/0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch @@ -35,7 +35,7 @@ Signed-off-by: Alexandre Frade fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */ --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -3003,6 +3003,7 @@ void tcp_send_loss_probe(struct sock *sk +@@ -3005,6 +3005,7 @@ void tcp_send_loss_probe(struct sock *sk if (WARN_ON(!skb || !tcp_skb_pcount(skb))) goto rearm_timer; diff --git a/debian/patches/patchset-pf/fixes/0003-USB-core-Disable-LPM-only-for-non-suspended-ports.patch b/debian/patches/patchset-pf/fixes/0003-USB-core-Disable-LPM-only-for-non-suspended-ports.patch new file mode 100644 index 0000000..f557cb9 --- /dev/null +++ b/debian/patches/patchset-pf/fixes/0003-USB-core-Disable-LPM-only-for-non-suspended-ports.patch @@ -0,0 +1,45 @@ +From 1c45e81769d174d02a26a61e3919313fa3b16120 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Fri, 6 Dec 2024 15:48:17 +0800 +Subject: USB: core: Disable LPM only for non-suspended ports + +There's USB error when tegra board is shutting down: +[ 180.919315] usb 2-3: Failed to set U1 timeout to 0x0,error code -113 +[ 180.919995] usb 2-3: Failed to set U1 timeout to 0xa,error code -113 +[ 180.920512] usb 2-3: Failed to set U2 timeout to 0x4,error code -113 +[ 186.157172] tegra-xusb 3610000.usb: xHCI host controller not responding, assume dead +[ 186.157858] tegra-xusb 3610000.usb: HC died; cleaning up +[ 186.317280] tegra-xusb 3610000.usb: Timeout while waiting for evaluate context command + +The issue is caused by disabling LPM on already suspended ports. + +For USB2 LPM, the LPM is already disabled during port suspend. For USB3 +LPM, port won't transit to U1/U2 when it's already suspended in U3, +hence disabling LPM is only needed for ports that are not suspended. + +Cc: Wayne Chang +Cc: stable@vger.kernel.org +Fixes: d920a2ed8620 ("usb: Disable USB3 LPM at shutdown") +Signed-off-by: Kai-Heng Feng +Acked-by: Alan Stern +--- + drivers/usb/core/port.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/usb/core/port.c ++++ b/drivers/usb/core/port.c +@@ -452,10 +452,11 @@ static int usb_port_runtime_suspend(stru + static void usb_port_shutdown(struct device *dev) + { + struct usb_port *port_dev = to_usb_port(dev); ++ struct usb_device *udev = port_dev->child; + +- if (port_dev->child) { +- usb_disable_usb2_hardware_lpm(port_dev->child); +- usb_unlocked_disable_lpm(port_dev->child); ++ if (udev && !udev->port_is_suspended) { ++ usb_disable_usb2_hardware_lpm(udev); ++ usb_unlocked_disable_lpm(udev); + } + } + diff --git a/debian/patches/patchset-pf/xfs/0001-xfs-fix-chown-with-rt-quota.patch b/debian/patches/patchset-pf/xfs/0001-xfs-fix-chown-with-rt-quota.patch index 4fdaf7c..3cd9523 100644 --- a/debian/patches/patchset-pf/xfs/0001-xfs-fix-chown-with-rt-quota.patch +++ b/debian/patches/patchset-pf/xfs/0001-xfs-fix-chown-with-rt-quota.patch @@ -126,7 +126,7 @@ Reviewed-by: Christoph Hellwig /* --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c -@@ -1262,11 +1262,26 @@ retry: +@@ -1254,11 +1254,26 @@ retry: gdqp = (new_gdqp != ip->i_gdquot) ? new_gdqp : NULL; pdqp = (new_pdqp != ip->i_pdquot) ? new_pdqp : NULL; if (udqp || gdqp || pdqp) { @@ -153,7 +153,7 @@ Reviewed-by: Christoph Hellwig /* * Reserve enough quota to handle blocks on disk and reserved * for a delayed allocation. We'll actually transfer the -@@ -1274,8 +1289,20 @@ retry: +@@ -1266,8 +1281,20 @@ retry: * though that part is only semi-transactional. */ error = xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp, diff --git a/debian/patches/patchset-xanmod/xanmod/0006-XANMOD-block-Set-rq_affinity-to-force-complete-I-O-r.patch b/debian/patches/patchset-xanmod/xanmod/0006-XANMOD-block-Set-rq_affinity-to-force-complete-I-O-r.patch index d8902e8..560b193 100644 --- a/debian/patches/patchset-xanmod/xanmod/0006-XANMOD-block-Set-rq_affinity-to-force-complete-I-O-r.patch +++ b/debian/patches/patchset-xanmod/xanmod/0006-XANMOD-block-Set-rq_affinity-to-force-complete-I-O-r.patch @@ -11,7 +11,7 @@ Signed-off-by: Alexandre Frade --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h -@@ -615,7 +615,8 @@ enum { +@@ -613,7 +613,8 @@ enum { QUEUE_FLAG_MAX }; diff --git a/debian/patches/series b/debian/patches/series index ca2e095..bcf56fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -305,5 +305,6 @@ patchset-zen/sauce/0024-ZEN-kernel-Kconfig.preempt-Remove-EXPERT-conditional.pat patchset-pf/fixes/0001-arch-Kconfig-Default-to-maximum-amount-of-ASLR-bits.patch patchset-pf/fixes/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch +patchset-pf/fixes/0003-USB-core-Disable-LPM-only-for-non-suspended-ports.patch patchset-zen/fixes/0001-futex-improve-user-space-accesses.patch