From: Sasha Levin Date: Wed, 20 Sep 2023 08:29:33 +0000 (-0400) Subject: Drop efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch X-Git-Tag: v5.10.196~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94be90babecdefae0abeefc190ffedd54c5b54c7;p=thirdparty%2Fkernel%2Fstable-queue.git Drop efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.5/efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch b/queue-6.5/efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch deleted file mode 100644 index 5f2d3947bff..00000000000 --- a/queue-6.5/efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9fc76127512229b74539276e0e7880beea85c0bf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Aug 2023 21:05:57 +0200 -Subject: efi/unaccepted: Use ACPI reclaim memory for unaccepted memory table - -From: Ard Biesheuvel - -[ Upstream commit e7761d827e99919c32400056a884e481ef008ec4 ] - -Kyril reports that crashkernels fail to work on confidential VMs that -rely on the unaccepted memory table, and this appears to be caused by -the fact that it is not considered part of the set of firmware tables -that the crashkernel needs to map. - -This is an oversight, and a result of the use of the EFI_LOADER_DATA -memory type for this table. The correct memory type to use for any -firmware table is EFI_ACPI_RECLAIM_MEMORY (including ones created by the -EFI stub), even though the name suggests that is it specific to ACPI. -ACPI reclaim means that the memory is used by the firmware to expose -information to the operating system, but that the memory region has no -special significance to the firmware itself, and the OS is free to -reclaim the memory and use it as ordinary memory if it is not interested -in the contents, or if it has already consumed them. In Linux, this -memory is never reclaimed, but it is always covered by the kernel direct -map and generally made accessible as ordinary memory. - -On x86, ACPI reclaim memory is translated into E820_ACPI, which the -kexec logic already recognizes as memory that the crashkernel may need -to to access, and so it will be mapped and accessible to the booting -crash kernel. - -Fixes: 745e3ed85f71 ("efi/libstub: Implement support for unaccepted memory") -Reported-by: Kirill A. Shutemov -Signed-off-by: Ard Biesheuvel -Signed-off-by: Sasha Levin ---- - drivers/firmware/efi/libstub/unaccepted_memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/firmware/efi/libstub/unaccepted_memory.c b/drivers/firmware/efi/libstub/unaccepted_memory.c -index ca61f4733ea58..9a655f30ba47d 100644 ---- a/drivers/firmware/efi/libstub/unaccepted_memory.c -+++ b/drivers/firmware/efi/libstub/unaccepted_memory.c -@@ -62,7 +62,7 @@ efi_status_t allocate_unaccepted_bitmap(__u32 nr_desc, - bitmap_size = DIV_ROUND_UP(unaccepted_end - unaccepted_start, - EFI_UNACCEPTED_UNIT_SIZE * BITS_PER_BYTE); - -- status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, -+ status = efi_bs_call(allocate_pool, EFI_ACPI_RECLAIM_MEMORY, - sizeof(*unaccepted_table) + bitmap_size, - (void **)&unaccepted_table); - if (status != EFI_SUCCESS) { --- -2.40.1 - diff --git a/queue-6.5/series b/queue-6.5/series index 52d05b21560..7ede555c709 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -145,7 +145,6 @@ drm-gm12u320-fix-the-timeout-usage-for-usb_bulk_msg.patch scsi-qla2xxx-fix-null-vs-is_err-bug-for-debugfs_crea.patch md-don-t-dereference-mddev-after-export_rdev.patch md-fix-warning-for-holder-mismatch-from-export_rdev.patch -efi-unaccepted-use-acpi-reclaim-memory-for-unaccepte.patch efivarfs-fix-statfs-on-efivarfs.patch pm-hibernate-fix-the-exclusive-get-block-device-in-t.patch selftests-tracing-fix-to-unmount-tracefs-for-recover.patch