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 D8BE1C77B7F for ; Sat, 13 May 2023 22:04:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9051F280002; Sat, 13 May 2023 18:04:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B5FB280003; Sat, 13 May 2023 18:04:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 691E1280002; Sat, 13 May 2023 18:04:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5A36C280001 for ; Sat, 13 May 2023 18:04:56 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2F41B411B7 for ; Sat, 13 May 2023 22:04:56 +0000 (UTC) X-FDA: 80786612592.08.B578DB3 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf24.hostedemail.com (Postfix) with ESMTP id CE0E718000C for ; Sat, 13 May 2023 22:04:53 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=GfnJVBW8; spf=none (imf24.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.88) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684015494; 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=BMOOHRUB7Zr7XQ5THzAtjIzZdoIftwVgnqo7Ze0X5Gc=; b=4qGhM6fvUdF3XpwUlKTNXcHravfxFATpivXAextVAnKvICJbQiDluS/PNhEQW9qxSsyvwk 9zpIir04/WCJTMjGSXJOUXj4DY7SyVQGWRgLcAIVeXLOCT4z6sMsv4kg1lLsctewF+57+6 X+h2HHnLaSZBbb7WiXKDNCQKMW0l7Mo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=GfnJVBW8; spf=none (imf24.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.88) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684015494; a=rsa-sha256; cv=none; b=BvQzdM+rDZBbqBe4xAzlpEfpb4xogF3xhzw2mktFrv/y30Dhe+pKHMOkT5iHc1+sBpEOSN 8TECaSX+g4IwwZv3Jmu2mMTLQ95cMbUqcKx6eZFOGIh4jncEJ55Uqm+UXkEMn4NnHslb2d qHFXIiMIv3hwgLBmNKuSsQuSNib7DvA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684015493; x=1715551493; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vzNujRVXgfcy7qjArGlQaKcw6ocTEeuAnyV8Bln9kG4=; b=GfnJVBW8kpVpU87yrB3j9QostD4A0DFel3kpBJGAuS+ETFtRVfi4NN4a Br58RYMBJb2ibgTtHEvol1XNwa2czxuYZ3xET6xtLpRYym3aKwzr1xgy4 4E6hG2hyazCVCbIL9KMetsSdVv1XXvENBvD5Kh8YWe+FYqGIPpvYIWq/E bSIMnYDRaHuG3OI7VDs64sYw50o+zyESR5tdwsn7YQ5oGaLkbcs01HsSG nZZJY5jEBSAhdD6BmpQXMKISQ5SJe4m4wAqbFZ6Qj2xcIYoe0iSO0EZJm OvwV7YMABSvFD86F2hIUC6m2wT/Ctc4PhvcCE0xXsw35pBDyQuwj7EtN5 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10709"; a="379142559" X-IronPort-AV: E=Sophos;i="5.99,273,1677571200"; d="scan'208";a="379142559" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2023 15:04:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10709"; a="733429554" X-IronPort-AV: E=Sophos;i="5.99,273,1677571200"; d="scan'208";a="733429554" Received: from sorinaau-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.62.145]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2023 15:04:45 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 1087C10CF7B; Sun, 14 May 2023 01:04:34 +0300 (+03) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , Dave Hansen , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel Cc: Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Dario Faggioli , Mike Rapoport , David Hildenbrand , Mel Gorman , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, aarcange@redhat.com, peterx@redhat.com, x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv11 5/9] efi: Provide helpers for unaccepted memory Date: Sun, 14 May 2023 01:04:14 +0300 Message-Id: <20230513220418.19357-6-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230513220418.19357-1-kirill.shutemov@linux.intel.com> References: <20230513220418.19357-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 3ia9j78jfqkyhcwuxpnc954fqarxmd5d X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CE0E718000C X-Rspam-User: X-HE-Tag: 1684015493-578929 X-HE-Meta: U2FsdGVkX1+hTZ/oqX6knZWnNzyvlXs9+wUqk6SY0Uy+txRi4rzm8S7SRcLAFFPsurDkU/ZviEZYlXAU8ThKRKwuyAiubOUYyYos2eRN0CItac0aE7cI+JwEF23xLW9W+6OF5/uYbPIWuxSg90y8dAH2rH9bDsFCdbC9eHmU1/tYDC7AnOvRizCQhaerB6oTBjPKZXGZKVWCz8z3zMexgSM8dazvipGiDA0bK89qGhY8M2IQg9n6Flog28SJ3HzD1AqBNIoD/lc3jMuRGUPSwhy1+brGYjLurDSejl82pt07iLWs8tyZLzH3V98hhX9TUs2ZC3sYtAM9ApVFJuAAXySorMfMc1yQcOqLDfKDvjuWaj9hIyDxhb8khhfUjEo81BRzv99x/pIhpvZJ6aGWJFrs5yI+eLUamBivQP/IhhZeMAdAwyZefvlvO62tMyVyxWLw1kRv8WPyj8eqNU0L1PM7E9AdC0MGGz+4EDwgKr++8ovWymV4MgvvAB4Gr6B2n7SinEOey6aKo/cSDdePPkAvADqKr6qeQ0x7OYJnOwoX/x3o4Mk1nXK0Dsm5qijcgkTH++CNaDylfzDhmWgGY2xx96iFBUwCwxUQoUUtN2SVX64cdVMMCpf+LdpVq6dw7t7LCQkMtDcwedh0bUDg/v9byKwx663zZEnCfIBGFDa5N+J5FMrKnmqe0xOsOiBeGW0thNnKppvjWSetnLPklzpPjwxpmhN68Asyk1Y/geq/GOYcO6G7pZVTLBVKYACTNcBS7xqo0VCYotzFuPyU15nSFedKz8D0VKrLG7MBOtpm4pTD2r8GF1Bn4M63BFsGQr2UoCg1b9yiJ3pXtGAWN/c9KcfMc8ZK8cOMJwXt+FBrhLWqvfSpATueMi5zNjkbgHxfhANbiWFMYAvS7tiA3gxdJHgHWJosldXfI4Yh4csaYRTAsb+ynhWjvin0K9j+iCX7HfzCMVgS+gCwTZj Xmgz2KU/ al1sAuz/iE5l5pzeBdveMRPSlcf41b859WBTz/Xugvks6PcOgSkqLbSjMz3nyC+aP7dzKSNEiVBrM/1B1pR2D4cciCjBHjAWeRxlLxj0gb/Ulm2A9pvzm/1Boq6B2s+m1P7i42vZ7quAni/LNnES5D6Mv5hXeprdY5fP/UxFIAE/R6znvJyEK3PBSEA== 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: 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 --- drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 6 ++ drivers/firmware/efi/unaccepted_memory.c | 103 +++++++++++++++++++++++ include/linux/efi.h | 1 + 4 files changed, 111 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..e15a2005ed93 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 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