July 2023 - Linux-stable-mirror

FAILED: patch "[PATCH] block: add overflow checks for Amiga partition support" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x b6f3f28f604ba3de4724ad82bea6adb1300c0b5f # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023071116-umbrella-fog-a65f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From b6f3f28f604ba3de4724ad82bea6adb1300c0b5f Mon Sep 17 00:00:00 2001 From: Michael Schmitz <schmitzmic(a)gmail.com> Date: Wed, 21 Jun 2023 08:17:25 +1200 Subject: [PATCH] block: add overflow checks for Amiga partition support The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB. Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t. Bail out if sector addresses overflow 32 bits on kernels without LBD support. This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <jdow(a)earthlink.net>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 in this series). This patch adds additional error checking and warning messages. Reported-by: Martin Steigerwald <Martin(a)lichtvoll.de> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=43511 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Message-ID: <201206192146.09327.Martin(a)lichtvoll.de> Cc: <stable(a)vger.kernel.org> # 5.2 Signed-off-by: Michael Schmitz <schmitzmic(a)gmail.com> Reviewed-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Reviewed-by: Christoph Hellwig <hch(a)infradead.org> Link: https://lore.kernel.org/r/20230620201725.7020-4-schmitzmic@gmail.com Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 85c5c79aae48..ed222b9c901b 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -11,10 +11,18 @@ #define pr_fmt(fmt) fmt #include <linux/types.h> +#include <linux/mm_types.h> +#include <linux/overflow.h> #include <linux/affs_hardblocks.h> #include "check.h" +/* magic offsets in partition DosEnvVec */ +#define NR_HD 3 +#define NR_SECT 5 +#define LO_CYL 9 +#define HI_CYL 10 + static __inline__ u32 checksum_block(__be32 *m, int size) { @@ -31,9 +39,12 @@ int amiga_partition(struct parsed_partitions *state) unsigned char *data; struct RigidDiskBlock *rdb; struct PartitionBlock *pb; - sector_t start_sect, nr_sects; - int blk, part, res = 0; - int blksize = 1; /* Multiplier for disk block size */ + u64 start_sect, nr_sects; + sector_t blk, end_sect; + u32 cylblk; /* rdb_CylBlocks = nr_heads*sect_per_track */ + u32 nr_hd, nr_sect, lo_cyl, hi_cyl; + int part, res = 0; + unsigned int blksize = 1; /* Multiplier for disk block size */ int slot = 1; for (blk = 0; ; blk++, put_dev_sector(sect)) { @@ -41,7 +52,7 @@ int amiga_partition(struct parsed_partitions *state) goto rdb_done; data = read_part_sector(state, blk, &sect); if (!data) { - pr_err("Dev %s: unable to read RDB block %d\n", + pr_err("Dev %s: unable to read RDB block %llu\n", state->disk->disk_name, blk); res = -1; goto rdb_done; @@ -58,12 +69,12 @@ int amiga_partition(struct parsed_partitions *state) *(__be32 *)(data+0xdc) = 0; if (checksum_block((__be32 *)data, be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) { - pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n", + pr_err("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n", blk); break; } - pr_err("Dev %s: RDB in block %d has bad checksum\n", + pr_err("Dev %s: RDB in block %llu has bad checksum\n", state->disk->disk_name, blk); } @@ -80,10 +91,15 @@ int amiga_partition(struct parsed_partitions *state) blk = be32_to_cpu(rdb->rdb_PartitionList); put_dev_sector(sect); for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) { - blk *= blksize; /* Read in terms partition table understands */ + /* Read in terms partition table understands */ + if (check_mul_overflow(blk, (sector_t) blksize, &blk)) { + pr_err("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n", + state->disk->disk_name, blk, part); + break; + } data = read_part_sector(state, blk, &sect); if (!data) { - pr_err("Dev %s: unable to read partition block %d\n", + pr_err("Dev %s: unable to read partition block %llu\n", state->disk->disk_name, blk); res = -1; goto rdb_done; @@ -95,19 +111,70 @@ int amiga_partition(struct parsed_partitions *state) if (checksum_block((__be32 *)pb, be32_to_cpu(pb->pb_SummedLongs) & 0x7F) != 0 ) continue; - /* Tell Kernel about it */ + /* RDB gives us more than enough rope to hang ourselves with, + * many times over (2^128 bytes if all fields max out). + * Some careful checks are in order, so check for potential + * overflows. + * We are multiplying four 32 bit numbers to one sector_t! + */ + + nr_hd = be32_to_cpu(pb->pb_Environment[NR_HD]); + nr_sect = be32_to_cpu(pb->pb_Environment[NR_SECT]); + + /* CylBlocks is total number of blocks per cylinder */ + if (check_mul_overflow(nr_hd, nr_sect, &cylblk)) { + pr_err("Dev %s: heads*sects %u overflows u32, skipping partition!\n", + state->disk->disk_name, cylblk); + continue; + } + + /* check for consistency with RDB defined CylBlocks */ + if (cylblk > be32_to_cpu(rdb->rdb_CylBlocks)) { + pr_warn("Dev %s: cylblk %u > rdb_CylBlocks %u!\n", + state->disk->disk_name, cylblk, + be32_to_cpu(rdb->rdb_CylBlocks)); + } + + /* RDB allows for variable logical block size - + * normalize to 512 byte blocks and check result. + */ + + if (check_mul_overflow(cylblk, blksize, &cylblk)) { + pr_err("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n", + state->disk->disk_name, part); + continue; + } + + /* Calculate partition start and end. Limit of 32 bit on cylblk + * guarantees no overflow occurs if LBD support is enabled. + */ + + lo_cyl = be32_to_cpu(pb->pb_Environment[LO_CYL]); + start_sect = ((u64) lo_cyl * cylblk); + + hi_cyl = be32_to_cpu(pb->pb_Environment[HI_CYL]); + nr_sects = (((u64) hi_cyl - lo_cyl + 1) * cylblk); - nr_sects = ((sector_t)be32_to_cpu(pb->pb_Environment[10]) + 1 - - be32_to_cpu(pb->pb_Environment[9])) * - be32_to_cpu(pb->pb_Environment[3]) * - be32_to_cpu(pb->pb_Environment[5]) * - blksize; if (!nr_sects) continue; - start_sect = (sector_t)be32_to_cpu(pb->pb_Environment[9]) * - be32_to_cpu(pb->pb_Environment[3]) * - be32_to_cpu(pb->pb_Environment[5]) * - blksize; + + /* Warn user if partition end overflows u32 (AmigaDOS limit) */ + + if ((start_sect + nr_sects) > UINT_MAX) { + pr_warn("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n", + state->disk->disk_name, part, + start_sect, start_sect + nr_sects); + } + + if (check_add_overflow(start_sect, nr_sects, &end_sect)) { + pr_err("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n", + state->disk->disk_name, part, + start_sect, end_sect); + continue; + } + + /* Tell Kernel about it */ + put_partition(state,slot++,start_sect,nr_sects); { /* Be even more informative to aid mounting */

1 year, 9 months

3
5
0 0

[PATCH 1/9] drm/amdgpu: make sure BOs are locked in amdgpu_vm_get_memory

by Alex Deucher

From: Christian König <christian.koenig(a)amd.com> We need to grab the lock of the BO or otherwise can run into a crash when we try to inspect the current location. Signed-off-by: Christian König <christian.koenig(a)amd.com> Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> Acked-by: Guchun Chen <guchun.chen(a)amd.com> Tested-by: Mikhail Gavrilov <mikhail.v.gavrilov(a)gmail.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> (cherry picked from commit e2ad8e2df432498b1cee2af04df605723f4d75e6) Cc: stable(a)vger.kernel.org # 6.3.x --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 69 +++++++++++++++----------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 5b3a70becbdf..a252a206f37b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -920,42 +920,51 @@ int amdgpu_vm_update_range(struct amdgpu_device *adev, struct amdgpu_vm *vm, return r; } +static void amdgpu_vm_bo_get_memory(struct amdgpu_bo_va *bo_va, + struct amdgpu_mem_stats *stats) +{ + struct amdgpu_vm *vm = bo_va->base.vm; + struct amdgpu_bo *bo = bo_va->base.bo; + + if (!bo) + return; + + /* + * For now ignore BOs which are currently locked and potentially + * changing their location. + */ + if (bo->tbo.base.resv != vm->root.bo->tbo.base.resv && + !dma_resv_trylock(bo->tbo.base.resv)) + return; + + amdgpu_bo_get_memory(bo, stats); + if (bo->tbo.base.resv != vm->root.bo->tbo.base.resv) + dma_resv_unlock(bo->tbo.base.resv); +} + void amdgpu_vm_get_memory(struct amdgpu_vm *vm, struct amdgpu_mem_stats *stats) { struct amdgpu_bo_va *bo_va, *tmp; spin_lock(&vm->status_lock); - list_for_each_entry_safe(bo_va, tmp, &vm->idle, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } - list_for_each_entry_safe(bo_va, tmp, &vm->evicted, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } - list_for_each_entry_safe(bo_va, tmp, &vm->relocated, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } - list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } - list_for_each_entry_safe(bo_va, tmp, &vm->invalidated, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } - list_for_each_entry_safe(bo_va, tmp, &vm->done, base.vm_status) { - if (!bo_va->base.bo) - continue; - amdgpu_bo_get_memory(bo_va->base.bo, stats); - } + list_for_each_entry_safe(bo_va, tmp, &vm->idle, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); + + list_for_each_entry_safe(bo_va, tmp, &vm->evicted, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); + + list_for_each_entry_safe(bo_va, tmp, &vm->relocated, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); + + list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); + + list_for_each_entry_safe(bo_va, tmp, &vm->invalidated, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); + + list_for_each_entry_safe(bo_va, tmp, &vm->done, base.vm_status) + amdgpu_vm_bo_get_memory(bo_va, stats); spin_unlock(&vm->status_lock); } -- 2.41.0

1 year, 9 months

4
13
0 0

[PATCH -stable,4.14 0/3] stable fixes for 4.14

by Pablo Neira Ayuso

Hi Greg, Sasha, The following list shows the backported patches, I am using original commit IDs for reference: 1) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE") 2) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") 3) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails") Please, apply, Thanks. Pablo Neira Ayuso (3): netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: unbind non-anonymous set if rule construction fails include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 29 +++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) -- 2.30.2

1 year, 9 months

2
4
0 0

[PATCH -stable,4.19 00/10] stable fixes for 4.19

by Pablo Neira Ayuso

