diff --git a/srcpkgs/linux6.1/files/i386-dotconfig b/srcpkgs/linux6.1/files/i386-dotconfig index d9c3fd6f3eb..e19912dc7c4 100644 --- a/srcpkgs/linux6.1/files/i386-dotconfig +++ b/srcpkgs/linux6.1/files/i386-dotconfig @@ -485,12 +485,13 @@ CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # diff --git a/srcpkgs/linux6.1/files/x86_64-dotconfig b/srcpkgs/linux6.1/files/x86_64-dotconfig index 087f28ac707..9fc04bfa94f 100644 --- a/srcpkgs/linux6.1/files/x86_64-dotconfig +++ b/srcpkgs/linux6.1/files/x86_64-dotconfig @@ -507,7 +507,7 @@ CONFIG_HAVE_LIVEPATCH=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y @@ -518,6 +518,7 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y diff --git a/srcpkgs/linux6.1/patches/revert-gbpages.patch b/srcpkgs/linux6.1/patches/revert-gbpages.patch deleted file mode 100644 index 48098db8682..00000000000 --- a/srcpkgs/linux6.1/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.1/template b/srcpkgs/linux6.1/template index c5ec1fb85ab..68afbf08089 100644 --- a/srcpkgs/linux6.1/template +++ b/srcpkgs/linux6.1/template @@ -1,6 +1,6 @@ # Template file for 'linux6.1' pkgname=linux6.1 -version=6.1.83 +version=6.1.91 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Đoàn Trần Công Danh " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb - 9268c5f79c00caf77e4be77795e26be36862eb60fd0d78a2f6bc5baeac84dd82" + a6eba132c7b412cea7a3f08f94cd5895681b98d2ad0e23949656383487e0d19c" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.