From patchwork Mon Jul 23 01:57:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10539507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 247A113BB for ; Mon, 23 Jul 2018 01:59:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DD3428492 for ; Mon, 23 Jul 2018 01:59:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC2B2849D; Mon, 23 Jul 2018 01:59:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C8FF2848B for ; Mon, 23 Jul 2018 01:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8ly6aqL7oT5Ay1AZBA7kNV0kvfmlbtsqXaJnl8iBxVs=; b=q2zw9QKTvFdQdVuhMUzIzcjuUA JWfXW5fveU02/sl05O35R1Hr7SO2k0j+oa6DMNWAlvxjPY5EUNotADNKI1QZzHiD+SgnAnXyZl+EY CT05whLqELPoXak9WkLd8PN58oS7pCZe0H/tvmARvcKTUurCDErPEiwTHe/s/5cLBGzYWA/q650VA bsBP8hou9wGA+IZBzckvkUPwFdALPS/HyGBWdKq1j1pU7hf6EJQxWG9IFcIHK8hPyewkvllRK46q5 kA8DaFwt5NOxpDZLKjswA2LdDCV/NwRN9z4rCctc9QcsJp/YUs4dcB3vwnF7+mleSpA4ztkmKmpP5 FiWFWafQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhQ8H-0001WG-CQ; Mon, 23 Jul 2018 01:59:29 +0000 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhQ8B-00018R-BJ for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2018 01:59:26 +0000 Received: by mail-pl0-x242.google.com with SMTP id 94-v6so7540170ple.12 for ; Sun, 22 Jul 2018 18:59:13 -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=VxevqCZhbKQ45BiJjQYFdciJrVc/rEp2DL/VeorXBAY=; b=gnuUno+OgQw9cCj7YXXmKBGdCpWCmY1R3+e52F2/cMxWD/ODZpv21K+jL+KbwNYIJ2 9s1Y8HIOctFjO17sUm3QXi7ZPLl/P3LKxeZErMVV6PRZyKRVEiPwzCk1lPUz0WejJJEU EFbWwLLpoLysdhjMvkClHiWG7B/9WtNjk6YTU= 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=VxevqCZhbKQ45BiJjQYFdciJrVc/rEp2DL/VeorXBAY=; b=Xm6PnhpQEb99z5Rt8HDb4AQ0gf8RRPlSfZsunBPTLAAYC5nxJsv5gb6fyS+bvAhFti UzfEtqnTWmsqAjwsU8Zekd2DT2O0ogRoM+5cK24XOM7vJRt/N7kBMfZYca+wTUn1iy0J GSvrKWZHOXWt1j4i+Y1NXDKcmzBf9/BNa4lRk2zj5p6PFKw99U8ousEwflEX8v8FORwD lao7NRERwWKyh/kMMw1oMJd+BMp1dPGAc9KDZQCfm2sVeH/L9b97t91c0NPzyUz1t2iq NXjhBY49iyz5iXGnSPtpf1UmBh+yKiRjI9mwqnfFqgWbcge2O2PfA4s4xMXxnxucLqSl GqNQ== X-Gm-Message-State: AOUpUlGPCaHgh0+zUJVw9zjQmfbcrhdg1b5wLaphrhMfjGMcb1oD8K8d RgQZoRPgRKp0KZph7wMIE+HGiQ== X-Google-Smtp-Source: AAOMgpcuwqefyGHc5fFVOmJlZjG5COrX0ofFxjg9KekhfT9Q0Xzkev7CVic4pZjlaKNBaKPwDPNY4A== X-Received: by 2002:a17:902:8645:: with SMTP id y5-v6mr10978442plt.334.1532311152593; Sun, 22 Jul 2018 18:59:12 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 85-v6sm20185621pgd.81.2018.07.22.18.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jul 2018 18:59:12 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, lenb@kernel.org, ard.biesheuvel@linaro.org Subject: [PATCH v4 1/5] arm64: export memblock_reserve()d regions via /proc/iomem Date: Mon, 23 Jul 2018 10:57:28 +0900 Message-Id: <20180723015732.24252-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180723015732.24252-1-takahiro.akashi@linaro.org> References: <20180723015732.24252-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180722_185924_062408_D87285A2 X-CRM114-Status: GOOD ( 15.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, lorenzo.pieralisi@arm.com, graeme.gregory@linaro.org, al.stone@linaro.org, bhsharma@redhat.com, tbaicar@codeaurora.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, james.morse@arm.com, hanjun.guo@linaro.org, sudeep.holla@arm.com, dyoung@redhat.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: James Morse There has been some confusion around what is necessary to prevent kexec overwriting important memory regions. memblock: reserve, or nomap? Only memblock nomap regions are reported via /proc/iomem, kexec's user-space doesn't know about memblock_reserve()d regions. Until commit f56ab9a5b73ca ("efi/arm: Don't mark ACPI reclaim memory as MEMBLOCK_NOMAP") the ACPI tables were nomap, now they are reserved and thus possible for kexec to overwrite with the new kernel or initrd. But this was always broken, as the UEFI memory map is also reserved and not marked as nomap. Exporting both nomap and reserved memblock types is a nuisance as they live in different memblock structures which we can't walk at the same time. Take a second walk over memblock.reserved and add new 'reserved' subnodes for the memblock_reserved() regions that aren't already described by the existing code. (e.g. Kernel Code) We use reserve_region_with_split() to find the gaps in existing named regions. This handles the gap between 'kernel code' and 'kernel data' which is memblock_reserve()d, but already partially described by request_standard_resources(). e.g.: | 80000000-dfffffff : System RAM | 80080000-80ffffff : Kernel code | 81000000-8158ffff : reserved | 81590000-8237efff : Kernel data | a0000000-dfffffff : Crash kernel | e00f0000-f949ffff : System RAM reserve_region_with_split needs kzalloc() which isn't available when request_standard_resources() is called, use an initcall. Reported-by: Bhupesh Sharma Reported-by: Tyler Baicar Suggested-by: Akashi Takahiro Signed-off-by: James Morse Fixes: d28f6df1305a ("arm64/kexec: Add core kexec support") Reviewed-by: Ard Biesheuvel CC: Mark Rutland --- arch/arm64/kernel/setup.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 30ad2f085d1f..5b4fac434c84 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -241,6 +241,44 @@ static void __init request_standard_resources(void) } } +static int __init reserve_memblock_reserved_regions(void) +{ + phys_addr_t start, end, roundup_end = 0; + struct resource *mem, *res; + u64 i; + + for_each_reserved_mem_region(i, &start, &end) { + if (end <= roundup_end) + continue; /* done already */ + + start = __pfn_to_phys(PFN_DOWN(start)); + end = __pfn_to_phys(PFN_UP(end)) - 1; + roundup_end = end; + + res = kzalloc(sizeof(*res), GFP_ATOMIC); + if (WARN_ON(!res)) + return -ENOMEM; + res->start = start; + res->end = end; + res->name = "reserved"; + res->flags = IORESOURCE_MEM; + + mem = request_resource_conflict(&iomem_resource, res); + /* + * We expected memblock_reserve() regions to conflict with + * memory created by request_standard_resources(). + */ + if (WARN_ON_ONCE(!mem)) + continue; + kfree(res); + + reserve_region_with_split(mem, start, end, "reserved"); + } + + return 0; +} +arch_initcall(reserve_memblock_reserved_regions); + u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID }; void __init setup_arch(char **cmdline_p)