diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 06:20:38 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 06:20:38 -0700 |
commit | 5f74b330c04aae1bc9c8b1f77bfda5ff89db2779 (patch) | |
tree | 36e4cbd76212cfcbe33a214a87c73e86edd64ceb | |
parent | 47763fecbae29aac682e73f8cb21a5405af81327 (diff) | |
download | stable-queue-5f74b330c04aae1bc9c8b1f77bfda5ff89db2779.tar.gz |
6.1-stable patches
added patches:
bootconfig-use-memblock_free_late-to-free-xbc-memory-to-buddy.patch
drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch
drm-vmwgfx-fix-crtc-s-atomic-check-conditional.patch
drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch
nilfs2-fix-oob-in-nilfs_set_de_type.patch
nouveau-fix-instmem-race-condition-around-ptr-stores.patch
7 files changed, 557 insertions, 0 deletions
diff --git a/queue-6.1/bootconfig-use-memblock_free_late-to-free-xbc-memory-to-buddy.patch b/queue-6.1/bootconfig-use-memblock_free_late-to-free-xbc-memory-to-buddy.patch new file mode 100644 index 0000000000..38880f19c4 --- /dev/null +++ b/queue-6.1/bootconfig-use-memblock_free_late-to-free-xbc-memory-to-buddy.patch @@ -0,0 +1,155 @@ +From 89f9a1e876b5a7ad884918c03a46831af202c8a0 Mon Sep 17 00:00:00 2001 +From: Qiang Zhang <qiang4.zhang@intel.com> +Date: Sun, 14 Apr 2024 19:49:45 +0800 +Subject: bootconfig: use memblock_free_late to free xbc memory to buddy + +From: Qiang Zhang <qiang4.zhang@intel.com> + +commit 89f9a1e876b5a7ad884918c03a46831af202c8a0 upstream. + +On the time to free xbc memory in xbc_exit(), memblock may has handed +over memory to buddy allocator. So it doesn't make sense to free memory +back to memblock. memblock_free() called by xbc_exit() even causes UAF bugs +on architectures with CONFIG_ARCH_KEEP_MEMBLOCK disabled like x86. +Following KASAN logs shows this case. + +This patch fixes the xbc memory free problem by calling memblock_free() +in early xbc init error rewind path and calling memblock_free_late() in +xbc exit path to free memory to buddy allocator. + +[ 9.410890] ================================================================== +[ 9.418962] BUG: KASAN: use-after-free in memblock_isolate_range+0x12d/0x260 +[ 9.426850] Read of size 8 at addr ffff88845dd30000 by task swapper/0/1 + +[ 9.435901] CPU: 9 PID: 1 Comm: swapper/0 Tainted: G U 6.9.0-rc3-00208-g586b5dfb51b9 #5 +[ 9.446403] Hardware name: Intel Corporation RPLP LP5 (CPU:RaptorLake)/RPLP LP5 (ID:13), BIOS IRPPN02.01.01.00.00.19.015.D-00000000 Dec 28 2023 +[ 9.460789] Call Trace: +[ 9.463518] <TASK> +[ 9.465859] dump_stack_lvl+0x53/0x70 +[ 9.469949] print_report+0xce/0x610 +[ 9.473944] ? __virt_addr_valid+0xf5/0x1b0 +[ 9.478619] ? memblock_isolate_range+0x12d/0x260 +[ 9.483877] kasan_report+0xc6/0x100 +[ 9.487870] ? memblock_isolate_range+0x12d/0x260 +[ 9.493125] memblock_isolate_range+0x12d/0x260 +[ 9.498187] memblock_phys_free+0xb4/0x160 +[ 9.502762] ? __pfx_memblock_phys_free+0x10/0x10 +[ 9.508021] ? mutex_unlock+0x7e/0xd0 +[ 9.512111] ? __pfx_mutex_unlock+0x10/0x10 +[ 9.516786] ? kernel_init_freeable+0x2d4/0x430 +[ 9.521850] ? __pfx_kernel_init+0x10/0x10 +[ 9.526426] xbc_exit+0x17/0x70 +[ 9.529935] kernel_init+0x38/0x1e0 +[ 9.533829] ? _raw_spin_unlock_irq+0xd/0x30 +[ 9.538601] ret_from_fork+0x2c/0x50 +[ 9.542596] ? __pfx_kernel_init+0x10/0x10 +[ 9.547170] ret_from_fork_asm+0x1a/0x30 +[ 9.551552] </TASK> + +[ 9.555649] The buggy address belongs to the physical page: +[ 9.561875] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x45dd30 +[ 9.570821] flags: 0x200000000000000(node=0|zone=2) +[ 9.576271] page_type: 0xffffffff() +[ 9.580167] raw: 0200000000000000 ffffea0011774c48 ffffea0012ba1848 0000000000000000 +[ 9.588823] raw: 0000000000000001 0000000000000000 00000000ffffffff 0000000000000000 +[ 9.597476] page dumped because: kasan: bad access detected + +[ 9.605362] Memory state around the buggy address: +[ 9.610714] ffff88845dd2ff00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[ 9.618786] ffff88845dd2ff80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[ 9.626857] >ffff88845dd30000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff +[ 9.634930] ^ +[ 9.638534] ffff88845dd30080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff +[ 9.646605] ffff88845dd30100: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff +[ 9.654675] ================================================================== + +Link: https://lore.kernel.org/all/20240414114944.1012359-1-qiang4.zhang@linux.intel.com/ + +Fixes: 40caa127f3c7 ("init: bootconfig: Remove all bootconfig data when the init memory is removed") +Cc: Stable@vger.kernel.org +Signed-off-by: Qiang Zhang <qiang4.zhang@intel.com> +Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> +Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + include/linux/bootconfig.h | 7 ++++++- + lib/bootconfig.c | 19 +++++++++++-------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +--- a/include/linux/bootconfig.h ++++ b/include/linux/bootconfig.h +@@ -287,7 +287,12 @@ int __init xbc_init(const char *buf, siz + int __init xbc_get_info(int *node_size, size_t *data_size); + + /* XBC cleanup data structures */ +-void __init xbc_exit(void); ++void __init _xbc_exit(bool early); ++ ++static inline void xbc_exit(void) ++{ ++ _xbc_exit(false); ++} + + /* XBC embedded bootconfig data in kernel */ + #ifdef CONFIG_BOOT_CONFIG_EMBED +--- a/lib/bootconfig.c ++++ b/lib/bootconfig.c +@@ -61,9 +61,12 @@ static inline void * __init xbc_alloc_me + return memblock_alloc(size, SMP_CACHE_BYTES); + } + +-static inline void __init xbc_free_mem(void *addr, size_t size) ++static inline void __init xbc_free_mem(void *addr, size_t size, bool early) + { +- memblock_free(addr, size); ++ if (early) ++ memblock_free(addr, size); ++ else if (addr) ++ memblock_free_late(__pa(addr), size); + } + + #else /* !__KERNEL__ */ +@@ -73,7 +76,7 @@ static inline void *xbc_alloc_mem(size_t + return malloc(size); + } + +-static inline void xbc_free_mem(void *addr, size_t size) ++static inline void xbc_free_mem(void *addr, size_t size, bool early) + { + free(addr); + } +@@ -904,13 +907,13 @@ static int __init xbc_parse_tree(void) + * If you need to reuse xbc_init() with new boot config, you can + * use this. + */ +-void __init xbc_exit(void) ++void __init _xbc_exit(bool early) + { +- xbc_free_mem(xbc_data, xbc_data_size); ++ xbc_free_mem(xbc_data, xbc_data_size, early); + xbc_data = NULL; + xbc_data_size = 0; + xbc_node_num = 0; +- xbc_free_mem(xbc_nodes, sizeof(struct xbc_node) * XBC_NODE_MAX); ++ xbc_free_mem(xbc_nodes, sizeof(struct xbc_node) * XBC_NODE_MAX, early); + xbc_nodes = NULL; + brace_index = 0; + } +@@ -963,7 +966,7 @@ int __init xbc_init(const char *data, si + if (!xbc_nodes) { + if (emsg) + *emsg = "Failed to allocate bootconfig nodes"; +- xbc_exit(); ++ _xbc_exit(true); + return -ENOMEM; + } + memset(xbc_nodes, 0, sizeof(struct xbc_node) * XBC_NODE_MAX); +@@ -977,7 +980,7 @@ int __init xbc_init(const char *data, si + *epos = xbc_err_pos; + if (emsg) + *emsg = xbc_err_msg; +- xbc_exit(); ++ _xbc_exit(true); + } else + ret = xbc_node_num; + diff --git a/queue-6.1/drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch b/queue-6.1/drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch new file mode 100644 index 0000000000..9de8bc21a9 --- /dev/null +++ b/queue-6.1/drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch @@ -0,0 +1,141 @@ +From 6fef2d4c00b5b8561ad68dd2b68173f5c6af1e75 Mon Sep 17 00:00:00 2001 +From: xinhui pan <xinhui.pan@amd.com> +Date: Thu, 11 Apr 2024 11:11:38 +0800 +Subject: drm/amdgpu: validate the parameters of bo mapping operations more clearly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: xinhui pan <xinhui.pan@amd.com> + +commit 6fef2d4c00b5b8561ad68dd2b68173f5c6af1e75 upstream. + +Verify the parameters of +amdgpu_vm_bo_(map/replace_map/clearing_mappings) in one common place. + +Fixes: dc54d3d1744d ("drm/amdgpu: implement AMDGPU_VA_OP_CLEAR v2") +Cc: stable@vger.kernel.org +Reported-by: Vlad Stolyarov <hexed@google.com> +Suggested-by: Christian König <christian.koenig@amd.com> +Signed-off-by: xinhui pan <xinhui.pan@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 +++++++++++++++++++++------------ + 1 file changed, 46 insertions(+), 26 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1400,6 +1400,37 @@ static void amdgpu_vm_bo_insert_map(stru + trace_amdgpu_vm_bo_map(bo_va, mapping); + } + ++/* Validate operation parameters to prevent potential abuse */ ++static int amdgpu_vm_verify_parameters(struct amdgpu_device *adev, ++ struct amdgpu_bo *bo, ++ uint64_t saddr, ++ uint64_t offset, ++ uint64_t size) ++{ ++ uint64_t tmp, lpfn; ++ ++ if (saddr & AMDGPU_GPU_PAGE_MASK ++ || offset & AMDGPU_GPU_PAGE_MASK ++ || size & AMDGPU_GPU_PAGE_MASK) ++ return -EINVAL; ++ ++ if (check_add_overflow(saddr, size, &tmp) ++ || check_add_overflow(offset, size, &tmp) ++ || size == 0 /* which also leads to end < begin */) ++ return -EINVAL; ++ ++ /* make sure object fit at this offset */ ++ if (bo && offset + size > amdgpu_bo_size(bo)) ++ return -EINVAL; ++ ++ /* Ensure last pfn not exceed max_pfn */ ++ lpfn = (saddr + size - 1) >> AMDGPU_GPU_PAGE_SHIFT; ++ if (lpfn >= adev->vm_manager.max_pfn) ++ return -EINVAL; ++ ++ return 0; ++} ++ + /** + * amdgpu_vm_bo_map - map bo inside a vm + * +@@ -1426,21 +1457,14 @@ int amdgpu_vm_bo_map(struct amdgpu_devic + struct amdgpu_bo *bo = bo_va->base.bo; + struct amdgpu_vm *vm = bo_va->base.vm; + uint64_t eaddr; ++ int r; + +- /* validate the parameters */ +- if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK) +- return -EINVAL; +- if (saddr + size <= saddr || offset + size <= offset) +- return -EINVAL; +- +- /* make sure object fit at this offset */ +- eaddr = saddr + size - 1; +- if ((bo && offset + size > amdgpu_bo_size(bo)) || +- (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT)) +- return -EINVAL; ++ r = amdgpu_vm_verify_parameters(adev, bo, saddr, offset, size); ++ if (r) ++ return r; + + saddr /= AMDGPU_GPU_PAGE_SIZE; +- eaddr /= AMDGPU_GPU_PAGE_SIZE; ++ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE; + + tmp = amdgpu_vm_it_iter_first(&vm->va, saddr, eaddr); + if (tmp) { +@@ -1493,17 +1517,9 @@ int amdgpu_vm_bo_replace_map(struct amdg + uint64_t eaddr; + int r; + +- /* validate the parameters */ +- if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK) +- return -EINVAL; +- if (saddr + size <= saddr || offset + size <= offset) +- return -EINVAL; +- +- /* make sure object fit at this offset */ +- eaddr = saddr + size - 1; +- if ((bo && offset + size > amdgpu_bo_size(bo)) || +- (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT)) +- return -EINVAL; ++ r = amdgpu_vm_verify_parameters(adev, bo, saddr, offset, size); ++ if (r) ++ return r; + + /* Allocate all the needed memory */ + mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); +@@ -1517,7 +1533,7 @@ int amdgpu_vm_bo_replace_map(struct amdg + } + + saddr /= AMDGPU_GPU_PAGE_SIZE; +- eaddr /= AMDGPU_GPU_PAGE_SIZE; ++ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE; + + mapping->start = saddr; + mapping->last = eaddr; +@@ -1604,10 +1620,14 @@ int amdgpu_vm_bo_clear_mappings(struct a + struct amdgpu_bo_va_mapping *before, *after, *tmp, *next; + LIST_HEAD(removed); + uint64_t eaddr; ++ int r; ++ ++ r = amdgpu_vm_verify_parameters(adev, NULL, saddr, 0, size); ++ if (r) ++ return r; + +- eaddr = saddr + size - 1; + saddr /= AMDGPU_GPU_PAGE_SIZE; +- eaddr /= AMDGPU_GPU_PAGE_SIZE; ++ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE; + + /* Allocate all the needed memory */ + before = kzalloc(sizeof(*before), GFP_KERNEL); diff --git a/queue-6.1/drm-vmwgfx-fix-crtc-s-atomic-check-conditional.patch b/queue-6.1/drm-vmwgfx-fix-crtc-s-atomic-check-conditional.patch new file mode 100644 index 0000000000..a7f1a4ae6f --- /dev/null +++ b/queue-6.1/drm-vmwgfx-fix-crtc-s-atomic-check-conditional.patch @@ -0,0 +1,58 @@ +From a60ccade88f926e871a57176e86a34bbf0db0098 Mon Sep 17 00:00:00 2001 +From: Zack Rusin <zack.rusin@broadcom.com> +Date: Thu, 11 Apr 2024 22:55:10 -0400 +Subject: drm/vmwgfx: Fix crtc's atomic check conditional + +From: Zack Rusin <zack.rusin@broadcom.com> + +commit a60ccade88f926e871a57176e86a34bbf0db0098 upstream. + +The conditional was supposed to prevent enabling of a crtc state +without a set primary plane. Accidently it also prevented disabling +crtc state with a set primary plane. Neither is correct. + +Fix the conditional and just driver-warn when a crtc state has been +enabled without a primary plane which will help debug broken userspace. + +Fixes IGT's kms_atomic_interruptible and kms_atomic_transition tests. + +Signed-off-by: Zack Rusin <zack.rusin@broadcom.com> +Fixes: 06ec41909e31 ("drm/vmwgfx: Add and connect CRTC helper functions") +Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> +Cc: dri-devel@lists.freedesktop.org +Cc: <stable@vger.kernel.org> # v4.12+ +Reviewed-by: Ian Forbes <ian.forbes@broadcom.com> +Reviewed-by: Martin Krastev <martin.krastev@broadcom.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20240412025511.78553-5-zack.rusin@broadcom.com +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +@@ -793,6 +793,7 @@ int vmw_du_cursor_plane_atomic_check(str + int vmw_du_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_atomic_state *state) + { ++ struct vmw_private *vmw = vmw_priv(crtc->dev); + struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, + crtc); + struct vmw_display_unit *du = vmw_crtc_to_du(new_state->crtc); +@@ -800,9 +801,13 @@ int vmw_du_crtc_atomic_check(struct drm_ + bool has_primary = new_state->plane_mask & + drm_plane_mask(crtc->primary); + +- /* We always want to have an active plane with an active CRTC */ +- if (has_primary != new_state->enable) +- return -EINVAL; ++ /* ++ * This is fine in general, but broken userspace might expect ++ * some actual rendering so give a clue as why it's blank. ++ */ ++ if (new_state->enable && !has_primary) ++ drm_dbg_driver(&vmw->drm, ++ "CRTC without a primary plane will be blank.\n"); + + + if (new_state->connector_mask != connector_mask && diff --git a/queue-6.1/drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch b/queue-6.1/drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch new file mode 100644 index 0000000000..23502fb5d5 --- /dev/null +++ b/queue-6.1/drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch @@ -0,0 +1,48 @@ +From d4c972bff3129a9dd4c22a3999fd8eba1a81531a Mon Sep 17 00:00:00 2001 +From: Zack Rusin <zack.rusin@broadcom.com> +Date: Thu, 11 Apr 2024 22:55:11 -0400 +Subject: drm/vmwgfx: Sort primary plane formats by order of preference + +From: Zack Rusin <zack.rusin@broadcom.com> + +commit d4c972bff3129a9dd4c22a3999fd8eba1a81531a upstream. + +The table of primary plane formats wasn't sorted at all, leading to +applications picking our least desirable formats by defaults. + +Sort the primary plane formats according to our order of preference. + +Nice side-effect of this change is that it makes IGT's kms_atomic +plane-invalid-params pass because the test picks the first format +which for vmwgfx was DRM_FORMAT_XRGB1555 and uses fb's with odd sizes +which make Pixman, which IGT depends on assert due to the fact that our +16bpp formats aren't 32 bit aligned like Pixman requires all formats +to be. + +Signed-off-by: Zack Rusin <zack.rusin@broadcom.com> +Fixes: 36cc79bc9077 ("drm/vmwgfx: Add universal plane support") +Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> +Cc: dri-devel@lists.freedesktop.org +Cc: <stable@vger.kernel.org> # v4.12+ +Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20240412025511.78553-6-zack.rusin@broadcom.com +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +@@ -246,10 +246,10 @@ struct vmw_framebuffer_bo { + + + static const uint32_t __maybe_unused vmw_primary_plane_formats[] = { +- DRM_FORMAT_XRGB1555, +- DRM_FORMAT_RGB565, + DRM_FORMAT_XRGB8888, + DRM_FORMAT_ARGB8888, ++ DRM_FORMAT_RGB565, ++ DRM_FORMAT_XRGB1555, + }; + + static const uint32_t __maybe_unused vmw_cursor_plane_formats[] = { diff --git a/queue-6.1/nilfs2-fix-oob-in-nilfs_set_de_type.patch b/queue-6.1/nilfs2-fix-oob-in-nilfs_set_de_type.patch new file mode 100644 index 0000000000..f463678c28 --- /dev/null +++ b/queue-6.1/nilfs2-fix-oob-in-nilfs_set_de_type.patch @@ -0,0 +1,53 @@ +From c4a7dc9523b59b3e73fd522c73e95e072f876b16 Mon Sep 17 00:00:00 2001 +From: Jeongjun Park <aha310510@gmail.com> +Date: Tue, 16 Apr 2024 03:20:48 +0900 +Subject: nilfs2: fix OOB in nilfs_set_de_type + +From: Jeongjun Park <aha310510@gmail.com> + +commit c4a7dc9523b59b3e73fd522c73e95e072f876b16 upstream. + +The size of the nilfs_type_by_mode array in the fs/nilfs2/dir.c file is +defined as "S_IFMT >> S_SHIFT", but the nilfs_set_de_type() function, +which uses this array, specifies the index to read from the array in the +same way as "(mode & S_IFMT) >> S_SHIFT". + +static void nilfs_set_de_type(struct nilfs_dir_entry *de, struct inode + *inode) +{ + umode_t mode = inode->i_mode; + + de->file_type = nilfs_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; // oob +} + +However, when the index is determined this way, an out-of-bounds (OOB) +error occurs by referring to an index that is 1 larger than the array size +when the condition "mode & S_IFMT == S_IFMT" is satisfied. Therefore, a +patch to resize the nilfs_type_by_mode array should be applied to prevent +OOB errors. + +Link: https://lkml.kernel.org/r/20240415182048.7144-1-konishi.ryusuke@gmail.com +Reported-by: syzbot+2e22057de05b9f3b30d8@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=2e22057de05b9f3b30d8 +Fixes: 2ba466d74ed7 ("nilfs2: directory entry operations") +Signed-off-by: Jeongjun Park <aha310510@gmail.com> +Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> +Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + fs/nilfs2/dir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/nilfs2/dir.c ++++ b/fs/nilfs2/dir.c +@@ -243,7 +243,7 @@ nilfs_filetype_table[NILFS_FT_MAX] = { + + #define S_SHIFT 12 + static unsigned char +-nilfs_type_by_mode[S_IFMT >> S_SHIFT] = { ++nilfs_type_by_mode[(S_IFMT >> S_SHIFT) + 1] = { + [S_IFREG >> S_SHIFT] = NILFS_FT_REG_FILE, + [S_IFDIR >> S_SHIFT] = NILFS_FT_DIR, + [S_IFCHR >> S_SHIFT] = NILFS_FT_CHRDEV, diff --git a/queue-6.1/nouveau-fix-instmem-race-condition-around-ptr-stores.patch b/queue-6.1/nouveau-fix-instmem-race-condition-around-ptr-stores.patch new file mode 100644 index 0000000000..7760cb3a1d --- /dev/null +++ b/queue-6.1/nouveau-fix-instmem-race-condition-around-ptr-stores.patch @@ -0,0 +1,96 @@ +From fff1386cc889d8fb4089d285f883f8cba62d82ce Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Thu, 11 Apr 2024 11:15:09 +1000 +Subject: nouveau: fix instmem race condition around ptr stores + +From: Dave Airlie <airlied@redhat.com> + +commit fff1386cc889d8fb4089d285f883f8cba62d82ce upstream. + +Running a lot of VK CTS in parallel against nouveau, once every +few hours you might see something like this crash. + +BUG: kernel NULL pointer dereference, address: 0000000000000008 +PGD 8000000114e6e067 P4D 8000000114e6e067 PUD 109046067 PMD 0 +Oops: 0000 [#1] PREEMPT SMP PTI +CPU: 7 PID: 53891 Comm: deqp-vk Not tainted 6.8.0-rc6+ #27 +Hardware name: Gigabyte Technology Co., Ltd. Z390 I AORUS PRO WIFI/Z390 I AORUS PRO WIFI-CF, BIOS F8 11/05/2021 +RIP: 0010:gp100_vmm_pgt_mem+0xe3/0x180 [nouveau] +Code: c7 48 01 c8 49 89 45 58 85 d2 0f 84 95 00 00 00 41 0f b7 46 12 49 8b 7e 08 89 da 42 8d 2c f8 48 8b 47 08 41 83 c7 01 48 89 ee <48> 8b 40 08 ff d0 0f 1f 00 49 8b 7e 08 48 89 d9 48 8d 75 04 48 c1 +RSP: 0000:ffffac20c5857838 EFLAGS: 00010202 +RAX: 0000000000000000 RBX: 00000000004d8001 RCX: 0000000000000001 +RDX: 00000000004d8001 RSI: 00000000000006d8 RDI: ffffa07afe332180 +RBP: 00000000000006d8 R08: ffffac20c5857ad0 R09: 0000000000ffff10 +R10: 0000000000000001 R11: ffffa07af27e2de0 R12: 000000000000001c +R13: ffffac20c5857ad0 R14: ffffa07a96fe9040 R15: 000000000000001c +FS: 00007fe395eed7c0(0000) GS:ffffa07e2c980000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 0000000000000008 CR3: 000000011febe001 CR4: 00000000003706f0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: + +... + + ? gp100_vmm_pgt_mem+0xe3/0x180 [nouveau] + ? gp100_vmm_pgt_mem+0x37/0x180 [nouveau] + nvkm_vmm_iter+0x351/0xa20 [nouveau] + ? __pfx_nvkm_vmm_ref_ptes+0x10/0x10 [nouveau] + ? __pfx_gp100_vmm_pgt_mem+0x10/0x10 [nouveau] + ? __pfx_gp100_vmm_pgt_mem+0x10/0x10 [nouveau] + ? __lock_acquire+0x3ed/0x2170 + ? __pfx_gp100_vmm_pgt_mem+0x10/0x10 [nouveau] + nvkm_vmm_ptes_get_map+0xc2/0x100 [nouveau] + ? __pfx_nvkm_vmm_ref_ptes+0x10/0x10 [nouveau] + ? __pfx_gp100_vmm_pgt_mem+0x10/0x10 [nouveau] + nvkm_vmm_map_locked+0x224/0x3a0 [nouveau] + +Adding any sort of useful debug usually makes it go away, so I hand +wrote the function in a line, and debugged the asm. + +Every so often pt->memory->ptrs is NULL. This ptrs ptr is set in +the nv50_instobj_acquire called from nvkm_kmap. + +If Thread A and Thread B both get to nv50_instobj_acquire around +the same time, and Thread A hits the refcount_set line, and in +lockstep thread B succeeds at refcount_inc_not_zero, there is a +chance the ptrs value won't have been stored since refcount_set +is unordered. Force a memory barrier here, I picked smp_mb, since +we want it on all CPUs and it's write followed by a read. + +v2: use paired smp_rmb/smp_wmb. + +Cc: <stable@vger.kernel.org> +Fixes: be55287aa5ba ("drm/nouveau/imem/nv50: embed nvkm_instobj directly into nv04_instobj") +Signed-off-by: Dave Airlie <airlied@redhat.com> +Signed-off-by: Danilo Krummrich <dakr@redhat.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20240411011510.2546857-1-airlied@gmail.com +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +@@ -221,8 +221,11 @@ nv50_instobj_acquire(struct nvkm_memory + void __iomem *map = NULL; + + /* Already mapped? */ +- if (refcount_inc_not_zero(&iobj->maps)) ++ if (refcount_inc_not_zero(&iobj->maps)) { ++ /* read barrier match the wmb on refcount set */ ++ smp_rmb(); + return iobj->map; ++ } + + /* Take the lock, and re-check that another thread hasn't + * already mapped the object in the meantime. +@@ -249,6 +252,8 @@ nv50_instobj_acquire(struct nvkm_memory + iobj->base.memory.ptrs = &nv50_instobj_fast; + else + iobj->base.memory.ptrs = &nv50_instobj_slow; ++ /* barrier to ensure the ptrs are written before refcount is set */ ++ smp_wmb(); + refcount_set(&iobj->maps, 1); + } + diff --git a/queue-6.1/series b/queue-6.1/series index da1ec93b6a..31d4a7cf30 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -126,3 +126,9 @@ kvm-x86-pmu-do-not-mask-lvtpc-when-handling-a-pmi-on-amd-platforms.patch arm64-hibernate-fix-level3-translation-fault-in-swsusp_save.patch init-main.c-fix-potential-static_command_line-memory-overflow.patch mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch +drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch +drm-vmwgfx-sort-primary-plane-formats-by-order-of-preference.patch +drm-vmwgfx-fix-crtc-s-atomic-check-conditional.patch +nouveau-fix-instmem-race-condition-around-ptr-stores.patch +bootconfig-use-memblock_free_late-to-free-xbc-memory-to-buddy.patch +nilfs2-fix-oob-in-nilfs_set_de_type.patch |