From a61a4a6c510ea3a4ece858e17d7fb0119f22b071 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 16 Apr 2024 19:25:42 +0200 Subject: [PATCH] linux6.6: update to 6.6.27. --- srcpkgs/linux6.6/files/i386-dotconfig | 8 +- srcpkgs/linux6.6/files/x86_64-dotconfig | 9 ++- srcpkgs/linux6.6/patches/revert-gbpages.patch | 75 ------------------- srcpkgs/linux6.6/template | 4 +- 4 files changed, 12 insertions(+), 84 deletions(-) delete mode 100644 srcpkgs/linux6.6/patches/revert-gbpages.patch diff --git a/srcpkgs/linux6.6/files/i386-dotconfig b/srcpkgs/linux6.6/files/i386-dotconfig index 6308b2af13a..69eda597568 100644 --- a/srcpkgs/linux6.6/files/i386-dotconfig +++ b/srcpkgs/linux6.6/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.6.22 Kernel Configuration +# Linux/i386 6.6.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -180,7 +180,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y @@ -503,6 +503,9 @@ CONFIG_RETPOLINE=y CONFIG_RETHUNK=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_SPECTRE_BHI_ON=y +# CONFIG_SPECTRE_BHI_OFF is not set +# CONFIG_SPECTRE_BHI_AUTO is not set # # Power management and ACPI options @@ -1795,7 +1798,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -CONFIG_BT_HS=y CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_LEDS=y diff --git a/srcpkgs/linux6.6/files/x86_64-dotconfig b/srcpkgs/linux6.6/files/x86_64-dotconfig index 1144abfc9a7..d0a3d7baa54 100644 --- a/srcpkgs/linux6.6/files/x86_64-dotconfig +++ b/srcpkgs/linux6.6/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.6.22 Kernel Configuration +# Linux/x86_64 6.6.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -194,7 +194,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y @@ -453,7 +453,6 @@ CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_CPA_STATISTICS=y CONFIG_X86_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y @@ -547,6 +546,9 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_SPECTRE_BHI_ON=y +# CONFIG_SPECTRE_BHI_OFF is not set +# CONFIG_SPECTRE_BHI_AUTO is not set CONFIG_ARCH_HAS_ADD_PAGES=y # @@ -1951,7 +1953,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -CONFIG_BT_HS=y CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y CONFIG_BT_6LOWPAN=m diff --git a/srcpkgs/linux6.6/patches/revert-gbpages.patch b/srcpkgs/linux6.6/patches/revert-gbpages.patch deleted file mode 100644 index 48098db8682..00000000000 --- a/srcpkgs/linux6.6/patches/revert-gbpages.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c567f2948f57bdc03ed03403ae0234085f376b7d Mon Sep 17 00:00:00 2001 -From: Ingo Molnar -Date: Mon, 25 Mar 2024 11:47:51 +0100 -Subject: Revert "x86/mm/ident_map: Use gbpages only where full GB page should - be mapped." - -This reverts commit d794734c9bbfe22f86686dc2909c25f5ffe1a572. - -While the original change tries to fix a bug, it also unintentionally broke -existing systems, see the regressions reported at: - - https://lore.kernel.org/all/3a1b9909-45ac-4f97-ad68-d16ef1ce99db@pavinjoseph.com/ - -Since d794734c9bbf was also marked for -stable, let's back it out before -causing more damage. - -Note that due to another upstream change the revert was not 100% automatic: - - 0a845e0f6348 mm/treewide: replace pud_large() with pud_leaf() - -Signed-off-by: Ingo Molnar -Cc: -Cc: Russ Anderson -Cc: Steve Wahl -Cc: Dave Hansen -Link: https://lore.kernel.org/all/3a1b9909-45ac-4f97-ad68-d16ef1ce99db@pavinjoseph.com/ -Fixes: d794734c9bbf ("x86/mm/ident_map: Use gbpages only where full GB page should be mapped.") ---- - arch/x86/mm/ident_map.c | 23 +++++------------------ - 1 file changed, 5 insertions(+), 18 deletions(-) - -diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c -index a204a332c71fc5..968d7005f4a724 100644 ---- a/arch/x86/mm/ident_map.c -+++ b/arch/x86/mm/ident_map.c -@@ -26,31 +26,18 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, - for (; addr < end; addr = next) { - pud_t *pud = pud_page + pud_index(addr); - pmd_t *pmd; -- bool use_gbpage; - - next = (addr & PUD_MASK) + PUD_SIZE; - if (next > end) - next = end; - -- /* if this is already a gbpage, this portion is already mapped */ -- if (pud_large(*pud)) -- continue; -- -- /* Is using a gbpage allowed? */ -- use_gbpage = info->direct_gbpages; -- -- /* Don't use gbpage if it maps more than the requested region. */ -- /* at the begining: */ -- use_gbpage &= ((addr & ~PUD_MASK) == 0); -- /* ... or at the end: */ -- use_gbpage &= ((next & ~PUD_MASK) == 0); -- -- /* Never overwrite existing mappings */ -- use_gbpage &= !pud_present(*pud); -- -- if (use_gbpage) { -+ if (info->direct_gbpages) { - pud_t pudval; - -+ if (pud_present(*pud)) -+ continue; -+ -+ addr &= PUD_MASK; - pudval = __pud((addr - info->offset) | info->page_flag); - set_pud(pud, pudval); - continue; --- -cgit 1.2.3-korg - diff --git a/srcpkgs/linux6.6/template b/srcpkgs/linux6.6/template index db7dc24e99b..835785a4747 100644 --- a/srcpkgs/linux6.6/template +++ b/srcpkgs/linux6.6/template @@ -1,6 +1,6 @@ # Template file for 'linux6.6' pkgname=linux6.6 -version=6.6.25 +version=6.6.27 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0 - 2a569b39e5fea2c4f417b7ce3c017c90a5f57a9db2c2b19c8ec8c76788b22263" + 08de3bf1c8221608b0f0ac2de68ca01c6aa4481c9effbab566d2c59d3926b68a" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.