6.4: Update for 6.4.1

Signed-off-by: Peter Jung <[email protected]>
CachyOS · Jul 1, 2023 · 58c0cdc · 58c0cdc
1 parent 51fd795
commit 58c0cdc
Show file tree

Hide file tree

Showing 17 changed files with 260 additions and 24,173 deletions.
diff --git a/6.3/all/0001-cachyos-base-all.tar.gz b/6.3/all/0001-cachyos-base-all.tar.gz
diff --git a/6.4/0001-bbr2.patch b/6.4/0001-bbr2.patch
@@ -1,7 +1,7 @@
-From f1a625264b0e94d3e8b5ea03dd3f85275688ef67 Mon Sep 17 00:00:00 2001
+From 4ab0a89f6041a700bfc9b341d37dfdceafa3ddc9 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Tue, 9 May 2023 18:38:36 +0200
-Subject: [PATCH 1/9] bbr2
+Subject: [PATCH 1/8] bbr2
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

diff --git a/6.4/0002-cachy.patch b/6.4/0002-cachy.patch
@@ -1,7 +1,7 @@
-From 6eb9db80bc8be24103a5bb3a379c04d7ec6eaf25 Mon Sep 17 00:00:00 2001
+From b0be3056917c37ac3cf69603878e5d66d8c2bdad Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
-Date: Thu, 1 Jun 2023 16:35:02 +0200
-Subject: [PATCH 2/9] cachy
+Date: Sat, 1 Jul 2023 15:11:26 +0200
+Subject: [PATCH 2/8] cachy
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -50,10 +50,9 @@ Signed-off-by: Peter Jung <[email protected]>
  include/linux/mm.h                            |    2 +-
  include/linux/pagemap.h                       |    2 +-
  include/linux/user_namespace.h                |    4 +
- init/Kconfig                                  |   39 +
+ init/Kconfig                                  |   26 +
  kernel/Kconfig.hz                             |   24 +
  kernel/fork.c                                 |   14 +
- kernel/module/Kconfig                         |   25 +
  kernel/sched/fair.c                           |   20 +-
  kernel/sysctl.c                               |   12 +
  kernel/user_namespace.c                       |    7 +
@@ -62,9 +61,7 @@ Signed-off-by: Peter Jung <[email protected]>
  mm/swap.c                                     |    5 +
  mm/vmpressure.c                               |    4 +
  mm/vmscan.c                                   |    8 +
- scripts/Makefile.lib                          |   13 +-
- scripts/Makefile.modinst                      |    7 +-
- 59 files changed, 5395 insertions(+), 65 deletions(-)
+ 56 files changed, 5341 insertions(+), 61 deletions(-)
  create mode 100644 arch/x86/Makefile.postlink
  create mode 100644 drivers/i2c/busses/i2c-nct6775.c
  create mode 100644 drivers/pci/controller/intel-nvme-remap.c
@@ -126,7 +123,7 @@ index 3c399f132e2d..a62ad01e6d11 100644
  vmlinuz
  voffset.h
 diff --git a/Makefile b/Makefile