Hi Greg, Sasha, The following list shows the backported patches, I am using original commit IDs for reference: 1) 1e9451cbda45 ("netfilter: nf_tables: fix nat hook table deletion") 2) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks") 3) 802b805162a1 ("netfilter: nftables: add helper function to set the base sequence number") 4) 19c28b1374fb ("netfilter: add helper function to set up the nfnetlink header and use it") 5) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data") 6) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE") 7) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") 8) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase") 9) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails") 10) 2024439bd5ce ("netfilter: nf_tables: fix scheduling-while-atomic splat") Please, apply, Thanks. Florian Westphal (3): netfilter: nf_tables: fix nat hook table deletion netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_tables: fix scheduling-while-atomic splat Pablo Neira Ayuso (7): netfilter: nftables: add helper function to set the base sequence number netfilter: add helper function to set up the nfnetlink header and use it netfilter: nf_tables: use net_generic infra for transaction data netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: reject unbound anonymous set before commit phase netfilter: nf_tables: unbind non-anonymous set if rule construction fails include/linux/netfilter/nfnetlink.h | 27 ++ include/net/netfilter/nf_tables.h | 14 + include/net/netns/nftables.h | 5 - net/netfilter/ipset/ip_set_core.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 77 ++--- net/netfilter/nf_tables_api.c | 483 ++++++++++++++++----------- net/netfilter/nf_tables_trace.c | 9 +- net/netfilter/nfnetlink_acct.c | 11 +- net/netfilter/nfnetlink_cthelper.c | 11 +- net/netfilter/nfnetlink_cttimeout.c | 22 +- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue.c | 12 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_compat.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 15 files changed, 383 insertions(+), 344 deletions(-) -- 2.30.2

1 year, 9 months

2
11
0 0

[PATCH -stable,5.4 00/10] stable fixes for 5.4

by Pablo Neira Ayuso

Hi Greg, Sasha, The following list shows the backported patches, I am using original commit IDs for reference: 1) 1e9451cbda45 ("netfilter: nf_tables: fix nat hook table deletion") 2) 802b805162a1 ("netfilter: nftables: add helper function to set the base sequence number") 3) 19c28b1374fb ("netfilter: add helper function to set up the nfnetlink header and use it") 4) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data") 5) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks") 6) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE") 7) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") 8) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase") 9) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails") 10) 2024439bd5ce ("netfilter: nf_tables: fix scheduling-while-atomic splat") Please, apply, Thanks Florian Westphal (4): netfilter: nf_tables: fix nat hook table deletion netfilter: nf_tables: use net_generic infra for transaction data netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_tables: fix scheduling-while-atomic splat Pablo Neira Ayuso (6): netfilter: nftables: add helper function to set the base sequence number netfilter: add helper function to set up the nfnetlink header and use it netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: reject unbound anonymous set before commit phase netfilter: nf_tables: unbind non-anonymous set if rule construction fails include/linux/netfilter/nfnetlink.h | 27 ++ include/net/netfilter/nf_tables.h | 14 + include/net/netns/nftables.h | 6 - net/netfilter/ipset/ip_set_core.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 77 ++-- net/netfilter/nf_tables_api.c | 510 ++++++++++++++++----------- net/netfilter/nf_tables_offload.c | 29 +- net/netfilter/nf_tables_trace.c | 9 +- net/netfilter/nfnetlink_acct.c | 11 +- net/netfilter/nfnetlink_cthelper.c | 11 +- net/netfilter/nfnetlink_cttimeout.c | 22 +- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue.c | 12 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_compat.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 16 files changed, 418 insertions(+), 366 deletions(-) -- 2.30.2

1 year, 9 months

2
11
0 0

[PATCH -stable,5.10 v3 00/11] Netfilter stable fixes for 5.10

by Pablo Neira Ayuso

Hi Greg, Sasha, [ This is v3: - remove backported function that is useless in patch 09/11 - use: Upstream commit XYZ tag as suggested by Salvatore Bonaccorso. ] The following list shows the backported patches. I am using original commit IDs for reference: 1) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data") 2) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks") 3) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE") 4) 4bedf9eee016 ("netfilter: nf_tables: fix chain binding transaction logic") 5) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain") 6) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase") 7) 62e1e94b246e ("netfilter: nf_tables: reject unbound chain set before commit phase") 8) f8bb7889af58 ("netfilter: nftables: rename set element data activation/deactivation functions") 9) 628bd3e49cba ("netfilter: nf_tables: drop map element references from preparation phase") 10) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails") 11) f838e0906dd3 ("netfilter: nf_tables: fix scheduling-while-atomic splat") Notes: - Patch #1 is a backported dependency patch required by these fixes. - Patch #3 needs an incremental follow up fix coming in Patch #11. Florian Westphal (3): netfilter: nf_tables: use net_generic infra for transaction data netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_tables: fix scheduling-while-atomic splat Pablo Neira Ayuso (8): netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE netfilter: nf_tables: fix chain binding transaction logic netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain netfilter: nf_tables: reject unbound anonymous set before commit phase netfilter: nf_tables: reject unbound chain set before commit phase netfilter: nftables: rename set element data activation/deactivation functions netfilter: nf_tables: drop map element references from preparation phase netfilter: nf_tables: unbind non-anonymous set if rule construction fails include/net/netfilter/nf_tables.h | 41 +- include/net/netns/nftables.h | 7 - net/netfilter/nf_tables_api.c | 662 +++++++++++++++++++++--------- net/netfilter/nf_tables_offload.c | 30 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- net/netfilter/nft_immediate.c | 90 +++- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 +- net/netfilter/nft_set_pipapo.c | 14 +- net/netfilter/nft_set_rbtree.c | 5 +- 11 files changed, 648 insertions(+), 246 deletions(-) -- 2.30.2

1 year, 9 months

2
13
0 0

Backport to 4.14 and 4.19 commits 24c363623361 and 17ecffa28948 and a798a7086c38

by Christophe Leroy

Hi, Could you please backport the three following commits to 4.14 and 4.19: 24c363623361 ("spi: spi-fsl-spi: remove always-true conditional in fsl_spi_do_one_msg") 17ecffa28948 ("spi: spi-fsl-spi: relax message sanity checking a little") a798a7086c38 ("spi: spi-fsl-spi: allow changing bits_per_word while CS is still active") Those three commits (the last one indeed) are needed to overcome a problem introduced in 4.14.230 by commit 42c04316d927 ("spi: fsl-cpm: Use 16 bit mode for large transfers with even size"), which leads to the following error in certain cases: [ 174.900526] at25 spi0.3: bits_per_word/speed_hz should be same for the same SPI transfer [ 174.911844] spi_master spi0: failed to transfer one message from queue [ 366.639467] INFO: task od:406 blocked for more than 120 seconds. [ 366.645155] Not tainted 4.14.320-s3k-dev-dirty #342 [ 366.652996] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 489.519450] INFO: task od:406 blocked for more than 120 seconds. [ 489.525156] Not tainted 4.14.320-s3k-dev-dirty #342 [ 489.532915] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ... Thanks Christophe

1 year, 9 months

2
1
0 0

FAILED: patch "[PATCH] io_uring: Use io_schedule* in cqring wait" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 8a796565cec3601071cbbd27d6304e202019d014 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023071623-deafness-gargle-5297@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 8a796565cec3 ("io_uring: Use io_schedule* in cqring wait") d33a39e57768 ("io_uring: keep timeout in io_wait_queue") 46ae7eef44f6 ("io_uring: optimise non-timeout waiting") 846072f16eed ("io_uring: mimimise io_cqring_wait_schedule") 3fcf19d592d5 ("io_uring: parse check_cq out of wq waiting") 12521a5d5cb7 ("io_uring: fix CQ waiting timeout handling") 52ea806ad983 ("io_uring: finish waiting before flushing overflow entries") 35d90f95cfa7 ("io_uring: include task_work run after scheduling in wait for events") 1b346e4aa8e7 ("io_uring: don't check overflow flush failures") a85381d8326d ("io_uring: skip overflow CQE posting for dying ring") c0e0d6ba25f1 ("io_uring: add IORING_SETUP_DEFER_TASKRUN") b4c98d59a787 ("io_uring: introduce io_has_work") 78a861b94959 ("io_uring: add sync cancelation API through io_uring_register()") c34398a8c018 ("io_uring: remove __io_req_task_work_add") ed5ccb3beeba ("io_uring: remove priority tw list optimisation") 4a0fef62788b ("io_uring: optimize io_uring_task layout") 253993210bd8 ("io_uring: introduce locking helpers for CQE posting") 305bef988708 ("io_uring: hide eventfd assumptions in eventfd paths") affa87db9010 ("io_uring: fix multi ctx cancellation") d9dee4302a7c ("io_uring: remove ->flush_cqes optimisation") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 8a796565cec3601071cbbd27d6304e202019d014 Mon Sep 17 00:00:00 2001 From: Andres Freund <andres(a)anarazel.de> Date: Fri, 7 Jul 2023 09:20:07 -0700 Subject: [PATCH] io_uring: Use io_schedule* in cqring wait I observed poor performance of io_uring compared to synchronous IO. That turns out to be caused by deeper CPU idle states entered with io_uring, due to io_uring using plain schedule(), whereas synchronous IO uses io_schedule(). The losses due to this are substantial. On my cascade lake workstation, t/io_uring from the fio repository e.g. yields regressions between 20% and 40% with the following command: ./t/io_uring -r 5 -X0 -d 1 -s 1 -c 1 -p 0 -S$use_sync -R 0 /mnt/t2/fio/write.0.0 This is repeatable with different filesystems, using raw block devices and using different block devices. Use io_schedule_prepare() / io_schedule_finish() in io_cqring_wait_schedule() to address the difference. After that using io_uring is on par or surpassing synchronous IO (using registered files etc makes it reliably win, but arguably is a less fair comparison). There are other calls to schedule() in io_uring/, but none immediately jump out to be similarly situated, so I did not touch them. Similarly, it's possible that mutex_lock_io() should be used, but it's not clear if there are cases where that matters. Cc: stable(a)vger.kernel.org # 5.10+ Cc: Pavel Begunkov <asml.silence(a)gmail.com> Cc: io-uring(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Andres Freund <andres(a)anarazel.de> Link: https://lore.kernel.org/r/20230707162007.194068-1-andres@anarazel.de [axboe: minor style fixup] Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index e8096d502a7c..7505de2428e0 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2489,6 +2489,8 @@ int io_run_task_work_sig(struct io_ring_ctx *ctx) static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx, struct io_wait_queue *iowq) { + int token, ret; + if (unlikely(READ_ONCE(ctx->check_cq))) return 1; if (unlikely(!llist_empty(&ctx->work_llist))) @@ -2499,11 +2501,20 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx, return -EINTR; if (unlikely(io_should_wake(iowq))) return 0; + + /* + * Use io_schedule_prepare/finish, so cpufreq can take into account + * that the task is waiting for IO - turns out to be important for low + * QD IO. + */ + token = io_schedule_prepare(); + ret = 0; if (iowq->timeout == KTIME_MAX) schedule(); else if (!schedule_hrtimeout(&iowq->timeout, HRTIMER_MODE_ABS)) - return -ETIME; - return 0; + ret = -ETIME; + io_schedule_finish(token); + return ret; } /*

