From patchwork Mon Jan 11 13:18:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 59468 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2104355lbb; Mon, 11 Jan 2016 05:19:55 -0800 (PST) X-Received: by 10.98.13.195 with SMTP id 64mr14253979pfn.164.1452518394959; Mon, 11 Jan 2016 05:19:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ur6si48915333pac.167.2016.01.11.05.19.53; Mon, 11 Jan 2016 05:19:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759822AbcAKNTs (ORCPT + 29 others); Mon, 11 Jan 2016 08:19:48 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:33013 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759757AbcAKNTl (ORCPT ); Mon, 11 Jan 2016 08:19:41 -0500 Received: by mail-wm0-f44.google.com with SMTP id f206so212493161wmf.0 for ; Mon, 11 Jan 2016 05:19:40 -0800 (PST) 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=ympgELncxT6FSnDHnulb/s+92BEAkQpmRrVGdA6+w08=; b=SlzPOZRH43ER3kWAVrh4bVwXbVnDN+aKuvGcLrvF0eWsdWk84xVoqZ5QY1cW/txKET 8y0A1bEYouARZltWlS8HnqwdPSB2qn9YRD8izYyUDnJDHtYPPvVBH+Lt87ZrnVte5yqL ZbNeX2FftE5y5LlJKjYIpGmlwKSRr0owyExKM= 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=ympgELncxT6FSnDHnulb/s+92BEAkQpmRrVGdA6+w08=; b=bsigmyeCypInWtMUG4EFRhlQER3d7RFg9y8waObbYA9FqDNddMUd309YJdfbNeGupw AfIXe2gMfGdzdc4Uw+424DOlxsspY5fCh9lDdpCaQJHR29w9EXDt/y7qgPleFRofDCPU yc3kX2g+9hiosumcyjotndHjYE3ODq2sJX4LcC9fKCSq2ZjDp4X/+6DhqB31PO3hjsDT ddUK6bWXaq8+7SrWBeAdm0WKSmQVaPM0wxGpzOY4X/SwPRpu8EM9yku0dA5OJXH+AxI/ zeGjRjTrDSB21rODFQgq82to356KZRn66yiOD3XCDazNMB6e7HYGewsV3OVpqTTXKqTS Q/3w== X-Gm-Message-State: ALoCoQn7NHrsr3uCQh/pbdwfF+QqUODgqBRV5HKyB94tpkhljXulLfGEWObhlPnNSaCxjXrCIWeI2GM3GaPxsBYwSBI6nHxBgQ== X-Received: by 10.194.57.100 with SMTP id h4mr130376777wjq.21.1452518379867; Mon, 11 Jan 2016 05:19:39 -0800 (PST) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id c15sm12766055wmd.19.2016.01.11.05.19.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 05:19:39 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, kernel-hardening@lists.openwall.com, will.deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com, leif.lindholm@linaro.org, keescook@chromium.org, linux-kernel@vger.kernel.org Cc: stuart.yoder@freescale.com, bhupesh.sharma@freescale.com, arnd@arndb.de, marc.zyngier@arm.com, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [PATCH v3 02/21] arm64: introduce KIMAGE_VADDR as the virtual base of the kernel region Date: Mon, 11 Jan 2016 14:18:55 +0100 Message-Id: <1452518355-4606-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452518355-4606-1-git-send-email-ard.biesheuvel@linaro.org> References: <1452518355-4606-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This introduces the preprocessor symbol KIMAGE_VADDR which will serve as the symbolic virtual base of the kernel region, i.e., the kernel's virtual offset will be KIMAGE_VADDR + TEXT_OFFSET. For now, we define it as being equal to PAGE_OFFSET, but in the future, it will be moved below it once we move the kernel virtual mapping out of the linear mapping. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/memory.h | 10 ++++++++-- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/vmlinux.lds.S | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) -- 2.5.0 Reviewed-by: Mark Rutland diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 853953cd1f08..bea9631b34a8 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -51,7 +51,8 @@ #define VA_BITS (CONFIG_ARM64_VA_BITS) #define VA_START (UL(0xffffffffffffffff) << VA_BITS) #define PAGE_OFFSET (UL(0xffffffffffffffff) << (VA_BITS - 1)) -#define MODULES_END (PAGE_OFFSET) +#define KIMAGE_VADDR (PAGE_OFFSET) +#define MODULES_END (KIMAGE_VADDR) #define MODULES_VADDR (MODULES_END - SZ_64M) #define PCI_IO_END (MODULES_VADDR - SZ_2M) #define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE) @@ -75,8 +76,13 @@ * private definitions which should NOT be used outside memory.h * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. */ -#define __virt_to_phys(x) (((phys_addr_t)(x) - PAGE_OFFSET + PHYS_OFFSET)) +#define __virt_to_phys(x) ({ \ + phys_addr_t __x = (phys_addr_t)(x); \ + __x >= PAGE_OFFSET ? (__x - PAGE_OFFSET + PHYS_OFFSET) : \ + (__x - KIMAGE_VADDR + PHYS_OFFSET); }) + #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET)) +#define __phys_to_kimg(x) ((unsigned long)((x) - PHYS_OFFSET + KIMAGE_VADDR)) /* * Convert a page to/from a physical address diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 63335fa68426..350515276541 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -389,7 +389,7 @@ __create_page_tables: * Map the kernel image (starting with PHYS_OFFSET). */ mov x0, x26 // swapper_pg_dir - mov x5, #PAGE_OFFSET + ldr x5, =KIMAGE_VADDR create_pgd_entry x0, x5, x3, x6 ldr x6, =KERNEL_END // __va(KERNEL_END) mov x3, x24 // phys offset diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 7de6c39858a5..ced0dedcabcc 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -88,7 +88,7 @@ SECTIONS *(.discard.*) } - . = PAGE_OFFSET + TEXT_OFFSET; + . = KIMAGE_VADDR + TEXT_OFFSET; .head.text : { _text = .; @@ -185,4 +185,4 @@ ASSERT(__idmap_text_end - (__idmap_text_start & ~(SZ_4K - 1)) <= SZ_4K, /* * If padding is applied before .head.text, virt<->phys conversions will fail. */ -ASSERT(_text == (PAGE_OFFSET + TEXT_OFFSET), "HEAD is misaligned") +ASSERT(_text == (KIMAGE_VADDR + TEXT_OFFSET), "HEAD is misaligned")