diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-21 13:01:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-21 13:01:37 +0200 |
| commit | bc68b44fd6f62c11fcebe873fa2440c7abae2a2b (patch) | |
| tree | 604a531b72a7730e28c0e877b5c47740bc646e9b | |
| parent | 8b60edbcb1a629ddee7f8d216b1a5cf98a15bd44 (diff) | |
| download | stable-queue-bc68b44fd6f62c11fcebe873fa2440c7abae2a2b.tar.gz | |
6.15-stable patches
added patches:
drm-appletbdrm-make-appletbdrm-depend-on-x86.patch
mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch
| -rw-r--r-- | queue-6.15/drm-appletbdrm-make-appletbdrm-depend-on-x86.patch | 32 | ||||
| -rw-r--r-- | queue-6.15/mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch | 53 | ||||
| -rw-r--r-- | queue-6.15/series | 2 |
3 files changed, 87 insertions, 0 deletions
diff --git a/queue-6.15/drm-appletbdrm-make-appletbdrm-depend-on-x86.patch b/queue-6.15/drm-appletbdrm-make-appletbdrm-depend-on-x86.patch new file mode 100644 index 00000000000..15b69ee682b --- /dev/null +++ b/queue-6.15/drm-appletbdrm-make-appletbdrm-depend-on-x86.patch @@ -0,0 +1,32 @@ +From de5fbbe1531f645c8b56098be8d1faf31e46f7f0 Mon Sep 17 00:00:00 2001 +From: Aditya Garg <gargaditya08@live.com> +Date: Thu, 10 Apr 2025 23:50:01 +0530 +Subject: drm/appletbdrm: Make appletbdrm depend on X86 + +From: Aditya Garg <gargaditya08@live.com> + +commit de5fbbe1531f645c8b56098be8d1faf31e46f7f0 upstream. + +The appletbdrm driver is exclusively for Touch Bars on x86 Intel Macs. +The M1 Macs have a separate driver. So, lets avoid compiling it for +other architectures. + +Signed-off-by: Aditya Garg <gargaditya08@live.com> +Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> +Link: https://lore.kernel.org/r/PN3PR01MB95970778982F28E4A3751392B8B72@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM +Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/tiny/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/tiny/Kconfig ++++ b/drivers/gpu/drm/tiny/Kconfig +@@ -3,6 +3,7 @@ + config DRM_APPLETBDRM + tristate "DRM support for Apple Touch Bars" + depends on DRM && USB && MMU ++ depends on X86 || COMPILE_TEST + select DRM_GEM_SHMEM_HELPER + select DRM_KMS_HELPER + help diff --git a/queue-6.15/mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch b/queue-6.15/mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch new file mode 100644 index 00000000000..432d3b14600 --- /dev/null +++ b/queue-6.15/mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch @@ -0,0 +1,53 @@ +From 9c49e5d09f076001e05537734d7df002162eb2b5 Mon Sep 17 00:00:00 2001 +From: SeongJae Park <sj@kernel.org> +Date: Mon, 2 Jun 2025 10:49:26 -0700 +Subject: mm/madvise: handle madvise_lock() failure during race unwinding + +From: SeongJae Park <sj@kernel.org> + +commit 9c49e5d09f076001e05537734d7df002162eb2b5 upstream. + +When unwinding race on -ERESTARTNOINTR handling of process_madvise(), +madvise_lock() failure is ignored. Check the failure and abort remaining +works in the case. + +Link: https://lkml.kernel.org/r/20250602174926.1074-1-sj@kernel.org +Fixes: 4000e3d0a367 ("mm/madvise: remove redundant mmap_lock operations from process_madvise()") +Signed-off-by: SeongJae Park <sj@kernel.org> +Reported-by: Barry Song <21cnbao@gmail.com> +Closes: https://lore.kernel.org/CAGsJ_4xJXXO0G+4BizhohSZ4yDteziPw43_uF8nPXPWxUVChzw@mail.gmail.com +Reviewed-by: Jann Horn <jannh@google.com> +Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> +Acked-by: David Hildenbrand <david@redhat.com> +Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev> +Reviewed-by: Barry Song <baohua@kernel.org> +Cc: Liam Howlett <liam.howlett@oracle.com> +Cc: Vlastimil Babka <vbabka@suse.cz> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + mm/madvise.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/mm/madvise.c ++++ b/mm/madvise.c +@@ -1832,7 +1832,9 @@ static ssize_t vector_madvise(struct mm_ + + /* Drop and reacquire lock to unwind race. */ + madvise_unlock(mm, behavior); +- madvise_lock(mm, behavior); ++ ret = madvise_lock(mm, behavior); ++ if (ret) ++ goto out; + continue; + } + if (ret < 0) +@@ -1841,6 +1843,7 @@ static ssize_t vector_madvise(struct mm_ + } + madvise_unlock(mm, behavior); + ++out: + ret = (total_len - iov_iter_count(iter)) ? : ret; + + return ret; diff --git a/queue-6.15/series b/queue-6.15/series index d435b8e1e4a..9383fa4a4b0 100644 --- a/queue-6.15/series +++ b/queue-6.15/series @@ -494,3 +494,5 @@ alsa-hda-realtek-add-mute-led-support-for-hp-victus-16-s1xxx-and-hp-victus-15-fa alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch alsa-hda-realtek-fix-built-in-mic-on-asus-vivobook-x513ea.patch alsa-hda-realtek-add-quirk-for-asus-gu605c.patch +drm-appletbdrm-make-appletbdrm-depend-on-x86.patch +mm-madvise-handle-madvise_lock-failure-during-race-unwinding.patch |