From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC803C7EE26 for ; Tue, 16 May 2023 12:07:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 566DD900006; Tue, 16 May 2023 08:07:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 516E6900002; Tue, 16 May 2023 08:07:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DEA4900006; Tue, 16 May 2023 08:07:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 2D33A900002 for ; Tue, 16 May 2023 08:07:09 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EB8A140231 for ; Tue, 16 May 2023 12:07:08 +0000 (UTC) X-FDA: 80795992536.03.368A2CB Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by imf12.hostedemail.com (Postfix) with ESMTP id EF70240008 for ; Tue, 16 May 2023 12:07:05 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UPmvEJUr; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf12.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.120) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684238826; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0pIWQzhyTwwz5zJrvdNIGRnHUe6a4waRhQhVWpWonrE=; b=Q5k0eHF2eohcusw+IjvJwOFTU+RFdcB9e9PG3+SvkLkGG504uZoSHo8aV/dKw2UaXqhxYC dcb9c0yq5bvOTLwq7AR8DkPvyMT8NVqlFpfewWLMy1uPqhwvilVKetxsbwGPVpV/zYiXmG iuPuhu8x4sVYjWeVJrLYA8EgNANk6VA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UPmvEJUr; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf12.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.120) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684238826; a=rsa-sha256; cv=none; b=FyXBeju341s+4w0OKT0O5qTM0yiEaFY/rGjobDJcR9T9qA/p2GfxVPmnFq9Fs5swAr4wuo dwI7Fsv3ld6zq2pNHHrJvJ23U3F1lXmD3o9FPMFUw5QYiXvKc3c7o8iIcK7D6QSTBD9Au+ g/YR4lNVR8u+EgzvfYS4XGZPUlUKO6g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684238825; x=1715774825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TzWOm3Mewv0PjnBqLlqHuGcExnpl6kTEJiKYo8/CWf0=; b=UPmvEJUrdax5n69fksX1ZJJNmaXP9tJqYwRSrjocfQf9D4dJ24BPtBPE TzLZEVvXwvwOoEijhf+bns08G1j2h/XOJrjWJJkijioGN7s0tfYdZpApI iZb3D3g4k0pyoORKhdJ9MVRIr7kpAj5q/HeAa+7jxwy0WrdCikTUpa8yJ BObsMaUEZf6mkkMb5pSy82UyGG1JGQB2gF/Xqi2ySx0EcIDtzQqs8agN+ IWeYL0Cyo2CUVtQA0Z9vFudfNzEBZQCxF9tJ2/0YaP6EYl4qwzNCxguo9 QEvB8g4nzhMPIZr9mAbMhdQTBVA6v3pllAXLd+bdMuuidUQmkoVf6/bLH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="350294636" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="350294636" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 05:07:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="678828131" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="678828131" Received: from unisar-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.219.243]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 05:06:56 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 9DA9310DF0F; Tue, 16 May 2023 15:06:53 +0300 (+03) From: "Kirill A. Shutemov" To: kirill.shutemov@linux.intel.com Cc: aarcange@redhat.com, ak@linux.intel.com, akpm@linux-foundation.org, ardb@kernel.org, bp@alien8.de, dave.hansen@intel.com, david@redhat.com, dfaggioli@suse.com, jroedel@suse.de, khalid.elmously@canonical.com, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, marcelo.cerri@canonical.com, mgorman@techsingularity.net, mingo@redhat.com, pbonzini@redhat.com, peterx@redhat.com, peterz@infradead.org, philip.cox@canonical.com, rientjes@google.com, rppt@kernel.org, sathyanarayanan.kuppuswamy@linux.intel.com, seanjc@google.com, tglx@linutronix.de, thomas.lendacky@amd.com, tim.gardner@canonical.com, vbabka@suse.cz, x86@kernel.org Subject: [PATCHv11.1 5/9] efi: Add unaccepted memory support Date: Tue, 16 May 2023 15:06:46 +0300 Message-Id: <20230516120646.31195-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230513220418.19357-6-kirill.shutemov@linux.intel.com> References: <20230513220418.19357-6-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: c5sywzpf1cj5ya55xcsrnn4znt4rdyhk X-Rspam-User: X-Rspamd-Queue-Id: EF70240008 X-Rspamd-Server: rspam07 X-HE-Tag: 1684238825-756888 X-HE-Meta: U2FsdGVkX19J6pVu2HMGZ1ouANWWce6iRjYctxXlAVoMQdlLaaFkRHPTfvttCdNQufayPabIUmRi0iTARuh8557ydX61RFcxCxMj1UC8SJ+1YbI8QjqSa8dovd1VVG/YOSPrwRsg/tacsYykfxCvFqRSGSnitjm7TxVTMIU4hoUdj6EyXpgI+U+qVVyl3CEvy1Nj+Rf65VDq6Yt5fvT5nutoUbvbS60XQS2B4/Ap0FIJuhQyZicpPnER0QUSjO6qkx0UtlIUZahNQntG3AoJtwoddks9hgrw7ZWQ8HUArlblnlG2J7I0/szde+Sq1l01Hcvmr6wxOalC58vJAX3PrEoKXIakooEI24b0QHQnStGS0Yo33HPvOSHntgX7+PkBE9aP0xooqi72BxB7gEpRCQ/lLxTR38kERNyq66Z6CXPythB2z9xU+u+cDpGB7P/PnhHj2op2tJrJlUa1dQlHtMbl/ON4BZq0QlEWlgX6rN/NL6CFSqZcKh2xTvRHV+hFdcjwCG0QaXpWdIozxMgijud3q1n560KwFATsy2xW/825I/nSBw5WoWDr7gLXhtduaaZyM+QkoywUnhaoj0uRiBadK2L3tv5XS0mn9ERV8YuBinBGAjhhgROyL7a6+8Mt0d3Y9k6cr09tjV2dGOXGgbPp+MQ5UgkWWVux6nOkZ9z+ZtggT5dez9ptU4sz47kh71cq9J+dHy+W8LTB3LML7Mq34VsWZsDHFK8lV134Y8a3sXX767nv6il78xeEnVNEXCewz+0NV7sFUylsCEpZhI6LybSBcelRrHnOn9P4/pZas+5euPV9H+GCCysFihGLJVvZURozoT7OGoTewC5XnW95IwljR7UpSQmczdKdYn8vzF4XHUj0Nyj8Y0slfNwVwfAE7vmpHW0tNqCYSB1onX+RXUWeFQ2QhXdJPBKsyZ8ym7hIGZg42Rg9LDtZPwmLuRvJQXhgC9dyXMJEVA1 lBzEdSeP Eodig6ucJOu4/rcx7I7e09vwgYtfa2s8/dc9JEqSJHt3PYwOvesrdgikfhuGe7QBW4BkyE69yWq3zbYuv5m2FFJZ1IzMT4kTrqTP1QSFfmrW+5uDwDLHmyo4QjlKBz4Kjvg6D3d/NJN126LCLNddIGvyX4XVfMtW06L6iv70aYl069fSgBhY+VPylfQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: efi_config_parse_tables() reserves memory that holds unaccepted memory configuration table so it won't be reused by page allocator. Core-mm requires few helpers to support unaccepted memory: - accept_memory() checks the range of addresses against the bitmap and accept memory if needed. - range_contains_unaccepted_memory() checks if anything within the range requires acceptance. Architectural code has to provide efi_get_unaccepted_table() that returns pointer to the unaccepted memory configuration table. arch_accept_memory() handles arch-specific part of memory acceptance. Signed-off-by: Kirill A. Shutemov v11.1: - Add missing memblock_reserve() for the unaccepted memory configuration table. --- drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 25 ++++++ drivers/firmware/efi/unaccepted_memory.c | 103 +++++++++++++++++++++++ include/linux/efi.h | 1 + 4 files changed, 130 insertions(+) create mode 100644 drivers/firmware/efi/unaccepted_memory.c diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index b51f2a4c821e..e489fefd23da 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -41,3 +41,4 @@ obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o obj-$(CONFIG_EFI_EARLYCON) += earlycon.o obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o +obj-$(CONFIG_UNACCEPTED_MEMORY) += unaccepted_memory.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 7dce06e419c5..d817e7afd266 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -50,6 +50,9 @@ struct efi __read_mostly efi = { #ifdef CONFIG_EFI_COCO_SECRET .coco_secret = EFI_INVALID_TABLE_ADDR, #endif +#ifdef CONFIG_UNACCEPTED_MEMORY + .unaccepted = EFI_INVALID_TABLE_ADDR, +#endif }; EXPORT_SYMBOL(efi); @@ -605,6 +608,9 @@ static const efi_config_table_type_t common_tables[] __initconst = { #ifdef CONFIG_EFI_COCO_SECRET {LINUX_EFI_COCO_SECRET_AREA_GUID, &efi.coco_secret, "CocoSecret" }, #endif +#ifdef CONFIG_UNACCEPTED_MEMORY + {LINUX_EFI_UNACCEPTED_MEM_TABLE_GUID, &efi.unaccepted, "Unaccepted" }, +#endif #ifdef CONFIG_EFI_GENERIC_STUB {LINUX_EFI_SCREEN_INFO_TABLE_GUID, &screen_info_table }, #endif @@ -759,6 +765,25 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, } } + if (IS_ENABLED(CONFIG_UNACCEPTED_MEMORY) && + efi.unaccepted != EFI_INVALID_TABLE_ADDR) { + struct efi_unaccepted_memory *unaccepted; + + unaccepted = early_memremap(efi.unaccepted, sizeof(*unaccepted)); + if (unaccepted) { + unsigned long size; + + if (unaccepted->version == 1) { + size = sizeof(*unaccepted) + unaccepted->size; + memblock_reserve(efi.unaccepted, size); + } else { + efi.unaccepted = EFI_INVALID_TABLE_ADDR; + } + + early_memunmap(unaccepted, sizeof(*unaccepted)); + } + } + return 0; } diff --git a/drivers/firmware/efi/unaccepted_memory.c b/drivers/firmware/efi/unaccepted_memory.c new file mode 100644 index 000000000000..bb91c41f76fb --- /dev/null +++ b/drivers/firmware/efi/unaccepted_memory.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include + +/* Protects unaccepted memory bitmap */ +static DEFINE_SPINLOCK(unaccepted_memory_lock); + +void accept_memory(phys_addr_t start, phys_addr_t end) +{ + struct efi_unaccepted_memory *unaccepted; + unsigned long range_start, range_end; + unsigned long flags; + u64 unit_size; + + if (efi.unaccepted == EFI_INVALID_TABLE_ADDR) + return; + + unaccepted = efi_get_unaccepted_table(); + if (!unaccepted) + return; + + unit_size = unaccepted->unit_size; + + /* + * Only care for the part of the range that is represented + * in the bitmap. + */ + if (start < unaccepted->phys_base) + start = unaccepted->phys_base; + if (end < unaccepted->phys_base) + return; + + /* Translate to offsets from the beginning of the bitmap */ + start -= unaccepted->phys_base; + end -= unaccepted->phys_base; + + /* Make sure not to overrun the bitmap */ + if (end > unaccepted->size * unit_size * BITS_PER_BYTE) + end = unaccepted->size * unit_size * BITS_PER_BYTE; + + range_start = start / unit_size; + + spin_lock_irqsave(&unaccepted_memory_lock, flags); + for_each_set_bitrange_from(range_start, range_end, unaccepted->bitmap, + DIV_ROUND_UP(end, unit_size)) { + unsigned long phys_start, phys_end; + unsigned long len = range_end - range_start; + + phys_start = range_start * unit_size + unaccepted->phys_base; + phys_end = range_end * unit_size + unaccepted->phys_base; + + arch_accept_memory(phys_start, phys_end); + bitmap_clear(unaccepted->bitmap, range_start, len); + } + spin_unlock_irqrestore(&unaccepted_memory_lock, flags); +} + +bool range_contains_unaccepted_memory(phys_addr_t start, phys_addr_t end) +{ + struct efi_unaccepted_memory *unaccepted; + unsigned long flags; + bool ret = false; + u64 unit_size; + + unaccepted = efi_get_unaccepted_table(); + if (!unaccepted) + return false; + + unit_size = unaccepted->unit_size; + + /* + * Only care for the part of the range that is represented + * in the bitmap. + */ + if (start < unaccepted->phys_base) + start = unaccepted->phys_base; + if (end < unaccepted->phys_base) + return false; + + /* Translate to offsets from the beginning of the bitmap */ + start -= unaccepted->phys_base; + end -= unaccepted->phys_base; + + /* Make sure not to overrun the bitmap */ + if (end > unaccepted->size * unit_size * BITS_PER_BYTE) + end = unaccepted->size * unit_size * BITS_PER_BYTE; + + spin_lock_irqsave(&unaccepted_memory_lock, flags); + while (start < end) { + if (test_bit(start / unit_size, unaccepted->bitmap)) { + ret = true; + break; + } + + start += unit_size; + } + spin_unlock_irqrestore(&unaccepted_memory_lock, flags); + + return ret; +} diff --git a/include/linux/efi.h b/include/linux/efi.h index 29cc622910da..9864f9c00da2 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -646,6 +646,7 @@ extern struct efi { unsigned long tpm_final_log; /* TPM2 Final Events Log table */ unsigned long mokvar_table; /* MOK variable config table */ unsigned long coco_secret; /* Confidential computing secret table */ + unsigned long unaccepted; /* Unaccepted memory table */ efi_get_time_t *get_time; efi_set_time_t *set_time; -- 2.39.3