From patchwork Mon Nov 30 12:28:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 57442 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1438830lbb; Mon, 30 Nov 2015 04:35:59 -0800 (PST) X-Received: by 10.66.63.33 with SMTP id d1mr90140776pas.120.1448886957033; Mon, 30 Nov 2015 04:35:57 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 18si3415125pfc.4.2015.11.30.04.35.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2015 04:35:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a3Nf1-00011O-LI; Mon, 30 Nov 2015 12:34:27 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a3NaJ-0004Dm-SY for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2015 12:29:46 +0000 Received: by wmww144 with SMTP id w144so135366275wmw.0 for ; Mon, 30 Nov 2015 04:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZBedWwpNwsYE5cml9TzSMuh5o/imFthQhKI4i0I+WB0=; b=sQTnrATUyiXIIehpmGeQO2GsRZ+O5Xx3W/n0E3EWro/ZKCXdD/e3UWH9zcuo7HBUPl l/3BRZS/rfnKbkty6ISE3wL5s4iFh4SdNQ2D32U7dJvQk2YY0a9RAdkmW47OL08fDWcO Nk0jATwPCmtBTFDMu8gweAhPIDyfoJMuQSXxVfiz4z0YHSP4cAhlXyR1VPYu0abRg6FD JGD/5Qew1ccb+J6kuRhTdpfR8WrkZrSCFxomUSDwtdl4Wo20LkxBREeZlIMD5FzXV435 aJQS695DYeh3WjoH40nvjUD6B1iTzkE435Eg50OB6ZQAvTIKfqq7fW2GbNvs9dBM1dhU 8DYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZBedWwpNwsYE5cml9TzSMuh5o/imFthQhKI4i0I+WB0=; b=dIBMqvV+yd5bbofKByfdr2k+AVWwbG9oaK1SZXWPYahaHRzpJm2QmXUgsaXQUusc+2 /rhQr/xdv9OxXo3MNi68g18x5t5UP4QjAZfGAzAXY80fpQ9NvvijPC7XbbSTTWAik6tp 7krDyGOVkss020+9b2t3RmdkYOsKAbVekzP7OwZhW6+UDgu7K36erfNrCSqgR+BWQtr4 Tf5L9K2YlU41i6eTTk+IKAq0Tnykt01JVbXpi3q1y1yJpW9x1+Jv/zkZ/N3D7WtHk88h +XCAdeiW+WaUv701XEOsuuzTNDcQeym9pVHHvjt+w+SGqQ8XLE6+7wwLU0ZPxmc01jDy xXMw== X-Gm-Message-State: ALoCoQmYafKSGBaGo/Fd+2YSK/3oufLDQ+8eGxUXF8xyEAXfYMOe610DmvaezqZXQFh/2KPGXbpg X-Received: by 10.194.95.65 with SMTP id di1mr70274890wjb.134.1448886554212; Mon, 30 Nov 2015 04:29:14 -0800 (PST) Received: from localhost.localdomain (host2-115-static.225-95-b.business.telecomitalia.it. [95.225.115.2]) by smtp.gmail.com with ESMTPSA id d2sm46560361wjy.16.2015.11.30.04.29.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Nov 2015 04:29:13 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com, linux-efi@vger.kernel.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk, linux@arm.linux.org.uk Subject: [PATCH v4 02/13] arm64: only consider memblocks with NOMAP cleared for linear mapping Date: Mon, 30 Nov 2015 13:28:16 +0100 Message-Id: <1448886507-3216-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448886507-3216-1-git-send-email-ard.biesheuvel@linaro.org> References: <1448886507-3216-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151130_042936_636581_67E5C3DE X-CRM114-Status: GOOD ( 12.20 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:230 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kuleshovmail@gmail.com, Ard Biesheuvel , roy.franz@linaro.org, linux-mm@kvack.org, ryan.harkin@linaro.org, msalter@redhat.com, grant.likely@linaro.org, akpm@linux-foundation.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Take the new memblock attribute MEMBLOCK_NOMAP into account when deciding whether a certain region is or should be covered by the kernel direct mapping. Reviewed-by: Matt Fleming Signed-off-by: Ard Biesheuvel --- arch/arm64/mm/init.c | 2 +- arch/arm64/mm/mmu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 17bf39ac83ba..ac4d7cbbdd2d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -120,7 +120,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) #ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid(unsigned long pfn) { - return memblock_is_memory(pfn << PAGE_SHIFT); + return memblock_is_map_memory(pfn << PAGE_SHIFT); } EXPORT_SYMBOL(pfn_valid); #endif diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 873e363048c6..f336a775c353 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -372,6 +372,8 @@ static void __init map_mem(void) if (start >= end) break; + if (memblock_is_nomap(reg)) + continue; if (ARM64_SWAPPER_USES_SECTION_MAPS) { /*