From patchwork Fri Jun 15 10:48:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138669 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp678325lji; Fri, 15 Jun 2018 03:48:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI03dj+HQhtlPTHrJhfXvVQhAHTMTqcSeAYPv3wZQT6G69lwR/S/t5cgIIoLcVWjuer4eWp X-Received: by 2002:a17:902:2f84:: with SMTP id t4-v6mr1452613plb.24.1529059708753; Fri, 15 Jun 2018 03:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529059708; cv=none; d=google.com; s=arc-20160816; b=dCylSNkYAvARz930HUth7ythEVa+RxQPoyUE2CqGG2EUvpN7emxxAOuP0c7rmAeH6Q bvZfKaGEuT86hQc1x30m8dOOqT3Lw34hB7718h2smFKYZorUQU2DaCS4qAOfPdwghAyB uOr5okINObNHx0JYQOdxTkM7MU6elMKTx/SsmNCNsSY0VoLvPANSwzlAuOg3vPXVWE8W HHqLyEFHfxesQX8OhI+uZcb/bRCMSAA/u2Kyz9bWPMc2nkOmLZTiNAOJlo6BbUvE4uzG qN5cMbftzl0W5sSyC662BcJVvrFROZOmCHWqbrwhfbE2OdIzxr6wxLJy8ixRHbfZdj/F nEpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=9288kZXrtrpdgykxekSKaXamAxLBJxcMOlMMQ/XhKNo=; b=NpDlyvS0rxbVk2MNvc2ZRu0B/AaE8w+nfemEYFT3GhAKAzHYxGllOnFYod1a0A1V7d 68X9Q24dP9GT8kNlD/KAwftJlMRqr3+4QZqG6VpR8Pi8FdppVwWlt3AL0DO4qZ+z0l8a 64PXXTBOzrLaNrYbCXXeU9LwCK+NfF+F308VTdAY8pJdqemMhj1m38+NU7HwOlryRTV7 u3BUDnWPw+swbUxyIcRhjPmgfHp2zVDMNg0H0966CnD1kwwHR/L7CRfhwhrLZziUDY7P 8PP+b7TkAWFUuP1F8ORCM+RmIKqZK3n/AWaTz6/3Ej7ogIU8+KDQEa7oIbltwLMzFhqD IL0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UTu5pkts; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12-v6si7693135pll.461.2018.06.15.03.48.28; Fri, 15 Jun 2018 03:48:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UTu5pkts; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965650AbeFOKs2 (ORCPT + 2 others); Fri, 15 Jun 2018 06:48:28 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35282 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965590AbeFOKs1 (ORCPT ); Fri, 15 Jun 2018 06:48:27 -0400 Received: by mail-wm0-f67.google.com with SMTP id j15-v6so3102423wme.0 for ; Fri, 15 Jun 2018 03:48:26 -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=BHhUxkxl1ZsxG3tQPx8viBrXAf9Z3cQcqB/rSx04Qy4=; b=UTu5pktsLxp1Ac2eUNjqbPEzkjk0H2yPp3mmSmWEiERwD0Yy5Z6O5iiXsvef+uJ+N9 E9Bpj1qj66d+d8UFo/j/CzQZzwjtifnB2WuiihjvWaAFh++BYDrxOhbviUlYkgfOLI6L TdpLVjqz8S1u0NlDfH00gT4K90ss4OnOoLQpk= 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=BHhUxkxl1ZsxG3tQPx8viBrXAf9Z3cQcqB/rSx04Qy4=; b=GZDtr1uUNjcZ28a0I4D1omR9atWYNV3uy0xWUux17L3AOl9HBE+kecL6h/b/zSExpd TMxV36YP5IQvl3r5exopHlf6B1f5X4+86Ukqd4dBtgJ0Fj0h6N6sK0N6D01gkAmPS8iZ txiyqYh6wH0Q5uHD6Ag6RFV7CgxhMrcgRUAH1idm8CHqFMREiHHxIg6Z+Oz8OBe1gNvs Kb15h2j1VkC1UY6I7NsSENOxvA5vDVhhB/z13tz1I+EYCzuv1haR3YTXiKz9fuPhMaFD 9PKQMozV7SyLcJXlO+4AT1D8P1mD9g6a+G5qmBaA5IIqR5dv2bqnYXnuuDVqag/0XQzE royQ== X-Gm-Message-State: APt69E2D9eHpW6r0T9zUyPtlnFj2fbu4lBbSP5EqShB1X7wGrHVHTwQ9 BOOmkDKXRqQhkD3FK7UjR0WZGlMy10E= X-Received: by 2002:a1c:40d4:: with SMTP id n203-v6mr834298wma.101.1529059705948; Fri, 15 Jun 2018 03:48:25 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:3805:d7d2:48be:b40a]) by smtp.gmail.com with ESMTPSA id a9-v6sm1393914wmh.38.2018.06.15.03.48.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jun 2018 03:48:25 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: lersek@redhat.com, pjones@redhat.com, kraxel@redhat.com, Ard Biesheuvel , Peter Jones Subject: [PATCH 1/2] efi: drop type and attribute checks in efi_mem_desc_lookup() Date: Fri, 15 Jun 2018 12:48:17 +0200 Message-Id: <20180615104818.23013-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615104818.23013-1-ard.biesheuvel@linaro.org> References: <20180615104818.23013-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The current implementation of efi_mem_desc_lookup() includes the following check on the memory descriptor it returns: if (!(md->attribute & EFI_MEMORY_RUNTIME) && md->type != EFI_BOOT_SERVICES_DATA && md->type != EFI_RUNTIME_SERVICES_DATA) { continue; } This means that only EfiBootServicesData or EfiRuntimeServicesData regions are considered, or any other region type provided that it has the EFI_MEMORY_RUNTIME attribute set. Given what the name of the function implies, and the fact that any physical address can be described in the UEFI memory map only a single time, it does not make sense to impose this condition in the body of the loop, but instead, should be imposed by the caller depending on the value that is returned to it. Two such callers exist at the moment: - The BGRT code when running on x86, via efi_mem_reserve() and efi_arch_mem_reserve(). In this case, the region is already known to be EfiBootServicesData, and so the check is redundant. - The ESRT handling code which introduced this function, which calls it both directly from efi_esrt_init() and again via efi_mem_reserve() and efi_arch_mem_reserve() [on x86]. So let's move this check into the callers instead. This preserves the current behavior both for BGRT and ESRT handling, and allows the lookup routine to be reused by other [upcoming] users that don't have this limitation. In the ESRT case, keep the entire condition, so that platforms that deviate from the UEFI spec and use something other than EfiBootServicesData for the ESRT table will keep working as before. For x86's efi_arch_mem_reserve() implementation, limit the type to EfiBootServicesData, since it is the only type the reservation code expects to operate on in the first place. While we're at it, drop the __init annotation so that drivers can use it as well. Cc: Peter Jones Signed-off-by: Ard Biesheuvel --- arch/x86/platform/efi/quirks.c | 3 ++- drivers/firmware/efi/efi.c | 8 +------- drivers/firmware/efi/esrt.c | 5 ++++- 3 files changed, 7 insertions(+), 9 deletions(-) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 36c1f8b9f7e0..4ee6f4980afe 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -249,7 +249,8 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) int num_entries; void *new; - if (efi_mem_desc_lookup(addr, &md)) { + if (efi_mem_desc_lookup(addr, &md) || + md.type != EFI_BOOT_SERVICES_DATA) { pr_err("Failed to lookup EFI memory descriptor for %pa\n", &addr); return; } diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 232f4915223b..cbc25d1c40bb 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -388,7 +388,7 @@ subsys_initcall(efisubsys_init); * and if so, populate the supplied memory descriptor with the appropriate * data. */ -int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) +int efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) { efi_memory_desc_t *md; @@ -406,12 +406,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) u64 size; u64 end; - if (!(md->attribute & EFI_MEMORY_RUNTIME) && - md->type != EFI_BOOT_SERVICES_DATA && - md->type != EFI_RUNTIME_SERVICES_DATA) { - continue; - } - size = md->num_pages << EFI_PAGE_SHIFT; end = md->phys_addr + size; if (phys_addr >= md->phys_addr && phys_addr < end) { diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index 1ab80e06e7c5..375a77c1c6e5 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -250,7 +250,10 @@ void __init efi_esrt_init(void) return; rc = efi_mem_desc_lookup(efi.esrt, &md); - if (rc < 0) { + if (rc < 0 || + (!(md.attribute & EFI_MEMORY_RUNTIME) && + md.type != EFI_BOOT_SERVICES_DATA && + md.type != EFI_RUNTIME_SERVICES_DATA)) { pr_warn("ESRT header is not in the memory map.\n"); return; }