-index e51e4d9174ab..14e8b07e5e95 100644
+index 9f6376cbafeb..26f594d699d5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -818,6 +818,9 @@ KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
@@ -5973,7 +5970,7 @@ index 000000000000..77a6677ec19e
 +MODULE_DESCRIPTION("Steam Deck ACPI platform driver");
 +MODULE_LICENSE("GPL");
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 27ce77080c79..cd9b319f03ef 100644
+index 6cbcc55a80b0..f80819d5a23e 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -191,7 +191,7 @@ static inline void __mm_zero_struct_page(struct page *page)
@@ -6021,7 +6018,7 @@ index 45f09bec02c4..87b20e2ee274 100644
  {
  	return &init_user_ns;
 diff --git a/init/Kconfig b/init/Kconfig
-index 32c24950c4ce..0147b4a33161 100644
+index 32c24950c4ce..b6d38eccca10 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -123,6 +123,10 @@ config THREAD_INFO_IN_TASK
@@ -6035,27 +6032,7 @@ index 32c24950c4ce..0147b4a33161 100644
  config BROKEN
  	bool
 
-@@ -348,6 +352,19 @@ config KERNEL_UNCOMPRESSED
-
- endchoice
-
-+menu "ZSTD compression options"
-+	depends on KERNEL_ZSTD
-+
-+config ZSTD_COMPRESSION_LEVEL
-+	int "Compression level (1-22)"
-+	range 1 22
-+	default "22"
-+	help
-+	  Choose a compression level for zstd kernel compression.
-+	  Default is 22, which is the maximum.
-+
-+endmenu
-+
- config DEFAULT_INIT
- 	string "Default init path"
- 	default ""
-@@ -1225,6 +1242,22 @@ config USER_NS
+@@ -1225,6 +1229,22 @@ config USER_NS
 
  	  If unsure, say N.
 
@@ -6078,7 +6055,7 @@ index 32c24950c4ce..0147b4a33161 100644
  config PID_NS
  	bool "PID Namespaces"
  	default y
-@@ -1367,6 +1400,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -1367,6 +1387,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
  	  with the "-O2" compiler flag for best performance and most
  	  helpful compile-time warnings.
 
@@ -6172,42 +6149,6 @@ index 41c964104b58..915ad6dae416 100644
  	err = check_unshare_flags(unshare_flags);
  	if (err)
  		goto bad_unshare_out;
-diff --git a/kernel/module/Kconfig b/kernel/module/Kconfig
-index 33a2e991f608..0dceefdac58a 100644
---- a/kernel/module/Kconfig
-+++ b/kernel/module/Kconfig
-@@ -317,6 +317,31 @@ config MODULE_COMPRESS_ZSTD
-
- endchoice
-
-+menu "ZSTD module compression options"
-+    depends on MODULE_COMPRESS_ZSTD
-+
-+config MODULE_COMPRESS_ZSTD_LEVEL
-+	int "Compression level (1-19)"
-+	range 1 19
-+	default 9
-+	help
-+	  Compression level used by zstd for compressing modules.
-+
-+config MODULE_COMPRESS_ZSTD_ULTRA
-+	bool "Enable ZSTD ultra compression"
-+	help
-+	  Compress modules with ZSTD using the highest possible compression.
-+
-+config MODULE_COMPRESS_ZSTD_LEVEL_ULTRA
-+	int "Compression level (20-22)"
-+	depends on MODULE_COMPRESS_ZSTD_ULTRA
-+	range 20 22
-+	default 20
-+	help
-+	  Ultra compression level used by zstd for compressing modules.
-+
-+endmenu
-+
- config MODULE_DECOMPRESS
- 	bool "Support in-kernel module decompression"
- 	depends on MODULE_COMPRESS_GZIP || MODULE_COMPRESS_XZ || MODULE_COMPRESS_ZSTD
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
 index 373ff5f55884..9671df93d1f5 100644
 --- a/kernel/sched/fair.c
@@ -6317,7 +6258,7 @@ index 1d8e47bed3f1..fec01d016a35 100644
  static DEFINE_MUTEX(userns_state_mutex);
 
 diff --git a/mm/Kconfig b/mm/Kconfig
-index 7672a22647b4..d2e3105f7b2e 100644
+index e3454087fd31..bc617f00f97c 100644
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
 @@ -605,7 +605,7 @@ config COMPACTION
@@ -6422,54 +6363,6 @@ index 5bf98d0a22c9..28f6d5cd362e 100644
 
  static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc)
  {
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 100a386fcd71..a3ec7265fb57 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -542,14 +542,21 @@ quiet_cmd_xzmisc = XZMISC  $@
- # decompression is used, like initramfs decompression, zstd22 should likely not
- # be used because it would require zstd to allocate a 128 MB buffer.
-
-+ifdef CONFIG_ZSTD_COMPRESSION_LEVEL
-+zstd_comp_val	:= $(CONFIG_ZSTD_COMPRESSION_LEVEL)
-+ifeq ($(shell test $(zstd_comp_val) -gt 19; echo $$?),0)
-+zstd_comp_val	+= --ultra
-+endif
-+endif
-+
- quiet_cmd_zstd = ZSTD    $@
--      cmd_zstd = cat $(real-prereqs) | $(ZSTD) -19 > $@
-+      cmd_zstd = cat $(real-prereqs) | $(ZSTD) -T0 -19 > $@
-
- quiet_cmd_zstd22 = ZSTD22  $@
--      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@
-+      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -T0 -22 --ultra > $@
-
- quiet_cmd_zstd22_with_size = ZSTD22  $@
--      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
-+      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -T0 -$(zstd_comp_val); $(size_append); } > $@
-
- # ASM offsets
- # ---------------------------------------------------------------------------
-diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
-index ab0c5bd1a60f..f4989f706d7f 100644
---- a/scripts/Makefile.modinst
-+++ b/scripts/Makefile.modinst
-@@ -100,8 +100,13 @@ quiet_cmd_gzip = GZIP    $@
-       cmd_gzip = $(KGZIP) -n -f $<
- quiet_cmd_xz = XZ      $@
-       cmd_xz = $(XZ) --lzma2=dict=2MiB -f $<
-+ifdef CONFIG_MODULE_COMPRESS_ZSTD_ULTRA
- quiet_cmd_zstd = ZSTD    $@
--      cmd_zstd = $(ZSTD) -T0 --rm -f -q $<
-+      cmd_zstd = $(ZSTD) -$(CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA) --ultra --zstd=wlog=21 -T0 --rm -f -q $<
-+else
-+quiet_cmd_zstd = ZSTD    $@
-+      cmd_zstd = $(ZSTD) -$(CONFIG_MODULE_COMPRESS_ZSTD_LEVEL) --zstd=wlog=21 -T0 --rm -f -q $<
-+endif
-
- $(dst)/%.ko.gz: $(dst)/%.ko FORCE
- 	$(call cmd,gzip)
 -- 
 2.41.0
 
