From: Sasha Levin Date: Mon, 20 Nov 2023 14:23:27 +0000 (-0500) Subject: Fixes for 6.1 X-Git-Tag: v4.14.331~153 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f81d14541fd98e6dc6f8bf621b60c4197c8b8f2e;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/9p-trans_fd-annotate-data-racy-writes-to-file-f_flag.patch b/queue-6.1/9p-trans_fd-annotate-data-racy-writes-to-file-f_flag.patch new file mode 100644 index 00000000000..03b29eab6dd --- /dev/null +++ b/queue-6.1/9p-trans_fd-annotate-data-racy-writes-to-file-f_flag.patch @@ -0,0 +1,94 @@ +From 60a2e7a6c27ddd96ad3d3521738a65379c0d7192 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Oct 2023 19:34:43 +0900 +Subject: 9p/trans_fd: Annotate data-racy writes to file::f_flags + +From: Marco Elver + +[ Upstream commit 355f074609dbf3042900ea9d30fcd2b0c323a365 ] + +syzbot reported: + + | BUG: KCSAN: data-race in p9_fd_create / p9_fd_create + | + | read-write to 0xffff888130fb3d48 of 4 bytes by task 15599 on cpu 0: + | p9_fd_open net/9p/trans_fd.c:842 [inline] + | p9_fd_create+0x210/0x250 net/9p/trans_fd.c:1092 + | p9_client_create+0x595/0xa70 net/9p/client.c:1010 + | v9fs_session_init+0xf9/0xd90 fs/9p/v9fs.c:410 + | v9fs_mount+0x69/0x630 fs/9p/vfs_super.c:123 + | legacy_get_tree+0x74/0xd0 fs/fs_context.c:611 + | vfs_get_tree+0x51/0x190 fs/super.c:1519 + | do_new_mount+0x203/0x660 fs/namespace.c:3335 + | path_mount+0x496/0xb30 fs/namespace.c:3662 + | do_mount fs/namespace.c:3675 [inline] + | __do_sys_mount fs/namespace.c:3884 [inline] + | [...] + | + | read-write to 0xffff888130fb3d48 of 4 bytes by task 15563 on cpu 1: + | p9_fd_open net/9p/trans_fd.c:842 [inline] + | p9_fd_create+0x210/0x250 net/9p/trans_fd.c:1092 + | p9_client_create+0x595/0xa70 net/9p/client.c:1010 + | v9fs_session_init+0xf9/0xd90 fs/9p/v9fs.c:410 + | v9fs_mount+0x69/0x630 fs/9p/vfs_super.c:123 + | legacy_get_tree+0x74/0xd0 fs/fs_context.c:611 + | vfs_get_tree+0x51/0x190 fs/super.c:1519 + | do_new_mount+0x203/0x660 fs/namespace.c:3335 + | path_mount+0x496/0xb30 fs/namespace.c:3662 + | do_mount fs/namespace.c:3675 [inline] + | __do_sys_mount fs/namespace.c:3884 [inline] + | [...] + | + | value changed: 0x00008002 -> 0x00008802 + +Within p9_fd_open(), O_NONBLOCK is added to f_flags of the read and +write files. This may happen concurrently if e.g. mounting process +modifies the fd in another thread. + +Mark the plain read-modify-writes as intentional data-races, with the +assumption that the result of executing the accesses concurrently will +always result in the same result despite the accesses themselves not +being atomic. + +Reported-by: syzbot+e441aeeb422763cc5511@syzkaller.appspotmail.com +Signed-off-by: Marco Elver +Link: https://lore.kernel.org/r/ZO38mqkS0TYUlpFp@elver.google.com +Signed-off-by: Dominique Martinet +Message-ID: <20231025103445.1248103-1-asmadeus@codewreck.org> +Signed-off-by: Sasha Levin +--- + net/9p/trans_fd.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c +index 5a1aecf7fe487..a69422366a235 100644 +--- a/net/9p/trans_fd.c ++++ b/net/9p/trans_fd.c +@@ -833,14 +833,21 @@ static int p9_fd_open(struct p9_client *client, int rfd, int wfd) + goto out_free_ts; + if (!(ts->rd->f_mode & FMODE_READ)) + goto out_put_rd; +- /* prevent workers from hanging on IO when fd is a pipe */ +- ts->rd->f_flags |= O_NONBLOCK; ++ /* Prevent workers from hanging on IO when fd is a pipe. ++ * It's technically possible for userspace or concurrent mounts to ++ * modify this flag concurrently, which will likely result in a ++ * broken filesystem. However, just having bad flags here should ++ * not crash the kernel or cause any other sort of bug, so mark this ++ * particular data race as intentional so that tooling (like KCSAN) ++ * can allow it and detect further problems. ++ */ ++ data_race(ts->rd->f_flags |= O_NONBLOCK); + ts->wr = fget(wfd); + if (!ts->wr) + goto out_put_rd; + if (!(ts->wr->f_mode & FMODE_WRITE)) + goto out_put_wr; +- ts->wr->f_flags |= O_NONBLOCK; ++ data_race(ts->wr->f_flags |= O_NONBLOCK); + + client->trans = ts; + client->status = Connected; +-- +2.42.0 + diff --git a/queue-6.1/9p-v9fs_listxattr-fix-s-null-argument-warning.patch b/queue-6.1/9p-v9fs_listxattr-fix-s-null-argument-warning.patch new file mode 100644 index 00000000000..d7dc51e896c --- /dev/null +++ b/queue-6.1/9p-v9fs_listxattr-fix-s-null-argument-warning.patch @@ -0,0 +1,77 @@ +From 0d0d701c7f40893a5974b716bca8699f11dabf5f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Oct 2023 19:34:44 +0900 +Subject: 9p: v9fs_listxattr: fix %s null argument warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dominique Martinet + +[ Upstream commit 9b5c6281838fc84683dd99b47302d81fce399918 ] + +W=1 warns about null argument to kprintf: +In file included from fs/9p/xattr.c:12: +In function ‘v9fs_xattr_get’, + inlined from ‘v9fs_listxattr’ at fs/9p/xattr.c:142:9: +include/net/9p/9p.h:55:2: error: ‘%s’ directive argument is null +[-Werror=format-overflow=] + 55 | _p9_debug(level, __func__, fmt, ##__VA_ARGS__) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Use an empty string instead of : + - this is ok 9p-wise because p9pdu_vwritef serializes a null string +and an empty string the same way (one '0' word for length) + - since this degrades the print statements, add new single quotes for +xattr's name delimter (Old: "file = (null)", new: "file = ''") + +Link: https://lore.kernel.org/r/20231008060138.517057-1-suhui@nfschina.com +Suggested-by: Su Hui +Signed-off-by: Dominique Martinet +Acked-by: Christian Schoenebeck +Message-ID: <20231025103445.1248103-2-asmadeus@codewreck.org> +Signed-off-by: Sasha Levin +--- + fs/9p/xattr.c | 5 +++-- + net/9p/client.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c +index 2807bb63f7802..3b9aa61de8c2d 100644 +--- a/fs/9p/xattr.c ++++ b/fs/9p/xattr.c +@@ -65,7 +65,7 @@ ssize_t v9fs_xattr_get(struct dentry *dentry, const char *name, + struct p9_fid *fid; + int ret; + +- p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu\n", ++ p9_debug(P9_DEBUG_VFS, "name = '%s' value_len = %zu\n", + name, buffer_size); + fid = v9fs_fid_lookup(dentry); + if (IS_ERR(fid)) +@@ -136,7 +136,8 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name, + + ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) + { +- return v9fs_xattr_get(dentry, NULL, buffer, buffer_size); ++ /* Txattrwalk with an empty string lists xattrs instead */ ++ return v9fs_xattr_get(dentry, "", buffer, buffer_size); + } + + static int v9fs_xattr_handler_get(const struct xattr_handler *handler, +diff --git a/net/9p/client.c b/net/9p/client.c +index a96e127ca4883..84b93b04d0f06 100644 +--- a/net/9p/client.c ++++ b/net/9p/client.c +@@ -1987,7 +1987,7 @@ struct p9_fid *p9_client_xattrwalk(struct p9_fid *file_fid, + goto error; + } + p9_debug(P9_DEBUG_9P, +- ">>> TXATTRWALK file_fid %d, attr_fid %d name %s\n", ++ ">>> TXATTRWALK file_fid %d, attr_fid %d name '%s'\n", + file_fid->fid, attr_fid->fid, attr_name); + + req = p9_client_rpc(clnt, P9_TXATTRWALK, "dds", +-- +2.42.0 + diff --git a/queue-6.1/acpi-ec-add-quirk-for-hp-250-g7-notebook-pc.patch b/queue-6.1/acpi-ec-add-quirk-for-hp-250-g7-notebook-pc.patch new file mode 100644 index 00000000000..ad91204ab74 --- /dev/null +++ b/queue-6.1/acpi-ec-add-quirk-for-hp-250-g7-notebook-pc.patch @@ -0,0 +1,46 @@ +From 84d03cffe5d9f6d6278e5d5535e0b0554ac42d64 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Oct 2023 09:13:36 -0500 +Subject: ACPI: EC: Add quirk for HP 250 G7 Notebook PC + +From: Jonathan Denose + +[ Upstream commit 891ddc03e2f4395e24795596e032f57d5ab37fe7 ] + +Add GPE quirk entry for HP 250 G7 Notebook PC. + +This change allows the lid switch to be identified as the lid switch +and not a keyboard button. With the lid switch properly identified, the +device triggers suspend correctly on lid close. + +Signed-off-by: Jonathan Denose +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/ec.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c +index 8bb233d2d1e48..77d1f2cb89ef3 100644 +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -1897,6 +1897,16 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = { + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-dk1xxx"), + }, + }, ++ { ++ /* ++ * HP 250 G7 Notebook PC ++ */ ++ .callback = ec_honor_dsdt_gpe, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "HP"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "HP 250 G7 Notebook PC"), ++ }, ++ }, + { + /* + * Samsung hardware +-- +2.42.0 + diff --git a/queue-6.1/af_unix-fix-use-after-free-in-unix_stream_read_actor.patch b/queue-6.1/af_unix-fix-use-after-free-in-unix_stream_read_actor.patch new file mode 100644 index 00000000000..8832bf1045d --- /dev/null +++ b/queue-6.1/af_unix-fix-use-after-free-in-unix_stream_read_actor.patch @@ -0,0 +1,219 @@ +From 781601ce6e7022ec44c265bf253f7fca867fd65f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Nov 2023 13:49:38 +0000 +Subject: af_unix: fix use-after-free in unix_stream_read_actor() + +From: Eric Dumazet + +[ Upstream commit 4b7b492615cf3017190f55444f7016812b66611d ] + +syzbot reported the following crash [1] + +After releasing unix socket lock, u->oob_skb can be changed +by another thread. We must temporarily increase skb refcount +to make sure this other thread will not free the skb under us. + +[1] + +BUG: KASAN: slab-use-after-free in unix_stream_read_actor+0xa7/0xc0 net/unix/af_unix.c:2866 +Read of size 4 at addr ffff88801f3b9cc4 by task syz-executor107/5297 + +CPU: 1 PID: 5297 Comm: syz-executor107 Not tainted 6.6.0-syzkaller-15910-gb8e3a87a627b #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/09/2023 +Call Trace: + +__dump_stack lib/dump_stack.c:88 [inline] +dump_stack_lvl+0xd9/0x1b0 lib/dump_stack.c:106 +print_address_description mm/kasan/report.c:364 [inline] +print_report+0xc4/0x620 mm/kasan/report.c:475 +kasan_report+0xda/0x110 mm/kasan/report.c:588 +unix_stream_read_actor+0xa7/0xc0 net/unix/af_unix.c:2866 +unix_stream_recv_urg net/unix/af_unix.c:2587 [inline] +unix_stream_read_generic+0x19a5/0x2480 net/unix/af_unix.c:2666 +unix_stream_recvmsg+0x189/0x1b0 net/unix/af_unix.c:2903 +sock_recvmsg_nosec net/socket.c:1044 [inline] +sock_recvmsg+0xe2/0x170 net/socket.c:1066 +____sys_recvmsg+0x21f/0x5c0 net/socket.c:2803 +___sys_recvmsg+0x115/0x1a0 net/socket.c:2845 +__sys_recvmsg+0x114/0x1e0 net/socket.c:2875 +do_syscall_x64 arch/x86/entry/common.c:51 [inline] +do_syscall_64+0x3f/0x110 arch/x86/entry/common.c:82 +entry_SYSCALL_64_after_hwframe+0x63/0x6b +RIP: 0033:0x7fc67492c559 +Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 51 18 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 +RSP: 002b:00007fc6748ab228 EFLAGS: 00000246 ORIG_RAX: 000000000000002f +RAX: ffffffffffffffda RBX: 000000000000001c RCX: 00007fc67492c559 +RDX: 0000000040010083 RSI: 0000000020000140 RDI: 0000000000000004 +RBP: 00007fc6749b6348 R08: 00007fc6748ab6c0 R09: 00007fc6748ab6c0 +R10: 0000000000000000 R11: 0000000000000246 R12: 00007fc6749b6340 +R13: 00007fc6749b634c R14: 00007ffe9fac52a0 R15: 00007ffe9fac5388 + + +Allocated by task 5295: +kasan_save_stack+0x33/0x50 mm/kasan/common.c:45 +kasan_set_track+0x25/0x30 mm/kasan/common.c:52 +__kasan_slab_alloc+0x81/0x90 mm/kasan/common.c:328 +kasan_slab_alloc include/linux/kasan.h:188 [inline] +slab_post_alloc_hook mm/slab.h:763 [inline] +slab_alloc_node mm/slub.c:3478 [inline] +kmem_cache_alloc_node+0x180/0x3c0 mm/slub.c:3523 +__alloc_skb+0x287/0x330 net/core/skbuff.c:641 +alloc_skb include/linux/skbuff.h:1286 [inline] +alloc_skb_with_frags+0xe4/0x710 net/core/skbuff.c:6331 +sock_alloc_send_pskb+0x7e4/0x970 net/core/sock.c:2780 +sock_alloc_send_skb include/net/sock.h:1884 [inline] +queue_oob net/unix/af_unix.c:2147 [inline] +unix_stream_sendmsg+0xb5f/0x10a0 net/unix/af_unix.c:2301 +sock_sendmsg_nosec net/socket.c:730 [inline] +__sock_sendmsg+0xd5/0x180 net/socket.c:745 +____sys_sendmsg+0x6ac/0x940 net/socket.c:2584 +___sys_sendmsg+0x135/0x1d0 net/socket.c:2638 +__sys_sendmsg+0x117/0x1e0 net/socket.c:2667 +do_syscall_x64 arch/x86/entry/common.c:51 [inline] +do_syscall_64+0x3f/0x110 arch/x86/entry/common.c:82 +entry_SYSCALL_64_after_hwframe+0x63/0x6b + +Freed by task 5295: +kasan_save_stack+0x33/0x50 mm/kasan/common.c:45 +kasan_set_track+0x25/0x30 mm/kasan/common.c:52 +kasan_save_free_info+0x2b/0x40 mm/kasan/generic.c:522 +____kasan_slab_free mm/kasan/common.c:236 [inline] +____kasan_slab_free+0x15b/0x1b0 mm/kasan/common.c:200 +kasan_slab_free include/linux/kasan.h:164 [inline] +slab_free_hook mm/slub.c:1800 [inline] +slab_free_freelist_hook+0x114/0x1e0 mm/slub.c:1826 +slab_free mm/slub.c:3809 [inline] +kmem_cache_free+0xf8/0x340 mm/slub.c:3831 +kfree_skbmem+0xef/0x1b0 net/core/skbuff.c:1015 +__kfree_skb net/core/skbuff.c:1073 [inline] +consume_skb net/core/skbuff.c:1288 [inline] +consume_skb+0xdf/0x170 net/core/skbuff.c:1282 +queue_oob net/unix/af_unix.c:2178 [inline] +unix_stream_sendmsg+0xd49/0x10a0 net/unix/af_unix.c:2301 +sock_sendmsg_nosec net/socket.c:730 [inline] +__sock_sendmsg+0xd5/0x180 net/socket.c:745 +____sys_sendmsg+0x6ac/0x940 net/socket.c:2584 +___sys_sendmsg+0x135/0x1d0 net/socket.c:2638 +__sys_sendmsg+0x117/0x1e0 net/socket.c:2667 +do_syscall_x64 arch/x86/entry/common.c:51 [inline] +do_syscall_64+0x3f/0x110 arch/x86/entry/common.c:82 +entry_SYSCALL_64_after_hwframe+0x63/0x6b + +The buggy address belongs to the object at ffff88801f3b9c80 +which belongs to the cache skbuff_head_cache of size 240 +The buggy address is located 68 bytes inside of +freed 240-byte region [ffff88801f3b9c80, ffff88801f3b9d70) + +The buggy address belongs to the physical page: +page:ffffea00007cee40 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x1f3b9 +flags: 0xfff00000000800(slab|node=0|zone=1|lastcpupid=0x7ff) +page_type: 0xffffffff() +raw: 00fff00000000800 ffff888142a60640 dead000000000122 0000000000000000 +raw: 0000000000000000 00000000000c000c 00000001ffffffff 0000000000000000 +page dumped because: kasan: bad access detected +page_owner tracks the page as allocated +page last allocated via order 0, migratetype Unmovable, gfp_mask 0x12cc0(GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY), pid 5299, tgid 5283 (syz-executor107), ts 103803840339, free_ts 103600093431 +set_page_owner include/linux/page_owner.h:31 [inline] +post_alloc_hook+0x2cf/0x340 mm/page_alloc.c:1537 +prep_new_page mm/page_alloc.c:1544 [inline] +get_page_from_freelist+0xa25/0x36c0 mm/page_alloc.c:3312 +__alloc_pages+0x1d0/0x4a0 mm/page_alloc.c:4568 +alloc_pages_mpol+0x258/0x5f0 mm/mempolicy.c:2133 +alloc_slab_page mm/slub.c:1870 [inline] +allocate_slab+0x251/0x380 mm/slub.c:2017 +new_slab mm/slub.c:2070 [inline] +___slab_alloc+0x8c7/0x1580 mm/slub.c:3223 +__slab_alloc.constprop.0+0x56/0xa0 mm/slub.c:3322 +__slab_alloc_node mm/slub.c:3375 [inline] +slab_alloc_node mm/slub.c:3468 [inline] +kmem_cache_alloc_node+0x132/0x3c0 mm/slub.c:3523 +__alloc_skb+0x287/0x330 net/core/skbuff.c:641 +alloc_skb include/linux/skbuff.h:1286 [inline] +alloc_skb_with_frags+0xe4/0x710 net/core/skbuff.c:6331 +sock_alloc_send_pskb+0x7e4/0x970 net/core/sock.c:2780 +sock_alloc_send_skb include/net/sock.h:1884 [inline] +queue_oob net/unix/af_unix.c:2147 [inline] +unix_stream_sendmsg+0xb5f/0x10a0 net/unix/af_unix.c:2301 +sock_sendmsg_nosec net/socket.c:730 [inline] +__sock_sendmsg+0xd5/0x180 net/socket.c:745 +____sys_sendmsg+0x6ac/0x940 net/socket.c:2584 +___sys_sendmsg+0x135/0x1d0 net/socket.c:2638 +__sys_sendmsg+0x117/0x1e0 net/socket.c:2667 +page last free stack trace: +reset_page_owner include/linux/page_owner.h:24 [inline] +free_pages_prepare mm/page_alloc.c:1137 [inline] +free_unref_page_prepare+0x4f8/0xa90 mm/page_alloc.c:2347 +free_unref_page+0x33/0x3b0 mm/page_alloc.c:2487 +__unfreeze_partials+0x21d/0x240 mm/slub.c:2655 +qlink_free mm/kasan/quarantine.c:168 [inline] +qlist_free_all+0x6a/0x170 mm/kasan/quarantine.c:187 +kasan_quarantine_reduce+0x18e/0x1d0 mm/kasan/quarantine.c:294 +__kasan_slab_alloc+0x65/0x90 mm/kasan/common.c:305 +kasan_slab_alloc include/linux/kasan.h:188 [inline] +slab_post_alloc_hook mm/slab.h:763 [inline] +slab_alloc_node mm/slub.c:3478 [inline] +slab_alloc mm/slub.c:3486 [inline] +__kmem_cache_alloc_lru mm/slub.c:3493 [inline] +kmem_cache_alloc+0x15d/0x380 mm/slub.c:3502 +vm_area_dup+0x21/0x2f0 kernel/fork.c:500 +__split_vma+0x17d/0x1070 mm/mmap.c:2365 +split_vma mm/mmap.c:2437 [inline] +vma_modify+0x25d/0x450 mm/mmap.c:2472 +vma_modify_flags include/linux/mm.h:3271 [inline] +mprotect_fixup+0x228/0xc80 mm/mprotect.c:635 +do_mprotect_pkey+0x852/0xd60 mm/mprotect.c:809 +__do_sys_mprotect mm/mprotect.c:830 [inline] +__se_sys_mprotect mm/mprotect.c:827 [inline] +__x64_sys_mprotect+0x78/0xb0 mm/mprotect.c:827 +do_syscall_x64 arch/x86/entry/common.c:51 [inline] +do_syscall_64+0x3f/0x110 arch/x86/entry/common.c:82 +entry_SYSCALL_64_after_hwframe+0x63/0x6b + +Memory state around the buggy address: +ffff88801f3b9b80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb +ffff88801f3b9c00: fb fb fb fb fb fb fc fc fc fc fc fc fc fc fc fc +>ffff88801f3b9c80: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb +^ +ffff88801f3b9d00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fc fc +ffff88801f3b9d80: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb + +Fixes: 876c14ad014d ("af_unix: fix holding spinlock in oob handling") +Reported-and-tested-by: syzbot+7a2d546fa43e49315ed3@syzkaller.appspotmail.com +Signed-off-by: Eric Dumazet +Cc: Rao Shoaib +Reviewed-by: Rao shoaib +Link: https://lore.kernel.org/r/20231113134938.168151-1-edumazet@google.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/unix/af_unix.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c +index 310952f4c68f7..6dbeb80073338 100644 +--- a/net/unix/af_unix.c ++++ b/net/unix/af_unix.c +@@ -2641,15 +2641,16 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state) + + if (!(state->flags & MSG_PEEK)) + WRITE_ONCE(u->oob_skb, NULL); +- ++ else ++ skb_get(oob_skb); + unix_state_unlock(sk); + + chunk = state->recv_actor(oob_skb, 0, chunk, state); + +- if (!(state->flags & MSG_PEEK)) { ++ if (!(state->flags & MSG_PEEK)) + UNIXCB(oob_skb).consumed += 1; +- kfree_skb(oob_skb); +- } ++ ++ consume_skb(oob_skb); + + mutex_unlock(&u->iolock); + +-- +2.42.0 + diff --git a/queue-6.1/alsa-hda-fix-possible-null-ptr-deref-when-assigning-.patch b/queue-6.1/alsa-hda-fix-possible-null-ptr-deref-when-assigning-.patch new file mode 100644 index 00000000000..7bb1de24f97 --- /dev/null +++ b/queue-6.1/alsa-hda-fix-possible-null-ptr-deref-when-assigning-.patch @@ -0,0 +1,42 @@ +From fb59a00afd179ea8cde9fdc034e34e2a55d81386 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Oct 2023 12:28:55 +0200 +Subject: ALSA: hda: Fix possible null-ptr-deref when assigning a stream + +From: Cezary Rojewski + +[ Upstream commit f93dc90c2e8ed664985e366aa6459ac83cdab236 ] + +While AudioDSP drivers assign streams exclusively of HOST or LINK type, +nothing blocks a user to attempt to assign a COUPLED stream. As +supplied substream instance may be a stub, what is the case when +code-loading, such scenario ends with null-ptr-deref. + +Signed-off-by: Cezary Rojewski +Link: https://lore.kernel.org/r/20231006102857.749143-2-cezary.rojewski@intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/hda/hdac_stream.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c +index 1b8be39c38a96..741a5d17ae4cb 100644 +--- a/sound/hda/hdac_stream.c ++++ b/sound/hda/hdac_stream.c +@@ -338,8 +338,10 @@ struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus, + struct hdac_stream *res = NULL; + + /* make a non-zero unique key for the substream */ +- int key = (substream->pcm->device << 16) | (substream->number << 2) | +- (substream->stream + 1); ++ int key = (substream->number << 2) | (substream->stream + 1); ++ ++ if (substream->pcm) ++ key |= (substream->pcm->device << 16); + + spin_lock_irq(&bus->reg_lock); + list_for_each_entry(azx_dev, &bus->stream_list, list) { +-- +2.42.0 + diff --git a/queue-6.1/alsa-hda-realtek-add-quirk-for-asus-ux7602zm.patch b/queue-6.1/alsa-hda-realtek-add-quirk-for-asus-ux7602zm.patch new file mode 100644 index 00000000000..084bd7c1df8 --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-add-quirk-for-asus-ux7602zm.patch @@ -0,0 +1,39 @@ +From 0857eacded9f10eda21b597b91b53b4425538427 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Nov 2023 16:01:52 -0500 +Subject: ALSA: hda/realtek: Add quirk for ASUS UX7602ZM + +From: Alex Spataru + +[ Upstream commit 26fd31ef9c02a5e91cdb8eea127b056bd7cf0b3b ] + +Enables the SPI-connected CSC35L41 audio amplifier for this +laptop model. + +As of BIOS version 303 it's still necessary to +modify the ACPI table to add the related _DSD properties: +https://github.com/alex-spataru/asus_zenbook_ux7602zm_sound/ + +Signed-off-by: Alex Spataru +Link: https://lore.kernel.org/r/DS7PR07MB7621BB5BB14F5473D181624CE3A4A@DS7PR07MB7621.namprd07.prod.outlook.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 0163d4c7fdda8..c55b26af002a7 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9749,6 +9749,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), + SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2), ++ SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), + SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), +-- +2.42.0 + diff --git a/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch b/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch new file mode 100644 index 00000000000..2893a4054d1 --- /dev/null +++ b/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch @@ -0,0 +1,195 @@ +From 5d2d8300617cf037fe4c14d31bc4391f674c8cd1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Sep 2023 03:02:16 +0930 +Subject: ALSA: scarlett2: Move USB IDs out from device_info struct + +From: Geoffrey D. Bennett + +[ Upstream commit d98cc489029dba4d99714c2e8ec4f5ba249f6851 ] + +By moving the USB IDs from the device_info struct into +scarlett2_devices[], that will allow for devices with different +USB IDs to share the same device_info. + +Tested-by: Philippe Perrot +Signed-off-by: Geoffrey D. Bennett +Link: https://lore.kernel.org/r/8263368e8d49e6fcebc709817bd82ab79b404468.1694705811.git.g@b4.vu +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/usb/mixer_scarlett_gen2.c | 63 ++++++++++++--------------------- + 1 file changed, 23 insertions(+), 40 deletions(-) + +diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c +index 9d11bb08667e7..48f5c9b9790dc 100644 +--- a/sound/usb/mixer_scarlett_gen2.c ++++ b/sound/usb/mixer_scarlett_gen2.c +@@ -317,8 +317,6 @@ struct scarlett2_mux_entry { + }; + + struct scarlett2_device_info { +- u32 usb_id; /* USB device identifier */ +- + /* Gen 3 devices have an internal MSD mode switch that needs + * to be disabled in order to access the full functionality of + * the device. +@@ -440,8 +438,6 @@ struct scarlett2_data { + /*** Model-specific data ***/ + + static const struct scarlett2_device_info s6i6_gen2_info = { +- .usb_id = USB_ID(0x1235, 0x8203), +- + .config_set = SCARLETT2_CONFIG_SET_GEN_2, + .level_input_count = 2, + .pad_input_count = 2, +@@ -486,8 +482,6 @@ static const struct scarlett2_device_info s6i6_gen2_info = { + }; + + static const struct scarlett2_device_info s18i8_gen2_info = { +- .usb_id = USB_ID(0x1235, 0x8204), +- + .config_set = SCARLETT2_CONFIG_SET_GEN_2, + .level_input_count = 2, + .pad_input_count = 4, +@@ -535,8 +529,6 @@ static const struct scarlett2_device_info s18i8_gen2_info = { + }; + + static const struct scarlett2_device_info s18i20_gen2_info = { +- .usb_id = USB_ID(0x1235, 0x8201), +- + .config_set = SCARLETT2_CONFIG_SET_GEN_2, + .line_out_hw_vol = 1, + +@@ -589,8 +581,6 @@ static const struct scarlett2_device_info s18i20_gen2_info = { + }; + + static const struct scarlett2_device_info solo_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8211), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, + .level_input_count = 1, +@@ -602,8 +592,6 @@ static const struct scarlett2_device_info solo_gen3_info = { + }; + + static const struct scarlett2_device_info s2i2_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8210), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, + .level_input_count = 2, +@@ -614,8 +602,6 @@ static const struct scarlett2_device_info s2i2_gen3_info = { + }; + + static const struct scarlett2_device_info s4i4_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8212), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_GEN_3, + .level_input_count = 2, +@@ -660,8 +646,6 @@ static const struct scarlett2_device_info s4i4_gen3_info = { + }; + + static const struct scarlett2_device_info s8i6_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8213), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_GEN_3, + .level_input_count = 2, +@@ -713,8 +697,6 @@ static const struct scarlett2_device_info s8i6_gen3_info = { + }; + + static const struct scarlett2_device_info s18i8_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8214), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_GEN_3, + .line_out_hw_vol = 1, +@@ -783,8 +765,6 @@ static const struct scarlett2_device_info s18i8_gen3_info = { + }; + + static const struct scarlett2_device_info s18i20_gen3_info = { +- .usb_id = USB_ID(0x1235, 0x8215), +- + .has_msd_mode = 1, + .config_set = SCARLETT2_CONFIG_SET_GEN_3, + .line_out_hw_vol = 1, +@@ -848,8 +828,6 @@ static const struct scarlett2_device_info s18i20_gen3_info = { + }; + + static const struct scarlett2_device_info clarett_8pre_info = { +- .usb_id = USB_ID(0x1235, 0x820c), +- + .config_set = SCARLETT2_CONFIG_SET_CLARETT, + .line_out_hw_vol = 1, + .level_input_count = 2, +@@ -902,25 +880,30 @@ static const struct scarlett2_device_info clarett_8pre_info = { + } }, + }; + +-static const struct scarlett2_device_info *scarlett2_devices[] = { ++struct scarlett2_device_entry { ++ const u32 usb_id; /* USB device identifier */ ++ const struct scarlett2_device_info *info; ++}; ++ ++static const struct scarlett2_device_entry scarlett2_devices[] = { + /* Supported Gen 2 devices */ +- &s6i6_gen2_info, +- &s18i8_gen2_info, +- &s18i20_gen2_info, ++ { USB_ID(0x1235, 0x8203), &s6i6_gen2_info }, ++ { USB_ID(0x1235, 0x8204), &s18i8_gen2_info }, ++ { USB_ID(0x1235, 0x8201), &s18i20_gen2_info }, + + /* Supported Gen 3 devices */ +- &solo_gen3_info, +- &s2i2_gen3_info, +- &s4i4_gen3_info, +- &s8i6_gen3_info, +- &s18i8_gen3_info, +- &s18i20_gen3_info, ++ { USB_ID(0x1235, 0x8211), &solo_gen3_info }, ++ { USB_ID(0x1235, 0x8210), &s2i2_gen3_info }, ++ { USB_ID(0x1235, 0x8212), &s4i4_gen3_info }, ++ { USB_ID(0x1235, 0x8213), &s8i6_gen3_info }, ++ { USB_ID(0x1235, 0x8214), &s18i8_gen3_info }, ++ { USB_ID(0x1235, 0x8215), &s18i20_gen3_info }, + + /* Supported Clarett+ devices */ +- &clarett_8pre_info, ++ { USB_ID(0x1235, 0x820c), &clarett_8pre_info }, + + /* End of list */ +- NULL ++ { 0, NULL }, + }; + + /* get the starting port index number for a given port type/direction */ +@@ -4072,17 +4055,17 @@ static int scarlett2_init_notify(struct usb_mixer_interface *mixer) + + static int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) + { +- const struct scarlett2_device_info **info = scarlett2_devices; ++ const struct scarlett2_device_entry *entry = scarlett2_devices; + int err; + +- /* Find device in scarlett2_devices */ +- while (*info && (*info)->usb_id != mixer->chip->usb_id) +- info++; +- if (!*info) ++ /* Find entry in scarlett2_devices */ ++ while (entry->usb_id && entry->usb_id != mixer->chip->usb_id) ++ entry++; ++ if (!entry->usb_id) + return -EINVAL; + + /* Initialise private data */ +- err = scarlett2_init_private(mixer, *info); ++ err = scarlett2_init_private(mixer, entry->info); + if (err < 0) + return err; + +-- +2.42.0 + diff --git a/queue-6.1/arm-9320-1-fix-stack-depot-irq-stack-filter.patch b/queue-6.1/arm-9320-1-fix-stack-depot-irq-stack-filter.patch new file mode 100644 index 00000000000..59d4975ce1a --- /dev/null +++ b/queue-6.1/arm-9320-1-fix-stack-depot-irq-stack-filter.patch @@ -0,0 +1,45 @@ +From 6a2f843c12e9fee3fb0b1f106eca3f54c05f0cfb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Aug 2023 08:45:21 +0100 +Subject: ARM: 9320/1: fix stack depot IRQ stack filter + +From: Vincent Whitchurch + +[ Upstream commit b0150014878c32197cfa66e3e2f79e57f66babc0 ] + +Place IRQ handlers such as gic_handle_irq() in the irqentry section even +if FUNCTION_GRAPH_TRACER is not enabled. Without this, the stack +depot's filter_irq_stacks() does not correctly filter out IRQ stacks in +those configurations, which hampers deduplication and eventually leads +to "Stack depot reached limit capacity" splats with KASAN. + +A similar fix was done for arm64 in commit f6794950f0e5ba37e3bbed +("arm64: set __exception_irq_entry with __irq_entry as a default"). + +Link: https://lore.kernel.org/r/20230803-arm-irqentry-v1-1-8aad8e260b1c@axis.com + +Signed-off-by: Vincent Whitchurch +Signed-off-by: Russell King (Oracle) +Signed-off-by: Sasha Levin +--- + arch/arm/include/asm/exception.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/include/asm/exception.h b/arch/arm/include/asm/exception.h +index 58e039a851af0..3c82975d46db3 100644 +--- a/arch/arm/include/asm/exception.h ++++ b/arch/arm/include/asm/exception.h +@@ -10,10 +10,6 @@ + + #include + +-#ifdef CONFIG_FUNCTION_GRAPH_TRACER + #define __exception_irq_entry __irq_entry +-#else +-#define __exception_irq_entry +-#endif + + #endif /* __ASM_ARM_EXCEPTION_H */ +-- +2.42.0 + diff --git a/queue-6.1/arm64-dts-ls208xa-use-a-pseudo-bus-to-constrain-usb-.patch b/queue-6.1/arm64-dts-ls208xa-use-a-pseudo-bus-to-constrain-usb-.patch new file mode 100644 index 00000000000..7b8eb329f6e --- /dev/null +++ b/queue-6.1/arm64-dts-ls208xa-use-a-pseudo-bus-to-constrain-usb-.patch @@ -0,0 +1,94 @@ +From f18c4da1d62899470695cc13b57e314acd249512 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Sep 2023 18:10:15 +0300 +Subject: arm64: dts: ls208xa: use a pseudo-bus to constrain usb dma size + +From: Laurentiu Tudor + +[ Upstream commit b39d5016456871a88f5cd141914a5043591b46f3 ] + +Wrap the usb controllers in an intermediate simple-bus and use it to +constrain the dma address size of these usb controllers to the 40b +that they generate toward the interconnect. This is required because +the SoC uses 48b address sizes and this mismatch would lead to smmu +context faults [1] because the usb generates 40b addresses while the +smmu page tables are populated with 48b wide addresses. + +[1] +xhci-hcd xhci-hcd.0.auto: xHCI Host Controller +xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 1 +xhci-hcd xhci-hcd.0.auto: hcc params 0x0220f66d hci version 0x100 quirks 0x0000000002000010 +xhci-hcd xhci-hcd.0.auto: irq 108, io mem 0x03100000 +xhci-hcd xhci-hcd.0.auto: xHCI Host Controller +xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 2 +xhci-hcd xhci-hcd.0.auto: Host supports USB 3.0 SuperSpeed +arm-smmu 5000000.iommu: Unhandled context fault: fsr=0x402, iova=0xffffffb000, fsynr=0x0, cbfrsynra=0xc01, cb=3 + +Signed-off-by: Laurentiu Tudor +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + .../arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 46 +++++++++++-------- + 1 file changed, 27 insertions(+), 19 deletions(-) + +diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +index 348d9e3a91252..b53d74aee12ad 100644 +--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi ++++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +@@ -1186,26 +1186,34 @@ + dma-coherent; + }; + +- usb0: usb@3100000 { +- status = "disabled"; +- compatible = "snps,dwc3"; +- reg = <0x0 0x3100000 0x0 0x10000>; +- interrupts = <0 80 0x4>; /* Level high type */ +- dr_mode = "host"; +- snps,quirk-frame-length-adjustment = <0x20>; +- snps,dis_rxdet_inp3_quirk; +- snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; +- }; ++ bus: bus { ++ #address-cells = <2>; ++ #size-cells = <2>; ++ compatible = "simple-bus"; ++ ranges; ++ dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>; ++ ++ usb0: usb@3100000 { ++ compatible = "snps,dwc3"; ++ reg = <0x0 0x3100000 0x0 0x10000>; ++ interrupts = <0 80 0x4>; /* Level high type */ ++ dr_mode = "host"; ++ snps,quirk-frame-length-adjustment = <0x20>; ++ snps,dis_rxdet_inp3_quirk; ++ snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; ++ status = "disabled"; ++ }; + +- usb1: usb@3110000 { +- status = "disabled"; +- compatible = "snps,dwc3"; +- reg = <0x0 0x3110000 0x0 0x10000>; +- interrupts = <0 81 0x4>; /* Level high type */ +- dr_mode = "host"; +- snps,quirk-frame-length-adjustment = <0x20>; +- snps,dis_rxdet_inp3_quirk; +- snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; ++ usb1: usb@3110000 { ++ compatible = "snps,dwc3"; ++ reg = <0x0 0x3110000 0x0 0x10000>; ++ interrupts = <0 81 0x4>; /* Level high type */ ++ dr_mode = "host"; ++ snps,quirk-frame-length-adjustment = <0x20>; ++ snps,dis_rxdet_inp3_quirk; ++ snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; ++ status = "disabled"; ++ }; + }; + + ccn@4000000 { +-- +2.42.0 + diff --git a/queue-6.1/asoc-intel-soc-acpi-cht-add-lenovo-yoga-tab-3-pro-yt.patch b/queue-6.1/asoc-intel-soc-acpi-cht-add-lenovo-yoga-tab-3-pro-yt.patch new file mode 100644 index 00000000000..e7dc2068991 --- /dev/null +++ b/queue-6.1/asoc-intel-soc-acpi-cht-add-lenovo-yoga-tab-3-pro-yt.patch @@ -0,0 +1,90 @@ +From 4b2589996b1f6d69b4f3202d55c7ac36db518e2a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 21 Oct 2023 23:15:28 +0200 +Subject: ASoC: Intel: soc-acpi-cht: Add Lenovo Yoga Tab 3 Pro YT3-X90 quirk + +From: Hans de Goede + +[ Upstream commit 2cb54788393134d8174ee594002baae3ce52c61e ] + +The Lenovo Yoga Tab 3 Pro YT3-X90 x86 tablet, which ships with Android with +a custom kernel as factory OS, does not list the used WM5102 codec inside +its DSDT. + +Workaround this with a new snd_soc_acpi_intel_baytrail_machines[] entry +which matches on the SST id instead of the codec id like nocodec does, +combined with using a machine_quirk callback which returns NULL on +other machines to skip the new entry on other machines. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20231021211534.114991-1-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + .../intel/common/soc-acpi-intel-cht-match.c | 43 +++++++++++++++++++ + 1 file changed, 43 insertions(+) + +diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c +index cdcbf04b8832f..5e2ec60e2954b 100644 +--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c ++++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c +@@ -75,6 +75,39 @@ static struct snd_soc_acpi_mach *cht_ess8316_quirk(void *arg) + return arg; + } + ++/* ++ * The Lenovo Yoga Tab 3 Pro YT3-X90, with Android factory OS has a buggy DSDT ++ * with the coded not being listed at all. ++ */ ++static const struct dmi_system_id lenovo_yoga_tab3_x90[] = { ++ { ++ /* Lenovo Yoga Tab 3 Pro YT3-X90, codec missing from DSDT */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"), ++ }, ++ }, ++ { } ++}; ++ ++static struct snd_soc_acpi_mach cht_lenovo_yoga_tab3_x90_mach = { ++ .id = "10WM5102", ++ .drv_name = "bytcr_wm5102", ++ .fw_filename = "intel/fw_sst_22a8.bin", ++ .board = "bytcr_wm5102", ++ .sof_tplg_filename = "sof-cht-wm5102.tplg", ++}; ++ ++static struct snd_soc_acpi_mach *lenovo_yt3_x90_quirk(void *arg) ++{ ++ if (dmi_check_system(lenovo_yoga_tab3_x90)) ++ return &cht_lenovo_yoga_tab3_x90_mach; ++ ++ /* Skip wildcard match snd_soc_acpi_intel_cherrytrail_machines[] entry */ ++ return NULL; ++} ++ + static const struct snd_soc_acpi_codecs rt5640_comp_ids = { + .num_codecs = 2, + .codecs = { "10EC5640", "10EC3276" }, +@@ -175,6 +208,16 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { + .drv_name = "sof_pcm512x", + .sof_tplg_filename = "sof-cht-src-50khz-pcm512x.tplg", + }, ++ /* ++ * Special case for the Lenovo Yoga Tab 3 Pro YT3-X90 where the DSDT ++ * misses the codec. Match on the SST id instead, lenovo_yt3_x90_quirk() ++ * will return a YT3 specific mach or NULL when called on other hw, ++ * skipping this entry. ++ */ ++ { ++ .id = "808622A8", ++ .machine_quirk = lenovo_yt3_x90_quirk, ++ }, + + #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) + /* +-- +2.42.0 + diff --git a/queue-6.1/asoc-soc-card-add-storage-for-pci-ssid.patch b/queue-6.1/asoc-soc-card-add-storage-for-pci-ssid.patch new file mode 100644 index 00000000000..14fccd8d41b --- /dev/null +++ b/queue-6.1/asoc-soc-card-add-storage-for-pci-ssid.patch @@ -0,0 +1,122 @@ +From 20f25af6e000f3b126bcfdcf48334f36d8cccb99 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 17:32:04 +0100 +Subject: ASoC: soc-card: Add storage for PCI SSID + +From: Richard Fitzgerald + +[ Upstream commit 47f56e38a199bd45514b8e0142399cba4feeaf1a ] + +Add members to struct snd_soc_card to store the PCI subsystem ID (SSID) +of the soundcard. + +The PCI specification provides two registers to store a vendor-specific +SSID that can be read by drivers to uniquely identify a particular +"soundcard". This is defined in the PCI specification to distinguish +products that use the same silicon (and therefore have the same silicon +ID) so that product-specific differences can be applied. + +PCI only defines 0xFFFF as an invalid value. 0x0000 is not defined as +invalid. So the usual pattern of zero-filling the struct and then +assuming a zero value unset will not work. A flag is included to +indicate when the SSID information has been filled in. + +Unlike DMI information, which has a free-format entirely up to the vendor, +the PCI SSID has a strictly defined format and a registry of vendor IDs. + +It is usual in Windows drivers that the SSID is used as the sole identifier +of the specific end-product and the Windows driver contains tables mapping +that to information about the hardware setup, rather than using ACPI +properties. + +This SSID is important information for ASoC components that need to apply +hardware-specific configuration on PCI-based systems. + +As the SSID is a generic part of the PCI specification and is treated as +identifying the "soundcard", it is reasonable to include this information +in struct snd_soc_card, instead of components inventing their own custom +ways to pass this information around. + +Signed-off-by: Richard Fitzgerald +Reviewed-by: Pierre-Louis Bossart +Link: https://lore.kernel.org/r/20230912163207.3498161-2-rf@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + include/sound/soc-card.h | 37 +++++++++++++++++++++++++++++++++++++ + include/sound/soc.h | 11 +++++++++++ + 2 files changed, 48 insertions(+) + +diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h +index 9d31a5c0db33c..40d3023cf0d16 100644 +--- a/include/sound/soc-card.h ++++ b/include/sound/soc-card.h +@@ -44,6 +44,43 @@ int snd_soc_card_add_dai_link(struct snd_soc_card *card, + void snd_soc_card_remove_dai_link(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link); + ++#ifdef CONFIG_PCI ++static inline void snd_soc_card_set_pci_ssid(struct snd_soc_card *card, ++ unsigned short vendor, ++ unsigned short device) ++{ ++ card->pci_subsystem_vendor = vendor; ++ card->pci_subsystem_device = device; ++ card->pci_subsystem_set = true; ++} ++ ++static inline int snd_soc_card_get_pci_ssid(struct snd_soc_card *card, ++ unsigned short *vendor, ++ unsigned short *device) ++{ ++ if (!card->pci_subsystem_set) ++ return -ENOENT; ++ ++ *vendor = card->pci_subsystem_vendor; ++ *device = card->pci_subsystem_device; ++ ++ return 0; ++} ++#else /* !CONFIG_PCI */ ++static inline void snd_soc_card_set_pci_ssid(struct snd_soc_card *card, ++ unsigned short vendor, ++ unsigned short device) ++{ ++} ++ ++static inline int snd_soc_card_get_pci_ssid(struct snd_soc_card *card, ++ unsigned short *vendor, ++ unsigned short *device) ++{ ++ return -ENOENT; ++} ++#endif /* CONFIG_PCI */ ++ + /* device driver data */ + static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card, + void *data) +diff --git a/include/sound/soc.h b/include/sound/soc.h +index 37bbfc8b45cb2..108617cea9c67 100644 +--- a/include/sound/soc.h ++++ b/include/sound/soc.h +@@ -911,6 +911,17 @@ struct snd_soc_card { + #ifdef CONFIG_DMI + char dmi_longname[80]; + #endif /* CONFIG_DMI */ ++ ++#ifdef CONFIG_PCI ++ /* ++ * PCI does not define 0 as invalid, so pci_subsystem_set indicates ++ * whether a value has been written to these fields. ++ */ ++ unsigned short pci_subsystem_vendor; ++ unsigned short pci_subsystem_device; ++ bool pci_subsystem_set; ++#endif /* CONFIG_PCI */ ++ + char topology_shortname[32]; + + struct device *dev; +-- +2.42.0 + diff --git a/queue-6.1/asoc-sof-ipc4-handle-exception_caught-notification-f.patch b/queue-6.1/asoc-sof-ipc4-handle-exception_caught-notification-f.patch new file mode 100644 index 00000000000..d2f10baf67b --- /dev/null +++ b/queue-6.1/asoc-sof-ipc4-handle-exception_caught-notification-f.patch @@ -0,0 +1,45 @@ +From 097900e9ced7a1f77b2e24163e24cbb35b8853a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Sep 2023 12:24:16 +0300 +Subject: ASoC: SOF: ipc4: handle EXCEPTION_CAUGHT notification from firmware +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rander Wang + +[ Upstream commit c1c48fd6bbe788458e3685fea74bdb3cb148ff93 ] + +Driver will receive exception IPC message and process it by +snd_sof_dsp_panic. + +Signed-off-by: Rander Wang +Reviewed-by: Péter Ujfalusi +Reviewed-by: Kai Vehmanen +Reviewed-by: Pierre-Louis Bossart +Reviewed-by: Guennadi Liakhovetski +Signed-off-by: Peter Ujfalusi +Link: https://lore.kernel.org/r/20230919092416.4137-10-peter.ujfalusi@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/sof/ipc4.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/soc/sof/ipc4.c b/sound/soc/sof/ipc4.c +index c08f3960ddd96..06e1872abfee7 100644 +--- a/sound/soc/sof/ipc4.c ++++ b/sound/soc/sof/ipc4.c +@@ -601,6 +601,9 @@ static void sof_ipc4_rx_msg(struct snd_sof_dev *sdev) + case SOF_IPC4_NOTIFY_LOG_BUFFER_STATUS: + sof_ipc4_mtrace_update_pos(sdev, SOF_IPC4_LOG_CORE_GET(ipc4_msg->primary)); + break; ++ case SOF_IPC4_NOTIFY_EXCEPTION_CAUGHT: ++ snd_sof_dsp_panic(sdev, 0, true); ++ break; + default: + dev_dbg(sdev->dev, "Unhandled DSP message: %#x|%#x\n", + ipc4_msg->primary, ipc4_msg->extension); +-- +2.42.0 + diff --git a/queue-6.1/asoc-sof-pass-pci-ssid-to-machine-driver.patch b/queue-6.1/asoc-sof-pass-pci-ssid-to-machine-driver.patch new file mode 100644 index 00000000000..fcc54f23a5f --- /dev/null +++ b/queue-6.1/asoc-sof-pass-pci-ssid-to-machine-driver.patch @@ -0,0 +1,132 @@ +From d5c533e16f474c85350a0cbe4ba912ba7aa8b53a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 17:32:05 +0100 +Subject: ASoC: SOF: Pass PCI SSID to machine driver + +From: Richard Fitzgerald + +[ Upstream commit ba2de401d32625fe538d3f2c00ca73740dd2d516 ] + +Pass the PCI SSID of the audio interface through to the machine driver. +This allows the machine driver to use the SSID to uniquely identify the +specific hardware configuration and apply any platform-specific +configuration. + +struct snd_sof_pdata is passed around inside the SOF code, but it then +passes configuration information to the machine driver through +struct snd_soc_acpi_mach and struct snd_soc_acpi_mach_params. So SSID +information has been added to both snd_sof_pdata and +snd_soc_acpi_mach_params. + +PCI does not define 0x0000 as an invalid value so we can't use zero to +indicate that the struct member was not written. Instead a flag is +included to indicate that a value has been written to the +subsystem_vendor and subsystem_device members. + +sof_pci_probe() creates the struct snd_sof_pdata. It is passed a struct +pci_dev so it can fill in the SSID value. + +sof_machine_check() finds the appropriate struct snd_soc_acpi_mach. It +copies the SSID information across to the struct snd_soc_acpi_mach_params. +This done before calling any custom set_mach_params() so that it could be +used by the set_mach_params() callback to apply variant params. + +The machine driver receives the struct snd_soc_acpi_mach as its +platform_data. + +Signed-off-by: Richard Fitzgerald +Reviewed-by: Pierre-Louis Bossart +Link: https://lore.kernel.org/r/20230912163207.3498161-3-rf@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + include/sound/soc-acpi.h | 7 +++++++ + include/sound/sof.h | 8 ++++++++ + sound/soc/sof/sof-audio.c | 7 +++++++ + sound/soc/sof/sof-pci-dev.c | 8 ++++++++ + 4 files changed, 30 insertions(+) + +diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h +index 528279056b3ab..1a5f90b0a5463 100644 +--- a/include/sound/soc-acpi.h ++++ b/include/sound/soc-acpi.h +@@ -67,6 +67,10 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) + * @i2s_link_mask: I2S/TDM links enabled on the board + * @num_dai_drivers: number of elements in @dai_drivers + * @dai_drivers: pointer to dai_drivers, used e.g. in nocodec mode ++ * @subsystem_vendor: optional PCI SSID vendor value ++ * @subsystem_device: optional PCI SSID device value ++ * @subsystem_id_set: true if a value has been written to ++ * subsystem_vendor and subsystem_device. + */ + struct snd_soc_acpi_mach_params { + u32 acpi_ipc_irq_index; +@@ -79,6 +83,9 @@ struct snd_soc_acpi_mach_params { + u32 i2s_link_mask; + u32 num_dai_drivers; + struct snd_soc_dai_driver *dai_drivers; ++ unsigned short subsystem_vendor; ++ unsigned short subsystem_device; ++ bool subsystem_id_set; + }; + + /** +diff --git a/include/sound/sof.h b/include/sound/sof.h +index 341fef19e6124..1caeb7bf109b4 100644 +--- a/include/sound/sof.h ++++ b/include/sound/sof.h +@@ -63,6 +63,14 @@ struct snd_sof_pdata { + const char *name; + const char *platform; + ++ /* ++ * PCI SSID. As PCI does not define 0 as invalid, the subsystem_id_set ++ * flag indicates that a value has been written to these members. ++ */ ++ unsigned short subsystem_vendor; ++ unsigned short subsystem_device; ++ bool subsystem_id_set; ++ + struct device *dev; + + /* indicate how many first bytes shouldn't be loaded into DSP memory. */ +diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c +index cf2c0db57d899..061ab7289a6c3 100644 +--- a/sound/soc/sof/sof-audio.c ++++ b/sound/soc/sof/sof-audio.c +@@ -832,6 +832,13 @@ int sof_machine_check(struct snd_sof_dev *sdev) + mach = snd_sof_machine_select(sdev); + if (mach) { + sof_pdata->machine = mach; ++ ++ if (sof_pdata->subsystem_id_set) { ++ mach->mach_params.subsystem_vendor = sof_pdata->subsystem_vendor; ++ mach->mach_params.subsystem_device = sof_pdata->subsystem_device; ++ mach->mach_params.subsystem_id_set = true; ++ } ++ + snd_sof_set_mach_params(mach, sdev); + return 0; + } +diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c +index 05fb4e20e8a40..99cc272e321d0 100644 +--- a/sound/soc/sof/sof-pci-dev.c ++++ b/sound/soc/sof/sof-pci-dev.c +@@ -217,6 +217,14 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) + return ret; + + sof_pdata->name = pci_name(pci); ++ ++ /* PCI defines a vendor ID of 0xFFFF as invalid. */ ++ if (pci->subsystem_vendor != 0xFFFF) { ++ sof_pdata->subsystem_vendor = pci->subsystem_vendor; ++ sof_pdata->subsystem_device = pci->subsystem_device; ++ sof_pdata->subsystem_id_set = true; ++ } ++ + sof_pdata->desc = desc; + sof_pdata->dev = dev; + +-- +2.42.0 + diff --git a/queue-6.1/asoc-ti-omap-mcbsp-fix-runtime-pm-underflow-warnings.patch b/queue-6.1/asoc-ti-omap-mcbsp-fix-runtime-pm-underflow-warnings.patch new file mode 100644 index 00000000000..6750c126b2b --- /dev/null +++ b/queue-6.1/asoc-ti-omap-mcbsp-fix-runtime-pm-underflow-warnings.patch @@ -0,0 +1,47 @@ +From 77260e4482471bb895778195a9d57b923636c94e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Oct 2023 07:23:38 +0200 +Subject: ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings + +From: Tony Lindgren + +[ Upstream commit fbb74e56378d8306f214658e3d525a8b3f000c5a ] + +We need to check for an active device as otherwise we get warnings +for some mcbsp instances for "Runtime PM usage count underflow!". + +Reported-by: Andreas Kemnade +Signed-off-by: Tony Lindgren +Link: https://lore.kernel.org/r/20231030052340.13415-1-tony@atomide.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/ti/omap-mcbsp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c +index 7c539a41a6a34..4b8aac1a36fa2 100644 +--- a/sound/soc/ti/omap-mcbsp.c ++++ b/sound/soc/ti/omap-mcbsp.c +@@ -74,14 +74,16 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) + return -EINVAL; + } + +- pm_runtime_put_sync(mcbsp->dev); ++ if (mcbsp->active) ++ pm_runtime_put_sync(mcbsp->dev); + + r = clk_set_parent(mcbsp->fclk, fck_src); + if (r) + dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n", + src); + +- pm_runtime_get_sync(mcbsp->dev); ++ if (mcbsp->active) ++ pm_runtime_get_sync(mcbsp->dev); + + clk_put(fck_src); + +-- +2.42.0 + diff --git a/queue-6.1/atl1c-work-around-the-dma-rx-overflow-issue.patch b/queue-6.1/atl1c-work-around-the-dma-rx-overflow-issue.patch new file mode 100644 index 00000000000..6b85af5ed36 --- /dev/null +++ b/queue-6.1/atl1c-work-around-the-dma-rx-overflow-issue.patch @@ -0,0 +1,173 @@ +From 5e77815ec3de588c825e775f2eb48adc3931d58f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 09:07:11 +0800 +Subject: atl1c: Work around the DMA RX overflow issue + +From: Sieng-Piaw Liew + +[ Upstream commit 86565682e9053e5deb128193ea9e88531bbae9cf ] + +This is based on alx driver commit 881d0327db37 ("net: alx: Work around +the DMA RX overflow issue"). + +The alx and atl1c drivers had RX overflow error which was why a custom +allocator was created to avoid certain addresses. The simpler workaround +then created for alx driver, but not for atl1c due to lack of tester. + +Instead of using a custom allocator, check the allocated skb address and +use skb_reserve() to move away from problematic 0x...fc0 address. + +Tested on AR8131 on Acer 4540. + +Signed-off-by: Sieng-Piaw Liew +Link: https://lore.kernel.org/r/20230912010711.12036-1-liew.s.piaw@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 - + .../net/ethernet/atheros/atl1c/atl1c_main.c | 67 +++++-------------- + 2 files changed, 16 insertions(+), 54 deletions(-) + +diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h +index 43d821fe7a542..63ba64dbb7310 100644 +--- a/drivers/net/ethernet/atheros/atl1c/atl1c.h ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h +@@ -504,15 +504,12 @@ struct atl1c_rrd_ring { + u16 next_to_use; + u16 next_to_clean; + struct napi_struct napi; +- struct page *rx_page; +- unsigned int rx_page_offset; + }; + + /* board specific private data structure */ + struct atl1c_adapter { + struct net_device *netdev; + struct pci_dev *pdev; +- unsigned int rx_frag_size; + struct atl1c_hw hw; + struct atl1c_hw_stats hw_stats; + struct mii_if_info mii; /* MII interface info */ +diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +index 7762e532c6a4f..6eb86d75955fe 100644 +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -493,15 +493,10 @@ static int atl1c_set_mac_addr(struct net_device *netdev, void *p) + static void atl1c_set_rxbufsize(struct atl1c_adapter *adapter, + struct net_device *dev) + { +- unsigned int head_size; + int mtu = dev->mtu; + + adapter->rx_buffer_len = mtu > AT_RX_BUF_SIZE ? + roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; +- +- head_size = SKB_DATA_ALIGN(adapter->rx_buffer_len + NET_SKB_PAD + NET_IP_ALIGN) + +- SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); +- adapter->rx_frag_size = roundup_pow_of_two(head_size); + } + + static netdev_features_t atl1c_fix_features(struct net_device *netdev, +@@ -974,7 +969,6 @@ static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter) + static void atl1c_free_ring_resources(struct atl1c_adapter *adapter) + { + struct pci_dev *pdev = adapter->pdev; +- int i; + + dma_free_coherent(&pdev->dev, adapter->ring_header.size, + adapter->ring_header.desc, adapter->ring_header.dma); +@@ -987,12 +981,6 @@ static void atl1c_free_ring_resources(struct atl1c_adapter *adapter) + kfree(adapter->tpd_ring[0].buffer_info); + adapter->tpd_ring[0].buffer_info = NULL; + } +- for (i = 0; i < adapter->rx_queue_count; ++i) { +- if (adapter->rrd_ring[i].rx_page) { +- put_page(adapter->rrd_ring[i].rx_page); +- adapter->rrd_ring[i].rx_page = NULL; +- } +- } + } + + /** +@@ -1764,48 +1752,11 @@ static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter, + skb_checksum_none_assert(skb); + } + +-static struct sk_buff *atl1c_alloc_skb(struct atl1c_adapter *adapter, +- u32 queue, bool napi_mode) +-{ +- struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring[queue]; +- struct sk_buff *skb; +- struct page *page; +- +- if (adapter->rx_frag_size > PAGE_SIZE) { +- if (likely(napi_mode)) +- return napi_alloc_skb(&rrd_ring->napi, +- adapter->rx_buffer_len); +- else +- return netdev_alloc_skb_ip_align(adapter->netdev, +- adapter->rx_buffer_len); +- } +- +- page = rrd_ring->rx_page; +- if (!page) { +- page = alloc_page(GFP_ATOMIC); +- if (unlikely(!page)) +- return NULL; +- rrd_ring->rx_page = page; +- rrd_ring->rx_page_offset = 0; +- } +- +- skb = build_skb(page_address(page) + rrd_ring->rx_page_offset, +- adapter->rx_frag_size); +- if (likely(skb)) { +- skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN); +- rrd_ring->rx_page_offset += adapter->rx_frag_size; +- if (rrd_ring->rx_page_offset >= PAGE_SIZE) +- rrd_ring->rx_page = NULL; +- else +- get_page(page); +- } +- return skb; +-} +- + static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, u32 queue, + bool napi_mode) + { + struct atl1c_rfd_ring *rfd_ring = &adapter->rfd_ring[queue]; ++ struct atl1c_rrd_ring *rrd_ring = &adapter->rrd_ring[queue]; + struct pci_dev *pdev = adapter->pdev; + struct atl1c_buffer *buffer_info, *next_info; + struct sk_buff *skb; +@@ -1824,13 +1775,27 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, u32 queue, + while (next_info->flags & ATL1C_BUFFER_FREE) { + rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use); + +- skb = atl1c_alloc_skb(adapter, queue, napi_mode); ++ /* When DMA RX address is set to something like ++ * 0x....fc0, it will be very likely to cause DMA ++ * RFD overflow issue. ++ * ++ * To work around it, we apply rx skb with 64 bytes ++ * longer space, and offset the address whenever ++ * 0x....fc0 is detected. ++ */ ++ if (likely(napi_mode)) ++ skb = napi_alloc_skb(&rrd_ring->napi, adapter->rx_buffer_len + 64); ++ else ++ skb = netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len + 64); + if (unlikely(!skb)) { + if (netif_msg_rx_err(adapter)) + dev_warn(&pdev->dev, "alloc rx buffer failed\n"); + break; + } + ++ if (((unsigned long)skb->data & 0xfff) == 0xfc0) ++ skb_reserve(skb, 64); ++ + /* + * Make buffer alignment 2 beyond a 16 byte boundary + * this will result in a 16 byte aligned IP header after +-- +2.42.0 + diff --git a/queue-6.1/atm-iphase-do-pci-error-checks-on-own-line.patch b/queue-6.1/atm-iphase-do-pci-error-checks-on-own-line.patch new file mode 100644 index 00000000000..6d63289936e --- /dev/null +++ b/queue-6.1/atm-iphase-do-pci-error-checks-on-own-line.patch @@ -0,0 +1,68 @@ +From c5c7097a622208e33ed2a6f0d8ec99476262238f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Sep 2023 15:53:51 +0300 +Subject: atm: iphase: Do PCI error checks on own line +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit c28742447ca9879b52fbaf022ad844f0ffcd749c ] + +In get_esi() PCI errors are checked inside line-split "if" conditions (in +addition to the file not following the coding style). To make the code in +get_esi() more readable, fix the coding style and use the usual error +handling pattern with a separate variable. + +In addition, initialization of 'error' variable at declaration is not +needed. + +No functional changes intended. + +Link: https://lore.kernel.org/r/20230911125354.25501-4-ilpo.jarvinen@linux.intel.com +Signed-off-by: Ilpo Järvinen +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/atm/iphase.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c +index 3241486869530..9bba8f280a4d4 100644 +--- a/drivers/atm/iphase.c ++++ b/drivers/atm/iphase.c +@@ -2291,19 +2291,21 @@ static int get_esi(struct atm_dev *dev) + static int reset_sar(struct atm_dev *dev) + { + IADEV *iadev; +- int i, error = 1; ++ int i, error; + unsigned int pci[64]; + + iadev = INPH_IA_DEV(dev); +- for(i=0; i<64; i++) +- if ((error = pci_read_config_dword(iadev->pci, +- i*4, &pci[i])) != PCIBIOS_SUCCESSFUL) +- return error; ++ for (i = 0; i < 64; i++) { ++ error = pci_read_config_dword(iadev->pci, i * 4, &pci[i]); ++ if (error != PCIBIOS_SUCCESSFUL) ++ return error; ++ } + writel(0, iadev->reg+IPHASE5575_EXT_RESET); +- for(i=0; i<64; i++) +- if ((error = pci_write_config_dword(iadev->pci, +- i*4, pci[i])) != PCIBIOS_SUCCESSFUL) +- return error; ++ for (i = 0; i < 64; i++) { ++ error = pci_write_config_dword(iadev->pci, i * 4, pci[i]); ++ if (error != PCIBIOS_SUCCESSFUL) ++ return error; ++ } + udelay(5); + return 0; + } +-- +2.42.0 + diff --git a/queue-6.1/bluetooth-btusb-add-date-evt_skb-is-null-check.patch b/queue-6.1/bluetooth-btusb-add-date-evt_skb-is-null-check.patch new file mode 100644 index 00000000000..36d1ff0f6dc --- /dev/null +++ b/queue-6.1/bluetooth-btusb-add-date-evt_skb-is-null-check.patch @@ -0,0 +1,71 @@ +From 4340fbecd19c3739a2654fae0cd131b67a6a7e8d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 13:14:47 +0800 +Subject: Bluetooth: btusb: Add date->evt_skb is NULL check + +From: youwan Wang + +[ Upstream commit 624820f7c8826dd010e8b1963303c145f99816e9 ] + +fix crash because of null pointers + +[ 6104.969662] BUG: kernel NULL pointer dereference, address: 00000000000000c8 +[ 6104.969667] #PF: supervisor read access in kernel mode +[ 6104.969668] #PF: error_code(0x0000) - not-present page +[ 6104.969670] PGD 0 P4D 0 +[ 6104.969673] Oops: 0000 [#1] SMP NOPTI +[ 6104.969684] RIP: 0010:btusb_mtk_hci_wmt_sync+0x144/0x220 [btusb] +[ 6104.969688] RSP: 0018:ffffb8d681533d48 EFLAGS: 00010246 +[ 6104.969689] RAX: 0000000000000000 RBX: ffff8ad560bb2000 RCX: 0000000000000006 +[ 6104.969691] RDX: 0000000000000000 RSI: ffffb8d681533d08 RDI: 0000000000000000 +[ 6104.969692] RBP: ffffb8d681533d70 R08: 0000000000000001 R09: 0000000000000001 +[ 6104.969694] R10: 0000000000000001 R11: 00000000fa83b2da R12: ffff8ad461d1d7c0 +[ 6104.969695] R13: 0000000000000000 R14: ffff8ad459618c18 R15: ffffb8d681533d90 +[ 6104.969697] FS: 00007f5a1cab9d40(0000) GS:ffff8ad578200000(0000) knlGS:00000 +[ 6104.969699] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 6104.969700] CR2: 00000000000000c8 CR3: 000000018620c001 CR4: 0000000000760ef0 +[ 6104.969701] PKRU: 55555554 +[ 6104.969702] Call Trace: +[ 6104.969708] btusb_mtk_shutdown+0x44/0x80 [btusb] +[ 6104.969732] hci_dev_do_close+0x470/0x5c0 [bluetooth] +[ 6104.969748] hci_rfkill_set_block+0x56/0xa0 [bluetooth] +[ 6104.969753] rfkill_set_block+0x92/0x160 +[ 6104.969755] rfkill_fop_write+0x136/0x1e0 +[ 6104.969759] __vfs_write+0x18/0x40 +[ 6104.969761] vfs_write+0xdf/0x1c0 +[ 6104.969763] ksys_write+0xb1/0xe0 +[ 6104.969765] __x64_sys_write+0x1a/0x20 +[ 6104.969769] do_syscall_64+0x51/0x180 +[ 6104.969771] entry_SYSCALL_64_after_hwframe+0x44/0xa9 +[ 6104.969773] RIP: 0033:0x7f5a21f18fef +[ 6104.9] RSP: 002b:00007ffeefe39010 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 +[ 6104.969780] RAX: ffffffffffffffda RBX: 000055c10a7560a0 RCX: 00007f5a21f18fef +[ 6104.969781] RDX: 0000000000000008 RSI: 00007ffeefe39060 RDI: 0000000000000012 +[ 6104.969782] RBP: 00007ffeefe39060 R08: 0000000000000000 R09: 0000000000000017 +[ 6104.969784] R10: 00007ffeefe38d97 R11: 0000000000000293 R12: 0000000000000002 +[ 6104.969785] R13: 00007ffeefe39220 R14: 00007ffeefe391a0 R15: 000055c10a72acf0 + +Signed-off-by: youwan Wang +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + drivers/bluetooth/btusb.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index 96d4f48e36011..4a6369d1dd171 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -2638,6 +2638,9 @@ static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev, + goto err_free_wc; + } + ++ if (data->evt_skb == NULL) ++ goto err_free_wc; ++ + /* Parse and handle the return WMT event */ + wmt_evt = (struct btmtk_hci_wmt_evt *)data->evt_skb->data; + if (wmt_evt->whdr.op != hdr->op) { +-- +2.42.0 + diff --git a/queue-6.1/bluetooth-fix-double-free-in-hci_conn_cleanup.patch b/queue-6.1/bluetooth-fix-double-free-in-hci_conn_cleanup.patch new file mode 100644 index 00000000000..7dda3eacba2 --- /dev/null +++ b/queue-6.1/bluetooth-fix-double-free-in-hci_conn_cleanup.patch @@ -0,0 +1,139 @@ +From 64dc36f6e9f93964372079d4e8889c3e1162100d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Oct 2023 12:30:55 +0200 +Subject: Bluetooth: Fix double free in hci_conn_cleanup + +From: ZhengHan Wang + +[ Upstream commit a85fb91e3d728bdfc80833167e8162cce8bc7004 ] + +syzbot reports a slab use-after-free in hci_conn_hash_flush [1]. +After releasing an object using hci_conn_del_sysfs in the +hci_conn_cleanup function, releasing the same object again +using the hci_dev_put and hci_conn_put functions causes a double free. +Here's a simplified flow: + +hci_conn_del_sysfs: + hci_dev_put + put_device + kobject_put + kref_put + kobject_release + kobject_cleanup + kfree_const + kfree(name) + +hci_dev_put: + ... + kfree(name) + +hci_conn_put: + put_device + ... + kfree(name) + +This patch drop the hci_dev_put and hci_conn_put function +call in hci_conn_cleanup function, because the object is +freed in hci_conn_del_sysfs function. + +This patch also fixes the refcounting in hci_conn_add_sysfs() and +hci_conn_del_sysfs() to take into account device_add() failures. + +This fixes CVE-2023-28464. + +Link: https://syzkaller.appspot.com/bug?id=1bb51491ca5df96a5f724899d1dbb87afda61419 [1] + +Signed-off-by: ZhengHan Wang +Co-developed-by: Luiz Augusto von Dentz +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_conn.c | 6 ++---- + net/bluetooth/hci_sysfs.c | 23 ++++++++++++----------- + 2 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c +index 728be9307f526..55e0ecd88543e 100644 +--- a/net/bluetooth/hci_conn.c ++++ b/net/bluetooth/hci_conn.c +@@ -168,13 +168,11 @@ static void hci_conn_cleanup(struct hci_conn *conn) + hdev->notify(hdev, HCI_NOTIFY_CONN_DEL); + } + +- hci_conn_del_sysfs(conn); +- + debugfs_remove_recursive(conn->debugfs); + +- hci_dev_put(hdev); ++ hci_conn_del_sysfs(conn); + +- hci_conn_put(conn); ++ hci_dev_put(hdev); + } + + static void le_scan_cleanup(struct work_struct *work) +diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c +index 08542dfc2dc53..633b82d542728 100644 +--- a/net/bluetooth/hci_sysfs.c ++++ b/net/bluetooth/hci_sysfs.c +@@ -33,7 +33,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn) + { + struct hci_dev *hdev = conn->hdev; + +- BT_DBG("conn %p", conn); ++ bt_dev_dbg(hdev, "conn %p", conn); + + conn->dev.type = &bt_link; + conn->dev.class = bt_class; +@@ -46,27 +46,30 @@ void hci_conn_add_sysfs(struct hci_conn *conn) + { + struct hci_dev *hdev = conn->hdev; + +- BT_DBG("conn %p", conn); ++ bt_dev_dbg(hdev, "conn %p", conn); + + if (device_is_registered(&conn->dev)) + return; + + dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); + +- if (device_add(&conn->dev) < 0) { ++ if (device_add(&conn->dev) < 0) + bt_dev_err(hdev, "failed to register connection device"); +- return; +- } +- +- hci_dev_hold(hdev); + } + + void hci_conn_del_sysfs(struct hci_conn *conn) + { + struct hci_dev *hdev = conn->hdev; + +- if (!device_is_registered(&conn->dev)) ++ bt_dev_dbg(hdev, "conn %p", conn); ++ ++ if (!device_is_registered(&conn->dev)) { ++ /* If device_add() has *not* succeeded, use *only* put_device() ++ * to drop the reference count. ++ */ ++ put_device(&conn->dev); + return; ++ } + + while (1) { + struct device *dev; +@@ -78,9 +81,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn) + put_device(dev); + } + +- device_del(&conn->dev); +- +- hci_dev_put(hdev); ++ device_unregister(&conn->dev); + } + + static void bt_host_release(struct device *dev) +-- +2.42.0 + diff --git a/queue-6.1/bonding-stop-the-device-in-bond_setup_by_slave.patch b/queue-6.1/bonding-stop-the-device-in-bond_setup_by_slave.patch new file mode 100644 index 00000000000..319935d2e05 --- /dev/null +++ b/queue-6.1/bonding-stop-the-device-in-bond_setup_by_slave.patch @@ -0,0 +1,133 @@ +From bf90ce68ee08927f41747f93b2919874d3ca64e4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 18:01:02 +0000 +Subject: bonding: stop the device in bond_setup_by_slave() + +From: Eric Dumazet + +[ Upstream commit 3cffa2ddc4d3fcf70cde361236f5a614f81a09b2 ] + +Commit 9eed321cde22 ("net: lapbether: only support ethernet devices") +has been able to keep syzbot away from net/lapb, until today. + +In the following splat [1], the issue is that a lapbether device has +been created on a bonding device without members. Then adding a non +ARPHRD_ETHER member forced the bonding master to change its type. + +The fix is to make sure we call dev_close() in bond_setup_by_slave() +so that the potential linked lapbether devices (or any other devices +having assumptions on the physical device) are removed. + +A similar bug has been addressed in commit 40baec225765 +("bonding: fix panic on non-ARPHRD_ETHER enslave failure") + +[1] +skbuff: skb_under_panic: text:ffff800089508810 len:44 put:40 head:ffff0000c78e7c00 data:ffff0000c78e7bea tail:0x16 end:0x140 dev:bond0 +kernel BUG at net/core/skbuff.c:192 ! +Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP +Modules linked in: +CPU: 0 PID: 6007 Comm: syz-executor383 Not tainted 6.6.0-rc3-syzkaller-gbf6547d8715b #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/04/2023 +pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) +pc : skb_panic net/core/skbuff.c:188 [inline] +pc : skb_under_panic+0x13c/0x140 net/core/skbuff.c:202 +lr : skb_panic net/core/skbuff.c:188 [inline] +lr : skb_under_panic+0x13c/0x140 net/core/skbuff.c:202 +sp : ffff800096a06aa0 +x29: ffff800096a06ab0 x28: ffff800096a06ba0 x27: dfff800000000000 +x26: ffff0000ce9b9b50 x25: 0000000000000016 x24: ffff0000c78e7bea +x23: ffff0000c78e7c00 x22: 000000000000002c x21: 0000000000000140 +x20: 0000000000000028 x19: ffff800089508810 x18: ffff800096a06100 +x17: 0000000000000000 x16: ffff80008a629a3c x15: 0000000000000001 +x14: 1fffe00036837a32 x13: 0000000000000000 x12: 0000000000000000 +x11: 0000000000000201 x10: 0000000000000000 x9 : cb50b496c519aa00 +x8 : cb50b496c519aa00 x7 : 0000000000000001 x6 : 0000000000000001 +x5 : ffff800096a063b8 x4 : ffff80008e280f80 x3 : ffff8000805ad11c +x2 : 0000000000000001 x1 : 0000000100000201 x0 : 0000000000000086 +Call trace: +skb_panic net/core/skbuff.c:188 [inline] +skb_under_panic+0x13c/0x140 net/core/skbuff.c:202 +skb_push+0xf0/0x108 net/core/skbuff.c:2446 +ip6gre_header+0xbc/0x738 net/ipv6/ip6_gre.c:1384 +dev_hard_header include/linux/netdevice.h:3136 [inline] +lapbeth_data_transmit+0x1c4/0x298 drivers/net/wan/lapbether.c:257 +lapb_data_transmit+0x8c/0xb0 net/lapb/lapb_iface.c:447 +lapb_transmit_buffer+0x178/0x204 net/lapb/lapb_out.c:149 +lapb_send_control+0x220/0x320 net/lapb/lapb_subr.c:251 +__lapb_disconnect_request+0x9c/0x17c net/lapb/lapb_iface.c:326 +lapb_device_event+0x288/0x4e0 net/lapb/lapb_iface.c:492 +notifier_call_chain+0x1a4/0x510 kernel/notifier.c:93 +raw_notifier_call_chain+0x3c/0x50 kernel/notifier.c:461 +call_netdevice_notifiers_info net/core/dev.c:1970 [inline] +call_netdevice_notifiers_extack net/core/dev.c:2008 [inline] +call_netdevice_notifiers net/core/dev.c:2022 [inline] +__dev_close_many+0x1b8/0x3c4 net/core/dev.c:1508 +dev_close_many+0x1e0/0x470 net/core/dev.c:1559 +dev_close+0x174/0x250 net/core/dev.c:1585 +lapbeth_device_event+0x2e4/0x958 drivers/net/wan/lapbether.c:466 +notifier_call_chain+0x1a4/0x510 kernel/notifier.c:93 +raw_notifier_call_chain+0x3c/0x50 kernel/notifier.c:461 +call_netdevice_notifiers_info net/core/dev.c:1970 [inline] +call_netdevice_notifiers_extack net/core/dev.c:2008 [inline] +call_netdevice_notifiers net/core/dev.c:2022 [inline] +__dev_close_many+0x1b8/0x3c4 net/core/dev.c:1508 +dev_close_many+0x1e0/0x470 net/core/dev.c:1559 +dev_close+0x174/0x250 net/core/dev.c:1585 +bond_enslave+0x2298/0x30cc drivers/net/bonding/bond_main.c:2332 +bond_do_ioctl+0x268/0xc64 drivers/net/bonding/bond_main.c:4539 +dev_ifsioc+0x754/0x9ac +dev_ioctl+0x4d8/0xd34 net/core/dev_ioctl.c:786 +sock_do_ioctl+0x1d4/0x2d0 net/socket.c:1217 +sock_ioctl+0x4e8/0x834 net/socket.c:1322 +vfs_ioctl fs/ioctl.c:51 [inline] +__do_sys_ioctl fs/ioctl.c:871 [inline] +__se_sys_ioctl fs/ioctl.c:857 [inline] +__arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:857 +__invoke_syscall arch/arm64/kernel/syscall.c:37 [inline] +invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:51 +el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:136 +do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:155 +el0_svc+0x58/0x16c arch/arm64/kernel/entry-common.c:678 +el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:696 +el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:591 +Code: aa1803e6 aa1903e7 a90023f5 94785b8b (d4210000) + +Fixes: 872254dd6b1f ("net/bonding: Enable bonding to enslave non ARPHRD_ETHER") +Reported-by: syzbot +Signed-off-by: Eric Dumazet +Acked-by: Jay Vosburgh +Reviewed-by: Hangbin Liu +Link: https://lore.kernel.org/r/20231109180102.4085183-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/bonding/bond_main.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c +index b170a3d8d007e..710734a5af9bf 100644 +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -1503,6 +1503,10 @@ static void bond_compute_features(struct bonding *bond) + static void bond_setup_by_slave(struct net_device *bond_dev, + struct net_device *slave_dev) + { ++ bool was_up = !!(bond_dev->flags & IFF_UP); ++ ++ dev_close(bond_dev); ++ + bond_dev->header_ops = slave_dev->header_ops; + + bond_dev->type = slave_dev->type; +@@ -1517,6 +1521,8 @@ static void bond_setup_by_slave(struct net_device *bond_dev, + bond_dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST); + bond_dev->flags |= (IFF_POINTOPOINT | IFF_NOARP); + } ++ if (was_up) ++ dev_open(bond_dev, NULL); + } + + /* On bonding slaves other than the currently active slave, suppress +-- +2.42.0 + diff --git a/queue-6.1/bpf-detect-ip-ksym.end-as-part-of-bpf-program.patch b/queue-6.1/bpf-detect-ip-ksym.end-as-part-of-bpf-program.patch new file mode 100644 index 00000000000..0c4dae266c1 --- /dev/null +++ b/queue-6.1/bpf-detect-ip-ksym.end-as-part-of-bpf-program.patch @@ -0,0 +1,97 @@ +From 2dfab1827ec9717c6ba4407e6e96a3e6c8d2f1d9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Sep 2023 01:32:08 +0200 +Subject: bpf: Detect IP == ksym.end as part of BPF program + +From: Kumar Kartikeya Dwivedi + +[ Upstream commit 66d9111f3517f85ef2af0337ece02683ce0faf21 ] + +Now that bpf_throw kfunc is the first such call instruction that has +noreturn semantics within the verifier, this also kicks in dead code +elimination in unprecedented ways. For one, any instruction following +a bpf_throw call will never be marked as seen. Moreover, if a callchain +ends up throwing, any instructions after the call instruction to the +eventually throwing subprog in callers will also never be marked as +seen. + +The tempting way to fix this would be to emit extra 'int3' instructions +which bump the jited_len of a program, and ensure that during runtime +when a program throws, we can discover its boundaries even if the call +instruction to bpf_throw (or to subprogs that always throw) is emitted +as the final instruction in the program. + +An example of such a program would be this: + +do_something(): + ... + r0 = 0 + exit + +foo(): + r1 = 0 + call bpf_throw + r0 = 0 + exit + +bar(cond): + if r1 != 0 goto pc+2 + call do_something + exit + call foo + r0 = 0 // Never seen by verifier + exit // + +main(ctx): + r1 = ... + call bar + r0 = 0 + exit + +Here, if we do end up throwing, the stacktrace would be the following: + +bpf_throw +foo +bar +main + +In bar, the final instruction emitted will be the call to foo, as such, +the return address will be the subsequent instruction (which the JIT +emits as int3 on x86). This will end up lying outside the jited_len of +the program, thus, when unwinding, we will fail to discover the return +address as belonging to any program and end up in a panic due to the +unreliable stack unwinding of BPF programs that we never expect. + +To remedy this case, make bpf_prog_ksym_find treat IP == ksym.end as +part of the BPF program, so that is_bpf_text_address returns true when +such a case occurs, and we are able to unwind reliably when the final +instruction ends up being a call instruction. + +Signed-off-by: Kumar Kartikeya Dwivedi +Link: https://lore.kernel.org/r/20230912233214.1518551-12-memxor@gmail.com +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + kernel/bpf/core.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c +index 64706723624b9..7225cb67c0d3a 100644 +--- a/kernel/bpf/core.c ++++ b/kernel/bpf/core.c +@@ -608,7 +608,11 @@ static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n) + + if (val < ksym->start) + return -1; +- if (val >= ksym->end) ++ /* Ensure that we detect return addresses as part of the program, when ++ * the final instruction is a call for a program part of the stack ++ * trace. Therefore, do val > ksym->end instead of val >= ksym->end. ++ */ ++ if (val > ksym->end) + return 1; + + return 0; +-- +2.42.0 + diff --git a/queue-6.1/bpf-ensure-proper-register-state-printing-for-cond-j.patch b/queue-6.1/bpf-ensure-proper-register-state-printing-for-cond-j.patch new file mode 100644 index 00000000000..884b8c6dbab --- /dev/null +++ b/queue-6.1/bpf-ensure-proper-register-state-printing-for-cond-j.patch @@ -0,0 +1,113 @@ +From 5ec7f6fd77d019ecafbcc6d35c504cde70c01656 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 15:37:28 -0700 +Subject: bpf: Ensure proper register state printing for cond jumps + +From: Andrii Nakryiko + +[ Upstream commit 1a8a315f008a58f54fecb012b928aa6a494435b3 ] + +Verifier emits relevant register state involved in any given instruction +next to it after `;` to the right, if possible. Or, worst case, on the +separate line repeating instruction index. + +E.g., a nice and simple case would be: + + 2: (d5) if r0 s<= 0x0 goto pc+1 ; R0_w=0 + +But if there is some intervening extra output (e.g., precision +backtracking log) involved, we are supposed to see the state after the +precision backtrack log: + + 4: (75) if r0 s>= 0x0 goto pc+1 + mark_precise: frame0: last_idx 4 first_idx 0 subseq_idx -1 + mark_precise: frame0: regs=r0 stack= before 2: (d5) if r0 s<= 0x0 goto pc+1 + mark_precise: frame0: regs=r0 stack= before 1: (b7) r0 = 0 + 6: R0_w=0 + +First off, note that in `6: R0_w=0` instruction index corresponds to the +next instruction, not to the conditional jump instruction itself, which +is wrong and we'll get to that. + +But besides that, the above is a happy case that does work today. Yet, +if it so happens that precision backtracking had to traverse some of the +parent states, this `6: R0_w=0` state output would be missing. + +This is due to a quirk of print_verifier_state() routine, which performs +mark_verifier_state_clean(env) at the end. This marks all registers as +"non-scratched", which means that subsequent logic to print *relevant* +registers (that is, "scratched ones") fails and doesn't see anything +relevant to print and skips the output altogether. + +print_verifier_state() is used both to print instruction context, but +also to print an **entire** verifier state indiscriminately, e.g., +during precision backtracking (and in a few other situations, like +during entering or exiting subprogram). Which means if we have to print +entire parent state before getting to printing instruction context +state, instruction context is marked as clean and is omitted. + +Long story short, this is definitely not intentional. So we fix this +behavior in this patch by teaching print_verifier_state() to clear +scratch state only if it was used to print instruction state, not the +parent/callback state. This is determined by print_all option, so if +it's not set, we don't clear scratch state. This fixes missing +instruction state for these cases. + +As for the mismatched instruction index, we fix that by making sure we +call print_insn_state() early inside check_cond_jmp_op() before we +adjusted insn_idx based on jump branch taken logic. And with that we get +desired correct information: + + 9: (16) if w4 == 0x1 goto pc+9 + mark_precise: frame0: last_idx 9 first_idx 9 subseq_idx -1 + mark_precise: frame0: parent state regs=r4 stack=: R2_w=1944 R4_rw=P1 R10=fp0 + mark_precise: frame0: last_idx 8 first_idx 0 subseq_idx 9 + mark_precise: frame0: regs=r4 stack= before 8: (66) if w4 s> 0x3 goto pc+5 + mark_precise: frame0: regs=r4 stack= before 7: (b7) r4 = 1 + 9: R4=1 + +Signed-off-by: Andrii Nakryiko +Signed-off-by: Daniel Borkmann +Acked-by: John Fastabend +Acked-by: Eduard Zingerman +Link: https://lore.kernel.org/bpf/20231011223728.3188086-6-andrii@kernel.org +Signed-off-by: Sasha Levin +--- + kernel/bpf/verifier.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c +index eb3f52be115d6..7fbc6492fe7b4 100644 +--- a/kernel/bpf/verifier.c ++++ b/kernel/bpf/verifier.c +@@ -978,7 +978,8 @@ static void print_verifier_state(struct bpf_verifier_env *env, + if (state->in_async_callback_fn) + verbose(env, " async_cb"); + verbose(env, "\n"); +- mark_verifier_state_clean(env); ++ if (!print_all) ++ mark_verifier_state_clean(env); + } + + static inline u32 vlog_alignment(u32 pos) +@@ -10476,6 +10477,8 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env, + !sanitize_speculative_path(env, insn, *insn_idx + 1, + *insn_idx)) + return -EFAULT; ++ if (env->log.level & BPF_LOG_LEVEL) ++ print_insn_state(env, this_branch->frame[this_branch->curframe]); + *insn_idx += insn->off; + return 0; + } else if (pred == 0) { +@@ -10488,6 +10491,8 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env, + *insn_idx + insn->off + 1, + *insn_idx)) + return -EFAULT; ++ if (env->log.level & BPF_LOG_LEVEL) ++ print_insn_state(env, this_branch->frame[this_branch->curframe]); + return 0; + } + +-- +2.42.0 + diff --git a/queue-6.1/cifs-fix-check-of-rc-in-function-generate_smb3signin.patch b/queue-6.1/cifs-fix-check-of-rc-in-function-generate_smb3signin.patch new file mode 100644 index 00000000000..7d11dd42e66 --- /dev/null +++ b/queue-6.1/cifs-fix-check-of-rc-in-function-generate_smb3signin.patch @@ -0,0 +1,52 @@ +From e89c60e81a1c9451791254a50ae5a5532e563af7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Nov 2023 19:42:41 +0300 +Subject: cifs: fix check of rc in function generate_smb3signingkey + +From: Ekaterina Esina + +[ Upstream commit 181724fc72486dec2bec8803459be05b5162aaa8 ] + +Remove extra check after condition, add check after generating key +for encryption. The check is needed to return non zero rc before +rewriting it with generating key for decryption. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Reviewed-by: Paulo Alcantara (SUSE) +Fixes: d70e9fa55884 ("cifs: try opening channels after mounting") +Signed-off-by: Ekaterina Esina +Co-developed-by: Anastasia Belova +Signed-off-by: Anastasia Belova +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/smb/client/smb2transport.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c +index 22954a9c7a6c7..69dbd08fd4419 100644 +--- a/fs/smb/client/smb2transport.c ++++ b/fs/smb/client/smb2transport.c +@@ -451,6 +451,8 @@ generate_smb3signingkey(struct cifs_ses *ses, + ptriplet->encryption.context, + ses->smb3encryptionkey, + SMB3_ENC_DEC_KEY_SIZE); ++ if (rc) ++ return rc; + rc = generate_key(ses, ptriplet->decryption.label, + ptriplet->decryption.context, + ses->smb3decryptionkey, +@@ -459,9 +461,6 @@ generate_smb3signingkey(struct cifs_ses *ses, + return rc; + } + +- if (rc) +- return rc; +- + #ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS + cifs_dbg(VFS, "%s: dumping generated AES session keys\n", __func__); + /* +-- +2.42.0 + diff --git a/queue-6.1/cifs-spnego-add-in-host_key_len.patch b/queue-6.1/cifs-spnego-add-in-host_key_len.patch new file mode 100644 index 00000000000..4b1cd4e8d97 --- /dev/null +++ b/queue-6.1/cifs-spnego-add-in-host_key_len.patch @@ -0,0 +1,43 @@ +From 99036a129802ba0688df3d1a6cf34770ed2f14aa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Nov 2023 17:52:32 +0300 +Subject: cifs: spnego: add ';' in HOST_KEY_LEN + +From: Anastasia Belova + +[ Upstream commit ff31ba19d732efb9aca3633935d71085e68d5076 ] + +"host=" should start with ';' (as in cifs_get_spnego_key) +So its length should be 6. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Reviewed-by: Paulo Alcantara (SUSE) +Fixes: 7c9c3760b3a5 ("[CIFS] add constants for string lengths of keynames in SPNEGO upcall string") +Signed-off-by: Anastasia Belova +Co-developed-by: Ekaterina Esina +Signed-off-by: Ekaterina Esina +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/smb/client/cifs_spnego.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c +index 342717bf1dc28..1e6819daaaa7e 100644 +--- a/fs/smb/client/cifs_spnego.c ++++ b/fs/smb/client/cifs_spnego.c +@@ -64,8 +64,8 @@ struct key_type cifs_spnego_key_type = { + * strlen(";sec=ntlmsspi") */ + #define MAX_MECH_STR_LEN 13 + +-/* strlen of "host=" */ +-#define HOST_KEY_LEN 5 ++/* strlen of ";host=" */ ++#define HOST_KEY_LEN 6 + + /* strlen of ";ip4=" or ";ip6=" */ + #define IP_KEY_LEN 5 +-- +2.42.0 + diff --git a/queue-6.1/clocksource-drivers-timer-atmel-tcb-fix-initializati.patch b/queue-6.1/clocksource-drivers-timer-atmel-tcb-fix-initializati.patch new file mode 100644 index 00000000000..48b40b3622b --- /dev/null +++ b/queue-6.1/clocksource-drivers-timer-atmel-tcb-fix-initializati.patch @@ -0,0 +1,56 @@ +From c60d2ad04ec5e64550a253730e832895bfac57cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 7 Oct 2023 18:17:13 +0200 +Subject: clocksource/drivers/timer-atmel-tcb: Fix initialization on SAM9 + hardware + +From: Ronald Wahl + +[ Upstream commit 6d3bc4c02d59996d1d3180d8ed409a9d7d5900e0 ] + +On SAM9 hardware two cascaded 16 bit timers are used to form a 32 bit +high resolution timer that is used as scheduler clock when the kernel +has been configured that way (CONFIG_ATMEL_CLOCKSOURCE_TCB). + +The driver initially triggers a reset-to-zero of the two timers but this +reset is only performed on the next rising clock. For the first timer +this is ok - it will be in the next 60ns (16MHz clock). For the chained +second timer this will only happen after the first timer overflows, i.e. +after 2^16 clocks (~4ms with a 16MHz clock). So with other words the +scheduler clock resets to 0 after the first 2^16 clock cycles. + +It looks like that the scheduler does not like this and behaves wrongly +over its lifetime, e.g. some tasks are scheduled with a long delay. Why +that is and if there are additional requirements for this behaviour has +not been further analysed. + +There is a simple fix for resetting the second timer as well when the +first timer is reset and this is to set the ATMEL_TC_ASWTRG_SET bit in +the Channel Mode register (CMR) of the first timer. This will also rise +the TIOA line (clock input of the second timer) when a software trigger +respective SYNC is issued. + +Signed-off-by: Ronald Wahl +Acked-by: Alexandre Belloni +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20231007161803.31342-1-rwahl@gmx.de +Signed-off-by: Sasha Levin +--- + drivers/clocksource/timer-atmel-tcb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/clocksource/timer-atmel-tcb.c b/drivers/clocksource/timer-atmel-tcb.c +index 27af17c995900..2a90c92a9182a 100644 +--- a/drivers/clocksource/timer-atmel-tcb.c ++++ b/drivers/clocksource/timer-atmel-tcb.c +@@ -315,6 +315,7 @@ static void __init tcb_setup_dual_chan(struct atmel_tc *tc, int mck_divisor_idx) + writel(mck_divisor_idx /* likely divide-by-8 */ + | ATMEL_TC_WAVE + | ATMEL_TC_WAVESEL_UP /* free-run */ ++ | ATMEL_TC_ASWTRG_SET /* TIOA0 rises at software trigger */ + | ATMEL_TC_ACPA_SET /* TIOA0 rises at 0 */ + | ATMEL_TC_ACPC_CLEAR, /* (duty cycle 50%) */ + tcaddr + ATMEL_TC_REG(0, CMR)); +-- +2.42.0 + diff --git a/queue-6.1/clocksource-drivers-timer-imx-gpt-fix-potential-memo.patch b/queue-6.1/clocksource-drivers-timer-imx-gpt-fix-potential-memo.patch new file mode 100644 index 00000000000..db6989f0cd4 --- /dev/null +++ b/queue-6.1/clocksource-drivers-timer-imx-gpt-fix-potential-memo.patch @@ -0,0 +1,66 @@ +From e14780549c498a6cc0653e2d1fc23e3a8a427a97 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Oct 2023 16:39:22 +0800 +Subject: clocksource/drivers/timer-imx-gpt: Fix potential memory leak + +From: Jacky Bai + +[ Upstream commit 8051a993ce222a5158bccc6ac22ace9253dd71cb ] + +Fix coverity Issue CID 250382: Resource leak (RESOURCE_LEAK). +Add kfree when error return. + +Signed-off-by: Jacky Bai +Reviewed-by: Peng Fan +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20231009083922.1942971-1-ping.bai@nxp.com +Signed-off-by: Sasha Levin +--- + drivers/clocksource/timer-imx-gpt.c | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c +index 7b2c70f2f353b..fabff69e52e58 100644 +--- a/drivers/clocksource/timer-imx-gpt.c ++++ b/drivers/clocksource/timer-imx-gpt.c +@@ -454,12 +454,16 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t + return -ENOMEM; + + imxtm->base = of_iomap(np, 0); +- if (!imxtm->base) +- return -ENXIO; ++ if (!imxtm->base) { ++ ret = -ENXIO; ++ goto err_kfree; ++ } + + imxtm->irq = irq_of_parse_and_map(np, 0); +- if (imxtm->irq <= 0) +- return -EINVAL; ++ if (imxtm->irq <= 0) { ++ ret = -EINVAL; ++ goto err_kfree; ++ } + + imxtm->clk_ipg = of_clk_get_by_name(np, "ipg"); + +@@ -472,11 +476,15 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t + + ret = _mxc_timer_init(imxtm); + if (ret) +- return ret; ++ goto err_kfree; + + initialized = 1; + + return 0; ++ ++err_kfree: ++ kfree(imxtm); ++ return ret; + } + + static int __init imx1_timer_init_dt(struct device_node *np) +-- +2.42.0 + diff --git a/queue-6.1/cpu-hotplug-don-t-offline-the-last-non-isolated-cpu.patch b/queue-6.1/cpu-hotplug-don-t-offline-the-last-non-isolated-cpu.patch new file mode 100644 index 00000000000..de8f6e2b16b --- /dev/null +++ b/queue-6.1/cpu-hotplug-don-t-offline-the-last-non-isolated-cpu.patch @@ -0,0 +1,75 @@ +From e9a6a3bb0cda0ecc42a34cfcb6f809bf5b4ff88b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Oct 2023 17:09:53 +0800 +Subject: cpu/hotplug: Don't offline the last non-isolated CPU + +From: Ran Xiaokai + +[ Upstream commit 38685e2a0476127db766f81b1c06019ddc4c9ffa ] + +If a system has isolated CPUs via the "isolcpus=" command line parameter, +then an attempt to offline the last housekeeping CPU will result in a +WARN_ON() when rebuilding the scheduler domains and a subsequent panic due +to and unhandled empty CPU mas in partition_sched_domains_locked(). + +cpuset_hotplug_workfn() + rebuild_sched_domains_locked() + ndoms = generate_sched_domains(&doms, &attr); + cpumask_and(doms[0], top_cpuset.effective_cpus, housekeeping_cpumask(HK_FLAG_DOMAIN)); + +Thus results in an empty CPU mask which triggers the warning and then the +subsequent crash: + +WARNING: CPU: 4 PID: 80 at kernel/sched/topology.c:2366 build_sched_domains+0x120c/0x1408 +Call trace: + build_sched_domains+0x120c/0x1408 + partition_sched_domains_locked+0x234/0x880 + rebuild_sched_domains_locked+0x37c/0x798 + rebuild_sched_domains+0x30/0x58 + cpuset_hotplug_workfn+0x2a8/0x930 + +Unable to handle kernel paging request at virtual address fffe80027ab37080 + partition_sched_domains_locked+0x318/0x880 + rebuild_sched_domains_locked+0x37c/0x798 + +Aside of the resulting crash, it does not make any sense to offline the last +last housekeeping CPU. + +Prevent this by masking out the non-housekeeping CPUs when selecting a +target CPU for initiating the CPU unplug operation via the work queue. + +Suggested-by: Thomas Gleixner +Signed-off-by: Ran Xiaokai +Signed-off-by: Thomas Gleixner +Link: https://lore.kernel.org/r/202310171709530660462@zte.com.cn +Signed-off-by: Sasha Levin +--- + kernel/cpu.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/kernel/cpu.c b/kernel/cpu.c +index f8eb1825f704f..0e4d362e90825 100644 +--- a/kernel/cpu.c ++++ b/kernel/cpu.c +@@ -1243,11 +1243,14 @@ static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target) + /* + * Ensure that the control task does not run on the to be offlined + * CPU to prevent a deadlock against cfs_b->period_timer. ++ * Also keep at least one housekeeping cpu onlined to avoid generating ++ * an empty sched_domain span. + */ +- cpu = cpumask_any_but(cpu_online_mask, cpu); +- if (cpu >= nr_cpu_ids) +- return -EBUSY; +- return work_on_cpu(cpu, __cpu_down_maps_locked, &work); ++ for_each_cpu_and(cpu, cpu_online_mask, housekeeping_cpumask(HK_TYPE_DOMAIN)) { ++ if (cpu != work.cpu) ++ return work_on_cpu(cpu, __cpu_down_maps_locked, &work); ++ } ++ return -EBUSY; + } + + static int cpu_down(unsigned int cpu, enum cpuhp_state target) +-- +2.42.0 + diff --git a/queue-6.1/crypto-hisilicon-qm-prevent-soft-lockup-in-receive-l.patch b/queue-6.1/crypto-hisilicon-qm-prevent-soft-lockup-in-receive-l.patch new file mode 100644 index 00000000000..901d98f42eb --- /dev/null +++ b/queue-6.1/crypto-hisilicon-qm-prevent-soft-lockup-in-receive-l.patch @@ -0,0 +1,60 @@ +From 3e1e6bb783977ef2d101ed20a494c7928646540c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Oct 2023 17:35:58 +0800 +Subject: crypto: hisilicon/qm - prevent soft lockup in receive loop + +From: Longfang Liu + +[ Upstream commit 33fc506d2ac514be1072499a263c3bff8c7c95a0 ] + +In the scenario where the accelerator business is fully loaded. +When the workqueue receiving messages and performing callback +processing, there are a large number of messages that need to be +received, and there are continuously messages that have been +processed and need to be received. +This will cause the receive loop here to be locked for a long time. +This scenario will cause watchdog timeout problems on OS with kernel +preemption turned off. + +The error logs: +watchdog: BUG: soft lockup - CPU#23 stuck for 23s! [kworker/u262:1:1407] +[ 1461.978428][ C23] Call trace: +[ 1461.981890][ C23] complete+0x8c/0xf0 +[ 1461.986031][ C23] kcryptd_async_done+0x154/0x1f4 [dm_crypt] +[ 1461.992154][ C23] sec_skcipher_callback+0x7c/0xf4 [hisi_sec2] +[ 1461.998446][ C23] sec_req_cb+0x104/0x1f4 [hisi_sec2] +[ 1462.003950][ C23] qm_poll_req_cb+0xcc/0x150 [hisi_qm] +[ 1462.009531][ C23] qm_work_process+0x60/0xc0 [hisi_qm] +[ 1462.015101][ C23] process_one_work+0x1c4/0x470 +[ 1462.020052][ C23] worker_thread+0x150/0x3c4 +[ 1462.024735][ C23] kthread+0x108/0x13c +[ 1462.028889][ C23] ret_from_fork+0x10/0x18 + +Therefore, it is necessary to add an actively scheduled operation in the +while loop to prevent this problem. +After adding it, no matter whether the OS turns on or off the kernel +preemption function. Neither will cause watchdog timeout issues. + +Signed-off-by: Longfang Liu +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/hisilicon/qm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c +index a4a3895c74181..f9acf7ecc41be 100644 +--- a/drivers/crypto/hisilicon/qm.c ++++ b/drivers/crypto/hisilicon/qm.c +@@ -841,6 +841,8 @@ static void qm_poll_req_cb(struct hisi_qp *qp) + qm_db(qm, qp->qp_id, QM_DOORBELL_CMD_CQ, + qp->qp_status.cq_head, 0); + atomic_dec(&qp->qp_status.used); ++ ++ cond_resched(); + } + + /* set c_flag */ +-- +2.42.0 + diff --git a/queue-6.1/crypto-pcrypt-fix-hungtask-for-padata_reset.patch b/queue-6.1/crypto-pcrypt-fix-hungtask-for-padata_reset.patch new file mode 100644 index 00000000000..f9b2ad7de6c --- /dev/null +++ b/queue-6.1/crypto-pcrypt-fix-hungtask-for-padata_reset.patch @@ -0,0 +1,106 @@ +From 49938dec7e0b4d27d21e2be0fafb8c145dcf043e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Sep 2023 13:33:41 +0000 +Subject: crypto: pcrypt - Fix hungtask for PADATA_RESET + +From: Lu Jialin + +[ Upstream commit 8f4f68e788c3a7a696546291258bfa5fdb215523 ] + +We found a hungtask bug in test_aead_vec_cfg as follows: + +INFO: task cryptomgr_test:391009 blocked for more than 120 seconds. +"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +Call trace: + __switch_to+0x98/0xe0 + __schedule+0x6c4/0xf40 + schedule+0xd8/0x1b4 + schedule_timeout+0x474/0x560 + wait_for_common+0x368/0x4e0 + wait_for_completion+0x20/0x30 + wait_for_completion+0x20/0x30 + test_aead_vec_cfg+0xab4/0xd50 + test_aead+0x144/0x1f0 + alg_test_aead+0xd8/0x1e0 + alg_test+0x634/0x890 + cryptomgr_test+0x40/0x70 + kthread+0x1e0/0x220 + ret_from_fork+0x10/0x18 + Kernel panic - not syncing: hung_task: blocked tasks + +For padata_do_parallel, when the return err is 0 or -EBUSY, it will call +wait_for_completion(&wait->completion) in test_aead_vec_cfg. In normal +case, aead_request_complete() will be called in pcrypt_aead_serial and the +return err is 0 for padata_do_parallel. But, when pinst->flags is +PADATA_RESET, the return err is -EBUSY for padata_do_parallel, and it +won't call aead_request_complete(). Therefore, test_aead_vec_cfg will +hung at wait_for_completion(&wait->completion), which will cause +hungtask. + +The problem comes as following: +(padata_do_parallel) | + rcu_read_lock_bh(); | + err = -EINVAL; | (padata_replace) + | pinst->flags |= PADATA_RESET; + err = -EBUSY | + if (pinst->flags & PADATA_RESET) | + rcu_read_unlock_bh() | + return err + +In order to resolve the problem, we replace the return err -EBUSY with +-EAGAIN, which means parallel_data is changing, and the caller should call +it again. + +v3: +remove retry and just change the return err. +v2: +introduce padata_try_do_parallel() in pcrypt_aead_encrypt and +pcrypt_aead_decrypt to solve the hungtask. + +Signed-off-by: Lu Jialin +Signed-off-by: Guo Zihua +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + crypto/pcrypt.c | 4 ++++ + kernel/padata.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c +index 9d10b846ccf73..005a36cb21bc4 100644 +--- a/crypto/pcrypt.c ++++ b/crypto/pcrypt.c +@@ -117,6 +117,8 @@ static int pcrypt_aead_encrypt(struct aead_request *req) + err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu); + if (!err) + return -EINPROGRESS; ++ if (err == -EBUSY) ++ return -EAGAIN; + + return err; + } +@@ -164,6 +166,8 @@ static int pcrypt_aead_decrypt(struct aead_request *req) + err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu); + if (!err) + return -EINPROGRESS; ++ if (err == -EBUSY) ++ return -EAGAIN; + + return err; + } +diff --git a/kernel/padata.c b/kernel/padata.c +index 791d9cb07a501..7bef7dae3db54 100644 +--- a/kernel/padata.c ++++ b/kernel/padata.c +@@ -194,7 +194,7 @@ int padata_do_parallel(struct padata_shell *ps, + *cb_cpu = cpu; + } + +- err = -EBUSY; ++ err = -EBUSY; + if ((pinst->flags & PADATA_RESET)) + goto out; + +-- +2.42.0 + diff --git a/queue-6.1/drm-amd-display-avoid-null-dereference-of-timing-gen.patch b/queue-6.1/drm-amd-display-avoid-null-dereference-of-timing-gen.patch new file mode 100644 index 00000000000..4fc9e35d44a --- /dev/null +++ b/queue-6.1/drm-amd-display-avoid-null-dereference-of-timing-gen.patch @@ -0,0 +1,48 @@ +From a05396c9e8820a3d3bdb22a681ae147a5591a5b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Sep 2023 10:14:49 +0800 +Subject: drm/amd/display: Avoid NULL dereference of timing generator + +From: Wayne Lin + +[ Upstream commit b1904ed480cee3f9f4036ea0e36d139cb5fee2d6 ] + +[Why & How] +Check whether assigned timing generator is NULL or not before +accessing its funcs to prevent NULL dereference. + +Reviewed-by: Jun Lei +Acked-by: Hersen Wu +Signed-off-by: Wayne Lin +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +index 38d71b5c1f2d5..556c57c390ffd 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +@@ -567,7 +567,7 @@ uint32_t dc_stream_get_vblank_counter(const struct dc_stream_state *stream) + for (i = 0; i < MAX_PIPES; i++) { + struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg; + +- if (res_ctx->pipe_ctx[i].stream != stream) ++ if (res_ctx->pipe_ctx[i].stream != stream || !tg) + continue; + + return tg->funcs->get_frame_count(tg); +@@ -626,7 +626,7 @@ bool dc_stream_get_scanoutpos(const struct dc_stream_state *stream, + for (i = 0; i < MAX_PIPES; i++) { + struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg; + +- if (res_ctx->pipe_ctx[i].stream != stream) ++ if (res_ctx->pipe_ctx[i].stream != stream || !tg) + continue; + + tg->funcs->get_scanoutpos(tg, +-- +2.42.0 + diff --git a/queue-6.1/drm-amd-display-use-full-update-for-clip-size-increa.patch b/queue-6.1/drm-amd-display-use-full-update-for-clip-size-increa.patch new file mode 100644 index 00000000000..cd7bcb0790d --- /dev/null +++ b/queue-6.1/drm-amd-display-use-full-update-for-clip-size-increa.patch @@ -0,0 +1,93 @@ +From 903e32e28d3e936e388ee8872b4a297384d53471 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 14:43:21 -0400 +Subject: drm/amd/display: use full update for clip size increase of large + plane source + +From: Wenjing Liu + +[ Upstream commit 05b78277ef0efc1deebc8a22384fffec29a3676e ] + +[why] +Clip size increase will increase viewport, which could cause us to +switch to MPC combine. +If we skip full update, we are not able to change to MPC combine in +fast update. This will cause corruption showing on the video plane. + +[how] +treat clip size increase of a surface larger than 5k as a full update. + +Reviewed-by: Jun Lei +Acked-by: Aurabindo Pillai +Signed-off-by: Wenjing Liu +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 12 ++++++++++-- + drivers/gpu/drm/amd/display/dc/dc.h | 5 +++++ + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 15d3caf3d6d72..9d321f4f486e2 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -996,7 +996,8 @@ static bool dc_construct(struct dc *dc, + /* set i2c speed if not done by the respective dcnxxx__resource.c */ + if (dc->caps.i2c_speed_in_khz_hdcp == 0) + dc->caps.i2c_speed_in_khz_hdcp = dc->caps.i2c_speed_in_khz; +- ++ if (dc->caps.max_optimizable_video_width == 0) ++ dc->caps.max_optimizable_video_width = 5120; + dc->clk_mgr = dc_clk_mgr_create(dc->ctx, dc->res_pool->pp_smu, dc->res_pool->dccg); + if (!dc->clk_mgr) + goto fail; +@@ -2438,6 +2439,7 @@ static enum surface_update_type get_plane_info_update_type(const struct dc_surfa + } + + static enum surface_update_type get_scaling_info_update_type( ++ const struct dc *dc, + const struct dc_surface_update *u) + { + union surface_update_flags *update_flags = &u->surface->update_flags; +@@ -2472,6 +2474,12 @@ static enum surface_update_type get_scaling_info_update_type( + update_flags->bits.clock_change = 1; + } + ++ if (u->scaling_info->src_rect.width > dc->caps.max_optimizable_video_width && ++ (u->scaling_info->clip_rect.width > u->surface->clip_rect.width || ++ u->scaling_info->clip_rect.height > u->surface->clip_rect.height)) ++ /* Changing clip size of a large surface may result in MPC slice count change */ ++ update_flags->bits.bandwidth_change = 1; ++ + if (u->scaling_info->src_rect.x != u->surface->src_rect.x + || u->scaling_info->src_rect.y != u->surface->src_rect.y + || u->scaling_info->clip_rect.x != u->surface->clip_rect.x +@@ -2509,7 +2517,7 @@ static enum surface_update_type det_surface_update(const struct dc *dc, + type = get_plane_info_update_type(u); + elevate_update_type(&overall_type, type); + +- type = get_scaling_info_update_type(u); ++ type = get_scaling_info_update_type(dc, u); + elevate_update_type(&overall_type, type); + + if (u->flip_addr) { +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index a4540f83aae59..f773a467fef54 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -230,6 +230,11 @@ struct dc_caps { + uint32_t dmdata_alloc_size; + unsigned int max_cursor_size; + unsigned int max_video_width; ++ /* ++ * max video plane width that can be safely assumed to be always ++ * supported by single DPP pipe. ++ */ ++ unsigned int max_optimizable_video_width; + unsigned int min_horizontal_blanking_period; + int linear_pitch_alignment; + bool dcc_const_color; +-- +2.42.0 + diff --git a/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch b/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch new file mode 100644 index 00000000000..61314d539ca --- /dev/null +++ b/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch @@ -0,0 +1,81 @@ +From ef9eece57e4a2cbaeacdab10009ec80db543c2ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Oct 2023 15:46:44 -0500 +Subject: drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga + +From: Mario Limonciello + +[ Upstream commit 0f0e59075b5c22f1e871fbd508d6e4f495048356 ] + +For pptable structs that use flexible array sizes, use flexible arrays. + +Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742 +Signed-off-by: Mario Limonciello +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h +index 41444e27bfc0c..e0e40b054c08b 100644 +--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h ++++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h +@@ -164,7 +164,7 @@ typedef struct _ATOM_Tonga_State { + typedef struct _ATOM_Tonga_State_Array { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_State entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_State entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_State_Array; + + typedef struct _ATOM_Tonga_MCLK_Dependency_Record { +@@ -210,7 +210,7 @@ typedef struct _ATOM_Polaris_SCLK_Dependency_Record { + typedef struct _ATOM_Polaris_SCLK_Dependency_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Polaris_SCLK_Dependency_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Polaris_SCLK_Dependency_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Polaris_SCLK_Dependency_Table; + + typedef struct _ATOM_Tonga_PCIE_Record { +@@ -222,7 +222,7 @@ typedef struct _ATOM_Tonga_PCIE_Record { + typedef struct _ATOM_Tonga_PCIE_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_PCIE_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_PCIE_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_PCIE_Table; + + typedef struct _ATOM_Polaris10_PCIE_Record { +@@ -235,7 +235,7 @@ typedef struct _ATOM_Polaris10_PCIE_Record { + typedef struct _ATOM_Polaris10_PCIE_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Polaris10_PCIE_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Polaris10_PCIE_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Polaris10_PCIE_Table; + + +@@ -252,7 +252,7 @@ typedef struct _ATOM_Tonga_MM_Dependency_Record { + typedef struct _ATOM_Tonga_MM_Dependency_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_MM_Dependency_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_MM_Dependency_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_MM_Dependency_Table; + + typedef struct _ATOM_Tonga_Voltage_Lookup_Record { +@@ -265,7 +265,7 @@ typedef struct _ATOM_Tonga_Voltage_Lookup_Record { + typedef struct _ATOM_Tonga_Voltage_Lookup_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_Voltage_Lookup_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_Voltage_Lookup_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_Voltage_Lookup_Table; + + typedef struct _ATOM_Tonga_Fan_Table { +-- +2.42.0 + diff --git a/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch b/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch new file mode 100644 index 00000000000..f7798c18d09 --- /dev/null +++ b/queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch @@ -0,0 +1,69 @@ +From 90f5ec723d8ce084407803e25e9f49f221c4af1d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Oct 2023 15:22:52 -0500 +Subject: drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 + +From: Mario Limonciello + +[ Upstream commit 760efbca74a405dc439a013a5efaa9fadc95a8c3 ] + +For pptable structs that use flexible array sizes, use flexible arrays. + +Suggested-by: Felix Held +Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2874 +Signed-off-by: Mario Limonciello +Acked-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/include/pptable.h | 4 ++-- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/include/pptable.h b/drivers/gpu/drm/amd/include/pptable.h +index 0b6a057e0a4c4..5aac8d545bdc6 100644 +--- a/drivers/gpu/drm/amd/include/pptable.h ++++ b/drivers/gpu/drm/amd/include/pptable.h +@@ -78,7 +78,7 @@ typedef struct _ATOM_PPLIB_THERMALCONTROLLER + typedef struct _ATOM_PPLIB_STATE + { + UCHAR ucNonClockStateIndex; +- UCHAR ucClockStateIndices[1]; // variable-sized ++ UCHAR ucClockStateIndices[]; // variable-sized + } ATOM_PPLIB_STATE; + + +@@ -473,7 +473,7 @@ typedef struct _ATOM_PPLIB_STATE_V2 + /** + * Driver will read the first ucNumDPMLevels in this array + */ +- UCHAR clockInfoIndex[1]; ++ UCHAR clockInfoIndex[]; + } ATOM_PPLIB_STATE_V2; + + typedef struct _StateArray{ +diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h +index b0ac4d121adca..41444e27bfc0c 100644 +--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h ++++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h +@@ -179,7 +179,7 @@ typedef struct _ATOM_Tonga_MCLK_Dependency_Record { + typedef struct _ATOM_Tonga_MCLK_Dependency_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_MCLK_Dependency_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_MCLK_Dependency_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_MCLK_Dependency_Table; + + typedef struct _ATOM_Tonga_SCLK_Dependency_Record { +@@ -194,7 +194,7 @@ typedef struct _ATOM_Tonga_SCLK_Dependency_Record { + typedef struct _ATOM_Tonga_SCLK_Dependency_Table { + UCHAR ucRevId; + UCHAR ucNumEntries; /* Number of entries. */ +- ATOM_Tonga_SCLK_Dependency_Record entries[1]; /* Dynamically allocate entries. */ ++ ATOM_Tonga_SCLK_Dependency_Record entries[]; /* Dynamically allocate entries. */ + } ATOM_Tonga_SCLK_Dependency_Table; + + typedef struct _ATOM_Polaris_SCLK_Dependency_Record { +-- +2.42.0 + diff --git a/queue-6.1/drm-amd-update-update_pcie_parameters-functions-to-u.patch b/queue-6.1/drm-amd-update-update_pcie_parameters-functions-to-u.patch new file mode 100644 index 00000000000..25ec04af462 --- /dev/null +++ b/queue-6.1/drm-amd-update-update_pcie_parameters-functions-to-u.patch @@ -0,0 +1,127 @@ +From 3604d067e4610b988beb85604c4d7c7871aef286 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 29 Sep 2023 22:12:18 -0500 +Subject: drm/amd: Update `update_pcie_parameters` functions to use uint8_t + arguments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mario Limonciello + +[ Upstream commit 7752ccf85b929a22e658ec145283e8f31232f4bb ] + +The matching values for `pcie_gen_cap` and `pcie_width_cap` when +fetched from powerplay tables are 1 byte, so narrow the arguments +to match to ensure min() and max() comparisons without casts. + +Signed-off-by: Mario Limonciello +Acked-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 ++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 4 ++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 ++++---- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +index a664a0a284784..47ff3694ffa57 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +@@ -1221,7 +1221,7 @@ static int smu_smc_hw_setup(struct smu_context *smu) + { + struct smu_feature *feature = &smu->smu_feature; + struct amdgpu_device *adev = smu->adev; +- uint32_t pcie_gen = 0, pcie_width = 0; ++ uint8_t pcie_gen = 0, pcie_width = 0; + uint64_t features_supported; + int ret = 0; + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +index 1ab77a6cdb653..4174cb295dd0b 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +@@ -844,7 +844,7 @@ struct pptable_funcs { + * &pcie_gen_cap: Maximum allowed PCIe generation. + * &pcie_width_cap: Maximum allowed PCIe width. + */ +- int (*update_pcie_parameters)(struct smu_context *smu, uint32_t pcie_gen_cap, uint32_t pcie_width_cap); ++ int (*update_pcie_parameters)(struct smu_context *smu, uint8_t pcie_gen_cap, uint8_t pcie_width_cap); + + /** + * @i2c_init: Initialize i2c. +diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +index d6479a8088554..636b9579b96b0 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h ++++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +@@ -298,8 +298,8 @@ int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu, + uint32_t pptable_id); + + int smu_v13_0_update_pcie_parameters(struct smu_context *smu, +- uint32_t pcie_gen_cap, +- uint32_t pcie_width_cap); ++ uint8_t pcie_gen_cap, ++ uint8_t pcie_width_cap); + + #endif + #endif +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +index ca278280865fa..ed2112efc6c68 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +@@ -2368,8 +2368,8 @@ static int navi10_get_power_limit(struct smu_context *smu, + } + + static int navi10_update_pcie_parameters(struct smu_context *smu, +- uint32_t pcie_gen_cap, +- uint32_t pcie_width_cap) ++ uint8_t pcie_gen_cap, ++ uint8_t pcie_width_cap) + { + struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context; + PPTable_t *pptable = smu->smu_table.driver_pptable; +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +index fbc4d706748b7..cfd41d56e9701 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +@@ -2084,14 +2084,14 @@ static int sienna_cichlid_display_disable_memory_clock_switch(struct smu_context + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + + static int sienna_cichlid_update_pcie_parameters(struct smu_context *smu, +- uint32_t pcie_gen_cap, +- uint32_t pcie_width_cap) ++ uint8_t pcie_gen_cap, ++ uint8_t pcie_width_cap) + { + struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context; + struct smu_11_0_pcie_table *pcie_table = &dpm_context->dpm_tables.pcie_table; + uint8_t *table_member1, *table_member2; +- uint32_t min_gen_speed, max_gen_speed; +- uint32_t min_lane_width, max_lane_width; ++ uint8_t min_gen_speed, max_gen_speed; ++ uint8_t min_lane_width, max_lane_width; + uint32_t smu_pcie_arg; + int ret, i; + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +index 3104d49379090..1b0fb93539ec4 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +@@ -2486,8 +2486,8 @@ int smu_v13_0_mode1_reset(struct smu_context *smu) + } + + int smu_v13_0_update_pcie_parameters(struct smu_context *smu, +- uint32_t pcie_gen_cap, +- uint32_t pcie_width_cap) ++ uint8_t pcie_gen_cap, ++ uint8_t pcie_width_cap) + { + struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context; + struct smu_13_0_pcie_table *pcie_table = +-- +2.42.0 + diff --git a/queue-6.1/drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch b/queue-6.1/drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch new file mode 100644 index 00000000000..e196a1d6b8b --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch @@ -0,0 +1,105 @@ +From 98b12007a0915871efbbd559112f8e55311afbdb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Oct 2023 12:56:37 +0000 +Subject: drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is + NULL + +From: Qu Huang + +[ Upstream commit 5104fdf50d326db2c1a994f8b35dcd46e63ae4ad ] + +In certain types of chips, such as VEGA20, reading the amdgpu_regs_smc file could result in an abnormal null pointer access when the smc_rreg pointer is NULL. Below are the steps to reproduce this issue and the corresponding exception log: + +1. Navigate to the directory: /sys/kernel/debug/dri/0 +2. Execute command: cat amdgpu_regs_smc +3. Exception Log:: +[4005007.702554] BUG: kernel NULL pointer dereference, address: 0000000000000000 +[4005007.702562] #PF: supervisor instruction fetch in kernel mode +[4005007.702567] #PF: error_code(0x0010) - not-present page +[4005007.702570] PGD 0 P4D 0 +[4005007.702576] Oops: 0010 [#1] SMP NOPTI +[4005007.702581] CPU: 4 PID: 62563 Comm: cat Tainted: G OE 5.15.0-43-generic #46-Ubunt u +[4005007.702590] RIP: 0010:0x0 +[4005007.702598] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. +[4005007.702600] RSP: 0018:ffffa82b46d27da0 EFLAGS: 00010206 +[4005007.702605] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffa82b46d27e68 +[4005007.702609] RDX: 0000000000000001 RSI: 0000000000000000 RDI: ffff9940656e0000 +[4005007.702612] RBP: ffffa82b46d27dd8 R08: 0000000000000000 R09: ffff994060c07980 +[4005007.702615] R10: 0000000000020000 R11: 0000000000000000 R12: 00007f5e06753000 +[4005007.702618] R13: ffff9940656e0000 R14: ffffa82b46d27e68 R15: 00007f5e06753000 +[4005007.702622] FS: 00007f5e0755b740(0000) GS:ffff99479d300000(0000) knlGS:0000000000000000 +[4005007.702626] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[4005007.702629] CR2: ffffffffffffffd6 CR3: 00000003253fc000 CR4: 00000000003506e0 +[4005007.702633] Call Trace: +[4005007.702636] +[4005007.702640] amdgpu_debugfs_regs_smc_read+0xb0/0x120 [amdgpu] +[4005007.703002] full_proxy_read+0x5c/0x80 +[4005007.703011] vfs_read+0x9f/0x1a0 +[4005007.703019] ksys_read+0x67/0xe0 +[4005007.703023] __x64_sys_read+0x19/0x20 +[4005007.703028] do_syscall_64+0x5c/0xc0 +[4005007.703034] ? do_user_addr_fault+0x1e3/0x670 +[4005007.703040] ? exit_to_user_mode_prepare+0x37/0xb0 +[4005007.703047] ? irqentry_exit_to_user_mode+0x9/0x20 +[4005007.703052] ? irqentry_exit+0x19/0x30 +[4005007.703057] ? exc_page_fault+0x89/0x160 +[4005007.703062] ? asm_exc_page_fault+0x8/0x30 +[4005007.703068] entry_SYSCALL_64_after_hwframe+0x44/0xae +[4005007.703075] RIP: 0033:0x7f5e07672992 +[4005007.703079] Code: c0 e9 b2 fe ff ff 50 48 8d 3d fa b2 0c 00 e8 c5 1d 02 00 0f 1f 44 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 0f 05 <48> 3d 00 f0 ff ff 77 56 c3 0f 1f 44 00 00 48 83 e c 28 48 89 54 24 +[4005007.703083] RSP: 002b:00007ffe03097898 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 +[4005007.703088] RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007f5e07672992 +[4005007.703091] RDX: 0000000000020000 RSI: 00007f5e06753000 RDI: 0000000000000003 +[4005007.703094] RBP: 00007f5e06753000 R08: 00007f5e06752010 R09: 00007f5e06752010 +[4005007.703096] R10: 0000000000000022 R11: 0000000000000246 R12: 0000000000022000 +[4005007.703099] R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000 +[4005007.703105] +[4005007.703107] Modules linked in: nf_tables libcrc32c nfnetlink algif_hash af_alg binfmt_misc nls_ iso8859_1 ipmi_ssif ast intel_rapl_msr intel_rapl_common drm_vram_helper drm_ttm_helper amd64_edac t tm edac_mce_amd kvm_amd ccp mac_hid k10temp kvm acpi_ipmi ipmi_si rapl sch_fq_codel ipmi_devintf ipm i_msghandler msr parport_pc ppdev lp parport mtd pstore_blk efi_pstore ramoops pstore_zone reed_solo mon ip_tables x_tables autofs4 ib_uverbs ib_core amdgpu(OE) amddrm_ttm_helper(OE) amdttm(OE) iommu_v 2 amd_sched(OE) amdkcl(OE) drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec rc_core drm igb ahci xhci_pci libahci i2c_piix4 i2c_algo_bit xhci_pci_renesas dca +[4005007.703184] CR2: 0000000000000000 +[4005007.703188] ---[ end trace ac65a538d240da39 ]--- +[4005007.800865] RIP: 0010:0x0 +[4005007.800871] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. +[4005007.800874] RSP: 0018:ffffa82b46d27da0 EFLAGS: 00010206 +[4005007.800878] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffa82b46d27e68 +[4005007.800881] RDX: 0000000000000001 RSI: 0000000000000000 RDI: ffff9940656e0000 +[4005007.800883] RBP: ffffa82b46d27dd8 R08: 0000000000000000 R09: ffff994060c07980 +[4005007.800886] R10: 0000000000020000 R11: 0000000000000000 R12: 00007f5e06753000 +[4005007.800888] R13: ffff9940656e0000 R14: ffffa82b46d27e68 R15: 00007f5e06753000 +[4005007.800891] FS: 00007f5e0755b740(0000) GS:ffff99479d300000(0000) knlGS:0000000000000000 +[4005007.800895] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[4005007.800898] CR2: ffffffffffffffd6 CR3: 00000003253fc000 CR4: 00000000003506e0 + +Signed-off-by: Qu Huang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +index de61a85c4b022..fd796574f87a5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +@@ -589,6 +589,9 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, + ssize_t result = 0; + int r; + ++ if (!adev->smc_rreg) ++ return -EPERM; ++ + if (size & 0x3 || *pos & 0x3) + return -EINVAL; + +@@ -645,6 +648,9 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * + ssize_t result = 0; + int r; + ++ if (!adev->smc_wreg) ++ return -EPERM; ++ + if (size & 0x3 || *pos & 0x3) + return -EINVAL; + +-- +2.42.0 + diff --git a/queue-6.1/drm-amdgpu-fix-potential-null-pointer-derefernce.patch b/queue-6.1/drm-amdgpu-fix-potential-null-pointer-derefernce.patch new file mode 100644 index 00000000000..e2dae64231a --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-potential-null-pointer-derefernce.patch @@ -0,0 +1,37 @@ +From c6a3fb85bb20b0dda84b4f044d3b5e38e6a61fb9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Sep 2023 16:22:29 +0800 +Subject: drm/amdgpu: Fix potential null pointer derefernce + +From: Stanley.Yang + +[ Upstream commit 80285ae1ec8717b597b20de38866c29d84d321a1 ] + +The amdgpu_ras_get_context may return NULL if device +not support ras feature, so add check before using. + +Signed-off-by: Stanley.Yang +Reviewed-by: Tao Zhou +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 92fa2faf63e41..dc61cc1659326 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -5330,7 +5330,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, + * Flush RAM to disk so that after reboot + * the user can read log and see why the system rebooted. + */ +- if (need_emergency_restart && amdgpu_ras_get_context(adev)->reboot) { ++ if (need_emergency_restart && amdgpu_ras_get_context(adev) && ++ amdgpu_ras_get_context(adev)->reboot) { + DRM_WARN("Emergency reboot."); + + ksys_sync_helper(); +-- +2.42.0 + diff --git a/queue-6.1/drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch b/queue-6.1/drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch new file mode 100644 index 00000000000..c4ddff5443a --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch @@ -0,0 +1,103 @@ +From f6ca90a3d8460e033794035bf0c1bedf6f90fb99 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 19:31:48 -0400 +Subject: drm/amdgpu: fix software pci_unplug on some chips + +From: Vitaly Prosyak + +[ Upstream commit 4638e0c29a3f2294d5de0d052a4b8c9f33ccb957 ] + +When software 'pci unplug' using IGT is executed we got a sysfs directory +entry is NULL for differant ras blocks like hdp, umc, etc. +Before call 'sysfs_remove_file_from_group' and 'sysfs_remove_group' +check that 'sd' is not NULL. + +[ +0.000001] RIP: 0010:sysfs_remove_group+0x83/0x90 +[ +0.000002] Code: 31 c0 31 d2 31 f6 31 ff e9 9a a8 b4 00 4c 89 e7 e8 f2 a2 ff ff eb c2 49 8b 55 00 48 8b 33 48 c7 c7 80 65 94 82 e8 cd 82 bb ff <0f> 0b eb cc 66 0f 1f 84 00 00 00 00 00 90 90 90 90 90 90 90 90 90 +[ +0.000001] RSP: 0018:ffffc90002067c90 EFLAGS: 00010246 +[ +0.000002] RAX: 0000000000000000 RBX: ffffffff824ea180 RCX: 0000000000000000 +[ +0.000001] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 +[ +0.000001] RBP: ffffc90002067ca8 R08: 0000000000000000 R09: 0000000000000000 +[ +0.000001] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 +[ +0.000001] R13: ffff88810a395f48 R14: ffff888101aab0d0 R15: 0000000000000000 +[ +0.000001] FS: 00007f5ddaa43a00(0000) GS:ffff88841e800000(0000) knlGS:0000000000000000 +[ +0.000002] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ +0.000001] CR2: 00007f8ffa61ba50 CR3: 0000000106432000 CR4: 0000000000350ef0 +[ +0.000001] Call Trace: +[ +0.000001] +[ +0.000001] ? show_regs+0x72/0x90 +[ +0.000002] ? sysfs_remove_group+0x83/0x90 +[ +0.000002] ? __warn+0x8d/0x160 +[ +0.000001] ? sysfs_remove_group+0x83/0x90 +[ +0.000001] ? report_bug+0x1bb/0x1d0 +[ +0.000003] ? handle_bug+0x46/0x90 +[ +0.000001] ? exc_invalid_op+0x19/0x80 +[ +0.000002] ? asm_exc_invalid_op+0x1b/0x20 +[ +0.000003] ? sysfs_remove_group+0x83/0x90 +[ +0.000001] dpm_sysfs_remove+0x61/0x70 +[ +0.000002] device_del+0xa3/0x3d0 +[ +0.000002] ? ktime_get_mono_fast_ns+0x46/0xb0 +[ +0.000002] device_unregister+0x18/0x70 +[ +0.000001] i2c_del_adapter+0x26d/0x330 +[ +0.000002] arcturus_i2c_control_fini+0x25/0x50 [amdgpu] +[ +0.000236] smu_sw_fini+0x38/0x260 [amdgpu] +[ +0.000241] amdgpu_device_fini_sw+0x116/0x670 [amdgpu] +[ +0.000186] ? mutex_lock+0x13/0x50 +[ +0.000003] amdgpu_driver_release_kms+0x16/0x40 [amdgpu] +[ +0.000192] drm_minor_release+0x4f/0x80 [drm] +[ +0.000025] drm_release+0xfe/0x150 [drm] +[ +0.000027] __fput+0x9f/0x290 +[ +0.000002] ____fput+0xe/0x20 +[ +0.000002] task_work_run+0x61/0xa0 +[ +0.000002] exit_to_user_mode_prepare+0x150/0x170 +[ +0.000002] syscall_exit_to_user_mode+0x2a/0x50 + +Cc: Hawking Zhang +Cc: Luben Tuikov +Cc: Alex Deucher +Cc: Christian Koenig +Signed-off-by: Vitaly Prosyak +Reviewed-by: Luben Tuikov +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +index 09fc464f5f128..9fe2eae88ec17 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +@@ -1273,7 +1273,8 @@ static void amdgpu_ras_sysfs_remove_bad_page_node(struct amdgpu_device *adev) + { + struct amdgpu_ras *con = amdgpu_ras_get_context(adev); + +- sysfs_remove_file_from_group(&adev->dev->kobj, ++ if (adev->dev->kobj.sd) ++ sysfs_remove_file_from_group(&adev->dev->kobj, + &con->badpages_attr.attr, + RAS_FS_NAME); + } +@@ -1290,7 +1291,8 @@ static int amdgpu_ras_sysfs_remove_feature_node(struct amdgpu_device *adev) + .attrs = attrs, + }; + +- sysfs_remove_group(&adev->dev->kobj, &group); ++ if (adev->dev->kobj.sd) ++ sysfs_remove_group(&adev->dev->kobj, &group); + + return 0; + } +@@ -1337,7 +1339,8 @@ int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev, + if (!obj || !obj->attr_inuse) + return -EINVAL; + +- sysfs_remove_file_from_group(&adev->dev->kobj, ++ if (adev->dev->kobj.sd) ++ sysfs_remove_file_from_group(&adev->dev->kobj, + &obj->sysfs_attr.attr, + RAS_FS_NAME); + obj->attr_inuse = 0; +-- +2.42.0 + diff --git a/queue-6.1/drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch b/queue-6.1/drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch new file mode 100644 index 00000000000..095283ee87c --- /dev/null +++ b/queue-6.1/drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch @@ -0,0 +1,45 @@ +From 54f151ef18c1ce411c88d83ac61330e2cee3309e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Sep 2023 16:34:08 -0400 +Subject: drm/amdgpu: not to save bo in the case of RAS err_event_athub + +From: David (Ming Qiang) Wu + +[ Upstream commit fa1f1cc09d588a90c8ce3f507c47df257461d148 ] + +err_event_athub will corrupt VCPU buffer and not good to +be restored in amdgpu_vcn_resume() and in this case +the VCPU buffer needs to be cleared for VCN firmware to +work properly. + +Acked-by: Leo Liu +Signed-off-by: David (Ming Qiang) Wu +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +index 5c1193dd7d88c..48e612023d0c7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +@@ -391,8 +391,15 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) + void *ptr; + int i, idx; + ++ bool in_ras_intr = amdgpu_ras_intr_triggered(); ++ + cancel_delayed_work_sync(&adev->vcn.idle_work); + ++ /* err_event_athub will corrupt VCPU buffer, so we need to ++ * restore fw data and clear buffer in amdgpu_vcn_resume() */ ++ if (in_ras_intr) ++ return 0; ++ + for (i = 0; i < adev->vcn.num_vcn_inst; ++i) { + if (adev->vcn.harvest_config & (1 << i)) + continue; +-- +2.42.0 + diff --git a/queue-6.1/drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch b/queue-6.1/drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch new file mode 100644 index 00000000000..f00be0c8acd --- /dev/null +++ b/queue-6.1/drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch @@ -0,0 +1,37 @@ +From 0524b55d4d0ef3cc51dffbc4eb96049776abe0b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Oct 2023 09:53:43 +0800 +Subject: drm/amdgpu/vkms: fix a possible null pointer dereference + +From: Ma Ke + +[ Upstream commit cd90511557fdfb394bb4ac4c3b539b007383914c ] + +In amdgpu_vkms_conn_get_modes(), the return value of drm_cvt_mode() +is assigned to mode, which will lead to a NULL pointer dereference +on failure of drm_cvt_mode(). Add a check to avoid null pointer +dereference. + +Signed-off-by: Ma Ke +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +index d60c4a2eeb0c5..06980b8527ff8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +@@ -239,6 +239,8 @@ static int amdgpu_vkms_conn_get_modes(struct drm_connector *connector) + + for (i = 0; i < ARRAY_SIZE(common_modes); i++) { + mode = drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, false, false, false); ++ if (!mode) ++ continue; + drm_mode_probed_add(connector, mode); + } + +-- +2.42.0 + diff --git a/queue-6.1/drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch b/queue-6.1/drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch new file mode 100644 index 00000000000..be0259fcd30 --- /dev/null +++ b/queue-6.1/drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch @@ -0,0 +1,48 @@ +From 0e6a351679e56112fb2887d1031275cb214e3a53 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Sep 2023 11:20:28 -0500 +Subject: drm/amdkfd: Fix a race condition of vram buffer unref in svm code + +From: Xiaogang Chen + +[ Upstream commit 709c348261618da7ed89d6c303e2ceb9e453ba74 ] + +prange->svm_bo unref can happen in both mmu callback and a callback after +migrate to system ram. Both are async call in different tasks. Sync svm_bo +unref operation to avoid random "use-after-free". + +Signed-off-by: Xiaogang Chen +Reviewed-by: Philip Yang +Reviewed-by: Jesse Zhang +Tested-by: Jesse Zhang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +index d7e758c86a0b8..6281d370bb448 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +@@ -612,8 +612,15 @@ svm_range_vram_node_new(struct amdgpu_device *adev, struct svm_range *prange, + + void svm_range_vram_node_free(struct svm_range *prange) + { +- svm_range_bo_unref(prange->svm_bo); +- prange->ttm_res = NULL; ++ /* serialize prange->svm_bo unref */ ++ mutex_lock(&prange->lock); ++ /* prange->svm_bo has not been unref */ ++ if (prange->ttm_res) { ++ prange->ttm_res = NULL; ++ mutex_unlock(&prange->lock); ++ svm_range_bo_unref(prange->svm_bo); ++ } else ++ mutex_unlock(&prange->lock); + } + + struct amdgpu_device * +-- +2.42.0 + diff --git a/queue-6.1/drm-amdkfd-fix-shift-out-of-bounds-issue.patch b/queue-6.1/drm-amdkfd-fix-shift-out-of-bounds-issue.patch new file mode 100644 index 00000000000..dd6050695fc --- /dev/null +++ b/queue-6.1/drm-amdkfd-fix-shift-out-of-bounds-issue.patch @@ -0,0 +1,60 @@ +From e3dfeb5df564158a7edc572005efbcadcc3ac9c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Oct 2023 09:43:51 +0800 +Subject: drm/amdkfd: Fix shift out-of-bounds issue + +From: Jesse Zhang + +[ Upstream commit 282c1d793076c2edac6c3db51b7e8ed2b41d60a5 ] + +[ 567.613292] shift exponent 255 is too large for 64-bit type 'long unsigned int' +[ 567.614498] CPU: 5 PID: 238 Comm: kworker/5:1 Tainted: G OE 6.2.0-34-generic #34~22.04.1-Ubuntu +[ 567.614502] Hardware name: AMD Splinter/Splinter-RPL, BIOS WS43927N_871 09/25/2023 +[ 567.614504] Workqueue: events send_exception_work_handler [amdgpu] +[ 567.614748] Call Trace: +[ 567.614750] +[ 567.614753] dump_stack_lvl+0x48/0x70 +[ 567.614761] dump_stack+0x10/0x20 +[ 567.614763] __ubsan_handle_shift_out_of_bounds+0x156/0x310 +[ 567.614769] ? srso_alias_return_thunk+0x5/0x7f +[ 567.614773] ? update_sd_lb_stats.constprop.0+0xf2/0x3c0 +[ 567.614780] svm_range_split_by_granularity.cold+0x2b/0x34 [amdgpu] +[ 567.615047] ? srso_alias_return_thunk+0x5/0x7f +[ 567.615052] svm_migrate_to_ram+0x185/0x4d0 [amdgpu] +[ 567.615286] do_swap_page+0x7b6/0xa30 +[ 567.615291] ? srso_alias_return_thunk+0x5/0x7f +[ 567.615294] ? __free_pages+0x119/0x130 +[ 567.615299] handle_pte_fault+0x227/0x280 +[ 567.615303] __handle_mm_fault+0x3c0/0x720 +[ 567.615311] handle_mm_fault+0x119/0x330 +[ 567.615314] ? lock_mm_and_find_vma+0x44/0x250 +[ 567.615318] do_user_addr_fault+0x1a9/0x640 +[ 567.615323] exc_page_fault+0x81/0x1b0 +[ 567.615328] asm_exc_page_fault+0x27/0x30 +[ 567.615332] RIP: 0010:__get_user_8+0x1c/0x30 + +Signed-off-by: Jesse Zhang +Suggested-by: Philip Yang +Reviewed-by: Yifan Zhang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +index 6281d370bb448..208812512d8a8 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +@@ -764,7 +764,7 @@ svm_range_apply_attrs(struct kfd_process *p, struct svm_range *prange, + prange->flags &= ~attrs[i].value; + break; + case KFD_IOCTL_SVM_ATTR_GRANULARITY: +- prange->granularity = attrs[i].value; ++ prange->granularity = min_t(uint32_t, attrs[i].value, 0x3F); + break; + default: + WARN_ONCE(1, "svm_range_check_attrs wasn't called?"); +-- +2.42.0 + diff --git a/queue-6.1/drm-gma500-fix-call-trace-when-psb_gem_mm_init-fails.patch b/queue-6.1/drm-gma500-fix-call-trace-when-psb_gem_mm_init-fails.patch new file mode 100644 index 00000000000..a0cdc45d8d2 --- /dev/null +++ b/queue-6.1/drm-gma500-fix-call-trace-when-psb_gem_mm_init-fails.patch @@ -0,0 +1,138 @@ +From eb4c9f1201ff67d8b8087101aea3ba8df72b1342 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Jul 2023 02:58:55 +0800 +Subject: drm/gma500: Fix call trace when psb_gem_mm_init() fails + +From: Sui Jingfeng + +[ Upstream commit da596080b2b400c50fe9f8f237bcaf09fed06af8 ] + +Because the gma_irq_install() is call after psb_gem_mm_init() function, +when psb_gem_mm_init() fails, the interrupt line haven't been allocated. +Yet the gma_irq_uninstall() is called in the psb_driver_unload() function +without checking if checking the irq is registered or not. + +The calltrace is appended as following: + +[ 20.539253] ioremap memtype_reserve failed -16 +[ 20.543895] gma500 0000:00:02.0: Failure to map stolen base. +[ 20.565049] ------------[ cut here ]------------ +[ 20.565066] Trying to free already-free IRQ 16 +[ 20.565087] WARNING: CPU: 1 PID: 381 at kernel/irq/manage.c:1893 free_irq+0x209/0x370 +[ 20.565316] CPU: 1 PID: 381 Comm: systemd-udevd Tainted: G C 6.5.0-rc1+ #368 +[ 20.565329] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./IMB-140D Plus, BIOS P1.10 11/18/2013 +[ 20.565338] RIP: 0010:free_irq+0x209/0x370 +[ 20.565357] Code: 41 5d 41 5e 41 5f 5d 31 d2 89 d1 89 d6 89 d7 41 89 d1 c3 cc cc cc cc 8b 75 d0 48 c7 c7 e0 77 12 9f 4c 89 4d c8 e8 57 fe f4 ff <0f> 0b 48 8b 75 c8 4c 89 f7 e8 29 f3 f1 00 49 8b 47 40 48 8b 40 78 +[ 20.565369] RSP: 0018:ffffae3b40733808 EFLAGS: 00010046 +[ 20.565382] RAX: 0000000000000000 RBX: ffff9f8082bfe000 RCX: 0000000000000000 +[ 20.565390] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 +[ 20.565397] RBP: ffffae3b40733840 R08: 0000000000000000 R09: 0000000000000000 +[ 20.565405] R10: 0000000000000000 R11: 0000000000000000 R12: ffff9f80871c3100 +[ 20.565413] R13: ffff9f80835d3360 R14: ffff9f80835d32a4 R15: ffff9f80835d3200 +[ 20.565424] FS: 00007f13d36458c0(0000) GS:ffff9f8138880000(0000) knlGS:0000000000000000 +[ 20.565434] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 20.565441] CR2: 00007f0d046f3f20 CR3: 0000000006c8c000 CR4: 00000000000006e0 +[ 20.565450] Call Trace: +[ 20.565458] +[ 20.565470] ? show_regs+0x72/0x90 +[ 20.565488] ? free_irq+0x209/0x370 +[ 20.565504] ? __warn+0x8d/0x160 +[ 20.565520] ? free_irq+0x209/0x370 +[ 20.565536] ? report_bug+0x1bb/0x1d0 +[ 20.565555] ? handle_bug+0x46/0x90 +[ 20.565572] ? exc_invalid_op+0x19/0x80 +[ 20.565587] ? asm_exc_invalid_op+0x1b/0x20 +[ 20.565607] ? free_irq+0x209/0x370 +[ 20.565625] ? free_irq+0x209/0x370 +[ 20.565644] gma_irq_uninstall+0x15b/0x1e0 [gma500_gfx] +[ 20.565728] psb_driver_unload+0x27/0x190 [gma500_gfx] +[ 20.565800] psb_pci_probe+0x5d2/0x790 [gma500_gfx] +[ 20.565873] local_pci_probe+0x48/0xb0 +[ 20.565892] pci_device_probe+0xc8/0x280 +[ 20.565912] really_probe+0x1d2/0x440 +[ 20.565929] __driver_probe_device+0x8a/0x190 +[ 20.565944] driver_probe_device+0x23/0xd0 +[ 20.565957] __driver_attach+0x10f/0x220 +[ 20.565971] ? __pfx___driver_attach+0x10/0x10 +[ 20.565984] bus_for_each_dev+0x7a/0xe0 +[ 20.566002] driver_attach+0x1e/0x30 +[ 20.566014] bus_add_driver+0x127/0x240 +[ 20.566029] driver_register+0x64/0x140 +[ 20.566043] ? __pfx_psb_init+0x10/0x10 [gma500_gfx] +[ 20.566111] __pci_register_driver+0x68/0x80 +[ 20.566128] psb_init+0x2c/0xff0 [gma500_gfx] +[ 20.566194] do_one_initcall+0x46/0x330 +[ 20.566214] ? kmalloc_trace+0x2a/0xb0 +[ 20.566233] do_init_module+0x6a/0x270 +[ 20.566250] load_module+0x207f/0x23a0 +[ 20.566278] init_module_from_file+0x9c/0xf0 +[ 20.566293] ? init_module_from_file+0x9c/0xf0 +[ 20.566315] idempotent_init_module+0x184/0x240 +[ 20.566335] __x64_sys_finit_module+0x64/0xd0 +[ 20.566352] do_syscall_64+0x59/0x90 +[ 20.566366] ? ksys_mmap_pgoff+0x123/0x270 +[ 20.566378] ? __secure_computing+0x9b/0x110 +[ 20.566392] ? exit_to_user_mode_prepare+0x39/0x190 +[ 20.566406] ? syscall_exit_to_user_mode+0x2a/0x50 +[ 20.566420] ? do_syscall_64+0x69/0x90 +[ 20.566433] ? do_syscall_64+0x69/0x90 +[ 20.566445] ? do_syscall_64+0x69/0x90 +[ 20.566458] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 +[ 20.566472] RIP: 0033:0x7f13d351ea3d +[ 20.566485] Code: 5b 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d c3 a3 0f 00 f7 d8 64 89 01 48 +[ 20.566496] RSP: 002b:00007ffe566c1fd8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 +[ 20.566510] RAX: ffffffffffffffda RBX: 000055e66806eec0 RCX: 00007f13d351ea3d +[ 20.566519] RDX: 0000000000000000 RSI: 00007f13d36d9441 RDI: 0000000000000010 +[ 20.566527] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000002 +[ 20.566535] R10: 0000000000000010 R11: 0000000000000246 R12: 00007f13d36d9441 +[ 20.566543] R13: 000055e6681108c0 R14: 000055e66805ba70 R15: 000055e66819a9c0 +[ 20.566559] +[ 20.566566] ---[ end trace 0000000000000000 ]--- + +Signed-off-by: Sui Jingfeng +Signed-off-by: Patrik Jakobsson +Link: https://patchwork.freedesktop.org/patch/msgid/20230727185855.713318-1-suijingfeng@loongson.cn +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/gma500/psb_drv.h | 1 + + drivers/gpu/drm/gma500/psb_irq.c | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h +index ae544b69fc475..52f9ed3c24b8e 100644 +--- a/drivers/gpu/drm/gma500/psb_drv.h ++++ b/drivers/gpu/drm/gma500/psb_drv.h +@@ -426,6 +426,7 @@ struct drm_psb_private { + uint32_t pipestat[PSB_NUM_PIPE]; + + spinlock_t irqmask_lock; ++ bool irq_enabled; + + /* Power */ + bool pm_initialized; +diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c +index d421031462df6..ab2d49dab35a0 100644 +--- a/drivers/gpu/drm/gma500/psb_irq.c ++++ b/drivers/gpu/drm/gma500/psb_irq.c +@@ -338,6 +338,8 @@ int gma_irq_install(struct drm_device *dev) + + gma_irq_postinstall(dev); + ++ dev_priv->irq_enabled = true; ++ + return 0; + } + +@@ -348,6 +350,9 @@ void gma_irq_uninstall(struct drm_device *dev) + unsigned long irqflags; + unsigned int i; + ++ if (!dev_priv->irq_enabled) ++ return; ++ + spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); + + if (dev_priv->ops->hotplug_enable) +-- +2.42.0 + diff --git a/queue-6.1/drm-komeda-drop-all-currently-held-locks-if-deadlock.patch b/queue-6.1/drm-komeda-drop-all-currently-held-locks-if-deadlock.patch new file mode 100644 index 00000000000..b63306678e2 --- /dev/null +++ b/queue-6.1/drm-komeda-drop-all-currently-held-locks-if-deadlock.patch @@ -0,0 +1,184 @@ +From f3aacd6e9ac1251b34938dd54404ecc64d21cf4b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Aug 2023 10:05:53 +0800 +Subject: drm/komeda: drop all currently held locks if deadlock happens + +From: baozhu.liu + +[ Upstream commit 19ecbe8325a2a7ffda5ff4790955b84eaccba49f ] + +If komeda_pipeline_unbound_components() returns -EDEADLK, +it means that a deadlock happened in the locking context. +Currently, komeda is not dealing with the deadlock properly,producing the +following output when CONFIG_DEBUG_WW_MUTEX_SLOWPATH is enabled: + + ------------[ cut here ]------------ +[ 26.103984] WARNING: CPU: 2 PID: 345 at drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c:1248 + komeda_release_unclaimed_resources+0x13c/0x170 +[ 26.117453] Modules linked in: +[ 26.120511] CPU: 2 PID: 345 Comm: composer@2.1-se Kdump: loaded Tainted: G W 5.10.110-SE-SDK1.8-dirty #16 +[ 26.131374] Hardware name: Siengine Se1000 Evaluation board (DT) +[ 26.137379] pstate: 20400009 (nzCv daif +PAN -UAO -TCO BTYPE=--) +[ 26.143385] pc : komeda_release_unclaimed_resources+0x13c/0x170 +[ 26.149301] lr : komeda_release_unclaimed_resources+0xbc/0x170 +[ 26.155130] sp : ffff800017b8b8d0 +[ 26.158442] pmr_save: 000000e0 +[ 26.161493] x29: ffff800017b8b8d0 x28: ffff000cf2f96200 +[ 26.166805] x27: ffff000c8f5a8800 x26: 0000000000000000 +[ 26.172116] x25: 0000000000000038 x24: ffff8000116a0140 +[ 26.177428] x23: 0000000000000038 x22: ffff000cf2f96200 +[ 26.182739] x21: ffff000cfc300300 x20: ffff000c8ab77080 +[ 26.188051] x19: 0000000000000003 x18: 0000000000000000 +[ 26.193362] x17: 0000000000000000 x16: 0000000000000000 +[ 26.198672] x15: b400e638f738ba38 x14: 0000000000000000 +[ 26.203983] x13: 0000000106400a00 x12: 0000000000000000 +[ 26.209294] x11: 0000000000000000 x10: 0000000000000000 +[ 26.214604] x9 : ffff800012f80000 x8 : ffff000ca3308000 +[ 26.219915] x7 : 0000000ff3000000 x6 : ffff80001084034c +[ 26.225226] x5 : ffff800017b8bc40 x4 : 000000000000000f +[ 26.230536] x3 : ffff000ca3308000 x2 : 0000000000000000 +[ 26.235847] x1 : 0000000000000000 x0 : ffffffffffffffdd +[ 26.241158] Call trace: +[ 26.243604] komeda_release_unclaimed_resources+0x13c/0x170 +[ 26.249175] komeda_crtc_atomic_check+0x68/0xf0 +[ 26.253706] drm_atomic_helper_check_planes+0x138/0x1f4 +[ 26.258929] komeda_kms_check+0x284/0x36c +[ 26.262939] drm_atomic_check_only+0x40c/0x714 +[ 26.267381] drm_atomic_nonblocking_commit+0x1c/0x60 +[ 26.272344] drm_mode_atomic_ioctl+0xa3c/0xb8c +[ 26.276787] drm_ioctl_kernel+0xc4/0x120 +[ 26.280708] drm_ioctl+0x268/0x534 +[ 26.284109] __arm64_sys_ioctl+0xa8/0xf0 +[ 26.288030] el0_svc_common.constprop.0+0x80/0x240 +[ 26.292817] do_el0_svc+0x24/0x90 +[ 26.296132] el0_svc+0x20/0x30 +[ 26.299185] el0_sync_handler+0xe8/0xf0 +[ 26.303018] el0_sync+0x1a4/0x1c0 +[ 26.306330] irq event stamp: 0 +[ 26.309384] hardirqs last enabled at (0): [<0000000000000000>] 0x0 +[ 26.315650] hardirqs last disabled at (0): [] copy_process+0x5d0/0x183c +[ 26.323825] softirqs last enabled at (0): [] copy_process+0x5d0/0x183c +[ 26.331997] softirqs last disabled at (0): [<0000000000000000>] 0x0 +[ 26.338261] ---[ end trace 20ae984fa860184a ]--- +[ 26.343021] ------------[ cut here ]------------ +[ 26.347646] WARNING: CPU: 3 PID: 345 at drivers/gpu/drm/drm_modeset_lock.c:228 drm_modeset_drop_locks+0x84/0x90 +[ 26.357727] Modules linked in: +[ 26.360783] CPU: 3 PID: 345 Comm: composer@2.1-se Kdump: loaded Tainted: G W 5.10.110-SE-SDK1.8-dirty #16 +[ 26.371645] Hardware name: Siengine Se1000 Evaluation board (DT) +[ 26.377647] pstate: 20400009 (nzCv daif +PAN -UAO -TCO BTYPE=--) +[ 26.383649] pc : drm_modeset_drop_locks+0x84/0x90 +[ 26.388351] lr : drm_mode_atomic_ioctl+0x860/0xb8c +[ 26.393137] sp : ffff800017b8bb10 +[ 26.396447] pmr_save: 000000e0 +[ 26.399497] x29: ffff800017b8bb10 x28: 0000000000000001 +[ 26.404807] x27: 0000000000000038 x26: 0000000000000002 +[ 26.410115] x25: ffff000cecbefa00 x24: ffff000cf2f96200 +[ 26.415423] x23: 0000000000000001 x22: 0000000000000018 +[ 26.420731] x21: 0000000000000001 x20: ffff800017b8bc10 +[ 26.426039] x19: 0000000000000000 x18: 0000000000000000 +[ 26.431347] x17: 0000000002e8bf2c x16: 0000000002e94c6b +[ 26.436655] x15: 0000000002ea48b9 x14: ffff8000121f0300 +[ 26.441963] x13: 0000000002ee2ca8 x12: ffff80001129cae0 +[ 26.447272] x11: ffff800012435000 x10: ffff000ed46b5e88 +[ 26.452580] x9 : ffff000c9935e600 x8 : 0000000000000000 +[ 26.457888] x7 : 000000008020001e x6 : 000000008020001f +[ 26.463196] x5 : ffff80001085fbe0 x4 : fffffe0033a59f20 +[ 26.468504] x3 : 000000008020001e x2 : 0000000000000000 +[ 26.473813] x1 : 0000000000000000 x0 : ffff000c8f596090 +[ 26.479122] Call trace: +[ 26.481566] drm_modeset_drop_locks+0x84/0x90 +[ 26.485918] drm_mode_atomic_ioctl+0x860/0xb8c +[ 26.490359] drm_ioctl_kernel+0xc4/0x120 +[ 26.494278] drm_ioctl+0x268/0x534 +[ 26.497677] __arm64_sys_ioctl+0xa8/0xf0 +[ 26.501598] el0_svc_common.constprop.0+0x80/0x240 +[ 26.506384] do_el0_svc+0x24/0x90 +[ 26.509697] el0_svc+0x20/0x30 +[ 26.512748] el0_sync_handler+0xe8/0xf0 +[ 26.516580] el0_sync+0x1a4/0x1c0 +[ 26.519891] irq event stamp: 0 +[ 26.522943] hardirqs last enabled at (0): [<0000000000000000>] 0x0 +[ 26.529207] hardirqs last disabled at (0): [] copy_process+0x5d0/0x183c +[ 26.537379] softirqs last enabled at (0): [] copy_process+0x5d0/0x183c +[ 26.545550] softirqs last disabled at (0): [<0000000000000000>] 0x0 +[ 26.551812] ---[ end trace 20ae984fa860184b ]--- + +According to the call trace information,it can be located to be +WARN_ON(IS_ERR(c_st)) in the komeda_pipeline_unbound_components function; +Then follow the function. +komeda_pipeline_unbound_components +-> komeda_component_get_state_and_set_user + -> komeda_pipeline_get_state_and_set_crtc + -> komeda_pipeline_get_state + ->drm_atomic_get_private_obj_state + -> drm_atomic_get_private_obj_state + -> drm_modeset_lock + +komeda_pipeline_unbound_components +-> komeda_component_get_state_and_set_user + -> komeda_component_get_state + -> drm_atomic_get_private_obj_state + -> drm_modeset_lock + +ret = drm_modeset_lock(&obj->lock, state->acquire_ctx); if (ret) + return ERR_PTR(ret); +Here it return -EDEADLK. + +deal with the deadlock as suggested by [1], using the +function drm_modeset_backoff(). +[1] https://docs.kernel.org/gpu/drm-kms.html?highlight=kms#kms-locking + +Therefore, handling this problem can be solved +by adding return -EDEADLK back to the drm_modeset_backoff processing flow +in the drm_mode_atomic_ioctl function. + +Signed-off-by: baozhu.liu +Signed-off-by: menghui.huang +Reviewed-by: Liviu Dudau +Signed-off-by: Liviu Dudau +Link: https://patchwork.freedesktop.org/patch/msgid/20230804013117.6870-1-menghui.huang@siengine.com +Signed-off-by: Sasha Levin +--- + .../gpu/drm/arm/display/komeda/komeda_pipeline_state.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +index 3276a3e82c628..916f2c36bf2f7 100644 +--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c ++++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +@@ -1223,7 +1223,7 @@ int komeda_build_display_data_flow(struct komeda_crtc *kcrtc, + return 0; + } + +-static void ++static int + komeda_pipeline_unbound_components(struct komeda_pipeline *pipe, + struct komeda_pipeline_state *new) + { +@@ -1243,8 +1243,12 @@ komeda_pipeline_unbound_components(struct komeda_pipeline *pipe, + c = komeda_pipeline_get_component(pipe, id); + c_st = komeda_component_get_state_and_set_user(c, + drm_st, NULL, new->crtc); ++ if (PTR_ERR(c_st) == -EDEADLK) ++ return -EDEADLK; + WARN_ON(IS_ERR(c_st)); + } ++ ++ return 0; + } + + /* release unclaimed pipeline resource */ +@@ -1266,9 +1270,8 @@ int komeda_release_unclaimed_resources(struct komeda_pipeline *pipe, + if (WARN_ON(IS_ERR_OR_NULL(st))) + return -EINVAL; + +- komeda_pipeline_unbound_components(pipe, st); ++ return komeda_pipeline_unbound_components(pipe, st); + +- return 0; + } + + /* Since standalone disabled components must be disabled separately and in the +-- +2.42.0 + diff --git a/queue-6.1/drm-msm-dp-skip-validity-check-for-dp-cts-edid-check.patch b/queue-6.1/drm-msm-dp-skip-validity-check-for-dp-cts-edid-check.patch new file mode 100644 index 00000000000..1c5b558f1f2 --- /dev/null +++ b/queue-6.1/drm-msm-dp-skip-validity-check-for-dp-cts-edid-check.patch @@ -0,0 +1,79 @@ +From b319c6656220af466f9b676e89c37f193839da5a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 1 Sep 2023 17:20:34 +0300 +Subject: drm/msm/dp: skip validity check for DP CTS EDID checksum + +From: Jani Nikula + +[ Upstream commit a251c9d8e30833b260101edb9383b176ee2b7cb1 ] + +The DP CTS test for EDID last block checksum expects the checksum for +the last block, invalid or not. Skip the validity check. + +For the most part (*), the EDIDs returned by drm_get_edid() will be +valid anyway, and there's the CTS workaround to get the checksum for +completely invalid EDIDs. See commit 7948fe12d47a ("drm/msm/dp: return +correct edid checksum after corrupted edid checksum read"). + +This lets us remove one user of drm_edid_block_valid() with hopes the +function can be removed altogether in the future. + +(*) drm_get_edid() ignores checksum errors on CTA extensions. + +Cc: Abhinav Kumar +Cc: Dmitry Baryshkov +Cc: Kuogee Hsieh +Cc: Marijn Suijten +Cc: Rob Clark +Cc: Sean Paul +Cc: Stephen Boyd +Cc: linux-arm-msm@vger.kernel.org +Cc: freedreno@lists.freedesktop.org +Signed-off-by: Jani Nikula +Reviewed-by: Stephen Boyd +Reviewed-by: Abhinav Kumar +Reviewed-by: Kuogee Hsieh +Patchwork: https://patchwork.freedesktop.org/patch/555361/ +Link: https://lore.kernel.org/r/20230901142034.580802-1-jani.nikula@intel.com +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dp/dp_panel.c | 21 ++------------------- + 1 file changed, 2 insertions(+), 19 deletions(-) + +diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c +index 5149cebc93f61..d38086650fcf7 100644 +--- a/drivers/gpu/drm/msm/dp/dp_panel.c ++++ b/drivers/gpu/drm/msm/dp/dp_panel.c +@@ -266,26 +266,9 @@ int dp_panel_get_modes(struct dp_panel *dp_panel, + + static u8 dp_panel_get_edid_checksum(struct edid *edid) + { +- struct edid *last_block; +- u8 *raw_edid; +- bool is_edid_corrupt = false; ++ edid += edid->extensions; + +- if (!edid) { +- DRM_ERROR("invalid edid input\n"); +- return 0; +- } +- +- raw_edid = (u8 *)edid; +- raw_edid += (edid->extensions * EDID_LENGTH); +- last_block = (struct edid *)raw_edid; +- +- /* block type extension */ +- drm_edid_block_valid(raw_edid, 1, false, &is_edid_corrupt); +- if (!is_edid_corrupt) +- return last_block->checksum; +- +- DRM_ERROR("Invalid block, no checksum\n"); +- return 0; ++ return edid->checksum; + } + + void dp_panel_handle_sink_request(struct dp_panel *dp_panel) +-- +2.42.0 + diff --git a/queue-6.1/drm-panel-fix-a-possible-null-pointer-dereference.patch b/queue-6.1/drm-panel-fix-a-possible-null-pointer-dereference.patch new file mode 100644 index 00000000000..96a4817ec80 --- /dev/null +++ b/queue-6.1/drm-panel-fix-a-possible-null-pointer-dereference.patch @@ -0,0 +1,39 @@ +From a8105359b1ac86ac3c93dab19b439ab9ee60b6da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 7 Oct 2023 11:31:05 +0800 +Subject: drm/panel: fix a possible null pointer dereference + +From: Ma Ke + +[ Upstream commit 924e5814d1f84e6fa5cb19c6eceb69f066225229 ] + +In versatile_panel_get_modes(), the return value of drm_mode_duplicate() +is assigned to mode, which will lead to a NULL pointer dereference +on failure of drm_mode_duplicate(). Add a check to avoid npd. + +Signed-off-by: Ma Ke +Reviewed-by: Neil Armstrong +Link: https://lore.kernel.org/r/20231007033105.3997998-1-make_ruc2021@163.com +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20231007033105.3997998-1-make_ruc2021@163.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/panel/panel-arm-versatile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c +index abb0788843c60..503ecea72c5ea 100644 +--- a/drivers/gpu/drm/panel/panel-arm-versatile.c ++++ b/drivers/gpu/drm/panel/panel-arm-versatile.c +@@ -267,6 +267,8 @@ static int versatile_panel_get_modes(struct drm_panel *panel, + connector->display_info.bus_flags = vpanel->panel_type->bus_flags; + + mode = drm_mode_duplicate(connector->dev, &vpanel->panel_type->mode); ++ if (!mode) ++ return -ENOMEM; + drm_mode_set_name(mode); + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + +-- +2.42.0 + diff --git a/queue-6.1/drm-panel-panel-tpo-tpg110-fix-a-possible-null-point.patch b/queue-6.1/drm-panel-panel-tpo-tpg110-fix-a-possible-null-point.patch new file mode 100644 index 00000000000..61c541aa4d7 --- /dev/null +++ b/queue-6.1/drm-panel-panel-tpo-tpg110-fix-a-possible-null-point.patch @@ -0,0 +1,39 @@ +From 9aed89139357c0c4995f9abc9cdb28d30e046529 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Oct 2023 17:04:46 +0800 +Subject: drm/panel/panel-tpo-tpg110: fix a possible null pointer dereference + +From: Ma Ke + +[ Upstream commit f22def5970c423ea7f87d5247bd0ef91416b0658 ] + +In tpg110_get_modes(), the return value of drm_mode_duplicate() is +assigned to mode, which will lead to a NULL pointer dereference on +failure of drm_mode_duplicate(). Add a check to avoid npd. + +Signed-off-by: Ma Ke +Reviewed-by: Neil Armstrong +Link: https://lore.kernel.org/r/20231009090446.4043798-1-make_ruc2021@163.com +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20231009090446.4043798-1-make_ruc2021@163.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c +index 0b1f5a11a0554..735f1ea25c121 100644 +--- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c ++++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c +@@ -379,6 +379,8 @@ static int tpg110_get_modes(struct drm_panel *panel, + connector->display_info.bus_flags = tpg->panel_mode->bus_flags; + + mode = drm_mode_duplicate(connector->dev, &tpg->panel_mode->mode); ++ if (!mode) ++ return -ENOMEM; + drm_mode_set_name(mode); + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + +-- +2.42.0 + diff --git a/queue-6.1/drm-panel-st7703-pick-different-reset-sequence.patch b/queue-6.1/drm-panel-st7703-pick-different-reset-sequence.patch new file mode 100644 index 00000000000..3141758f06f --- /dev/null +++ b/queue-6.1/drm-panel-st7703-pick-different-reset-sequence.patch @@ -0,0 +1,86 @@ +From 3058a032ff96724df20dfa1622512432d0f300a2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 11 Feb 2023 18:17:48 +0100 +Subject: drm/panel: st7703: Pick different reset sequence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ondrej Jirman + +[ Upstream commit d12d635bb03c7cb4830acb641eb176ee9ff2aa89 ] + +Switching to a different reset sequence, enabling IOVCC before enabling +VCC. + +There also needs to be a delay after enabling the supplies and before +deasserting the reset. The datasheet specifies 1ms after the supplies +reach the required voltage. Use 10-20ms to also give the power supplies +some time to reach the required voltage, too. + +This fixes intermittent panel initialization failures and screen +corruption during resume from sleep on panel xingbangda,xbd599 (e.g. +used in PinePhone). + +Signed-off-by: Ondrej Jirman +Signed-off-by: Frank Oltmanns +Reported-by: Samuel Holland +Reviewed-by: Guido Günther +Tested-by: Guido Günther +Signed-off-by: Guido Günther +Link: https://patchwork.freedesktop.org/patch/msgid/20230211171748.36692-2-frank@oltmanns.dev +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 25 ++++++++++--------- + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c +index 86a472b01360b..b6e514aabe1d3 100644 +--- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c ++++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c +@@ -428,29 +428,30 @@ static int st7703_prepare(struct drm_panel *panel) + return 0; + + dev_dbg(ctx->dev, "Resetting the panel\n"); +- ret = regulator_enable(ctx->vcc); ++ gpiod_set_value_cansleep(ctx->reset_gpio, 1); ++ ++ ret = regulator_enable(ctx->iovcc); + if (ret < 0) { +- dev_err(ctx->dev, "Failed to enable vcc supply: %d\n", ret); ++ dev_err(ctx->dev, "Failed to enable iovcc supply: %d\n", ret); + return ret; + } +- ret = regulator_enable(ctx->iovcc); ++ ++ ret = regulator_enable(ctx->vcc); + if (ret < 0) { +- dev_err(ctx->dev, "Failed to enable iovcc supply: %d\n", ret); +- goto disable_vcc; ++ dev_err(ctx->dev, "Failed to enable vcc supply: %d\n", ret); ++ regulator_disable(ctx->iovcc); ++ return ret; + } + +- gpiod_set_value_cansleep(ctx->reset_gpio, 1); +- usleep_range(20, 40); ++ /* Give power supplies time to stabilize before deasserting reset. */ ++ usleep_range(10000, 20000); ++ + gpiod_set_value_cansleep(ctx->reset_gpio, 0); +- msleep(20); ++ usleep_range(15000, 20000); + + ctx->prepared = true; + + return 0; +- +-disable_vcc: +- regulator_disable(ctx->vcc); +- return ret; + } + + static const u32 mantix_bus_formats[] = { +-- +2.42.0 + diff --git a/queue-6.1/drm-qxl-prevent-memory-leak.patch b/queue-6.1/drm-qxl-prevent-memory-leak.patch new file mode 100644 index 00000000000..f2699020030 --- /dev/null +++ b/queue-6.1/drm-qxl-prevent-memory-leak.patch @@ -0,0 +1,41 @@ +From 3208c2a6553067e5f8399a34382af0f699a62fdd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Aug 2023 10:53:09 +0800 +Subject: drm/qxl: prevent memory leak + +From: Zongmin Zhou + +[ Upstream commit 0e8b9f258baed25f1c5672613699247c76b007b5 ] + +The allocated memory for qdev->dumb_heads should be released +in qxl_destroy_monitors_object before qxl suspend. +otherwise,qxl_create_monitors_object will be called to +reallocate memory for qdev->dumb_heads after qxl resume, +it will cause memory leak. + +Signed-off-by: Zongmin Zhou +Link: https://lore.kernel.org/r/20230801025309.4049813-1-zhouzongmin@kylinos.cn +Reviewed-by: Dave Airlie +Signed-off-by: Maxime Ripard +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/qxl/qxl_display.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c +index a152a7c6db215..f91a86225d5e7 100644 +--- a/drivers/gpu/drm/qxl/qxl_display.c ++++ b/drivers/gpu/drm/qxl/qxl_display.c +@@ -1229,6 +1229,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev) + if (!qdev->monitors_config_bo) + return 0; + ++ kfree(qdev->dumb_heads); ++ qdev->dumb_heads = NULL; ++ + qdev->monitors_config = NULL; + qdev->ram_header->monitors_config = 0; + +-- +2.42.0 + diff --git a/queue-6.1/drm-radeon-fix-a-possible-null-pointer-dereference.patch b/queue-6.1/drm-radeon-fix-a-possible-null-pointer-dereference.patch new file mode 100644 index 00000000000..c0b70fa630b --- /dev/null +++ b/queue-6.1/drm-radeon-fix-a-possible-null-pointer-dereference.patch @@ -0,0 +1,37 @@ +From 30df415a1c1e5489ff000acc542680e91bf847f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 09:21:43 +0800 +Subject: drm/radeon: fix a possible null pointer dereference + +From: Ma Ke + +[ Upstream commit 2c1fe3c480f9e1deefd50d4b18be4a046011ee1f ] + +In radeon_tv_get_modes(), the return value of drm_cvt_mode() +is assigned to mode, which will lead to a NULL pointer +dereference on failure of drm_cvt_mode(). Add a check to +avoid null point dereference. + +Signed-off-by: Ma Ke +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c +index f7431d2246044..5837af5123a9f 100644 +--- a/drivers/gpu/drm/radeon/radeon_connectors.c ++++ b/drivers/gpu/drm/radeon/radeon_connectors.c +@@ -1122,6 +1122,8 @@ static int radeon_tv_get_modes(struct drm_connector *connector) + else { + /* only 800x600 is supported right now on pre-avivo chips */ + tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false, false); ++ if (!tv_mode) ++ return 0; + tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_probed_add(connector, tv_mode); + } +-- +2.42.0 + diff --git a/queue-6.1/drm-vmwgfx_surface.c-copy-user-array-safely.patch b/queue-6.1/drm-vmwgfx_surface.c-copy-user-array-safely.patch new file mode 100644 index 00000000000..de19830e11c --- /dev/null +++ b/queue-6.1/drm-vmwgfx_surface.c-copy-user-array-safely.patch @@ -0,0 +1,44 @@ +From 0301859d08fba4be5e859a6c44eccad8d62248ee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Sep 2023 14:36:13 +0200 +Subject: drm: vmwgfx_surface.c: copy user-array safely + +From: Philipp Stanner + +[ Upstream commit 06ab64a0d836ac430c5f94669710a78aa43942cb ] + +Currently, there is no overflow-check with memdup_user(). + +Use the new function memdup_array_user() instead of memdup_user() for +duplicating the user-space array safely. + +Suggested-by: David Airlie +Signed-off-by: Philipp Stanner +Reviewed-by: Kees Cook +Reviewed-by: Zack Rusin +Signed-off-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-7-pstanner@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +index 591c301e6cf21..1a1a286bc749f 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +@@ -774,9 +774,9 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, + sizeof(metadata->mip_levels)); + metadata->num_sizes = num_sizes; + metadata->sizes = +- memdup_user((struct drm_vmw_size __user *)(unsigned long) ++ memdup_array_user((struct drm_vmw_size __user *)(unsigned long) + req->size_addr, +- sizeof(*metadata->sizes) * metadata->num_sizes); ++ metadata->num_sizes, sizeof(*metadata->sizes)); + if (IS_ERR(metadata->sizes)) { + ret = PTR_ERR(metadata->sizes); + goto out_no_sizes; +-- +2.42.0 + diff --git a/queue-6.1/drm_lease.c-copy-user-array-safely.patch b/queue-6.1/drm_lease.c-copy-user-array-safely.patch new file mode 100644 index 00000000000..7074c63133e --- /dev/null +++ b/queue-6.1/drm_lease.c-copy-user-array-safely.patch @@ -0,0 +1,43 @@ +From 391773534911491a5cda91afad871327b42e0d5f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Sep 2023 14:36:12 +0200 +Subject: drm_lease.c: copy user-array safely + +From: Philipp Stanner + +[ Upstream commit f37d63e219c39199a59b8b8a211412ff27192830 ] + +Currently, there is no overflow-check with memdup_user(). + +Use the new function memdup_array_user() instead of memdup_user() for +duplicating the user-space array safely. + +Suggested-by: David Airlie +Signed-off-by: Philipp Stanner +Reviewed-by: Kees Cook +Reviewed-by: Zack Rusin +Signed-off-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-6-pstanner@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_lease.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c +index d72c2fac0ff1a..b7362356e5448 100644 +--- a/drivers/gpu/drm/drm_lease.c ++++ b/drivers/gpu/drm/drm_lease.c +@@ -507,8 +507,8 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, + /* Handle leased objects, if any */ + idr_init(&leases); + if (object_count != 0) { +- object_ids = memdup_user(u64_to_user_ptr(cl->object_ids), +- array_size(object_count, sizeof(__u32))); ++ object_ids = memdup_array_user(u64_to_user_ptr(cl->object_ids), ++ object_count, sizeof(__u32)); + if (IS_ERR(object_ids)) { + ret = PTR_ERR(object_ids); + idr_destroy(&leases); +-- +2.42.0 + diff --git a/queue-6.1/exfat-support-handle-zero-size-directory.patch b/queue-6.1/exfat-support-handle-zero-size-directory.patch new file mode 100644 index 00000000000..95294f3b3c5 --- /dev/null +++ b/queue-6.1/exfat-support-handle-zero-size-directory.patch @@ -0,0 +1,103 @@ +From 1a9bbeae77345c35ab0dd0918964f5ec895b4055 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Jul 2023 14:23:08 +0800 +Subject: exfat: support handle zero-size directory + +From: Yuezhang Mo + +[ Upstream commit dab48b8f2fe7264d51ec9eed0adea0fe3c78830a ] + +After repairing a corrupted file system with exfatprogs' fsck.exfat, +zero-size directories may result. It is also possible to create +zero-size directories in other exFAT implementation, such as Paragon +ufsd dirver. + +As described in the specification, the lower directory size limits +is 0 bytes. + +Without this commit, sub-directories and files cannot be created +under a zero-size directory, and it cannot be removed. + +Signed-off-by: Yuezhang Mo +Reviewed-by: Andy Wu +Reviewed-by: Aoyama Wataru +Signed-off-by: Namjae Jeon +Signed-off-by: Sasha Levin +--- + fs/exfat/namei.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c +index 90b0477911449..30e97c51f0e14 100644 +--- a/fs/exfat/namei.c ++++ b/fs/exfat/namei.c +@@ -338,14 +338,20 @@ static int exfat_find_empty_entry(struct inode *inode, + if (exfat_check_max_dentries(inode)) + return -ENOSPC; + +- /* we trust p_dir->size regardless of FAT type */ +- if (exfat_find_last_cluster(sb, p_dir, &last_clu)) +- return -EIO; +- + /* + * Allocate new cluster to this directory + */ +- exfat_chain_set(&clu, last_clu + 1, 0, p_dir->flags); ++ if (ei->start_clu != EXFAT_EOF_CLUSTER) { ++ /* we trust p_dir->size regardless of FAT type */ ++ if (exfat_find_last_cluster(sb, p_dir, &last_clu)) ++ return -EIO; ++ ++ exfat_chain_set(&clu, last_clu + 1, 0, p_dir->flags); ++ } else { ++ /* This directory is empty */ ++ exfat_chain_set(&clu, EXFAT_EOF_CLUSTER, 0, ++ ALLOC_NO_FAT_CHAIN); ++ } + + /* allocate a cluster */ + ret = exfat_alloc_cluster(inode, 1, &clu, IS_DIRSYNC(inode)); +@@ -355,6 +361,11 @@ static int exfat_find_empty_entry(struct inode *inode, + if (exfat_zeroed_cluster(inode, clu.dir)) + return -EIO; + ++ if (ei->start_clu == EXFAT_EOF_CLUSTER) { ++ ei->start_clu = clu.dir; ++ p_dir->dir = clu.dir; ++ } ++ + /* append to the FAT chain */ + if (clu.flags != p_dir->flags) { + /* no-fat-chain bit is disabled, +@@ -644,7 +655,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname, + info->type = exfat_get_entry_type(ep); + info->attr = le16_to_cpu(ep->dentry.file.attr); + info->size = le64_to_cpu(ep2->dentry.stream.valid_size); +- if ((info->type == TYPE_FILE) && (info->size == 0)) { ++ if (info->size == 0) { + info->flags = ALLOC_NO_FAT_CHAIN; + info->start_clu = EXFAT_EOF_CLUSTER; + } else { +@@ -888,6 +899,9 @@ static int exfat_check_dir_empty(struct super_block *sb, + + dentries_per_clu = sbi->dentries_per_clu; + ++ if (p_dir->dir == EXFAT_EOF_CLUSTER) ++ return 0; ++ + exfat_chain_dup(&clu, p_dir); + + while (clu.dir != EXFAT_EOF_CLUSTER) { +@@ -1262,7 +1276,8 @@ static int __exfat_rename(struct inode *old_parent_inode, + } + + /* Free the clusters if new_inode is a dir(as if exfat_rmdir) */ +- if (new_entry_type == TYPE_DIR) { ++ if (new_entry_type == TYPE_DIR && ++ new_ei->start_clu != EXFAT_EOF_CLUSTER) { + /* new_ei, new_clu_to_free */ + struct exfat_chain new_clu_to_free; + +-- +2.42.0 + diff --git a/queue-6.1/f2fs-fix-error-handling-of-__get_node_page.patch b/queue-6.1/f2fs-fix-error-handling-of-__get_node_page.patch new file mode 100644 index 00000000000..ba2e1da3ae7 --- /dev/null +++ b/queue-6.1/f2fs-fix-error-handling-of-__get_node_page.patch @@ -0,0 +1,36 @@ +From 5e42a69047270abafafd6f48232ecffd15b071b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Oct 2023 14:51:02 +0800 +Subject: f2fs: fix error handling of __get_node_page + +From: Zhiguo Niu + +[ Upstream commit 9b4c8dd99fe48721410741651d426015e03a4b7a ] + +Use f2fs_handle_error to record inconsistent node block error +and return -EFSCORRUPTED instead of -EINVAL. + +Signed-off-by: Zhiguo Niu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/node.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c +index a010b4bc36d2c..b73d44df9423b 100644 +--- a/fs/f2fs/node.c ++++ b/fs/f2fs/node.c +@@ -1455,7 +1455,8 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, + ofs_of_node(page), cpver_of_node(page), + next_blkaddr_of_node(page)); + set_sbi_flag(sbi, SBI_NEED_FSCK); +- err = -EINVAL; ++ f2fs_handle_error(sbi, ERROR_INCONSISTENT_FOOTER); ++ err = -EFSCORRUPTED; + out_err: + ClearPageUptodate(page); + out_put_err: +-- +2.42.0 + diff --git a/queue-6.1/fs-jfs-add-check-for-negative-db_l2nbperpage.patch b/queue-6.1/fs-jfs-add-check-for-negative-db_l2nbperpage.patch new file mode 100644 index 00000000000..6dc3751fc34 --- /dev/null +++ b/queue-6.1/fs-jfs-add-check-for-negative-db_l2nbperpage.patch @@ -0,0 +1,46 @@ +From 1f8fa87d7da5c893e37b94ca4e63699fff68d8a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Oct 2023 17:56:58 +0800 +Subject: fs/jfs: Add check for negative db_l2nbperpage + +From: Juntong Deng + +[ Upstream commit 525b861a008143048535011f3816d407940f4bfa ] + +l2nbperpage is log2(number of blks per page), and the minimum legal +value should be 0, not negative. + +In the case of l2nbperpage being negative, an error will occur +when subsequently used as shift exponent. + +Syzbot reported this bug: + +UBSAN: shift-out-of-bounds in fs/jfs/jfs_dmap.c:799:12 +shift exponent -16777216 is negative + +Reported-by: syzbot+debee9ab7ae2b34b0307@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=debee9ab7ae2b34b0307 +Signed-off-by: Juntong Deng +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_dmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c +index e9d075cbd71ad..ee949e329c6e0 100644 +--- a/fs/jfs/jfs_dmap.c ++++ b/fs/jfs/jfs_dmap.c +@@ -180,7 +180,8 @@ int dbMount(struct inode *ipbmap) + bmp->db_nfree = le64_to_cpu(dbmp_le->dn_nfree); + + bmp->db_l2nbperpage = le32_to_cpu(dbmp_le->dn_l2nbperpage); +- if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE) { ++ if (bmp->db_l2nbperpage > L2PSIZE - L2MINBLOCKSIZE || ++ bmp->db_l2nbperpage < 0) { + err = -EINVAL; + goto err_release_metapage; + } +-- +2.42.0 + diff --git a/queue-6.1/fs-jfs-add-validity-check-for-db_maxag-and-db_agpref.patch b/queue-6.1/fs-jfs-add-validity-check-for-db_maxag-and-db_agpref.patch new file mode 100644 index 00000000000..43729b6ad37 --- /dev/null +++ b/queue-6.1/fs-jfs-add-validity-check-for-db_maxag-and-db_agpref.patch @@ -0,0 +1,50 @@ +From 06696b5c3c2dca68f79e44d0e29deee5ab686e6b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Oct 2023 02:06:41 +0800 +Subject: fs/jfs: Add validity check for db_maxag and db_agpref + +From: Juntong Deng + +[ Upstream commit 64933ab7b04881c6c18b21ff206c12278341c72e ] + +Both db_maxag and db_agpref are used as the index of the +db_agfree array, but there is currently no validity check for +db_maxag and db_agpref, which can lead to errors. + +The following is related bug reported by Syzbot: + +UBSAN: array-index-out-of-bounds in fs/jfs/jfs_dmap.c:639:20 +index 7936 is out of range for type 'atomic_t[128]' + +Add checking that the values of db_maxag and db_agpref are valid +indexes for the db_agfree array. + +Reported-by: syzbot+38e876a8aa44b7115c76@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=38e876a8aa44b7115c76 +Signed-off-by: Juntong Deng +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_dmap.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c +index ee949e329c6e0..e2927d1f3d1d3 100644 +--- a/fs/jfs/jfs_dmap.c ++++ b/fs/jfs/jfs_dmap.c +@@ -195,6 +195,12 @@ int dbMount(struct inode *ipbmap) + bmp->db_maxlevel = le32_to_cpu(dbmp_le->dn_maxlevel); + bmp->db_maxag = le32_to_cpu(dbmp_le->dn_maxag); + bmp->db_agpref = le32_to_cpu(dbmp_le->dn_agpref); ++ if (bmp->db_maxag >= MAXAG || bmp->db_maxag < 0 || ++ bmp->db_agpref >= MAXAG || bmp->db_agpref < 0) { ++ err = -EINVAL; ++ goto err_release_metapage; ++ } ++ + bmp->db_aglevel = le32_to_cpu(dbmp_le->dn_aglevel); + bmp->db_agheight = le32_to_cpu(dbmp_le->dn_agheight); + bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth); +-- +2.42.0 + diff --git a/queue-6.1/gfs2-fix-an-oops-in-gfs2_permission.patch b/queue-6.1/gfs2-fix-an-oops-in-gfs2_permission.patch new file mode 100644 index 00000000000..e52a7619e9b --- /dev/null +++ b/queue-6.1/gfs2-fix-an-oops-in-gfs2_permission.patch @@ -0,0 +1,67 @@ +From b2d2a7398bba3e78b34b75b89b1bbb018bbb68ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Oct 2023 03:33:44 +0100 +Subject: gfs2: fix an oops in gfs2_permission + +From: Al Viro + +[ Upstream commit 0abd1557e21c617bd13fc18f7725fc6363c05913 ] + +In RCU mode, we might race with gfs2_evict_inode(), which zeroes +->i_gl. Freeing of the object it points to is RCU-delayed, so +if we manage to fetch the pointer before it's been replaced with +NULL, we are fine. Check if we'd fetched NULL and treat that +as "bail out and tell the caller to get out of RCU mode". + +Signed-off-by: Al Viro +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/inode.c | 11 +++++++++-- + fs/gfs2/super.c | 2 +- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c +index 04a201584fa7c..d126b02893eb0 100644 +--- a/fs/gfs2/inode.c ++++ b/fs/gfs2/inode.c +@@ -1847,14 +1847,21 @@ int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode, + { + struct gfs2_inode *ip; + struct gfs2_holder i_gh; ++ struct gfs2_glock *gl; + int error; + + gfs2_holder_mark_uninitialized(&i_gh); + ip = GFS2_I(inode); +- if (gfs2_glock_is_locked_by_me(ip->i_gl) == NULL) { ++ gl = rcu_dereference(ip->i_gl); ++ if (unlikely(!gl)) { ++ /* inode is getting torn down, must be RCU mode */ ++ WARN_ON_ONCE(!(mask & MAY_NOT_BLOCK)); ++ return -ECHILD; ++ } ++ if (gfs2_glock_is_locked_by_me(gl) == NULL) { + if (mask & MAY_NOT_BLOCK) + return -ECHILD; +- error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); ++ error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); + if (error) + return error; + } +diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c +index 44c564f0bc622..302d1e43d7012 100644 +--- a/fs/gfs2/super.c ++++ b/fs/gfs2/super.c +@@ -1435,7 +1435,7 @@ static void gfs2_evict_inode(struct inode *inode) + wait_on_bit_io(&ip->i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE); + gfs2_glock_add_to_lru(ip->i_gl); + gfs2_glock_put_eventually(ip->i_gl); +- ip->i_gl = NULL; ++ rcu_assign_pointer(ip->i_gl, NULL); + } + } + +-- +2.42.0 + diff --git a/queue-6.1/gfs2-ignore-negated-quota-changes.patch b/queue-6.1/gfs2-ignore-negated-quota-changes.patch new file mode 100644 index 00000000000..4ea62e5a883 --- /dev/null +++ b/queue-6.1/gfs2-ignore-negated-quota-changes.patch @@ -0,0 +1,91 @@ +From fe958226c8bdb9d1663937b4c1aeb90a02bbe8b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 08:46:43 -0500 +Subject: gfs2: ignore negated quota changes + +From: Bob Peterson + +[ Upstream commit 4c6a08125f2249531ec01783a5f4317d7342add5 ] + +When lots of quota changes are made, there may be cases in which an +inode's quota information is increased and then decreased, such as when +blocks are added to a file, then deleted from it. If the timing is +right, function do_qc can add pending quota changes to a transaction, +then later, another call to do_qc can negate those changes, resulting +in a net gain of 0. The quota_change information is recorded in the qc +buffer (and qd element of the inode as well). The buffer is added to the +transaction by the first call to do_qc, but a subsequent call changes +the value from non-zero back to zero. At that point it's too late to +remove the buffer_head from the transaction. Later, when the quota sync +code is called, the zero-change qd element is discovered and flagged as +an assert warning. If the fs is mounted with errors=panic, the kernel +will panic. + +This is usually seen when files are truncated and the quota changes are +negated by punch_hole/truncate which uses gfs2_quota_hold and +gfs2_quota_unhold rather than block allocations that use gfs2_quota_lock +and gfs2_quota_unlock which automatically do quota sync. + +This patch solves the problem by adding a check to qd_check_sync such +that net-zero quota changes already added to the transaction are no +longer deemed necessary to be synced, and skipped. + +In this case references are taken for the qd and the slot from do_qc +so those need to be put. The normal sequence of events for a normal +non-zero quota change is as follows: + +gfs2_quota_change + do_qc + qd_hold + slot_hold + +Later, when the changes are to be synced: + +gfs2_quota_sync + qd_fish + qd_check_sync + gets qd ref via lockref_get_not_dead + do_sync + do_qc(QC_SYNC) + qd_put + lockref_put_or_lock + qd_unlock + qd_put + lockref_put_or_lock + +In the net-zero change case, we add a check to qd_check_sync so it puts +the qd and slot references acquired in gfs2_quota_change and skip the +unneeded sync. + +Signed-off-by: Bob Peterson +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/quota.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c +index 1ed17226d9ede..86bc73bd770b4 100644 +--- a/fs/gfs2/quota.c ++++ b/fs/gfs2/quota.c +@@ -438,6 +438,17 @@ static int qd_check_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd, + (sync_gen && (qd->qd_sync_gen >= *sync_gen))) + return 0; + ++ /* ++ * If qd_change is 0 it means a pending quota change was negated. ++ * We should not sync it, but we still have a qd reference and slot ++ * reference taken by gfs2_quota_change -> do_qc that need to be put. ++ */ ++ if (!qd->qd_change && test_and_clear_bit(QDF_CHANGE, &qd->qd_flags)) { ++ slot_put(qd); ++ qd_put(qd); ++ return 0; ++ } ++ + if (!lockref_get_not_dead(&qd->qd_lockref)) + return 0; + +-- +2.42.0 + diff --git a/queue-6.1/gfs2-silence-suspicious-rcu-usage-in-gfs2_permission.patch b/queue-6.1/gfs2-silence-suspicious-rcu-usage-in-gfs2_permission.patch new file mode 100644 index 00000000000..dbeca81f587 --- /dev/null +++ b/queue-6.1/gfs2-silence-suspicious-rcu-usage-in-gfs2_permission.patch @@ -0,0 +1,59 @@ +From 1947546d2ee5bbd3e4e5596ed11634a5dc99038b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Oct 2023 22:06:05 +0100 +Subject: gfs2: Silence "suspicious RCU usage in gfs2_permission" warning + +From: Andreas Gruenbacher + +[ Upstream commit 074d7306a4fe22fcac0b53f699f92757ab1cee99 ] + +Commit 0abd1557e21c added rcu_dereference() for dereferencing ip->i_gl +in gfs2_permission. This now causes lockdep to complain when +gfs2_permission is called in non-RCU context: + + WARNING: suspicious RCU usage in gfs2_permission + +Switch to rcu_dereference_check() and check for the MAY_NOT_BLOCK flag +to shut up lockdep when we know that dereferencing ip->i_gl is safe. + +Fixes: 0abd1557e21c ("gfs2: fix an oops in gfs2_permission") +Reported-by: syzbot+3e5130844b0c0e2b4948@syzkaller.appspotmail.com +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/inode.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c +index d126b02893eb0..23e6962cdd6e3 100644 +--- a/fs/gfs2/inode.c ++++ b/fs/gfs2/inode.c +@@ -1845,6 +1845,7 @@ static const char *gfs2_get_link(struct dentry *dentry, + int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode, + int mask) + { ++ int may_not_block = mask & MAY_NOT_BLOCK; + struct gfs2_inode *ip; + struct gfs2_holder i_gh; + struct gfs2_glock *gl; +@@ -1852,14 +1853,14 @@ int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode, + + gfs2_holder_mark_uninitialized(&i_gh); + ip = GFS2_I(inode); +- gl = rcu_dereference(ip->i_gl); ++ gl = rcu_dereference_check(ip->i_gl, !may_not_block); + if (unlikely(!gl)) { + /* inode is getting torn down, must be RCU mode */ +- WARN_ON_ONCE(!(mask & MAY_NOT_BLOCK)); ++ WARN_ON_ONCE(!may_not_block); + return -ECHILD; + } + if (gfs2_glock_is_locked_by_me(gl) == NULL) { +- if (mask & MAY_NOT_BLOCK) ++ if (may_not_block) + return -ECHILD; + error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); + if (error) +-- +2.42.0 + diff --git a/queue-6.1/hid-add-quirk-for-dell-pro-wireless-keyboard-and-mou.patch b/queue-6.1/hid-add-quirk-for-dell-pro-wireless-keyboard-and-mou.patch new file mode 100644 index 00000000000..ef6383c1fdb --- /dev/null +++ b/queue-6.1/hid-add-quirk-for-dell-pro-wireless-keyboard-and-mou.patch @@ -0,0 +1,47 @@ +From 144239a5e17c1b9c60b477ccc276860936512b06 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Oct 2023 15:32:09 +0200 +Subject: HID: Add quirk for Dell Pro Wireless Keyboard and Mouse KM5221W + +From: Jiri Kosina + +[ Upstream commit 62cc9c3cb3ec1bf31cc116146185ed97b450836a ] + +This device needs ALWAYS_POLL quirk, otherwise it keeps reconnecting +indefinitely. + +Reported-by: Robert Ayrapetyan +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 9a17e5cc3539b..130fc5f341422 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -365,6 +365,7 @@ + + #define USB_VENDOR_ID_DELL 0x413c + #define USB_DEVICE_ID_DELL_PIXART_USB_OPTICAL_MOUSE 0x301a ++#define USB_DEVICE_ID_DELL_PRO_WIRELESS_KM5221W 0x4503 + + #define USB_VENDOR_ID_DELORME 0x1163 + #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index f8f20a7c24b17..056bb32091285 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -66,6 +66,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_STRAFE), HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51), HID_QUIRK_NOGET }, + { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_PRO_WIRELESS_KM5221W), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC), HID_QUIRK_NOGET }, + { HID_USB_DEVICE(USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES), HID_QUIRK_MULTI_INPUT }, +-- +2.42.0 + diff --git a/queue-6.1/hid-lenovo-detect-quirk-free-fw-on-cptkbd-and-stop-a.patch b/queue-6.1/hid-lenovo-detect-quirk-free-fw-on-cptkbd-and-stop-a.patch new file mode 100644 index 00000000000..1d3a34c12eb --- /dev/null +++ b/queue-6.1/hid-lenovo-detect-quirk-free-fw-on-cptkbd-and-stop-a.patch @@ -0,0 +1,127 @@ +From f924c7e4917bbb942a694b6f28efc52683d38c10 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 24 Sep 2023 01:58:30 +0300 +Subject: HID: lenovo: Detect quirk-free fw on cptkbd and stop applying + workaround + +From: Mikhail Khvainitski + +[ Upstream commit 46a0a2c96f0f47628190f122c2e3d879e590bcbe ] + +Built-in firmware of cptkbd handles scrolling by itself (when middle +button is pressed) but with issues: it does not support horizontal and +hi-res scrolling and upon middle button release it sends middle button +click even if there was a scrolling event. Commit 3cb5ff0220e3 ("HID: +lenovo: Hide middle-button press until release") workarounds last +issue but it's impossible to workaround scrolling-related issues +without firmware modification. + +Likely, Dennis Schneider has reverse engineered the firmware and +provided an instruction on how to patch it [1]. However, +aforementioned workaround prevents userspace (libinput) from knowing +exact moment when middle button has been pressed down and performing +"On-Button scrolling". This commit detects correctly-behaving patched +firmware if cursor movement events has been received during middle +button being pressed and stops applying workaround for this device. + +Link: https://hohlerde.org/rauch/en/elektronik/projekte/tpkbd-fix/ [1] + +Signed-off-by: Mikhail Khvainitski +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-lenovo.c | 68 ++++++++++++++++++++++++++-------------- + 1 file changed, 45 insertions(+), 23 deletions(-) + +diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c +index 44763c0da4441..9c1181313e44d 100644 +--- a/drivers/hid/hid-lenovo.c ++++ b/drivers/hid/hid-lenovo.c +@@ -51,7 +51,12 @@ struct lenovo_drvdata { + int select_right; + int sensitivity; + int press_speed; +- u8 middlebutton_state; /* 0:Up, 1:Down (undecided), 2:Scrolling */ ++ /* 0: Up ++ * 1: Down (undecided) ++ * 2: Scrolling ++ * 3: Patched firmware, disable workaround ++ */ ++ u8 middlebutton_state; + bool fn_lock; + }; + +@@ -668,31 +673,48 @@ static int lenovo_event_cptkbd(struct hid_device *hdev, + { + struct lenovo_drvdata *cptkbd_data = hid_get_drvdata(hdev); + +- /* "wheel" scroll events */ +- if (usage->type == EV_REL && (usage->code == REL_WHEEL || +- usage->code == REL_HWHEEL)) { +- /* Scroll events disable middle-click event */ +- cptkbd_data->middlebutton_state = 2; +- return 0; +- } ++ if (cptkbd_data->middlebutton_state != 3) { ++ /* REL_X and REL_Y events during middle button pressed ++ * are only possible on patched, bug-free firmware ++ * so set middlebutton_state to 3 ++ * to never apply workaround anymore ++ */ ++ if (cptkbd_data->middlebutton_state == 1 && ++ usage->type == EV_REL && ++ (usage->code == REL_X || usage->code == REL_Y)) { ++ cptkbd_data->middlebutton_state = 3; ++ /* send middle button press which was hold before */ ++ input_event(field->hidinput->input, ++ EV_KEY, BTN_MIDDLE, 1); ++ input_sync(field->hidinput->input); ++ } + +- /* Middle click events */ +- if (usage->type == EV_KEY && usage->code == BTN_MIDDLE) { +- if (value == 1) { +- cptkbd_data->middlebutton_state = 1; +- } else if (value == 0) { +- if (cptkbd_data->middlebutton_state == 1) { +- /* No scrolling inbetween, send middle-click */ +- input_event(field->hidinput->input, +- EV_KEY, BTN_MIDDLE, 1); +- input_sync(field->hidinput->input); +- input_event(field->hidinput->input, +- EV_KEY, BTN_MIDDLE, 0); +- input_sync(field->hidinput->input); ++ /* "wheel" scroll events */ ++ if (usage->type == EV_REL && (usage->code == REL_WHEEL || ++ usage->code == REL_HWHEEL)) { ++ /* Scroll events disable middle-click event */ ++ cptkbd_data->middlebutton_state = 2; ++ return 0; ++ } ++ ++ /* Middle click events */ ++ if (usage->type == EV_KEY && usage->code == BTN_MIDDLE) { ++ if (value == 1) { ++ cptkbd_data->middlebutton_state = 1; ++ } else if (value == 0) { ++ if (cptkbd_data->middlebutton_state == 1) { ++ /* No scrolling inbetween, send middle-click */ ++ input_event(field->hidinput->input, ++ EV_KEY, BTN_MIDDLE, 1); ++ input_sync(field->hidinput->input); ++ input_event(field->hidinput->input, ++ EV_KEY, BTN_MIDDLE, 0); ++ input_sync(field->hidinput->input); ++ } ++ cptkbd_data->middlebutton_state = 0; + } +- cptkbd_data->middlebutton_state = 0; ++ return 1; + } +- return 1; + } + + if (usage->type == EV_KEY && usage->code == KEY_FN_ESC && value == 1) { +-- +2.42.0 + diff --git a/queue-6.1/i2c-dev-copy-userspace-array-safely.patch b/queue-6.1/i2c-dev-copy-userspace-array-safely.patch new file mode 100644 index 00000000000..3107fe8d1f4 --- /dev/null +++ b/queue-6.1/i2c-dev-copy-userspace-array-safely.patch @@ -0,0 +1,40 @@ +From 8710bd2a002a52118bb6d6c0bd5dc205ac7ba3b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Nov 2023 20:26:13 +0100 +Subject: i2c: dev: copy userspace array safely + +From: Philipp Stanner + +[ Upstream commit cc9c54232f04aef3a5d7f64a0ece7df00f1aaa3d ] + +i2c-dev.c utilizes memdup_user() to copy a userspace array. This is done +without an overflow check. + +Use the new wrapper memdup_array_user() to copy the array more safely. + +Suggested-by: Dave Airlie +Signed-off-by: Philipp Stanner +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/i2c-dev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c +index ab0adaa130dae..dd35f341b16fd 100644 +--- a/drivers/i2c/i2c-dev.c ++++ b/drivers/i2c/i2c-dev.c +@@ -450,8 +450,8 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) + if (rdwr_arg.nmsgs > I2C_RDWR_IOCTL_MAX_MSGS) + return -EINVAL; + +- rdwr_pa = memdup_user(rdwr_arg.msgs, +- rdwr_arg.nmsgs * sizeof(struct i2c_msg)); ++ rdwr_pa = memdup_array_user(rdwr_arg.msgs, ++ rdwr_arg.nmsgs, sizeof(struct i2c_msg)); + if (IS_ERR(rdwr_pa)) + return PTR_ERR(rdwr_pa); + +-- +2.42.0 + diff --git a/queue-6.1/i2c-fix-memleak-in-i2c_new_client_device.patch b/queue-6.1/i2c-fix-memleak-in-i2c_new_client_device.patch new file mode 100644 index 00000000000..9e7ba76c452 --- /dev/null +++ b/queue-6.1/i2c-fix-memleak-in-i2c_new_client_device.patch @@ -0,0 +1,99 @@ +From fcc914175659573e9851df22fe9367b615d4ba4c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 29 Sep 2023 11:19:52 +0200 +Subject: i2c: fix memleak in i2c_new_client_device() + +From: Wolfram Sang + +[ Upstream commit 6af79f7fe748fe6a3c5c3a63d7f35981a82c2769 ] + +Yang Yingliang reported a memleak: +=== + +I got memory leak as follows when doing fault injection test: + +unreferenced object 0xffff888014aec078 (size 8): + comm "xrun", pid 356, jiffies 4294910619 (age 16.332s) + hex dump (first 8 bytes): + 31 2d 30 30 31 63 00 00 1-001c.. + backtrace: + [<00000000eb56c0a9>] __kmalloc_track_caller+0x1a6/0x300 + [<000000000b220ea3>] kvasprintf+0xad/0x140 + [<00000000b83203e5>] kvasprintf_const+0x62/0x190 + [<000000002a5eab37>] kobject_set_name_vargs+0x56/0x140 + [<00000000300ac279>] dev_set_name+0xb0/0xe0 + [<00000000b66ebd6f>] i2c_new_client_device+0x7e4/0x9a0 + +If device_register() returns error in i2c_new_client_device(), +the name allocated by i2c_dev_set_name() need be freed. As +comment of device_register() says, it should use put_device() +to give up the reference in the error path. + +=== +I think this solution is less intrusive and more robust than he +originally proposed solutions, though. + +Reported-by: Yang Yingliang +Closes: http://patchwork.ozlabs.org/project/linux-i2c/patch/20221124085448.3620240-1-yangyingliang@huawei.com/ +Signed-off-by: Wolfram Sang +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/i2c-core-base.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c +index 7539b0740351d..5e3976ba52650 100644 +--- a/drivers/i2c/i2c-core-base.c ++++ b/drivers/i2c/i2c-core-base.c +@@ -916,8 +916,9 @@ int i2c_dev_irq_from_resources(const struct resource *resources, + struct i2c_client * + i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info) + { +- struct i2c_client *client; +- int status; ++ struct i2c_client *client; ++ bool need_put = false; ++ int status; + + client = kzalloc(sizeof *client, GFP_KERNEL); + if (!client) +@@ -955,7 +956,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf + client->dev.fwnode = info->fwnode; + + device_enable_async_suspend(&client->dev); +- i2c_dev_set_name(adap, client, info); + + if (info->swnode) { + status = device_add_software_node(&client->dev, info->swnode); +@@ -967,6 +967,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf + } + } + ++ i2c_dev_set_name(adap, client, info); + status = device_register(&client->dev); + if (status) + goto out_remove_swnode; +@@ -978,6 +979,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf + + out_remove_swnode: + device_remove_software_node(&client->dev); ++ need_put = true; + out_err_put_of_node: + of_node_put(info->of_node); + out_err: +@@ -985,7 +987,10 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf + "Failed to register i2c client %s at 0x%02x (%d)\n", + client->name, client->addr, status); + out_err_silent: +- kfree(client); ++ if (need_put) ++ put_device(&client->dev); ++ else ++ kfree(client); + return ERR_PTR(status); + } + EXPORT_SYMBOL_GPL(i2c_new_client_device); +-- +2.42.0 + diff --git a/queue-6.1/i2c-sun6i-p2wi-prevent-potential-division-by-zero.patch b/queue-6.1/i2c-sun6i-p2wi-prevent-potential-division-by-zero.patch new file mode 100644 index 00000000000..8b563d73efa --- /dev/null +++ b/queue-6.1/i2c-sun6i-p2wi-prevent-potential-division-by-zero.patch @@ -0,0 +1,39 @@ +From 17de772e58f8b85ab934a9a28d0c6257eaf5816c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Apr 2016 08:54:30 +0800 +Subject: i2c: sun6i-p2wi: Prevent potential division by zero + +From: Axel Lin + +[ Upstream commit 5ac61d26b8baff5b2e5a9f3dc1ef63297e4b53e7 ] + +Make sure we don't OOPS in case clock-frequency is set to 0 in a DT. The +variable set here is later used as a divisor. + +Signed-off-by: Axel Lin +Acked-by: Boris Brezillon +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c +index 9e3483f507ff5..f2ed13b551088 100644 +--- a/drivers/i2c/busses/i2c-sun6i-p2wi.c ++++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c +@@ -201,6 +201,11 @@ static int p2wi_probe(struct platform_device *pdev) + return -EINVAL; + } + ++ if (clk_freq == 0) { ++ dev_err(dev, "clock-frequency is set to 0 in DT\n"); ++ return -EINVAL; ++ } ++ + if (of_get_child_count(np) > 1) { + dev_err(dev, "P2WI only supports one slave device\n"); + return -EINVAL; +-- +2.42.0 + diff --git a/queue-6.1/i3c-master-mipi-i3c-hci-fix-a-kernel-panic-for-acces.patch b/queue-6.1/i3c-master-mipi-i3c-hci-fix-a-kernel-panic-for-acces.patch new file mode 100644 index 00000000000..57f8607b27d --- /dev/null +++ b/queue-6.1/i3c-master-mipi-i3c-hci-fix-a-kernel-panic-for-acces.patch @@ -0,0 +1,82 @@ +From 84fb8f5a1a08473f80e833f1a992776443e3f56e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Oct 2023 16:02:37 +0800 +Subject: i3c: master: mipi-i3c-hci: Fix a kernel panic for accessing DAT_data. + +From: Billy Tsai + +[ Upstream commit b53e9758a31c683fc8615df930262192ed5f034b ] + +The `i3c_master_bus_init` function may attach the I2C devices before the +I3C bus initialization. In this flow, the DAT `alloc_entry`` will be used +before the DAT `init`. Additionally, if the `i3c_master_bus_init` fails, +the DAT `cleanup` will execute before the device is detached, which will +execue DAT `free_entry` function. The above scenario can cause the driver +to use DAT_data when it is NULL. + +Signed-off-by: Billy Tsai +Link: https://lore.kernel.org/r/20231023080237.560936-1-billy_tsai@aspeedtech.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 29 ++++++++++++++++-------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +diff --git a/drivers/i3c/master/mipi-i3c-hci/dat_v1.c b/drivers/i3c/master/mipi-i3c-hci/dat_v1.c +index 97bb49ff5b53b..47b9b4d4ed3fc 100644 +--- a/drivers/i3c/master/mipi-i3c-hci/dat_v1.c ++++ b/drivers/i3c/master/mipi-i3c-hci/dat_v1.c +@@ -64,15 +64,17 @@ static int hci_dat_v1_init(struct i3c_hci *hci) + return -EOPNOTSUPP; + } + +- /* use a bitmap for faster free slot search */ +- hci->DAT_data = bitmap_zalloc(hci->DAT_entries, GFP_KERNEL); +- if (!hci->DAT_data) +- return -ENOMEM; +- +- /* clear them */ +- for (dat_idx = 0; dat_idx < hci->DAT_entries; dat_idx++) { +- dat_w0_write(dat_idx, 0); +- dat_w1_write(dat_idx, 0); ++ if (!hci->DAT_data) { ++ /* use a bitmap for faster free slot search */ ++ hci->DAT_data = bitmap_zalloc(hci->DAT_entries, GFP_KERNEL); ++ if (!hci->DAT_data) ++ return -ENOMEM; ++ ++ /* clear them */ ++ for (dat_idx = 0; dat_idx < hci->DAT_entries; dat_idx++) { ++ dat_w0_write(dat_idx, 0); ++ dat_w1_write(dat_idx, 0); ++ } + } + + return 0; +@@ -87,7 +89,13 @@ static void hci_dat_v1_cleanup(struct i3c_hci *hci) + static int hci_dat_v1_alloc_entry(struct i3c_hci *hci) + { + unsigned int dat_idx; ++ int ret; + ++ if (!hci->DAT_data) { ++ ret = hci_dat_v1_init(hci); ++ if (ret) ++ return ret; ++ } + dat_idx = find_first_zero_bit(hci->DAT_data, hci->DAT_entries); + if (dat_idx >= hci->DAT_entries) + return -ENOENT; +@@ -103,7 +111,8 @@ static void hci_dat_v1_free_entry(struct i3c_hci *hci, unsigned int dat_idx) + { + dat_w0_write(dat_idx, 0); + dat_w1_write(dat_idx, 0); +- __clear_bit(dat_idx, hci->DAT_data); ++ if (hci->DAT_data) ++ __clear_bit(dat_idx, hci->DAT_data); + } + + static void hci_dat_v1_set_dynamic_addr(struct i3c_hci *hci, +-- +2.42.0 + diff --git a/queue-6.1/i3c-mipi-i3c-hci-fix-out-of-bounds-access-in-hci_dma.patch b/queue-6.1/i3c-mipi-i3c-hci-fix-out-of-bounds-access-in-hci_dma.patch new file mode 100644 index 00000000000..4ee13ef363b --- /dev/null +++ b/queue-6.1/i3c-mipi-i3c-hci-fix-out-of-bounds-access-in-hci_dma.patch @@ -0,0 +1,38 @@ +From 051642b5c70e041280fad65ffa3c3ba563568d29 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 08:56:56 +0300 +Subject: i3c: mipi-i3c-hci: Fix out of bounds access in hci_dma_irq_handler + +From: Jarkko Nikula + +[ Upstream commit 45a832f989e520095429589d5b01b0c65da9b574 ] + +Do not loop over ring headers in hci_dma_irq_handler() that are not +allocated and enabled in hci_dma_init(). Otherwise out of bounds access +will occur from rings->headers[i] access when i >= number of allocated +ring headers. + +Signed-off-by: Jarkko Nikula +Link: https://lore.kernel.org/r/20230921055704.1087277-5-jarkko.nikula@linux.intel.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c +index 2990ac9eaade7..71b5dbe45c45c 100644 +--- a/drivers/i3c/master/mipi-i3c-hci/dma.c ++++ b/drivers/i3c/master/mipi-i3c-hci/dma.c +@@ -734,7 +734,7 @@ static bool hci_dma_irq_handler(struct i3c_hci *hci, unsigned int mask) + unsigned int i; + bool handled = false; + +- for (i = 0; mask && i < 8; i++) { ++ for (i = 0; mask && i < rings->total; i++) { + struct hci_rh_data *rh; + u32 status; + +-- +2.42.0 + diff --git a/queue-6.1/iio-adc-stm32-adc-harden-against-null-pointer-deref-.patch b/queue-6.1/iio-adc-stm32-adc-harden-against-null-pointer-deref-.patch new file mode 100644 index 00000000000..8dd3ca0ed8f --- /dev/null +++ b/queue-6.1/iio-adc-stm32-adc-harden-against-null-pointer-deref-.patch @@ -0,0 +1,53 @@ +From 76e5cd5071337b23327e5d5a00fa4c2357848a39 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Jul 2023 23:55:50 +0800 +Subject: iio: adc: stm32-adc: harden against NULL pointer deref in + stm32_adc_probe() + +From: Zhang Shurong + +[ Upstream commit 3a23b384e7e3d64d5587ad10729a34d4f761517e ] + +of_match_device() may fail and returns a NULL pointer. + +In practice there is no known reasonable way to trigger this, but +in case one is added in future, harden the code by adding the check + +Signed-off-by: Zhang Shurong +Link: https://lore.kernel.org/r/tencent_994DA85912C937E3B5405BA960B31ED90A08@qq.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/stm32-adc-core.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c +index 81d5db91c67bf..dee47b899e5df 100644 +--- a/drivers/iio/adc/stm32-adc-core.c ++++ b/drivers/iio/adc/stm32-adc-core.c +@@ -695,6 +695,8 @@ static int stm32_adc_probe(struct platform_device *pdev) + struct stm32_adc_priv *priv; + struct device *dev = &pdev->dev; + struct device_node *np = pdev->dev.of_node; ++ const struct of_device_id *of_id; ++ + struct resource *res; + u32 max_rate; + int ret; +@@ -707,8 +709,11 @@ static int stm32_adc_probe(struct platform_device *pdev) + return -ENOMEM; + platform_set_drvdata(pdev, &priv->common); + +- priv->cfg = (const struct stm32_adc_priv_cfg *) +- of_match_device(dev->driver->of_match_table, dev)->data; ++ of_id = of_match_device(dev->driver->of_match_table, dev); ++ if (!of_id) ++ return -ENODEV; ++ ++ priv->cfg = (const struct stm32_adc_priv_cfg *)of_id->data; + priv->nb_adc_max = priv->cfg->num_adcs; + spin_lock_init(&priv->common.lock); + +-- +2.42.0 + diff --git a/queue-6.1/ipvlan-add-ipvlan_route_v6_outbound-helper.patch b/queue-6.1/ipvlan-add-ipvlan_route_v6_outbound-helper.patch new file mode 100644 index 00000000000..988ea9af747 --- /dev/null +++ b/queue-6.1/ipvlan-add-ipvlan_route_v6_outbound-helper.patch @@ -0,0 +1,272 @@ +From 6af23c0606a1ee21afb75e131e60bac649973bde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 15:22:41 +0000 +Subject: ipvlan: add ipvlan_route_v6_outbound() helper + +From: Eric Dumazet + +[ Upstream commit 18f039428c7df183b09c69ebf10ffd4e521035d2 ] + +Inspired by syzbot reports using a stack of multiple ipvlan devices. + +Reduce stack size needed in ipvlan_process_v6_outbound() by moving +the flowi6 struct used for the route lookup in an non inlined +helper. ipvlan_route_v6_outbound() needs 120 bytes on the stack, +immediately reclaimed. + +Also make sure ipvlan_process_v4_outbound() is not inlined. + +We might also have to lower MAX_NEST_DEV, because only syzbot uses +setups with more than four stacked devices. + +BUG: TASK stack guard page was hit at ffffc9000e803ff8 (stack is ffffc9000e804000..ffffc9000e808000) +stack guard page: 0000 [#1] SMP KASAN +CPU: 0 PID: 13442 Comm: syz-executor.4 Not tainted 6.1.52-syzkaller #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/09/2023 +RIP: 0010:kasan_check_range+0x4/0x2a0 mm/kasan/generic.c:188 +Code: 48 01 c6 48 89 c7 e8 db 4e c1 03 31 c0 5d c3 cc 0f 0b eb 02 0f 0b b8 ea ff ff ff 5d c3 cc 00 00 cc cc 00 00 cc cc 55 48 89 e5 <41> 57 41 56 41 55 41 54 53 b0 01 48 85 f6 0f 84 a4 01 00 00 48 89 +RSP: 0018:ffffc9000e804000 EFLAGS: 00010246 +RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff817e5bf2 +RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffffffff887c6568 +RBP: ffffc9000e804000 R08: 0000000000000000 R09: 0000000000000000 +R10: 0000000000000000 R11: dffffc0000000001 R12: 1ffff92001d0080c +R13: dffffc0000000000 R14: ffffffff87e6b100 R15: 0000000000000000 +FS: 00007fd0c55826c0(0000) GS:ffff8881f6800000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: ffffc9000e803ff8 CR3: 0000000170ef7000 CR4: 00000000003506f0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: +<#DF> + + +[] __kasan_check_read+0x11/0x20 mm/kasan/shadow.c:31 +[] instrument_atomic_read include/linux/instrumented.h:72 [inline] +[] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] +[] cpumask_test_cpu include/linux/cpumask.h:506 [inline] +[] cpu_online include/linux/cpumask.h:1092 [inline] +[] trace_lock_acquire include/trace/events/lock.h:24 [inline] +[] lock_acquire+0xe2/0x590 kernel/locking/lockdep.c:5632 +[] rcu_lock_acquire+0x2e/0x40 include/linux/rcupdate.h:306 +[] rcu_read_lock include/linux/rcupdate.h:747 [inline] +[] ip6_pol_route+0x15d/0x1440 net/ipv6/route.c:2221 +[] ip6_pol_route_output+0x50/0x80 net/ipv6/route.c:2606 +[] pol_lookup_func include/net/ip6_fib.h:584 [inline] +[] fib6_rule_lookup+0x265/0x620 net/ipv6/fib6_rules.c:116 +[] ip6_route_output_flags_noref+0x2d9/0x3a0 net/ipv6/route.c:2638 +[] ip6_route_output_flags+0xca/0x340 net/ipv6/route.c:2651 +[] ip6_route_output include/net/ip6_route.h:100 [inline] +[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:473 [inline] +[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] +[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] +[] ipvlan_queue_xmit+0xc33/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 +[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 +[] netdev_start_xmit include/linux/netdevice.h:4966 [inline] +[] xmit_one net/core/dev.c:3644 [inline] +[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 +[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 +[] dev_queue_xmit include/linux/netdevice.h:3067 [inline] +[] neigh_hh_output include/net/neighbour.h:529 [inline] +[] neigh_output include/net/neighbour.h:543 [inline] +[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139 +[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] +[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 +[] NF_HOOK_COND include/linux/netfilter.h:298 [inline] +[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 +[] dst_output include/net/dst.h:444 [inline] +[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 +[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] +[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] +[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] +[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 +[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 +[] netdev_start_xmit include/linux/netdevice.h:4966 [inline] +[] xmit_one net/core/dev.c:3644 [inline] +[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 +[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 +[] dev_queue_xmit include/linux/netdevice.h:3067 [inline] +[] neigh_hh_output include/net/neighbour.h:529 [inline] +[] neigh_output include/net/neighbour.h:543 [inline] +[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139 +[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] +[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 +[] NF_HOOK_COND include/linux/netfilter.h:298 [inline] +[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 +[] dst_output include/net/dst.h:444 [inline] +[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 +[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] +[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] +[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] +[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 +[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 +[] netdev_start_xmit include/linux/netdevice.h:4966 [inline] +[] xmit_one net/core/dev.c:3644 [inline] +[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 +[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 +[] dev_queue_xmit include/linux/netdevice.h:3067 [inline] +[] neigh_hh_output include/net/neighbour.h:529 [inline] +[] neigh_output include/net/neighbour.h:543 [inline] +[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139 +[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] +[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 +[] NF_HOOK_COND include/linux/netfilter.h:298 [inline] +[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 +[] dst_output include/net/dst.h:444 [inline] +[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 +[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] +[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] +[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] +[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 +[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 +[] netdev_start_xmit include/linux/netdevice.h:4966 [inline] +[] xmit_one net/core/dev.c:3644 [inline] +[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 +[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 +[] dev_queue_xmit include/linux/netdevice.h:3067 [inline] +[] neigh_hh_output include/net/neighbour.h:529 [inline] +[] neigh_output include/net/neighbour.h:543 [inline] +[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139 +[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] +[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 +[] NF_HOOK_COND include/linux/netfilter.h:298 [inline] +[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 +[] dst_output include/net/dst.h:444 [inline] +[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 +[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] +[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] +[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] +[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 +[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 +[] netdev_start_xmit include/linux/netdevice.h:4966 [inline] +[] xmit_one net/core/dev.c:3644 [inline] +[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 +[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 +[] dev_queue_xmit include/linux/netdevice.h:3067 [inline] +[] neigh_resolve_output+0x64e/0x750 net/core/neighbour.c:1560 +[] neigh_output include/net/neighbour.h:545 [inline] +[] ip6_finish_output2+0x1643/0x1ae0 net/ipv6/ip6_output.c:139 +[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] +[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 +[] NF_HOOK_COND include/linux/netfilter.h:298 [inline] +[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 +[] dst_output include/net/dst.h:444 [inline] +[] NF_HOOK include/linux/netfilter.h:309 [inline] +[] ip6_xmit+0x11a4/0x1b20 net/ipv6/ip6_output.c:352 +[] sctp_v6_xmit+0x9ae/0x1230 net/sctp/ipv6.c:250 +[] sctp_packet_transmit+0x25de/0x2bc0 net/sctp/output.c:653 +[] sctp_packet_singleton+0x202/0x310 net/sctp/outqueue.c:783 +[] sctp_outq_flush_ctrl net/sctp/outqueue.c:914 [inline] +[] sctp_outq_flush+0x661/0x3d40 net/sctp/outqueue.c:1212 +[] sctp_outq_uncork+0x79/0xb0 net/sctp/outqueue.c:764 +[] sctp_side_effects net/sctp/sm_sideeffect.c:1199 [inline] +[] sctp_do_sm+0x55c0/0x5c30 net/sctp/sm_sideeffect.c:1170 +[] sctp_primitive_ASSOCIATE+0x97/0xc0 net/sctp/primitive.c:73 +[] sctp_sendmsg_to_asoc+0xf62/0x17b0 net/sctp/socket.c:1839 +[] sctp_sendmsg+0x212e/0x33b0 net/sctp/socket.c:2029 +[] inet_sendmsg+0x149/0x310 net/ipv4/af_inet.c:849 +[] sock_sendmsg_nosec net/socket.c:716 [inline] +[] sock_sendmsg net/socket.c:736 [inline] +[] ____sys_sendmsg+0x572/0x8c0 net/socket.c:2504 +[] ___sys_sendmsg net/socket.c:2558 [inline] +[] __sys_sendmsg+0x271/0x360 net/socket.c:2587 +[] __do_sys_sendmsg net/socket.c:2596 [inline] +[] __se_sys_sendmsg net/socket.c:2594 [inline] +[] __x64_sys_sendmsg+0x7f/0x90 net/socket.c:2594 +[] do_syscall_x64 arch/x86/entry/common.c:51 [inline] +[] do_syscall_64+0x53/0x80 arch/x86/entry/common.c:84 +[] entry_SYSCALL_64_after_hwframe+0x63/0xcd + +Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.") +Reported-by: syzbot +Signed-off-by: Eric Dumazet +Cc: Mahesh Bandewar +Cc: Willem de Bruijn +Reviewed-by: Willem de Bruijn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ipvlan/ipvlan_core.c | 41 +++++++++++++++++++------------- + 1 file changed, 25 insertions(+), 16 deletions(-) + +diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c +index b29b7d97b7739..d447f3076e24a 100644 +--- a/drivers/net/ipvlan/ipvlan_core.c ++++ b/drivers/net/ipvlan/ipvlan_core.c +@@ -411,7 +411,7 @@ struct ipvl_addr *ipvlan_addr_lookup(struct ipvl_port *port, void *lyr3h, + return addr; + } + +-static int ipvlan_process_v4_outbound(struct sk_buff *skb) ++static noinline_for_stack int ipvlan_process_v4_outbound(struct sk_buff *skb) + { + const struct iphdr *ip4h = ip_hdr(skb); + struct net_device *dev = skb->dev; +@@ -453,13 +453,11 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb) + } + + #if IS_ENABLED(CONFIG_IPV6) +-static int ipvlan_process_v6_outbound(struct sk_buff *skb) ++ ++static noinline_for_stack int ++ipvlan_route_v6_outbound(struct net_device *dev, struct sk_buff *skb) + { + const struct ipv6hdr *ip6h = ipv6_hdr(skb); +- struct net_device *dev = skb->dev; +- struct net *net = dev_net(dev); +- struct dst_entry *dst; +- int err, ret = NET_XMIT_DROP; + struct flowi6 fl6 = { + .flowi6_oif = dev->ifindex, + .daddr = ip6h->daddr, +@@ -469,27 +467,38 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb) + .flowi6_mark = skb->mark, + .flowi6_proto = ip6h->nexthdr, + }; ++ struct dst_entry *dst; ++ int err; + +- dst = ip6_route_output(net, NULL, &fl6); +- if (dst->error) { +- ret = dst->error; ++ dst = ip6_route_output(dev_net(dev), NULL, &fl6); ++ err = dst->error; ++ if (err) { + dst_release(dst); +- goto err; ++ return err; + } + skb_dst_set(skb, dst); ++ return 0; ++} ++ ++static int ipvlan_process_v6_outbound(struct sk_buff *skb) ++{ ++ struct net_device *dev = skb->dev; ++ int err, ret = NET_XMIT_DROP; ++ ++ err = ipvlan_route_v6_outbound(dev, skb); ++ if (unlikely(err)) { ++ DEV_STATS_INC(dev, tx_errors); ++ kfree_skb(skb); ++ return err; ++ } + + memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); + +- err = ip6_local_out(net, skb->sk, skb); ++ err = ip6_local_out(dev_net(dev), skb->sk, skb); + if (unlikely(net_xmit_eval(err))) + DEV_STATS_INC(dev, tx_errors); + else + ret = NET_XMIT_SUCCESS; +- goto out; +-err: +- DEV_STATS_INC(dev, tx_errors); +- kfree_skb(skb); +-out: + return ret; + } + #else +-- +2.42.0 + diff --git a/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dbfindleaf.patch b/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dbfindleaf.patch new file mode 100644 index 00000000000..49aec344549 --- /dev/null +++ b/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dbfindleaf.patch @@ -0,0 +1,87 @@ +From dd48974f764a76d4561c35b39c57c483bed6f192 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Oct 2023 11:17:18 +0530 +Subject: jfs: fix array-index-out-of-bounds in dbFindLeaf + +From: Manas Ghandat + +[ Upstream commit 22cad8bc1d36547cdae0eef316c47d917ce3147c ] + +Currently while searching for dmtree_t for sufficient free blocks there +is an array out of bounds while getting element in tp->dm_stree. To add +the required check for out of bound we first need to determine the type +of dmtree. Thus added an extra parameter to dbFindLeaf so that the type +of tree can be determined and the required check can be applied. + +Reported-by: syzbot+aea1ad91e854d0a83e04@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=aea1ad91e854d0a83e04 +Signed-off-by: Manas Ghandat +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_dmap.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c +index e2927d1f3d1d3..4d56f6081a5d2 100644 +--- a/fs/jfs/jfs_dmap.c ++++ b/fs/jfs/jfs_dmap.c +@@ -87,7 +87,7 @@ static int dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, + static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks); + static int dbFindBits(u32 word, int l2nb); + static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno); +-static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx); ++static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl); + static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno, + int nblocks); + static int dbFreeDmap(struct bmap * bmp, struct dmap * dp, s64 blkno, +@@ -1717,7 +1717,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno) + * dbFindLeaf() returns the index of the leaf at which + * free space was found. + */ +- rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx); ++ rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx, true); + + /* release the buffer. + */ +@@ -1964,7 +1964,7 @@ dbAllocDmapLev(struct bmap * bmp, + * free space. if sufficient free space is found, dbFindLeaf() + * returns the index of the leaf at which free space was found. + */ +- if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx)) ++ if (dbFindLeaf((dmtree_t *) &dp->tree, l2nb, &leafidx, false)) + return -ENOSPC; + + if (leafidx < 0) +@@ -2928,14 +2928,18 @@ static void dbAdjTree(dmtree_t * tp, int leafno, int newval) + * leafidx - return pointer to be set to the index of the leaf + * describing at least l2nb free blocks if sufficient + * free blocks are found. ++ * is_ctl - determines if the tree is of type ctl + * + * RETURN VALUES: + * 0 - success + * -ENOSPC - insufficient free blocks. + */ +-static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx) ++static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl) + { + int ti, n = 0, k, x = 0; ++ int max_size; ++ ++ max_size = is_ctl ? CTLTREESIZE : TREESIZE; + + /* first check the root of the tree to see if there is + * sufficient free space. +@@ -2956,6 +2960,8 @@ static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx) + /* sufficient free space found. move to the next + * level (or quit if this is the last level). + */ ++ if (x + n > max_size) ++ return -ENOSPC; + if (l2nb <= tp->dmt_stree[x + n]) + break; + } +-- +2.42.0 + diff --git a/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dialloc.patch b/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dialloc.patch new file mode 100644 index 00000000000..afc7aa94dbf --- /dev/null +++ b/queue-6.1/jfs-fix-array-index-out-of-bounds-in-dialloc.patch @@ -0,0 +1,48 @@ +From a7755930032c67b487722a9bd377f78cb6453798 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Oct 2023 13:10:40 +0530 +Subject: jfs: fix array-index-out-of-bounds in diAlloc + +From: Manas Ghandat + +[ Upstream commit 05d9ea1ceb62a55af6727a69269a4fd310edf483 ] + +Currently there is not check against the agno of the iag while +allocating new inodes to avoid fragmentation problem. Added the check +which is required. + +Reported-by: syzbot+79d792676d8ac050949f@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=79d792676d8ac050949f +Signed-off-by: Manas Ghandat +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_imap.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c +index 4899663996d81..6ed2e1d4c894f 100644 +--- a/fs/jfs/jfs_imap.c ++++ b/fs/jfs/jfs_imap.c +@@ -1320,7 +1320,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) + int diAlloc(struct inode *pip, bool dir, struct inode *ip) + { + int rc, ino, iagno, addext, extno, bitno, sword; +- int nwords, rem, i, agno; ++ int nwords, rem, i, agno, dn_numag; + u32 mask, inosmap, extsmap; + struct inode *ipimap; + struct metapage *mp; +@@ -1356,6 +1356,9 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) + + /* get the ag number of this iag */ + agno = BLKTOAG(JFS_IP(pip)->agstart, JFS_SBI(pip->i_sb)); ++ dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag; ++ if (agno < 0 || agno > dn_numag) ++ return -EIO; + + if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) { + /* +-- +2.42.0 + diff --git a/queue-6.1/kernel-kexec-copy-user-array-safely.patch b/queue-6.1/kernel-kexec-copy-user-array-safely.patch new file mode 100644 index 00000000000..f125da9f1ae --- /dev/null +++ b/queue-6.1/kernel-kexec-copy-user-array-safely.patch @@ -0,0 +1,42 @@ +From c38c432f1a42dd147063a47174ff13bf6a8a194a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Sep 2023 14:36:10 +0200 +Subject: kernel: kexec: copy user-array safely + +From: Philipp Stanner + +[ Upstream commit 569c8d82f95eb5993c84fb61a649a9c4ddd208b3 ] + +Currently, there is no overflow-check with memdup_user(). + +Use the new function memdup_array_user() instead of memdup_user() for +duplicating the user-space array safely. + +Suggested-by: David Airlie +Signed-off-by: Philipp Stanner +Acked-by: Baoquan He +Reviewed-by: Kees Cook +Reviewed-by: Zack Rusin +Signed-off-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-4-pstanner@redhat.com +Signed-off-by: Sasha Levin +--- + kernel/kexec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/kexec.c b/kernel/kexec.c +index cb8e6e6f983c7..5ff1dcc4acb78 100644 +--- a/kernel/kexec.c ++++ b/kernel/kexec.c +@@ -240,7 +240,7 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, + ((flags & KEXEC_ARCH_MASK) != KEXEC_ARCH_DEFAULT)) + return -EINVAL; + +- ksegments = memdup_user(segments, nr_segments * sizeof(ksegments[0])); ++ ksegments = memdup_array_user(segments, nr_segments, sizeof(ksegments[0])); + if (IS_ERR(ksegments)) + return PTR_ERR(ksegments); + +-- +2.42.0 + diff --git a/queue-6.1/kernel-watch_queue-copy-user-array-safely.patch b/queue-6.1/kernel-watch_queue-copy-user-array-safely.patch new file mode 100644 index 00000000000..abb05843c18 --- /dev/null +++ b/queue-6.1/kernel-watch_queue-copy-user-array-safely.patch @@ -0,0 +1,41 @@ +From 91395a1f74f01103250ec030388093bdeef97930 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Sep 2023 14:36:11 +0200 +Subject: kernel: watch_queue: copy user-array safely + +From: Philipp Stanner + +[ Upstream commit ca0776571d3163bd03b3e8c9e3da936abfaecbf6 ] + +Currently, there is no overflow-check with memdup_user(). + +Use the new function memdup_array_user() instead of memdup_user() for +duplicating the user-space array safely. + +Suggested-by: David Airlie +Signed-off-by: Philipp Stanner +Reviewed-by: Kees Cook +Reviewed-by: Zack Rusin +Signed-off-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-5-pstanner@redhat.com +Signed-off-by: Sasha Levin +--- + kernel/watch_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c +index 28ed71d277bd7..442bb92212f2a 100644 +--- a/kernel/watch_queue.c ++++ b/kernel/watch_queue.c +@@ -332,7 +332,7 @@ long watch_queue_set_filter(struct pipe_inode_info *pipe, + filter.__reserved != 0) + return -EINVAL; + +- tf = memdup_user(_filter->filters, filter.nr_filters * sizeof(*tf)); ++ tf = memdup_array_user(_filter->filters, filter.nr_filters, sizeof(*tf)); + if (IS_ERR(tf)) + return PTR_ERR(tf); + +-- +2.42.0 + diff --git a/queue-6.1/kgdb-flush-console-before-entering-kgdb-on-panic.patch b/queue-6.1/kgdb-flush-console-before-entering-kgdb-on-panic.patch new file mode 100644 index 00000000000..f8fe049c32e --- /dev/null +++ b/queue-6.1/kgdb-flush-console-before-entering-kgdb-on-panic.patch @@ -0,0 +1,59 @@ +From c2ba0b774107a1d10f338ab54a8a32aeaca30938 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Aug 2023 13:19:46 -0700 +Subject: kgdb: Flush console before entering kgdb on panic + +From: Douglas Anderson + +[ Upstream commit dd712d3d45807db9fcae28a522deee85c1f2fde6 ] + +When entering kdb/kgdb on a kernel panic, it was be observed that the +console isn't flushed before the `kdb` prompt came up. Specifically, +when using the buddy lockup detector on arm64 and running: + echo HARDLOCKUP > /sys/kernel/debug/provoke-crash/DIRECT + +I could see: + [ 26.161099] lkdtm: Performing direct entry HARDLOCKUP + [ 32.499881] watchdog: Watchdog detected hard LOCKUP on cpu 6 + [ 32.552865] Sending NMI from CPU 5 to CPUs 6: + [ 32.557359] NMI backtrace for cpu 6 + ... [backtrace for cpu 6] ... + [ 32.558353] NMI backtrace for cpu 5 + ... [backtrace for cpu 5] ... + [ 32.867471] Sending NMI from CPU 5 to CPUs 0-4,7: + [ 32.872321] NMI backtrace forP cpuANC: Hard LOCKUP + + Entering kdb (current=..., pid 0) on processor 5 due to Keyboard Entry + [5]kdb> + +As you can see, backtraces for the other CPUs start printing and get +interleaved with the kdb PANIC print. + +Let's replicate the commands to flush the console in the kdb panic +entry point to avoid this. + +Signed-off-by: Douglas Anderson +Link: https://lore.kernel.org/r/20230822131945.1.I5b460ae8f954e4c4f628a373d6e74713c06dd26f@changeid +Signed-off-by: Daniel Thompson +Signed-off-by: Sasha Levin +--- + kernel/debug/debug_core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c +index d5e9ccde3ab8e..3a904d8697c8f 100644 +--- a/kernel/debug/debug_core.c ++++ b/kernel/debug/debug_core.c +@@ -1006,6 +1006,9 @@ void kgdb_panic(const char *msg) + if (panic_timeout) + return; + ++ debug_locks_off(); ++ console_flush_on_panic(CONSOLE_FLUSH_PENDING); ++ + if (dbg_kdb_mode) + kdb_printf("PANIC: %s\n", msg); + +-- +2.42.0 + diff --git a/queue-6.1/lib-generic-radix-tree.c-don-t-overflow-in-peek.patch b/queue-6.1/lib-generic-radix-tree.c-don-t-overflow-in-peek.patch new file mode 100644 index 00000000000..6cd71683b5d --- /dev/null +++ b/queue-6.1/lib-generic-radix-tree.c-don-t-overflow-in-peek.patch @@ -0,0 +1,84 @@ +From f1e8fc94bd6604b19fd53082b035673542d46627 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Feb 2021 20:11:25 -0500 +Subject: lib/generic-radix-tree.c: Don't overflow in peek() + +From: Kent Overstreet + +[ Upstream commit 9492261ff2460252cf2d8de89cdf854c7e2b28a0 ] + +When we started spreading new inode numbers throughout most of the 64 +bit inode space, that triggered some corner case bugs, in particular +some integer overflows related to the radix tree code. Oops. + +Signed-off-by: Kent Overstreet +Signed-off-by: Sasha Levin +--- + include/linux/generic-radix-tree.h | 7 +++++++ + lib/generic-radix-tree.c | 17 ++++++++++++++--- + 2 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/include/linux/generic-radix-tree.h b/include/linux/generic-radix-tree.h +index 107613f7d7920..f6cd0f909d9fb 100644 +--- a/include/linux/generic-radix-tree.h ++++ b/include/linux/generic-radix-tree.h +@@ -38,6 +38,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -184,6 +185,12 @@ void *__genradix_iter_peek(struct genradix_iter *, struct __genradix *, size_t); + static inline void __genradix_iter_advance(struct genradix_iter *iter, + size_t obj_size) + { ++ if (iter->offset + obj_size < iter->offset) { ++ iter->offset = SIZE_MAX; ++ iter->pos = SIZE_MAX; ++ return; ++ } ++ + iter->offset += obj_size; + + if (!is_power_of_2(obj_size) && +diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c +index f25eb111c0516..7dfa88282b006 100644 +--- a/lib/generic-radix-tree.c ++++ b/lib/generic-radix-tree.c +@@ -166,6 +166,10 @@ void *__genradix_iter_peek(struct genradix_iter *iter, + struct genradix_root *r; + struct genradix_node *n; + unsigned level, i; ++ ++ if (iter->offset == SIZE_MAX) ++ return NULL; ++ + restart: + r = READ_ONCE(radix->root); + if (!r) +@@ -184,10 +188,17 @@ void *__genradix_iter_peek(struct genradix_iter *iter, + (GENRADIX_ARY - 1); + + while (!n->children[i]) { ++ size_t objs_per_ptr = genradix_depth_size(level); ++ ++ if (iter->offset + objs_per_ptr < iter->offset) { ++ iter->offset = SIZE_MAX; ++ iter->pos = SIZE_MAX; ++ return NULL; ++ } ++ + i++; +- iter->offset = round_down(iter->offset + +- genradix_depth_size(level), +- genradix_depth_size(level)); ++ iter->offset = round_down(iter->offset + objs_per_ptr, ++ objs_per_ptr); + iter->pos = (iter->offset >> PAGE_SHIFT) * + objs_per_page; + if (i == GENRADIX_ARY) +-- +2.42.0 + diff --git a/queue-6.1/locking-ww_mutex-test-fix-potential-workqueue-corrup.patch b/queue-6.1/locking-ww_mutex-test-fix-potential-workqueue-corrup.patch new file mode 100644 index 00000000000..8f248f13b40 --- /dev/null +++ b/queue-6.1/locking-ww_mutex-test-fix-potential-workqueue-corrup.patch @@ -0,0 +1,119 @@ +From cfc9743268e4b91faaf41d8e0ccbfb77d058fa85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Sep 2023 04:36:00 +0000 +Subject: locking/ww_mutex/test: Fix potential workqueue corruption + +From: John Stultz + +[ Upstream commit bccdd808902f8c677317cec47c306e42b93b849e ] + +In some cases running with the test-ww_mutex code, I was seeing +odd behavior where sometimes it seemed flush_workqueue was +returning before all the work threads were finished. + +Often this would cause strange crashes as the mutexes would be +freed while they were being used. + +Looking at the code, there is a lifetime problem as the +controlling thread that spawns the work allocates the +"struct stress" structures that are passed to the workqueue +threads. Then when the workqueue threads are finished, +they free the stress struct that was passed to them. + +Unfortunately the workqueue work_struct node is in the stress +struct. Which means the work_struct is freed before the work +thread returns and while flush_workqueue is waiting. + +It seems like a better idea to have the controlling thread +both allocate and free the stress structures, so that we can +be sure we don't corrupt the workqueue by freeing the structure +prematurely. + +So this patch reworks the test to do so, and with this change +I no longer see the early flush_workqueue returns. + +Signed-off-by: John Stultz +Signed-off-by: Ingo Molnar +Link: https://lore.kernel.org/r/20230922043616.19282-3-jstultz@google.com +Signed-off-by: Sasha Levin +--- + kernel/locking/test-ww_mutex.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c +index 43efb2a041602..b1e25695185a4 100644 +--- a/kernel/locking/test-ww_mutex.c ++++ b/kernel/locking/test-ww_mutex.c +@@ -466,7 +466,6 @@ static void stress_inorder_work(struct work_struct *work) + } while (!time_after(jiffies, stress->timeout)); + + kfree(order); +- kfree(stress); + } + + struct reorder_lock { +@@ -531,7 +530,6 @@ static void stress_reorder_work(struct work_struct *work) + list_for_each_entry_safe(ll, ln, &locks, link) + kfree(ll); + kfree(order); +- kfree(stress); + } + + static void stress_one_work(struct work_struct *work) +@@ -552,8 +550,6 @@ static void stress_one_work(struct work_struct *work) + break; + } + } while (!time_after(jiffies, stress->timeout)); +- +- kfree(stress); + } + + #define STRESS_INORDER BIT(0) +@@ -564,15 +560,24 @@ static void stress_one_work(struct work_struct *work) + static int stress(int nlocks, int nthreads, unsigned int flags) + { + struct ww_mutex *locks; +- int n; ++ struct stress *stress_array; ++ int n, count; + + locks = kmalloc_array(nlocks, sizeof(*locks), GFP_KERNEL); + if (!locks) + return -ENOMEM; + ++ stress_array = kmalloc_array(nthreads, sizeof(*stress_array), ++ GFP_KERNEL); ++ if (!stress_array) { ++ kfree(locks); ++ return -ENOMEM; ++ } ++ + for (n = 0; n < nlocks; n++) + ww_mutex_init(&locks[n], &ww_class); + ++ count = 0; + for (n = 0; nthreads; n++) { + struct stress *stress; + void (*fn)(struct work_struct *work); +@@ -596,9 +601,7 @@ static int stress(int nlocks, int nthreads, unsigned int flags) + if (!fn) + continue; + +- stress = kmalloc(sizeof(*stress), GFP_KERNEL); +- if (!stress) +- break; ++ stress = &stress_array[count++]; + + INIT_WORK(&stress->work, fn); + stress->locks = locks; +@@ -613,6 +616,7 @@ static int stress(int nlocks, int nthreads, unsigned int flags) + + for (n = 0; n < nlocks; n++) + ww_mutex_destroy(&locks[n]); ++ kfree(stress_array); + kfree(locks); + + return 0; +-- +2.42.0 + diff --git a/queue-6.1/macvlan-don-t-propagate-promisc-change-to-lower-dev-.patch b/queue-6.1/macvlan-don-t-propagate-promisc-change-to-lower-dev-.patch new file mode 100644 index 00000000000..4c283ec8d91 --- /dev/null +++ b/queue-6.1/macvlan-don-t-propagate-promisc-change-to-lower-dev-.patch @@ -0,0 +1,61 @@ +From 883227a6b8bdbc783f65dfc624c30133070015d3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 18:59:15 +0100 +Subject: macvlan: Don't propagate promisc change to lower dev in passthru + +From: Vlad Buslov + +[ Upstream commit 7e1caeace0418381f36b3aa8403dfd82fc57fc53 ] + +Macvlan device in passthru mode sets its lower device promiscuous mode +according to its MACVLAN_FLAG_NOPROMISC flag instead of synchronizing it to +its own promiscuity setting. However, macvlan_change_rx_flags() function +doesn't check the mode before propagating such changes to the lower device +which can cause net_device->promiscuity counter overflow as illustrated by +reproduction example [0] and resulting dmesg log [1]. Fix the issue by +first verifying the mode in macvlan_change_rx_flags() function before +propagating promiscuous mode change to the lower device. + +[0]: +ip link add macvlan1 link enp8s0f0 type macvlan mode passthru +ip link set macvlan1 promisc on +ip l set dev macvlan1 up +ip link set macvlan1 promisc off +ip l set dev macvlan1 down +ip l set dev macvlan1 up + +[1]: +[ 5156.281724] macvlan1: entered promiscuous mode +[ 5156.285467] mlx5_core 0000:08:00.0 enp8s0f0: entered promiscuous mode +[ 5156.287639] macvlan1: left promiscuous mode +[ 5156.288339] mlx5_core 0000:08:00.0 enp8s0f0: left promiscuous mode +[ 5156.290907] mlx5_core 0000:08:00.0 enp8s0f0: entered promiscuous mode +[ 5156.317197] mlx5_core 0000:08:00.0 enp8s0f0: promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken. + +Fixes: efdbd2b30caa ("macvlan: Propagate promiscuity setting to lower devices.") +Reviewed-by: Gal Pressman +Signed-off-by: Vlad Buslov +Reviewed-by: Jiri Pirko +Link: https://lore.kernel.org/r/20231114175915.1649154-1-vladbu@nvidia.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/macvlan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c +index b8cc55b2d721c..012830d12fde6 100644 +--- a/drivers/net/macvlan.c ++++ b/drivers/net/macvlan.c +@@ -771,7 +771,7 @@ static void macvlan_change_rx_flags(struct net_device *dev, int change) + if (dev->flags & IFF_UP) { + if (change & IFF_ALLMULTI) + dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1); +- if (change & IFF_PROMISC) ++ if (!macvlan_passthru(vlan->port) && change & IFF_PROMISC) + dev_set_promiscuity(lowerdev, + dev->flags & IFF_PROMISC ? 1 : -1); + +-- +2.42.0 + diff --git a/queue-6.1/media-ccs-fix-driver-quirk-struct-documentation.patch b/queue-6.1/media-ccs-fix-driver-quirk-struct-documentation.patch new file mode 100644 index 00000000000..609a58b196b --- /dev/null +++ b/queue-6.1/media-ccs-fix-driver-quirk-struct-documentation.patch @@ -0,0 +1,42 @@ +From bf9bf9b2d3202e6458c22100e1b0099fe6e0f91c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Aug 2023 15:18:18 +0300 +Subject: media: ccs: Fix driver quirk struct documentation + +From: Sakari Ailus + +[ Upstream commit 441b5c63d71ec9ec5453328f7e83384ecc1dddd9 ] + +Fix documentation for struct ccs_quirk, a device specific struct for +managing deviations from the standard. The flags field was drifted away +from where it should have been. + +Signed-off-by: Sakari Ailus +Reviewed-by: Laurent Pinchart +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/ccs/ccs-quirk.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/media/i2c/ccs/ccs-quirk.h b/drivers/media/i2c/ccs/ccs-quirk.h +index 5838fcda92fd4..0b1a64958d714 100644 +--- a/drivers/media/i2c/ccs/ccs-quirk.h ++++ b/drivers/media/i2c/ccs/ccs-quirk.h +@@ -32,12 +32,10 @@ struct ccs_sensor; + * @reg: Pointer to the register to access + * @value: Register value, set by the caller on write, or + * by the quirk on read +- * +- * @flags: Quirk flags +- * + * @return: 0 on success, -ENOIOCTLCMD if no register + * access may be done by the caller (default read + * value is zero), else negative error code on error ++ * @flags: Quirk flags + */ + struct ccs_quirk { + int (*limits)(struct ccs_sensor *sensor); +-- +2.42.0 + diff --git a/queue-6.1/media-cobalt-use-field_get-to-extract-link-width.patch b/queue-6.1/media-cobalt-use-field_get-to-extract-link-width.patch new file mode 100644 index 00000000000..28da4911dc4 --- /dev/null +++ b/queue-6.1/media-cobalt-use-field_get-to-extract-link-width.patch @@ -0,0 +1,77 @@ +From 6822b6eaec6784fc51132d48d6e06e4482194ed6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Sep 2023 15:27:40 +0300 +Subject: media: cobalt: Use FIELD_GET() to extract Link Width +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit f301fedbeecfdce91cb898d6fa5e62f269801fee ] + +Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields +instead of custom masking and shifting. + +Signed-off-by: Ilpo Järvinen +Reviewed-by: Jonathan Cameron +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/pci/cobalt/cobalt-driver.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c +index 74edcc76d12f4..6e1a0614e6d06 100644 +--- a/drivers/media/pci/cobalt/cobalt-driver.c ++++ b/drivers/media/pci/cobalt/cobalt-driver.c +@@ -8,6 +8,7 @@ + * All rights reserved. + */ + ++#include + #include + #include + #include +@@ -210,17 +211,17 @@ void cobalt_pcie_status_show(struct cobalt *cobalt) + pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &stat); + cobalt_info("PCIe link capability 0x%08x: %s per lane and %u lanes\n", + capa, get_link_speed(capa), +- (capa & PCI_EXP_LNKCAP_MLW) >> 4); ++ FIELD_GET(PCI_EXP_LNKCAP_MLW, capa)); + cobalt_info("PCIe link control 0x%04x\n", ctrl); + cobalt_info("PCIe link status 0x%04x: %s per lane and %u lanes\n", + stat, get_link_speed(stat), +- (stat & PCI_EXP_LNKSTA_NLW) >> 4); ++ FIELD_GET(PCI_EXP_LNKSTA_NLW, stat)); + + /* Bus */ + pcie_capability_read_dword(pci_bus_dev, PCI_EXP_LNKCAP, &capa); + cobalt_info("PCIe bus link capability 0x%08x: %s per lane and %u lanes\n", + capa, get_link_speed(capa), +- (capa & PCI_EXP_LNKCAP_MLW) >> 4); ++ FIELD_GET(PCI_EXP_LNKCAP_MLW, capa)); + + /* Slot */ + pcie_capability_read_dword(pci_dev, PCI_EXP_SLTCAP, &capa); +@@ -239,7 +240,7 @@ static unsigned pcie_link_get_lanes(struct cobalt *cobalt) + if (!pci_is_pcie(pci_dev)) + return 0; + pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &link); +- return (link & PCI_EXP_LNKSTA_NLW) >> 4; ++ return FIELD_GET(PCI_EXP_LNKSTA_NLW, link); + } + + static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt) +@@ -250,7 +251,7 @@ static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt) + if (!pci_is_pcie(pci_dev)) + return 0; + pcie_capability_read_dword(pci_dev, PCI_EXP_LNKCAP, &link); +- return (link & PCI_EXP_LNKCAP_MLW) >> 4; ++ return FIELD_GET(PCI_EXP_LNKCAP_MLW, link); + } + + static void msi_config_show(struct cobalt *cobalt, struct pci_dev *pci_dev) +-- +2.42.0 + diff --git a/queue-6.1/media-gspca-cpia1-shift-out-of-bounds-in-set_flicker.patch b/queue-6.1/media-gspca-cpia1-shift-out-of-bounds-in-set_flicker.patch new file mode 100644 index 00000000000..394e795173e --- /dev/null +++ b/queue-6.1/media-gspca-cpia1-shift-out-of-bounds-in-set_flicker.patch @@ -0,0 +1,53 @@ +From 2e9034960470a988583e99c45935b96d19ecbad0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Aug 2023 13:14:01 +0530 +Subject: media: gspca: cpia1: shift-out-of-bounds in set_flicker + +From: Rajeshwar R Shinde + +[ Upstream commit 099be1822d1f095433f4b08af9cc9d6308ec1953 ] + +Syzkaller reported the following issue: +UBSAN: shift-out-of-bounds in drivers/media/usb/gspca/cpia1.c:1031:27 +shift exponent 245 is too large for 32-bit type 'int' + +When the value of the variable "sd->params.exposure.gain" exceeds the +number of bits in an integer, a shift-out-of-bounds error is reported. It +is triggered because the variable "currentexp" cannot be left-shifted by +more than the number of bits in an integer. In order to avoid invalid +range during left-shift, the conditional expression is added. + +Reported-by: syzbot+e27f3dbdab04e43b9f73@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/all/20230818164522.12806-1-coolrrsh@gmail.com +Link: https://syzkaller.appspot.com/bug?extid=e27f3dbdab04e43b9f73 +Signed-off-by: Rajeshwar R Shinde +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/usb/gspca/cpia1.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c +index 46ed95483e222..5f5fa851ca640 100644 +--- a/drivers/media/usb/gspca/cpia1.c ++++ b/drivers/media/usb/gspca/cpia1.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "gspca.h" + +@@ -1028,6 +1029,8 @@ static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply) + sd->params.exposure.expMode = 2; + sd->exposure_status = EXPOSURE_NORMAL; + } ++ if (sd->params.exposure.gain >= BITS_PER_TYPE(currentexp)) ++ return -EINVAL; + currentexp = currentexp << sd->params.exposure.gain; + sd->params.exposure.gain = 0; + /* round down current exposure to nearest value */ +-- +2.42.0 + diff --git a/queue-6.1/media-imon-fix-access-to-invalid-resource-for-the-se.patch b/queue-6.1/media-imon-fix-access-to-invalid-resource-for-the-se.patch new file mode 100644 index 00000000000..db8e1df00d5 --- /dev/null +++ b/queue-6.1/media-imon-fix-access-to-invalid-resource-for-the-se.patch @@ -0,0 +1,54 @@ +From 557363f963ef6143a0dda5f3cecb729d8a05c346 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Sep 2023 14:38:07 +0200 +Subject: media: imon: fix access to invalid resource for the second interface + +From: Takashi Iwai + +[ Upstream commit a1766a4fd83befa0b34d932d532e7ebb7fab1fa7 ] + +imon driver probes two USB interfaces, and at the probe of the second +interface, the driver assumes blindly that the first interface got +bound with the same imon driver. It's usually true, but it's still +possible that the first interface is bound with another driver via a +malformed descriptor. Then it may lead to a memory corruption, as +spotted by syzkaller; imon driver accesses the data from drvdata as +struct imon_context object although it's a completely different one +that was assigned by another driver. + +This patch adds a sanity check -- whether the first interface is +really bound with the imon driver or not -- for avoiding the problem +above at the probe time. + +Reported-by: syzbot+59875ffef5cb9c9b29e9@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/all/000000000000a838aa0603cc74d6@google.com/ +Tested-by: Ricardo B. Marliere +Link: https://lore.kernel.org/r/20230922005152.163640-1-ricardo@marliere.net +Signed-off-by: Takashi Iwai +Signed-off-by: Sean Young +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/rc/imon.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c +index 74546f7e34691..5719dda6e0f0e 100644 +--- a/drivers/media/rc/imon.c ++++ b/drivers/media/rc/imon.c +@@ -2427,6 +2427,12 @@ static int imon_probe(struct usb_interface *interface, + goto fail; + } + ++ if (first_if->dev.driver != interface->dev.driver) { ++ dev_err(&interface->dev, "inconsistent driver matching\n"); ++ ret = -EINVAL; ++ goto fail; ++ } ++ + if (ifnum == 0) { + ictx = imon_init_intf0(interface, id); + if (!ictx) { +-- +2.42.0 + diff --git a/queue-6.1/media-vivid-avoid-integer-overflow.patch b/queue-6.1/media-vivid-avoid-integer-overflow.patch new file mode 100644 index 00000000000..4d97be3c286 --- /dev/null +++ b/queue-6.1/media-vivid-avoid-integer-overflow.patch @@ -0,0 +1,47 @@ +From 04cdc5aac8a668dec9a14f94d5da091092aef97b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 23 Sep 2023 17:20:48 +0200 +Subject: media: vivid: avoid integer overflow + +From: Hans Verkuil + +[ Upstream commit 4567ebf8e8f9546b373e78e3b7d584cc30b62028 ] + +Fixes these compiler warnings: + +drivers/media/test-drivers/vivid/vivid-rds-gen.c: In function 'vivid_rds_gen_fill': +drivers/media/test-drivers/vivid/vivid-rds-gen.c:147:56: warning: '.' directive output may be truncated writing 1 byte into a region of size between 0 and 3 [-Wformat-truncation=] + 147 | snprintf(rds->psname, sizeof(rds->psname), "%6d.%1d", + | ^ +drivers/media/test-drivers/vivid/vivid-rds-gen.c:147:52: note: directive argument in the range [0, 9] + 147 | snprintf(rds->psname, sizeof(rds->psname), "%6d.%1d", + | ^~~~~~~~~ +drivers/media/test-drivers/vivid/vivid-rds-gen.c:147:9: note: 'snprintf' output between 9 and 12 bytes into a destination of size 9 + 147 | snprintf(rds->psname, sizeof(rds->psname), "%6d.%1d", + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 148 | freq / 16, ((freq & 0xf) * 10) / 16); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Hans Verkuil +Acked-by: Arnd Bergmann +Signed-off-by: Sasha Levin +--- + drivers/media/test-drivers/vivid/vivid-rds-gen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/test-drivers/vivid/vivid-rds-gen.c b/drivers/media/test-drivers/vivid/vivid-rds-gen.c +index b5b104ee64c99..c57771119a34b 100644 +--- a/drivers/media/test-drivers/vivid/vivid-rds-gen.c ++++ b/drivers/media/test-drivers/vivid/vivid-rds-gen.c +@@ -145,7 +145,7 @@ void vivid_rds_gen_fill(struct vivid_rds_gen *rds, unsigned freq, + rds->ta = alt; + rds->ms = true; + snprintf(rds->psname, sizeof(rds->psname), "%6d.%1d", +- freq / 16, ((freq & 0xf) * 10) / 16); ++ (freq / 16) % 1000000, (((freq & 0xf) * 10) / 16) % 10); + if (alt) + strscpy(rds->radiotext, + " The Radio Data System can switch between different Radio Texts ", +-- +2.42.0 + diff --git a/queue-6.1/mfd-intel-lpss-add-intel-lunar-lake-m-pci-ids.patch b/queue-6.1/mfd-intel-lpss-add-intel-lunar-lake-m-pci-ids.patch new file mode 100644 index 00000000000..c93993733a9 --- /dev/null +++ b/queue-6.1/mfd-intel-lpss-add-intel-lunar-lake-m-pci-ids.patch @@ -0,0 +1,46 @@ +From c0ece595b67380030ae5881e7139da7faffd87d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Oct 2023 11:33:44 +0300 +Subject: mfd: intel-lpss: Add Intel Lunar Lake-M PCI IDs + +From: Jarkko Nikula + +[ Upstream commit e53b22b10c6e0de0cf2a03a92b18fdad70f266c7 ] + +Add Intel Lunar Lake-M SoC PCI IDs. + +Signed-off-by: Jarkko Nikula +Link: https://lore.kernel.org/r/20231002083344.75611-1-jarkko.nikula@linux.intel.com +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/mfd/intel-lpss-pci.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c +index 699f44ffff0e4..ae5759200622c 100644 +--- a/drivers/mfd/intel-lpss-pci.c ++++ b/drivers/mfd/intel-lpss-pci.c +@@ -561,6 +561,19 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { + { PCI_VDEVICE(INTEL, 0xa3e2), (kernel_ulong_t)&spt_i2c_info }, + { PCI_VDEVICE(INTEL, 0xa3e3), (kernel_ulong_t)&spt_i2c_info }, + { PCI_VDEVICE(INTEL, 0xa3e6), (kernel_ulong_t)&spt_uart_info }, ++ /* LNL-M */ ++ { PCI_VDEVICE(INTEL, 0xa825), (kernel_ulong_t)&bxt_uart_info }, ++ { PCI_VDEVICE(INTEL, 0xa826), (kernel_ulong_t)&bxt_uart_info }, ++ { PCI_VDEVICE(INTEL, 0xa827), (kernel_ulong_t)&tgl_info }, ++ { PCI_VDEVICE(INTEL, 0xa830), (kernel_ulong_t)&tgl_info }, ++ { PCI_VDEVICE(INTEL, 0xa846), (kernel_ulong_t)&tgl_info }, ++ { PCI_VDEVICE(INTEL, 0xa850), (kernel_ulong_t)&ehl_i2c_info }, ++ { PCI_VDEVICE(INTEL, 0xa851), (kernel_ulong_t)&ehl_i2c_info }, ++ { PCI_VDEVICE(INTEL, 0xa852), (kernel_ulong_t)&bxt_uart_info }, ++ { PCI_VDEVICE(INTEL, 0xa878), (kernel_ulong_t)&ehl_i2c_info }, ++ { PCI_VDEVICE(INTEL, 0xa879), (kernel_ulong_t)&ehl_i2c_info }, ++ { PCI_VDEVICE(INTEL, 0xa87a), (kernel_ulong_t)&ehl_i2c_info }, ++ { PCI_VDEVICE(INTEL, 0xa87b), (kernel_ulong_t)&ehl_i2c_info }, + { } + }; + MODULE_DEVICE_TABLE(pci, intel_lpss_pci_ids); +-- +2.42.0 + diff --git a/queue-6.1/misc-pci_endpoint_test-add-device-id-for-r-car-s4-8-.patch b/queue-6.1/misc-pci_endpoint_test-add-device-id-for-r-car-s4-8-.patch new file mode 100644 index 00000000000..d5dffe35b1b --- /dev/null +++ b/queue-6.1/misc-pci_endpoint_test-add-device-id-for-r-car-s4-8-.patch @@ -0,0 +1,49 @@ +From 2773c471823aa67d5e190d1f8c9d599c0dc5e5c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Oct 2023 17:56:31 +0900 +Subject: misc: pci_endpoint_test: Add Device ID for R-Car S4-8 PCIe controller +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Yoshihiro Shimoda + +[ Upstream commit 6c4b39937f4e65688ea294725ae432b2565821ff ] + +Add Renesas R8A779F0 in pci_device_id table so that pci-epf-test +can be used for testing PCIe EP on R-Car S4-8. + +Link: https://lore.kernel.org/linux-pci/20231018085631.1121289-16-yoshihiro.shimoda.uh@renesas.com +Signed-off-by: Yoshihiro Shimoda +Signed-off-by: Krzysztof Wilczyński +Acked-by: Manivannan Sadhasivam +Signed-off-by: Sasha Levin +--- + drivers/misc/pci_endpoint_test.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c +index 55dc16d8f6adb..18059a12d4e18 100644 +--- a/drivers/misc/pci_endpoint_test.c ++++ b/drivers/misc/pci_endpoint_test.c +@@ -81,6 +81,7 @@ + #define PCI_DEVICE_ID_RENESAS_R8A774B1 0x002b + #define PCI_DEVICE_ID_RENESAS_R8A774C0 0x002d + #define PCI_DEVICE_ID_RENESAS_R8A774E1 0x0025 ++#define PCI_DEVICE_ID_RENESAS_R8A779F0 0x0031 + + static DEFINE_IDA(pci_endpoint_test_ida); + +@@ -996,6 +997,9 @@ static const struct pci_device_id pci_endpoint_test_tbl[] = { + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774B1),}, + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774C0),}, + { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774E1),}, ++ { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A779F0), ++ .driver_data = (kernel_ulong_t)&default_data, ++ }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721E), + .driver_data = (kernel_ulong_t)&j721e_data, + }, +-- +2.42.0 + diff --git a/queue-6.1/mtd-rawnand-intel-check-return-value-of-devm_kasprin.patch b/queue-6.1/mtd-rawnand-intel-check-return-value-of-devm_kasprin.patch new file mode 100644 index 00000000000..284a21faeb9 --- /dev/null +++ b/queue-6.1/mtd-rawnand-intel-check-return-value-of-devm_kasprin.patch @@ -0,0 +1,53 @@ +From 4c0ef90e74d8cf08bd89666d4ddb0aa432796ab9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Oct 2023 06:55:37 +0000 +Subject: mtd: rawnand: intel: check return value of devm_kasprintf() + +From: Yi Yang + +[ Upstream commit 74ac5b5e2375f1e8ef797ac7770887e9969f2516 ] + +devm_kasprintf() returns a pointer to dynamically allocated memory +which can be NULL upon failure. Ensure the allocation was successful by +checking the pointer validity. + +Fixes: 0b1039f016e8 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC") +Signed-off-by: Yi Yang +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20231019065537.318391-1-yiyang13@huawei.com +Signed-off-by: Sasha Levin +--- + drivers/mtd/nand/raw/intel-nand-controller.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c +index 6f4cea81f97c0..1f8a33fb84607 100644 +--- a/drivers/mtd/nand/raw/intel-nand-controller.c ++++ b/drivers/mtd/nand/raw/intel-nand-controller.c +@@ -619,6 +619,11 @@ static int ebu_nand_probe(struct platform_device *pdev) + ebu_host->cs_num = cs; + + resname = devm_kasprintf(dev, GFP_KERNEL, "nand_cs%d", cs); ++ if (!resname) { ++ ret = -ENOMEM; ++ goto err_of_node_put; ++ } ++ + ebu_host->cs[cs].chipaddr = devm_platform_ioremap_resource_byname(pdev, + resname); + if (IS_ERR(ebu_host->cs[cs].chipaddr)) { +@@ -655,6 +660,11 @@ static int ebu_nand_probe(struct platform_device *pdev) + } + + resname = devm_kasprintf(dev, GFP_KERNEL, "addr_sel%d", cs); ++ if (!resname) { ++ ret = -ENOMEM; ++ goto err_cleanup_dma; ++ } ++ + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, resname); + if (!res) { + ret = -EINVAL; +-- +2.42.0 + diff --git a/queue-6.1/mtd-rawnand-meson-check-return-value-of-devm_kasprin.patch b/queue-6.1/mtd-rawnand-meson-check-return-value-of-devm_kasprin.patch new file mode 100644 index 00000000000..0d3bbea8cdc --- /dev/null +++ b/queue-6.1/mtd-rawnand-meson-check-return-value-of-devm_kasprin.patch @@ -0,0 +1,39 @@ +From 760c97c55c8aa62a35f314c3dcec72b1824343f0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Oct 2023 06:55:48 +0000 +Subject: mtd: rawnand: meson: check return value of devm_kasprintf() + +From: Yi Yang + +[ Upstream commit 5a985960a4dd041c21dbe9956958c1633d2da706 ] + +devm_kasprintf() returns a pointer to dynamically allocated memory +which can be NULL upon failure. Ensure the allocation was successful by +checking the pointer validity. + +Fixes: 1e4d3ba66888 ("mtd: rawnand: meson: fix the clock") +Signed-off-by: Yi Yang +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20231019065548.318443-1-yiyang13@huawei.com +Signed-off-by: Sasha Levin +--- + drivers/mtd/nand/raw/meson_nand.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c +index ac4947f720478..0aeac8ccbd0ee 100644 +--- a/drivers/mtd/nand/raw/meson_nand.c ++++ b/drivers/mtd/nand/raw/meson_nand.c +@@ -1021,6 +1021,9 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc) + init.name = devm_kasprintf(nfc->dev, + GFP_KERNEL, "%s#div", + dev_name(nfc->dev)); ++ if (!init.name) ++ return -ENOMEM; ++ + init.ops = &clk_divider_ops; + nfc_divider_parent_data[0].fw_name = "device"; + init.parent_data = nfc_divider_parent_data; +-- +2.42.0 + diff --git a/queue-6.1/mtd-rawnand-tegra-add-missing-check-for-platform_get.patch b/queue-6.1/mtd-rawnand-tegra-add-missing-check-for-platform_get.patch new file mode 100644 index 00000000000..fae60537dec --- /dev/null +++ b/queue-6.1/mtd-rawnand-tegra-add-missing-check-for-platform_get.patch @@ -0,0 +1,39 @@ +From 938b68bc7994e02bfcd1e20495b195b25f8426e5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Aug 2023 16:40:46 +0800 +Subject: mtd: rawnand: tegra: add missing check for platform_get_irq() + +From: Yi Yang + +[ Upstream commit 0a1166c27d4e53186e6bf9147ea6db9cd1d65847 ] + +Add the missing check for platform_get_irq() and return error code +if it fails. + +Fixes: d7d9f8ec77fe ("mtd: rawnand: add NVIDIA Tegra NAND Flash controller driver") +Signed-off-by: Yi Yang +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20230821084046.217025-1-yiyang13@huawei.com +Signed-off-by: Sasha Levin +--- + drivers/mtd/nand/raw/tegra_nand.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c +index a9b9031ce6167..d33030b68ac44 100644 +--- a/drivers/mtd/nand/raw/tegra_nand.c ++++ b/drivers/mtd/nand/raw/tegra_nand.c +@@ -1197,6 +1197,10 @@ static int tegra_nand_probe(struct platform_device *pdev) + init_completion(&ctrl->dma_complete); + + ctrl->irq = platform_get_irq(pdev, 0); ++ if (ctrl->irq < 0) { ++ err = ctrl->irq; ++ goto err_put_pm; ++ } + err = devm_request_irq(&pdev->dev, ctrl->irq, tegra_nand_irq, 0, + dev_name(&pdev->dev), ctrl); + if (err) { +-- +2.42.0 + diff --git a/queue-6.1/net-annotate-data-races-around-sk-sk_dst_pending_con.patch b/queue-6.1/net-annotate-data-races-around-sk-sk_dst_pending_con.patch new file mode 100644 index 00000000000..671993e6629 --- /dev/null +++ b/queue-6.1/net-annotate-data-races-around-sk-sk_dst_pending_con.patch @@ -0,0 +1,82 @@ +From 1bc99838d1d2e8b5917e2ba05f9f01adafd2d71d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 20:28:18 +0000 +Subject: net: annotate data-races around sk->sk_dst_pending_confirm + +From: Eric Dumazet + +[ Upstream commit eb44ad4e635132754bfbcb18103f1dcb7058aedd ] + +This field can be read or written without socket lock being held. + +Add annotations to avoid load-store tearing. + +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/sock.h | 6 +++--- + net/core/sock.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/net/sock.h b/include/net/sock.h +index 8d98fcd9e89a9..b6027b01c2455 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -2207,7 +2207,7 @@ static inline void __dst_negative_advice(struct sock *sk) + if (ndst != dst) { + rcu_assign_pointer(sk->sk_dst_cache, ndst); + sk_tx_queue_clear(sk); +- sk->sk_dst_pending_confirm = 0; ++ WRITE_ONCE(sk->sk_dst_pending_confirm, 0); + } + } + } +@@ -2224,7 +2224,7 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst) + struct dst_entry *old_dst; + + sk_tx_queue_clear(sk); +- sk->sk_dst_pending_confirm = 0; ++ WRITE_ONCE(sk->sk_dst_pending_confirm, 0); + old_dst = rcu_dereference_protected(sk->sk_dst_cache, + lockdep_sock_is_held(sk)); + rcu_assign_pointer(sk->sk_dst_cache, dst); +@@ -2237,7 +2237,7 @@ sk_dst_set(struct sock *sk, struct dst_entry *dst) + struct dst_entry *old_dst; + + sk_tx_queue_clear(sk); +- sk->sk_dst_pending_confirm = 0; ++ WRITE_ONCE(sk->sk_dst_pending_confirm, 0); + old_dst = xchg((__force struct dst_entry **)&sk->sk_dst_cache, dst); + dst_release(old_dst); + } +diff --git a/net/core/sock.c b/net/core/sock.c +index 0ee2e33bbe5f8..4305e55dbfba4 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -596,7 +596,7 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) + INDIRECT_CALL_INET(dst->ops->check, ip6_dst_check, ipv4_dst_check, + dst, cookie) == NULL) { + sk_tx_queue_clear(sk); +- sk->sk_dst_pending_confirm = 0; ++ WRITE_ONCE(sk->sk_dst_pending_confirm, 0); + RCU_INIT_POINTER(sk->sk_dst_cache, NULL); + dst_release(dst); + return NULL; +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c +index cc7ed86fb0a57..5b93d1ed1ed19 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1319,7 +1319,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, + skb->destructor = skb_is_tcp_pure_ack(skb) ? __sock_wfree : tcp_wfree; + refcount_add(skb->truesize, &sk->sk_wmem_alloc); + +- skb_set_dst_pending_confirm(skb, sk->sk_dst_pending_confirm); ++ skb_set_dst_pending_confirm(skb, READ_ONCE(sk->sk_dst_pending_confirm)); + + /* Build TCP header and checksum it. */ + th = (struct tcphdr *)skb->data; +-- +2.42.0 + diff --git a/queue-6.1/net-annotate-data-races-around-sk-sk_tx_queue_mappin.patch b/queue-6.1/net-annotate-data-races-around-sk-sk_tx_queue_mappin.patch new file mode 100644 index 00000000000..4b19b661357 --- /dev/null +++ b/queue-6.1/net-annotate-data-races-around-sk-sk_tx_queue_mappin.patch @@ -0,0 +1,65 @@ +From 1fc9390cbf3b54a303a15c2df23a59042dd5d67b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 20:28:17 +0000 +Subject: net: annotate data-races around sk->sk_tx_queue_mapping + +From: Eric Dumazet + +[ Upstream commit 0bb4d124d34044179b42a769a0c76f389ae973b6 ] + +This field can be read or written without socket lock being held. + +Add annotations to avoid load-store tearing. + +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/sock.h | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/include/net/sock.h b/include/net/sock.h +index a1fcbb2a8a2ce..8d98fcd9e89a9 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -2032,21 +2032,33 @@ static inline void sk_tx_queue_set(struct sock *sk, int tx_queue) + /* sk_tx_queue_mapping accept only upto a 16-bit value */ + if (WARN_ON_ONCE((unsigned short)tx_queue >= USHRT_MAX)) + return; +- sk->sk_tx_queue_mapping = tx_queue; ++ /* Paired with READ_ONCE() in sk_tx_queue_get() and ++ * other WRITE_ONCE() because socket lock might be not held. ++ */ ++ WRITE_ONCE(sk->sk_tx_queue_mapping, tx_queue); + } + + #define NO_QUEUE_MAPPING USHRT_MAX + + static inline void sk_tx_queue_clear(struct sock *sk) + { +- sk->sk_tx_queue_mapping = NO_QUEUE_MAPPING; ++ /* Paired with READ_ONCE() in sk_tx_queue_get() and ++ * other WRITE_ONCE() because socket lock might be not held. ++ */ ++ WRITE_ONCE(sk->sk_tx_queue_mapping, NO_QUEUE_MAPPING); + } + + static inline int sk_tx_queue_get(const struct sock *sk) + { +- if (sk && sk->sk_tx_queue_mapping != NO_QUEUE_MAPPING) +- return sk->sk_tx_queue_mapping; ++ if (sk) { ++ /* Paired with WRITE_ONCE() in sk_tx_queue_clear() ++ * and sk_tx_queue_set(). ++ */ ++ int val = READ_ONCE(sk->sk_tx_queue_mapping); + ++ if (val != NO_QUEUE_MAPPING) ++ return val; ++ } + return -1; + } + +-- +2.42.0 + diff --git a/queue-6.1/net-ethernet-cortina-fix-max-rx-frame-define.patch b/queue-6.1/net-ethernet-cortina-fix-max-rx-frame-define.patch new file mode 100644 index 00000000000..26f8ea1f6a6 --- /dev/null +++ b/queue-6.1/net-ethernet-cortina-fix-max-rx-frame-define.patch @@ -0,0 +1,55 @@ +From 33c9c5cc745fa5cd467c7c8d4c16f0e5cf57151d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 10:03:12 +0100 +Subject: net: ethernet: cortina: Fix max RX frame define + +From: Linus Walleij + +[ Upstream commit 510e35fb931ffc3b100e5d5ae4595cd3beca9f1a ] + +Enumerator 3 is 1548 bytes according to the datasheet. +Not 1542. + +Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") +Reviewed-by: Andrew Lunn +Signed-off-by: Linus Walleij +Reviewed-by: Vladimir Oltean +Link: https://lore.kernel.org/r/20231109-gemini-largeframe-fix-v4-1-6e611528db08@linaro.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cortina/gemini.c | 4 ++-- + drivers/net/ethernet/cortina/gemini.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c +index fdf10318758b4..15a0a39cc33c1 100644 +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -432,8 +432,8 @@ static const struct gmac_max_framelen gmac_maxlens[] = { + .val = CONFIG0_MAXLEN_1536, + }, + { +- .max_l3_len = 1542, +- .val = CONFIG0_MAXLEN_1542, ++ .max_l3_len = 1548, ++ .val = CONFIG0_MAXLEN_1548, + }, + { + .max_l3_len = 9212, +diff --git a/drivers/net/ethernet/cortina/gemini.h b/drivers/net/ethernet/cortina/gemini.h +index 9fdf77d5eb374..99efb11557436 100644 +--- a/drivers/net/ethernet/cortina/gemini.h ++++ b/drivers/net/ethernet/cortina/gemini.h +@@ -787,7 +787,7 @@ union gmac_config0 { + #define CONFIG0_MAXLEN_1536 0 + #define CONFIG0_MAXLEN_1518 1 + #define CONFIG0_MAXLEN_1522 2 +-#define CONFIG0_MAXLEN_1542 3 ++#define CONFIG0_MAXLEN_1548 3 + #define CONFIG0_MAXLEN_9k 4 /* 9212 */ + #define CONFIG0_MAXLEN_10k 5 /* 10236 */ + #define CONFIG0_MAXLEN_1518__6 6 +-- +2.42.0 + diff --git a/queue-6.1/net-ethernet-cortina-fix-mtu-max-setting.patch b/queue-6.1/net-ethernet-cortina-fix-mtu-max-setting.patch new file mode 100644 index 00000000000..5b1ae1f4ee1 --- /dev/null +++ b/queue-6.1/net-ethernet-cortina-fix-mtu-max-setting.patch @@ -0,0 +1,91 @@ +From 1f227eaba154371c9f7c307ebb6e9af8800b238f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 10:03:14 +0100 +Subject: net: ethernet: cortina: Fix MTU max setting + +From: Linus Walleij + +[ Upstream commit dc6c0bfbaa947dd7976e30e8c29b10c868b6fa42 ] + +The RX max frame size is over 10000 for the Gemini ethernet, +but the TX max frame size is actually just 2047 (0x7ff after +checking the datasheet). Reflect this in what we offer to Linux, +cap the MTU at the TX max frame minus ethernet headers. + +We delete the code disabling the hardware checksum for large +MTUs as netdev->mtu can no longer be larger than +netdev->max_mtu meaning the if()-clause in gmac_fix_features() +is never true. + +Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") +Reviewed-by: Andrew Lunn +Signed-off-by: Linus Walleij +Reviewed-by: Vladimir Oltean +Link: https://lore.kernel.org/r/20231109-gemini-largeframe-fix-v4-3-6e611528db08@linaro.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cortina/gemini.c | 17 ++++------------- + drivers/net/ethernet/cortina/gemini.h | 2 +- + 2 files changed, 5 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c +index 7b27d75a34ce7..7c0b0bc033c9c 100644 +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -2000,15 +2000,6 @@ static int gmac_change_mtu(struct net_device *netdev, int new_mtu) + return 0; + } + +-static netdev_features_t gmac_fix_features(struct net_device *netdev, +- netdev_features_t features) +-{ +- if (netdev->mtu + ETH_HLEN + VLAN_HLEN > MTU_SIZE_BIT_MASK) +- features &= ~GMAC_OFFLOAD_FEATURES; +- +- return features; +-} +- + static int gmac_set_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -2234,7 +2225,6 @@ static const struct net_device_ops gmac_351x_ops = { + .ndo_set_mac_address = gmac_set_mac_address, + .ndo_get_stats64 = gmac_get_stats64, + .ndo_change_mtu = gmac_change_mtu, +- .ndo_fix_features = gmac_fix_features, + .ndo_set_features = gmac_set_features, + }; + +@@ -2486,11 +2476,12 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) + + netdev->hw_features = GMAC_OFFLOAD_FEATURES; + netdev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO; +- /* We can handle jumbo frames up to 10236 bytes so, let's accept +- * payloads of 10236 bytes minus VLAN and ethernet header ++ /* We can receive jumbo frames up to 10236 bytes but only ++ * transmit 2047 bytes so, let's accept payloads of 2047 ++ * bytes minus VLAN and ethernet header + */ + netdev->min_mtu = ETH_MIN_MTU; +- netdev->max_mtu = 10236 - VLAN_ETH_HLEN; ++ netdev->max_mtu = MTU_SIZE_BIT_MASK - VLAN_ETH_HLEN; + + port->freeq_refill = 0; + netif_napi_add(netdev, &port->napi, gmac_napi_poll); +diff --git a/drivers/net/ethernet/cortina/gemini.h b/drivers/net/ethernet/cortina/gemini.h +index 99efb11557436..24bb989981f23 100644 +--- a/drivers/net/ethernet/cortina/gemini.h ++++ b/drivers/net/ethernet/cortina/gemini.h +@@ -502,7 +502,7 @@ union gmac_txdesc_3 { + #define SOF_BIT 0x80000000 + #define EOF_BIT 0x40000000 + #define EOFIE_BIT BIT(29) +-#define MTU_SIZE_BIT_MASK 0x1fff ++#define MTU_SIZE_BIT_MASK 0x7ff /* Max MTU 2047 bytes */ + + /* GMAC Tx Descriptor */ + struct gmac_txdesc { +-- +2.42.0 + diff --git a/queue-6.1/net-ethernet-cortina-handle-large-frames.patch b/queue-6.1/net-ethernet-cortina-handle-large-frames.patch new file mode 100644 index 00000000000..fe99544810a --- /dev/null +++ b/queue-6.1/net-ethernet-cortina-handle-large-frames.patch @@ -0,0 +1,111 @@ +From e299e251f7c8d6bb0854caebe9cdc2fbd99c0221 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 10:03:13 +0100 +Subject: net: ethernet: cortina: Handle large frames + +From: Linus Walleij + +[ Upstream commit d4d0c5b4d279bfe3585fbd806efefd3e51c82afa ] + +The Gemini ethernet controller provides hardware checksumming +for frames up to 1514 bytes including ethernet headers but not +FCS. + +If we start sending bigger frames (after first bumping up the MTU +on both interfaces sending and receiving the frames), truncated +packets start to appear on the target such as in this tcpdump +resulting from ping -s 1474: + +23:34:17.241983 14:d6:4d:a8:3c:4f (oui Unknown) > bc:ae:c5:6b:a8:3d (oui Unknown), +ethertype IPv4 (0x0800), length 1514: truncated-ip - 2 bytes missing! +(tos 0x0, ttl 64, id 32653, offset 0, flags [DF], proto ICMP (1), length 1502) +OpenWrt.lan > Fecusia: ICMP echo request, id 1672, seq 50, length 1482 + +If we bypass the hardware checksumming and provide a software +fallback, everything starts working fine up to the max TX MTU +of 2047 bytes, for example ping -s2000 192.168.1.2: + +00:44:29.587598 bc:ae:c5:6b:a8:3d (oui Unknown) > 14:d6:4d:a8:3c:4f (oui Unknown), +ethertype IPv4 (0x0800), length 2042: +(tos 0x0, ttl 64, id 51828, offset 0, flags [none], proto ICMP (1), length 2028) +Fecusia > OpenWrt.lan: ICMP echo reply, id 1683, seq 4, length 2008 + +The bit enabling to bypass hardware checksum (or any of the +"TSS" bits) are undocumented in the hardware reference manual. +The entire hardware checksum unit appears undocumented. The +conclusion that we need to use the "bypass" bit was found by +trial-and-error. + +Since no hardware checksum will happen, we slot in a software +checksum fallback. + +Check for the condition where we need to compute checksum on the +skb with either hardware or software using == CHECKSUM_PARTIAL instead +of != CHECKSUM_NONE which is an incomplete check according to +. + +On the D-Link DIR-685 router this fixes a bug on the conduit +interface to the RTL8366RB DSA switch: as the switch needs to add +space for its tag it increases the MTU on the conduit interface +to 1504 and that means that when the router sends packages +of 1500 bytes these get an extra 4 bytes of DSA tag and the +transfer fails because of the erroneous hardware checksumming, +affecting such basic functionality as the LuCI web interface. + +Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") +Signed-off-by: Linus Walleij +Reviewed-by: Vladimir Oltean +Link: https://lore.kernel.org/r/20231109-gemini-largeframe-fix-v4-2-6e611528db08@linaro.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c +index 15a0a39cc33c1..7b27d75a34ce7 100644 +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -1145,6 +1145,7 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, + dma_addr_t mapping; + unsigned short mtu; + void *buffer; ++ int ret; + + mtu = ETH_HLEN; + mtu += netdev->mtu; +@@ -1159,9 +1160,30 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, + word3 |= mtu; + } + +- if (skb->ip_summed != CHECKSUM_NONE) { ++ if (skb->len >= ETH_FRAME_LEN) { ++ /* Hardware offloaded checksumming isn't working on frames ++ * bigger than 1514 bytes. A hypothesis about this is that the ++ * checksum buffer is only 1518 bytes, so when the frames get ++ * bigger they get truncated, or the last few bytes get ++ * overwritten by the FCS. ++ * ++ * Just use software checksumming and bypass on bigger frames. ++ */ ++ if (skb->ip_summed == CHECKSUM_PARTIAL) { ++ ret = skb_checksum_help(skb); ++ if (ret) ++ return ret; ++ } ++ word1 |= TSS_BYPASS_BIT; ++ } else if (skb->ip_summed == CHECKSUM_PARTIAL) { + int tcp = 0; + ++ /* We do not switch off the checksumming on non TCP/UDP ++ * frames: as is shown from tests, the checksumming engine ++ * is smart enough to see that a frame is not actually TCP ++ * or UDP and then just pass it through without any changes ++ * to the frame. ++ */ + if (skb->protocol == htons(ETH_P_IP)) { + word1 |= TSS_IP_CHKSUM_BIT; + tcp = ip_hdr(skb)->protocol == IPPROTO_TCP; +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-add-barrier-in-vf-mailbox-reply-process.patch b/queue-6.1/net-hns3-add-barrier-in-vf-mailbox-reply-process.patch new file mode 100644 index 00000000000..b57fa68e98c --- /dev/null +++ b/queue-6.1/net-hns3-add-barrier-in-vf-mailbox-reply-process.patch @@ -0,0 +1,51 @@ +From 521ea21ead1718413ed9a23550d7abb7ec7b38d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:08 +0800 +Subject: net: hns3: add barrier in vf mailbox reply process + +From: Yonglong Liu + +[ Upstream commit ac92c0a9a0603fb448e60f38e63302e4eebb8035 ] + +In hclgevf_mbx_handler() and hclgevf_get_mbx_resp() functions, +there is a typical store-store and load-load scenario between +received_resp and additional_info. This patch adds barrier +to fix the problem. + +Fixes: 4671042f1ef0 ("net: hns3: add match_id to check mailbox response from PF to VF") +Signed-off-by: Yonglong Liu +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +index bbf7b14079de3..85c2a634c8f96 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +@@ -63,6 +63,9 @@ static int hclgevf_get_mbx_resp(struct hclgevf_dev *hdev, u16 code0, u16 code1, + i++; + } + ++ /* ensure additional_info will be seen after received_resp */ ++ smp_rmb(); ++ + if (i >= HCLGEVF_MAX_TRY_TIMES) { + dev_err(&hdev->pdev->dev, + "VF could not get mbx(%u,%u) resp(=%d) from PF in %d tries\n", +@@ -178,6 +181,10 @@ static void hclgevf_handle_mbx_response(struct hclgevf_dev *hdev, + resp->resp_status = hclgevf_resp_to_errno(resp_status); + memcpy(resp->additional_info, req->msg.resp_data, + HCLGE_MBX_MAX_RESP_DATA_SIZE * sizeof(u8)); ++ ++ /* ensure additional_info will be seen before setting received_resp */ ++ smp_wmb(); ++ + if (match_id) { + /* If match_id is not zero, it means PF support match_id. + * if the match_id is right, VF get the right response, or +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-add-vlan-fail-issue.patch b/queue-6.1/net-hns3-fix-add-vlan-fail-issue.patch new file mode 100644 index 00000000000..4659be006fd --- /dev/null +++ b/queue-6.1/net-hns3-fix-add-vlan-fail-issue.patch @@ -0,0 +1,192 @@ +From 309901494de19e987fbe37a127d50091189edcb2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:07 +0800 +Subject: net: hns3: fix add VLAN fail issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jian Shen + +[ Upstream commit 472a2ff63efb30234cbf6b2cdaf8117f21b4f8bc ] + +The hclge_sync_vlan_filter is called in periodic task, +trying to remove VLAN from vlan_del_fail_bmap. It can +be concurrence with VLAN adding operation from user. +So once user failed to delete a VLAN id, and add it +again soon, it may be removed by the periodic task, +which may cause the software configuration being +inconsistent with hardware. So add mutex handling +to avoid this. + + user hns3 driver + + periodic task + │ + add vlan 10 ───── hns3_vlan_rx_add_vid │ + │ (suppose success) │ + │ │ + del vlan 10 ───── hns3_vlan_rx_kill_vid │ + │ (suppose fail,add to │ + │ vlan_del_fail_bmap) │ + │ │ + add vlan 10 ───── hns3_vlan_rx_add_vid │ + (suppose success) │ + foreach vlan_del_fail_bmp + del vlan 10 + +Fixes: fe4144d47eef ("net: hns3: sync VLAN filter entries when kill VLAN ID failed") +Signed-off-by: Jian Shen +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + .../hisilicon/hns3/hns3pf/hclge_main.c | 28 +++++++++++++------ + .../hisilicon/hns3/hns3vf/hclgevf_main.c | 11 ++++++-- + 2 files changed, 29 insertions(+), 10 deletions(-) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +index 3e1d202d60ce1..51998a4d732d3 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +@@ -10132,8 +10132,6 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id, + struct hclge_vport_vlan_cfg *vlan, *tmp; + struct hclge_dev *hdev = vport->back; + +- mutex_lock(&hdev->vport_lock); +- + list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) { + if (vlan->vlan_id == vlan_id) { + if (is_write_tbl && vlan->hd_tbl_status) +@@ -10148,8 +10146,6 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id, + break; + } + } +- +- mutex_unlock(&hdev->vport_lock); + } + + void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list) +@@ -10558,11 +10554,16 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto, + * handle mailbox. Just record the vlan id, and remove it after + * reset finished. + */ ++ mutex_lock(&hdev->vport_lock); + if ((test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state) || + test_bit(HCLGE_STATE_RST_FAIL, &hdev->state)) && is_kill) { + set_bit(vlan_id, vport->vlan_del_fail_bmap); ++ mutex_unlock(&hdev->vport_lock); + return -EBUSY; ++ } else if (!is_kill && test_bit(vlan_id, vport->vlan_del_fail_bmap)) { ++ clear_bit(vlan_id, vport->vlan_del_fail_bmap); + } ++ mutex_unlock(&hdev->vport_lock); + + /* when port base vlan enabled, we use port base vlan as the vlan + * filter entry. In this case, we don't update vlan filter table +@@ -10577,17 +10578,22 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto, + } + + if (!ret) { +- if (!is_kill) ++ if (!is_kill) { + hclge_add_vport_vlan_table(vport, vlan_id, + writen_to_tbl); +- else if (is_kill && vlan_id != 0) ++ } else if (is_kill && vlan_id != 0) { ++ mutex_lock(&hdev->vport_lock); + hclge_rm_vport_vlan_table(vport, vlan_id, false); ++ mutex_unlock(&hdev->vport_lock); ++ } + } else if (is_kill) { + /* when remove hw vlan filter failed, record the vlan id, + * and try to remove it from hw later, to be consistence + * with stack + */ ++ mutex_lock(&hdev->vport_lock); + set_bit(vlan_id, vport->vlan_del_fail_bmap); ++ mutex_unlock(&hdev->vport_lock); + } + + hclge_set_vport_vlan_fltr_change(vport); +@@ -10627,6 +10633,7 @@ static void hclge_sync_vlan_filter(struct hclge_dev *hdev) + int i, ret, sync_cnt = 0; + u16 vlan_id; + ++ mutex_lock(&hdev->vport_lock); + /* start from vport 1 for PF is always alive */ + for (i = 0; i < hdev->num_alloc_vport; i++) { + struct hclge_vport *vport = &hdev->vport[i]; +@@ -10637,21 +10644,26 @@ static void hclge_sync_vlan_filter(struct hclge_dev *hdev) + ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q), + vport->vport_id, vlan_id, + true); +- if (ret && ret != -EINVAL) ++ if (ret && ret != -EINVAL) { ++ mutex_unlock(&hdev->vport_lock); + return; ++ } + + clear_bit(vlan_id, vport->vlan_del_fail_bmap); + hclge_rm_vport_vlan_table(vport, vlan_id, false); + hclge_set_vport_vlan_fltr_change(vport); + + sync_cnt++; +- if (sync_cnt >= HCLGE_MAX_SYNC_COUNT) ++ if (sync_cnt >= HCLGE_MAX_SYNC_COUNT) { ++ mutex_unlock(&hdev->vport_lock); + return; ++ } + + vlan_id = find_first_bit(vport->vlan_del_fail_bmap, + VLAN_N_VID); + } + } ++ mutex_unlock(&hdev->vport_lock); + + hclge_sync_vlan_fltr_state(hdev); + } +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +index 72cf5145e15a2..90ceec730d5bd 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +@@ -1258,6 +1258,8 @@ static int hclgevf_set_vlan_filter(struct hnae3_handle *handle, + test_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state)) && is_kill) { + set_bit(vlan_id, hdev->vlan_del_fail_bmap); + return -EBUSY; ++ } else if (!is_kill && test_bit(vlan_id, hdev->vlan_del_fail_bmap)) { ++ clear_bit(vlan_id, hdev->vlan_del_fail_bmap); + } + + hclgevf_build_send_msg(&send_msg, HCLGE_MBX_SET_VLAN, +@@ -1285,20 +1287,25 @@ static void hclgevf_sync_vlan_filter(struct hclgevf_dev *hdev) + int ret, sync_cnt = 0; + u16 vlan_id; + ++ if (bitmap_empty(hdev->vlan_del_fail_bmap, VLAN_N_VID)) ++ return; ++ ++ rtnl_lock(); + vlan_id = find_first_bit(hdev->vlan_del_fail_bmap, VLAN_N_VID); + while (vlan_id != VLAN_N_VID) { + ret = hclgevf_set_vlan_filter(handle, htons(ETH_P_8021Q), + vlan_id, true); + if (ret) +- return; ++ break; + + clear_bit(vlan_id, hdev->vlan_del_fail_bmap); + sync_cnt++; + if (sync_cnt >= HCLGEVF_MAX_SYNC_COUNT) +- return; ++ break; + + vlan_id = find_first_bit(hdev->vlan_del_fail_bmap, VLAN_N_VID); + } ++ rtnl_unlock(); + } + + static int hclgevf_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable) +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-incorrect-capability-bit-display-for-co.patch b/queue-6.1/net-hns3-fix-incorrect-capability-bit-display-for-co.patch new file mode 100644 index 00000000000..a1d81917fdb --- /dev/null +++ b/queue-6.1/net-hns3-fix-incorrect-capability-bit-display-for-co.patch @@ -0,0 +1,38 @@ +From 85392e86c5375efc5ee266d5185da8595c9c9d0f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:09 +0800 +Subject: net: hns3: fix incorrect capability bit display for copper port + +From: Jian Shen + +[ Upstream commit 75b247b57d8b71bcb679e4cb37d0db104848806c ] + +Currently, the FEC capability bit is default set for device version V2. +It's incorrect for the copper port. Eventhough it doesn't make the nic +work abnormal, but the capability information display in debugfs may +confuse user. So clear it when driver get the port type inforamtion. + +Fixes: 433ccce83504 ("net: hns3: use FEC capability queried from firmware") +Signed-off-by: Jian Shen +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +index 51998a4d732d3..da5fbe627fa0b 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +@@ -11654,6 +11654,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) + goto err_msi_irq_uninit; + + if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) { ++ clear_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps); + if (hnae3_dev_phy_imp_supported(hdev)) + ret = hclge_update_tp_port_info(hdev); + else +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-out-of-bounds-access-may-occur-when-coa.patch b/queue-6.1/net-hns3-fix-out-of-bounds-access-may-occur-when-coa.patch new file mode 100644 index 00000000000..91c9c72560d --- /dev/null +++ b/queue-6.1/net-hns3-fix-out-of-bounds-access-may-occur-when-coa.patch @@ -0,0 +1,49 @@ +From b2b77efd4283ba8a4503290149a329a4f3a38950 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:10 +0800 +Subject: net: hns3: fix out-of-bounds access may occur when coalesce info is + read via debugfs + +From: Yonglong Liu + +[ Upstream commit 53aba458f23846112c0d44239580ff59bc5c36c3 ] + +The hns3 driver define an array of string to show the coalesce +info, but if the kernel adds a new mode or a new state, +out-of-bounds access may occur when coalesce info is read via +debugfs, this patch fix the problem. + +Fixes: c99fead7cb07 ("net: hns3: add debugfs support for interrupt coalesce") +Signed-off-by: Yonglong Liu +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +index 00eed9835cb55..d2603cfc122c8 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +@@ -494,11 +494,14 @@ static void hns3_get_coal_info(struct hns3_enet_tqp_vector *tqp_vector, + } + + sprintf(result[j++], "%d", i); +- sprintf(result[j++], "%s", dim_state_str[dim->state]); ++ sprintf(result[j++], "%s", dim->state < ARRAY_SIZE(dim_state_str) ? ++ dim_state_str[dim->state] : "unknown"); + sprintf(result[j++], "%u", dim->profile_ix); +- sprintf(result[j++], "%s", dim_cqe_mode_str[dim->mode]); ++ sprintf(result[j++], "%s", dim->mode < ARRAY_SIZE(dim_cqe_mode_str) ? ++ dim_cqe_mode_str[dim->mode] : "unknown"); + sprintf(result[j++], "%s", +- dim_tune_stat_str[dim->tune_state]); ++ dim->tune_state < ARRAY_SIZE(dim_tune_stat_str) ? ++ dim_tune_stat_str[dim->tune_state] : "unknown"); + sprintf(result[j++], "%u", dim->steps_left); + sprintf(result[j++], "%u", dim->steps_right); + sprintf(result[j++], "%u", dim->tired); +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-variable-may-not-initialized-problem-in.patch b/queue-6.1/net-hns3-fix-variable-may-not-initialized-problem-in.patch new file mode 100644 index 00000000000..22e79808742 --- /dev/null +++ b/queue-6.1/net-hns3-fix-variable-may-not-initialized-problem-in.patch @@ -0,0 +1,38 @@ +From b0accbcf52ac78422cda4859cef7f028bd6cb9d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:11 +0800 +Subject: net: hns3: fix variable may not initialized problem in + hns3_init_mac_addr() + +From: Yonglong Liu + +[ Upstream commit dbd2f3b20c6ae425665b6975d766e3653d453e73 ] + +When a VF is calling hns3_init_mac_addr(), get_mac_addr() may +return fail, then the value of mac_addr_temp is not initialized. + +Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC") +Signed-off-by: Yonglong Liu +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +index 04c9baca1b0f8..5ad22b815b2f0 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +@@ -5139,7 +5139,7 @@ static int hns3_init_mac_addr(struct net_device *netdev) + struct hns3_nic_priv *priv = netdev_priv(netdev); + char format_mac_addr[HNAE3_FORMAT_MAC_ADDR_LEN]; + struct hnae3_handle *h = priv->ae_handle; +- u8 mac_addr_temp[ETH_ALEN]; ++ u8 mac_addr_temp[ETH_ALEN] = {0}; + int ret = 0; + + if (h->ae_algo->ops->get_mac_addr) +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-vf-reset-fail-issue.patch b/queue-6.1/net-hns3-fix-vf-reset-fail-issue.patch new file mode 100644 index 00000000000..f10acf475c7 --- /dev/null +++ b/queue-6.1/net-hns3-fix-vf-reset-fail-issue.patch @@ -0,0 +1,83 @@ +From 45bc1f55162c8725c4b8aa7ce640a900da04465b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:12 +0800 +Subject: net: hns3: fix VF reset fail issue + +From: Jijie Shao + +[ Upstream commit 65e98bb56fa3ce2edb400930c05238c9b380500e ] + +Currently the reset process in hns3 and firmware watchdog init process is +asynchronous. We think firmware watchdog initialization is completed +before VF clear the interrupt source. However, firmware initialization +may not complete early. So VF will receive multiple reset interrupts +and fail to reset. + +So we add delay before VF interrupt source and 5 ms delay +is enough to avoid second reset interrupt. + +Fixes: 427900d27d86 ("net: hns3: fix the timing issue of VF clearing interrupt sources") +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 14 +++++++++++++- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +index 90ceec730d5bd..5a978ea101a90 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +@@ -2035,8 +2035,18 @@ static enum hclgevf_evt_cause hclgevf_check_evt_cause(struct hclgevf_dev *hdev, + return HCLGEVF_VECTOR0_EVENT_OTHER; + } + ++static void hclgevf_reset_timer(struct timer_list *t) ++{ ++ struct hclgevf_dev *hdev = from_timer(hdev, t, reset_timer); ++ ++ hclgevf_clear_event_cause(hdev, HCLGEVF_VECTOR0_EVENT_RST); ++ hclgevf_reset_task_schedule(hdev); ++} ++ + static irqreturn_t hclgevf_misc_irq_handle(int irq, void *data) + { ++#define HCLGEVF_RESET_DELAY 5 ++ + enum hclgevf_evt_cause event_cause; + struct hclgevf_dev *hdev = data; + u32 clearval; +@@ -2048,7 +2058,8 @@ static irqreturn_t hclgevf_misc_irq_handle(int irq, void *data) + + switch (event_cause) { + case HCLGEVF_VECTOR0_EVENT_RST: +- hclgevf_reset_task_schedule(hdev); ++ mod_timer(&hdev->reset_timer, ++ jiffies + msecs_to_jiffies(HCLGEVF_RESET_DELAY)); + break; + case HCLGEVF_VECTOR0_EVENT_MBX: + hclgevf_mbx_handler(hdev); +@@ -2994,6 +3005,7 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) + HCLGEVF_DRIVER_NAME); + + hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); ++ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); + + return 0; + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +index 59ca6c794d6db..d65ace07b4569 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +@@ -219,6 +219,7 @@ struct hclgevf_dev { + enum hnae3_reset_type reset_level; + unsigned long reset_pending; + enum hnae3_reset_type reset_type; ++ struct timer_list reset_timer; + + #define HCLGEVF_RESET_REQUESTED 0 + #define HCLGEVF_RESET_PENDING 1 +-- +2.42.0 + diff --git a/queue-6.1/net-hns3-fix-vf-wrong-speed-and-duplex-issue.patch b/queue-6.1/net-hns3-fix-vf-wrong-speed-and-duplex-issue.patch new file mode 100644 index 00000000000..612783640f5 --- /dev/null +++ b/queue-6.1/net-hns3-fix-vf-wrong-speed-and-duplex-issue.patch @@ -0,0 +1,57 @@ +From 07198ebc9322cb4a5fbc9eefa675eb914edf836e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Nov 2023 17:37:13 +0800 +Subject: net: hns3: fix VF wrong speed and duplex issue + +From: Jijie Shao + +[ Upstream commit dff655e82faffc287d4a72a59f66fa120bf904e4 ] + +If PF is down, firmware will returns 10 Mbit/s rate and half-duplex mode +when PF queries the port information from firmware. + +After imp reset command is executed, PF status changes to down, +and PF will query link status and updates port information +from firmware in a periodic scheduled task. + +However, there is a low probability that port information is updated +when PF is down, and then PF link status changes to up. +In this case, PF synchronizes incorrect rate and duplex mode to VF. + +This patch fixes it by updating port information before +PF synchronizes the rate and duplex to the VF +when PF changes to up. + +Fixes: 18b6e31f8bf4 ("net: hns3: PF add support for pushing link status to VFs") +Signed-off-by: Jijie Shao +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +index da5fbe627fa0b..48b0cb5ec5d29 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +@@ -74,6 +74,7 @@ static void hclge_sync_fd_table(struct hclge_dev *hdev); + static void hclge_update_fec_stats(struct hclge_dev *hdev); + static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret, + int wait_cnt); ++static int hclge_update_port_info(struct hclge_dev *hdev); + + static struct hnae3_ae_algo ae_algo; + +@@ -3141,6 +3142,9 @@ static void hclge_update_link_status(struct hclge_dev *hdev) + + if (state != hdev->hw.mac.link) { + hdev->hw.mac.link = state; ++ if (state == HCLGE_LINK_STATUS_UP) ++ hclge_update_port_info(hdev); ++ + client->ops->link_status_change(handle, state); + hclge_config_mac_tnl_int(hdev, state); + if (rclient && rclient->ops->link_status_change) +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch b/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch new file mode 100644 index 00000000000..70ff2e5d153 --- /dev/null +++ b/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch @@ -0,0 +1,72 @@ +From a016045984a3f33d1d2d7a54c3a838b122909004 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:45 -0800 +Subject: net/mlx5e: Check return value of snprintf writing to fw_version + buffer + +From: Rahul Rameshbabu + +[ Upstream commit 41e63c2baa11dc2aa71df5dd27a5bd87d11b6bbb ] + +Treat the operation as an error case when the return value is equivalent to +the size of the name buffer. Failed to write null terminator to the name +buffer, making the string malformed and should not be used. Provide a +string with only the firmware version when forming the string with the +board id fails. + +Without check, will trigger -Wformat-truncation with W=1. + + drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_ethtool_get_drvinfo': + drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:49:31: warning: '%.16s' directive output may be truncated writing up to 16 bytes into a region of size between 13 and 22 [-Wformat-truncation=] + 49 | "%d.%d.%04d (%.16s)", + | ^~~~~ + drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:48:9: note: 'snprintf' output between 12 and 37 bytes into a destination of size 32 + 48 | snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 49 | "%d.%d.%04d (%.16s)", + | ~~~~~~~~~~~~~~~~~~~~~ + 50 | fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev), + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 51 | mdev->board_id); + | ~~~~~~~~~~~~~~~ + +Fixes: 84e11edb71de ("net/mlx5e: Show board id in ethtool driver information") +Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d4ab2e97dcfbcd748ae71761a9d8e5e41cc732c +Signed-off-by: Rahul Rameshbabu +Reviewed-by: Dragos Tatulea +Signed-off-by: Saeed Mahameed +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +index 1728e197558d0..eeba91d9c5211 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +@@ -43,12 +43,17 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, + struct ethtool_drvinfo *drvinfo) + { + struct mlx5_core_dev *mdev = priv->mdev; ++ int count; + + strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver)); +- snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), +- "%d.%d.%04d (%.16s)", +- fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev), +- mdev->board_id); ++ count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), ++ "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), ++ fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id); ++ if (count == sizeof(drvinfo->fw_version)) ++ snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), ++ "%d.%d.%04d", fw_rev_maj(mdev), ++ fw_rev_min(mdev), fw_rev_sub(mdev)); ++ + strscpy(drvinfo->bus_info, dev_name(mdev->device), + sizeof(drvinfo->bus_info)); + } +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch-10342 b/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch-10342 new file mode 100644 index 00000000000..911faf4161f --- /dev/null +++ b/queue-6.1/net-mlx5e-check-return-value-of-snprintf-writing-to-.patch-10342 @@ -0,0 +1,74 @@ +From 1db12c99353458b6cdc2e3e8b2d23446611c4b00 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:46 -0800 +Subject: net/mlx5e: Check return value of snprintf writing to fw_version + buffer for representors + +From: Rahul Rameshbabu + +[ Upstream commit 1b2bd0c0264febcd8d47209079a6671c38e6558b ] + +Treat the operation as an error case when the return value is equivalent to +the size of the name buffer. Failed to write null terminator to the name +buffer, making the string malformed and should not be used. Provide a +string with only the firmware version when forming the string with the +board id fails. This logic for representors is identical to normal flow +with ethtool. + +Without check, will trigger -Wformat-truncation with W=1. + + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c: In function 'mlx5e_rep_get_drvinfo': + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:78:31: warning: '%.16s' directive output may be truncated writing up to 16 bytes into a region of size between 13 and 22 [-Wformat-truncation=] + 78 | "%d.%d.%04d (%.16s)", + | ^~~~~ + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:77:9: note: 'snprintf' output between 12 and 37 bytes into a destination of size 32 + 77 | snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 78 | "%d.%d.%04d (%.16s)", + | ~~~~~~~~~~~~~~~~~~~~~ + 79 | fw_rev_maj(mdev), fw_rev_min(mdev), + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 80 | fw_rev_sub(mdev), mdev->board_id); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: cf83c8fdcd47 ("net/mlx5e: Add missing ethtool driver info for representors") +Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d4ab2e97dcfbcd748ae71761a9d8e5e41cc732c +Signed-off-by: Rahul Rameshbabu +Reviewed-by: Dragos Tatulea +Signed-off-by: Saeed Mahameed +Link: https://lore.kernel.org/r/20231114215846.5902-16-saeed@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +index bd895ef341a0b..2653cb96c3105 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +@@ -69,13 +69,17 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev, + { + struct mlx5e_priv *priv = netdev_priv(dev); + struct mlx5_core_dev *mdev = priv->mdev; ++ int count; + + strscpy(drvinfo->driver, mlx5e_rep_driver_name, + sizeof(drvinfo->driver)); +- snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), +- "%d.%d.%04d (%.16s)", +- fw_rev_maj(mdev), fw_rev_min(mdev), +- fw_rev_sub(mdev), mdev->board_id); ++ count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), ++ "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), ++ fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id); ++ if (count == sizeof(drvinfo->fw_version)) ++ snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), ++ "%d.%d.%04d", fw_rev_maj(mdev), ++ fw_rev_min(mdev), fw_rev_sub(mdev)); + } + + static const struct counter_desc sw_rep_stats_desc[] = { +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-fix-double-free-of-encap_header-in-update-.patch b/queue-6.1/net-mlx5e-fix-double-free-of-encap_header-in-update-.patch new file mode 100644 index 00000000000..2672769a6c4 --- /dev/null +++ b/queue-6.1/net-mlx5e-fix-double-free-of-encap_header-in-update-.patch @@ -0,0 +1,102 @@ +From a57a6f5677460dc6d0879bc88c37b84e315c2bd2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:37 -0800 +Subject: net/mlx5e: fix double free of encap_header in update funcs + +From: Gavin Li + +[ Upstream commit 3a4aa3cb83563df942be49d145ee3b7ddf17d6bb ] + +Follow up to the previous patch to fix the same issue for +mlx5e_tc_tun_update_header_ipv4{6} when mlx5_packet_reformat_alloc() +fails. + +When mlx5_packet_reformat_alloc() fails, the encap_header allocated in +mlx5e_tc_tun_update_header_ipv4{6} will be released within it. However, +e->encap_header is already set to the previously freed encap_header +before mlx5_packet_reformat_alloc(). As a result, the later +mlx5e_encap_put() will free e->encap_header again, causing a double free +issue. + +mlx5e_encap_put() + --> mlx5e_encap_dealloc() + --> kfree(e->encap_header) + +This patch fix it by not setting e->encap_header until +mlx5_packet_reformat_alloc() success. + +Fixes: a54e20b4fcae ("net/mlx5e: Add basic TC tunnel set action for SRIOV offloads") +Signed-off-by: Gavin Li +Signed-off-by: Saeed Mahameed +Link: https://lore.kernel.org/r/20231114215846.5902-7-saeed@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../ethernet/mellanox/mlx5/core/en/tc_tun.c | 20 +++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +index ccfc626c37d48..4db0483c066a8 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +@@ -403,16 +403,12 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, + if (err) + goto free_encap; + +- e->encap_size = ipv4_encap_size; +- kfree(e->encap_header); +- e->encap_header = encap_header; +- + if (!(nud_state & NUD_VALID)) { + neigh_event_send(attr.n, NULL); + /* the encap entry will be made valid on neigh update event + * and not used before that. + */ +- goto release_neigh; ++ goto free_encap; + } + + memset(&reformat_params, 0, sizeof(reformat_params)); +@@ -426,6 +422,10 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, + goto free_encap; + } + ++ e->encap_size = ipv4_encap_size; ++ kfree(e->encap_header); ++ e->encap_header = encap_header; ++ + e->flags |= MLX5_ENCAP_ENTRY_VALID; + mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev)); + mlx5e_route_lookup_ipv4_put(&attr); +@@ -669,16 +669,12 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, + if (err) + goto free_encap; + +- e->encap_size = ipv6_encap_size; +- kfree(e->encap_header); +- e->encap_header = encap_header; +- + if (!(nud_state & NUD_VALID)) { + neigh_event_send(attr.n, NULL); + /* the encap entry will be made valid on neigh update event + * and not used before that. + */ +- goto release_neigh; ++ goto free_encap; + } + + memset(&reformat_params, 0, sizeof(reformat_params)); +@@ -692,6 +688,10 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, + goto free_encap; + } + ++ e->encap_size = ipv6_encap_size; ++ kfree(e->encap_header); ++ e->encap_header = encap_header; ++ + e->flags |= MLX5_ENCAP_ENTRY_VALID; + mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev)); + mlx5e_route_lookup_ipv6_put(&attr); +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-fix-double-free-of-encap_header.patch b/queue-6.1/net-mlx5e-fix-double-free-of-encap_header.patch new file mode 100644 index 00000000000..8ba8fcaddd7 --- /dev/null +++ b/queue-6.1/net-mlx5e-fix-double-free-of-encap_header.patch @@ -0,0 +1,82 @@ +From 59843d744d9a6ab0d0e99b4efc34708fe6e515b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:36 -0800 +Subject: net/mlx5e: fix double free of encap_header + +From: Dust Li + +[ Upstream commit 6f9b1a0731662648949a1c0587f6acb3b7f8acf1 ] + +When mlx5_packet_reformat_alloc() fails, the encap_header allocated in +mlx5e_tc_tun_create_header_ipv4{6} will be released within it. However, +e->encap_header is already set to the previously freed encap_header +before mlx5_packet_reformat_alloc(). As a result, the later +mlx5e_encap_put() will free e->encap_header again, causing a double free +issue. + +mlx5e_encap_put() + --> mlx5e_encap_dealloc() + --> kfree(e->encap_header) + +This happens when cmd: MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT fail. + +This patch fix it by not setting e->encap_header until +mlx5_packet_reformat_alloc() success. + +Fixes: d589e785baf5e ("net/mlx5e: Allow concurrent creation of encap entries") +Reported-by: Cruz Zhao +Reported-by: Tianchen Ding +Signed-off-by: Dust Li +Reviewed-by: Wojciech Drewek +Signed-off-by: Saeed Mahameed +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +index 83bb0811e7741..ccfc626c37d48 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +@@ -300,9 +300,6 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, + if (err) + goto destroy_neigh_entry; + +- e->encap_size = ipv4_encap_size; +- e->encap_header = encap_header; +- + if (!(nud_state & NUD_VALID)) { + neigh_event_send(attr.n, NULL); + /* the encap entry will be made valid on neigh update event +@@ -322,6 +319,8 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, + goto destroy_neigh_entry; + } + ++ e->encap_size = ipv4_encap_size; ++ e->encap_header = encap_header; + e->flags |= MLX5_ENCAP_ENTRY_VALID; + mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev)); + mlx5e_route_lookup_ipv4_put(&attr); +@@ -568,9 +567,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, + if (err) + goto destroy_neigh_entry; + +- e->encap_size = ipv6_encap_size; +- e->encap_header = encap_header; +- + if (!(nud_state & NUD_VALID)) { + neigh_event_send(attr.n, NULL); + /* the encap entry will be made valid on neigh update event +@@ -590,6 +586,8 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, + goto destroy_neigh_entry; + } + ++ e->encap_size = ipv6_encap_size; ++ e->encap_header = encap_header; + e->flags |= MLX5_ENCAP_ENTRY_VALID; + mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev)); + mlx5e_route_lookup_ipv6_put(&attr); +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-fix-pedit-endianness.patch b/queue-6.1/net-mlx5e-fix-pedit-endianness.patch new file mode 100644 index 00000000000..a0d116491c9 --- /dev/null +++ b/queue-6.1/net-mlx5e-fix-pedit-endianness.patch @@ -0,0 +1,174 @@ +From eb1f521a4814fcb0c9be65efd16ad3d07aba8f1d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:38 -0800 +Subject: net/mlx5e: Fix pedit endianness + +From: Vlad Buslov + +[ Upstream commit 0c101a23ca7eaf00eef1328eefb04b3a93401cc8 ] + +Referenced commit addressed endianness issue in mlx5 pedit implementation +in ad hoc manner instead of systematically treating integer values +according to their types which left pedit fields of sizes not equal to 4 +and where the bytes being modified are not least significant ones broken on +big endian machines since wrong bits will be consumed during parsing which +leads to following example error when applying pedit to source and +destination MAC addresses: + +[Wed Oct 18 12:52:42 2023] mlx5_core 0001:00:00.1 p1v3_r: attempt to offload an unsupported field (cmd 0) +[Wed Oct 18 12:52:42 2023] mask: 00000000330c5b68: 00 00 00 00 ff ff 00 00 00 00 ff ff 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 0000000017d22fd9: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 000000008186d717: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 0000000029eb6149: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 000000007ed103e4: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 00000000db8101a6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +[Wed Oct 18 12:52:42 2023] mask: 00000000ec3c08a9: 00 00 00 00 00 00 00 00 00 00 00 00 ............ + +Treat masks and values of pedit and filter match as network byte order, +refactor pointers to them to void pointers instead of confusing u32 +pointers and only cast to pointer-to-integer when reading a value from +them. Treat pedit mlx5_fields->field_mask as host byte order according to +its type u32, change the constants in fields array accordingly. + +Fixes: 82198d8bcdef ("net/mlx5e: Fix endianness when calculating pedit mask first bit") +Signed-off-by: Vlad Buslov +Reviewed-by: Gal Pressman +Signed-off-by: Saeed Mahameed +Link: https://lore.kernel.org/r/20231114215846.5902-8-saeed@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../net/ethernet/mellanox/mlx5/core/en_tc.c | 60 ++++++++++--------- + 1 file changed, 32 insertions(+), 28 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +index 7ab489520a873..43239555f7850 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +@@ -3102,7 +3102,7 @@ static struct mlx5_fields fields[] = { + OFFLOAD(DIPV6_31_0, 32, U32_MAX, ip6.daddr.s6_addr32[3], 0, + dst_ipv4_dst_ipv6.ipv6_layout.ipv6[12]), + OFFLOAD(IPV6_HOPLIMIT, 8, U8_MAX, ip6.hop_limit, 0, ttl_hoplimit), +- OFFLOAD(IP_DSCP, 16, 0xc00f, ip6, 0, ip_dscp), ++ OFFLOAD(IP_DSCP, 16, 0x0fc0, ip6, 0, ip_dscp), + + OFFLOAD(TCP_SPORT, 16, U16_MAX, tcp.source, 0, tcp_sport), + OFFLOAD(TCP_DPORT, 16, U16_MAX, tcp.dest, 0, tcp_dport), +@@ -3113,21 +3113,31 @@ static struct mlx5_fields fields[] = { + OFFLOAD(UDP_DPORT, 16, U16_MAX, udp.dest, 0, udp_dport), + }; + +-static unsigned long mask_to_le(unsigned long mask, int size) ++static u32 mask_field_get(void *mask, struct mlx5_fields *f) + { +- __be32 mask_be32; +- __be16 mask_be16; +- +- if (size == 32) { +- mask_be32 = (__force __be32)(mask); +- mask = (__force unsigned long)cpu_to_le32(be32_to_cpu(mask_be32)); +- } else if (size == 16) { +- mask_be32 = (__force __be32)(mask); +- mask_be16 = *(__be16 *)&mask_be32; +- mask = (__force unsigned long)cpu_to_le16(be16_to_cpu(mask_be16)); ++ switch (f->field_bsize) { ++ case 32: ++ return be32_to_cpu(*(__be32 *)mask) & f->field_mask; ++ case 16: ++ return be16_to_cpu(*(__be16 *)mask) & (u16)f->field_mask; ++ default: ++ return *(u8 *)mask & (u8)f->field_mask; + } ++} + +- return mask; ++static void mask_field_clear(void *mask, struct mlx5_fields *f) ++{ ++ switch (f->field_bsize) { ++ case 32: ++ *(__be32 *)mask &= ~cpu_to_be32(f->field_mask); ++ break; ++ case 16: ++ *(__be16 *)mask &= ~cpu_to_be16((u16)f->field_mask); ++ break; ++ default: ++ *(u8 *)mask &= ~(u8)f->field_mask; ++ break; ++ } + } + + static int offload_pedit_fields(struct mlx5e_priv *priv, +@@ -3139,11 +3149,12 @@ static int offload_pedit_fields(struct mlx5e_priv *priv, + struct pedit_headers *set_masks, *add_masks, *set_vals, *add_vals; + struct pedit_headers_action *hdrs = parse_attr->hdrs; + void *headers_c, *headers_v, *action, *vals_p; +- u32 *s_masks_p, *a_masks_p, s_mask, a_mask; + struct mlx5e_tc_mod_hdr_acts *mod_acts; +- unsigned long mask, field_mask; ++ void *s_masks_p, *a_masks_p; + int i, first, last, next_z; + struct mlx5_fields *f; ++ unsigned long mask; ++ u32 s_mask, a_mask; + u8 cmd; + + mod_acts = &parse_attr->mod_hdr_acts; +@@ -3159,15 +3170,11 @@ static int offload_pedit_fields(struct mlx5e_priv *priv, + bool skip; + + f = &fields[i]; +- /* avoid seeing bits set from previous iterations */ +- s_mask = 0; +- a_mask = 0; +- + s_masks_p = (void *)set_masks + f->offset; + a_masks_p = (void *)add_masks + f->offset; + +- s_mask = *s_masks_p & f->field_mask; +- a_mask = *a_masks_p & f->field_mask; ++ s_mask = mask_field_get(s_masks_p, f); ++ a_mask = mask_field_get(a_masks_p, f); + + if (!s_mask && !a_mask) /* nothing to offload here */ + continue; +@@ -3194,22 +3201,20 @@ static int offload_pedit_fields(struct mlx5e_priv *priv, + match_mask, f->field_bsize)) + skip = true; + /* clear to denote we consumed this field */ +- *s_masks_p &= ~f->field_mask; ++ mask_field_clear(s_masks_p, f); + } else { + cmd = MLX5_ACTION_TYPE_ADD; + mask = a_mask; + vals_p = (void *)add_vals + f->offset; + /* add 0 is no change */ +- if ((*(u32 *)vals_p & f->field_mask) == 0) ++ if (!mask_field_get(vals_p, f)) + skip = true; + /* clear to denote we consumed this field */ +- *a_masks_p &= ~f->field_mask; ++ mask_field_clear(a_masks_p, f); + } + if (skip) + continue; + +- mask = mask_to_le(mask, f->field_bsize); +- + first = find_first_bit(&mask, f->field_bsize); + next_z = find_next_zero_bit(&mask, f->field_bsize, first); + last = find_last_bit(&mask, f->field_bsize); +@@ -3236,10 +3241,9 @@ static int offload_pedit_fields(struct mlx5e_priv *priv, + MLX5_SET(set_action_in, action, field, f->field); + + if (cmd == MLX5_ACTION_TYPE_SET) { ++ unsigned long field_mask = f->field_mask; + int start; + +- field_mask = mask_to_le(f->field_mask, f->field_bsize); +- + /* if field is bit sized it can start not from first bit */ + start = find_first_bit(&field_mask, f->field_bsize); + +-- +2.42.0 + diff --git a/queue-6.1/net-mlx5e-reduce-the-size-of-icosq_str.patch b/queue-6.1/net-mlx5e-reduce-the-size-of-icosq_str.patch new file mode 100644 index 00000000000..368ee146354 --- /dev/null +++ b/queue-6.1/net-mlx5e-reduce-the-size-of-icosq_str.patch @@ -0,0 +1,73 @@ +From 6c2488b9cb47db9a2d8dffd1f2fca44fc447624b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Nov 2023 13:58:44 -0800 +Subject: net/mlx5e: Reduce the size of icosq_str + +From: Saeed Mahameed + +[ Upstream commit dce94142842e119b982c27c1b62bd20890c7fd21 ] + +icosq_str size is unnecessarily too long, and it causes a build warning +-Wformat-truncation with W=1. Looking closely, It doesn't need to be 255B, +hence this patch reduces the size to 32B which should be more than enough +to host the string: "ICOSQ: 0x%x, ". + +While here, add a missing space in the formatted string. + +This fixes the following build warning: + +$ KCFLAGS='-Wall -Werror' +$ make O=/tmp/kbuild/linux W=1 -s -j12 drivers/net/ethernet/mellanox/mlx5/core/ + +drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c: In function 'mlx5e_reporter_rx_timeout': +drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c:718:56: +error: ', CQ: 0x' directive output may be truncated writing 8 bytes into a region of size between 0 and 255 [-Werror=format-truncation=] + 718 | "RX timeout on channel: %d, %sRQ: 0x%x, CQ: 0x%x", + | ^~~~~~~~ +drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c:717:9: note: 'snprintf' output between 43 and 322 bytes into a destination of size 288 + 717 | snprintf(err_str, sizeof(err_str), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 718 | "RX timeout on channel: %d, %sRQ: 0x%x, CQ: 0x%x", + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 719 | rq->ix, icosq_str, rq->rqn, rq->cq.mcq.cqn); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: 521f31af004a ("net/mlx5e: Allow RQ outside of channel context") +Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d4ab2e97dcfbcd748ae71761a9d8e5e41cc732c +Signed-off-by: Saeed Mahameed +Link: https://lore.kernel.org/r/20231114215846.5902-14-saeed@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +index 1ae15b8536a85..9b1f1369ac4d8 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +@@ -668,11 +668,11 @@ static int mlx5e_rx_reporter_dump(struct devlink_health_reporter *reporter, + + void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq) + { +- char icosq_str[MLX5E_REPORTER_PER_Q_MAX_LEN] = {}; + char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN]; + struct mlx5e_icosq *icosq = rq->icosq; + struct mlx5e_priv *priv = rq->priv; + struct mlx5e_err_ctx err_ctx = {}; ++ char icosq_str[32] = {}; + + err_ctx.ctx = rq; + err_ctx.recover = mlx5e_rx_reporter_timeout_recover; +@@ -681,7 +681,7 @@ void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq) + if (icosq) + snprintf(icosq_str, sizeof(icosq_str), "ICOSQ: 0x%x, ", icosq->sqn); + snprintf(err_str, sizeof(err_str), +- "RX timeout on channel: %d, %sRQ: 0x%x, CQ: 0x%x", ++ "RX timeout on channel: %d, %s RQ: 0x%x, CQ: 0x%x", + rq->ix, icosq_str, rq->rqn, rq->cq.mcq.cqn); + + mlx5e_health_report(priv, priv->rx_reporter, err_str, &err_ctx); +-- +2.42.0 + diff --git a/queue-6.1/net-mvneta-fix-calls-to-page_pool_get_stats.patch b/queue-6.1/net-mvneta-fix-calls-to-page_pool_get_stats.patch new file mode 100644 index 00000000000..44bd53c8fa5 --- /dev/null +++ b/queue-6.1/net-mvneta-fix-calls-to-page_pool_get_stats.patch @@ -0,0 +1,159 @@ +From 2ed40d831549be80ca617901730e395a429eeeb5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 11 Nov 2023 05:41:12 +0100 +Subject: net: mvneta: fix calls to page_pool_get_stats + +From: Sven Auhagen + +[ Upstream commit ca8add922f9c7f6e2e3c71039da8e0dcc64b87ed ] + +Calling page_pool_get_stats in the mvneta driver without checks +leads to kernel crashes. +First the page pool is only available if the bm is not used. +The page pool is also not allocated when the port is stopped. +It can also be not allocated in case of errors. + +The current implementation leads to the following crash calling +ethstats on a port that is down or when calling it at the wrong moment: + +ble to handle kernel NULL pointer dereference at virtual address 00000070 +[00000070] *pgd=00000000 +Internal error: Oops: 5 [#1] SMP ARM +Hardware name: Marvell Armada 380/385 (Device Tree) +PC is at page_pool_get_stats+0x18/0x1cc +LR is at mvneta_ethtool_get_stats+0xa0/0xe0 [mvneta] +pc : [] lr : [] psr: a0000013 +sp : f1439d48 ip : f1439dc0 fp : 0000001d +r10: 00000100 r9 : c4816b80 r8 : f0d75150 +r7 : bf0b400c r6 : c238f000 r5 : 00000000 r4 : f1439d68 +r3 : c2091040 r2 : ffffffd8 r1 : f1439d68 r0 : 00000000 +Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none +Control: 10c5387d Table: 066b004a DAC: 00000051 +Register r0 information: NULL pointer +Register r1 information: 2-page vmalloc region starting at 0xf1438000 allocated at kernel_clone+0x9c/0x390 +Register r2 information: non-paged memory +Register r3 information: slab kmalloc-2k start c2091000 pointer offset 64 size 2048 +Register r4 information: 2-page vmalloc region starting at 0xf1438000 allocated at kernel_clone+0x9c/0x390 +Register r5 information: NULL pointer +Register r6 information: slab kmalloc-cg-4k start c238f000 pointer offset 0 size 4096 +Register r7 information: 15-page vmalloc region starting at 0xbf0a8000 allocated at load_module+0xa30/0x219c +Register r8 information: 1-page vmalloc region starting at 0xf0d75000 allocated at ethtool_get_stats+0x138/0x208 +Register r9 information: slab task_struct start c4816b80 pointer offset 0 +Register r10 information: non-paged memory +Register r11 information: non-paged memory +Register r12 information: 2-page vmalloc region starting at 0xf1438000 allocated at kernel_clone+0x9c/0x390 +Process snmpd (pid: 733, stack limit = 0x38de3a88) +Stack: (0xf1439d48 to 0xf143a000) +9d40: 000000c0 00000001 c238f000 bf0b400c f0d75150 c4816b80 +9d60: 00000100 bf0a98d8 00000000 00000000 00000000 00000000 00000000 00000000 +9d80: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +9da0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +9dc0: 00000dc0 5335509c 00000035 c238f000 bf0b2214 01067f50 f0d75000 c0b9b9c8 +9de0: 0000001d 00000035 c2212094 5335509c c4816b80 c238f000 c5ad6e00 01067f50 +9e00: c1b0be80 c4816b80 00014813 c0b9d7f0 00000000 00000000 0000001d 0000001d +9e20: 00000000 00001200 00000000 00000000 c216ed90 c73943b8 00000000 00000000 +9e40: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +9e60: 00000000 c0ad9034 00000000 00000000 00000000 00000000 00000000 00000000 +9e80: 00000000 00000000 00000000 5335509c c1b0be80 f1439ee4 00008946 c1b0be80 +9ea0: 01067f50 f1439ee3 00000000 00000046 b6d77ae0 c0b383f0 00008946 becc83e8 +9ec0: c1b0be80 00000051 0000000b c68ca480 c7172d00 c0ad8ff0 f1439ee3 cf600e40 +9ee0: 01600e40 32687465 00000000 00000000 00000000 01067f50 00000000 00000000 +9f00: 00000000 5335509c 00008946 00008946 00000000 c68ca480 becc83e8 c05e2de0 +9f20: f1439fb0 c03002f0 00000006 5ac3c35a c4816b80 00000006 b6d77ae0 c030caf0 +9f40: c4817350 00000014 f1439e1c 0000000c 00000000 00000051 01000000 00000014 +9f60: 00003fec f1439edc 00000001 c0372abc b6d77ae0 c0372abc cf600e40 5335509c +9f80: c21e6800 01015c9c 0000000b 00008946 00000036 c03002f0 c4816b80 00000036 +9fa0: b6d77ae0 c03000c0 01015c9c 0000000b 0000000b 00008946 becc83e8 00000000 +9fc0: 01015c9c 0000000b 00008946 00000036 00000035 010678a0 b6d797ec b6d77ae0 +9fe0: b6dbf738 becc838c b6d186d7 b6baa858 40000030 0000000b 00000000 00000000 + page_pool_get_stats from mvneta_ethtool_get_stats+0xa0/0xe0 [mvneta] + mvneta_ethtool_get_stats [mvneta] from ethtool_get_stats+0x154/0x208 + ethtool_get_stats from dev_ethtool+0xf48/0x2480 + dev_ethtool from dev_ioctl+0x538/0x63c + dev_ioctl from sock_ioctl+0x49c/0x53c + sock_ioctl from sys_ioctl+0x134/0xbd8 + sys_ioctl from ret_fast_syscall+0x0/0x1c +Exception stack(0xf1439fa8 to 0xf1439ff0) +9fa0: 01015c9c 0000000b 0000000b 00008946 becc83e8 00000000 +9fc0: 01015c9c 0000000b 00008946 00000036 00000035 010678a0 b6d797ec b6d77ae0 +9fe0: b6dbf738 becc838c b6d186d7 b6baa858 +Code: e28dd004 e1a05000 e2514000 0a00006a (e5902070) + +This commit adds the proper checks before calling page_pool_get_stats. + +Fixes: b3fc79225f05 ("net: mvneta: add support for page_pool_get_stats") +Signed-off-by: Sven Auhagen +Reported-by: Paulo Da Silva +Acked-by: Lorenzo Bianconi +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/mvneta.c | 28 +++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c +index aca5b72cfeec6..eb4ebaa1c92ff 100644 +--- a/drivers/net/ethernet/marvell/mvneta.c ++++ b/drivers/net/ethernet/marvell/mvneta.c +@@ -4730,14 +4730,17 @@ static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset, + u8 *data) + { + if (sset == ETH_SS_STATS) { ++ struct mvneta_port *pp = netdev_priv(netdev); + int i; + + for (i = 0; i < ARRAY_SIZE(mvneta_statistics); i++) + memcpy(data + i * ETH_GSTRING_LEN, + mvneta_statistics[i].name, ETH_GSTRING_LEN); + +- data += ETH_GSTRING_LEN * ARRAY_SIZE(mvneta_statistics); +- page_pool_ethtool_stats_get_strings(data); ++ if (!pp->bm_priv) { ++ data += ETH_GSTRING_LEN * ARRAY_SIZE(mvneta_statistics); ++ page_pool_ethtool_stats_get_strings(data); ++ } + } + } + +@@ -4855,8 +4858,10 @@ static void mvneta_ethtool_pp_stats(struct mvneta_port *pp, u64 *data) + struct page_pool_stats stats = {}; + int i; + +- for (i = 0; i < rxq_number; i++) +- page_pool_get_stats(pp->rxqs[i].page_pool, &stats); ++ for (i = 0; i < rxq_number; i++) { ++ if (pp->rxqs[i].page_pool) ++ page_pool_get_stats(pp->rxqs[i].page_pool, &stats); ++ } + + page_pool_ethtool_stats_get(data, &stats); + } +@@ -4872,14 +4877,21 @@ static void mvneta_ethtool_get_stats(struct net_device *dev, + for (i = 0; i < ARRAY_SIZE(mvneta_statistics); i++) + *data++ = pp->ethtool_stats[i]; + +- mvneta_ethtool_pp_stats(pp, data); ++ if (!pp->bm_priv) ++ mvneta_ethtool_pp_stats(pp, data); + } + + static int mvneta_ethtool_get_sset_count(struct net_device *dev, int sset) + { +- if (sset == ETH_SS_STATS) +- return ARRAY_SIZE(mvneta_statistics) + +- page_pool_ethtool_stats_get_count(); ++ if (sset == ETH_SS_STATS) { ++ int count = ARRAY_SIZE(mvneta_statistics); ++ struct mvneta_port *pp = netdev_priv(dev); ++ ++ if (!pp->bm_priv) ++ count += page_pool_ethtool_stats_get_count(); ++ ++ return count; ++ } + + return -EOPNOTSUPP; + } +-- +2.42.0 + diff --git a/queue-6.1/net-set-sock_rcu_free-before-inserting-socket-into-h.patch b/queue-6.1/net-set-sock_rcu_free-before-inserting-socket-into-h.patch new file mode 100644 index 00000000000..373b524c5a5 --- /dev/null +++ b/queue-6.1/net-set-sock_rcu_free-before-inserting-socket-into-h.patch @@ -0,0 +1,88 @@ +From 7d51630c6881e99e8a42e00e2c2cdc49ddac2891 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Nov 2023 13:13:25 -0800 +Subject: net: set SOCK_RCU_FREE before inserting socket into hashtable + +From: Stanislav Fomichev + +[ Upstream commit 871019b22d1bcc9fab2d1feba1b9a564acbb6e99 ] + +We've started to see the following kernel traces: + + WARNING: CPU: 83 PID: 0 at net/core/filter.c:6641 sk_lookup+0x1bd/0x1d0 + + Call Trace: + + __bpf_skc_lookup+0x10d/0x120 + bpf_sk_lookup+0x48/0xd0 + bpf_sk_lookup_tcp+0x19/0x20 + bpf_prog_+0x37c/0x16a3 + cls_bpf_classify+0x205/0x2e0 + tcf_classify+0x92/0x160 + __netif_receive_skb_core+0xe52/0xf10 + __netif_receive_skb_list_core+0x96/0x2b0 + napi_complete_done+0x7b5/0xb70 + _poll+0x94/0xb0 + net_rx_action+0x163/0x1d70 + __do_softirq+0xdc/0x32e + asm_call_irq_on_stack+0x12/0x20 + + do_softirq_own_stack+0x36/0x50 + do_softirq+0x44/0x70 + +__inet_hash can race with lockless (rcu) readers on the other cpus: + + __inet_hash + __sk_nulls_add_node_rcu + <- (bpf triggers here) + sock_set_flag(SOCK_RCU_FREE) + +Let's move the SOCK_RCU_FREE part up a bit, before we are inserting +the socket into hashtables. Note, that the race is really harmless; +the bpf callers are handling this situation (where listener socket +doesn't have SOCK_RCU_FREE set) correctly, so the only +annoyance is a WARN_ONCE. + +More details from Eric regarding SOCK_RCU_FREE timeline: + +Commit 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under +synflood") added SOCK_RCU_FREE. At that time, the precise location of +sock_set_flag(sk, SOCK_RCU_FREE) did not matter, because the thread calling +__inet_hash() owns a reference on sk. SOCK_RCU_FREE was only tested +at dismantle time. + +Commit 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF") +started checking SOCK_RCU_FREE _after_ the lookup to infer whether +the refcount has been taken care of. + +Fixes: 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF") +Reviewed-by: Eric Dumazet +Signed-off-by: Stanislav Fomichev +Reviewed-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/inet_hashtables.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c +index 62d9472ac8bca..f2ed2aed08ab3 100644 +--- a/net/ipv4/inet_hashtables.c ++++ b/net/ipv4/inet_hashtables.c +@@ -731,12 +731,12 @@ int __inet_hash(struct sock *sk, struct sock *osk) + if (err) + goto unlock; + } ++ sock_set_flag(sk, SOCK_RCU_FREE); + if (IS_ENABLED(CONFIG_IPV6) && sk->sk_reuseport && + sk->sk_family == AF_INET6) + __sk_nulls_add_node_tail_rcu(sk, &ilb2->nulls_head); + else + __sk_nulls_add_node_rcu(sk, &ilb2->nulls_head); +- sock_set_flag(sk, SOCK_RCU_FREE); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); + unlock: + spin_unlock(&ilb2->lock); +-- +2.42.0 + diff --git a/queue-6.1/net-stmmac-avoid-rx-queue-overrun.patch b/queue-6.1/net-stmmac-avoid-rx-queue-overrun.patch new file mode 100644 index 00000000000..ce2932e5bbc --- /dev/null +++ b/queue-6.1/net-stmmac-avoid-rx-queue-overrun.patch @@ -0,0 +1,41 @@ +From e9905986af6c8d198952d639e5288402169a1f2c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Nov 2023 19:42:50 +0200 +Subject: net: stmmac: avoid rx queue overrun + +From: Baruch Siach + +[ Upstream commit b6cb4541853c7ee512111b0e7ddf3cb66c99c137 ] + +dma_rx_size can be set as low as 64. Rx budget might be higher than +that. Make sure to not overrun allocated rx buffers when budget is +larger. + +Leave one descriptor unused to avoid wrap around of 'dirty_rx' vs +'cur_rx'. + +Signed-off-by: Baruch Siach +Reviewed-by: Serge Semin +Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers.") +Link: https://lore.kernel.org/r/d95413e44c97d4692e72cec13a75f894abeb6998.1699897370.git.baruch@tkos.co.il +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +index ab49cbf8801c7..9f76c2f7d513b 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +@@ -5198,6 +5198,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) + + dma_dir = page_pool_get_dma_dir(rx_q->page_pool); + buf_sz = DIV_ROUND_UP(priv->dma_conf.dma_buf_sz, PAGE_SIZE) * PAGE_SIZE; ++ limit = min(priv->dma_conf.dma_rx_size - 1, (unsigned int)limit); + + if (netif_msg_rx_status(priv)) { + void *rx_head; +-- +2.42.0 + diff --git a/queue-6.1/net-stmmac-fix-rx-budget-limit-check.patch b/queue-6.1/net-stmmac-fix-rx-budget-limit-check.patch new file mode 100644 index 00000000000..6c52835884e --- /dev/null +++ b/queue-6.1/net-stmmac-fix-rx-budget-limit-check.patch @@ -0,0 +1,46 @@ +From 9621d7bcd012f86227df9e186b50b9650c5cedb6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Nov 2023 19:42:49 +0200 +Subject: net: stmmac: fix rx budget limit check + +From: Baruch Siach + +[ Upstream commit fa02de9e75889915b554eda1964a631fd019973b ] + +The while loop condition verifies 'count < limit'. Neither value change +before the 'count >= limit' check. As is this check is dead code. But +code inspection reveals a code path that modifies 'count' and then goto +'drain_data' and back to 'read_again'. So there is a need to verify +count value sanity after 'read_again'. + +Move 'read_again' up to fix the count limit check. + +Fixes: ec222003bd94 ("net: stmmac: Prepare to add Split Header support") +Signed-off-by: Baruch Siach +Reviewed-by: Serge Semin +Link: https://lore.kernel.org/r/d9486296c3b6b12ab3a0515fcd47d56447a07bfc.1699897370.git.baruch@tkos.co.il +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +index 1559a4dafd413..ab49cbf8801c7 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +@@ -5233,10 +5233,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) + len = 0; + } + ++read_again: + if (count >= limit) + break; + +-read_again: + buf1_len = 0; + buf2_len = 0; + entry = next_entry; +-- +2.42.0 + diff --git a/queue-6.1/netfilter-nf_conntrack_bridge-initialize-err-to-0.patch b/queue-6.1/netfilter-nf_conntrack_bridge-initialize-err-to-0.patch new file mode 100644 index 00000000000..8602c6ccf9a --- /dev/null +++ b/queue-6.1/netfilter-nf_conntrack_bridge-initialize-err-to-0.patch @@ -0,0 +1,43 @@ +From 3b4d63d781410c3199ebb68cf4c59172f243ecb5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Nov 2023 11:20:18 +0800 +Subject: netfilter: nf_conntrack_bridge: initialize err to 0 + +From: Linkui Xiao + +[ Upstream commit a44af08e3d4d7566eeea98d7a29fe06e7b9de944 ] + +K2CI reported a problem: + + consume_skb(skb); + return err; +[nf_br_ip_fragment() error] uninitialized symbol 'err'. + +err is not initialized, because returning 0 is expected, initialize err +to 0. + +Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system") +Reported-by: k2ci +Signed-off-by: Linkui Xiao +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/bridge/netfilter/nf_conntrack_bridge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c +index 73242962be5d7..06d94b2c6b5de 100644 +--- a/net/bridge/netfilter/nf_conntrack_bridge.c ++++ b/net/bridge/netfilter/nf_conntrack_bridge.c +@@ -37,7 +37,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk, + ktime_t tstamp = skb->tstamp; + struct ip_frag_state state; + struct iphdr *iph; +- int err; ++ int err = 0; + + /* for offloaded checksums cleanup checksum before fragmentation */ + if (skb->ip_summed == CHECKSUM_PARTIAL && +-- +2.42.0 + diff --git a/queue-6.1/netfilter-nf_tables-fix-pointer-math-issue-in-nft_by.patch b/queue-6.1/netfilter-nf_tables-fix-pointer-math-issue-in-nft_by.patch new file mode 100644 index 00000000000..3c3109fdd80 --- /dev/null +++ b/queue-6.1/netfilter-nf_tables-fix-pointer-math-issue-in-nft_by.patch @@ -0,0 +1,91 @@ +From b7cade4577d6e82f1bf3b54b264bbefaa6f93440 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Nov 2023 09:42:51 +0300 +Subject: netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() + +From: Dan Carpenter + +[ Upstream commit c301f0981fdd3fd1ffac6836b423c4d7a8e0eb63 ] + +The problem is in nft_byteorder_eval() where we are iterating through a +loop and writing to dst[0], dst[1], dst[2] and so on... On each +iteration we are writing 8 bytes. But dst[] is an array of u32 so each +element only has space for 4 bytes. That means that every iteration +overwrites part of the previous element. + +I spotted this bug while reviewing commit caf3ef7468f7 ("netfilter: +nf_tables: prevent OOB access in nft_byteorder_eval") which is a related +issue. I think that the reason we have not detected this bug in testing +is that most of time we only write one element. + +Fixes: ce1e7989d989 ("netfilter: nft_byteorder: provide 64bit le/be conversion") +Signed-off-by: Dan Carpenter +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + include/net/netfilter/nf_tables.h | 4 ++-- + net/netfilter/nft_byteorder.c | 5 +++-- + net/netfilter/nft_meta.c | 2 +- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h +index d1f81a6d7773b..c726da3b7d68a 100644 +--- a/include/net/netfilter/nf_tables.h ++++ b/include/net/netfilter/nf_tables.h +@@ -177,9 +177,9 @@ static inline __be32 nft_reg_load_be32(const u32 *sreg) + return *(__force __be32 *)sreg; + } + +-static inline void nft_reg_store64(u32 *dreg, u64 val) ++static inline void nft_reg_store64(u64 *dreg, u64 val) + { +- put_unaligned(val, (u64 *)dreg); ++ put_unaligned(val, dreg); + } + + static inline u64 nft_reg_load64(const u32 *sreg) +diff --git a/net/netfilter/nft_byteorder.c b/net/netfilter/nft_byteorder.c +index 2e2eb2cb17bc7..605178133d9eb 100644 +--- a/net/netfilter/nft_byteorder.c ++++ b/net/netfilter/nft_byteorder.c +@@ -38,13 +38,14 @@ void nft_byteorder_eval(const struct nft_expr *expr, + + switch (priv->size) { + case 8: { ++ u64 *dst64 = (void *)dst; + u64 src64; + + switch (priv->op) { + case NFT_BYTEORDER_NTOH: + for (i = 0; i < priv->len / 8; i++) { + src64 = nft_reg_load64(&src[i]); +- nft_reg_store64(&dst[i], ++ nft_reg_store64(&dst64[i], + be64_to_cpu((__force __be64)src64)); + } + break; +@@ -52,7 +53,7 @@ void nft_byteorder_eval(const struct nft_expr *expr, + for (i = 0; i < priv->len / 8; i++) { + src64 = (__force __u64) + cpu_to_be64(nft_reg_load64(&src[i])); +- nft_reg_store64(&dst[i], src64); ++ nft_reg_store64(&dst64[i], src64); + } + break; + } +diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c +index 55d2d49c34259..6e83321926229 100644 +--- a/net/netfilter/nft_meta.c ++++ b/net/netfilter/nft_meta.c +@@ -63,7 +63,7 @@ nft_meta_get_eval_time(enum nft_meta_keys key, + { + switch (key) { + case NFT_META_TIME_NS: +- nft_reg_store64(dest, ktime_get_real_ns()); ++ nft_reg_store64((u64 *)dest, ktime_get_real_ns()); + break; + case NFT_META_TIME_DAY: + nft_reg_store8(dest, nft_meta_weekday()); +-- +2.42.0 + diff --git a/queue-6.1/nfsv4.1-fix-handling-nfs4err_delay-when-testing-for-.patch b/queue-6.1/nfsv4.1-fix-handling-nfs4err_delay-when-testing-for-.patch new file mode 100644 index 00000000000..459ff257504 --- /dev/null +++ b/queue-6.1/nfsv4.1-fix-handling-nfs4err_delay-when-testing-for-.patch @@ -0,0 +1,54 @@ +From fdd8b2df43ba3374c1cef9f913cb260e44757aea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Sep 2023 15:21:16 -0400 +Subject: NFSv4.1: fix handling NFS4ERR_DELAY when testing for session trunking + +From: Olga Kornievskaia + +[ Upstream commit 6bd1a77dc72dea0b0d8b6014f231143984d18f6d ] + +Currently when client sends an EXCHANGE_ID for a possible trunked +connection, for any error that happened, the trunk will be thrown +out. However, an NFS4ERR_DELAY is a transient error that should be +retried instead. + +Fixes: e818bd085baf ("NFSv4.1 remove xprt from xprt_switch if session trunking test fails") +Signed-off-by: Olga Kornievskaia +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4proc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 5cf53def987e5..4058861c72123 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -8939,6 +8939,7 @@ void nfs4_test_session_trunk(struct rpc_clnt *clnt, struct rpc_xprt *xprt, + + sp4_how = (adata->clp->cl_sp4_flags == 0 ? SP4_NONE : SP4_MACH_CRED); + ++try_again: + /* Test connection for session trunking. Async exchange_id call */ + task = nfs4_run_exchange_id(adata->clp, adata->cred, sp4_how, xprt); + if (IS_ERR(task)) +@@ -8951,11 +8952,15 @@ void nfs4_test_session_trunk(struct rpc_clnt *clnt, struct rpc_xprt *xprt, + + if (status == 0) + rpc_clnt_xprt_switch_add_xprt(clnt, xprt); +- else if (rpc_clnt_xprt_switch_has_addr(clnt, ++ else if (status != -NFS4ERR_DELAY && rpc_clnt_xprt_switch_has_addr(clnt, + (struct sockaddr *)&xprt->addr)) + rpc_clnt_xprt_switch_remove_xprt(clnt, xprt); + + rpc_put_task(task); ++ if (status == -NFS4ERR_DELAY) { ++ ssleep(1); ++ goto try_again; ++ } + } + EXPORT_SYMBOL_GPL(nfs4_test_session_trunk); + +-- +2.42.0 + diff --git a/queue-6.1/nfsv4.1-fix-sp4_mach_cred-protection-for-pnfs-io.patch b/queue-6.1/nfsv4.1-fix-sp4_mach_cred-protection-for-pnfs-io.patch new file mode 100644 index 00000000000..3c7d35287ee --- /dev/null +++ b/queue-6.1/nfsv4.1-fix-sp4_mach_cred-protection-for-pnfs-io.patch @@ -0,0 +1,48 @@ +From 29e78846dd1fddd4ed31ec18d7f251f733d1b406 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Oct 2023 11:04:10 -0400 +Subject: NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO + +From: Olga Kornievskaia + +[ Upstream commit 5cc7688bae7f0757c39c1d3dfdd827b724061067 ] + +If the client is doing pnfs IO and Kerberos is configured and EXCHANGEID +successfully negotiated SP4_MACH_CRED and WRITE/COMMIT are on the +list of state protected operations, then we need to make sure to +choose the DS's rpc_client structure instead of the MDS's one. + +Fixes: fb91fb0ee7b2 ("NFS: Move call to nfs4_state_protect_write() to nfs4_write_setup()") +Signed-off-by: Olga Kornievskaia +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4proc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 4058861c72123..85a952143e9fb 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -5628,7 +5628,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr, + + msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE]; + nfs4_init_sequence(&hdr->args.seq_args, &hdr->res.seq_res, 0, 0); +- nfs4_state_protect_write(server->nfs_client, clnt, msg, hdr); ++ nfs4_state_protect_write(hdr->ds_clp ? hdr->ds_clp : server->nfs_client, clnt, msg, hdr); + } + + static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data) +@@ -5669,7 +5669,8 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess + data->res.server = server; + msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT]; + nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1, 0); +- nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_COMMIT, clnt, msg); ++ nfs4_state_protect(data->ds_clp ? data->ds_clp : server->nfs_client, ++ NFS_SP4_MACH_CRED_COMMIT, clnt, msg); + } + + static int _nfs4_proc_commit(struct file *dst, struct nfs_commitargs *args, +-- +2.42.0 + diff --git a/queue-6.1/pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch b/queue-6.1/pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch new file mode 100644 index 00000000000..d39ab3ce262 --- /dev/null +++ b/queue-6.1/pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch @@ -0,0 +1,60 @@ +From 13b050eb01eb9af3ce1413249a799e60aa1ff818 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Sep 2023 14:36:06 +0000 +Subject: PCI: Disable ATS for specific Intel IPU E2000 devices + +From: Bartosz Pawlowski + +[ Upstream commit a18615b1cfc04f00548c60eb9a77e0ce56e848fd ] + +Due to a hardware issue in A and B steppings of Intel IPU E2000, it expects +wrong endianness in ATS invalidation message body. This problem can lead to +outdated translations being returned as valid and finally cause system +instability. + +To prevent such issues, add quirk_intel_e2000_no_ats() to disable ATS for +vulnerable IPU E2000 devices. + +Link: https://lore.kernel.org/r/20230908143606.685930-3-bartosz.pawlowski@intel.com +Signed-off-by: Bartosz Pawlowski +Signed-off-by: Bjorn Helgaas +Reviewed-by: Andy Shevchenko +Reviewed-by: Alexander Lobakin +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index d16e0f356042b..48389785d9247 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -5449,6 +5449,25 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7347, quirk_amd_harvest_no_ats); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x734f, quirk_amd_harvest_no_ats); + /* AMD Raven platform iGPU */ + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x15d8, quirk_amd_harvest_no_ats); ++ ++/* ++ * Intel IPU E2000 revisions before C0 implement incorrect endianness ++ * in ATS Invalidate Request message body. Disable ATS for those devices. ++ */ ++static void quirk_intel_e2000_no_ats(struct pci_dev *pdev) ++{ ++ if (pdev->revision < 0x20) ++ quirk_no_ats(pdev); ++} ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1451, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1452, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1453, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1454, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1455, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1457, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1459, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x145a, quirk_intel_e2000_no_ats); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x145c, quirk_intel_e2000_no_ats); + #endif /* CONFIG_PCI_ATS */ + + /* Freescale PCIe doesn't support MSI in RC mode */ +-- +2.42.0 + diff --git a/queue-6.1/pci-do-error-check-on-own-line-to-split-long-if-cond.patch b/queue-6.1/pci-do-error-check-on-own-line-to-split-long-if-cond.patch new file mode 100644 index 00000000000..0716e567e67 --- /dev/null +++ b/queue-6.1/pci-do-error-check-on-own-line-to-split-long-if-cond.patch @@ -0,0 +1,109 @@ +From 235042cfa69cc7aa9410a61010cee844fb1553b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Sep 2023 15:53:52 +0300 +Subject: PCI: Do error check on own line to split long "if" conditions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit d15f18053e5cc5576af9e7eef0b2a91169b6326d ] + +Placing PCI error code check inside "if" condition usually results in need +to split lines. Combined with additional conditions the "if" condition +becomes messy. + +Convert to the usual error handling pattern with an additional variable to +improve code readability. In addition, reverse the logic in +pci_find_vsec_capability() to get rid of &&. + +No functional changes intended. + +Link: https://lore.kernel.org/r/20230911125354.25501-5-ilpo.jarvinen@linux.intel.com +Signed-off-by: Ilpo Järvinen +[bhelgaas: PCI_POSSIBLE_ERROR()] +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/pci.c | 9 ++++++--- + drivers/pci/probe.c | 6 +++--- + drivers/pci/quirks.c | 6 +++--- + 3 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c +index 835e9ea14b3a1..59b5c017d6c38 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -717,15 +717,18 @@ u16 pci_find_vsec_capability(struct pci_dev *dev, u16 vendor, int cap) + { + u16 vsec = 0; + u32 header; ++ int ret; + + if (vendor != dev->vendor) + return 0; + + while ((vsec = pci_find_next_ext_capability(dev, vsec, + PCI_EXT_CAP_ID_VNDR))) { +- if (pci_read_config_dword(dev, vsec + PCI_VNDR_HEADER, +- &header) == PCIBIOS_SUCCESSFUL && +- PCI_VNDR_HEADER_ID(header) == cap) ++ ret = pci_read_config_dword(dev, vsec + PCI_VNDR_HEADER, &header); ++ if (ret != PCIBIOS_SUCCESSFUL) ++ continue; ++ ++ if (PCI_VNDR_HEADER_ID(header) == cap) + return vsec; + } + +diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c +index 0945f50fe94ff..e19b79821dd6d 100644 +--- a/drivers/pci/probe.c ++++ b/drivers/pci/probe.c +@@ -1643,15 +1643,15 @@ static void pci_set_removable(struct pci_dev *dev) + static bool pci_ext_cfg_is_aliased(struct pci_dev *dev) + { + #ifdef CONFIG_PCI_QUIRKS +- int pos; ++ int pos, ret; + u32 header, tmp; + + pci_read_config_dword(dev, PCI_VENDOR_ID, &header); + + for (pos = PCI_CFG_SPACE_SIZE; + pos < PCI_CFG_SPACE_EXP_SIZE; pos += PCI_CFG_SPACE_SIZE) { +- if (pci_read_config_dword(dev, pos, &tmp) != PCIBIOS_SUCCESSFUL +- || header != tmp) ++ ret = pci_read_config_dword(dev, pos, &tmp); ++ if ((ret != PCIBIOS_SUCCESSFUL) || (header != tmp)) + return false; + } + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 30e7c627f21a7..42f89ad32c26c 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -5288,7 +5288,7 @@ int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) + */ + static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) + { +- int pos, i = 0; ++ int pos, i = 0, ret; + u8 next_cap; + u16 reg16, *cap; + struct pci_cap_saved_state *state; +@@ -5334,8 +5334,8 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) + pdev->pcie_mpss = reg16 & PCI_EXP_DEVCAP_PAYLOAD; + + pdev->cfg_size = PCI_CFG_SPACE_EXP_SIZE; +- if (pci_read_config_dword(pdev, PCI_CFG_SPACE_SIZE, &status) != +- PCIBIOS_SUCCESSFUL || (status == 0xffffffff)) ++ ret = pci_read_config_dword(pdev, PCI_CFG_SPACE_SIZE, &status); ++ if ((ret != PCIBIOS_SUCCESSFUL) || (PCI_POSSIBLE_ERROR(status))) + pdev->cfg_size = PCI_CFG_SPACE_SIZE; + + if (pci_find_saved_cap(pdev, PCI_CAP_ID_EXP)) +-- +2.42.0 + diff --git a/queue-6.1/pci-extract-ats-disabling-to-a-helper-function.patch b/queue-6.1/pci-extract-ats-disabling-to-a-helper-function.patch new file mode 100644 index 00000000000..1bd1daec03c --- /dev/null +++ b/queue-6.1/pci-extract-ats-disabling-to-a-helper-function.patch @@ -0,0 +1,60 @@ +From cbd9ca0103b7572d4ce304b24a412ee34dde727f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Sep 2023 14:36:05 +0000 +Subject: PCI: Extract ATS disabling to a helper function + +From: Bartosz Pawlowski + +[ Upstream commit f18b1137d38c091cc8c16365219f0a1d4a30b3d1 ] + +Introduce quirk_no_ats() helper function to provide a standard way to +disable ATS capability in PCI quirks. + +Suggested-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20230908143606.685930-2-bartosz.pawlowski@intel.com +Signed-off-by: Bartosz Pawlowski +Signed-off-by: Bjorn Helgaas +Reviewed-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 42f89ad32c26c..d16e0f356042b 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -5404,6 +5404,12 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags); + DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags); + + #ifdef CONFIG_PCI_ATS ++static void quirk_no_ats(struct pci_dev *pdev) ++{ ++ pci_info(pdev, "disabling ATS\n"); ++ pdev->ats_cap = 0; ++} ++ + /* + * Some devices require additional driver setup to enable ATS. Don't use + * ATS for those devices as ATS will be enabled before the driver has had a +@@ -5417,14 +5423,10 @@ static void quirk_amd_harvest_no_ats(struct pci_dev *pdev) + (pdev->subsystem_device == 0xce19 || + pdev->subsystem_device == 0xcc10 || + pdev->subsystem_device == 0xcc08)) +- goto no_ats; +- else +- return; ++ quirk_no_ats(pdev); ++ } else { ++ quirk_no_ats(pdev); + } +- +-no_ats: +- pci_info(pdev, "disabling ATS\n"); +- pdev->ats_cap = 0; + } + + /* AMD Stoney platform GPU */ +-- +2.42.0 + diff --git a/queue-6.1/pci-mvebu-use-field_prep-with-link-width.patch b/queue-6.1/pci-mvebu-use-field_prep-with-link-width.patch new file mode 100644 index 00000000000..89adf42c495 --- /dev/null +++ b/queue-6.1/pci-mvebu-use-field_prep-with-link-width.patch @@ -0,0 +1,42 @@ +From c735537fb9e631eb818493febe0ff49e8fe0f261 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Sep 2023 15:56:45 +0300 +Subject: PCI: mvebu: Use FIELD_PREP() with Link Width +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit 408599ec561ad5862cda4f107626009f6fa97a74 ] + +mvebu_pcie_setup_hw() setups the Maximum Link Width field in the Link +Capabilities registers using an open-coded variant of FIELD_PREP() with +a literal in shift. Improve readability by using +FIELD_PREP(PCI_EXP_LNKCAP_MLW, ...). + +Link: https://lore.kernel.org/r/20230919125648.1920-6-ilpo.jarvinen@linux.intel.com +Signed-off-by: Ilpo Järvinen +Signed-off-by: Bjorn Helgaas +Reviewed-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/pci-mvebu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c +index 1ced73726a267..668601fd0b296 100644 +--- a/drivers/pci/controller/pci-mvebu.c ++++ b/drivers/pci/controller/pci-mvebu.c +@@ -264,7 +264,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) + */ + lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); + lnkcap &= ~PCI_EXP_LNKCAP_MLW; +- lnkcap |= (port->is_x4 ? 4 : 1) << 4; ++ lnkcap |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1); + mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); + + /* Disable Root Bridge I/O space, memory space and bus mastering. */ +-- +2.42.0 + diff --git a/queue-6.1/pci-tegra194-use-field_get-field_prep-with-link-widt.patch b/queue-6.1/pci-tegra194-use-field_get-field_prep-with-link-widt.patch new file mode 100644 index 00000000000..13965f971b5 --- /dev/null +++ b/queue-6.1/pci-tegra194-use-field_get-field_prep-with-link-widt.patch @@ -0,0 +1,72 @@ +From c9341c851d2dc22eabcc567cabe5fe5c62224035 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Sep 2023 15:56:44 +0300 +Subject: PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit 759574abd78e3b47ec45bbd31a64e8832cf73f97 ] + +Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of +custom masking and shifting. + +Similarly, change custom code that misleadingly used +PCI_EXP_LNKSTA_NLW_SHIFT to prepare value for PCI_EXP_LNKCAP write +to use FIELD_PREP() with correct field define (PCI_EXP_LNKCAP_MLW). + +Link: https://lore.kernel.org/r/20230919125648.1920-5-ilpo.jarvinen@linux.intel.com +Signed-off-by: Ilpo Järvinen +Signed-off-by: Bjorn Helgaas +Reviewed-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c +index 2241029537a03..5d1ae2706f6ea 100644 +--- a/drivers/pci/controller/dwc/pcie-tegra194.c ++++ b/drivers/pci/controller/dwc/pcie-tegra194.c +@@ -9,6 +9,7 @@ + * Author: Vidya Sagar + */ + ++#include + #include + #include + #include +@@ -324,8 +325,7 @@ static void apply_bad_link_workaround(struct dw_pcie_rp *pp) + */ + val = dw_pcie_readw_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKSTA); + if (val & PCI_EXP_LNKSTA_LBMS) { +- current_link_width = (val & PCI_EXP_LNKSTA_NLW) >> +- PCI_EXP_LNKSTA_NLW_SHIFT; ++ current_link_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, val); + if (pcie->init_link_width > current_link_width) { + dev_warn(pci->dev, "PCIe link is bad, width reduced\n"); + val = dw_pcie_readw_dbi(pci, pcie->pcie_cap_base + +@@ -740,8 +740,7 @@ static void tegra_pcie_enable_system_interrupts(struct dw_pcie_rp *pp) + + val_w = dw_pcie_readw_dbi(&pcie->pci, pcie->pcie_cap_base + + PCI_EXP_LNKSTA); +- pcie->init_link_width = (val_w & PCI_EXP_LNKSTA_NLW) >> +- PCI_EXP_LNKSTA_NLW_SHIFT; ++ pcie->init_link_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, val_w); + + val_w = dw_pcie_readw_dbi(&pcie->pci, pcie->pcie_cap_base + + PCI_EXP_LNKCTL); +@@ -900,7 +899,7 @@ static int tegra_pcie_dw_host_init(struct dw_pcie_rp *pp) + /* Configure Max lane width from DT */ + val = dw_pcie_readl_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKCAP); + val &= ~PCI_EXP_LNKCAP_MLW; +- val |= (pcie->num_lanes << PCI_EXP_LNKSTA_NLW_SHIFT); ++ val |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, pcie->num_lanes); + dw_pcie_writel_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKCAP, val); + + /* Clear Slot Clock Configuration bit if SRNS configuration */ +-- +2.42.0 + diff --git a/queue-6.1/pci-use-field_get-in-sapphire-rx-5600-xt-pulse-quirk.patch b/queue-6.1/pci-use-field_get-in-sapphire-rx-5600-xt-pulse-quirk.patch new file mode 100644 index 00000000000..4bd9a4da1d5 --- /dev/null +++ b/queue-6.1/pci-use-field_get-in-sapphire-rx-5600-xt-pulse-quirk.patch @@ -0,0 +1,57 @@ +From 7c575b05b032341ea3b343dfb2c5d2db53fae63a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Oct 2023 15:44:28 -0500 +Subject: PCI: Use FIELD_GET() in Sapphire RX 5600 XT Pulse quirk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Bjorn Helgaas + +[ Upstream commit 04e82fa5951ca66495d7b05665eff673aa3852b4 ] + +Use FIELD_GET() to remove dependences on the field position, i.e., the +shift value. No functional change intended. + +Separate because this isn't as trivial as the other FIELD_GET() changes. + +See 907830b0fc9e ("PCI: Add a REBAR size quirk for Sapphire RX 5600 XT +Pulse") + +Link: https://lore.kernel.org/r/20231010204436.1000644-3-helgaas@kernel.org +Signed-off-by: Bjorn Helgaas +Reviewed-by: Ilpo Järvinen +Reviewed-by: Jonathan Cameron +Reviewed-by: Kuppuswamy Sathyanarayanan +Cc: Nirmoy Das +Signed-off-by: Sasha Levin +--- + drivers/pci/pci.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c +index 4f37885017200..8df156c28aade 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -3713,14 +3713,14 @@ u32 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar) + return 0; + + pci_read_config_dword(pdev, pos + PCI_REBAR_CAP, &cap); +- cap &= PCI_REBAR_CAP_SIZES; ++ cap = FIELD_GET(PCI_REBAR_CAP_SIZES, cap); + + /* Sapphire RX 5600 XT Pulse has an invalid cap dword for BAR 0 */ + if (pdev->vendor == PCI_VENDOR_ID_ATI && pdev->device == 0x731f && +- bar == 0 && cap == 0x7000) +- cap = 0x3f000; ++ bar == 0 && cap == 0x700) ++ return 0x3f00; + +- return cap >> 4; ++ return cap; + } + EXPORT_SYMBOL(pci_rebar_get_possible_sizes); + +-- +2.42.0 + diff --git a/queue-6.1/pci-use-field_get-to-extract-link-width.patch b/queue-6.1/pci-use-field_get-to-extract-link-width.patch new file mode 100644 index 00000000000..734bc4a4a45 --- /dev/null +++ b/queue-6.1/pci-use-field_get-to-extract-link-width.patch @@ -0,0 +1,75 @@ +From a6be3c3e1e77ac3b02de9fd5e771c971dedb911b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Sep 2023 15:56:46 +0300 +Subject: PCI: Use FIELD_GET() to extract Link Width +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit d1f9b39da4a5347150246871325190018cda8cb3 ] + +Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields +instead of custom masking and shifting. + +Link: https://lore.kernel.org/r/20230919125648.1920-7-ilpo.jarvinen@linux.intel.com +Signed-off-by: Ilpo Järvinen +[bhelgaas: drop duplicate include of ] +Signed-off-by: Bjorn Helgaas +Reviewed-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/pci/pci-sysfs.c | 5 ++--- + drivers/pci/pci.c | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c +index dd0d9d9bc5097..6ccd88d1bfa0f 100644 +--- a/drivers/pci/pci-sysfs.c ++++ b/drivers/pci/pci-sysfs.c +@@ -12,7 +12,7 @@ + * Modeled after usb's driverfs.c + */ + +- ++#include + #include + #include + #include +@@ -230,8 +230,7 @@ static ssize_t current_link_width_show(struct device *dev, + if (err) + return -EINVAL; + +- return sysfs_emit(buf, "%u\n", +- (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT); ++ return sysfs_emit(buf, "%u\n", FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat)); + } + static DEVICE_ATTR_RO(current_link_width); + +diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c +index 59b5c017d6c38..4f37885017200 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -6138,8 +6138,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev, + pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta); + + next_speed = pcie_link_speed[lnksta & PCI_EXP_LNKSTA_CLS]; +- next_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> +- PCI_EXP_LNKSTA_NLW_SHIFT; ++ next_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta); + + next_bw = next_width * PCIE_SPEED2MBS_ENC(next_speed); + +@@ -6211,7 +6210,7 @@ enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev) + + pcie_capability_read_dword(dev, PCI_EXP_LNKCAP, &lnkcap); + if (lnkcap) +- return (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4; ++ return FIELD_GET(PCI_EXP_LNKCAP_MLW, lnkcap); + + return PCIE_LNK_WIDTH_UNKNOWN; + } +-- +2.42.0 + diff --git a/queue-6.1/perf-core-bail-out-early-if-the-request-aux-area-is-.patch b/queue-6.1/perf-core-bail-out-early-if-the-request-aux-area-is-.patch new file mode 100644 index 00000000000..8d318e6317c --- /dev/null +++ b/queue-6.1/perf-core-bail-out-early-if-the-request-aux-area-is-.patch @@ -0,0 +1,76 @@ +From 8aef39c83808f7502dd90378dc4c3ffa83afca3e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Sep 2023 08:43:07 +0800 +Subject: perf/core: Bail out early if the request AUX area is out of bound + +From: Shuai Xue + +[ Upstream commit 54aee5f15b83437f23b2b2469bcf21bdd9823916 ] + +When perf-record with a large AUX area, e.g 4GB, it fails with: + + #perf record -C 0 -m ,4G -e arm_spe_0// -- sleep 1 + failed to mmap with 12 (Cannot allocate memory) + +and it reveals a WARNING with __alloc_pages(): + + ------------[ cut here ]------------ + WARNING: CPU: 44 PID: 17573 at mm/page_alloc.c:5568 __alloc_pages+0x1ec/0x248 + Call trace: + __alloc_pages+0x1ec/0x248 + __kmalloc_large_node+0xc0/0x1f8 + __kmalloc_node+0x134/0x1e8 + rb_alloc_aux+0xe0/0x298 + perf_mmap+0x440/0x660 + mmap_region+0x308/0x8a8 + do_mmap+0x3c0/0x528 + vm_mmap_pgoff+0xf4/0x1b8 + ksys_mmap_pgoff+0x18c/0x218 + __arm64_sys_mmap+0x38/0x58 + invoke_syscall+0x50/0x128 + el0_svc_common.constprop.0+0x58/0x188 + do_el0_svc+0x34/0x50 + el0_svc+0x34/0x108 + el0t_64_sync_handler+0xb8/0xc0 + el0t_64_sync+0x1a4/0x1a8 + +'rb->aux_pages' allocated by kcalloc() is a pointer array which is used to +maintains AUX trace pages. The allocated page for this array is physically +contiguous (and virtually contiguous) with an order of 0..MAX_ORDER. If the +size of pointer array crosses the limitation set by MAX_ORDER, it reveals a +WARNING. + +So bail out early with -ENOMEM if the request AUX area is out of bound, +e.g.: + + #perf record -C 0 -m ,4G -e arm_spe_0// -- sleep 1 + failed to mmap with 12 (Cannot allocate memory) + +Signed-off-by: Shuai Xue +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +--- + kernel/events/ring_buffer.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c +index 273a0fe7910a5..45965f13757e4 100644 +--- a/kernel/events/ring_buffer.c ++++ b/kernel/events/ring_buffer.c +@@ -699,6 +699,12 @@ int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event, + watermark = 0; + } + ++ /* ++ * kcalloc_node() is unable to allocate buffer if the size is larger ++ * than: PAGE_SIZE << MAX_ORDER; directly bail out in this case. ++ */ ++ if (get_order((unsigned long)nr_pages * sizeof(void *)) > MAX_ORDER) ++ return -ENOMEM; + rb->aux_pages = kcalloc_node(nr_pages, sizeof(void *), GFP_KERNEL, + node); + if (!rb->aux_pages) +-- +2.42.0 + diff --git a/queue-6.1/platform-chrome-kunit-initialize-lock-for-fake-ec_de.patch b/queue-6.1/platform-chrome-kunit-initialize-lock-for-fake-ec_de.patch new file mode 100644 index 00000000000..48490518a53 --- /dev/null +++ b/queue-6.1/platform-chrome-kunit-initialize-lock-for-fake-ec_de.patch @@ -0,0 +1,44 @@ +From 90f0cb30b0d0f31b38c94a1b02e770211d694c90 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Oct 2023 08:05:04 +0000 +Subject: platform/chrome: kunit: initialize lock for fake ec_dev + +From: Tzung-Bi Shih + +[ Upstream commit e410b4ade83d06a046f6e32b5085997502ba0559 ] + +cros_ec_cmd_xfer() uses ec_dev->lock. Initialize it. + +Otherwise, dmesg shows the following: +> DEBUG_LOCKS_WARN_ON(lock->magic != lock) +> ... +> Call Trace: +> ? __mutex_lock +> ? __warn +> ? __mutex_lock +> ... +> ? cros_ec_cmd_xfer + +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20231003080504.4011337-1-tzungbi@kernel.org +Signed-off-by: Tzung-Bi Shih +Signed-off-by: Sasha Levin +--- + drivers/platform/chrome/cros_ec_proto_test.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/chrome/cros_ec_proto_test.c b/drivers/platform/chrome/cros_ec_proto_test.c +index c6a83df91ae1e..b46a8bc2196fe 100644 +--- a/drivers/platform/chrome/cros_ec_proto_test.c ++++ b/drivers/platform/chrome/cros_ec_proto_test.c +@@ -2667,6 +2667,7 @@ static int cros_ec_proto_test_init(struct kunit *test) + ec_dev->dev->release = cros_ec_proto_test_release; + ec_dev->cmd_xfer = cros_kunit_ec_xfer_mock; + ec_dev->pkt_xfer = cros_kunit_ec_xfer_mock; ++ mutex_init(&ec_dev->lock); + + priv->msg = (struct cros_ec_command *)priv->_msg; + +-- +2.42.0 + diff --git a/queue-6.1/platform-x86-thinkpad_acpi-add-battery-quirk-for-thi.patch b/queue-6.1/platform-x86-thinkpad_acpi-add-battery-quirk-for-thi.patch new file mode 100644 index 00000000000..4efe627a2f9 --- /dev/null +++ b/queue-6.1/platform-x86-thinkpad_acpi-add-battery-quirk-for-thi.patch @@ -0,0 +1,38 @@ +From ea94c4a479ef0a6f9c0f4f7dbccd5782aecb7f16 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Oct 2023 22:09:21 +0300 +Subject: platform/x86: thinkpad_acpi: Add battery quirk for Thinkpad X120e +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Olli Asikainen + +[ Upstream commit 916646758aea81a143ce89103910f715ed923346 ] + +Thinkpad X120e also needs this battery quirk. + +Signed-off-by: Olli Asikainen +Link: https://lore.kernel.org/r/20231024190922.2742-1-olli.asikainen@gmail.com +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/thinkpad_acpi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c +index 3bb60687f2e42..05a55bc31c796 100644 +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -10019,6 +10019,7 @@ static const struct tpacpi_quirk battery_quirk_table[] __initconst = { + * Individual addressing is broken on models that expose the + * primary battery as BAT1. + */ ++ TPACPI_Q_LNV('8', 'F', true), /* Thinkpad X120e */ + TPACPI_Q_LNV('J', '7', true), /* B5400 */ + TPACPI_Q_LNV('J', 'I', true), /* Thinkpad 11e */ + TPACPI_Q_LNV3('R', '0', 'B', true), /* Thinkpad 11e gen 3 */ +-- +2.42.0 + diff --git a/queue-6.1/ppp-limit-mru-to-64k.patch b/queue-6.1/ppp-limit-mru-to-64k.patch new file mode 100644 index 00000000000..c80d5b56d2c --- /dev/null +++ b/queue-6.1/ppp-limit-mru-to-64k.patch @@ -0,0 +1,76 @@ +From 9c69e6a387b87298cc53bc2e70f61dcd70e0a15d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Nov 2023 22:16:32 -0500 +Subject: ppp: limit MRU to 64K + +From: Willem de Bruijn + +[ Upstream commit c0a2a1b0d631fc460d830f52d06211838874d655 ] + +ppp_sync_ioctl allows setting device MRU, but does not sanity check +this input. + +Limit to a sane upper bound of 64KB. + +No implementation I could find generates larger than 64KB frames. +RFC 2823 mentions an upper bound of PPP over SDL of 64KB based on the +16-bit length field. Other protocols will be smaller, such as PPPoE +(9KB jumbo frame) and PPPoA (18190 maximum CPCS-SDU size, RFC 2364). +PPTP and L2TP encapsulate in IP. + +Syzbot managed to trigger alloc warning in __alloc_pages: + + if (WARN_ON_ONCE_GFP(order > MAX_ORDER, gfp)) + + WARNING: CPU: 1 PID: 37 at mm/page_alloc.c:4544 __alloc_pages+0x3ab/0x4a0 mm/page_alloc.c:4544 + + __alloc_skb+0x12b/0x330 net/core/skbuff.c:651 + __netdev_alloc_skb+0x72/0x3f0 net/core/skbuff.c:715 + netdev_alloc_skb include/linux/skbuff.h:3225 [inline] + dev_alloc_skb include/linux/skbuff.h:3238 [inline] + ppp_sync_input drivers/net/ppp/ppp_synctty.c:669 [inline] + ppp_sync_receive+0xff/0x680 drivers/net/ppp/ppp_synctty.c:334 + tty_ldisc_receive_buf+0x14c/0x180 drivers/tty/tty_buffer.c:390 + tty_port_default_receive_buf+0x70/0xb0 drivers/tty/tty_port.c:37 + receive_buf drivers/tty/tty_buffer.c:444 [inline] + flush_to_ldisc+0x261/0x780 drivers/tty/tty_buffer.c:494 + process_one_work+0x884/0x15c0 kernel/workqueue.c:2630 + +With call + + ioctl$PPPIOCSMRU1(r1, 0x40047452, &(0x7f0000000100)=0x5e6417a8) + +Similar code exists in other drivers that implement ppp_channel_ops +ioctl PPPIOCSMRU. Those might also be in scope. Notably excluded from +this are pppol2tp_ioctl and pppoe_ioctl. + +This code goes back to the start of git history. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Reported-by: syzbot+6177e1f90d92583bcc58@syzkaller.appspotmail.com +Signed-off-by: Willem de Bruijn +Reviewed-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ppp/ppp_synctty.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c +index 1ac231408398a..94ef6f9ca5103 100644 +--- a/drivers/net/ppp/ppp_synctty.c ++++ b/drivers/net/ppp/ppp_synctty.c +@@ -462,6 +462,10 @@ ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg) + case PPPIOCSMRU: + if (get_user(val, (int __user *) argp)) + break; ++ if (val > U16_MAX) { ++ err = -EINVAL; ++ break; ++ } + if (val < PPP_MRU) + val = PPP_MRU; + ap->mru = val; +-- +2.42.0 + diff --git a/queue-6.1/ptp-annotate-data-race-around-q-head-and-q-tail.patch b/queue-6.1/ptp-annotate-data-race-around-q-head-and-q-tail.patch new file mode 100644 index 00000000000..df24bef8376 --- /dev/null +++ b/queue-6.1/ptp-annotate-data-race-around-q-head-and-q-tail.patch @@ -0,0 +1,98 @@ +From 9a50af0f5d351c127a3e85fe123c8210723be0ab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 17:48:59 +0000 +Subject: ptp: annotate data-race around q->head and q->tail + +From: Eric Dumazet + +[ Upstream commit 73bde5a3294853947252cd9092a3517c7cb0cd2d ] + +As I was working on a syzbot report, I found that KCSAN would +probably complain that reading q->head or q->tail without +barriers could lead to invalid results. + +Add corresponding READ_ONCE() and WRITE_ONCE() to avoid +load-store tearing. + +Fixes: d94ba80ebbea ("ptp: Added a brand new class driver for ptp clocks.") +Signed-off-by: Eric Dumazet +Acked-by: Richard Cochran +Link: https://lore.kernel.org/r/20231109174859.3995880-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_chardev.c | 3 ++- + drivers/ptp/ptp_clock.c | 5 +++-- + drivers/ptp/ptp_private.h | 8 ++++++-- + drivers/ptp/ptp_sysfs.c | 3 ++- + 4 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c +index af3bc65c4595d..9311f3d09c8fc 100644 +--- a/drivers/ptp/ptp_chardev.c ++++ b/drivers/ptp/ptp_chardev.c +@@ -487,7 +487,8 @@ ssize_t ptp_read(struct posix_clock *pc, + + for (i = 0; i < cnt; i++) { + event[i] = queue->buf[queue->head]; +- queue->head = (queue->head + 1) % PTP_MAX_TIMESTAMPS; ++ /* Paired with READ_ONCE() in queue_cnt() */ ++ WRITE_ONCE(queue->head, (queue->head + 1) % PTP_MAX_TIMESTAMPS); + } + + spin_unlock_irqrestore(&queue->lock, flags); +diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c +index 51cae72bb6db2..3c3e4fbefebaf 100644 +--- a/drivers/ptp/ptp_clock.c ++++ b/drivers/ptp/ptp_clock.c +@@ -56,10 +56,11 @@ static void enqueue_external_timestamp(struct timestamp_event_queue *queue, + dst->t.sec = seconds; + dst->t.nsec = remainder; + ++ /* Both WRITE_ONCE() are paired with READ_ONCE() in queue_cnt() */ + if (!queue_free(queue)) +- queue->head = (queue->head + 1) % PTP_MAX_TIMESTAMPS; ++ WRITE_ONCE(queue->head, (queue->head + 1) % PTP_MAX_TIMESTAMPS); + +- queue->tail = (queue->tail + 1) % PTP_MAX_TIMESTAMPS; ++ WRITE_ONCE(queue->tail, (queue->tail + 1) % PTP_MAX_TIMESTAMPS); + + spin_unlock_irqrestore(&queue->lock, flags); + } +diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h +index 75f58fc468a71..b8d4f61f14be4 100644 +--- a/drivers/ptp/ptp_private.h ++++ b/drivers/ptp/ptp_private.h +@@ -76,9 +76,13 @@ struct ptp_vclock { + * that a writer might concurrently increment the tail does not + * matter, since the queue remains nonempty nonetheless. + */ +-static inline int queue_cnt(struct timestamp_event_queue *q) ++static inline int queue_cnt(const struct timestamp_event_queue *q) + { +- int cnt = q->tail - q->head; ++ /* ++ * Paired with WRITE_ONCE() in enqueue_external_timestamp(), ++ * ptp_read(), extts_fifo_show(). ++ */ ++ int cnt = READ_ONCE(q->tail) - READ_ONCE(q->head); + return cnt < 0 ? PTP_MAX_TIMESTAMPS + cnt : cnt; + } + +diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c +index f30b0a4394705..74b9c794d6363 100644 +--- a/drivers/ptp/ptp_sysfs.c ++++ b/drivers/ptp/ptp_sysfs.c +@@ -79,7 +79,8 @@ static ssize_t extts_fifo_show(struct device *dev, + qcnt = queue_cnt(queue); + if (qcnt) { + event = queue->buf[queue->head]; +- queue->head = (queue->head + 1) % PTP_MAX_TIMESTAMPS; ++ /* Paired with READ_ONCE() in queue_cnt() */ ++ WRITE_ONCE(queue->head, (queue->head + 1) % PTP_MAX_TIMESTAMPS); + } + spin_unlock_irqrestore(&queue->lock, flags); + +-- +2.42.0 + diff --git a/queue-6.1/pwm-fix-double-shift-bug.patch b/queue-6.1/pwm-fix-double-shift-bug.patch new file mode 100644 index 00000000000..42646cb9643 --- /dev/null +++ b/queue-6.1/pwm-fix-double-shift-bug.patch @@ -0,0 +1,45 @@ +From 595b8b3c4c9d5280f2192a1c122f1fb17adbfea1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Oct 2023 14:58:18 +0300 +Subject: pwm: Fix double shift bug +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dan Carpenter + +[ Upstream commit d27abbfd4888d79dd24baf50e774631046ac4732 ] + +These enums are passed to set/test_bit(). The set/test_bit() functions +take a bit number instead of a shifted value. Passing a shifted value +is a double shift bug like doing BIT(BIT(1)). The double shift bug +doesn't cause a problem here because we are only checking 0 and 1 but +if the value was 5 or above then it can lead to a buffer overflow. + +Signed-off-by: Dan Carpenter +Reviewed-by: Uwe Kleine-König +Reviewed-by: Sam Protsenko +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + include/linux/pwm.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/linux/pwm.h b/include/linux/pwm.h +index 161e91167b9c0..5e88f1b591832 100644 +--- a/include/linux/pwm.h ++++ b/include/linux/pwm.h +@@ -41,8 +41,8 @@ struct pwm_args { + }; + + enum { +- PWMF_REQUESTED = 1 << 0, +- PWMF_EXPORTED = 1 << 1, ++ PWMF_REQUESTED = 0, ++ PWMF_EXPORTED = 1, + }; + + /* +-- +2.42.0 + diff --git a/queue-6.1/rcu-dump-memory-object-info-if-callback-function-is-.patch b/queue-6.1/rcu-dump-memory-object-info-if-callback-function-is-.patch new file mode 100644 index 00000000000..510eb443d9b --- /dev/null +++ b/queue-6.1/rcu-dump-memory-object-info-if-callback-function-is-.patch @@ -0,0 +1,149 @@ +From 05fad3fe13cf271e98133db13a9ddb26cef0b7b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 5 Aug 2023 11:17:26 +0800 +Subject: rcu: Dump memory object info if callback function is invalid + +From: Zhen Lei + +[ Upstream commit 2cbc482d325ee58001472c4359b311958c4efdd1 ] + +When a structure containing an RCU callback rhp is (incorrectly) freed +and reallocated after rhp is passed to call_rcu(), it is not unusual for +rhp->func to be set to NULL. This defeats the debugging prints used by +__call_rcu_common() in kernels built with CONFIG_DEBUG_OBJECTS_RCU_HEAD=y, +which expect to identify the offending code using the identity of this +function. + +And in kernels build without CONFIG_DEBUG_OBJECTS_RCU_HEAD=y, things +are even worse, as can be seen from this splat: + +Unable to handle kernel NULL pointer dereference at virtual address 0 +... ... +PC is at 0x0 +LR is at rcu_do_batch+0x1c0/0x3b8 +... ... + (rcu_do_batch) from (rcu_core+0x1d4/0x284) + (rcu_core) from (__do_softirq+0x24c/0x344) + (__do_softirq) from (__irq_exit_rcu+0x64/0x108) + (__irq_exit_rcu) from (irq_exit+0x8/0x10) + (irq_exit) from (__handle_domain_irq+0x74/0x9c) + (__handle_domain_irq) from (gic_handle_irq+0x8c/0x98) + (gic_handle_irq) from (__irq_svc+0x5c/0x94) + (__irq_svc) from (arch_cpu_idle+0x20/0x3c) + (arch_cpu_idle) from (default_idle_call+0x4c/0x78) + (default_idle_call) from (do_idle+0xf8/0x150) + (do_idle) from (cpu_startup_entry+0x18/0x20) + (cpu_startup_entry) from (0xc01530) + +This commit therefore adds calls to mem_dump_obj(rhp) to output some +information, for example: + + slab kmalloc-256 start ffff410c45019900 pointer offset 0 size 256 + +This provides the rough size of the memory block and the offset of the +rcu_head structure, which as least provides at least a few clues to help +locate the problem. If the problem is reproducible, additional slab +debugging can be enabled, for example, CONFIG_DEBUG_SLAB=y, which can +provide significantly more information. + +Signed-off-by: Zhen Lei +Signed-off-by: Paul E. McKenney +Signed-off-by: Frederic Weisbecker +Signed-off-by: Sasha Levin +--- + kernel/rcu/rcu.h | 7 +++++++ + kernel/rcu/srcutiny.c | 1 + + kernel/rcu/srcutree.c | 1 + + kernel/rcu/tasks.h | 1 + + kernel/rcu/tiny.c | 1 + + kernel/rcu/tree.c | 1 + + 6 files changed, 12 insertions(+) + +diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h +index 48d8f754b730e..49ff955ed2034 100644 +--- a/kernel/rcu/rcu.h ++++ b/kernel/rcu/rcu.h +@@ -10,6 +10,7 @@ + #ifndef __LINUX_RCU_H + #define __LINUX_RCU_H + ++#include + #include + + /* +@@ -211,6 +212,12 @@ static inline void debug_rcu_head_unqueue(struct rcu_head *head) + } + #endif /* #else !CONFIG_DEBUG_OBJECTS_RCU_HEAD */ + ++static inline void debug_rcu_head_callback(struct rcu_head *rhp) ++{ ++ if (unlikely(!rhp->func)) ++ kmem_dump_obj(rhp); ++} ++ + extern int rcu_cpu_stall_suppress_at_boot; + + static inline bool rcu_stall_is_suppressed_at_boot(void) +diff --git a/kernel/rcu/srcutiny.c b/kernel/rcu/srcutiny.c +index 33adafdad2613..5e7f336baa06a 100644 +--- a/kernel/rcu/srcutiny.c ++++ b/kernel/rcu/srcutiny.c +@@ -138,6 +138,7 @@ void srcu_drive_gp(struct work_struct *wp) + while (lh) { + rhp = lh; + lh = lh->next; ++ debug_rcu_head_callback(rhp); + local_bh_disable(); + rhp->func(rhp); + local_bh_enable(); +diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c +index 4db36d543be37..ce60cdf069e3a 100644 +--- a/kernel/rcu/srcutree.c ++++ b/kernel/rcu/srcutree.c +@@ -1564,6 +1564,7 @@ static void srcu_invoke_callbacks(struct work_struct *work) + rhp = rcu_cblist_dequeue(&ready_cbs); + for (; rhp != NULL; rhp = rcu_cblist_dequeue(&ready_cbs)) { + debug_rcu_head_unqueue(rhp); ++ debug_rcu_head_callback(rhp); + local_bh_disable(); + rhp->func(rhp); + local_bh_enable(); +diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h +index c1f18c63b9b14..98370f6c225dc 100644 +--- a/kernel/rcu/tasks.h ++++ b/kernel/rcu/tasks.h +@@ -487,6 +487,7 @@ static void rcu_tasks_invoke_cbs(struct rcu_tasks *rtp, struct rcu_tasks_percpu + raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags); + len = rcl.len; + for (rhp = rcu_cblist_dequeue(&rcl); rhp; rhp = rcu_cblist_dequeue(&rcl)) { ++ debug_rcu_head_callback(rhp); + local_bh_disable(); + rhp->func(rhp); + local_bh_enable(); +diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c +index a33a8d4942c37..21c040cba4bd0 100644 +--- a/kernel/rcu/tiny.c ++++ b/kernel/rcu/tiny.c +@@ -97,6 +97,7 @@ static inline bool rcu_reclaim_tiny(struct rcu_head *head) + + trace_rcu_invoke_callback("", head); + f = head->func; ++ debug_rcu_head_callback(head); + WRITE_ONCE(head->func, (rcu_callback_t)0L); + f(head); + rcu_lock_release(&rcu_callback_map); +diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c +index 917a1e43f7839..50726adb4e0b5 100644 +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c +@@ -2247,6 +2247,7 @@ static void rcu_do_batch(struct rcu_data *rdp) + trace_rcu_invoke_callback(rcu_state.name, rhp); + + f = rhp->func; ++ debug_rcu_head_callback(rhp); + WRITE_ONCE(rhp->func, (rcu_callback_t)0L); + f(rhp); + +-- +2.42.0 + diff --git a/queue-6.1/rdma-hfi1-use-field_get-to-extract-link-width.patch b/queue-6.1/rdma-hfi1-use-field_get-to-extract-link-width.patch new file mode 100644 index 00000000000..51f3e1d4d4b --- /dev/null +++ b/queue-6.1/rdma-hfi1-use-field_get-to-extract-link-width.patch @@ -0,0 +1,63 @@ +From da6b64a45617d8316d9bc51a22eb4fe975c36d35 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Sep 2023 15:56:41 +0300 +Subject: RDMA/hfi1: Use FIELD_GET() to extract Link Width +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit 8bf7187d978610b9e327a3d92728c8864a575ebd ] + +Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of +custom masking and shifting, and remove extract_width() which only +wraps that FIELD_GET(). + +Signed-off-by: Ilpo Järvinen +Link: https://lore.kernel.org/r/20230919125648.1920-2-ilpo.jarvinen@linux.intel.com +Reviewed-by: Jonathan Cameron +Reviewed-by: Dean Luick +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/hfi1/pcie.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c +index a0802332c8cb3..5395cf56fbd90 100644 +--- a/drivers/infiniband/hw/hfi1/pcie.c ++++ b/drivers/infiniband/hw/hfi1/pcie.c +@@ -3,6 +3,7 @@ + * Copyright(c) 2015 - 2019 Intel Corporation. + */ + ++#include + #include + #include + #include +@@ -212,12 +213,6 @@ static u32 extract_speed(u16 linkstat) + return speed; + } + +-/* return the PCIe link speed from the given link status */ +-static u32 extract_width(u16 linkstat) +-{ +- return (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT; +-} +- + /* read the link status and set dd->{lbus_width,lbus_speed,lbus_info} */ + static void update_lbus_info(struct hfi1_devdata *dd) + { +@@ -230,7 +225,7 @@ static void update_lbus_info(struct hfi1_devdata *dd) + return; + } + +- dd->lbus_width = extract_width(linkstat); ++ dd->lbus_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat); + dd->lbus_speed = extract_speed(linkstat); + snprintf(dd->lbus_info, sizeof(dd->lbus_info), + "PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width); +-- +2.42.0 + diff --git a/queue-6.1/sched-core-optimize-in_task-and-in_interrupt-a-bit.patch b/queue-6.1/sched-core-optimize-in_task-and-in_interrupt-a-bit.patch new file mode 100644 index 00000000000..406efa728d3 --- /dev/null +++ b/queue-6.1/sched-core-optimize-in_task-and-in_interrupt-a-bit.patch @@ -0,0 +1,100 @@ +From ad2a79e10b67fa502edb39151ee6abcb19509084 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Sep 2023 15:47:11 +1000 +Subject: sched/core: Optimize in_task() and in_interrupt() a bit + +From: Finn Thain + +[ Upstream commit 87c3a5893e865739ce78aa7192d36011022e0af7 ] + +Except on x86, preempt_count is always accessed with READ_ONCE(). +Repeated invocations in macros like irq_count() produce repeated loads. +These redundant instructions appear in various fast paths. In the one +shown below, for example, irq_count() is evaluated during kernel entry +if !tick_nohz_full_cpu(smp_processor_id()). + +0001ed0a : + 1ed0a: 4e56 0000 linkw %fp,#0 + 1ed0e: 200f movel %sp,%d0 + 1ed10: 0280 ffff e000 andil #-8192,%d0 + 1ed16: 2040 moveal %d0,%a0 + 1ed18: 2028 0008 movel %a0@(8),%d0 + 1ed1c: 0680 0001 0000 addil #65536,%d0 + 1ed22: 2140 0008 movel %d0,%a0@(8) + 1ed26: 082a 0001 000f btst #1,%a2@(15) + 1ed2c: 670c beqs 1ed3a + 1ed2e: 2028 0008 movel %a0@(8),%d0 + 1ed32: 2028 0008 movel %a0@(8),%d0 + 1ed36: 2028 0008 movel %a0@(8),%d0 + 1ed3a: 4e5e unlk %fp + 1ed3c: 4e75 rts + +This patch doesn't prevent the pointless btst and beqs instructions +above, but it does eliminate 2 of the 3 pointless move instructions +here and elsewhere. + +On x86, preempt_count is per-cpu data and the problem does not arise +presumably because the compiler is free to optimize more effectively. + +This patch was tested on m68k and x86. I was expecting no changes +to object code for x86 and mostly that's what I saw. However, there +were a few places where code generation was perturbed for some reason. + +The performance issue addressed here is minor on uniprocessor m68k. I +got a 0.01% improvement from this patch for a simple "find /sys -false" +benchmark. For architectures and workloads susceptible to cache line bounce +the improvement is expected to be larger. The only SMP architecture I have +is x86, and as x86 unaffected I have not done any further measurements. + +Fixes: 15115830c887 ("preempt: Cleanup the macro maze a bit") +Signed-off-by: Finn Thain +Signed-off-by: Ingo Molnar +Link: https://lore.kernel.org/r/0a403120a682a525e6db2d81d1a3ffcc137c3742.1694756831.git.fthain@linux-m68k.org +Signed-off-by: Sasha Levin +--- + include/linux/preempt.h | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/include/linux/preempt.h b/include/linux/preempt.h +index 0df425bf9bd75..8cfcc5d454512 100644 +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h +@@ -98,14 +98,21 @@ static __always_inline unsigned char interrupt_context_level(void) + return level; + } + ++/* ++ * These macro definitions avoid redundant invocations of preempt_count() ++ * because such invocations would result in redundant loads given that ++ * preempt_count() is commonly implemented with READ_ONCE(). ++ */ ++ + #define nmi_count() (preempt_count() & NMI_MASK) + #define hardirq_count() (preempt_count() & HARDIRQ_MASK) + #ifdef CONFIG_PREEMPT_RT + # define softirq_count() (current->softirq_disable_cnt & SOFTIRQ_MASK) ++# define irq_count() ((preempt_count() & (NMI_MASK | HARDIRQ_MASK)) | softirq_count()) + #else + # define softirq_count() (preempt_count() & SOFTIRQ_MASK) ++# define irq_count() (preempt_count() & (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_MASK)) + #endif +-#define irq_count() (nmi_count() | hardirq_count() | softirq_count()) + + /* + * Macros to retrieve the current execution context: +@@ -118,7 +125,11 @@ static __always_inline unsigned char interrupt_context_level(void) + #define in_nmi() (nmi_count()) + #define in_hardirq() (hardirq_count()) + #define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET) +-#define in_task() (!(in_nmi() | in_hardirq() | in_serving_softirq())) ++#ifdef CONFIG_PREEMPT_RT ++# define in_task() (!((preempt_count() & (NMI_MASK | HARDIRQ_MASK)) | in_serving_softirq())) ++#else ++# define in_task() (!(preempt_count() & (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET))) ++#endif + + /* + * The following macros are deprecated and should not be used in new code: +-- +2.42.0 + diff --git a/queue-6.1/scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch b/queue-6.1/scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch new file mode 100644 index 00000000000..bd9437c51d9 --- /dev/null +++ b/queue-6.1/scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch @@ -0,0 +1,110 @@ +From 3e890cd53329d287b2a7ae201d1aee30f1e4cab0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Sep 2023 10:15:25 +0800 +Subject: scsi: hisi_sas: Set debugfs_dir pointer to NULL after removing + debugfs + +From: Yihang Li + +[ Upstream commit 6de426f9276c448e2db7238911c97fb157cb23be ] + +If init debugfs failed during device registration due to memory allocation +failure, debugfs_remove_recursive() is called, after which debugfs_dir is +not set to NULL. debugfs_remove_recursive() will be called again during +device removal. As a result, illegal pointer is accessed. + +[ 1665.467244] hisi_sas_v3_hw 0000:b4:02.0: failed to init debugfs! +... +[ 1669.836708] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000a0 +[ 1669.872669] pc : down_write+0x24/0x70 +[ 1669.876315] lr : down_write+0x1c/0x70 +[ 1669.879961] sp : ffff000036f53a30 +[ 1669.883260] x29: ffff000036f53a30 x28: ffffa027c31549f8 +[ 1669.888547] x27: ffffa027c3140000 x26: 0000000000000000 +[ 1669.893834] x25: ffffa027bf37c270 x24: ffffa027bf37c270 +[ 1669.899122] x23: ffff0000095406b8 x22: ffff0000095406a8 +[ 1669.904408] x21: 0000000000000000 x20: ffffa027bf37c310 +[ 1669.909695] x19: 00000000000000a0 x18: ffff8027dcd86f10 +[ 1669.914982] x17: 0000000000000000 x16: 0000000000000000 +[ 1669.920268] x15: 0000000000000000 x14: ffffa0274014f870 +[ 1669.925555] x13: 0000000000000040 x12: 0000000000000228 +[ 1669.930842] x11: 0000000000000020 x10: 0000000000000bb0 +[ 1669.936129] x9 : ffff000036f537f0 x8 : ffff80273088ca10 +[ 1669.941416] x7 : 000000000000001d x6 : 00000000ffffffff +[ 1669.946702] x5 : ffff000008a36310 x4 : ffff80273088be00 +[ 1669.951989] x3 : ffff000009513e90 x2 : 0000000000000000 +[ 1669.957276] x1 : 00000000000000a0 x0 : ffffffff00000001 +[ 1669.962563] Call trace: +[ 1669.965000] down_write+0x24/0x70 +[ 1669.968301] debugfs_remove_recursive+0x5c/0x1b0 +[ 1669.972905] hisi_sas_debugfs_exit+0x24/0x30 [hisi_sas_main] +[ 1669.978541] hisi_sas_v3_remove+0x130/0x150 [hisi_sas_v3_hw] +[ 1669.984175] pci_device_remove+0x48/0xd8 +[ 1669.988082] device_release_driver_internal+0x1b4/0x250 +[ 1669.993282] device_release_driver+0x28/0x38 +[ 1669.997534] pci_stop_bus_device+0x84/0xb8 +[ 1670.001611] pci_stop_and_remove_bus_device_locked+0x24/0x40 +[ 1670.007244] remove_store+0xfc/0x140 +[ 1670.010802] dev_attr_store+0x44/0x60 +[ 1670.014448] sysfs_kf_write+0x58/0x80 +[ 1670.018095] kernfs_fop_write+0xe8/0x1f0 +[ 1670.022000] __vfs_write+0x60/0x190 +[ 1670.025472] vfs_write+0xac/0x1c0 +[ 1670.028771] ksys_write+0x6c/0xd8 +[ 1670.032071] __arm64_sys_write+0x24/0x30 +[ 1670.035977] el0_svc_common+0x78/0x130 +[ 1670.039710] el0_svc_handler+0x38/0x78 +[ 1670.043442] el0_svc+0x8/0xc + +To fix this, set debugfs_dir to NULL after debugfs_remove_recursive(). + +Signed-off-by: Yihang Li +Signed-off-by: Xingui Yang +Signed-off-by: Xiang Chen +Link: https://lore.kernel.org/r/1694571327-78697-2-git-send-email-chenxiang66@hisilicon.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +index c0e74d768716d..c4305ec38ebf3 100644 +--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c ++++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +@@ -4717,6 +4717,12 @@ static void debugfs_bist_init_v3_hw(struct hisi_hba *hisi_hba) + hisi_hba->debugfs_bist_linkrate = SAS_LINK_RATE_1_5_GBPS; + } + ++static void debugfs_exit_v3_hw(struct hisi_hba *hisi_hba) ++{ ++ debugfs_remove_recursive(hisi_hba->debugfs_dir); ++ hisi_hba->debugfs_dir = NULL; ++} ++ + static void debugfs_init_v3_hw(struct hisi_hba *hisi_hba) + { + struct device *dev = hisi_hba->dev; +@@ -4740,18 +4746,13 @@ static void debugfs_init_v3_hw(struct hisi_hba *hisi_hba) + + for (i = 0; i < hisi_sas_debugfs_dump_count; i++) { + if (debugfs_alloc_v3_hw(hisi_hba, i)) { +- debugfs_remove_recursive(hisi_hba->debugfs_dir); ++ debugfs_exit_v3_hw(hisi_hba); + dev_dbg(dev, "failed to init debugfs!\n"); + break; + } + } + } + +-static void debugfs_exit_v3_hw(struct hisi_hba *hisi_hba) +-{ +- debugfs_remove_recursive(hisi_hba->debugfs_dir); +-} +- + static int + hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) + { +-- +2.42.0 + diff --git a/queue-6.1/scsi-ibmvfc-remove-bug_on-in-the-case-of-an-empty-ev.patch b/queue-6.1/scsi-ibmvfc-remove-bug_on-in-the-case-of-an-empty-ev.patch new file mode 100644 index 00000000000..045382b434b --- /dev/null +++ b/queue-6.1/scsi-ibmvfc-remove-bug_on-in-the-case-of-an-empty-ev.patch @@ -0,0 +1,322 @@ +From 0696708e519225db3011c526b202533e7b3af62e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 17:54:25 -0500 +Subject: scsi: ibmvfc: Remove BUG_ON in the case of an empty event pool + +From: Tyrel Datwyler + +[ Upstream commit b39f2d10b86d0af353ea339e5815820026bca48f ] + +In practice the driver should never send more commands than are allocated +to a queue's event pool. In the unlikely event that this happens, the code +asserts a BUG_ON, and in the case that the kernel is not configured to +crash on panic returns a junk event pointer from the empty event list +causing things to spiral from there. This BUG_ON is a historical artifact +of the ibmvfc driver first being upstreamed, and it is well known now that +the use of BUG_ON is bad practice except in the most unrecoverable +scenario. There is nothing about this scenario that prevents the driver +from recovering and carrying on. + +Remove the BUG_ON in question from ibmvfc_get_event() and return a NULL +pointer in the case of an empty event pool. Update all call sites to +ibmvfc_get_event() to check for a NULL pointer and perfrom the appropriate +failure or recovery action. + +Signed-off-by: Tyrel Datwyler +Link: https://lore.kernel.org/r/20230921225435.3537728-2-tyreld@linux.ibm.com +Reviewed-by: Brian King +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ibmvscsi/ibmvfc.c | 124 ++++++++++++++++++++++++++++++++- + 1 file changed, 122 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c +index 41148b0430df9..013f5c05e9f39 100644 +--- a/drivers/scsi/ibmvscsi/ibmvfc.c ++++ b/drivers/scsi/ibmvscsi/ibmvfc.c +@@ -1518,7 +1518,11 @@ static struct ibmvfc_event *ibmvfc_get_event(struct ibmvfc_queue *queue) + unsigned long flags; + + spin_lock_irqsave(&queue->l_lock, flags); +- BUG_ON(list_empty(&queue->free)); ++ if (list_empty(&queue->free)) { ++ ibmvfc_log(queue->vhost, 4, "empty event pool on queue:%ld\n", queue->hwq_id); ++ spin_unlock_irqrestore(&queue->l_lock, flags); ++ return NULL; ++ } + evt = list_entry(queue->free.next, struct ibmvfc_event, queue_list); + atomic_set(&evt->free, 0); + list_del(&evt->queue_list); +@@ -1947,9 +1951,15 @@ static int ibmvfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) + if (vhost->using_channels) { + scsi_channel = hwq % vhost->scsi_scrqs.active_queues; + evt = ibmvfc_get_event(&vhost->scsi_scrqs.scrqs[scsi_channel]); ++ if (!evt) ++ return SCSI_MLQUEUE_HOST_BUSY; ++ + evt->hwq = hwq % vhost->scsi_scrqs.active_queues; +- } else ++ } else { + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) ++ return SCSI_MLQUEUE_HOST_BUSY; ++ } + + ibmvfc_init_event(evt, ibmvfc_scsi_done, IBMVFC_CMD_FORMAT); + evt->cmnd = cmnd; +@@ -2037,6 +2047,11 @@ static int ibmvfc_bsg_timeout(struct bsg_job *job) + + vhost->aborting_passthru = 1; + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ return -ENOMEM; ++ } ++ + ibmvfc_init_event(evt, ibmvfc_bsg_timeout_done, IBMVFC_MAD_FORMAT); + + tmf = &evt->iu.tmf; +@@ -2095,6 +2110,10 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id) + goto unlock_out; + + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ rc = -ENOMEM; ++ goto unlock_out; ++ } + ibmvfc_init_event(evt, ibmvfc_sync_completion, IBMVFC_MAD_FORMAT); + plogi = &evt->iu.plogi; + memset(plogi, 0, sizeof(*plogi)); +@@ -2213,6 +2232,11 @@ static int ibmvfc_bsg_request(struct bsg_job *job) + } + + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ rc = -ENOMEM; ++ goto out; ++ } + ibmvfc_init_event(evt, ibmvfc_sync_completion, IBMVFC_MAD_FORMAT); + mad = &evt->iu.passthru; + +@@ -2301,6 +2325,11 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc) + else + evt = ibmvfc_get_event(&vhost->crq); + ++ if (!evt) { ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ return -ENOMEM; ++ } ++ + ibmvfc_init_event(evt, ibmvfc_sync_completion, IBMVFC_CMD_FORMAT); + tmf = ibmvfc_init_vfc_cmd(evt, sdev); + iu = ibmvfc_get_fcp_iu(vhost, tmf); +@@ -2504,6 +2533,8 @@ static struct ibmvfc_event *ibmvfc_init_tmf(struct ibmvfc_queue *queue, + struct ibmvfc_tmf *tmf; + + evt = ibmvfc_get_event(queue); ++ if (!evt) ++ return NULL; + ibmvfc_init_event(evt, ibmvfc_sync_completion, IBMVFC_MAD_FORMAT); + + tmf = &evt->iu.tmf; +@@ -2560,6 +2591,11 @@ static int ibmvfc_cancel_all_mq(struct scsi_device *sdev, int type) + + if (found_evt && vhost->logged_in) { + evt = ibmvfc_init_tmf(&queues[i], sdev, type); ++ if (!evt) { ++ spin_unlock(queues[i].q_lock); ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ return -ENOMEM; ++ } + evt->sync_iu = &queues[i].cancel_rsp; + ibmvfc_send_event(evt, vhost, default_timeout); + list_add_tail(&evt->cancel, &cancelq); +@@ -2773,6 +2809,10 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) + + if (vhost->state == IBMVFC_ACTIVE) { + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ return -ENOMEM; ++ } + ibmvfc_init_event(evt, ibmvfc_sync_completion, IBMVFC_CMD_FORMAT); + tmf = ibmvfc_init_vfc_cmd(evt, sdev); + iu = ibmvfc_get_fcp_iu(vhost, tmf); +@@ -4031,6 +4071,12 @@ static void ibmvfc_tgt_send_prli(struct ibmvfc_target *tgt) + + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + vhost->discovery_threads++; + ibmvfc_init_event(evt, ibmvfc_tgt_prli_done, IBMVFC_MAD_FORMAT); + evt->tgt = tgt; +@@ -4138,6 +4184,12 @@ static void ibmvfc_tgt_send_plogi(struct ibmvfc_target *tgt) + kref_get(&tgt->kref); + tgt->logo_rcvd = 0; + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + vhost->discovery_threads++; + ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT); + ibmvfc_init_event(evt, ibmvfc_tgt_plogi_done, IBMVFC_MAD_FORMAT); +@@ -4214,6 +4266,8 @@ static struct ibmvfc_event *__ibmvfc_tgt_get_implicit_logout_evt(struct ibmvfc_t + + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) ++ return NULL; + ibmvfc_init_event(evt, done, IBMVFC_MAD_FORMAT); + evt->tgt = tgt; + mad = &evt->iu.implicit_logout; +@@ -4241,6 +4295,13 @@ static void ibmvfc_tgt_implicit_logout(struct ibmvfc_target *tgt) + vhost->discovery_threads++; + evt = __ibmvfc_tgt_get_implicit_logout_evt(tgt, + ibmvfc_tgt_implicit_logout_done); ++ if (!evt) { ++ vhost->discovery_threads--; ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + + ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT); + if (ibmvfc_send_event(evt, vhost, default_timeout)) { +@@ -4380,6 +4441,12 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *tgt) + + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + vhost->discovery_threads++; + ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT); + ibmvfc_init_event(evt, ibmvfc_tgt_move_login_done, IBMVFC_MAD_FORMAT); +@@ -4546,6 +4613,14 @@ static void ibmvfc_adisc_timeout(struct timer_list *t) + vhost->abort_threads++; + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ tgt_err(tgt, "Failed to get cancel event for ADISC.\n"); ++ vhost->abort_threads--; ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ spin_unlock_irqrestore(vhost->host->host_lock, flags); ++ return; ++ } + ibmvfc_init_event(evt, ibmvfc_tgt_adisc_cancel_done, IBMVFC_MAD_FORMAT); + + evt->tgt = tgt; +@@ -4596,6 +4671,12 @@ static void ibmvfc_tgt_adisc(struct ibmvfc_target *tgt) + + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + vhost->discovery_threads++; + ibmvfc_init_event(evt, ibmvfc_tgt_adisc_done, IBMVFC_MAD_FORMAT); + evt->tgt = tgt; +@@ -4699,6 +4780,12 @@ static void ibmvfc_tgt_query_target(struct ibmvfc_target *tgt) + + kref_get(&tgt->kref); + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE); ++ kref_put(&tgt->kref, ibmvfc_release_tgt); ++ __ibmvfc_reset_host(vhost); ++ return; ++ } + vhost->discovery_threads++; + evt->tgt = tgt; + ibmvfc_init_event(evt, ibmvfc_tgt_query_target_done, IBMVFC_MAD_FORMAT); +@@ -4871,6 +4958,13 @@ static void ibmvfc_discover_targets(struct ibmvfc_host *vhost) + { + struct ibmvfc_discover_targets *mad; + struct ibmvfc_event *evt = ibmvfc_get_event(&vhost->crq); ++ int level = IBMVFC_DEFAULT_LOG_LEVEL; ++ ++ if (!evt) { ++ ibmvfc_log(vhost, level, "Discover Targets failed: no available events\n"); ++ ibmvfc_hard_reset_host(vhost); ++ return; ++ } + + ibmvfc_init_event(evt, ibmvfc_discover_targets_done, IBMVFC_MAD_FORMAT); + mad = &evt->iu.discover_targets; +@@ -4948,8 +5042,15 @@ static void ibmvfc_channel_setup(struct ibmvfc_host *vhost) + struct ibmvfc_scsi_channels *scrqs = &vhost->scsi_scrqs; + unsigned int num_channels = + min(vhost->client_scsi_channels, vhost->max_vios_scsi_channels); ++ int level = IBMVFC_DEFAULT_LOG_LEVEL; + int i; + ++ if (!evt) { ++ ibmvfc_log(vhost, level, "Channel Setup failed: no available events\n"); ++ ibmvfc_hard_reset_host(vhost); ++ return; ++ } ++ + memset(setup_buf, 0, sizeof(*setup_buf)); + if (num_channels == 0) + setup_buf->flags = cpu_to_be32(IBMVFC_CANCEL_CHANNELS); +@@ -5011,6 +5112,13 @@ static void ibmvfc_channel_enquiry(struct ibmvfc_host *vhost) + { + struct ibmvfc_channel_enquiry *mad; + struct ibmvfc_event *evt = ibmvfc_get_event(&vhost->crq); ++ int level = IBMVFC_DEFAULT_LOG_LEVEL; ++ ++ if (!evt) { ++ ibmvfc_log(vhost, level, "Channel Enquiry failed: no available events\n"); ++ ibmvfc_hard_reset_host(vhost); ++ return; ++ } + + ibmvfc_init_event(evt, ibmvfc_channel_enquiry_done, IBMVFC_MAD_FORMAT); + mad = &evt->iu.channel_enquiry; +@@ -5133,6 +5241,12 @@ static void ibmvfc_npiv_login(struct ibmvfc_host *vhost) + struct ibmvfc_npiv_login_mad *mad; + struct ibmvfc_event *evt = ibmvfc_get_event(&vhost->crq); + ++ if (!evt) { ++ ibmvfc_dbg(vhost, "NPIV Login failed: no available events\n"); ++ ibmvfc_hard_reset_host(vhost); ++ return; ++ } ++ + ibmvfc_gather_partition_info(vhost); + ibmvfc_set_login_info(vhost); + ibmvfc_init_event(evt, ibmvfc_npiv_login_done, IBMVFC_MAD_FORMAT); +@@ -5197,6 +5311,12 @@ static void ibmvfc_npiv_logout(struct ibmvfc_host *vhost) + struct ibmvfc_event *evt; + + evt = ibmvfc_get_event(&vhost->crq); ++ if (!evt) { ++ ibmvfc_dbg(vhost, "NPIV Logout failed: no available events\n"); ++ ibmvfc_hard_reset_host(vhost); ++ return; ++ } ++ + ibmvfc_init_event(evt, ibmvfc_npiv_logout_done, IBMVFC_MAD_FORMAT); + + mad = &evt->iu.npiv_logout; +-- +2.42.0 + diff --git a/queue-6.1/scsi-libfc-fix-potential-null-pointer-dereference-in.patch b/queue-6.1/scsi-libfc-fix-potential-null-pointer-dereference-in.patch new file mode 100644 index 00000000000..a6d40292ac1 --- /dev/null +++ b/queue-6.1/scsi-libfc-fix-potential-null-pointer-dereference-in.patch @@ -0,0 +1,44 @@ +From a761f1b12ea6434dd6bcd9b03d8db24f4b9cfc43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 21:03:50 +0800 +Subject: scsi: libfc: Fix potential NULL pointer dereference in + fc_lport_ptp_setup() + +From: Wenchao Hao + +[ Upstream commit 4df105f0ce9f6f30cda4e99f577150d23f0c9c5f ] + +fc_lport_ptp_setup() did not check the return value of fc_rport_create() +which can return NULL and would cause a NULL pointer dereference. Address +this issue by checking return value of fc_rport_create() and log error +message on fc_rport_create() failed. + +Signed-off-by: Wenchao Hao +Link: https://lore.kernel.org/r/20231011130350.819571-1-haowenchao2@huawei.com +Reviewed-by: Simon Horman +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/libfc/fc_lport.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c +index 9c02c9523c4d4..ab06e9aeb613e 100644 +--- a/drivers/scsi/libfc/fc_lport.c ++++ b/drivers/scsi/libfc/fc_lport.c +@@ -241,6 +241,12 @@ static void fc_lport_ptp_setup(struct fc_lport *lport, + } + mutex_lock(&lport->disc.disc_mutex); + lport->ptp_rdata = fc_rport_create(lport, remote_fid); ++ if (!lport->ptp_rdata) { ++ printk(KERN_WARNING "libfc: Failed to setup lport 0x%x\n", ++ lport->port_id); ++ mutex_unlock(&lport->disc.disc_mutex); ++ return; ++ } + kref_get(&lport->ptp_rdata->kref); + lport->ptp_rdata->ids.port_name = remote_wwpn; + lport->ptp_rdata->ids.node_name = remote_wwnn; +-- +2.42.0 + diff --git a/queue-6.1/selftests-efivarfs-create-read-fix-a-resource-leak.patch b/queue-6.1/selftests-efivarfs-create-read-fix-a-resource-leak.patch new file mode 100644 index 00000000000..44638d3a983 --- /dev/null +++ b/queue-6.1/selftests-efivarfs-create-read-fix-a-resource-leak.patch @@ -0,0 +1,37 @@ +From e7be79e1663dabbbdc68fad36399f7522de1d7c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Oct 2023 18:59:21 -0700 +Subject: selftests/efivarfs: create-read: fix a resource leak + +From: zhujun2 + +[ Upstream commit 3f6f8a8c5e11a9b384a36df4f40f0c9a653b6975 ] + +The opened file should be closed in main(), otherwise resource +leak will occur that this problem was discovered by code reading + +Signed-off-by: zhujun2 +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/efivarfs/create-read.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/testing/selftests/efivarfs/create-read.c b/tools/testing/selftests/efivarfs/create-read.c +index 9674a19396a32..7bc7af4eb2c17 100644 +--- a/tools/testing/selftests/efivarfs/create-read.c ++++ b/tools/testing/selftests/efivarfs/create-read.c +@@ -32,8 +32,10 @@ int main(int argc, char **argv) + rc = read(fd, buf, sizeof(buf)); + if (rc != 0) { + fprintf(stderr, "Reading a new var should return EOF\n"); ++ close(fd); + return EXIT_FAILURE; + } + ++ close(fd); + return EXIT_SUCCESS; + } +-- +2.42.0 + diff --git a/queue-6.1/selftests-lkdtm-disable-config_ubsan_trap-in-test-co.patch b/queue-6.1/selftests-lkdtm-disable-config_ubsan_trap-in-test-co.patch new file mode 100644 index 00000000000..658e5c6f87a --- /dev/null +++ b/queue-6.1/selftests-lkdtm-disable-config_ubsan_trap-in-test-co.patch @@ -0,0 +1,68 @@ +From 810ce40b89cc811f01e72736e77a7e4c8f5a84d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Aug 2023 08:32:52 +0200 +Subject: selftests/lkdtm: Disable CONFIG_UBSAN_TRAP in test config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ricardo Cañuelo + +[ Upstream commit cf77bf698887c3b9ebed76dea492b07a3c2c7632 ] + +The lkdtm selftest config fragment enables CONFIG_UBSAN_TRAP to make the +ARRAY_BOUNDS test kill the calling process when an out-of-bound access +is detected by UBSAN. However, after this [1] commit, UBSAN is triggered +under many new scenarios that weren't detected before, such as in struct +definitions with fixed-size trailing arrays used as flexible arrays. As +a result, CONFIG_UBSAN_TRAP=y has become a very aggressive option to +enable except for specific situations. + +`make kselftest-merge` applies CONFIG_UBSAN_TRAP=y to the kernel config +for all selftests, which makes many of them fail because of system hangs +during boot. + +This change removes the config option from the lkdtm kselftest and +configures the ARRAY_BOUNDS test to look for UBSAN reports rather than +relying on the calling process being killed. + +[1] commit 2d47c6956ab3 ("ubsan: Tighten UBSAN_BOUNDS on GCC")' + +Signed-off-by: Ricardo Cañuelo +Reviewed-by: Kees Cook +Link: https://lore.kernel.org/r/20230802063252.1917997-1-ricardo.canuelo@collabora.com +Signed-off-by: Kees Cook +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/lkdtm/config | 1 - + tools/testing/selftests/lkdtm/tests.txt | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config +index 5d52f64dfb430..7afe05e8c4d79 100644 +--- a/tools/testing/selftests/lkdtm/config ++++ b/tools/testing/selftests/lkdtm/config +@@ -9,7 +9,6 @@ CONFIG_INIT_ON_FREE_DEFAULT_ON=y + CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y + CONFIG_UBSAN=y + CONFIG_UBSAN_BOUNDS=y +-CONFIG_UBSAN_TRAP=y + CONFIG_STACKPROTECTOR_STRONG=y + CONFIG_SLUB_DEBUG=y + CONFIG_SLUB_DEBUG_ON=y +diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt +index 607b8d7e3ea34..2f3a1b96da6e3 100644 +--- a/tools/testing/selftests/lkdtm/tests.txt ++++ b/tools/testing/selftests/lkdtm/tests.txt +@@ -7,7 +7,7 @@ EXCEPTION + #EXHAUST_STACK Corrupts memory on failure + #CORRUPT_STACK Crashes entire system on success + #CORRUPT_STACK_STRONG Crashes entire system on success +-ARRAY_BOUNDS ++ARRAY_BOUNDS call trace:|UBSAN: array-index-out-of-bounds + CORRUPT_LIST_ADD list_add corruption + CORRUPT_LIST_DEL list_del corruption + STACK_GUARD_PAGE_LEADING +-- +2.42.0 + diff --git a/queue-6.1/series b/queue-6.1/series new file mode 100644 index 00000000000..04381093f7a --- /dev/null +++ b/queue-6.1/series @@ -0,0 +1,160 @@ +locking-ww_mutex-test-fix-potential-workqueue-corrup.patch +lib-generic-radix-tree.c-don-t-overflow-in-peek.patch +perf-core-bail-out-early-if-the-request-aux-area-is-.patch +rcu-dump-memory-object-info-if-callback-function-is-.patch +srcu-fix-srcu_struct-node-grpmask-overflow-on-64-bit.patch +selftests-lkdtm-disable-config_ubsan_trap-in-test-co.patch +clocksource-drivers-timer-imx-gpt-fix-potential-memo.patch +clocksource-drivers-timer-atmel-tcb-fix-initializati.patch +smp-csd-throw-an-error-if-a-csd-lock-is-stuck-for-to.patch +cpu-hotplug-don-t-offline-the-last-non-isolated-cpu.patch +workqueue-provide-one-lock-class-key-per-work_on_cpu.patch +x86-mm-drop-the-4-mb-restriction-on-minimal-numa-nod.patch +wifi-plfxlc-fix-clang-specific-fortify-warning.patch +wifi-mac80211_hwsim-fix-clang-specific-fortify-warni.patch +wifi-mac80211-don-t-return-unset-power-in-ieee80211_.patch +atl1c-work-around-the-dma-rx-overflow-issue.patch +bpf-detect-ip-ksym.end-as-part-of-bpf-program.patch +wifi-ath9k-fix-clang-specific-fortify-warnings.patch +wifi-ath10k-fix-clang-specific-fortify-warning.patch +net-annotate-data-races-around-sk-sk_tx_queue_mappin.patch +net-annotate-data-races-around-sk-sk_dst_pending_con.patch +wifi-ath10k-don-t-touch-the-ce-interrupt-registers-a.patch +vsock-read-from-socket-s-error-queue.patch +bpf-ensure-proper-register-state-printing-for-cond-j.patch +bluetooth-btusb-add-date-evt_skb-is-null-check.patch +bluetooth-fix-double-free-in-hci_conn_cleanup.patch +acpi-ec-add-quirk-for-hp-250-g7-notebook-pc.patch +tsnep-fix-tsnep_request_irq-format-overflow-warning.patch +platform-chrome-kunit-initialize-lock-for-fake-ec_de.patch +platform-x86-thinkpad_acpi-add-battery-quirk-for-thi.patch +drm-gma500-fix-call-trace-when-psb_gem_mm_init-fails.patch +drm-komeda-drop-all-currently-held-locks-if-deadlock.patch +drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch +drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch +drm-amd-update-update_pcie_parameters-functions-to-u.patch +drm-amd-display-use-full-update-for-clip-size-increa.patch +string.h-add-array-wrappers-for-v-memdup_user.patch +kernel-kexec-copy-user-array-safely.patch +kernel-watch_queue-copy-user-array-safely.patch +drm_lease.c-copy-user-array-safely.patch +drm-vmwgfx_surface.c-copy-user-array-safely.patch +drm-msm-dp-skip-validity-check-for-dp-cts-edid-check.patch +drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch +drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch +drm-amdgpu-fix-potential-null-pointer-derefernce.patch +drm-panel-fix-a-possible-null-pointer-dereference.patch +drm-panel-panel-tpo-tpg110-fix-a-possible-null-point.patch +drm-radeon-fix-a-possible-null-pointer-dereference.patch +drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch +drm-panel-st7703-pick-different-reset-sequence.patch +drm-amdkfd-fix-shift-out-of-bounds-issue.patch +drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch +arm64-dts-ls208xa-use-a-pseudo-bus-to-constrain-usb-.patch +selftests-efivarfs-create-read-fix-a-resource-leak.patch +asoc-soc-card-add-storage-for-pci-ssid.patch +asoc-sof-pass-pci-ssid-to-machine-driver.patch +crypto-pcrypt-fix-hungtask-for-padata_reset.patch +alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch +asoc-sof-ipc4-handle-exception_caught-notification-f.patch +rdma-hfi1-use-field_get-to-extract-link-width.patch +scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch +scsi-ibmvfc-remove-bug_on-in-the-case-of-an-empty-ev.patch +fs-jfs-add-check-for-negative-db_l2nbperpage.patch +fs-jfs-add-validity-check-for-db_maxag-and-db_agpref.patch +jfs-fix-array-index-out-of-bounds-in-dbfindleaf.patch +jfs-fix-array-index-out-of-bounds-in-dialloc.patch +hid-lenovo-detect-quirk-free-fw-on-cptkbd-and-stop-a.patch +arm-9320-1-fix-stack-depot-irq-stack-filter.patch +alsa-hda-fix-possible-null-ptr-deref-when-assigning-.patch +pci-tegra194-use-field_get-field_prep-with-link-widt.patch +pci-mvebu-use-field_prep-with-link-width.patch +atm-iphase-do-pci-error-checks-on-own-line.patch +pci-do-error-check-on-own-line-to-split-long-if-cond.patch +scsi-libfc-fix-potential-null-pointer-dereference-in.patch +pci-use-field_get-to-extract-link-width.patch +pci-extract-ats-disabling-to-a-helper-function.patch +pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch +misc-pci_endpoint_test-add-device-id-for-r-car-s4-8-.patch +pci-use-field_get-in-sapphire-rx-5600-xt-pulse-quirk.patch +asoc-intel-soc-acpi-cht-add-lenovo-yoga-tab-3-pro-yt.patch +crypto-hisilicon-qm-prevent-soft-lockup-in-receive-l.patch +hid-add-quirk-for-dell-pro-wireless-keyboard-and-mou.patch +exfat-support-handle-zero-size-directory.patch +mfd-intel-lpss-add-intel-lunar-lake-m-pci-ids.patch +iio-adc-stm32-adc-harden-against-null-pointer-deref-.patch +thunderbolt-apply-usb-3.x-bandwidth-quirk-only-in-so.patch +tty-vcc-add-check-for-kstrdup-in-vcc_probe.patch +usb-dwc3-core-configure-tx-rx-threshold-for-dwc3_ip.patch +soundwire-dmi-quirks-update-hp-omen-match.patch +f2fs-fix-error-handling-of-__get_node_page.patch +usb-gadget-f_ncm-always-set-current-gadget-in-ncm_bi.patch +9p-trans_fd-annotate-data-racy-writes-to-file-f_flag.patch +9p-v9fs_listxattr-fix-s-null-argument-warning.patch +i3c-mipi-i3c-hci-fix-out-of-bounds-access-in-hci_dma.patch +i2c-fix-memleak-in-i2c_new_client_device.patch +i2c-sun6i-p2wi-prevent-potential-division-by-zero.patch +virtio-blk-fix-implicit-overflow-on-virtio_max_dma_s.patch +i3c-master-mipi-i3c-hci-fix-a-kernel-panic-for-acces.patch +media-gspca-cpia1-shift-out-of-bounds-in-set_flicker.patch +media-vivid-avoid-integer-overflow.patch +gfs2-ignore-negated-quota-changes.patch +gfs2-fix-an-oops-in-gfs2_permission.patch +media-cobalt-use-field_get-to-extract-link-width.patch +media-ccs-fix-driver-quirk-struct-documentation.patch +media-imon-fix-access-to-invalid-resource-for-the-se.patch +drm-amd-display-avoid-null-dereference-of-timing-gen.patch +kgdb-flush-console-before-entering-kgdb-on-panic.patch +i2c-dev-copy-userspace-array-safely.patch +asoc-ti-omap-mcbsp-fix-runtime-pm-underflow-warnings.patch +drm-qxl-prevent-memory-leak.patch +alsa-hda-realtek-add-quirk-for-asus-ux7602zm.patch +drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch +pwm-fix-double-shift-bug.patch +mtd-rawnand-tegra-add-missing-check-for-platform_get.patch +wifi-iwlwifi-use-fw-rate-for-non-data-frames.patch +sched-core-optimize-in_task-and-in_interrupt-a-bit.patch +sunrpc-econnreset-might-require-a-rebind.patch +mtd-rawnand-intel-check-return-value-of-devm_kasprin.patch +mtd-rawnand-meson-check-return-value-of-devm_kasprin.patch +nfsv4.1-fix-handling-nfs4err_delay-when-testing-for-.patch +sunrpc-add-an-is_err-check-back-to-where-it-was.patch +nfsv4.1-fix-sp4_mach_cred-protection-for-pnfs-io.patch +sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-de.patch +gfs2-silence-suspicious-rcu-usage-in-gfs2_permission.patch +vhost-vdpa-fix-use-after-free-in-vhost_vdpa_probe.patch +net-set-sock_rcu_free-before-inserting-socket-into-h.patch +ipvlan-add-ipvlan_route_v6_outbound-helper.patch +tty-fix-uninit-value-access-in-ppp_sync_receive.patch +net-hns3-fix-add-vlan-fail-issue.patch +net-hns3-add-barrier-in-vf-mailbox-reply-process.patch +net-hns3-fix-incorrect-capability-bit-display-for-co.patch +net-hns3-fix-out-of-bounds-access-may-occur-when-coa.patch +net-hns3-fix-variable-may-not-initialized-problem-in.patch +net-hns3-fix-vf-reset-fail-issue.patch +net-hns3-fix-vf-wrong-speed-and-duplex-issue.patch +tipc-fix-kernel-infoleak-due-to-uninitialized-tlv-va.patch +net-mvneta-fix-calls-to-page_pool_get_stats.patch +ppp-limit-mru-to-64k.patch +xen-events-fix-delayed-eoi-list-handling.patch +ptp-annotate-data-race-around-q-head-and-q-tail.patch +bonding-stop-the-device-in-bond_setup_by_slave.patch +net-ethernet-cortina-fix-max-rx-frame-define.patch +net-ethernet-cortina-handle-large-frames.patch +net-ethernet-cortina-fix-mtu-max-setting.patch +af_unix-fix-use-after-free-in-unix_stream_read_actor.patch +netfilter-nf_conntrack_bridge-initialize-err-to-0.patch +netfilter-nf_tables-fix-pointer-math-issue-in-nft_by.patch +net-stmmac-fix-rx-budget-limit-check.patch +net-stmmac-avoid-rx-queue-overrun.patch +net-mlx5e-fix-double-free-of-encap_header.patch +net-mlx5e-fix-double-free-of-encap_header-in-update-.patch +net-mlx5e-fix-pedit-endianness.patch +net-mlx5e-reduce-the-size-of-icosq_str.patch +net-mlx5e-check-return-value-of-snprintf-writing-to-.patch +net-mlx5e-check-return-value-of-snprintf-writing-to-.patch-10342 +macvlan-don-t-propagate-promisc-change-to-lower-dev-.patch +tools-power-turbostat-fix-a-knl-bug.patch +tools-power-turbostat-enable-the-c-state-pre-wake-pr.patch +cifs-spnego-add-in-host_key_len.patch +cifs-fix-check-of-rc-in-function-generate_smb3signin.patch diff --git a/queue-6.1/smp-csd-throw-an-error-if-a-csd-lock-is-stuck-for-to.patch b/queue-6.1/smp-csd-throw-an-error-if-a-csd-lock-is-stuck-for-to.patch new file mode 100644 index 00000000000..45fd1300d59 --- /dev/null +++ b/queue-6.1/smp-csd-throw-an-error-if-a-csd-lock-is-stuck-for-to.patch @@ -0,0 +1,105 @@ +From 1594cbcb4885251c308fcfc71d97872eabe5a3d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Aug 2023 16:04:09 -0400 +Subject: smp,csd: Throw an error if a CSD lock is stuck for too long + +From: Rik van Riel + +[ Upstream commit 94b3f0b5af2c7af69e3d6e0cdd9b0ea535f22186 ] + +The CSD lock seems to get stuck in 2 "modes". When it gets stuck +temporarily, it usually gets released in a few seconds, and sometimes +up to one or two minutes. + +If the CSD lock stays stuck for more than several minutes, it never +seems to get unstuck, and gradually more and more things in the system +end up also getting stuck. + +In the latter case, we should just give up, so the system can dump out +a little more information about what went wrong, and, with panic_on_oops +and a kdump kernel loaded, dump a whole bunch more information about what +might have gone wrong. In addition, there is an smp.panic_on_ipistall +kernel boot parameter that by default retains the old behavior, but when +set enables the panic after the CSD lock has been stuck for more than +the specified number of milliseconds, as in 300,000 for five minutes. + +[ paulmck: Apply Imran Khan feedback. ] +[ paulmck: Apply Leonardo Bras feedback. ] + +Link: https://lore.kernel.org/lkml/bc7cc8b0-f587-4451-8bcd-0daae627bcc7@paulmck-laptop/ +Signed-off-by: Rik van Riel +Signed-off-by: Paul E. McKenney +Reviewed-by: Imran Khan +Reviewed-by: Leonardo Bras +Cc: Peter Zijlstra +Cc: Valentin Schneider +Cc: Juergen Gross +Cc: Jonathan Corbet +Cc: Randy Dunlap +Signed-off-by: Sasha Levin +--- + Documentation/admin-guide/kernel-parameters.txt | 7 +++++++ + kernel/smp.c | 13 ++++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index 31af352b4762d..4ad60e127e048 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt ++++ b/Documentation/admin-guide/kernel-parameters.txt +@@ -5671,6 +5671,13 @@ + This feature may be more efficiently disabled + using the csdlock_debug- kernel parameter. + ++ smp.panic_on_ipistall= [KNL] ++ If a csd_lock_timeout extends for more than ++ the specified number of milliseconds, panic the ++ system. By default, let CSD-lock acquisition ++ take as long as they take. Specifying 300,000 ++ for this value provides a 5-minute timeout. ++ + smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices + smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port + smsc-ircc2.ircc_sir= [HW] SIR base I/O port +diff --git a/kernel/smp.c b/kernel/smp.c +index 06a413987a14a..63e466bb6b03a 100644 +--- a/kernel/smp.c ++++ b/kernel/smp.c +@@ -185,6 +185,8 @@ static DEFINE_PER_CPU(struct cfd_seq_local, cfd_seq_local); + + static ulong csd_lock_timeout = 5000; /* CSD lock timeout in milliseconds. */ + module_param(csd_lock_timeout, ulong, 0444); ++static int panic_on_ipistall; /* CSD panic timeout in milliseconds, 300000 for five minutes. */ ++module_param(panic_on_ipistall, int, 0444); + + static atomic_t csd_bug_count = ATOMIC_INIT(0); + static u64 cfd_seq; +@@ -343,6 +345,7 @@ static bool csd_lock_wait_toolong(struct __call_single_data *csd, u64 ts0, u64 * + } + + ts2 = sched_clock(); ++ /* How long since we last checked for a stuck CSD lock.*/ + ts_delta = ts2 - *ts1; + if (likely(ts_delta <= csd_lock_timeout_ns || csd_lock_timeout_ns == 0)) + return false; +@@ -356,9 +359,17 @@ static bool csd_lock_wait_toolong(struct __call_single_data *csd, u64 ts0, u64 * + else + cpux = cpu; + cpu_cur_csd = smp_load_acquire(&per_cpu(cur_csd, cpux)); /* Before func and info. */ ++ /* How long since this CSD lock was stuck. */ ++ ts_delta = ts2 - ts0; + pr_alert("csd: %s non-responsive CSD lock (#%d) on CPU#%d, waiting %llu ns for CPU#%02d %pS(%ps).\n", +- firsttime ? "Detected" : "Continued", *bug_id, raw_smp_processor_id(), ts2 - ts0, ++ firsttime ? "Detected" : "Continued", *bug_id, raw_smp_processor_id(), ts_delta, + cpu, csd->func, csd->info); ++ /* ++ * If the CSD lock is still stuck after 5 minutes, it is unlikely ++ * to become unstuck. Use a signed comparison to avoid triggering ++ * on underflows when the TSC is out of sync between sockets. ++ */ ++ BUG_ON(panic_on_ipistall > 0 && (s64)ts_delta > ((s64)panic_on_ipistall * NSEC_PER_MSEC)); + if (cpu_cur_csd && csd != cpu_cur_csd) { + pr_alert("\tcsd: CSD lock (#%d) handling prior %pS(%ps) request.\n", + *bug_id, READ_ONCE(per_cpu(cur_csd_func, cpux)), +-- +2.42.0 + diff --git a/queue-6.1/soundwire-dmi-quirks-update-hp-omen-match.patch b/queue-6.1/soundwire-dmi-quirks-update-hp-omen-match.patch new file mode 100644 index 00000000000..1017d68d1c5 --- /dev/null +++ b/queue-6.1/soundwire-dmi-quirks-update-hp-omen-match.patch @@ -0,0 +1,39 @@ +From 441beeb8307c2b36e9d4870c8b9f89cdf7e89dbc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Oct 2023 09:08:33 +0800 +Subject: soundwire: dmi-quirks: update HP Omen match + +From: Pierre-Louis Bossart + +[ Upstream commit 4ea2b6d3128ea4d502c4015df0dc16b7d1070954 ] + +New platforms have a slightly different DMI product name, remove +trailing characters/digits to handle all cases + +Closes: https://github.com/thesofproject/linux/issues/4611 +Signed-off-by: Pierre-Louis Bossart +Reviewed-by: Rander Wang +Signed-off-by: Bard Liao +Link: https://lore.kernel.org/r/20231013010833.114271-1-yung-chuan.liao@linux.intel.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/soundwire/dmi-quirks.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c +index 2a1096dab63d3..9ebdd0cd0b1cf 100644 +--- a/drivers/soundwire/dmi-quirks.c ++++ b/drivers/soundwire/dmi-quirks.c +@@ -141,7 +141,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), +- DMI_MATCH(DMI_PRODUCT_NAME, "OMEN by HP Gaming Laptop 16-k0xxx"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "OMEN by HP Gaming Laptop 16"), + }, + .driver_data = (void *)hp_omen_16, + }, +-- +2.42.0 + diff --git a/queue-6.1/srcu-fix-srcu_struct-node-grpmask-overflow-on-64-bit.patch b/queue-6.1/srcu-fix-srcu_struct-node-grpmask-overflow-on-64-bit.patch new file mode 100644 index 00000000000..216c205beaa --- /dev/null +++ b/queue-6.1/srcu-fix-srcu_struct-node-grpmask-overflow-on-64-bit.patch @@ -0,0 +1,66 @@ +From 5df36b3dd16be6e8ba1393a67069f1f80afc9d89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Sep 2023 15:21:14 +0300 +Subject: srcu: Fix srcu_struct node grpmask overflow on 64-bit systems + +From: Denis Arefev + +[ Upstream commit d8d5b7bf6f2105883bbd91bbd4d5b67e4e3dff71 ] + +The value of a bitwise expression 1 << (cpu - sdp->mynode->grplo) +is subject to overflow due to a failure to cast operands to a larger +data type before performing the bitwise operation. + +The maximum result of this subtraction is defined by the RCU_FANOUT_LEAF +Kconfig option, which on 64-bit systems defaults to 16 (resulting in a +maximum shift of 15), but which can be set up as high as 64 (resulting +in a maximum shift of 63). A value of 31 can result in sign extension, +resulting in 0xffffffff80000000 instead of the desired 0x80000000. +A value of 32 or greater triggers undefined behavior per the C standard. + +This bug has not been known to cause issues because almost all kernels +take the default CONFIG_RCU_FANOUT_LEAF=16. Furthermore, as long as a +given compiler gives a deterministic non-zero result for 1<=32, +the code correctly invokes all SRCU callbacks, albeit wasting CPU time +along the way. + +This commit therefore substitutes the correct 1UL for the buggy 1. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Signed-off-by: Denis Arefev +Reviewed-by: Mathieu Desnoyers +Reviewed-by: Joel Fernandes (Google) +Cc: David Laight +Signed-off-by: Paul E. McKenney +Signed-off-by: Frederic Weisbecker +Signed-off-by: Sasha Levin +--- + kernel/rcu/srcutree.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c +index ce60cdf069e3a..94da8e13b71fb 100644 +--- a/kernel/rcu/srcutree.c ++++ b/kernel/rcu/srcutree.c +@@ -223,7 +223,7 @@ static bool init_srcu_struct_nodes(struct srcu_struct *ssp, gfp_t gfp_flags) + snp->grplo = cpu; + snp->grphi = cpu; + } +- sdp->grpmask = 1 << (cpu - sdp->mynode->grplo); ++ sdp->grpmask = 1UL << (cpu - sdp->mynode->grplo); + } + smp_store_release(&ssp->srcu_size_state, SRCU_SIZE_WAIT_BARRIER); + return true; +@@ -722,7 +722,7 @@ static void srcu_schedule_cbs_snp(struct srcu_struct *ssp, struct srcu_node *snp + int cpu; + + for (cpu = snp->grplo; cpu <= snp->grphi; cpu++) { +- if (!(mask & (1 << (cpu - snp->grplo)))) ++ if (!(mask & (1UL << (cpu - snp->grplo)))) + continue; + srcu_schedule_cbs_sdp(per_cpu_ptr(ssp->sda, cpu), delay); + } +-- +2.42.0 + diff --git a/queue-6.1/string.h-add-array-wrappers-for-v-memdup_user.patch b/queue-6.1/string.h-add-array-wrappers-for-v-memdup_user.patch new file mode 100644 index 00000000000..05ab44f49a0 --- /dev/null +++ b/queue-6.1/string.h-add-array-wrappers-for-v-memdup_user.patch @@ -0,0 +1,94 @@ +From 36787fe4cc916b59919f05355258f6b41182e348 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Sep 2023 14:36:09 +0200 +Subject: string.h: add array-wrappers for (v)memdup_user() + +From: Philipp Stanner + +[ Upstream commit 313ebe47d75558511aa1237b6e35c663b5c0ec6f ] + +Currently, user array duplications are sometimes done without an +overflow check. Sometimes the checks are done manually; sometimes the +array size is calculated with array_size() and sometimes by calculating +n * size directly in code. + +Introduce wrappers for arrays for memdup_user() and vmemdup_user() to +provide a standardized and safe way for duplicating user arrays. + +This is both for new code as well as replacing usage of (v)memdup_user() +in existing code that uses, e.g., n * size to calculate array sizes. + +Suggested-by: David Airlie +Signed-off-by: Philipp Stanner +Reviewed-by: Andy Shevchenko +Reviewed-by: Kees Cook +Reviewed-by: Zack Rusin +Signed-off-by: Dave Airlie +Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-3-pstanner@redhat.com +Signed-off-by: Sasha Levin +--- + include/linux/string.h | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/include/linux/string.h b/include/linux/string.h +index 26ab8928d8661..422606e98cc42 100644 +--- a/include/linux/string.h ++++ b/include/linux/string.h +@@ -5,7 +5,9 @@ + #include /* for inline */ + #include /* for size_t */ + #include /* for NULL */ ++#include /* for ERR_PTR() */ + #include /* for E2BIG */ ++#include /* for check_mul_overflow() */ + #include + #include + +@@ -14,6 +16,44 @@ extern void *memdup_user(const void __user *, size_t); + extern void *vmemdup_user(const void __user *, size_t); + extern void *memdup_user_nul(const void __user *, size_t); + ++/** ++ * memdup_array_user - duplicate array from user space ++ * @src: source address in user space ++ * @n: number of array members to copy ++ * @size: size of one array member ++ * ++ * Return: an ERR_PTR() on failure. Result is physically ++ * contiguous, to be freed by kfree(). ++ */ ++static inline void *memdup_array_user(const void __user *src, size_t n, size_t size) ++{ ++ size_t nbytes; ++ ++ if (check_mul_overflow(n, size, &nbytes)) ++ return ERR_PTR(-EOVERFLOW); ++ ++ return memdup_user(src, nbytes); ++} ++ ++/** ++ * vmemdup_array_user - duplicate array from user space ++ * @src: source address in user space ++ * @n: number of array members to copy ++ * @size: size of one array member ++ * ++ * Return: an ERR_PTR() on failure. Result may be not ++ * physically contiguous. Use kvfree() to free. ++ */ ++static inline void *vmemdup_array_user(const void __user *src, size_t n, size_t size) ++{ ++ size_t nbytes; ++ ++ if (check_mul_overflow(n, size, &nbytes)) ++ return ERR_PTR(-EOVERFLOW); ++ ++ return vmemdup_user(src, nbytes); ++} ++ + /* + * Include machine specific inline routines + */ +-- +2.42.0 + diff --git a/queue-6.1/sunrpc-add-an-is_err-check-back-to-where-it-was.patch b/queue-6.1/sunrpc-add-an-is_err-check-back-to-where-it-was.patch new file mode 100644 index 00000000000..c154bb21106 --- /dev/null +++ b/queue-6.1/sunrpc-add-an-is_err-check-back-to-where-it-was.patch @@ -0,0 +1,44 @@ +From 833f5e0ddfebe8d2d04e9cb820314f34cee8a714 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Oct 2023 11:00:22 +0300 +Subject: SUNRPC: Add an IS_ERR() check back to where it was + +From: Dan Carpenter + +[ Upstream commit 4f3ed837186fc0d2722ba8d2457a594322e9c2ef ] + +This IS_ERR() check was deleted during in a cleanup because, at the time, +the rpcb_call_async() function could not return an error pointer. That +changed in commit 25cf32ad5dba ("SUNRPC: Handle allocation failure in +rpc_new_task()") and now it can return an error pointer. Put the check +back. + +A related revert was done in commit 13bd90141804 ("Revert "SUNRPC: +Remove unreachable error condition""). + +Fixes: 037e910b52b0 ("SUNRPC: Remove unreachable error condition in rpcb_getport_async()") +Signed-off-by: Dan Carpenter +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/rpcb_clnt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c +index 5a8e6d46809ae..82afb56695f8d 100644 +--- a/net/sunrpc/rpcb_clnt.c ++++ b/net/sunrpc/rpcb_clnt.c +@@ -746,6 +746,10 @@ void rpcb_getport_async(struct rpc_task *task) + + child = rpcb_call_async(rpcb_clnt, map, proc); + rpc_release_client(rpcb_clnt); ++ if (IS_ERR(child)) { ++ /* rpcb_map_release() has freed the arguments */ ++ return; ++ } + + xprt->stat.bind_count++; + rpc_put_task(child); +-- +2.42.0 + diff --git a/queue-6.1/sunrpc-econnreset-might-require-a-rebind.patch b/queue-6.1/sunrpc-econnreset-might-require-a-rebind.patch new file mode 100644 index 00000000000..19ca0171fd6 --- /dev/null +++ b/queue-6.1/sunrpc-econnreset-might-require-a-rebind.patch @@ -0,0 +1,43 @@ +From d413b479f23492e4bdf8f962d534d66ab25f26f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 17 Sep 2023 09:06:05 -0400 +Subject: SUNRPC: ECONNRESET might require a rebind + +From: Trond Myklebust + +[ Upstream commit 4b09ca1508a60be30b2e3940264e93d7aeb5c97e ] + +If connect() is returning ECONNRESET, it usually means that nothing is +listening on that port. If so, a rebind might be required in order to +obtain the new port on which the RPC service is listening. + +Fixes: fd01b2597941 ("SUNRPC: ECONNREFUSED should cause a rebind.") +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/clnt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c +index 2b803383c7b31..f0bbd6cb4e39b 100644 +--- a/net/sunrpc/clnt.c ++++ b/net/sunrpc/clnt.c +@@ -2157,6 +2157,7 @@ call_connect_status(struct rpc_task *task) + task->tk_status = 0; + switch (status) { + case -ECONNREFUSED: ++ case -ECONNRESET: + /* A positive refusal suggests a rebind is needed. */ + if (RPC_IS_SOFTCONN(task)) + break; +@@ -2165,7 +2166,6 @@ call_connect_status(struct rpc_task *task) + goto out_retry; + } + fallthrough; +- case -ECONNRESET: + case -ECONNABORTED: + case -ENETDOWN: + case -ENETUNREACH: +-- +2.42.0 + diff --git a/queue-6.1/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-de.patch b/queue-6.1/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-de.patch new file mode 100644 index 00000000000..93ffa57b593 --- /dev/null +++ b/queue-6.1/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-de.patch @@ -0,0 +1,121 @@ +From 45dd5a518ddc1c44e7e2f538af1778af1abc781d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Oct 2023 09:40:19 +0800 +Subject: SUNRPC: Fix RPC client cleaned up the freed pipefs dentries + +From: felix + +[ Upstream commit bfca5fb4e97c46503ddfc582335917b0cc228264 ] + +RPC client pipefs dentries cleanup is in separated rpc_remove_pipedir() +workqueue,which takes care about pipefs superblock locking. +In some special scenarios, when kernel frees the pipefs sb of the +current client and immediately alloctes a new pipefs sb, +rpc_remove_pipedir function would misjudge the existence of pipefs +sb which is not the one it used to hold. As a result, +the rpc_remove_pipedir would clean the released freed pipefs dentries. + +To fix this issue, rpc_remove_pipedir should check whether the +current pipefs sb is consistent with the original pipefs sb. + +This error can be catched by KASAN: +========================================================= +[ 250.497700] BUG: KASAN: slab-use-after-free in dget_parent+0x195/0x200 +[ 250.498315] Read of size 4 at addr ffff88800a2ab804 by task kworker/0:18/106503 +[ 250.500549] Workqueue: events rpc_free_client_work +[ 250.501001] Call Trace: +[ 250.502880] kasan_report+0xb6/0xf0 +[ 250.503209] ? dget_parent+0x195/0x200 +[ 250.503561] dget_parent+0x195/0x200 +[ 250.503897] ? __pfx_rpc_clntdir_depopulate+0x10/0x10 +[ 250.504384] rpc_rmdir_depopulate+0x1b/0x90 +[ 250.504781] rpc_remove_client_dir+0xf5/0x150 +[ 250.505195] rpc_free_client_work+0xe4/0x230 +[ 250.505598] process_one_work+0x8ee/0x13b0 +... +[ 22.039056] Allocated by task 244: +[ 22.039390] kasan_save_stack+0x22/0x50 +[ 22.039758] kasan_set_track+0x25/0x30 +[ 22.040109] __kasan_slab_alloc+0x59/0x70 +[ 22.040487] kmem_cache_alloc_lru+0xf0/0x240 +[ 22.040889] __d_alloc+0x31/0x8e0 +[ 22.041207] d_alloc+0x44/0x1f0 +[ 22.041514] __rpc_lookup_create_exclusive+0x11c/0x140 +[ 22.041987] rpc_mkdir_populate.constprop.0+0x5f/0x110 +[ 22.042459] rpc_create_client_dir+0x34/0x150 +[ 22.042874] rpc_setup_pipedir_sb+0x102/0x1c0 +[ 22.043284] rpc_client_register+0x136/0x4e0 +[ 22.043689] rpc_new_client+0x911/0x1020 +[ 22.044057] rpc_create_xprt+0xcb/0x370 +[ 22.044417] rpc_create+0x36b/0x6c0 +... +[ 22.049524] Freed by task 0: +[ 22.049803] kasan_save_stack+0x22/0x50 +[ 22.050165] kasan_set_track+0x25/0x30 +[ 22.050520] kasan_save_free_info+0x2b/0x50 +[ 22.050921] __kasan_slab_free+0x10e/0x1a0 +[ 22.051306] kmem_cache_free+0xa5/0x390 +[ 22.051667] rcu_core+0x62c/0x1930 +[ 22.051995] __do_softirq+0x165/0x52a +[ 22.052347] +[ 22.052503] Last potentially related work creation: +[ 22.052952] kasan_save_stack+0x22/0x50 +[ 22.053313] __kasan_record_aux_stack+0x8e/0xa0 +[ 22.053739] __call_rcu_common.constprop.0+0x6b/0x8b0 +[ 22.054209] dentry_free+0xb2/0x140 +[ 22.054540] __dentry_kill+0x3be/0x540 +[ 22.054900] shrink_dentry_list+0x199/0x510 +[ 22.055293] shrink_dcache_parent+0x190/0x240 +[ 22.055703] do_one_tree+0x11/0x40 +[ 22.056028] shrink_dcache_for_umount+0x61/0x140 +[ 22.056461] generic_shutdown_super+0x70/0x590 +[ 22.056879] kill_anon_super+0x3a/0x60 +[ 22.057234] rpc_kill_sb+0x121/0x200 + +Fixes: 0157d021d23a ("SUNRPC: handle RPC client pipefs dentries by network namespace aware routines") +Signed-off-by: felix +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + include/linux/sunrpc/clnt.h | 1 + + net/sunrpc/clnt.c | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h +index 770ef2cb57752..c794b0ce4e782 100644 +--- a/include/linux/sunrpc/clnt.h ++++ b/include/linux/sunrpc/clnt.h +@@ -84,6 +84,7 @@ struct rpc_clnt { + }; + const struct cred *cl_cred; + unsigned int cl_max_connect; /* max number of transports not to the same IP */ ++ struct super_block *pipefs_sb; + }; + + /* +diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c +index f0bbd6cb4e39b..61e5c77462e94 100644 +--- a/net/sunrpc/clnt.c ++++ b/net/sunrpc/clnt.c +@@ -111,7 +111,8 @@ static void rpc_clnt_remove_pipedir(struct rpc_clnt *clnt) + + pipefs_sb = rpc_get_sb_net(net); + if (pipefs_sb) { +- __rpc_clnt_remove_pipedir(clnt); ++ if (pipefs_sb == clnt->pipefs_sb) ++ __rpc_clnt_remove_pipedir(clnt); + rpc_put_sb_net(net); + } + } +@@ -151,6 +152,8 @@ rpc_setup_pipedir(struct super_block *pipefs_sb, struct rpc_clnt *clnt) + { + struct dentry *dentry; + ++ clnt->pipefs_sb = pipefs_sb; ++ + if (clnt->cl_program->pipe_dir_name != NULL) { + dentry = rpc_setup_pipedir_sb(pipefs_sb, clnt); + if (IS_ERR(dentry)) +-- +2.42.0 + diff --git a/queue-6.1/thunderbolt-apply-usb-3.x-bandwidth-quirk-only-in-so.patch b/queue-6.1/thunderbolt-apply-usb-3.x-bandwidth-quirk-only-in-so.patch new file mode 100644 index 00000000000..7420350cb5a --- /dev/null +++ b/queue-6.1/thunderbolt-apply-usb-3.x-bandwidth-quirk-only-in-so.patch @@ -0,0 +1,36 @@ +From 4858df45c4d80705d4854c814804bd7bc7f7bc80 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Aug 2023 10:10:35 +0300 +Subject: thunderbolt: Apply USB 3.x bandwidth quirk only in software + connection manager + +From: Mika Westerberg + +[ Upstream commit 0c35ac18256942e66d8dab6ca049185812e60c69 ] + +This is not needed when firmware connection manager is run so limit this +to software connection manager. + +Signed-off-by: Mika Westerberg +Signed-off-by: Sasha Levin +--- + drivers/thunderbolt/quirks.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/thunderbolt/quirks.c b/drivers/thunderbolt/quirks.c +index 8c2ee431fcde8..4ab3803e10c83 100644 +--- a/drivers/thunderbolt/quirks.c ++++ b/drivers/thunderbolt/quirks.c +@@ -30,6 +30,9 @@ static void quirk_usb3_maximum_bandwidth(struct tb_switch *sw) + { + struct tb_port *port; + ++ if (tb_switch_is_icm(sw)) ++ return; ++ + tb_switch_for_each_port(sw, port) { + if (!tb_port_is_usb3_down(port)) + continue; +-- +2.42.0 + diff --git a/queue-6.1/tipc-fix-kernel-infoleak-due-to-uninitialized-tlv-va.patch b/queue-6.1/tipc-fix-kernel-infoleak-due-to-uninitialized-tlv-va.patch new file mode 100644 index 00000000000..84360721b8f --- /dev/null +++ b/queue-6.1/tipc-fix-kernel-infoleak-due-to-uninitialized-tlv-va.patch @@ -0,0 +1,113 @@ +From d659109ec54aa2d3624882f1d7017a7f431e1fa4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 11 Nov 2023 01:39:47 +0900 +Subject: tipc: Fix kernel-infoleak due to uninitialized TLV value + +From: Shigeru Yoshida + +[ Upstream commit fb317eb23b5ee4c37b0656a9a52a3db58d9dd072 ] + +KMSAN reported the following kernel-infoleak issue: + +===================================================== +BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline] +BUG: KMSAN: kernel-infoleak in copy_to_user_iter lib/iov_iter.c:24 [inline] +BUG: KMSAN: kernel-infoleak in iterate_ubuf include/linux/iov_iter.h:29 [inline] +BUG: KMSAN: kernel-infoleak in iterate_and_advance2 include/linux/iov_iter.h:245 [inline] +BUG: KMSAN: kernel-infoleak in iterate_and_advance include/linux/iov_iter.h:271 [inline] +BUG: KMSAN: kernel-infoleak in _copy_to_iter+0x4ec/0x2bc0 lib/iov_iter.c:186 + instrument_copy_to_user include/linux/instrumented.h:114 [inline] + copy_to_user_iter lib/iov_iter.c:24 [inline] + iterate_ubuf include/linux/iov_iter.h:29 [inline] + iterate_and_advance2 include/linux/iov_iter.h:245 [inline] + iterate_and_advance include/linux/iov_iter.h:271 [inline] + _copy_to_iter+0x4ec/0x2bc0 lib/iov_iter.c:186 + copy_to_iter include/linux/uio.h:197 [inline] + simple_copy_to_iter net/core/datagram.c:532 [inline] + __skb_datagram_iter.5+0x148/0xe30 net/core/datagram.c:420 + skb_copy_datagram_iter+0x52/0x210 net/core/datagram.c:546 + skb_copy_datagram_msg include/linux/skbuff.h:3960 [inline] + netlink_recvmsg+0x43d/0x1630 net/netlink/af_netlink.c:1967 + sock_recvmsg_nosec net/socket.c:1044 [inline] + sock_recvmsg net/socket.c:1066 [inline] + __sys_recvfrom+0x476/0x860 net/socket.c:2246 + __do_sys_recvfrom net/socket.c:2264 [inline] + __se_sys_recvfrom net/socket.c:2260 [inline] + __x64_sys_recvfrom+0x130/0x200 net/socket.c:2260 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x44/0x110 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x63/0x6b + +Uninit was created at: + slab_post_alloc_hook+0x103/0x9e0 mm/slab.h:768 + slab_alloc_node mm/slub.c:3478 [inline] + kmem_cache_alloc_node+0x5f7/0xb50 mm/slub.c:3523 + kmalloc_reserve+0x13c/0x4a0 net/core/skbuff.c:560 + __alloc_skb+0x2fd/0x770 net/core/skbuff.c:651 + alloc_skb include/linux/skbuff.h:1286 [inline] + tipc_tlv_alloc net/tipc/netlink_compat.c:156 [inline] + tipc_get_err_tlv+0x90/0x5d0 net/tipc/netlink_compat.c:170 + tipc_nl_compat_recv+0x1042/0x15d0 net/tipc/netlink_compat.c:1324 + genl_family_rcv_msg_doit net/netlink/genetlink.c:972 [inline] + genl_family_rcv_msg net/netlink/genetlink.c:1052 [inline] + genl_rcv_msg+0x1220/0x12c0 net/netlink/genetlink.c:1067 + netlink_rcv_skb+0x4a4/0x6a0 net/netlink/af_netlink.c:2545 + genl_rcv+0x41/0x60 net/netlink/genetlink.c:1076 + netlink_unicast_kernel net/netlink/af_netlink.c:1342 [inline] + netlink_unicast+0xf4b/0x1230 net/netlink/af_netlink.c:1368 + netlink_sendmsg+0x1242/0x1420 net/netlink/af_netlink.c:1910 + sock_sendmsg_nosec net/socket.c:730 [inline] + __sock_sendmsg net/socket.c:745 [inline] + ____sys_sendmsg+0x997/0xd60 net/socket.c:2588 + ___sys_sendmsg+0x271/0x3b0 net/socket.c:2642 + __sys_sendmsg net/socket.c:2671 [inline] + __do_sys_sendmsg net/socket.c:2680 [inline] + __se_sys_sendmsg net/socket.c:2678 [inline] + __x64_sys_sendmsg+0x2fa/0x4a0 net/socket.c:2678 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x44/0x110 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x63/0x6b + +Bytes 34-35 of 36 are uninitialized +Memory access of size 36 starts at ffff88802d464a00 +Data copied to user address 00007ff55033c0a0 + +CPU: 0 PID: 30322 Comm: syz-executor.0 Not tainted 6.6.0-14500-g1c41041124bd #10 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-1.fc38 04/01/2014 +===================================================== + +tipc_add_tlv() puts TLV descriptor and value onto `skb`. This size is +calculated with TLV_SPACE() macro. It adds the size of struct tlv_desc and +the length of TLV value passed as an argument, and aligns the result to a +multiple of TLV_ALIGNTO, i.e., a multiple of 4 bytes. + +If the size of struct tlv_desc plus the length of TLV value is not aligned, +the current implementation leaves the remaining bytes uninitialized. This +is the cause of the above kernel-infoleak issue. + +This patch resolves this issue by clearing data up to an aligned size. + +Fixes: d0796d1ef63d ("tipc: convert legacy nl bearer dump to nl compat") +Signed-off-by: Shigeru Yoshida +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/tipc/netlink_compat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c +index dfea27a906f2f..9eb7cab6b2f60 100644 +--- a/net/tipc/netlink_compat.c ++++ b/net/tipc/netlink_compat.c +@@ -101,6 +101,7 @@ static int tipc_add_tlv(struct sk_buff *skb, u16 type, void *data, u16 len) + return -EMSGSIZE; + + skb_put(skb, TLV_SPACE(len)); ++ memset(tlv, 0, TLV_SPACE(len)); + tlv->tlv_type = htons(type); + tlv->tlv_len = htons(TLV_LENGTH(len)); + if (len && data) +-- +2.42.0 + diff --git a/queue-6.1/tools-power-turbostat-enable-the-c-state-pre-wake-pr.patch b/queue-6.1/tools-power-turbostat-enable-the-c-state-pre-wake-pr.patch new file mode 100644 index 00000000000..6f64c79896d --- /dev/null +++ b/queue-6.1/tools-power-turbostat-enable-the-c-state-pre-wake-pr.patch @@ -0,0 +1,36 @@ +From dad95fb969d5fc0cea228159efcfb30b80054bbf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Mar 2023 11:17:44 +0800 +Subject: tools/power/turbostat: Enable the C-state Pre-wake printing + +From: Chen Yu + +[ Upstream commit b61b7d8c4c22c4298a50ae5d0ee88facb85ce665 ] + +Currently the C-state Pre-wake will not be printed due to the +probe has not been invoked. Invoke the probe function accordingly. + +Fixes: aeb01e6d71ff ("tools/power turbostat: Print the C-state Pre-wake settings") +Signed-off-by: Chen Yu +Reviewed-by: Zhang Rui +Reviewed-by: Len Brown +Signed-off-by: Sasha Levin +--- + tools/power/x86/turbostat/turbostat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c +index 4651ecbdc936c..b113900d94879 100644 +--- a/tools/power/x86/turbostat/turbostat.c ++++ b/tools/power/x86/turbostat/turbostat.c +@@ -5790,6 +5790,7 @@ void process_cpuid() + rapl_probe(family, model); + perf_limit_reasons_probe(family, model); + automatic_cstate_conversion_probe(family, model); ++ prewake_cstate_probe(family, model); + + check_tcc_offset(model_orig); + +-- +2.42.0 + diff --git a/queue-6.1/tools-power-turbostat-fix-a-knl-bug.patch b/queue-6.1/tools-power-turbostat-fix-a-knl-bug.patch new file mode 100644 index 00000000000..34e31bab9aa --- /dev/null +++ b/queue-6.1/tools-power-turbostat-fix-a-knl-bug.patch @@ -0,0 +1,41 @@ +From 625a764c27cfe850c45e49092f8709715db13d3a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 25 Mar 2023 21:57:07 +0800 +Subject: tools/power/turbostat: Fix a knl bug + +From: Zhang Rui + +[ Upstream commit 137f01b3529d292a68d22e9681e2f903c768f790 ] + +MSR_KNL_CORE_C6_RESIDENCY should be evaluated only if +1. this is KNL platform +AND +2. need to get C6 residency or need to calculate C1 residency + +Fix the broken logic introduced by commit 1e9042b9c8d4 ("tools/power +turbostat: Fix CPU%C1 display value"). + +Fixes: 1e9042b9c8d4 ("tools/power turbostat: Fix CPU%C1 display value") +Signed-off-by: Zhang Rui +Reviewed-by: Len Brown +Signed-off-by: Sasha Levin +--- + tools/power/x86/turbostat/turbostat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c +index c61c6c704fbe6..4651ecbdc936c 100644 +--- a/tools/power/x86/turbostat/turbostat.c ++++ b/tools/power/x86/turbostat/turbostat.c +@@ -2180,7 +2180,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) + if ((DO_BIC(BIC_CPU_c6) || soft_c1_residency_display(BIC_CPU_c6)) && !do_knl_cstates) { + if (get_msr(cpu, MSR_CORE_C6_RESIDENCY, &c->c6)) + return -7; +- } else if (do_knl_cstates || soft_c1_residency_display(BIC_CPU_c6)) { ++ } else if (do_knl_cstates && soft_c1_residency_display(BIC_CPU_c6)) { + if (get_msr(cpu, MSR_KNL_CORE_C6_RESIDENCY, &c->c6)) + return -7; + } +-- +2.42.0 + diff --git a/queue-6.1/tsnep-fix-tsnep_request_irq-format-overflow-warning.patch b/queue-6.1/tsnep-fix-tsnep_request_irq-format-overflow-warning.patch new file mode 100644 index 00000000000..83e9146624e --- /dev/null +++ b/queue-6.1/tsnep-fix-tsnep_request_irq-format-overflow-warning.patch @@ -0,0 +1,80 @@ +From e7a7e3e1c3aafeb7056d967066410b27ff7e86b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Oct 2023 20:38:56 +0200 +Subject: tsnep: Fix tsnep_request_irq() format-overflow warning + +From: Gerhard Engleder + +[ Upstream commit 00e984cb986b31e9313745e51daceaa1e1eb7351 ] + +Compiler warns about a possible format-overflow in tsnep_request_irq(): +drivers/net/ethernet/engleder/tsnep_main.c:884:55: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=] + sprintf(queue->name, "%s-rx-%d", name, + ^ +drivers/net/ethernet/engleder/tsnep_main.c:881:55: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=] + sprintf(queue->name, "%s-tx-%d", name, + ^ +drivers/net/ethernet/engleder/tsnep_main.c:878:49: warning: '-txrx-' directive writing 6 bytes into a region of size between 5 and 25 [-Wformat-overflow=] + sprintf(queue->name, "%s-txrx-%d", name, + ^~~~~~ + +Actually overflow cannot happen. Name is limited to IFNAMSIZ, because +netdev_name() is called during ndo_open(). queue_index is single char, +because less than 10 queues are supported. + +Fix warning with snprintf(). Additionally increase buffer to 32 bytes, +because those 7 additional bytes were unused anyway. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202310182028.vmDthIUa-lkp@intel.com/ +Signed-off-by: Gerhard Engleder +Reviewed-by: Jacob Keller +Link: https://lore.kernel.org/r/20231023183856.58373-1-gerhard@engleder-embedded.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/engleder/tsnep.h | 2 +- + drivers/net/ethernet/engleder/tsnep_main.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/ethernet/engleder/tsnep.h b/drivers/net/ethernet/engleder/tsnep.h +index 09a723b827c77..0a0d3d7ba63b3 100644 +--- a/drivers/net/ethernet/engleder/tsnep.h ++++ b/drivers/net/ethernet/engleder/tsnep.h +@@ -123,7 +123,7 @@ struct tsnep_rx { + + struct tsnep_queue { + struct tsnep_adapter *adapter; +- char name[IFNAMSIZ + 9]; ++ char name[IFNAMSIZ + 16]; + + struct tsnep_tx *tx; + struct tsnep_rx *rx; +diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c +index 2be518db04270..c86dfbce787f1 100644 +--- a/drivers/net/ethernet/engleder/tsnep_main.c ++++ b/drivers/net/ethernet/engleder/tsnep_main.c +@@ -973,14 +973,14 @@ static int tsnep_request_irq(struct tsnep_queue *queue, bool first) + dev = queue->adapter; + } else { + if (queue->tx && queue->rx) +- sprintf(queue->name, "%s-txrx-%d", name, +- queue->rx->queue_index); ++ snprintf(queue->name, sizeof(queue->name), "%s-txrx-%d", ++ name, queue->rx->queue_index); + else if (queue->tx) +- sprintf(queue->name, "%s-tx-%d", name, +- queue->tx->queue_index); ++ snprintf(queue->name, sizeof(queue->name), "%s-tx-%d", ++ name, queue->tx->queue_index); + else +- sprintf(queue->name, "%s-rx-%d", name, +- queue->rx->queue_index); ++ snprintf(queue->name, sizeof(queue->name), "%s-rx-%d", ++ name, queue->rx->queue_index); + handler = tsnep_irq_txrx; + dev = queue; + } +-- +2.42.0 + diff --git a/queue-6.1/tty-fix-uninit-value-access-in-ppp_sync_receive.patch b/queue-6.1/tty-fix-uninit-value-access-in-ppp_sync_receive.patch new file mode 100644 index 00000000000..2ae7e54c4bc --- /dev/null +++ b/queue-6.1/tty-fix-uninit-value-access-in-ppp_sync_receive.patch @@ -0,0 +1,82 @@ +From d852c5511747045cfcb75f68b35eeff154d98cc3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Nov 2023 00:44:20 +0900 +Subject: tty: Fix uninit-value access in ppp_sync_receive() + +From: Shigeru Yoshida + +[ Upstream commit 719639853d88071dfdfd8d9971eca9c283ff314c ] + +KMSAN reported the following uninit-value access issue: + +===================================================== +BUG: KMSAN: uninit-value in ppp_sync_input drivers/net/ppp/ppp_synctty.c:690 [inline] +BUG: KMSAN: uninit-value in ppp_sync_receive+0xdc9/0xe70 drivers/net/ppp/ppp_synctty.c:334 + ppp_sync_input drivers/net/ppp/ppp_synctty.c:690 [inline] + ppp_sync_receive+0xdc9/0xe70 drivers/net/ppp/ppp_synctty.c:334 + tiocsti+0x328/0x450 drivers/tty/tty_io.c:2295 + tty_ioctl+0x808/0x1920 drivers/tty/tty_io.c:2694 + vfs_ioctl fs/ioctl.c:51 [inline] + __do_sys_ioctl fs/ioctl.c:871 [inline] + __se_sys_ioctl+0x211/0x400 fs/ioctl.c:857 + __x64_sys_ioctl+0x97/0xe0 fs/ioctl.c:857 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x44/0x110 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x63/0x6b + +Uninit was created at: + __alloc_pages+0x75d/0xe80 mm/page_alloc.c:4591 + __alloc_pages_node include/linux/gfp.h:238 [inline] + alloc_pages_node include/linux/gfp.h:261 [inline] + __page_frag_cache_refill+0x9a/0x2c0 mm/page_alloc.c:4691 + page_frag_alloc_align+0x91/0x5d0 mm/page_alloc.c:4722 + page_frag_alloc include/linux/gfp.h:322 [inline] + __netdev_alloc_skb+0x215/0x6d0 net/core/skbuff.c:728 + netdev_alloc_skb include/linux/skbuff.h:3225 [inline] + dev_alloc_skb include/linux/skbuff.h:3238 [inline] + ppp_sync_input drivers/net/ppp/ppp_synctty.c:669 [inline] + ppp_sync_receive+0x237/0xe70 drivers/net/ppp/ppp_synctty.c:334 + tiocsti+0x328/0x450 drivers/tty/tty_io.c:2295 + tty_ioctl+0x808/0x1920 drivers/tty/tty_io.c:2694 + vfs_ioctl fs/ioctl.c:51 [inline] + __do_sys_ioctl fs/ioctl.c:871 [inline] + __se_sys_ioctl+0x211/0x400 fs/ioctl.c:857 + __x64_sys_ioctl+0x97/0xe0 fs/ioctl.c:857 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x44/0x110 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x63/0x6b + +CPU: 0 PID: 12950 Comm: syz-executor.1 Not tainted 6.6.0-14500-g1c41041124bd #10 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-1.fc38 04/01/2014 +===================================================== + +ppp_sync_input() checks the first 2 bytes of the data are PPP_ALLSTATIONS +and PPP_UI. However, if the data length is 1 and the first byte is +PPP_ALLSTATIONS, an access to an uninitialized value occurs when checking +PPP_UI. This patch resolves this issue by checking the data length. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Shigeru Yoshida +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ppp/ppp_synctty.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c +index 18283b7b94bcd..1ac231408398a 100644 +--- a/drivers/net/ppp/ppp_synctty.c ++++ b/drivers/net/ppp/ppp_synctty.c +@@ -697,7 +697,7 @@ ppp_sync_input(struct syncppp *ap, const unsigned char *buf, + + /* strip address/control field if present */ + p = skb->data; +- if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { ++ if (skb->len >= 2 && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { + /* chop off address/control */ + if (skb->len < 3) + goto err; +-- +2.42.0 + diff --git a/queue-6.1/tty-vcc-add-check-for-kstrdup-in-vcc_probe.patch b/queue-6.1/tty-vcc-add-check-for-kstrdup-in-vcc_probe.patch new file mode 100644 index 00000000000..abcf2da9cca --- /dev/null +++ b/queue-6.1/tty-vcc-add-check-for-kstrdup-in-vcc_probe.patch @@ -0,0 +1,76 @@ +From 996fdf286cfb8e10bd09902ba85764b3eabe7dd6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Sep 2023 11:52:20 +0800 +Subject: tty: vcc: Add check for kstrdup() in vcc_probe() + +From: Yi Yang + +[ Upstream commit d81ffb87aaa75f842cd7aa57091810353755b3e6 ] + +Add check for the return value of kstrdup() and return the error, if it +fails in order to avoid NULL pointer dereference. + +Signed-off-by: Yi Yang +Reviewed-by: Jiri Slaby +Link: https://lore.kernel.org/r/20230904035220.48164-1-yiyang13@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/vcc.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c +index 34ba6e54789a7..b8b832c75b856 100644 +--- a/drivers/tty/vcc.c ++++ b/drivers/tty/vcc.c +@@ -579,18 +579,22 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) + return -ENOMEM; + + name = kstrdup(dev_name(&vdev->dev), GFP_KERNEL); ++ if (!name) { ++ rv = -ENOMEM; ++ goto free_port; ++ } + + rv = vio_driver_init(&port->vio, vdev, VDEV_CONSOLE_CON, vcc_versions, + ARRAY_SIZE(vcc_versions), NULL, name); + if (rv) +- goto free_port; ++ goto free_name; + + port->vio.debug = vcc_dbg_vio; + vcc_ldc_cfg.debug = vcc_dbg_ldc; + + rv = vio_ldc_alloc(&port->vio, &vcc_ldc_cfg, port); + if (rv) +- goto free_port; ++ goto free_name; + + spin_lock_init(&port->lock); + +@@ -624,6 +628,11 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) + goto unreg_tty; + } + port->domain = kstrdup(domain, GFP_KERNEL); ++ if (!port->domain) { ++ rv = -ENOMEM; ++ goto unreg_tty; ++ } ++ + + mdesc_release(hp); + +@@ -653,8 +662,9 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) + vcc_table_remove(port->index); + free_ldc: + vio_ldc_free(&port->vio); +-free_port: ++free_name: + kfree(name); ++free_port: + kfree(port); + + return rv; +-- +2.42.0 + diff --git a/queue-6.1/usb-dwc3-core-configure-tx-rx-threshold-for-dwc3_ip.patch b/queue-6.1/usb-dwc3-core-configure-tx-rx-threshold-for-dwc3_ip.patch new file mode 100644 index 00000000000..a9524ad12aa --- /dev/null +++ b/queue-6.1/usb-dwc3-core-configure-tx-rx-threshold-for-dwc3_ip.patch @@ -0,0 +1,268 @@ +From 59da04bb5c9aaed364a5baa5996c029fac432b08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 12:19:02 +0800 +Subject: usb: dwc3: core: configure TX/RX threshold for DWC3_IP + +From: Stanley Chang + +[ Upstream commit e72fc8d6a12af7ae8dd1b52cf68ed68569d29f80 ] + +In Synopsys's dwc3 data book: +To avoid underrun and overrun during the burst, in a high-latency bus +system (like USB), threshold and burst size control is provided through +GTXTHRCFG and GRXTHRCFG registers. + +In Realtek DHC SoC, DWC3 USB 3.0 uses AHB system bus. When dwc3 is +connected with USB 2.5G Ethernet, there will be overrun problem. +Therefore, setting TX/RX thresholds can avoid this issue. + +Signed-off-by: Stanley Chang +Acked-by: Thinh Nguyen +Link: https://lore.kernel.org/r/20230912041904.30721-1-stanley_chang@realtek.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/core.c | 160 +++++++++++++++++++++++++++++++--------- + drivers/usb/dwc3/core.h | 13 ++++ + 2 files changed, 137 insertions(+), 36 deletions(-) + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index 57e2f4cc744f7..a811db88eedae 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -1111,6 +1111,111 @@ static void dwc3_set_power_down_clk_scale(struct dwc3 *dwc) + } + } + ++static void dwc3_config_threshold(struct dwc3 *dwc) ++{ ++ u32 reg; ++ u8 rx_thr_num; ++ u8 rx_maxburst; ++ u8 tx_thr_num; ++ u8 tx_maxburst; ++ ++ /* ++ * Must config both number of packets and max burst settings to enable ++ * RX and/or TX threshold. ++ */ ++ if (!DWC3_IP_IS(DWC3) && dwc->dr_mode == USB_DR_MODE_HOST) { ++ rx_thr_num = dwc->rx_thr_num_pkt_prd; ++ rx_maxburst = dwc->rx_max_burst_prd; ++ tx_thr_num = dwc->tx_thr_num_pkt_prd; ++ tx_maxburst = dwc->tx_max_burst_prd; ++ ++ if (rx_thr_num && rx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); ++ reg |= DWC31_RXTHRNUMPKTSEL_PRD; ++ ++ reg &= ~DWC31_RXTHRNUMPKT_PRD(~0); ++ reg |= DWC31_RXTHRNUMPKT_PRD(rx_thr_num); ++ ++ reg &= ~DWC31_MAXRXBURSTSIZE_PRD(~0); ++ reg |= DWC31_MAXRXBURSTSIZE_PRD(rx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); ++ } ++ ++ if (tx_thr_num && tx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); ++ reg |= DWC31_TXTHRNUMPKTSEL_PRD; ++ ++ reg &= ~DWC31_TXTHRNUMPKT_PRD(~0); ++ reg |= DWC31_TXTHRNUMPKT_PRD(tx_thr_num); ++ ++ reg &= ~DWC31_MAXTXBURSTSIZE_PRD(~0); ++ reg |= DWC31_MAXTXBURSTSIZE_PRD(tx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); ++ } ++ } ++ ++ rx_thr_num = dwc->rx_thr_num_pkt; ++ rx_maxburst = dwc->rx_max_burst; ++ tx_thr_num = dwc->tx_thr_num_pkt; ++ tx_maxburst = dwc->tx_max_burst; ++ ++ if (DWC3_IP_IS(DWC3)) { ++ if (rx_thr_num && rx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); ++ reg |= DWC3_GRXTHRCFG_PKTCNTSEL; ++ ++ reg &= ~DWC3_GRXTHRCFG_RXPKTCNT(~0); ++ reg |= DWC3_GRXTHRCFG_RXPKTCNT(rx_thr_num); ++ ++ reg &= ~DWC3_GRXTHRCFG_MAXRXBURSTSIZE(~0); ++ reg |= DWC3_GRXTHRCFG_MAXRXBURSTSIZE(rx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); ++ } ++ ++ if (tx_thr_num && tx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); ++ reg |= DWC3_GTXTHRCFG_PKTCNTSEL; ++ ++ reg &= ~DWC3_GTXTHRCFG_TXPKTCNT(~0); ++ reg |= DWC3_GTXTHRCFG_TXPKTCNT(tx_thr_num); ++ ++ reg &= ~DWC3_GTXTHRCFG_MAXTXBURSTSIZE(~0); ++ reg |= DWC3_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); ++ } ++ } else { ++ if (rx_thr_num && rx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); ++ reg |= DWC31_GRXTHRCFG_PKTCNTSEL; ++ ++ reg &= ~DWC31_GRXTHRCFG_RXPKTCNT(~0); ++ reg |= DWC31_GRXTHRCFG_RXPKTCNT(rx_thr_num); ++ ++ reg &= ~DWC31_GRXTHRCFG_MAXRXBURSTSIZE(~0); ++ reg |= DWC31_GRXTHRCFG_MAXRXBURSTSIZE(rx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); ++ } ++ ++ if (tx_thr_num && tx_maxburst) { ++ reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); ++ reg |= DWC31_GTXTHRCFG_PKTCNTSEL; ++ ++ reg &= ~DWC31_GTXTHRCFG_TXPKTCNT(~0); ++ reg |= DWC31_GTXTHRCFG_TXPKTCNT(tx_thr_num); ++ ++ reg &= ~DWC31_GTXTHRCFG_MAXTXBURSTSIZE(~0); ++ reg |= DWC31_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst); ++ ++ dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); ++ } ++ } ++} ++ + /** + * dwc3_core_init - Low-level initialization of DWC3 Core + * @dwc: Pointer to our controller context structure +@@ -1278,42 +1383,7 @@ static int dwc3_core_init(struct dwc3 *dwc) + dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); + } + +- /* +- * Must config both number of packets and max burst settings to enable +- * RX and/or TX threshold. +- */ +- if (!DWC3_IP_IS(DWC3) && dwc->dr_mode == USB_DR_MODE_HOST) { +- u8 rx_thr_num = dwc->rx_thr_num_pkt_prd; +- u8 rx_maxburst = dwc->rx_max_burst_prd; +- u8 tx_thr_num = dwc->tx_thr_num_pkt_prd; +- u8 tx_maxburst = dwc->tx_max_burst_prd; +- +- if (rx_thr_num && rx_maxburst) { +- reg = dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); +- reg |= DWC31_RXTHRNUMPKTSEL_PRD; +- +- reg &= ~DWC31_RXTHRNUMPKT_PRD(~0); +- reg |= DWC31_RXTHRNUMPKT_PRD(rx_thr_num); +- +- reg &= ~DWC31_MAXRXBURSTSIZE_PRD(~0); +- reg |= DWC31_MAXRXBURSTSIZE_PRD(rx_maxburst); +- +- dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); +- } +- +- if (tx_thr_num && tx_maxburst) { +- reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); +- reg |= DWC31_TXTHRNUMPKTSEL_PRD; +- +- reg &= ~DWC31_TXTHRNUMPKT_PRD(~0); +- reg |= DWC31_TXTHRNUMPKT_PRD(tx_thr_num); +- +- reg &= ~DWC31_MAXTXBURSTSIZE_PRD(~0); +- reg |= DWC31_MAXTXBURSTSIZE_PRD(tx_maxburst); +- +- dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); +- } +- } ++ dwc3_config_threshold(dwc); + + return 0; + +@@ -1462,6 +1532,10 @@ static void dwc3_get_properties(struct dwc3 *dwc) + u8 lpm_nyet_threshold; + u8 tx_de_emphasis; + u8 hird_threshold; ++ u8 rx_thr_num_pkt = 0; ++ u8 rx_max_burst = 0; ++ u8 tx_thr_num_pkt = 0; ++ u8 tx_max_burst = 0; + u8 rx_thr_num_pkt_prd = 0; + u8 rx_max_burst_prd = 0; + u8 tx_thr_num_pkt_prd = 0; +@@ -1524,6 +1598,14 @@ static void dwc3_get_properties(struct dwc3 *dwc) + "snps,usb2-lpm-disable"); + dwc->usb2_gadget_lpm_disable = device_property_read_bool(dev, + "snps,usb2-gadget-lpm-disable"); ++ device_property_read_u8(dev, "snps,rx-thr-num-pkt", ++ &rx_thr_num_pkt); ++ device_property_read_u8(dev, "snps,rx-max-burst", ++ &rx_max_burst); ++ device_property_read_u8(dev, "snps,tx-thr-num-pkt", ++ &tx_thr_num_pkt); ++ device_property_read_u8(dev, "snps,tx-max-burst", ++ &tx_max_burst); + device_property_read_u8(dev, "snps,rx-thr-num-pkt-prd", + &rx_thr_num_pkt_prd); + device_property_read_u8(dev, "snps,rx-max-burst-prd", +@@ -1601,6 +1683,12 @@ static void dwc3_get_properties(struct dwc3 *dwc) + + dwc->hird_threshold = hird_threshold; + ++ dwc->rx_thr_num_pkt = rx_thr_num_pkt; ++ dwc->rx_max_burst = rx_max_burst; ++ ++ dwc->tx_thr_num_pkt = tx_thr_num_pkt; ++ dwc->tx_max_burst = tx_max_burst; ++ + dwc->rx_thr_num_pkt_prd = rx_thr_num_pkt_prd; + dwc->rx_max_burst_prd = rx_max_burst_prd; + +diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h +index 80cc532ba9d55..889c122dad457 100644 +--- a/drivers/usb/dwc3/core.h ++++ b/drivers/usb/dwc3/core.h +@@ -209,6 +209,11 @@ + #define DWC3_GRXTHRCFG_RXPKTCNT(n) (((n) & 0xf) << 24) + #define DWC3_GRXTHRCFG_PKTCNTSEL BIT(29) + ++/* Global TX Threshold Configuration Register */ ++#define DWC3_GTXTHRCFG_MAXTXBURSTSIZE(n) (((n) & 0xff) << 16) ++#define DWC3_GTXTHRCFG_TXPKTCNT(n) (((n) & 0xf) << 24) ++#define DWC3_GTXTHRCFG_PKTCNTSEL BIT(29) ++ + /* Global RX Threshold Configuration Register for DWC_usb31 only */ + #define DWC31_GRXTHRCFG_MAXRXBURSTSIZE(n) (((n) & 0x1f) << 16) + #define DWC31_GRXTHRCFG_RXPKTCNT(n) (((n) & 0x1f) << 21) +@@ -1041,6 +1046,10 @@ struct dwc3_scratchpad_array { + * @test_mode_nr: test feature selector + * @lpm_nyet_threshold: LPM NYET response threshold + * @hird_threshold: HIRD threshold ++ * @rx_thr_num_pkt: USB receive packet count ++ * @rx_max_burst: max USB receive burst size ++ * @tx_thr_num_pkt: USB transmit packet count ++ * @tx_max_burst: max USB transmit burst size + * @rx_thr_num_pkt_prd: periodic ESS receive packet count + * @rx_max_burst_prd: max periodic ESS receive burst size + * @tx_thr_num_pkt_prd: periodic ESS transmit packet count +@@ -1268,6 +1277,10 @@ struct dwc3 { + u8 test_mode_nr; + u8 lpm_nyet_threshold; + u8 hird_threshold; ++ u8 rx_thr_num_pkt; ++ u8 rx_max_burst; ++ u8 tx_thr_num_pkt; ++ u8 tx_max_burst; + u8 rx_thr_num_pkt_prd; + u8 rx_max_burst_prd; + u8 tx_thr_num_pkt_prd; +-- +2.42.0 + diff --git a/queue-6.1/usb-gadget-f_ncm-always-set-current-gadget-in-ncm_bi.patch b/queue-6.1/usb-gadget-f_ncm-always-set-current-gadget-in-ncm_bi.patch new file mode 100644 index 00000000000..64a226fa857 --- /dev/null +++ b/queue-6.1/usb-gadget-f_ncm-always-set-current-gadget-in-ncm_bi.patch @@ -0,0 +1,137 @@ +From c52ed0240af7fe66326ecd426c2687345b998dae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Oct 2023 17:33:24 +0200 +Subject: usb: gadget: f_ncm: Always set current gadget in ncm_bind() + +From: Hardik Gajjar + +[ Upstream commit a04224da1f3424b2c607b12a3bd1f0e302fb8231 ] + +Previously, gadget assignment to the net device occurred exclusively +during the initial binding attempt. + +Nevertheless, the gadget pointer could change during bind/unbind +cycles due to various conditions, including the unloading/loading +of the UDC device driver or the detachment/reconnection of an +OTG-capable USB hub device. + +This patch relocates the gether_set_gadget() function out from +ncm_opts->bound condition check, ensuring that the correct gadget +is assigned during each bind request. + +The provided logs demonstrate the consistency of ncm_opts throughout +the power cycle, while the gadget may change. + +* OTG hub connected during boot up and assignment of gadget and + ncm_opts pointer + +[ 2.366301] usb 2-1.5: New USB device found, idVendor=2996, idProduct=0105 +[ 2.366304] usb 2-1.5: New USB device strings: Mfr=1, Product=2, SerialNumber=3 +[ 2.366306] usb 2-1.5: Product: H2H Bridge +[ 2.366308] usb 2-1.5: Manufacturer: Aptiv +[ 2.366309] usb 2-1.5: SerialNumber: 13FEB2021 +[ 2.427989] usb 2-1.5: New USB device found, VID=2996, PID=0105 +[ 2.428959] dabridge 2-1.5:1.0: dabridge 2-4 total endpoints=5, 0000000093a8d681 +[ 2.429710] dabridge 2-1.5:1.0: P(0105) D(22.06.22) F(17.3.16) H(1.1) high-speed +[ 2.429714] dabridge 2-1.5:1.0: Hub 2-2 P(0151) V(06.87) +[ 2.429956] dabridge 2-1.5:1.0: All downstream ports in host mode + +[ 2.430093] gadget 000000003c414d59 ------> gadget pointer + +* NCM opts and associated gadget pointer during First ncm_bind + +[ 34.763929] NCM opts 00000000aa304ac9 +[ 34.763930] NCM gadget 000000003c414d59 + +* OTG capable hub disconnecte or assume driver unload. + +[ 97.203114] usb 2-1: USB disconnect, device number 2 +[ 97.203118] usb 2-1.1: USB disconnect, device number 3 +[ 97.209217] usb 2-1.5: USB disconnect, device number 4 +[ 97.230990] dabr_udc deleted + +* Reconnect the OTG hub or load driver assaign new gadget pointer. + +[ 111.534035] usb 2-1.1: New USB device found, idVendor=2996, idProduct=0120, bcdDevice= 6.87 +[ 111.534038] usb 2-1.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 +[ 111.534040] usb 2-1.1: Product: Vendor +[ 111.534041] usb 2-1.1: Manufacturer: Aptiv +[ 111.534042] usb 2-1.1: SerialNumber: Superior +[ 111.535175] usb 2-1.1: New USB device found, VID=2996, PID=0120 +[ 111.610995] usb 2-1.5: new high-speed USB device number 8 using xhci-hcd +[ 111.630052] usb 2-1.5: New USB device found, idVendor=2996, idProduct=0105, bcdDevice=21.02 +[ 111.630055] usb 2-1.5: New USB device strings: Mfr=1, Product=2, SerialNumber=3 +[ 111.630057] usb 2-1.5: Product: H2H Bridge +[ 111.630058] usb 2-1.5: Manufacturer: Aptiv +[ 111.630059] usb 2-1.5: SerialNumber: 13FEB2021 +[ 111.687464] usb 2-1.5: New USB device found, VID=2996, PID=0105 +[ 111.690375] dabridge 2-1.5:1.0: dabridge 2-8 total endpoints=5, 000000000d87c961 +[ 111.691172] dabridge 2-1.5:1.0: P(0105) D(22.06.22) F(17.3.16) H(1.1) high-speed +[ 111.691176] dabridge 2-1.5:1.0: Hub 2-6 P(0151) V(06.87) +[ 111.691646] dabridge 2-1.5:1.0: All downstream ports in host mode + +[ 111.692298] gadget 00000000dc72f7a9 --------> new gadget ptr on connect + +* NCM opts and associated gadget pointer during second ncm_bind + +[ 113.271786] NCM opts 00000000aa304ac9 -----> same opts ptr used during first bind +[ 113.271788] NCM gadget 00000000dc72f7a9 ----> however new gaget ptr, that will not set + in net_device due to ncm_opts->bound = true + +Signed-off-by: Hardik Gajjar +Link: https://lore.kernel.org/r/20231020153324.82794-1-hgajjar@de.adit-jv.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_ncm.c | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c +index faf90a2174194..bbb6ff6b11aa1 100644 +--- a/drivers/usb/gadget/function/f_ncm.c ++++ b/drivers/usb/gadget/function/f_ncm.c +@@ -1425,7 +1425,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) + struct usb_composite_dev *cdev = c->cdev; + struct f_ncm *ncm = func_to_ncm(f); + struct usb_string *us; +- int status; ++ int status = 0; + struct usb_ep *ep; + struct f_ncm_opts *ncm_opts; + +@@ -1443,22 +1443,17 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) + f->os_desc_table[0].os_desc = &ncm_opts->ncm_os_desc; + } + +- /* +- * in drivers/usb/gadget/configfs.c:configfs_composite_bind() +- * configurations are bound in sequence with list_for_each_entry, +- * in each configuration its functions are bound in sequence +- * with list_for_each_entry, so we assume no race condition +- * with regard to ncm_opts->bound access +- */ +- if (!ncm_opts->bound) { +- mutex_lock(&ncm_opts->lock); +- gether_set_gadget(ncm_opts->net, cdev->gadget); ++ mutex_lock(&ncm_opts->lock); ++ gether_set_gadget(ncm_opts->net, cdev->gadget); ++ if (!ncm_opts->bound) + status = gether_register_netdev(ncm_opts->net); +- mutex_unlock(&ncm_opts->lock); +- if (status) +- goto fail; +- ncm_opts->bound = true; +- } ++ mutex_unlock(&ncm_opts->lock); ++ ++ if (status) ++ goto fail; ++ ++ ncm_opts->bound = true; ++ + us = usb_gstrings_attach(cdev, ncm_strings, + ARRAY_SIZE(ncm_string_defs)); + if (IS_ERR(us)) { +-- +2.42.0 + diff --git a/queue-6.1/vhost-vdpa-fix-use-after-free-in-vhost_vdpa_probe.patch b/queue-6.1/vhost-vdpa-fix-use-after-free-in-vhost_vdpa_probe.patch new file mode 100644 index 00000000000..9c567321edc --- /dev/null +++ b/queue-6.1/vhost-vdpa-fix-use-after-free-in-vhost_vdpa_probe.patch @@ -0,0 +1,38 @@ +From 9535d1c74f4ba68aec8e28b8c45f8fb230a05283 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Oct 2023 15:12:54 +0300 +Subject: vhost-vdpa: fix use after free in vhost_vdpa_probe() + +From: Dan Carpenter + +[ Upstream commit e07754e0a1ea2d63fb29574253d1fd7405607343 ] + +The put_device() calls vhost_vdpa_release_dev() which calls +ida_simple_remove() and frees "v". So this call to +ida_simple_remove() is a use after free and a double free. + +Fixes: ebe6a354fa7e ("vhost-vdpa: Call ida_simple_remove() when failed") +Signed-off-by: Dan Carpenter +Message-Id: +Signed-off-by: Michael S. Tsirkin +Acked-by: Jason Wang +Signed-off-by: Sasha Levin +--- + drivers/vhost/vdpa.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c +index 31a156669a531..c8374527a27d9 100644 +--- a/drivers/vhost/vdpa.c ++++ b/drivers/vhost/vdpa.c +@@ -1427,7 +1427,6 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) + + err: + put_device(&v->dev); +- ida_simple_remove(&vhost_vdpa_ida, v->minor); + return r; + } + +-- +2.42.0 + diff --git a/queue-6.1/virtio-blk-fix-implicit-overflow-on-virtio_max_dma_s.patch b/queue-6.1/virtio-blk-fix-implicit-overflow-on-virtio_max_dma_s.patch new file mode 100644 index 00000000000..1c1375ad3c5 --- /dev/null +++ b/queue-6.1/virtio-blk-fix-implicit-overflow-on-virtio_max_dma_s.patch @@ -0,0 +1,49 @@ +From d8f9e5f13ad467377f03616d9545653e5bb9e6f3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Sep 2023 14:10:45 +0800 +Subject: virtio-blk: fix implicit overflow on virtio_max_dma_size + +From: zhenwei pi + +[ Upstream commit fafb51a67fb883eb2dde352539df939a251851be ] + +The following codes have an implicit conversion from size_t to u32: +(u32)max_size = (size_t)virtio_max_dma_size(vdev); + +This may lead overflow, Ex (size_t)4G -> (u32)0. Once +virtio_max_dma_size() has a larger size than U32_MAX, use U32_MAX +instead. + +Signed-off-by: zhenwei pi +Message-Id: <20230904061045.510460-1-pizhenwei@bytedance.com> +Signed-off-by: Michael S. Tsirkin +Signed-off-by: Sasha Levin +--- + drivers/block/virtio_blk.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c +index a7697027ce43b..efa5535a8e1d8 100644 +--- a/drivers/block/virtio_blk.c ++++ b/drivers/block/virtio_blk.c +@@ -900,6 +900,7 @@ static int virtblk_probe(struct virtio_device *vdev) + u16 min_io_size; + u8 physical_block_exp, alignment_offset; + unsigned int queue_depth; ++ size_t max_dma_size; + + if (!vdev->config->get) { + dev_err(&vdev->dev, "%s failure: config access disabled\n", +@@ -998,7 +999,8 @@ static int virtblk_probe(struct virtio_device *vdev) + /* No real sector limit. */ + blk_queue_max_hw_sectors(q, -1U); + +- max_size = virtio_max_dma_size(vdev); ++ max_dma_size = virtio_max_dma_size(vdev); ++ max_size = max_dma_size > U32_MAX ? U32_MAX : max_dma_size; + + /* Host can optionally specify maximum segment size and number of + * segments. */ +-- +2.42.0 + diff --git a/queue-6.1/vsock-read-from-socket-s-error-queue.patch b/queue-6.1/vsock-read-from-socket-s-error-queue.patch new file mode 100644 index 00000000000..9513e9bb305 --- /dev/null +++ b/queue-6.1/vsock-read-from-socket-s-error-queue.patch @@ -0,0 +1,97 @@ +From 0055e6e171f97d45b3db789991a7fd425c819417 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Oct 2023 22:15:14 +0300 +Subject: vsock: read from socket's error queue + +From: Arseniy Krasnov + +[ Upstream commit 49dbe25adac42d3e06f65d1420946bec65896222 ] + +This adds handling of MSG_ERRQUEUE input flag in receive call. This flag +is used to read socket's error queue instead of data queue. Possible +scenario of error queue usage is receiving completions for transmission +with MSG_ZEROCOPY flag. This patch also adds new defines: 'SOL_VSOCK' +and 'VSOCK_RECVERR'. + +Signed-off-by: Arseniy Krasnov +Reviewed-by: Stefano Garzarella +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/linux/socket.h | 1 + + include/uapi/linux/vm_sockets.h | 17 +++++++++++++++++ + net/vmw_vsock/af_vsock.c | 6 ++++++ + 3 files changed, 24 insertions(+) + +diff --git a/include/linux/socket.h b/include/linux/socket.h +index de3701a2a2129..1db29aab8f9c3 100644 +--- a/include/linux/socket.h ++++ b/include/linux/socket.h +@@ -376,6 +376,7 @@ struct ucred { + #define SOL_MPTCP 284 + #define SOL_MCTP 285 + #define SOL_SMC 286 ++#define SOL_VSOCK 287 + + /* IPX options */ + #define IPX_TYPE 1 +diff --git a/include/uapi/linux/vm_sockets.h b/include/uapi/linux/vm_sockets.h +index c60ca33eac594..ed07181d4eff9 100644 +--- a/include/uapi/linux/vm_sockets.h ++++ b/include/uapi/linux/vm_sockets.h +@@ -191,4 +191,21 @@ struct sockaddr_vm { + + #define IOCTL_VM_SOCKETS_GET_LOCAL_CID _IO(7, 0xb9) + ++/* MSG_ZEROCOPY notifications are encoded in the standard error format, ++ * sock_extended_err. See Documentation/networking/msg_zerocopy.rst in ++ * kernel source tree for more details. ++ */ ++ ++/* 'cmsg_level' field value of 'struct cmsghdr' for notification parsing ++ * when MSG_ZEROCOPY flag is used on transmissions. ++ */ ++ ++#define SOL_VSOCK 287 ++ ++/* 'cmsg_type' field value of 'struct cmsghdr' for notification parsing ++ * when MSG_ZEROCOPY flag is used on transmissions. ++ */ ++ ++#define VSOCK_RECVERR 1 ++ + #endif /* _UAPI_VM_SOCKETS_H */ +diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c +index 8360c790a8a01..84471745c0829 100644 +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -89,6 +89,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -110,6 +111,7 @@ + #include + #include + #include ++#include + + static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); + static void vsock_sk_destruct(struct sock *sk); +@@ -2096,6 +2098,10 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, + int err; + + sk = sock->sk; ++ ++ if (unlikely(flags & MSG_ERRQUEUE)) ++ return sock_recv_errqueue(sk, msg, len, SOL_VSOCK, VSOCK_RECVERR); ++ + vsk = vsock_sk(sk); + err = 0; + +-- +2.42.0 + diff --git a/queue-6.1/wifi-ath10k-don-t-touch-the-ce-interrupt-registers-a.patch b/queue-6.1/wifi-ath10k-don-t-touch-the-ce-interrupt-registers-a.patch new file mode 100644 index 00000000000..ed91ff81b0c --- /dev/null +++ b/queue-6.1/wifi-ath10k-don-t-touch-the-ce-interrupt-registers-a.patch @@ -0,0 +1,122 @@ +From 04e028674b7799172121400732e90baf1b7b0964 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Sep 2023 07:54:48 +0300 +Subject: wifi: ath10k: Don't touch the CE interrupt registers after power up + +From: Douglas Anderson + +[ Upstream commit 170c75d43a77dc937c58f07ecf847ba1b42ab74e ] + +As talked about in commit d66d24ac300c ("ath10k: Keep track of which +interrupts fired, don't poll them"), if we access the copy engine +register at a bad time then ath10k can go boom. However, it's not +necessarily easy to know when it's safe to access them. + +The ChromeOS test labs saw a crash that looked like this at +shutdown/reboot time (on a chromeos-5.15 kernel, but likely the +problem could also reproduce upstream): + +Internal error: synchronous external abort: 96000010 [#1] PREEMPT SMP +... +CPU: 4 PID: 6168 Comm: reboot Not tainted 5.15.111-lockdep-19350-g1d624fe6758f #1 010b9b233ab055c27c6dc88efb0be2f4e9e86f51 +Hardware name: Google Kingoftown (DT) +... +pc : ath10k_snoc_read32+0x50/0x74 [ath10k_snoc] +lr : ath10k_snoc_read32+0x24/0x74 [ath10k_snoc] +... +Call trace: +ath10k_snoc_read32+0x50/0x74 [ath10k_snoc ...] +ath10k_ce_disable_interrupt+0x190/0x65c [ath10k_core ...] +ath10k_ce_disable_interrupts+0x8c/0x120 [ath10k_core ...] +ath10k_snoc_hif_stop+0x78/0x660 [ath10k_snoc ...] +ath10k_core_stop+0x13c/0x1ec [ath10k_core ...] +ath10k_halt+0x398/0x5b0 [ath10k_core ...] +ath10k_stop+0xfc/0x1a8 [ath10k_core ...] +drv_stop+0x148/0x6b4 [mac80211 ...] +ieee80211_stop_device+0x70/0x80 [mac80211 ...] +ieee80211_do_stop+0x10d8/0x15b0 [mac80211 ...] +ieee80211_stop+0x144/0x1a0 [mac80211 ...] +__dev_close_many+0x1e8/0x2c0 +dev_close_many+0x198/0x33c +dev_close+0x140/0x210 +cfg80211_shutdown_all_interfaces+0xc8/0x1e0 [cfg80211 ...] +ieee80211_remove_interfaces+0x118/0x5c4 [mac80211 ...] +ieee80211_unregister_hw+0x64/0x1f4 [mac80211 ...] +ath10k_mac_unregister+0x4c/0xf0 [ath10k_core ...] +ath10k_core_unregister+0x80/0xb0 [ath10k_core ...] +ath10k_snoc_free_resources+0xb8/0x1ec [ath10k_snoc ...] +ath10k_snoc_shutdown+0x98/0xd0 [ath10k_snoc ...] +platform_shutdown+0x7c/0xa0 +device_shutdown+0x3e0/0x58c +kernel_restart_prepare+0x68/0xa0 +kernel_restart+0x28/0x7c + +Though there's no known way to reproduce the problem, it makes sense +that it would be the same issue where we're trying to access copy +engine registers when it's not allowed. + +Let's fix this by changing how we "disable" the interrupts. Instead of +tweaking the copy engine registers we'll just use disable_irq() and +enable_irq(). Then we'll configure the interrupts once at power up +time. + +Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.2.2.c10-00754-QCAHLSWMTPL-1 + +Signed-off-by: Douglas Anderson +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20230630151842.1.If764ede23c4e09a43a842771c2ddf99608f25f8e@changeid +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/snoc.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c +index cfcb759a87dea..4b7266d928470 100644 +--- a/drivers/net/wireless/ath/ath10k/snoc.c ++++ b/drivers/net/wireless/ath/ath10k/snoc.c +@@ -828,12 +828,20 @@ static void ath10k_snoc_hif_get_default_pipe(struct ath10k *ar, + + static inline void ath10k_snoc_irq_disable(struct ath10k *ar) + { +- ath10k_ce_disable_interrupts(ar); ++ struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar); ++ int id; ++ ++ for (id = 0; id < CE_COUNT_MAX; id++) ++ disable_irq(ar_snoc->ce_irqs[id].irq_line); + } + + static inline void ath10k_snoc_irq_enable(struct ath10k *ar) + { +- ath10k_ce_enable_interrupts(ar); ++ struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar); ++ int id; ++ ++ for (id = 0; id < CE_COUNT_MAX; id++) ++ enable_irq(ar_snoc->ce_irqs[id].irq_line); + } + + static void ath10k_snoc_rx_pipe_cleanup(struct ath10k_snoc_pipe *snoc_pipe) +@@ -1089,6 +1097,8 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar, + goto err_free_rri; + } + ++ ath10k_ce_enable_interrupts(ar); ++ + return 0; + + err_free_rri: +@@ -1252,8 +1262,8 @@ static int ath10k_snoc_request_irq(struct ath10k *ar) + + for (id = 0; id < CE_COUNT_MAX; id++) { + ret = request_irq(ar_snoc->ce_irqs[id].irq_line, +- ath10k_snoc_per_engine_handler, 0, +- ce_name[id], ar); ++ ath10k_snoc_per_engine_handler, ++ IRQF_NO_AUTOEN, ce_name[id], ar); + if (ret) { + ath10k_err(ar, + "failed to register IRQ handler for CE %d: %d\n", +-- +2.42.0 + diff --git a/queue-6.1/wifi-ath10k-fix-clang-specific-fortify-warning.patch b/queue-6.1/wifi-ath10k-fix-clang-specific-fortify-warning.patch new file mode 100644 index 00000000000..914d9467a02 --- /dev/null +++ b/queue-6.1/wifi-ath10k-fix-clang-specific-fortify-warning.patch @@ -0,0 +1,62 @@ +From 3a0fbde1bee43afc0ec9172865005bcca7afd0c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Aug 2023 12:36:02 +0300 +Subject: wifi: ath10k: fix clang-specific fortify warning + +From: Dmitry Antipov + +[ Upstream commit cb4c132ebfeac5962f7258ffc831caa0c4dada1a ] + +When compiling with clang 16.0.6 and CONFIG_FORTIFY_SOURCE=y, I've +noticed the following (somewhat confusing due to absence of an actual +source code location): + +In file included from drivers/net/wireless/ath/ath10k/debug.c:8: +In file included from ./include/linux/module.h:13: +In file included from ./include/linux/stat.h:19: +In file included from ./include/linux/time.h:60: +In file included from ./include/linux/time32.h:13: +In file included from ./include/linux/timex.h:67: +In file included from ./arch/x86/include/asm/timex.h:5: +In file included from ./arch/x86/include/asm/processor.h:23: +In file included from ./arch/x86/include/asm/msr.h:11: +In file included from ./arch/x86/include/asm/cpumask.h:5: +In file included from ./include/linux/cpumask.h:12: +In file included from ./include/linux/bitmap.h:11: +In file included from ./include/linux/string.h:254: +./include/linux/fortify-string.h:592:4: warning: call to '__read_overflow2_field' +declared with 'warning' attribute: detected read beyond size of field (2nd +parameter); maybe use struct_group()? [-Wattribute-warning] + __read_overflow2_field(q_size_field, size); + +The compiler actually complains on 'ath10k_debug_get_et_strings()' where +fortification logic inteprets call to 'memcpy()' as an attempt to copy +the whole 'ath10k_gstrings_stats' array from it's first member and so +issues an overread warning. This warning may be silenced by passing +an address of the whole array and not the first member to 'memcpy()'. + +Signed-off-by: Dmitry Antipov +Acked-by: Jeff Johnson +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20230829093652.234537-1-dmantipov@yandex.ru +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/debug.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c +index c861e66ef6bc5..41f387e15dcd0 100644 +--- a/drivers/net/wireless/ath/ath10k/debug.c ++++ b/drivers/net/wireless/ath/ath10k/debug.c +@@ -1139,7 +1139,7 @@ void ath10k_debug_get_et_strings(struct ieee80211_hw *hw, + u32 sset, u8 *data) + { + if (sset == ETH_SS_STATS) +- memcpy(data, *ath10k_gstrings_stats, ++ memcpy(data, ath10k_gstrings_stats, + sizeof(ath10k_gstrings_stats)); + } + +-- +2.42.0 + diff --git a/queue-6.1/wifi-ath9k-fix-clang-specific-fortify-warnings.patch b/queue-6.1/wifi-ath9k-fix-clang-specific-fortify-warnings.patch new file mode 100644 index 00000000000..de472118dc4 --- /dev/null +++ b/queue-6.1/wifi-ath9k-fix-clang-specific-fortify-warnings.patch @@ -0,0 +1,102 @@ +From 9447376d2496ab0209f2643b1ae1c5ee10fae910 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Aug 2023 12:38:12 +0300 +Subject: wifi: ath9k: fix clang-specific fortify warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dmitry Antipov + +[ Upstream commit 95f97fe0ac974467ab4da215985a32b2fdf48af0 ] + +When compiling with clang 16.0.6 and CONFIG_FORTIFY_SOURCE=y, I've +noticed the following (somewhat confusing due to absence of an actual +source code location): + +In file included from drivers/net/wireless/ath/ath9k/debug.c:17: +In file included from ./include/linux/slab.h:16: +In file included from ./include/linux/gfp.h:7: +In file included from ./include/linux/mmzone.h:8: +In file included from ./include/linux/spinlock.h:56: +In file included from ./include/linux/preempt.h:79: +In file included from ./arch/x86/include/asm/preempt.h:9: +In file included from ./include/linux/thread_info.h:60: +In file included from ./arch/x86/include/asm/thread_info.h:53: +In file included from ./arch/x86/include/asm/cpufeature.h:5: +In file included from ./arch/x86/include/asm/processor.h:23: +In file included from ./arch/x86/include/asm/msr.h:11: +In file included from ./arch/x86/include/asm/cpumask.h:5: +In file included from ./include/linux/cpumask.h:12: +In file included from ./include/linux/bitmap.h:11: +In file included from ./include/linux/string.h:254: +./include/linux/fortify-string.h:592:4: warning: call to '__read_overflow2_field' +declared with 'warning' attribute: detected read beyond size of field (2nd +parameter); maybe use struct_group()? [-Wattribute-warning] + __read_overflow2_field(q_size_field, size); + +In file included from drivers/net/wireless/ath/ath9k/htc_drv_debug.c:17: +In file included from drivers/net/wireless/ath/ath9k/htc.h:20: +In file included from ./include/linux/module.h:13: +In file included from ./include/linux/stat.h:19: +In file included from ./include/linux/time.h:60: +In file included from ./include/linux/time32.h:13: +In file included from ./include/linux/timex.h:67: +In file included from ./arch/x86/include/asm/timex.h:5: +In file included from ./arch/x86/include/asm/processor.h:23: +In file included from ./arch/x86/include/asm/msr.h:11: +In file included from ./arch/x86/include/asm/cpumask.h:5: +In file included from ./include/linux/cpumask.h:12: +In file included from ./include/linux/bitmap.h:11: +In file included from ./include/linux/string.h:254: +./include/linux/fortify-string.h:592:4: warning: call to '__read_overflow2_field' +declared with 'warning' attribute: detected read beyond size of field (2nd +parameter); maybe use struct_group()? [-Wattribute-warning] + __read_overflow2_field(q_size_field, size); + +The compiler actually complains on 'ath9k_get_et_strings()' and +'ath9k_htc_get_et_strings()' due to the same reason: fortification logic +inteprets call to 'memcpy()' as an attempt to copy the whole array from +it's first member and so issues an overread warning. These warnings may +be silenced by passing an address of the whole array and not the first +member to 'memcpy()'. + +Signed-off-by: Dmitry Antipov +Acked-by: Toke Høiland-Jørgensen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20230829093856.234584-1-dmantipov@yandex.ru +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c +index fb7a2952d0ce8..d9bac1c343490 100644 +--- a/drivers/net/wireless/ath/ath9k/debug.c ++++ b/drivers/net/wireless/ath/ath9k/debug.c +@@ -1333,7 +1333,7 @@ void ath9k_get_et_strings(struct ieee80211_hw *hw, + u32 sset, u8 *data) + { + if (sset == ETH_SS_STATS) +- memcpy(data, *ath9k_gstrings_stats, ++ memcpy(data, ath9k_gstrings_stats, + sizeof(ath9k_gstrings_stats)); + } + +diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +index c55aab01fff5d..e79bbcd3279af 100644 +--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +@@ -428,7 +428,7 @@ void ath9k_htc_get_et_strings(struct ieee80211_hw *hw, + u32 sset, u8 *data) + { + if (sset == ETH_SS_STATS) +- memcpy(data, *ath9k_htc_gstrings_stats, ++ memcpy(data, ath9k_htc_gstrings_stats, + sizeof(ath9k_htc_gstrings_stats)); + } + +-- +2.42.0 + diff --git a/queue-6.1/wifi-iwlwifi-use-fw-rate-for-non-data-frames.patch b/queue-6.1/wifi-iwlwifi-use-fw-rate-for-non-data-frames.patch new file mode 100644 index 00000000000..9fa53aa3bc8 --- /dev/null +++ b/queue-6.1/wifi-iwlwifi-use-fw-rate-for-non-data-frames.patch @@ -0,0 +1,64 @@ +From 82a9183d14643115d36e8e503ef98f756f630df3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Sep 2023 14:56:45 +0300 +Subject: wifi: iwlwifi: Use FW rate for non-data frames + +From: Miri Korenblit + +[ Upstream commit 499d02790495958506a64f37ceda7e97345a50a8 ] + +Currently we are setting the rate in the tx cmd for +mgmt frames (e.g. during connection establishment). +This was problematic when sending mgmt frames in eSR mode, +as we don't know what link this frame will be sent on +(This is decided by the FW), so we don't know what is the +lowest rate. +Fix this by not setting the rate in tx cmd and rely +on FW to choose the right one. +Set rate only for injected frames with fixed rate, +or when no sta is given. +Also set for important frames (EAPOL etc.) the High Priority flag. + +Fixes: 055b22e770dd ("iwlwifi: mvm: Set Tx rate and flags when there is not station") +Signed-off-by: Miri Korenblit +Signed-off-by: Gregory Greenman +Link: https://lore.kernel.org/r/20230913145231.6c7e59620ee0.I6eaed3ccdd6dd62b9e664facc484081fc5275843@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +index 618355ecd9d7b..caaf4d52e2c64 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +@@ -524,16 +524,20 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, + flags |= IWL_TX_FLAGS_ENCRYPT_DIS; + + /* +- * For data packets rate info comes from the fw. Only +- * set rate/antenna during connection establishment or in case +- * no station is given. ++ * For data and mgmt packets rate info comes from the fw. Only ++ * set rate/antenna for injected frames with fixed rate, or ++ * when no sta is given. + */ +- if (!sta || !ieee80211_is_data(hdr->frame_control) || +- mvmsta->sta_state < IEEE80211_STA_AUTHORIZED) { ++ if (unlikely(!sta || ++ info->control.flags & IEEE80211_TX_CTRL_RATE_INJECT)) { + flags |= IWL_TX_FLAGS_CMD_RATE; + rate_n_flags = + iwl_mvm_get_tx_rate_n_flags(mvm, info, sta, + hdr->frame_control); ++ } else if (!ieee80211_is_data(hdr->frame_control) || ++ mvmsta->sta_state < IEEE80211_STA_AUTHORIZED) { ++ /* These are important frames */ ++ flags |= IWL_TX_FLAGS_HIGH_PRI; + } + + if (mvm->trans->trans_cfg->device_family >= +-- +2.42.0 + diff --git a/queue-6.1/wifi-mac80211-don-t-return-unset-power-in-ieee80211_.patch b/queue-6.1/wifi-mac80211-don-t-return-unset-power-in-ieee80211_.patch new file mode 100644 index 00000000000..24a102eb179 --- /dev/null +++ b/queue-6.1/wifi-mac80211-don-t-return-unset-power-in-ieee80211_.patch @@ -0,0 +1,58 @@ +From 5f2780bad3acea3f2af1bf0e8af3588697b1961f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Feb 2023 10:36:36 +0800 +Subject: wifi: mac80211: don't return unset power in ieee80211_get_tx_power() + +From: Ping-Ke Shih + +[ Upstream commit e160ab85166e77347d0cbe5149045cb25e83937f ] + +We can get a UBSAN warning if ieee80211_get_tx_power() returns the +INT_MIN value mac80211 internally uses for "unset power level". + + UBSAN: signed-integer-overflow in net/wireless/nl80211.c:3816:5 + -2147483648 * 100 cannot be represented in type 'int' + CPU: 0 PID: 20433 Comm: insmod Tainted: G WC OE + Call Trace: + dump_stack+0x74/0x92 + ubsan_epilogue+0x9/0x50 + handle_overflow+0x8d/0xd0 + __ubsan_handle_mul_overflow+0xe/0x10 + nl80211_send_iface+0x688/0x6b0 [cfg80211] + [...] + cfg80211_register_wdev+0x78/0xb0 [cfg80211] + cfg80211_netdev_notifier_call+0x200/0x620 [cfg80211] + [...] + ieee80211_if_add+0x60e/0x8f0 [mac80211] + ieee80211_register_hw+0xda5/0x1170 [mac80211] + +In this case, simply return an error instead, to indicate +that no data is available. + +Cc: Zong-Zhe Yang +Signed-off-by: Ping-Ke Shih +Link: https://lore.kernel.org/r/20230203023636.4418-1-pkshih@realtek.com +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/cfg.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c +index ee9f455bb2d18..2ca442f485132 100644 +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -3006,6 +3006,10 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, + else + *dbm = sdata->vif.bss_conf.txpower; + ++ /* INT_MIN indicates no power level was set yet */ ++ if (*dbm == INT_MIN) ++ return -EINVAL; ++ + return 0; + } + +-- +2.42.0 + diff --git a/queue-6.1/wifi-mac80211_hwsim-fix-clang-specific-fortify-warni.patch b/queue-6.1/wifi-mac80211_hwsim-fix-clang-specific-fortify-warni.patch new file mode 100644 index 00000000000..29a28328eff --- /dev/null +++ b/queue-6.1/wifi-mac80211_hwsim-fix-clang-specific-fortify-warni.patch @@ -0,0 +1,64 @@ +From 394e9a710e72c0c8e9caeb976cfd6ec070887fdd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Aug 2023 12:41:01 +0300 +Subject: wifi: mac80211_hwsim: fix clang-specific fortify warning + +From: Dmitry Antipov + +[ Upstream commit cbaccdc42483c65016f1bae89128c08dc17cfb2a ] + +When compiling with clang 16.0.6 and CONFIG_FORTIFY_SOURCE=y, I've +noticed the following (somewhat confusing due to absence of an actual +source code location): + +In file included from drivers/net/wireless/virtual/mac80211_hwsim.c:18: +In file included from ./include/linux/slab.h:16: +In file included from ./include/linux/gfp.h:7: +In file included from ./include/linux/mmzone.h:8: +In file included from ./include/linux/spinlock.h:56: +In file included from ./include/linux/preempt.h:79: +In file included from ./arch/x86/include/asm/preempt.h:9: +In file included from ./include/linux/thread_info.h:60: +In file included from ./arch/x86/include/asm/thread_info.h:53: +In file included from ./arch/x86/include/asm/cpufeature.h:5: +In file included from ./arch/x86/include/asm/processor.h:23: +In file included from ./arch/x86/include/asm/msr.h:11: +In file included from ./arch/x86/include/asm/cpumask.h:5: +In file included from ./include/linux/cpumask.h:12: +In file included from ./include/linux/bitmap.h:11: +In file included from ./include/linux/string.h:254: +./include/linux/fortify-string.h:592:4: warning: call to '__read_overflow2_field' +declared with 'warning' attribute: detected read beyond size of field (2nd +parameter); maybe use struct_group()? [-Wattribute-warning] + __read_overflow2_field(q_size_field, size); + +The compiler actually complains on 'mac80211_hwsim_get_et_strings()' where +fortification logic inteprets call to 'memcpy()' as an attempt to copy the +whole 'mac80211_hwsim_gstrings_stats' array from its first member and so +issues an overread warning. This warning may be silenced by passing +an address of the whole array and not the first member to 'memcpy()'. + +Signed-off-by: Dmitry Antipov +Link: https://lore.kernel.org/r/20230829094140.234636-1-dmantipov@yandex.ru +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c +index db70cef854bc4..abcd165a62cfe 100644 +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -3021,7 +3021,7 @@ static void mac80211_hwsim_get_et_strings(struct ieee80211_hw *hw, + u32 sset, u8 *data) + { + if (sset == ETH_SS_STATS) +- memcpy(data, *mac80211_hwsim_gstrings_stats, ++ memcpy(data, mac80211_hwsim_gstrings_stats, + sizeof(mac80211_hwsim_gstrings_stats)); + } + +-- +2.42.0 + diff --git a/queue-6.1/wifi-plfxlc-fix-clang-specific-fortify-warning.patch b/queue-6.1/wifi-plfxlc-fix-clang-specific-fortify-warning.patch new file mode 100644 index 00000000000..ef4ee3105f7 --- /dev/null +++ b/queue-6.1/wifi-plfxlc-fix-clang-specific-fortify-warning.patch @@ -0,0 +1,62 @@ +From 934458dc008ab50985b48f87ccff8637ffdcb7ff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Aug 2023 12:45:31 +0300 +Subject: wifi: plfxlc: fix clang-specific fortify warning + +From: Dmitry Antipov + +[ Upstream commit a763e92c78615ea838f5b9a841398b1d4adb968e ] + +When compiling with clang 16.0.6 and CONFIG_FORTIFY_SOURCE=y, I've +noticed the following (somewhat confusing due to absence of an actual +source code location): + +In file included from drivers/net/wireless/purelifi/plfxlc/mac.c:6: +In file included from ./include/linux/netdevice.h:24: +In file included from ./include/linux/timer.h:6: +In file included from ./include/linux/ktime.h:24: +In file included from ./include/linux/time.h:60: +In file included from ./include/linux/time32.h:13: +In file included from ./include/linux/timex.h:67: +In file included from ./arch/x86/include/asm/timex.h:5: +In file included from ./arch/x86/include/asm/processor.h:23: +In file included from ./arch/x86/include/asm/msr.h:11: +In file included from ./arch/x86/include/asm/cpumask.h:5: +In file included from ./include/linux/cpumask.h:12: +In file included from ./include/linux/bitmap.h:11: +In file included from ./include/linux/string.h:254: +./include/linux/fortify-string.h:592:4: warning: call to '__read_overflow2_field' +declared with 'warning' attribute: detected read beyond size of field (2nd +parameter); maybe use struct_group()? [-Wattribute-warning] + __read_overflow2_field(q_size_field, size); + +The compiler actually complains on 'plfxlc_get_et_strings()' where +fortification logic inteprets call to 'memcpy()' as an attempt to copy +the whole 'et_strings' array from its first member and so issues an +overread warning. This warning may be silenced by passing an address +of the whole array and not the first member to 'memcpy()'. + +Signed-off-by: Dmitry Antipov +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20230829094541.234751-1-dmantipov@yandex.ru +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/purelifi/plfxlc/mac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/purelifi/plfxlc/mac.c b/drivers/net/wireless/purelifi/plfxlc/mac.c +index d3cdffbded693..87a4ff888ddd4 100644 +--- a/drivers/net/wireless/purelifi/plfxlc/mac.c ++++ b/drivers/net/wireless/purelifi/plfxlc/mac.c +@@ -666,7 +666,7 @@ static void plfxlc_get_et_strings(struct ieee80211_hw *hw, + u32 sset, u8 *data) + { + if (sset == ETH_SS_STATS) +- memcpy(data, *et_strings, sizeof(et_strings)); ++ memcpy(data, et_strings, sizeof(et_strings)); + } + + static void plfxlc_get_et_stats(struct ieee80211_hw *hw, +-- +2.42.0 + diff --git a/queue-6.1/workqueue-provide-one-lock-class-key-per-work_on_cpu.patch b/queue-6.1/workqueue-provide-one-lock-class-key-per-work_on_cpu.patch new file mode 100644 index 00000000000..a2e86d46dd9 --- /dev/null +++ b/queue-6.1/workqueue-provide-one-lock-class-key-per-work_on_cpu.patch @@ -0,0 +1,299 @@ +From b014d9577b2f109453ed7a349df5478672317498 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 24 Sep 2023 17:07:02 +0200 +Subject: workqueue: Provide one lock class key per work_on_cpu() callsite + +From: Frederic Weisbecker + +[ Upstream commit 265f3ed077036f053981f5eea0b5b43e7c5b39ff ] + +All callers of work_on_cpu() share the same lock class key for all the +functions queued. As a result the workqueue related locking scenario for +a function A may be spuriously accounted as an inversion against the +locking scenario of function B such as in the following model: + + long A(void *arg) + { + mutex_lock(&mutex); + mutex_unlock(&mutex); + } + + long B(void *arg) + { + } + + void launchA(void) + { + work_on_cpu(0, A, NULL); + } + + void launchB(void) + { + mutex_lock(&mutex); + work_on_cpu(1, B, NULL); + mutex_unlock(&mutex); + } + +launchA and launchB running concurrently have no chance to deadlock. +However the above can be reported by lockdep as a possible locking +inversion because the works containing A() and B() are treated as +belonging to the same locking class. + +The following shows an existing example of such a spurious lockdep splat: + + ====================================================== + WARNING: possible circular locking dependency detected + 6.6.0-rc1-00065-g934ebd6e5359 #35409 Not tainted + ------------------------------------------------------ + kworker/0:1/9 is trying to acquire lock: + ffffffff9bc72f30 (cpu_hotplug_lock){++++}-{0:0}, at: _cpu_down+0x57/0x2b0 + + but task is already holding lock: + ffff9e3bc0057e60 ((work_completion)(&wfc.work)){+.+.}-{0:0}, at: process_scheduled_works+0x216/0x500 + + which lock already depends on the new lock. + + the existing dependency chain (in reverse order) is: + + -> #2 ((work_completion)(&wfc.work)){+.+.}-{0:0}: + __flush_work+0x83/0x4e0 + work_on_cpu+0x97/0xc0 + rcu_nocb_cpu_offload+0x62/0xb0 + rcu_nocb_toggle+0xd0/0x1d0 + kthread+0xe6/0x120 + ret_from_fork+0x2f/0x40 + ret_from_fork_asm+0x1b/0x30 + + -> #1 (rcu_state.barrier_mutex){+.+.}-{3:3}: + __mutex_lock+0x81/0xc80 + rcu_nocb_cpu_deoffload+0x38/0xb0 + rcu_nocb_toggle+0x144/0x1d0 + kthread+0xe6/0x120 + ret_from_fork+0x2f/0x40 + ret_from_fork_asm+0x1b/0x30 + + -> #0 (cpu_hotplug_lock){++++}-{0:0}: + __lock_acquire+0x1538/0x2500 + lock_acquire+0xbf/0x2a0 + percpu_down_write+0x31/0x200 + _cpu_down+0x57/0x2b0 + __cpu_down_maps_locked+0x10/0x20 + work_for_cpu_fn+0x15/0x20 + process_scheduled_works+0x2a7/0x500 + worker_thread+0x173/0x330 + kthread+0xe6/0x120 + ret_from_fork+0x2f/0x40 + ret_from_fork_asm+0x1b/0x30 + + other info that might help us debug this: + + Chain exists of: + cpu_hotplug_lock --> rcu_state.barrier_mutex --> (work_completion)(&wfc.work) + + Possible unsafe locking scenario: + + CPU0 CPU1 + ---- ---- + lock((work_completion)(&wfc.work)); + lock(rcu_state.barrier_mutex); + lock((work_completion)(&wfc.work)); + lock(cpu_hotplug_lock); + + *** DEADLOCK *** + + 2 locks held by kworker/0:1/9: + #0: ffff900481068b38 ((wq_completion)events){+.+.}-{0:0}, at: process_scheduled_works+0x212/0x500 + #1: ffff9e3bc0057e60 ((work_completion)(&wfc.work)){+.+.}-{0:0}, at: process_scheduled_works+0x216/0x500 + + stack backtrace: + CPU: 0 PID: 9 Comm: kworker/0:1 Not tainted 6.6.0-rc1-00065-g934ebd6e5359 #35409 + Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 + Workqueue: events work_for_cpu_fn + Call Trace: + rcu-torture: rcu_torture_read_exit: Start of episode + + dump_stack_lvl+0x4a/0x80 + check_noncircular+0x132/0x150 + __lock_acquire+0x1538/0x2500 + lock_acquire+0xbf/0x2a0 + ? _cpu_down+0x57/0x2b0 + percpu_down_write+0x31/0x200 + ? _cpu_down+0x57/0x2b0 + _cpu_down+0x57/0x2b0 + __cpu_down_maps_locked+0x10/0x20 + work_for_cpu_fn+0x15/0x20 + process_scheduled_works+0x2a7/0x500 + worker_thread+0x173/0x330 + ? __pfx_worker_thread+0x10/0x10 + kthread+0xe6/0x120 + ? __pfx_kthread+0x10/0x10 + ret_from_fork+0x2f/0x40 + ? __pfx_kthread+0x10/0x10 + ret_from_fork_asm+0x1b/0x30 + +Signed-off-by: Frederic Weisbecker +Signed-off-by: Tejun Heo +Signed-off-by: Sasha Levin +--- + include/linux/workqueue.h | 46 +++++++++++++++++++++++++++++++++------ + kernel/workqueue.c | 20 ++++++++++------- + 2 files changed, 51 insertions(+), 15 deletions(-) + +diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h +index 3ca41b9da6473..5d052e193a85c 100644 +--- a/include/linux/workqueue.h ++++ b/include/linux/workqueue.h +@@ -222,18 +222,16 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } + * to generate better code. + */ + #ifdef CONFIG_LOCKDEP +-#define __INIT_WORK(_work, _func, _onstack) \ ++#define __INIT_WORK_KEY(_work, _func, _onstack, _key) \ + do { \ +- static struct lock_class_key __key; \ +- \ + __init_work((_work), _onstack); \ + (_work)->data = (atomic_long_t) WORK_DATA_INIT(); \ +- lockdep_init_map(&(_work)->lockdep_map, "(work_completion)"#_work, &__key, 0); \ ++ lockdep_init_map(&(_work)->lockdep_map, "(work_completion)"#_work, (_key), 0); \ + INIT_LIST_HEAD(&(_work)->entry); \ + (_work)->func = (_func); \ + } while (0) + #else +-#define __INIT_WORK(_work, _func, _onstack) \ ++#define __INIT_WORK_KEY(_work, _func, _onstack, _key) \ + do { \ + __init_work((_work), _onstack); \ + (_work)->data = (atomic_long_t) WORK_DATA_INIT(); \ +@@ -242,12 +240,22 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } + } while (0) + #endif + ++#define __INIT_WORK(_work, _func, _onstack) \ ++ do { \ ++ static __maybe_unused struct lock_class_key __key; \ ++ \ ++ __INIT_WORK_KEY(_work, _func, _onstack, &__key); \ ++ } while (0) ++ + #define INIT_WORK(_work, _func) \ + __INIT_WORK((_work), (_func), 0) + + #define INIT_WORK_ONSTACK(_work, _func) \ + __INIT_WORK((_work), (_func), 1) + ++#define INIT_WORK_ONSTACK_KEY(_work, _func, _key) \ ++ __INIT_WORK_KEY((_work), (_func), 1, _key) ++ + #define __INIT_DELAYED_WORK(_work, _func, _tflags) \ + do { \ + INIT_WORK(&(_work)->work, (_func)); \ +@@ -681,8 +689,32 @@ static inline long work_on_cpu_safe(int cpu, long (*fn)(void *), void *arg) + return fn(arg); + } + #else +-long work_on_cpu(int cpu, long (*fn)(void *), void *arg); +-long work_on_cpu_safe(int cpu, long (*fn)(void *), void *arg); ++long work_on_cpu_key(int cpu, long (*fn)(void *), ++ void *arg, struct lock_class_key *key); ++/* ++ * A new key is defined for each caller to make sure the work ++ * associated with the function doesn't share its locking class. ++ */ ++#define work_on_cpu(_cpu, _fn, _arg) \ ++({ \ ++ static struct lock_class_key __key; \ ++ \ ++ work_on_cpu_key(_cpu, _fn, _arg, &__key); \ ++}) ++ ++long work_on_cpu_safe_key(int cpu, long (*fn)(void *), ++ void *arg, struct lock_class_key *key); ++ ++/* ++ * A new key is defined for each caller to make sure the work ++ * associated with the function doesn't share its locking class. ++ */ ++#define work_on_cpu_safe(_cpu, _fn, _arg) \ ++({ \ ++ static struct lock_class_key __key; \ ++ \ ++ work_on_cpu_safe_key(_cpu, _fn, _arg, &__key); \ ++}) + #endif /* CONFIG_SMP */ + + #ifdef CONFIG_FREEZER +diff --git a/kernel/workqueue.c b/kernel/workqueue.c +index bc1a97ee40b21..f3b6ac232e219 100644 +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c +@@ -5185,50 +5185,54 @@ static void work_for_cpu_fn(struct work_struct *work) + } + + /** +- * work_on_cpu - run a function in thread context on a particular cpu ++ * work_on_cpu_key - run a function in thread context on a particular cpu + * @cpu: the cpu to run on + * @fn: the function to run + * @arg: the function arg ++ * @key: The lock class key for lock debugging purposes + * + * It is up to the caller to ensure that the cpu doesn't go offline. + * The caller must not hold any locks which would prevent @fn from completing. + * + * Return: The value @fn returns. + */ +-long work_on_cpu(int cpu, long (*fn)(void *), void *arg) ++long work_on_cpu_key(int cpu, long (*fn)(void *), ++ void *arg, struct lock_class_key *key) + { + struct work_for_cpu wfc = { .fn = fn, .arg = arg }; + +- INIT_WORK_ONSTACK(&wfc.work, work_for_cpu_fn); ++ INIT_WORK_ONSTACK_KEY(&wfc.work, work_for_cpu_fn, key); + schedule_work_on(cpu, &wfc.work); + flush_work(&wfc.work); + destroy_work_on_stack(&wfc.work); + return wfc.ret; + } +-EXPORT_SYMBOL_GPL(work_on_cpu); ++EXPORT_SYMBOL_GPL(work_on_cpu_key); + + /** +- * work_on_cpu_safe - run a function in thread context on a particular cpu ++ * work_on_cpu_safe_key - run a function in thread context on a particular cpu + * @cpu: the cpu to run on + * @fn: the function to run + * @arg: the function argument ++ * @key: The lock class key for lock debugging purposes + * + * Disables CPU hotplug and calls work_on_cpu(). The caller must not hold + * any locks which would prevent @fn from completing. + * + * Return: The value @fn returns. + */ +-long work_on_cpu_safe(int cpu, long (*fn)(void *), void *arg) ++long work_on_cpu_safe_key(int cpu, long (*fn)(void *), ++ void *arg, struct lock_class_key *key) + { + long ret = -ENODEV; + + cpus_read_lock(); + if (cpu_online(cpu)) +- ret = work_on_cpu(cpu, fn, arg); ++ ret = work_on_cpu_key(cpu, fn, arg, key); + cpus_read_unlock(); + return ret; + } +-EXPORT_SYMBOL_GPL(work_on_cpu_safe); ++EXPORT_SYMBOL_GPL(work_on_cpu_safe_key); + #endif /* CONFIG_SMP */ + + #ifdef CONFIG_FREEZER +-- +2.42.0 + diff --git a/queue-6.1/x86-mm-drop-the-4-mb-restriction-on-minimal-numa-nod.patch b/queue-6.1/x86-mm-drop-the-4-mb-restriction-on-minimal-numa-nod.patch new file mode 100644 index 00000000000..9db36330643 --- /dev/null +++ b/queue-6.1/x86-mm-drop-the-4-mb-restriction-on-minimal-numa-nod.patch @@ -0,0 +1,112 @@ +From ae3360c5168785403cc02af3de524129b445bb43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Oct 2023 12:42:50 +0200 +Subject: x86/mm: Drop the 4 MB restriction on minimal NUMA node memory size + +From: Mike Rapoport (IBM) + +[ Upstream commit a1e2b8b36820d8c91275f207e77e91645b7c6836 ] + +Qi Zheng reported crashes in a production environment and provided a +simplified example as a reproducer: + + | For example, if we use Qemu to start a two NUMA node kernel, + | one of the nodes has 2M memory (less than NODE_MIN_SIZE), + | and the other node has 2G, then we will encounter the + | following panic: + | + | BUG: kernel NULL pointer dereference, address: 0000000000000000 + | <...> + | RIP: 0010:_raw_spin_lock_irqsave+0x22/0x40 + | <...> + | Call Trace: + | + | deactivate_slab() + | bootstrap() + | kmem_cache_init() + | start_kernel() + | secondary_startup_64_no_verify() + +The crashes happen because of inconsistency between the nodemask that +has nodes with less than 4MB as memoryless, and the actual memory fed +into the core mm. + +The commit: + + 9391a3f9c7f1 ("[PATCH] x86_64: Clear more state when ignoring empty node in SRAT parsing") + +... that introduced minimal size of a NUMA node does not explain why +a node size cannot be less than 4MB and what boot failures this +restriction might fix. + +Fixes have been submitted to the core MM code to tighten up the +memory topologies it accepts and to not crash on weird input: + + mm: page_alloc: skip memoryless nodes entirely + mm: memory_hotplug: drop memoryless node from fallback lists + +Andrew has accepted them into the -mm tree, but there are no +stable SHA1's yet. + +This patch drops the limitation for minimal node size on x86: + + - which works around the crash without the fixes to the core MM. + - makes x86 topologies less weird, + - removes an arbitrary and undocumented limitation on NUMA topologies. + +[ mingo: Improved changelog clarity. ] + +Reported-by: Qi Zheng +Tested-by: Mario Casquero +Signed-off-by: Mike Rapoport (IBM) +Signed-off-by: Ingo Molnar +Acked-by: David Hildenbrand +Acked-by: Michal Hocko +Cc: Dave Hansen +Cc: Rik van Riel +Link: https://lore.kernel.org/r/ZS+2qqjEO5/867br@gmail.com +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/numa.h | 7 ------- + arch/x86/mm/numa.c | 7 ------- + 2 files changed, 14 deletions(-) + +diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h +index e3bae2b60a0db..ef2844d691735 100644 +--- a/arch/x86/include/asm/numa.h ++++ b/arch/x86/include/asm/numa.h +@@ -12,13 +12,6 @@ + + #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) + +-/* +- * Too small node sizes may confuse the VM badly. Usually they +- * result from BIOS bugs. So dont recognize nodes as standalone +- * NUMA entities that have less than this amount of RAM listed: +- */ +-#define NODE_MIN_SIZE (4*1024*1024) +- + extern int numa_off; + + /* +diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c +index c01c5506fd4ae..aa39d678fe81d 100644 +--- a/arch/x86/mm/numa.c ++++ b/arch/x86/mm/numa.c +@@ -602,13 +602,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) + if (start >= end) + continue; + +- /* +- * Don't confuse VM with a node that doesn't have the +- * minimum amount of memory: +- */ +- if (end && (end - start) < NODE_MIN_SIZE) +- continue; +- + alloc_node_data(nid); + } + +-- +2.42.0 + diff --git a/queue-6.1/xen-events-fix-delayed-eoi-list-handling.patch b/queue-6.1/xen-events-fix-delayed-eoi-list-handling.patch new file mode 100644 index 00000000000..0011d690af4 --- /dev/null +++ b/queue-6.1/xen-events-fix-delayed-eoi-list-handling.patch @@ -0,0 +1,47 @@ +From 7d53eca7a118bef861cbe16275e6e3d9e7a94aa5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Sep 2023 17:54:13 +0200 +Subject: xen/events: fix delayed eoi list handling + +From: Juergen Gross + +[ Upstream commit 47d970204054f859f35a2237baa75c2d84fcf436 ] + +When delaying eoi handling of events, the related elements are queued +into the percpu lateeoi list. In case the list isn't empty, the +elements should be sorted by the time when eoi handling is to happen. + +Unfortunately a new element will never be queued at the start of the +list, even if it has a handling time lower than all other list +elements. + +Fix that by handling that case the same way as for an empty list. + +Fixes: e99502f76271 ("xen/events: defer eoi in case of excessive number of events") +Reported-by: Jan Beulich +Signed-off-by: Juergen Gross +Reviewed-by: Oleksandr Tyshchenko +Signed-off-by: Juergen Gross +Signed-off-by: Sasha Levin +--- + drivers/xen/events/events_base.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c +index 80b46de14f413..af9115d648092 100644 +--- a/drivers/xen/events/events_base.c ++++ b/drivers/xen/events/events_base.c +@@ -600,7 +600,9 @@ static void lateeoi_list_add(struct irq_info *info) + + spin_lock_irqsave(&eoi->eoi_list_lock, flags); + +- if (list_empty(&eoi->eoi_list)) { ++ elem = list_first_entry_or_null(&eoi->eoi_list, struct irq_info, ++ eoi_list); ++ if (!elem || info->eoi_time < elem->eoi_time) { + list_add(&info->eoi_list, &eoi->eoi_list); + mod_delayed_work_on(info->eoi_cpu, system_wq, + &eoi->delayed, delay); +-- +2.42.0 +