1 year, 9 months

3
2
0 0

[PATCH 5.15 000/371] 5.15.111-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.111 release. There are 371 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 10 May 2023 09:47:07 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.111-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.111-rc1 Vincent Guittot <vincent.guittot(a)linaro.org> arm64: dts: qcom: sdm845: correct dynamic power coefficients - again Miles Chen <miles.chen(a)mediatek.com> sound/oss/dmasound: fix 'dmasound_setup' defined but not used Thomas Gleixner <tglx(a)linutronix.de> debugobject: Ensure pool refill (again) Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix CYC timestamps after standalone CBR Adrian Hunter <adrian.hunter(a)intel.com> perf auxtrace: Fix address filter entire kernel size Li Lingfeng <lilingfeng3(a)huawei.com> dm: don't lock fs when the map is NULL in process of resume Mike Snitzer <snitzer(a)kernel.org> dm ioctl: fix nested locking in table_clear() to remove deadlock concern Mikulas Patocka <mpatocka(a)redhat.com> dm flakey: fix a crash with invalid table line Mike Snitzer <snitzer(a)kernel.org> dm integrity: call kmem_cache_destroy() in dm_integrity_init() error path Mike Snitzer <snitzer(a)kernel.org> dm clone: call kmem_cache_destroy() in dm_clone_init() error path Yeongjin Gil <youngjin.gil(a)samsung.com> dm verity: fix error handling for check_at_most_once on FEC Hugh Dickins <hughd(a)google.com> ia64: fix an addr to taddr in huge_pte_offset() Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix hanging blockdevice after request requeue Qu Wenruo <wqu(a)suse.com> btrfs: scrub: reject unsupported scrub flags Peng Liu <liupeng17(a)lenovo.com> scripts/gdb: fix lx-timerlist for Python3 Quentin Schulz <quentin.schulz(a)theobroma-systems.com> clk: rockchip: rk3399: allow clk_cifout to force clk_cifout_src to reparent Bitterblue Smith <rtl8821cerfe2(a)gmail.com> wifi: rtl8xxxu: RTL8192EU always needs full init Tanmay Shah <tanmay.shah(a)amd.com> mailbox: zynqmp: Fix typo in IPI documentation Tanmay Shah <tanmay.shah(a)amd.com> mailbox: zynqmp: Fix IPI isr handling Michael Walle <michael(a)walle.cc> mtd: core: fix error path for nvmem provider Michael Walle <michael(a)walle.cc> mtd: core: fix nvmem error reporting Michael Walle <michael(a)walle.cc> mtd: core: provide unique name for nvmem device, take two Li Nan <linan122(a)huawei.com> md/raid10: fix null-ptr-deref in raid10_sync_request Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix infinite loop in nilfs_mdt_get_block() Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: do not write dirty data after degenerating to read-only Geraldo Nascimento <geraldogabriel(a)gmail.com> ALSA: usb-audio: Add quirk for Pioneer DDJ-800 Helge Deller <deller(a)gmx.de> parisc: Fix argument pointer in real64_call_asm() Marc Dionne <marc.dionne(a)auristor.com> afs: Fix updating of i_size with dv jump from server Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> mfd: tqmx86: Correct board names for TQMxE39x Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> mfd: tqmx86: Specify IO port register range more precisely Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> mfd: tqmx86: Do not access I2C_DETECT register through io_base Kang Chen <void0red(a)hust.edu.cn> thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe Claudiu Beznea <claudiu.beznea(a)microchip.com> dmaengine: at_xdmac: do not enable all cyclic channels Tudor Ambarus <tudor.ambarus(a)microchip.com> dmaengine: at_xdmac: Fix race for the tx desc callback Tudor Ambarus <tudor.ambarus(a)microchip.com> dmaengine: at_xdmac: Fix concurrency over chan's completed_cookie Shunsuke Mie <mie(a)igel.co.jp> dmaengine: dw-edma: Fix to enable to issue dma request on DMA processing Shunsuke Mie <mie(a)igel.co.jp> dmaengine: dw-edma: Fix to change for continuous transfer Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> dma: gpi: remove spurious unlock in gpi_ch_init Gaosheng Cui <cuigaosheng1(a)huawei.com> phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> pwm: mtk-disp: Configure double buffering before reading in .get_state() AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> pwm: mtk-disp: Disable shadow registers before setting backlight values H. Nikolaus Schaller <hns(a)goldelico.com> leds: tca6507: Fix error handling of using fwnode_property_read_string Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: mv_xor_v2: Fix an error code. Randy Dunlap <rdunlap(a)infradead.org> leds: TI_LMU_COMMON: select REGMAP instead of depending on it Hai Pham <hai.pham.ud(a)renesas.com> pinctrl: renesas: r8a779a0: Remove incorrect AVB[01] pinmux configuration Ye Bin <yebin10(a)huawei.com> ext4: fix use-after-free read in ext4_find_extent for bigalloc + inline Zhihao Cheng <chengzhihao1(a)huawei.com> ext4: fix i_disksize exceeding i_size problem in paritally written case Bharath SM <bharathsm(a)microsoft.com> SMB3: Close deferred file handles in case of handle lease break Bharath SM <bharathsm(a)microsoft.com> SMB3: Add missing locks to protect deferred close file list Geert Uytterhoeven <geert+renesas(a)glider.be> timekeeping: Fix references to nonexistent ktime_get_fast_ns() Stafford Horne <shorne(a)gmail.com> openrisc: Properly store r31 to pt_regs on unhandled exceptions Qinrun Dai <flno(a)hust.edu.cn> clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails Mark Zhang <markzhang(a)nvidia.com> RDMA/mlx5: Use correct device num_ports when modify DC Dai Ngo <dai.ngo(a)oracle.com> SUNRPC: remove the maximum number of retries in call_bind_status Mark Bloch <mbloch(a)nvidia.com> RDMA/mlx5: Fix flow counter query via DEVX Miaoqian Lin <linmq006(a)gmail.com> Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> clk: qcom: gcc-sm8350: fix PCIe PIPE clocks handling Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> clk: qcom: regmap: add PHY clock source implementation Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.1: Always send a RECLAIM_COMPLETE after establishing lease Patrick Kelsey <pat.kelsey(a)cornelisnetworks.com> IB/hfi1: Fix bugs with non-PAGE_SIZE-end multi-iovec user SDMA requests Patrick Kelsey <pat.kelsey(a)cornelisnetworks.com> IB/hfi1: Fix SDMA mmu_rb_node not being evicted in LRU order Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> RDMA/srpt: Add a check for valid 'mad_agent' pointer Mark Zhang <markzhang(a)nvidia.com> RDMA/cm: Trace icm_send_rej event before the cm state is reset Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: gcc-sm6115: Mark RCGs shared where applicable Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> RDMA/siw: Remove namespace check from siw_netdev_event() Clément Léger <clement.leger(a)bootlin.com> clk: add missing of_node_put() in "assigned-clocks" property parsing Sebastian Reichel <sre(a)kernel.org> power: supply: generic-adc-battery: fix unit scaling Zeng Heng <zengheng4(a)huawei.com> fs/ntfs3: Fix slab-out-of-bounds read in hdr_delete_de() ZhangPeng <zhangpeng362(a)huawei.com> fs/ntfs3: Fix OOB read in indx_insert_into_buffer ZhangPeng <zhangpeng362(a)huawei.com> fs/ntfs3: Fix null-ptr-deref on inode->i_op in ntfs_lookup() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> fs/ntfs3: Add check for kmemdup Chen Zhongjin <chenzhongjin(a)huawei.com> fs/ntfs3: Fix memory leak if ntfs_read_mft failed Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time Dan Carpenter <error27(a)gmail.com> RDMA/mlx4: Prevent shift wrapping in set_user_sq_size() Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> rtc: omap: include header for omap_rtc_power_off_program prototype Petr Mladek <pmladek(a)suse.com> workqueue: Fix hung time report of worker pools Imran Khan <imran.f.khan(a)oracle.com> workqueue: Introduce show_one_worker_pool and show_one_workqueue. Natalia Petrova <n.petrova(a)fintech.ru> RDMA/rdmavt: Delete unnecessary NULL check Daniil Dulov <d.dulov(a)aladdin.ru> RDMA/siw: Fix potential page_array out of range access Claudiu Beznea <claudiu.beznea(a)microchip.com> clk: at91: clk-sam9x60-pll: fix return value check Schspa Shi <schspa(a)gmail.com> sched/rt: Fix bad task migration for rt tasks Josh Poimboeuf <jpoimboe(a)kernel.org> Revert "objtool: Support addition to set CFA base" Yang Jihong <yangjihong1(a)huawei.com> perf/core: Fix hardlockup failure caused by perf throttle Libo Chen <libo.chen(a)oracle.com> sched/fair: Fix inaccurate tally of ttwu_move_affine Yafang Shao <laoar.shao(a)gmail.com> sched: Make struct sched_statistics independent of fair sched class Yafang Shao <laoar.shao(a)gmail.com> sched/fair: Use __schedstat_set() in set_next_entity() Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/rtas: use memmove for potentially overlapping buffer copy Randy Dunlap <rdunlap(a)infradead.org> macintosh: via-pmu-led: requires ATA to be set Randy Dunlap <rdunlap(a)infradead.org> powerpc/sysdev/tsi108: fix resource printk format warnings Randy Dunlap <rdunlap(a)infradead.org> powerpc/wii: fix resource printk format warnings Randy Dunlap <rdunlap(a)infradead.org> powerpc/mpc512x: fix resource printk format warning Liang He <windhl(a)126.com> macintosh/windfarm_smu_sat: Add missing of_node_put() Dhruva Gole <d-gole(a)ti.com> spi: bcm63xx: remove PM_SLEEP based conditional compilation Albert Huang <huangjie.albert(a)bytedance.com> virtio_ring: don't update event idx on get_buf Jishnu Prakash <quic_jprakash(a)quicinc.com> spmi: Add a check for remove callback when removing a SPMI driver Philipp Hortmann <philipp.g.hortmann(a)gmail.com> staging: rtl8192e: Fix W_DISABLE# does not work after stop/start Florian Fainelli <f.fainelli(a)gmail.com> serial: 8250: Add missing wakeup event reporting Shenwei Wang <shenwei.wang(a)nxp.com> tty: serial: fsl_lpuart: adjust buffer length to the intended size Dan Carpenter <dan.carpenter(a)linaro.org> firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe Chunfeng Yun <chunfeng.yun(a)mediatek.com> usb: mtu3: fix kernel panic at qmu transfer done irq handler Yinhao Hu <dddddd(a)hust.edu.cn> usb: chipidea: fix missing goto in `ci_hdrc_probe` Jon Hunter <jonathanh(a)nvidia.com> usb: gadget: tegra-xudc: Fix crash in vbus_draw John Paul Adrian Glaubitz <glaubitz(a)physik.fu-berlin.de> sh: sq: Fix incorrect element size for allocating bitmap buffer Kevin Brodsky <kevin.brodsky(a)arm.com> uapi/linux/const.h: prefer ISO-friendly __typeof__ Florian Fainelli <f.fainelli(a)gmail.com> scripts/gdb: raise error with reduced debugging information Lars-Peter Clausen <lars(a)metafoo.de> i2c: cadence: cdns_i2c_master_xfer(): Fix runtime PM leak on error path Dhruva Gole <d-gole(a)ti.com> spi: cadence-quadspi: fix suspend-resume implementations Liliang Ye <yll(a)hust.edu.cn> ASoC: fsl_mqs: move of_node_put() to the correct location Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: etm_pmu: Set the module field Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> HID: amd_sfh: Add support for shutdown operation Florian Fainelli <f.fainelli(a)gmail.com> scripts/gdb: bail early if there are no generic PD Florian Fainelli <f.fainelli(a)gmail.com> scripts/gdb: bail early if there are no clocks Randy Dunlap <rdunlap(a)infradead.org> ia64: salinfo: placate defined-but-not-used warning Randy Dunlap <rdunlap(a)infradead.org> ia64: mm/contig: fix section mismatch warning/error Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy(a)linux.intel.com> PCI/EDR: Clear Device Status after EDR error recovery Miquel Raynal <miquel.raynal(a)bootlin.com> of: Fix modalias string generation Dae R. Jeong <threeearcat(a)gmail.com> vmci_host: fix a race condition in vmci_host_poll() causing GPF Christophe Leroy <christophe.leroy(a)csgroup.eu> spi: fsl-spi: Fix CPM/QE mode Litte Endian Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi: qup: Don't skip cleanup in remove's error path Randy Dunlap <rdunlap(a)infradead.org> linux/vt_buffer.h: allow either builtin or modular for macros Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> ASoC: es8316: Handle optional IRQ assignment H. Nikolaus Schaller <hns(a)goldelico.com> PCI: imx6: Install the fault handler only on compatible match Zheng Wang <zyytlz.wz(a)163.com> usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi: imx: Don't skip cleanup in remove's error path Minghao Chi <chi.minghao(a)zte.com.cn> spi: spi-imx: using pm_runtime_resume_and_get instead of pm_runtime_get_sync Doug Berger <opendmb(a)gmail.com> serial: 8250_bcm7271: Fix arbitration handling Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> iio: light: max44009: add missing OF device matching Marco Pagani <marpagan(a)redhat.com> fpga: bridge: fix kernel-doc parameter description Marek Vasut <marex(a)denx.de> serial: stm32: Re-assert RTS/DE GPIO in RS485 mode only if more data are transmitted Erwan Le Ray <erwan.leray(a)foss.st.com> serial: stm32: re-introduce an irq flag condition in usart_receive_chars Prashanth K <quic_prashk(a)quicinc.com> usb: dwc3: gadget: Change condition for processing suspend event Wolfram Sang <wsa+renesas(a)sang-engineering.com> usb: host: xhci-rcar: remove leftover quirk handling John Stultz <jstultz(a)google.com> pstore: Revert pmsg_lock back to a normal mutex Hans de Goede <hdegoede(a)redhat.com> drivers: staging: rtl8723bs: Fix locking in rtw_scan_timeout_handler() Hans de Goede <hdegoede(a)redhat.com> drivers: staging: rtl8723bs: Fix locking in _rtw_join_timeout_handler() Randy Dunlap <rdunlap(a)infradead.org> ipmi: ASPEED_BT_IPMI_BMC: select REGMAP_MMIO instead of depending on it Kuniyuki Iwashima <kuniyu(a)amazon.com> tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp. Gencen Gan <gangecen(a)hust.edu.cn> net: amd: Fix link leak when verifying config failed Kuniyuki Iwashima <kuniyu(a)amazon.com> netlink: Use copy_to_user() for optval in netlink_getsockopt(). Liu Jian <liujian56(a)huawei.com> Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work" Ziyang Xuan <william.xuanziyang(a)huawei.com> ipv4: Fix potential uninit variable access bug in __ip_make_skb() Davide Caratti <dcaratti(a)redhat.com> net/sched: sch_fq: fix integer overflow of "credit" Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't write table validation state without mutex Stanislav Fomichev <sdf(a)google.com> bpf: Don't EFAULT for getsockopt with optval=NULL Yan Wang <rk.code(a)outlook.com> net: stmmac:fix system hang when setting up tag_8021q VLAN for DSA ports Chris Mi <cmi(a)nvidia.com> net/mlx5: E-switch, Don't destroy indirect table in split rule Joe Damato <jdamato(a)fastly.com> ixgbe: Enable setting RSS table to default values Joe Damato <jdamato(a)fastly.com> ixgbe: Allow flow hash to be set via ethtool Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: fw: fix memory leak in debugfs Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: mvm: check firmware response size Quan Zhou <quan.zhou(a)mediatek.com> wifi: mt76: mt7921e: improve reliability of dma reset Ming Yen Hsieh <mingyen.hsieh(a)mediatek.com> wifi: mt76: fix 6GHz high channel not be scanned Quan Zhou <quan.zhou(a)mediatek.com> wifi: mt76: mt7921e: fix probe timeout after reboot Deren Wu <deren.wu(a)mediatek.com> wifi: mt76: add flexible polling wait-interval support Kang Chen <void0red(a)gmail.com> wifi: mt76: handle failure of vzalloc in mt7615_coredump_work Emmanuel Grumbach <emmanuel.grumbach(a)intel.com> wifi: iwlwifi: make the loop for card preparation effective Jan Kara <jack(a)suse.cz> jdb2: Don't refuse invalidation of already invalidated buffers Tom Rix <trix(a)redhat.com> wifi: iwlwifi: fw: move memset before early return Tom Rix <trix(a)redhat.com> wifi: iwlwifi: mvm: initialize seq variable Daniel Gabay <daniel.gabay(a)intel.com> wifi: iwlwifi: yoyo: Fix possible division by zero Daniel Gabay <daniel.gabay(a)intel.com> wifi: iwlwifi: yoyo: skip dump correctly on hw error Yu Kuai <yukuai3(a)huawei.com> md/raid10: don't call bio_start_io_acct twice for bio which experienced read error Yu Kuai <yukuai3(a)huawei.com> md/raid10: fix memleak of md thread Yu Kuai <yukuai3(a)huawei.com> md/raid10: fix memleak for 'conf->bio_split' Yu Kuai <yukuai3(a)huawei.com> md/raid10: fix leak of 'r10bio->remaining' for recovery Li Nan <linan122(a)huawei.com> md/raid10: fix task hung in raid10d Yu Kuai <yukuai3(a)huawei.com> md/raid10: factor out code from wait_barrier() to stop_waiting_barrier() Vishal Verma <vverma(a)digitalocean.com> md: raid10 add nowait support Mariusz Tkaczyk <mariusz.tkaczyk(a)linux.intel.com> md: drop queue limitation for RAID1 and RAID10 Daniel Borkmann <daniel(a)iogearbox.net> bpf, sockmap: Revert buggy deadlock fix in the sockhash and sockmap Song Liu <song(a)kernel.org> selftests/bpf: Fix leaked bpf_link in get_stackid_cannot_attach Ming Lei <ming.lei(a)redhat.com> nvme-fcloop: fix "inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage" Keith Busch <kbusch(a)kernel.org> nvme: fix async event trace event Michael Kelley <mikelley(a)microsoft.com> nvme: handle the persistent internal error AER Damien Le Moal <damien.lemoal(a)opensource.wdc.com> nvmet: fix I/O Command Set specific Identify Controller Damien Le Moal <damien.lemoal(a)opensource.wdc.com> nvmet: fix Identify Active Namespace ID list handling Damien Le Moal <damien.lemoal(a)opensource.wdc.com> nvmet: fix Identify Controller handling Damien Le Moal <damien.lemoal(a)opensource.wdc.com> nvmet: fix Identify Namespace handling Damien Le Moal <damien.lemoal(a)opensource.wdc.com> nvmet: fix error handling in nvmet_execute_identify_cns_cs_ns() Christoph Hellwig <hch(a)lst.de> nvmet: move the call to nvmet_ns_changed out of nvmet_ns_revalidate Chaitanya Kulkarni <kch(a)nvidia.com> nvmet: use i_size_read() to set size for file-ns Xin Liu <liuxin350(a)huawei.com> bpf, sockmap: fix deadlocks in the sockhash and sockmap Sebastian Reichel <sebastian.reichel(a)collabora.com> net: ethernet: stmmac: dwmac-rk: fix optional phy regulator handling Shuchang Li <lishuchang(a)hust.edu.cn> scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup() Chao Yu <chao(a)kernel.org> f2fs: fix to avoid use-after-free for cached IPU bio Kal Conley <kal.conley(a)dectris.com> xsk: Fix unaligned descriptor validation Herbert Xu <herbert(a)gondor.apana.org.au> crypto: drbg - Only fail when jent is unavailable in FIPS mode Nicolai Stange <nstange(a)suse.de> crypto: drbg - make drbg_prepare_hrng() handle jent instantiation errors Quentin Monnet <quentin(a)isovalent.com> bpftool: Fix bug for long instructions in program CFG dumps YiFei Zhu <zhuyifei(a)google.com> selftests/bpf: Wait for receive in cg_storage_multi test Kal Conley <kal.conley(a)dectris.com> selftests: xsk: Disable IPv6 on VETH1 Simon Horman <horms(a)kernel.org> net: qrtr: correct types of trace event parameters Armin Wolf <W_Armin(a)gmx.de> wifi: rt2x00: Fix memory leak when handling surveys Wei Chen <harperchen1110(a)gmail.com> wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg() Wei Chen <harperchen1110(a)gmail.com> wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg() Suman Anna <s-anna(a)ti.com> crypto: sa2ul - Select CRYPTO_DES Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> crypto: caam - Clear some memory in instantiate_rng Yangtao Li <frank.li(a)vivo.com> f2fs: compress: fix to call f2fs_wait_on_page_writeback() in f2fs_write_raw_pages() Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: apply zone capacity to all zone type Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: enforce single zone capacity Yangtao Li <frank.li(a)vivo.com> f2fs: handle dqget error in f2fs_transfer_project_quota() Danila Chernetsov <listdansp(a)mail.ru> scsi: megaraid: Fix mega_cmd_done() CMDID_INT_CMDS Mike Christie <michael.christie(a)oracle.com> scsi: target: iscsit: Fix TAS handling during conn cleanup Mike Christie <michael.christie(a)oracle.com> scsi: target: Fix multiple LUN_RESET handling Eric Dumazet <edumazet(a)google.com> net/packet: convert po->auxdata to an atomic flag Eric Dumazet <edumazet(a)google.com> net/packet: convert po->origdev to an atomic flag Eric Dumazet <edumazet(a)google.com> net/packet: annotate accesses to po->xmit Vadim Fedorenko <vadim.fedorenko(a)linux.dev> vlan: partially enable SIOCSHWTSTAMP in container Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> net: pcs: xpcs: remove double-read of link state when using AN Luis Gerhorst <gerhorst(a)cs.fau.de> bpf: Remove misleading spec_v1 check on var-offset stack read Martin KaFai Lau <martin.lau(a)kernel.org> selftests/bpf: Fix a fd leak in an error path in network_helpers.c Alexander Mikhalitsyn <aleksandr.mikhalitsyn(a)canonical.com> scm: fix MSG_CTRUNC setting condition for SO_PASSSEC Andrii Nakryiko <andrii(a)kernel.org> bpf: fix precision propagation verbose logging Andrii Nakryiko <andrii(a)kernel.org> bpf: take into account liveness when propagating precision Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> wifi: rtw88: mac: Return the original error from rtw_mac_power_switch() Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> wifi: rtw88: mac: Return the original error from rtw_pwr_seq_parser() Luis Gerhorst <gerhorst(a)cs.fau.de> tools: bpftool: Remove invalid \' json escape Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath6kl: reduce WARN to dev_dbg() in callback John Keeping <john(a)metanate.com> wifi: brcmfmac: support CQM RSSI notification with older firmware Dan Carpenter <error27(a)gmail.com> wifi: ath5k: fix an off by one check in ath5k_eeprom_read_freq_list() Fedor Pchelkin <pchelkin(a)ispras.ru> wifi: ath9k: hif_usb: fix memory leak of remain_skbs Alexey V. Vissarionov <gremlin(a)altlinux.org> wifi: ath6kl: minor fix for allocation size Tomáš Pecka <tomas.pecka(a)cesnet.cz> hwmon: (pmbus/fsp-3y) Fix functionality bitmask in FSP-3Y YM-2151E Sanjay Chandrashekara <sanjayc(a)nvidia.com> cpufreq: use correct unit when verify cur freq Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> tick/common: Align tick period with the HZ tick. Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Make intel_get_crtc_new_encoder() less oopsy Thomas Gleixner <tglx(a)linutronix.de> debugobject: Prevent init race with static objects Sumit Garg <sumit.garg(a)linaro.org> arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step Saurabh Sengar <ssengar(a)linux.microsoft.com> x86/ioapic: Don't return 0 from arch_dynirq_lower_bound() YAN SHI <m202071378(a)hust.edu.cn> regulator: stm32-pwr: fix of_iomap leak Michał Krawczyk <mk(a)semihalf.com> media: venus: dec: Fix handling of the start cmd Florian Fainelli <f.fainelli(a)gmail.com> media: rc: gpio-ir-recv: Fix support for wake-up Igor Artemiev <Igor.A.Artemiev(a)mcst.ru> drm/amd/display: Fix potential null dereference Miaoqian Lin <linmq006(a)gmail.com> media: rcar_fdp1: Fix refcount leak in probe and remove function Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> media: rcar_fdp1: Convert to platform remove callback returning void Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> platform: Provide a remove callback that returns no value Tang Bin <tangbin(a)cmss.chinamobile.com> media: rcar_fdp1: Fix the correct variable assignments Cai Huoqing <caihuoqing(a)baidu.com> media: rcar_fdp1: Make use of the helper function devm_platform_ioremap_resource() Zheng Wang <zyytlz.wz(a)163.com> media: saa7134: fix use after free bug in saa7134_finidev due to race condition Zheng Wang <zyytlz.wz(a)163.com> media: dm1105: Fix use after free bug in dm1105_remove due to race condition Zheng Wang <zyytlz.wz(a)163.com> media: rkvdec: fix use after free bug in rkvdec_remove Uros Bizjak <ubizjak(a)gmail.com> x86/apic: Fix atomic update of offset in reserve_eilvt_offset() Douglas Anderson <dianders(a)chromium.org> regulator: core: Avoid lockdep reports when resolving supplies Douglas Anderson <dianders(a)chromium.org> regulator: core: Consistently set mutex_owner when using ww_mutex_lock_slow() Thomas Hellström <thomas.hellstrom(a)linux.intel.com> drm/ttm/pool: Fix ttm_pool_alloc error path Christian König <christian.koenig(a)amd.com> drm/ttm: optimize pool allocations a bit v2 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: msm8994-msft-lumia-octagon: drop unit address from PMI8994 regulator Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: msm8994-kitakami: drop unit address from PMI8994 regulator Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: sc7180-trogdor-lazor: correct trackpad supply Conor Dooley <conor.dooley(a)microchip.com> mailbox: mpfs: switch to txdone_poll Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> drm/lima/lima_drv: Add missing unwind goto in lima_pdev_probe() Jean-Philippe Brucker <jean-philippe(a)linaro.org> ACPI: VIOT: Initialize the correct IOMMU fwspec Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Fix xfers allocation on Rx channel H. Nikolaus Schaller <hns(a)goldelico.com> ARM: dts: gta04: fix excess dma channel usage Dan Carpenter <error27(a)gmail.com> drm: rcar-du: Fix a NULL vs IS_ERR() bug Georgii Kruglov <georgy.kruglov(a)yandex.ru> mmc: sdhci-of-esdhc: fix quirk to ignore command inhibit for data Roger Pau Monne <roger.pau(a)citrix.com> ACPI: processor: Fix evaluating _PDC method when running as Xen dom0 Lee Jones <lee(a)kernel.org> drm/amd/display/dc/dce60/Makefile: Fix previous attempt to silence known override-init warnings Adam Skladowski <a39.skl(a)gmail.com> drm: msm: adreno: Disable preemption on Adreno 510 Johan Hovold <johan+linaro(a)kernel.org> drm/msm/adreno: drop bogus pm_runtime_set_active() Rob Clark <robdclark(a)chromium.org> drm/msm/adreno: Defer enabling runpm until hw_init() Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> media: max9286: Free control handler Adam Ford <aford173(a)gmail.com> drm/bridge: adv7533: Fix adv7533_mode_valid for adv7533 and adv7535 Mukesh Ojha <quic_mojha(a)quicinc.com> firmware: qcom_scm: Clear download bit during reboot Dan Carpenter <error27(a)gmail.com> media: av7110: prevent underflow in write_ts_to_decoder() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> media: bdisp: Add missing check for create_workqueue Muralidhara M K <muralimk(a)amd.com> x86/MCE/AMD: Use an u64 for bank_map Manivannan Sadhasivam <mani(a)kernel.org> ARM: dts: qcom: ipq8064: Fix the PCI I/O port range Christian Marangi <ansuelsmth(a)gmail.com> ARM: dts: qcom: ipq8064: reduce pci IO size to 64K Manivannan Sadhasivam <mani(a)kernel.org> ARM: dts: qcom: ipq4019: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: sm8250: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: msm8996: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: ipq6018: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: ipq8074: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: msm8998: Fix the PCI I/O port range Manivannan Sadhasivam <mani(a)kernel.org> arm64: dts: qcom: sdm845: Fix the PCI I/O port range Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: sdm845: correct dynamic power coefficients Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8998: Fix stm-stimulus-base reg name Rafał Miłecki <rafal(a)milecki.pl> arm64: dts: broadcom: bcmbca: bcm4908: fix procmon nodename Rafał Miłecki <rafal(a)milecki.pl> arm64: dts: broadcom: bcmbca: bcm4908: fix NAND interrupt name William Zhang <william.zhang(a)broadcom.com> arm64: dts: Move BCM4908 dts to bcmbca folder Rafał Miłecki <rafal(a)milecki.pl> arm64: dts: Add base DTS file for bcmbca device Asus GT-AX6000 Anand Gore <anand.gore(a)broadcom.com> ARM64: dts: Add DTS files for bcmbca SoC BCM6858 William Zhang <william.zhang(a)broadcom.com> arm64: dts: Add DTS files for bcmbca SoC BCM4912 William Zhang <william.zhang(a)broadcom.com> arm64: dts: Add DTS files for bcmbca SoC BCM63158 Rafał Miłecki <rafal(a)milecki.pl> arm64: dts: broadcom: bcm4908: add DT for Netgear RAXE500 Bhavya Kapoor <b-kapoor(a)ti.com> arm64: dts: ti: k3-j721e-main: Remove ti,strobe-sel property Douglas Anderson <dianders(a)chromium.org> regulator: core: Shorten off-on-delay-us for always-on/boot-on by time since booted Qiuxu Zhuo <qiuxu.zhuo(a)intel.com> EDAC/skx: Fix overflows on the DRAM row address mapping arrays Vinod Polimera <quic_vpolimer(a)quicinc.com> drm/msm/disp/dpu: check for crtc enable rather than crtc active to release shared resources Geert Uytterhoeven <geert+renesas(a)glider.be> arm64: dts: renesas: r8a774c0: Remove bogus voltages from OPP table Geert Uytterhoeven <geert+renesas(a)glider.be> arm64: dts: renesas: r8a77990: Remove bogus voltages from OPP table Miaoqian Lin <linmq006(a)gmail.com> soc: ti: pm33xx: Fix refcount leak in am33xx_pm_probe Terry Bowman <terry.bowman(a)amd.com> tools/x86/kcpuid: Fix avx512bw and avx512lvl fields in Fn00000007 Dom Cobley <popcornmix(a)gmail.com> drm/probe-helper: Cancel previous job before starting new one Maíra Canal <mcanal(a)igalia.com> drm/vgem: add missing mutex_destroy Rob Clark <robdclark(a)chromium.org> drm/rockchip: Drop unbalanced obj unref Jingbo Xu <jefflexu(a)linux.alibaba.com> erofs: fix potential overflow calculating xattr_isize Gao Xiang <hsiangkao(a)linux.alibaba.com> erofs: stop parsing non-compact HEAD index if clusterofs is invalid Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Claim locality when interrupts are reenabled on resume Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm: Implement usage counter for locality Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Claim locality before writing interrupt registers Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Do not skip reset of original interrupt vector Paul Moore <paul(a)paul-moore.com> selinux: ensure av_permissions.h is built when needed Ondrej Mosnacek <omosnace(a)redhat.com> selinux: fix Makefile dependencies of flask.h Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Check for return value after write_schemata() Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Allow ->setup() to return errors Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Move ->setup() call outside of test specific branches Shaopeng Tan <tan.shaopeng(a)jp.fujitsu.com> selftests/resctrl: Extend CPU vendor detection Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Return NULL if malloc_and_init_memory() did not alloc mem Zqiang <qiang1.zhang(a)intel.com> rcu: Fix missing TICK_DEP_MASK_RCU_EXP dependency check Randy Dunlap <rdunlap(a)infradead.org> sound/oss/dmasound: fix build when drivers are mixed =y/=m Dave Chinner <dchinner(a)redhat.com> xfs: don't consider future format versions valid Mårten Lindahl <marten.lindahl(a)axis.com> ubifs: Free memory for tmpfile name Wang YanQing <udknight(a)gmail.com> ubi: Fix return value overwrite issue in try_write_vid_and_data() Zhihao Cheng <chengzhihao1(a)huawei.com> ubifs: Fix memleak when insert_old_idx() failed Zhihao Cheng <chengzhihao1(a)huawei.com> Revert "ubifs: dirty_cow_znode: Fix memleak in error handling path" Kishon Vijay Abraham I <kvijayab(a)amd.com> iommu/amd: Fix "Guest Virtual APIC Table Root Pointer" configuration in IRTE Ondrej Mosnacek <omosnace(a)redhat.com> tracing: Fix permissions for the buffer_percent file Song Shuai <suagrfillet(a)gmail.com> riscv: mm: remove redundant parameter of create_fdt_early_page_table Reid Tonking <reidt(a)ti.com> i2c: omap: Fix standard mode false ACK readings Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: fix memleak in session setup Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: fix NULL pointer dereference in smb2_get_info_filesystem() Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: call rcu_barrier() in ksmbd_server_exit() Baokun Li <libaokun1(a)huawei.com> writeback, cgroup: fix null-ptr-deref write in bdi_split_work_to_wbs Zhang Zhengming <zhang.zhengming(a)h3c.com> relayfs: fix out-of-bounds access in relay_file_read Sean Christopherson <seanjc(a)google.com> KVM: nVMX: Emulate NOPs in L2, and PAUSE if it's not intercepted Roberto Sassu <roberto.sassu(a)huawei.com> reiserfs: Add security prefix to xattr name in reiserfs_security_write() Zheng Yejian <zhengyejian1(a)huawei.com> rcu: Avoid stack overflow due to __rcu_irq_enter_check_tick() being kprobe-ed Jonathan McDowell <noodles(a)earth.li> crypto: safexcel - Cleanup ring IRQ workqueues on load failure Toke Høiland-Jørgensen <toke(a)redhat.com> crypto: api - Demote BUG_ON() in crypto_unregister_alg() to a WARN_ON() Johannes Berg <johannes.berg(a)intel.com> ring-buffer: Sync IRQ works before buffer destruction Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> pinctrl: qcom: lpass-lpi: set output value before enabling output Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> soundwire: qcom: correct setting ignore bit on v1.5.1 Heiner Kallweit <hkallweit1(a)gmail.com> pwm: meson: Fix g12a ao clk81 name Heiner Kallweit <hkallweit1(a)gmail.com> pwm: meson: Fix axg ao mux parents Felix Fietkau <nbd(a)nbd.name> wifi: mt76: add missing locking to protect against concurrent rx/status calls Kees Cook <keescook(a)chromium.org> kheaders: Use array declaration instead of char Zhang Yuchen <zhangyuchen.lcr(a)bytedance.com> ipmi: fix SSIF not responding under certain cond. Corey Minyard <minyard(a)acm.org> ipmi:ssif: Add send_retries increment Jiaxun Yang <jiaxun.yang(a)flygoat.com> MIPS: fw: Allow firmware to pass a empty env Joel Fernandes (Google) <joel(a)joelfernandes.org> tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem Johan Hovold <johan+linaro(a)kernel.org> xhci: fix debugfs register accesses while suspended Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> tty: Prevent writing chars during tcsetattr TCSADRAIN/FLUSH Nuno Sá <nuno.sa(a)analog.com> staging: iio: resolver: ads1210: fix config mode Harshad Shirwadkar <harshadshirwadkar(a)gmail.com> ext4: use ext4_journal_start/stop for fast commit transactions Eric Biggers <ebiggers(a)google.com> blk-crypto: make blk_crypto_evict_key() more robust Eric Biggers <ebiggers(a)google.com> blk-crypto: make blk_crypto_evict_key() return void Eric Biggers <ebiggers(a)google.com> blk-mq: release crypto keyslot before reporting I/O complete Thomas Gleixner <tglx(a)linutronix.de> posix-cpu-timers: Implement the missing timer_wait_running callback Chris Packham <chris.packham(a)alliedtelesis.co.nz> hwmon: (adt7475) Use device_property APIs when configuring polarity Babu Moger <Babu.Moger(a)amd.com> hwmon: (k10temp) Check range scale when CUR_TEMP register is read-write Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: fix runtime pm imbalance on unbind Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: fix runtime pm imbalance on probe errors Randy Dunlap <rdunlap(a)infradead.org> IMA: allow/fix UML builds Manivannan Sadhasivam <mani(a)kernel.org> PCI: qcom: Fix the incorrect register usage in v2.7.0 config Lukas Wunner <lukas(a)wunner.de> PCI: pciehp: Fix AB-BA deadlock between reset_lock and device_lock Ard Biesheuvel <ardb(a)kernel.org> arm64: Stash shadow stack pointer in the task struct on interrupt Ard Biesheuvel <ardb(a)kernel.org> arm64: Always load shadow stack pointer directly from the task struct Mario Limonciello <mario.limonciello(a)amd.com> wifi: mt76: mt7921e: Set memory space enable in PCI_COMMAND if unset Jiri Slaby (SUSE) <jirislaby(a)kernel.org> wireguard: timers: cast enum limits members to int in prints Tony Luck <tony.luck(a)intel.com> x86/cpu: Add model number for Intel Arrow Lake processor Vladimir Oltean <vladimir.oltean(a)nxp.com> asm-generic/io.h: suppress endianness warnings for readq() and writeq() Anh Tuan Phan <tuananhlfc(a)gmail.com> selftests mount: Fix mount_setattr_test builds failed Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750 Patrik Dahlström <risca(a)dalakolonin.se> iio: adc: palmas_gpadc: fix NULL dereference on rmmod Michael Kelley <mikelley(a)microsoft.com> x86/hyperv: Block root partition functionality in a Confidential VM Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: soc-pcm: fix hw->formats cleared by soc_pcm_hw_init() for dpcm Eugene Huang <eugene.huang99(a)gmail.com> ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/omap3-gta04.dtsi | 16 + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +- arch/arm64/boot/dts/broadcom/Makefile | 2 +- arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 4 - arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 10 + .../{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0 .../bcm4906-tplink-archer-c2300-v1.dts | 0 .../dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0 .../{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0 .../broadcom/bcmbca/bcm4908-netgear-raxe500.dts | 50 ++ .../dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 4 +- .../dts/broadcom/bcmbca/bcm4912-asus-gt-ax6000.dts | 19 + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 128 +++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 128 +++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 121 +++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 30 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 30 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 30 ++ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 6 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 +- .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 3 +- .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 3 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +- arch/arm64/boot/dts/qcom/msm8998.dtsi | 4 +- .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 30 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 +- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 - arch/arm64/boot/dts/renesas/r8a77990.dtsi | 3 - arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 1 - arch/arm64/include/asm/debug-monitors.h | 1 + arch/arm64/include/asm/scs.h | 7 +- arch/arm64/kernel/debug-monitors.c | 5 + arch/arm64/kernel/entry.S | 16 +- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/kgdb.c | 2 + arch/ia64/kernel/salinfo.c | 2 +- arch/ia64/mm/contig.c | 2 +- arch/ia64/mm/hugetlbpage.c | 2 +- arch/mips/fw/lib/cmdline.c | 2 +- arch/openrisc/kernel/entry.S | 6 +- arch/parisc/kernel/real2.S | 5 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/wii.c | 4 +- arch/powerpc/sysdev/tsi108_pci.c | 5 +- arch/riscv/mm/init.c | 6 +- arch/sh/kernel/cpu/sh4/sq.c | 2 +- arch/x86/include/asm/intel-family.h | 2 + arch/x86/kernel/apic/apic.c | 5 +- arch/x86/kernel/apic/io_apic.c | 14 +- arch/x86/kernel/cpu/mce/amd.c | 14 +- arch/x86/kernel/cpu/mshyperv.c | 12 +- arch/x86/kvm/vmx/vmx.c | 15 + block/blk-core.c | 7 + block/blk-crypto-internal.h | 25 +- block/blk-crypto.c | 69 ++- block/blk-merge.c | 2 + block/blk-mq.c | 2 +- block/keyslot-manager.c | 43 +- crypto/algapi.c | 4 +- crypto/drbg.c | 16 +- drivers/acpi/processor_pdc.c | 11 + drivers/acpi/viot.c | 5 +- drivers/base/cpu.c | 3 +- drivers/base/platform.c | 4 +- drivers/bluetooth/btsdio.c | 1 - drivers/char/ipmi/Kconfig | 3 +- drivers/char/ipmi/ipmi_ssif.c | 8 +- drivers/char/tpm/tpm_tis_core.c | 131 +++-- drivers/char/tpm/tpm_tis_core.h | 2 + drivers/clk/at91/clk-sam9x60-pll.c | 2 +- drivers/clk/clk-conf.c | 12 +- drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-regmap-phy-mux.c | 62 +++ drivers/clk/qcom/clk-regmap-phy-mux.h | 33 ++ drivers/clk/qcom/gcc-sm6115.c | 50 +- drivers/clk/qcom/gcc-sm8350.c | 47 +- drivers/clk/rockchip/clk-rk3399.c | 2 +- drivers/clocksource/timer-davinci.c | 30 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/crypto/Kconfig | 1 + drivers/crypto/caam/ctrl.c | 6 +- drivers/crypto/inside-secure/safexcel.c | 37 +- drivers/dma/at_xdmac.c | 33 +- drivers/dma/dw-edma/dw-edma-core.c | 27 +- drivers/dma/mv_xor_v2.c | 2 +- drivers/dma/qcom/gpi.c | 1 - drivers/edac/skx_base.c | 4 +- drivers/firmware/arm_scmi/driver.c | 2 +- drivers/firmware/qcom_scm.c | 3 +- drivers/firmware/stratix10-svc.c | 4 +- drivers/fpga/fpga-bridge.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/bridge/adv7511/adv7533.c | 25 +- drivers/gpu/drm/drm_probe_helper.c | 5 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 6 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 7 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 - drivers/gpu/drm/ttm/ttm_pool.c | 161 ++++-- drivers/gpu/drm/vgem/vgem_fence.c | 1 + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 9 + drivers/hwmon/adt7475.c | 6 +- drivers/hwmon/k10temp.c | 4 +- drivers/hwmon/pmbus/fsp-3y.c | 1 - drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + drivers/i2c/busses/i2c-cadence.c | 6 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/iio/adc/palmas_gpadc.c | 2 +- drivers/iio/light/max44009.c | 13 +- drivers/infiniband/core/cm.c | 3 +- drivers/infiniband/hw/hfi1/ipoib_tx.c | 1 + drivers/infiniband/hw/hfi1/mmu_rb.c | 73 +-- drivers/infiniband/hw/hfi1/mmu_rb.h | 8 +- drivers/infiniband/hw/hfi1/sdma.c | 21 +- drivers/infiniband/hw/hfi1/sdma.h | 16 +- drivers/infiniband/hw/hfi1/sdma_txreq.h | 1 + drivers/infiniband/hw/hfi1/trace_mmu.h | 4 - drivers/infiniband/hw/hfi1/user_sdma.c | 600 +++++++++++++-------- drivers/infiniband/hw/hfi1/user_sdma.h | 5 - drivers/infiniband/hw/hfi1/verbs.c | 4 +- drivers/infiniband/hw/hfi1/vnic_sdma.c | 1 + drivers/infiniband/hw/mlx4/qp.c | 8 +- drivers/infiniband/hw/mlx5/devx.c | 31 +- drivers/infiniband/hw/mlx5/qp.c | 2 +- drivers/infiniband/sw/rdmavt/qp.c | 2 - drivers/infiniband/sw/siw/siw_main.c | 3 - drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 23 +- drivers/input/touchscreen/raspberrypi-ts.c | 3 +- drivers/iommu/amd/amd_iommu_types.h | 4 +- drivers/leds/Kconfig | 2 +- drivers/leds/leds-tca6507.c | 5 +- drivers/macintosh/Kconfig | 1 + drivers/macintosh/windfarm_smu_sat.c | 1 + drivers/mailbox/mailbox-mpfs.c | 12 +- drivers/mailbox/zynqmp-ipi-mailbox.c | 6 +- drivers/md/dm-clone-target.c | 1 + drivers/md/dm-flakey.c | 4 +- drivers/md/dm-integrity.c | 8 +- drivers/md/dm-ioctl.c | 12 +- drivers/md/dm-table.c | 19 +- drivers/md/dm-verity-target.c | 2 +- drivers/md/raid1-10.c | 6 - drivers/md/raid1.c | 7 - drivers/md/raid10.c | 221 +++++--- drivers/media/i2c/max9286.c | 1 + drivers/media/pci/dm1105/dm1105.c | 1 + drivers/media/pci/saa7134/saa7134-ts.c | 1 + drivers/media/pci/saa7134/saa7134-vbi.c | 1 + drivers/media/pci/saa7134/saa7134-video.c | 1 + drivers/media/platform/qcom/venus/vdec.c | 8 + drivers/media/platform/rcar_fdp1.c | 28 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 + drivers/media/rc/gpio-ir-recv.c | 2 + drivers/mfd/tqmx86.c | 52 +- drivers/misc/vmw_vmci/vmci_host.c | 8 +- drivers/mmc/host/sdhci-of-esdhc.c | 24 +- drivers/mtd/mtdcore.c | 23 +- drivers/mtd/ubi/eba.c | 19 +- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 23 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 - drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 14 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +- drivers/net/pcs/pcs-xpcs.c | 13 +- drivers/net/wireguard/timers.c | 8 +- drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 19 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 14 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 8 +- drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 4 +- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- drivers/net/wireless/mediatek/mt76/dma.c | 2 + drivers/net/wireless/mediatek/mt76/mt76.h | 9 +- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 5 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 13 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 13 +- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 5 +- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 40 +- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 6 + drivers/net/wireless/mediatek/mt76/tx.c | 4 + drivers/net/wireless/mediatek/mt76/util.c | 10 +- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 1 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 + drivers/net/wireless/realtek/rtlwifi/debug.c | 12 +- drivers/net/wireless/realtek/rtw88/mac.c | 8 +- drivers/nvme/host/core.c | 34 +- drivers/nvme/host/trace.h | 15 +- drivers/nvme/target/admin-cmd.c | 51 +- drivers/nvme/target/configfs.c | 3 +- drivers/nvme/target/core.c | 5 +- drivers/nvme/target/fcloop.c | 48 +- drivers/nvme/target/io-cmd-file.c | 17 +- drivers/nvme/target/nvmet.h | 6 +- drivers/nvme/target/zns.c | 16 +- drivers/of/device.c | 7 +- drivers/pci/controller/dwc/pci-imx6.c | 7 + drivers/pci/controller/dwc/pcie-qcom.c | 8 +- drivers/pci/hotplug/pciehp_pci.c | 15 + drivers/pci/pcie/edr.c | 1 + drivers/phy/tegra/xusb.c | 2 + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 14 +- drivers/pinctrl/renesas/pfc-r8a779a0.c | 8 - drivers/power/supply/generic-adc-battery.c | 3 + drivers/pwm/pwm-meson.c | 6 +- drivers/pwm/pwm-mtk-disp.c | 34 +- drivers/regulator/core.c | 100 +++- drivers/regulator/stm32-pwr.c | 7 +- drivers/rtc/rtc-meson-vrtc.c | 4 +- drivers/rtc/rtc-omap.c | 1 + drivers/s390/block/dasd.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 10 +- drivers/scsi/megaraid.c | 1 + drivers/soc/ti/pm33xx.c | 5 +- drivers/soundwire/qcom.c | 2 +- drivers/spi/spi-bcm63xx.c | 2 - drivers/spi/spi-cadence-quadspi.c | 19 +- drivers/spi/spi-fsl-spi.c | 12 +- drivers/spi/spi-imx.c | 14 +- drivers/spi/spi-qup.c | 22 +- drivers/spmi/spmi.c | 3 +- drivers/staging/iio/resolver/ad2s1210.c | 2 +- drivers/staging/media/av7110/av7110_av.c | 4 +- drivers/staging/media/rkvdec/rkvdec.c | 2 + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 + drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 +- drivers/target/iscsi/iscsi_target.c | 16 +- drivers/target/target_core_device.c | 1 + drivers/target/target_core_tmr.c | 26 +- drivers/thermal/mtk_thermal.c | 14 +- drivers/tty/serial/8250/8250_bcm7271.c | 18 +- drivers/tty/serial/8250/8250_port.c | 4 + drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/tty/serial/stm32-usart.c | 26 +- drivers/tty/sysrq.c | 2 +- drivers/tty/tty.h | 2 + drivers/tty/tty_io.c | 4 +- drivers/tty/tty_ioctl.c | 45 +- drivers/usb/chipidea/core.c | 2 +- drivers/usb/dwc3/core.c | 15 +- drivers/usb/dwc3/gadget.c | 11 +- drivers/usb/gadget/udc/renesas_usb3.c | 1 + drivers/usb/gadget/udc/tegra-xudc.c | 2 +- drivers/usb/host/xhci-debugfs.c | 1 + drivers/usb/host/xhci-rcar.c | 3 - drivers/usb/mtu3/mtu3_qmu.c | 5 +- drivers/virtio/virtio_ring.c | 22 +- drivers/xen/pcpu.c | 20 + fs/afs/inode.c | 1 + fs/btrfs/ioctl.c | 5 + fs/cifs/file.c | 16 + fs/cifs/misc.c | 8 +- fs/erofs/internal.h | 2 +- fs/erofs/zmap.c | 4 + fs/ext4/acl.c | 2 - fs/ext4/extents.c | 6 +- fs/ext4/file.c | 4 - fs/ext4/inode.c | 10 +- fs/ext4/ioctl.c | 10 +- fs/f2fs/compress.c | 6 + fs/f2fs/data.c | 5 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 15 +- fs/f2fs/segment.c | 76 +-- fs/f2fs/segment.h | 6 + fs/f2fs/super.c | 33 +- fs/fs-writeback.c | 17 +- fs/jbd2/journal.c | 2 + fs/jbd2/transaction.c | 3 + fs/ksmbd/server.c | 1 + fs/ksmbd/smb2pdu.c | 7 + fs/nfs/nfs4state.c | 4 + fs/nilfs2/bmap.c | 16 +- fs/nilfs2/segment.c | 5 +- fs/ntfs3/fslog.c | 6 +- fs/ntfs3/index.c | 8 + fs/ntfs3/inode.c | 2 +- fs/ntfs3/namei.c | 10 + fs/ntfs3/ntfs_fs.h | 1 + fs/pstore/pmsg.c | 7 +- fs/reiserfs/xattr_security.c | 8 +- fs/ubifs/dir.c | 1 + fs/ubifs/tnc.c | 142 +++-- fs/xfs/libxfs/xfs_sb.c | 11 +- include/asm-generic/io.h | 4 +- include/linux/blk-crypto.h | 4 +- include/linux/mailbox/zynqmp-ipi-message.h | 2 +- include/linux/mlx5/mlx5_ifc.h | 3 +- include/linux/netfilter/nfnetlink.h | 1 - include/linux/nvme.h | 4 + include/linux/platform_device.h | 11 + include/linux/posix-timers.h | 17 +- include/linux/sched.h | 6 +- include/linux/sunrpc/sched.h | 3 +- include/linux/tick.h | 2 + include/linux/vt_buffer.h | 2 +- include/linux/workqueue.h | 3 +- include/net/scm.h | 13 +- include/net/xsk_buff_pool.h | 9 +- include/target/target_core_base.h | 1 + include/trace/events/qrtr.h | 33 +- include/trace/events/timer.h | 3 +- include/uapi/linux/btrfs.h | 1 + include/uapi/linux/const.h | 2 +- include/xen/xen.h | 11 + kernel/bpf/cgroup.c | 9 +- kernel/bpf/verifier.c | 26 +- kernel/events/core.c | 4 +- kernel/kheaders.c | 10 +- kernel/power/process.c | 2 +- kernel/rcu/tree.c | 1 + kernel/relay.c | 3 +- kernel/sched/core.c | 25 +- kernel/sched/deadline.c | 5 +- kernel/sched/debug.c | 92 ++-- kernel/sched/fair.c | 93 ++-- kernel/sched/rt.c | 8 +- kernel/sched/stats.h | 19 + kernel/sched/stop_task.c | 4 +- kernel/time/posix-cpu-timers.c | 81 ++- kernel/time/posix-timers.c | 4 + kernel/time/tick-common.c | 12 +- kernel/time/tick-sched.c | 16 +- kernel/time/timekeeping.c | 4 +- kernel/trace/ring_buffer.c | 4 + kernel/trace/trace.c | 2 +- kernel/workqueue.c | 176 +++--- lib/debugobjects.c | 146 ++--- mm/backing-dev.c | 12 +- net/8021q/vlan_dev.c | 2 +- net/core/skbuff.c | 3 + net/ipv4/ip_output.c | 16 +- net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nfnetlink.c | 2 - net/netlink/af_netlink.c | 75 +-- net/packet/af_packet.c | 30 +- net/packet/diag.c | 4 +- net/packet/internal.h | 26 +- net/sched/sch_fq.c | 6 +- net/sunrpc/clnt.c | 3 - net/sunrpc/sched.c | 1 - net/xdp/xsk_queue.h | 1 + scripts/gdb/linux/clk.py | 2 + scripts/gdb/linux/constants.py.in | 2 + scripts/gdb/linux/genpd.py | 4 +- scripts/gdb/linux/timerlist.py | 4 +- scripts/gdb/linux/utils.py | 5 +- scripts/gdb/vmlinux-gdb.py | 5 +- security/integrity/ima/Kconfig | 2 +- security/selinux/Makefile | 4 +- sound/oss/dmasound/dmasound.h | 6 - sound/oss/dmasound/dmasound_core.c | 26 +- sound/soc/codecs/es8316.c | 14 +- sound/soc/fsl/fsl_mqs.c | 15 +- sound/soc/intel/boards/bytcr_rt5640.c | 12 + sound/soc/intel/boards/sof_sdw.c | 11 + sound/soc/soc-pcm.c | 4 + sound/usb/quirks-table.h | 58 ++ tools/arch/x86/kcpuid/cpuid.csv | 4 +- tools/bpf/bpftool/json_writer.c | 3 - tools/bpf/bpftool/xlated_dumper.c | 7 + tools/objtool/check.c | 11 - tools/perf/util/auxtrace.c | 5 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + tools/testing/selftests/bpf/network_helpers.c | 2 +- .../selftests/bpf/prog_tests/cg_storage_multi.c | 8 +- .../bpf/prog_tests/get_stackid_cannot_attach.c | 1 + tools/testing/selftests/bpf/test_xsk.sh | 1 + .../selftests/mount_setattr/mount_setattr_test.c | 1 + tools/testing/selftests/resctrl/cache.c | 4 +- tools/testing/selftests/resctrl/cat_test.c | 4 +- tools/testing/selftests/resctrl/cmt_test.c | 2 +- tools/testing/selftests/resctrl/fill_buf.c | 2 + tools/testing/selftests/resctrl/mba_test.c | 9 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl.h | 7 +- tools/testing/selftests/resctrl/resctrl_tests.c | 41 +- tools/testing/selftests/resctrl/resctrl_val.c | 21 +- tools/testing/selftests/resctrl/resctrlfs.c | 2 +- 395 files changed, 3860 insertions(+), 2108 deletions(-)

1 year, 9 months

9
384
0 0

FAILED: patch "[PATCH] blk-cgroup: Flush stats before releasing blkcg_gq" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 20cb1c2fb7568a6054c55defe044311397e01ddb # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023071635-handsaw-enclosure-0363@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 20cb1c2fb756 ("blk-cgroup: Flush stats before releasing blkcg_gq") 2c275afeb61d ("block: make blkcg_punt_bio_submit optional") 12be09fe18f2 ("block: async_bio_lock does not need to be bh-safe") 3480373ebdf7 ("btrfs, block: move REQ_CGROUP_PUNT to btrfs") 0a0596fbbe5b ("btrfs, mm: remove the punt_to_cgroup field in struct writeback_control") 05d06a5c9d9c ("btrfs: move kthread_associate_blkcg out of btrfs_submit_compressed_write") ae42a154ca89 ("btrfs: pass a btrfs_bio to btrfs_submit_bio") 34f888ce3a35 ("btrfs: cleanup main loop in btrfs_encoded_read_regular_fill_pages") 72b505dc5757 ("btrfs: add a wbc pointer to struct btrfs_bio_ctrl") 794c26e214ab ("btrfs: remove the sync_io flag in struct btrfs_bio_ctrl") c000bc04bad4 ("btrfs: store the bio opf in struct btrfs_bio_ctrl") eb8d0c6d042f ("btrfs: remove the force_bio_submit to submit_extent_page") 67998cf438e2 ("btrfs: don't set force_bio_submit in read_extent_buffer_subpage") 10e924bc320a ("btrfs: factor out a btrfs_add_compressed_bio_pages helper") e7aff33e3161 ("btrfs: use the bbio file offset in btrfs_submit_compressed_read") 798c9fc74d03 ("btrfs: remove redundant free_extent_map in btrfs_submit_compressed_read") 544fe4a903ce ("btrfs: embed a btrfs_bio into struct compressed_bio") 3822a7c40997 ("Merge tag 'mm-stable-2023-02-20-13-37' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 20cb1c2fb7568a6054c55defe044311397e01ddb Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei(a)redhat.com> Date: Sat, 10 Jun 2023 07:42:49 +0800 Subject: [PATCH] blk-cgroup: Flush stats before releasing blkcg_gq As noted by Michal, the blkg_iostat_set's in the lockless list hold reference to blkg's to protect against their removal. Those blkg's hold reference to blkcg. When a cgroup is being destroyed, cgroup_rstat_flush() is only called at css_release_work_fn() which is called when the blkcg reference count reaches 0. This circular dependency will prevent blkcg and some blkgs from being freed after they are made offline. It is less a problem if the cgroup to be destroyed also has other controllers like memory that will call cgroup_rstat_flush() which will clean up the reference count. If block is the only controller that uses rstat, these offline blkcg and blkgs may never be freed leaking more and more memory over time. To prevent this potential memory leak: - flush blkcg per-cpu stats list in __blkg_release(), when no new stat can be added - add global blkg_stat_lock for covering concurrent parent blkg stat update - don't grab bio->bi_blkg reference when adding the stats into blkcg's per-cpu stat list since all stats are guaranteed to be consumed before releasing blkg instance, and grabbing blkg reference for stats was the most fragile part of original patch Based on Waiman's patch: https://lore.kernel.org/linux-block/20221215033132.230023-3-longman@redhat.… Fixes: 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()") Cc: stable(a)vger.kernel.org Reported-by: Jay Shin <jaeshin(a)redhat.com> Acked-by: Tejun Heo <tj(a)kernel.org> Cc: Waiman Long <longman(a)redhat.com> Cc: mkoutny(a)suse.com Cc: Yosry Ahmed <yosryahmed(a)google.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Link: https://lore.kernel.org/r/20230609234249.1412858-1-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 0ce64dd73cfe..f0b5c9c41cde 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -34,6 +34,8 @@ #include "blk-ioprio.h" #include "blk-throttle.h" +static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu); + /* * blkcg_pol_mutex protects blkcg_policy[] and policy [de]activation. * blkcg_pol_register_mutex nests outside of it and synchronizes entire @@ -56,6 +58,8 @@ static LIST_HEAD(all_blkcgs); /* protected by blkcg_pol_mutex */ bool blkcg_debug_stats = false; +static DEFINE_RAW_SPINLOCK(blkg_stat_lock); + #define BLKG_DESTROY_BATCH_SIZE 64 /* @@ -163,10 +167,20 @@ static void blkg_free(struct blkcg_gq *blkg) static void __blkg_release(struct rcu_head *rcu) { struct blkcg_gq *blkg = container_of(rcu, struct blkcg_gq, rcu_head); + struct blkcg *blkcg = blkg->blkcg; + int cpu; #ifdef CONFIG_BLK_CGROUP_PUNT_BIO WARN_ON(!bio_list_empty(&blkg->async_bios)); #endif + /* + * Flush all the non-empty percpu lockless lists before releasing + * us, given these stat belongs to us. + * + * blkg_stat_lock is for serializing blkg stat update + */ + for_each_possible_cpu(cpu) + __blkcg_rstat_flush(blkcg, cpu); /* release the blkcg and parent blkg refs this blkg has been holding */ css_put(&blkg->blkcg->css); @@ -951,23 +965,26 @@ static void blkcg_iostat_update(struct blkcg_gq *blkg, struct blkg_iostat *cur, u64_stats_update_end_irqrestore(&blkg->iostat.sync, flags); } -static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) +static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu) { - struct blkcg *blkcg = css_to_blkcg(css); struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); struct llist_node *lnode; struct blkg_iostat_set *bisc, *next_bisc; - /* Root-level stats are sourced from system-wide IO stats */ - if (!cgroup_parent(css->cgroup)) - return; - rcu_read_lock(); lnode = llist_del_all(lhead); if (!lnode) goto out; + /* + * For covering concurrent parent blkg update from blkg_release(). + * + * When flushing from cgroup, cgroup_rstat_lock is always held, so + * this lock won't cause contention most of time. + */ + raw_spin_lock(&blkg_stat_lock); + /* * Iterate only the iostat_cpu's queued in the lockless list. */ @@ -991,13 +1008,19 @@ static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) if (parent && parent->parent) blkcg_iostat_update(parent, &blkg->iostat.cur, &blkg->iostat.last); - percpu_ref_put(&blkg->refcnt); } - + raw_spin_unlock(&blkg_stat_lock); out: rcu_read_unlock(); } +static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) +{ + /* Root-level stats are sourced from system-wide IO stats */ + if (cgroup_parent(css->cgroup)) + __blkcg_rstat_flush(css_to_blkcg(css), cpu); +} + /* * We source root cgroup stats from the system-wide stats to avoid * tracking the same information twice and incurring overhead when no @@ -2075,7 +2098,6 @@ void blk_cgroup_bio_start(struct bio *bio) llist_add(&bis->lnode, lhead); WRITE_ONCE(bis->lqueued, true); - percpu_ref_get(&bis->blkg->refcnt); } u64_stats_update_end_irqrestore(&bis->sync, flags);

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2023