diff --git a/6.4/0003-ddcci.patch b/6.4/0003-ddcci.patch
@@ -1,7 +1,7 @@
-From edee2a2f9c845aff9a634cde10e9923430a5d440 Mon Sep 17 00:00:00 2001
+From b10c24b78e0fe1d76eca435913d54013ff35f9ce Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Tue, 9 May 2023 18:39:03 +0200
-Subject: [PATCH 3/9] ddcci
+Subject: [PATCH 3/8] ddcci
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

diff --git a/6.4/0004-fixes.patch b/6.4/0004-fixes.patch
@@ -1,7 +1,7 @@
-From 2986df400474803f0e0611fa7331b7bdb751abe6 Mon Sep 17 00:00:00 2001
+From 87a0f4f9c6f362b5fb226e811b018ec597ee9ee7 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
-Date: Tue, 20 Jun 2023 20:17:12 +0200
-Subject: [PATCH 4/9] fixes
+Date: Sat, 1 Jul 2023 15:11:45 +0200
+Subject: [PATCH 4/8] fixes
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -13,15 +13,15 @@ Signed-off-by: Peter Jung <[email protected]>
  drivers/leds/trigger/Kconfig                  |    9 +
  drivers/leds/trigger/Makefile                 |    1 +
  drivers/leds/trigger/ledtrig-blkdev.c         | 1221 +++++++++++++++++
- fs/eventpoll.c                                |    4 -
  include/linux/pageblock-flags.h               |    2 +-
  kernel/padata.c                               |    4 +-
  lib/decompress_inflate.c                      |    2 +-
  lib/decompress_unxz.c                         |    2 +
  lib/decompress_unzstd.c                       |    2 +
+ mm/mmap.c                                     |    9 +-
  scripts/Makefile.vmlinux_o                    |    2 +-
  sound/pci/hda/cs35l41_hda.c                   |    2 +-
- 16 files changed, 1489 insertions(+), 11 deletions(-)
+ 16 files changed, 1494 insertions(+), 11 deletions(-)
  create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blkdev
  create mode 100644 Documentation/leds/ledtrig-blkdev.rst
  create mode 100644 drivers/leds/trigger/ledtrig-blkdev.c
@@ -1574,21 +1574,6 @@ index 000000000000..067eedb003b5
 +MODULE_DESCRIPTION("Block device LED trigger");
 +MODULE_AUTHOR("Ian Pilcher <[email protected]>");
 +MODULE_LICENSE("GPL v2");
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 266d45c7685b..fb561fd0b443 100644
---- a/fs/eventpoll.c
-+++ b/fs/eventpoll.c
-@@ -1805,10 +1805,6 @@ static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry,
- {
- 	int ret = default_wake_function(wq_entry, mode, sync, key);
-
--	/*
--	 * Pairs with list_empty_careful in ep_poll, and ensures future loop
--	 * iterations see the cause of this wakeup.
--	 */
- 	list_del_init_careful(&wq_entry->entry);
- 	return ret;
- }
 diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h
 index e83c4c095041..21b8dfa5d828 100644
 --- a/include/linux/pageblock-flags.h
