summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2024-09-12 09:07:11 -0400
committerMike Pagano <mpagano@gentoo.org>2024-09-12 09:07:11 -0400
commit9ca4d20e2535253eb3da4c5d4b5d84ed351d1a11 (patch)
tree97a99af844082e38cd41ea9fa0cac31c4e0ba86c
parentLinux patch 6.10.10 (diff)
downloadlinux-patches-9ca4d20e2535253eb3da4c5d4b5d84ed351d1a11.tar.gz
linux-patches-9ca4d20e2535253eb3da4c5d4b5d84ed351d1a11.tar.bz2
linux-patches-9ca4d20e2535253eb3da4c5d4b5d84ed351d1a11.zip
Remove redundant patches6.10-13
Removed: 1710_parisc-Delay-write-protection.patch 1900_xfs-finobt-count-blocks-fix.patch Signed-off-by: Mike Pagano <mpagano@gentoo.org>
-rw-r--r--0000_README8
-rw-r--r--1710_parisc-Delay-write-protection.patch61
-rw-r--r--1900_xfs-finobt-count-blocks-fix.patch55
3 files changed, 0 insertions, 124 deletions
diff --git a/0000_README b/0000_README
index 3b3f17cf..fbbb6719 100644
--- a/0000_README
+++ b/0000_README
@@ -91,18 +91,10 @@ Patch: 1700_sparc-address-warray-bound-warnings.patch
From: https://github.com/KSPP/linux/issues/109
Desc: Address -Warray-bounds warnings
-Patch: 1710_parisc-Delay-write-protection.patch
-From: https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
-Desc: parisc: Delay write-protection until mark_rodata_ro() call
-
Patch: 1730_parisc-Disable-prctl.patch
From: https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
Desc: prctl: Temporarily disable prctl(PR_SET_MDWE) on parisc
-Patch: 1900_xfs-finobt-count-blocks-fix.patch
-From: https://lore.kernel.org/linux-xfs/20240813152530.GF6051@frogsfrogsfrogs/T/#mdc718f38912ccc1b9b53b46d9adfaeff0828b55f
-Desc: xfs: xfs_finobt_count_blocks() walks the wrong btree
-
Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
diff --git a/1710_parisc-Delay-write-protection.patch b/1710_parisc-Delay-write-protection.patch
deleted file mode 100644
index efdd4c27..00000000
--- a/1710_parisc-Delay-write-protection.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 213aa670153ed675a007c1f35c5db544b0fefc94 Mon Sep 17 00:00:00 2001
-From: Helge Deller <deller@gmx.de>
-Date: Sat, 31 Aug 2024 14:02:06 +0200
-Subject: parisc: Delay write-protection until mark_rodata_ro() call
-
-Do not write-protect the kernel read-only and __ro_after_init sections
-earlier than before mark_rodata_ro() is called. This fixes a boot issue on
-parisc which is triggered by commit 91a1d97ef482 ("jump_label,module: Don't
-alloc static_key_mod for __ro_after_init keys"). That commit may modify
-static key contents in the __ro_after_init section at bootup, so this
-section needs to be writable at least until mark_rodata_ro() is called.
-
-Signed-off-by: Helge Deller <deller@gmx.de>
-Reported-by: matoro <matoro_mailinglist_kernel@matoro.tk>
-Reported-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
-Tested-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
-Link: https://lore.kernel.org/linux-parisc/096cad5aada514255cd7b0b9dbafc768@matoro.tk/#r
-Fixes: 91a1d97ef482 ("jump_label,module: Don't alloc static_key_mod for __ro_after_init keys")
-Cc: stable@vger.kernel.org # v6.10+
----
- arch/parisc/mm/init.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
-index 34d91cb8b25905..96970fa75e4ac9 100644
---- a/arch/parisc/mm/init.c
-+++ b/arch/parisc/mm/init.c
-@@ -459,7 +459,6 @@ void free_initmem(void)
- unsigned long kernel_end = (unsigned long)&_end;
-
- /* Remap kernel text and data, but do not touch init section yet. */
-- kernel_set_to_readonly = true;
- map_pages(init_end, __pa(init_end), kernel_end - init_end,
- PAGE_KERNEL, 0);
-
-@@ -493,11 +492,18 @@ void free_initmem(void)
- #ifdef CONFIG_STRICT_KERNEL_RWX
- void mark_rodata_ro(void)
- {
-- /* rodata memory was already mapped with KERNEL_RO access rights by
-- pagetable_init() and map_pages(). No need to do additional stuff here */
-- unsigned long roai_size = __end_ro_after_init - __start_ro_after_init;
-+ unsigned long start = (unsigned long) &__start_rodata;
-+ unsigned long end = (unsigned long) &__end_rodata;
-+
-+ pr_info("Write protecting the kernel read-only data: %luk\n",
-+ (end - start) >> 10);
-+
-+ kernel_set_to_readonly = true;
-+ map_pages(start, __pa(start), end - start, PAGE_KERNEL, 0);
-
-- pr_info("Write protected read-only-after-init data: %luk\n", roai_size >> 10);
-+ /* force the kernel to see the new page table entries */
-+ flush_cache_all();
-+ flush_tlb_all();
- }
- #endif
-
---
-cgit 1.2.3-korg
-
diff --git a/1900_xfs-finobt-count-blocks-fix.patch b/1900_xfs-finobt-count-blocks-fix.patch
deleted file mode 100644
index 02f60712..00000000
--- a/1900_xfs-finobt-count-blocks-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-xfs: xfs_finobt_count_blocks() walks the wrong btree
-
-From: Dave Chinner <dchinner@redhat.com>
-
-As a result of the factoring in commit 14dd46cf31f4 ("xfs: split
-xfs_inobt_init_cursor"), mount started taking a long time on a
-user's filesystem. For Anders, this made mount times regress from
-under a second to over 15 minutes for a filesystem with only 30
-million inodes in it.
-
-Anders bisected it down to the above commit, but even then the bug
-was not obvious. In this commit, over 20 calls to
-xfs_inobt_init_cursor() were modified, and some we modified to call
-a new function named xfs_finobt_init_cursor().
-
-If that takes you a moment to reread those function names to see
-what the rename was, then you have realised why this bug wasn't
-spotted during review. And it wasn't spotted on inspection even
-after the bisect pointed at this commit - a single missing "f" isn't
-the easiest thing for a human eye to notice....
-
-The result is that xfs_finobt_count_blocks() now incorrectly calls
-xfs_inobt_init_cursor() so it is now walking the inobt instead of
-the finobt. Hence when there are lots of allocated inodes in a
-filesystem, mount takes a -long- time run because it now walks a
-massive allocated inode btrees instead of the small, nearly empty
-free inode btrees. It also means all the finobt space reservations
-are wrong, so mount could potentially given ENOSPC on kernel
-upgrade.
-
-In hindsight, commit 14dd46cf31f4 should have been two commits - the
-first to convert the finobt callers to the new API, the second to
-modify the xfs_inobt_init_cursor() API for the inobt callers. That
-would have made the bug very obvious during review.
-
-Fixes: 14dd46cf31f4 ("xfs: split xfs_inobt_init_cursor")
-Reported-by: Anders Blomdell <anders.blomdell@gmail.com>
-Signed-off-by: Dave Chinner <dchinner@redhat.com>
----
- fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
-index 496e2f72a85b..797d5b5f7b72 100644
---- a/fs/xfs/libxfs/xfs_ialloc_btree.c
-+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
-@@ -749,7 +749,7 @@ xfs_finobt_count_blocks(
- if (error)
- return error;
-
-- cur = xfs_inobt_init_cursor(pag, tp, agbp);
-+ cur = xfs_finobt_init_cursor(pag, tp, agbp);
- error = xfs_btree_count_blocks(cur, tree_blocks);
- xfs_btree_del_cursor(cur, error);
- xfs_trans_brelse(tp, agbp);