diff --git a/Makefile b/Makefile index 6590e2359..c444d25bf 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ SHELL = /bin/bash .SHELLFLAGS += -e KERNEL_ABI_MINOR_VERSION = 2 -KVERSION_SHORT ?= 6.1.0-22-$(KERNEL_ABI_MINOR_VERSION) +KVERSION_SHORT ?= 6.1.0-29-$(KERNEL_ABI_MINOR_VERSION) KVERSION ?= $(KVERSION_SHORT)-amd64 -KERNEL_VERSION ?= 6.1.94 +KERNEL_VERSION ?= 6.1.123 KERNEL_SUBVERSION ?= 1 CONFIGURED_ARCH ?= amd64 CONFIGURED_PLATFORM ?= vs diff --git a/patch/0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patch b/patch/0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patch deleted file mode 100644 index c8975df35..000000000 --- a/patch/0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 29922c1e20e86e643687a76b8c3181e388067b03 Mon Sep 17 00:00:00 2001 -From: Vivek Reddy -Date: Fri, 27 Sep 2024 02:27:37 +0000 -Subject: [PATCH] Revert "mtd: spi-nor: Correct flags for Winbond w25q128" - -This reverts commit 7c6ba20a0b9aeb82a6c097c74ccbecdda8e9fc25. ---- - drivers/mtd/spi-nor/winbond.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c -index b7c775b615e8..ffaa24055259 100644 ---- a/drivers/mtd/spi-nor/winbond.c -+++ b/drivers/mtd/spi-nor/winbond.c -@@ -120,9 +120,8 @@ static const struct flash_info winbond_nor_parts[] = { - NO_SFDP_FLAGS(SECT_4K) }, - { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16) - NO_SFDP_FLAGS(SECT_4K) }, -- { "w25q128", INFO(0xef4018, 0, 0, 0) -- PARSE_SFDP -- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, -+ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256) -+ NO_SFDP_FLAGS(SECT_4K) }, - { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512) - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) - .fixups = &w25q256_fixups }, --- -2.43.2 - diff --git a/patch/0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patch b/patch/0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patch deleted file mode 100644 index 7ca33a81f..000000000 --- a/patch/0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patch +++ /dev/null @@ -1,91 +0,0 @@ -From c1bf9b90ce85dd46f958b9f0e60143d58f885963 Mon Sep 17 00:00:00 2001 -From: Ido Schimmel -Date: Tue, 1 Oct 2024 14:20:35 +0300 -Subject: [PATCH] devlink: Fix RCU stall when unregistering a devlink instance - -When a devlink instance is unregistered the following happens (among -other things): - -t0 - The instance is marked with 'DEVLINK_UNREGISTERING'. -t1 - Blocking until an RCU grace period passes. -t2 - The 'DEVLINK_UNREGISTERING' mark is cleared from the instance. - -When iterating over devlink instances (f.e., when requesting a dump of -available instances) and encountering an instance that is currently -being unregistered, the current code will loop around until the -'DEVLINK_UNREGISTERING' mark is cleared. - -The iteration over devlink instances happens in an RCU critical section, -so if the instance that is currently being unregistered was encountered -between t0 and t1, the system will deadlock and RCU stalls will be -reported [1]. The task unregistering the instance will forever wait for an -RCU grace period to pass and the task iterating over the instances will -forever wait for the mark to be cleared. - -The issue can be reliably reproduced by increasing the time window -between t0 and t1 (used a 60 seconds sleep) and running the following -reproducer [2]. - -Fix by skipping over instances that are currently being unregistered. - -[1] -rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: -rcu: Tasks blocked on level-0 rcu_node (CPUs 0-7): P344 - (detected by 4, t=26002 jiffies, g=5773, q=12 ncpus=8) -task:devlink state:R running task stack:25568 pid:344 ppid:260 flags:0x00004002 -[...] -Call Trace: - xa_get_mark+0x184/0x3e0 - devlinks_xa_find_get.constprop.0+0xc6/0x2e0 - devlink_nl_cmd_get_dumpit+0x105/0x3f0 - netlink_dump+0x568/0xff0 - __netlink_dump_start+0x651/0x900 - genl_family_rcv_msg_dumpit+0x201/0x340 - genl_rcv_msg+0x573/0x780 - netlink_rcv_skb+0x15f/0x430 - genl_rcv+0x29/0x40 - netlink_unicast+0x546/0x800 - netlink_sendmsg+0x958/0xe60 - __sys_sendto+0x3a2/0x480 - __x64_sys_sendto+0xe1/0x1b0 - do_syscall_64+0x35/0x80 - entry_SYSCALL_64_after_hwframe+0x68/0xd2 - -[2] - # echo 10 > /sys/bus/netdevsim/new_device - # echo 10 > /sys/bus/netdevsim/del_device & - # devlink dev - -Fixes: c2368b19807a ("net: devlink: introduce "unregistering" mark and use it during devlinks iteration") -Reported-by: Vivek Reddy Karri -Signed-off-by: Ido Schimmel ---- - net/devlink/leftover.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c -index 032c7af06..c6f781a08 100644 ---- a/net/devlink/leftover.c -+++ b/net/devlink/leftover.c -@@ -301,6 +301,9 @@ devlinks_xa_find_get(struct net *net, unsigned long *indexp, xa_mark_t filter, - if (!devlink) - goto unlock; - -+ /* For a possible retry, the xa_find_after() should be always used */ -+ xa_find_fn = xa_find_after; -+ - /* In case devlink_unregister() was already called and "unregistering" - * mark was set, do not allow to get a devlink reference here. - * This prevents live-lock of devlink_unregister() wait for completion. -@@ -308,8 +311,6 @@ devlinks_xa_find_get(struct net *net, unsigned long *indexp, xa_mark_t filter, - if (xa_get_mark(&devlinks, *indexp, DEVLINK_UNREGISTERING)) - goto retry; - -- /* For a possible retry, the xa_find_after() should be always used */ -- xa_find_fn = xa_find_after; - if (!devlink_try_get(devlink)) - goto retry; - if (!net_eq(devlink_net(devlink), net)) { --- -2.43.2 - diff --git a/patch/preconfig/disable-building-linux-source-deb-package.patch b/patch/preconfig/disable-building-linux-source-deb-package.patch index 9f35c1a14..f8b886dcf 100644 --- a/patch/preconfig/disable-building-linux-source-deb-package.patch +++ b/patch/preconfig/disable-building-linux-source-deb-package.patch @@ -19,8 +19,8 @@ index 7d4eabf04..30b3c66a3 100644 a20d83421667bad21739041d4e743ed1 debian/templates/sourcebin.meta.maintscript.in cbc5b0a81441c4c98b329ebe10827812 debian/templates/tools-unversioned.control.in 568f629072d584e9a0eb1dc9d3a94749 debian/templates/tools-versioned.control.in --1d140a262c41627e255a1aaa0ddcfe92 debian/config/defines -+cb9f5129f072fe65d26e16d8963d4297 debian/config/defines +-26c0dd754fd9fd1ffd676fe8a91d40c2 debian/config/defines ++f2176df3239edfc784a274054247ec8b debian/config/defines 59a811890d2e7129bec940075850f11f debian/config/alpha/defines 60569b1b4c618e2fe7b135f687d0f0d2 debian/config/amd64/defines bc35d767074baf305423437d049be85d debian/config/arm64/defines diff --git a/patch/preconfig/packaging-update-abiname.patch b/patch/preconfig/packaging-update-abiname.patch index 25c23b6f0..b7c1dd02e 100644 --- a/patch/preconfig/packaging-update-abiname.patch +++ b/patch/preconfig/packaging-update-abiname.patch @@ -14,8 +14,8 @@ index 983625720..55d7e51a7 100644 +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] --abiname: 22 -+abiname: 22-2 +-abiname: 29 ++abiname: 29-2 ignore-changes: __cpuhp_* __udp_gso_segment @@ -27,8 +27,8 @@ index b3ce4f58d..7d4eabf04 100644 a20d83421667bad21739041d4e743ed1 debian/templates/sourcebin.meta.maintscript.in cbc5b0a81441c4c98b329ebe10827812 debian/templates/tools-unversioned.control.in 568f629072d584e9a0eb1dc9d3a94749 debian/templates/tools-versioned.control.in --36001efefc2d9ec53b7a0fd2a504677b debian/config/defines -+1d140a262c41627e255a1aaa0ddcfe92 debian/config/defines +-f3ba608063c55ec489dcdf9397ec8082 debian/config/defines ++26c0dd754fd9fd1ffd676fe8a91d40c2 debian/config/defines 59a811890d2e7129bec940075850f11f debian/config/alpha/defines 60569b1b4c618e2fe7b135f687d0f0d2 debian/config/amd64/defines bc35d767074baf305423437d049be85d debian/config/arm64/defines diff --git a/patch/series b/patch/series index 1b500c5cd..7cbed96bb 100755 --- a/patch/series +++ b/patch/series @@ -69,8 +69,6 @@ Support-for-fullcone-nat.patch # Tbridge-per-port-multicast-broadcast-flood-flags.patch # -0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patch - # Mellanox patches for 5.10 ###-> mellanox_sdk-start 0001-psample-define-the-macro-PSAMPLE_MD_EXTENDED_ATTR.patch @@ -141,7 +139,7 @@ Support-for-fullcone-nat.patch 0092-platform-mellanox-Introduce-support-of-Nvidia-smart-.patch 0093-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2855-c.patch 0094-i2c-asf-Introduce-MCTP-support-over-ASF-controller.patch -0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch +#0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch 8000-mlxsw-Use-weak-reverse-dependencies-for-firmware-fla.patch 8003-mlxsw-i2c-SONIC-ISSU-Prevent-transaction-execution-f.patch 8004-mlxsw-minimal-Downstream-Ignore-error-reading-SPAD-r.patch @@ -215,9 +213,6 @@ cisco-npu-disable-other-bars.patch 0028-Create-miniaturised-diafgw-partition-for-128MB-flash.patch 0029-pcie-if-hotplug-enabled-do-immediate-reset-on-panic.patch -# Fix for w25q128 flash that dont have SFDP support -0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patch - # Security patch 0001-Change-the-system.map-file-permission-only-readable-.patch