@@ -1663,6 +1648,36 @@ index a512b99ae16a..bba2c0bb10cb 100644
  #endif
 
  #include <linux/decompress/mm.h>
+diff --git a/mm/mmap.c b/mm/mmap.c
+index bc510361acec..d3d939d8410a 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -2476,7 +2476,8 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
+ 		}
+ 		vma_start_write(next);
+ 		mas_set_range(&mas_detach, next->vm_start, next->vm_end - 1);
+-		if (mas_store_gfp(&mas_detach, next, GFP_KERNEL))
++		error = mas_store_gfp(&mas_detach, next, GFP_KERNEL);
++		if (error)
+ 			goto munmap_gather_failed;
+ 		vma_mark_detached(next, true);
+ 		if (next->vm_flags & VM_LOCKED)
+@@ -2525,12 +2526,12 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
+ 		BUG_ON(count != test_count);
+ 	}
+ #endif
+-	/* Point of no return */
+-	error = -ENOMEM;
+ 	vma_iter_set(vmi, start);
+-	if (vma_iter_clear_gfp(vmi, start, end, GFP_KERNEL))
++	error = vma_iter_clear_gfp(vmi, start, end, GFP_KERNEL);
++	if (error)
+ 		goto clear_tree_failed;
+
++	/* Point of no return */
+ 	mm->locked_vm -= locked_vm;
+ 	mm->map_count -= count;
+ 	/*
 diff --git a/scripts/Makefile.vmlinux_o b/scripts/Makefile.vmlinux_o
 index 0edfdb40364b..ae52d3b3f063 100644
 --- a/scripts/Makefile.vmlinux_o

diff --git a/6.4/0005-ksm.patch b/6.4/0005-ksm.patch
@@ -1,7 +1,7 @@
-From b0c45146fa0dba728991ca74edfbc84342fc19fb Mon Sep 17 00:00:00 2001
+From d6acc3c1d3c68f7b733f4927dbd37ccb42da1d72 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 1 Jun 2023 16:35:38 +0200
-Subject: [PATCH 5/9] ksm
+Subject: [PATCH 5/8] ksm
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

diff --git a/6.4/0006-kvm-lru.patch b/6.4/0006-kvm-lru.patch
@@ -1,7 +1,7 @@
-From eff56a542dfa60bfd552ffe91433798d7ab057df Mon Sep 17 00:00:00 2001
+From 4a9bbe5211278e439c56852a36415d34e406362d Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 26 Jun 2023 17:01:13 +0200
-Subject: [PATCH 6/9] kvm-lru
+Subject: [PATCH 6/8] kvm-lru
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

diff --git a/6.4/0007-sched.patch b/6.4/0007-sched.patch
@@ -1,7 +1,7 @@
-From 5ae60d877e2fe3168176be97c13b2c0979fed07e Mon Sep 17 00:00:00 2001
+From cc7bb29d63840bc98e06aff203fab5d2bf9f0691 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Thu, 1 Jun 2023 16:35:57 +0200
-Subject: [PATCH 7/9] sched
+Subject: [PATCH 7/8] sched
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -62,10 +62,10 @@ index 670eb08b972a..ee4fe8cdb857 100644
 +	per_cpu(sched_core_priority, cpu) = prio;
  }
 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 352f0ce1ece4..34066f6735dd 100644
+index 483df0427678..bc64fd5ca69e 100644
 --- a/arch/x86/kernel/smpboot.c
 +++ b/arch/x86/kernel/smpboot.c
-@@ -552,7 +552,7 @@ static int x86_core_flags(void)
+@@ -571,7 +571,7 @@ static int x86_core_flags(void)
  #ifdef CONFIG_SCHED_SMT
  static int x86_smt_flags(void)
  {
@@ -74,7 +74,7 @@ index 352f0ce1ece4..34066f6735dd 100644
  }
  #endif
  #ifdef CONFIG_SCHED_CLUSTER
-@@ -583,7 +583,7 @@ static struct sched_domain_topology_level x86_hybrid_topology[] = {
+@@ -602,7 +602,7 @@ static struct sched_domain_topology_level x86_hybrid_topology[] = {
  #ifdef CONFIG_SCHED_MC
  	{ cpu_coregroup_mask, x86_core_flags, SD_INIT_NAME(MC) },
  #endif