From: Greg Kroah-Hartman Date: Mon, 8 May 2023 05:08:58 +0000 (+0200) Subject: 6.2-stable patches X-Git-Tag: v5.15.111~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=802cccbd128f8cab3e6bd3e983f6fe12b551a1b1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.2-stable patches added patches: blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch --- diff --git a/queue-6.2/blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch b/queue-6.2/blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch new file mode 100644 index 00000000000..170a64d178a --- /dev/null +++ b/queue-6.2/blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch @@ -0,0 +1,57 @@ +From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 18 Jan 2023 09:07:01 +0100 +Subject: blk-iocost: avoid 64-bit division in ioc_timer_fn + +From: Arnd Bergmann + +commit 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 upstream. + +The behavior of 'enum' types has changed in gcc-13, so now the +UNBUSY_THR_PCT constant is interpreted as a 64-bit number because +it is defined as part of the same enum definition as some other +constants that do not fit within a 32-bit integer. This in turn +leads to some inefficient code on 32-bit architectures as well +as a link error: + +arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn': +blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod' +arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod' + +Split the enum definition to keep the 64-bit timing constants in +a separate enum type from those constants that can clearly fit +within a smaller type. + +Signed-off-by: Arnd Bergmann +Acked-by: Tejun Heo +Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + block/blk-iocost.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/block/blk-iocost.c ++++ b/block/blk-iocost.c +@@ -258,6 +258,11 @@ enum { + VRATE_MIN = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION, + VRATE_CLAMP_ADJ_PCT = 4, + ++ /* switch iff the conditions are met for longer than this */ ++ AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, ++}; ++ ++enum { + /* if IOs end up waiting for requests, issue less */ + RQ_WAIT_BUSY_PCT = 5, + +@@ -296,9 +301,6 @@ enum { + /* don't let cmds which take a very long time pin lagging for too long */ + MAX_LAGGING_PERIODS = 10, + +- /* switch iff the conditions are met for longer than this */ +- AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, +- + /* + * Count IO size in 4k pages. The 12bit shift helps keeping + * size-proportional components of cost calculation in closer diff --git a/queue-6.2/series b/queue-6.2/series index 91686ce362b..9bbe2929360 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -658,6 +658,7 @@ dm-integrity-call-kmem_cache_destroy-in-dm_integrity_init-error-path.patch dm-flakey-fix-a-crash-with-invalid-table-line.patch dm-ioctl-fix-nested-locking-in-table_clear-to-remove-deadlock-concern.patch dm-don-t-lock-fs-when-the-map-is-null-in-process-of-resume.patch +blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch cifs-fix-potential-use-after-free-bugs-in-tcp_server_info-hostname.patch cifs-protect-session-status-check-in-smb2_reconnect.patch cifs-fix-sharing-of-dfs-connections.patch