From patchwork Wed Jun 13 08:08:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138424 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp401550lji; Wed, 13 Jun 2018 01:09:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKgius9g7TmwGXiflZFx7NfRhmHTM+P7JIojomJr20fwalElrdkJG0gXuqo3nWnQ0JCnZCM X-Received: by 2002:a37:c598:: with SMTP id k24-v6mr3460384qkl.153.1528877349684; Wed, 13 Jun 2018 01:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528877349; cv=none; d=google.com; s=arc-20160816; b=0kdkjL6I241vFM5TJz/haBiGvfzMKBop2n4FArKhKYHm833Iu+8lKzV0riOzOXWfa9 IbKOeiRb1Mu5jMDCyCBlkq/viTgKWN+pgtS5e5x/1WF9I6Kgo7KMbsB5PnpWWUHK2u6u QEs/GH31fv2W29WfKHodZ3yCv4XH2proTYzrAhXF56hiI4myePjOWXhygEm7HlPqj1Qc 07RAtjUGWLl8UM/VKi6gO0RFMTaT7pTmLOeTMeYiLho3SXjm+kudJQa5fj+TKzkH1Hn4 fwAnxC2oM8fHPD3PWsdKaYIffFQUdEifcre1amiKKzYOfQW5IzcqlPw7NCrKL5RpaKkO 157g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dEo/qH9ERlYRKAzqdnMqGJKCPdvSFKXf5Olmw/JBCvc=; b=KtgSkVfUJlH68ImCK1VS+NvBdP2NmbyxkxdPRkIK9eR4joKZF5v7+AorcxU9oBUJ0h dqvBgp31SKtoYQCqbCAsvNZp6nly5VEaXnb2YsXyjtXPYXOKqGPjfiXFyhHFsMM1p0no qS/g11VjsIo7zV2yH3bIMQw+hTyt9T23aDP1XIbc+TzK7S52ONYy5xMl0kevijq1IAvu aT3ytmqMuqFJZtTwfPm3Pd5Oo+5R9L5gkF22Tgz+kXTHO3K4j6wsfC44GXaq5CX6RmFE ueaJ2p87yjpKe9OjntFQ3Rm7jT4u1X3mZ3BChFKTz190YdoOp2WXXvRsx81EnIb6HIq8 gtfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ey5OZ58U; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id f2-v6si2207353qta.209.2018.06.13.01.09.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ey5OZ58U; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B74012129DBB4; Wed, 13 Jun 2018 01:09:08 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CAC60212532FC for ; Wed, 13 Jun 2018 01:09:07 -0700 (PDT) Received: by mail-wr0-x244.google.com with SMTP id k16-v6so1706805wro.0 for ; Wed, 13 Jun 2018 01:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0SjQw8NZf56wNaiOjcfCkQOwuqdnx8aQ3teqfAvPg9Q=; b=ey5OZ58U2ZYaqxTSviLzLh9B9vpETvSt0QDq+VsEoSXeZyMbQW5vADqwaODqWQkdI2 qZ4+jkLStbpoWf8EkwML/zYhEdKOvurWH73bIPByzqzzOqgwi9k/pUk3O1CkgcH1wlfX yV/pdXGIub6vsl0/ZYSpo1vLLA19VeXuVQKOg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0SjQw8NZf56wNaiOjcfCkQOwuqdnx8aQ3teqfAvPg9Q=; b=tD3bIGMnnr0zY6O8dUneQon++4QZErBDU9uI+EXyb+NTNpdELjtYgxvbNttA2TisCe 9wtwdhNNjUvLG1cEw/QSa3SbiGBuIBubEaqYZv7CXG722V0QwHlkDLNivXF95GbHVMBQ 3WTNNbbvwEL2il8wYGo/DsFFGn3XqdLDXy4MSgCGTlsongLJ7u1OdsElYyV8BmALCxal az/DrOqWPIE5/Uq+EvkVhd1icqW6tiBruGkDJwdvyEKwrtQGEzHNT1RF9EcuSjhMZxoV SlS2tXBEuKigJy6ExSdT65al+Fm4EtVu64F5ie4jsGN5CORrdmkMDUtxzRzY5Iwh2WSu A7Ig== X-Gm-Message-State: APt69E0KEyEgclY1IuYK7QJXEzR/H8jTA/+FsGr4cO5QPnF1yJrbCAw7 3xGfTa7LCKP5wn1WYYddVo+rgVmUVV0= X-Received: by 2002:adf:fd05:: with SMTP id e5-v6mr3108779wrr.280.1528877345890; Wed, 13 Jun 2018 01:09:05 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id v31-v6sm4974772wrc.80.2018.06.13.01.09.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:05 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 10:08:58 +0200 Message-Id: <20180613080901.7156-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613080901.7156-1-ard.biesheuvel@linaro.org> References: <20180613080901.7156-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v4 1/4] MdeModulePkg/CapsuleRuntimeDxe: clean the capsule payload to DRAM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When capsule updates are staged for processing after a warm reboot, they are copied into memory with the MMU and caches enabled. When the capsule PEI gets around to coalescing the capsule, the MMU and caches may still be disabled, and so on architectures where uncached accesses are incoherent with the caches (such as ARM and AARCH64), we need to ensure that the data passed into UpdateCapsule() is written back to main memory before performing the warm reboot. Unfortunately, on ARM, the only type of cache maintenance instructions that are suitable for this purpose operate on virtual addresses only, and given that the UpdateCapsule() prototype includes the physical address of a linked list of scatter/gather data structures that are mapped at an address that is unknown to the firmware (and may not even be mapped at all when UpdateCapsule() is invoked), we can only perform this cache maintenance at boot time. Fortunately, both Windows and Linux only invoke UpdateCapsule() before calling ExitBootServices(), so this is not a problem in practice. In the future, we may propose adding a secure firmware service that permits performing the cache maintenance at OS runtime, in which case this code may be enhanced to call that service if available. For now, we just fail any UpdateCapsule() calls performed at OS runtime on ARM. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 77 ++++++++++++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c | 51 +++++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf | 14 +++- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 33 ++------- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h | 73 +++++++++++++++++++ 5 files changed, 219 insertions(+), 29 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Signed-off-by: Ard Biesheuvel Reviewed-by: Jiewen.yao@intel.com diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c new file mode 100644 index 000000000000..7e0ca06ce7d0 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c @@ -0,0 +1,77 @@ + /** @file + ARM implementation of architecture specific routines related to + PersistAcrossReset capsules + + Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials are licensed and made available + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include "CapsuleService.h" + +#include + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ) +{ + // + // ARM requires the capsule payload to be cleaned to the point of coherency + // (PoC), but only permits doing so using cache maintenance instructions that + // operate on virtual addresses. Since at runtime, we don't know the virtual + // addresses of the data structures that make up the scatter/gather list, we + // cannot perform the maintenance, and all we can do is give up. + // + return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime (); +} + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ + EFI_CAPSULE_BLOCK_DESCRIPTOR *Desc; + + Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList; + do { + WriteBackDataCacheRange (Desc, sizeof *Desc); + + if (Desc->Length > 0) { + WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock, + Desc->Length + ); + Desc++; + } else if (Desc->Union.ContinuationPointer > 0) { + Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)Desc->Union.ContinuationPointer; + } + } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); + + WriteBackDataCacheRange (Desc, sizeof *Desc); +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c new file mode 100644 index 000000000000..09616999e3f8 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c @@ -0,0 +1,51 @@ +/** @file + Default implementation of architecture specific routines related to + PersistAcrossReset capsules + + Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials are licensed and made available + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include "CapsuleService.h" + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ) +{ + return FeaturePcdGet (PcdSupportUpdateCapsuleReset); +} + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf index 9ab04ce1b301..43a29ee22948 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -27,17 +27,24 @@ [Defines] # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC ARM AARCH64 # [Sources] CapsuleService.c + CapsuleService.h -[Sources.Ia32, Sources.IPF, Sources.EBC, Sources.ARM, Sources.AARCH64] +[Sources.Ia32, Sources.IPF, Sources.EBC] SaveLongModeContext.c + CapsuleReset.c [Sources.X64] X64/SaveLongModeContext.c + CapsuleReset.c + +[Sources.ARM, Sources.AARCH64] + SaveLongModeContext.c + Arm/CapsuleReset.c [Packages] MdePkg/MdePkg.dec @@ -59,6 +66,9 @@ [LibraryClasses.X64] UefiLib BaseMemoryLib +[LibraryClasses.ARM, LibraryClasses.AARCH64] + CacheMaintenanceLib + [Guids] ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # (Process across reset capsule image) for capsule updated data ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c index 216798d1617e..23fd6d59c59e 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -15,22 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "CapsuleService.h" + // // Handle for the installation of Capsule Architecture Protocol. // @@ -44,15 +30,6 @@ UINTN mTimes = 0; UINT32 mMaxSizePopulateCapsule = 0; UINT32 mMaxSizeNonPopulateCapsule = 0; -/** - Create the variable to save the base address of page table and stack - for transferring into long mode in IA32 PEI. -**/ -VOID -SaveLongModeContext ( - VOID - ); - /** Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended consumption, the firmware may process the capsule immediately. If the payload should persist @@ -194,10 +171,12 @@ UpdateCapsule ( // // Check if the platform supports update capsule across a system reset // - if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { + if (!IsPersistAcrossResetCapsuleSupported ()) { return EFI_UNSUPPORTED; } + CapsuleCacheWriteBack (ScatterGatherList); + // // Construct variable name CapsuleUpdateData, CapsuleUpdateData1, CapsuleUpdateData2... // if user calls UpdateCapsule multiple times. @@ -344,7 +323,7 @@ QueryCapsuleCapabilities ( // //Check if the platform supports update capsule across a system reset // - if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { + if (!IsPersistAcrossResetCapsuleSupported ()) { return EFI_UNSUPPORTED; } *ResetType = EfiResetWarm; diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h new file mode 100644 index 000000000000..85aafc144b41 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h @@ -0,0 +1,73 @@ +/** @file + Capsule Runtime Driver produces two UEFI capsule runtime services. + (UpdateCapsule, QueryCapsuleCapabilities) + It installs the Capsule Architectural Protocol defined in PI1.0a to signify + the capsule runtime services are ready. + + Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials are licensed and made available + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** + Create the variable to save the base address of page table and stack + for transferring into long mode in IA32 PEI. +**/ +VOID +SaveLongModeContext ( + VOID + ); + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ); + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + );