linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Shi <alex.shi@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	stable@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org (moderated list:ARM64 PORT
	(AARCH64 ARCHITECTURE)), linux-kernel@vger.kernel.org (open list)
Cc: Yury Norov <ynorov@caviumnetworks.com>,
	Laura Abbott <labbott@redhat.com>,
	James Morse <james.morse@arm.com>
Subject: [PATCH 05/52] arm64: move TASK_* definitions to <asm/processor.h>
Date: Mon, 26 Feb 2018 16:19:39 +0800	[thread overview]
Message-ID: <1519633227-29832-6-git-send-email-alex.shi@linaro.org> (raw)
In-Reply-To: <1519633227-29832-1-git-send-email-alex.shi@linaro.org>

From: Yury Norov <ynorov@caviumnetworks.com>

commit eef94a3d09aab upstream.

ILP32 series [1] introduces the dependency on <asm/is_compat.h> for
TASK_SIZE macro. Which in turn requires <asm/thread_info.h>, and
<asm/thread_info.h> include <asm/memory.h>, giving a circular dependency,
because TASK_SIZE is currently located in <asm/memory.h>.

In other architectures, TASK_SIZE is defined in <asm/processor.h>, and
moving TASK_SIZE there fixes the problem.

Discussion: https://patchwork.kernel.org/patch/9929107/

[1] https://github.com/norov/linux/tree/ilp32-next

CC: Will Deacon <will.deacon@arm.com>
CC: Laura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Alex Shi <alex.shi@linaro.org>

Conflicts:
	no ptrace.h in arch/arm64/kernel/entry.S
---
 arch/arm64/include/asm/memory.h    | 15 ---------------
 arch/arm64/include/asm/processor.h | 21 +++++++++++++++++++++
 arch/arm64/kernel/entry.S          |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 53211a0..269b979 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -60,8 +60,6 @@
  * KIMAGE_VADDR - the virtual address of the start of the kernel image
  * VA_BITS - the maximum number of bits for virtual addresses.
  * VA_START - the first kernel virtual address.
- * TASK_SIZE - the maximum size of a user space task.
- * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area.
  */
 #define VA_BITS			(CONFIG_ARM64_VA_BITS)
 #define VA_START		(UL(0xffffffffffffffff) << VA_BITS)
@@ -74,19 +72,6 @@
 #define PCI_IO_END		(VMEMMAP_START - SZ_2M)
 #define PCI_IO_START		(PCI_IO_END - PCI_IO_SIZE)
 #define FIXADDR_TOP		(PCI_IO_START - SZ_2M)
-#define TASK_SIZE_64		(UL(1) << VA_BITS)
-
-#ifdef CONFIG_COMPAT
-#define TASK_SIZE_32		UL(0x100000000)
-#define TASK_SIZE		(test_thread_flag(TIF_32BIT) ? \
-				TASK_SIZE_32 : TASK_SIZE_64)
-#define TASK_SIZE_OF(tsk)	(test_tsk_thread_flag(tsk, TIF_32BIT) ? \
-				TASK_SIZE_32 : TASK_SIZE_64)
-#else
-#define TASK_SIZE		TASK_SIZE_64
-#endif /* CONFIG_COMPAT */
-
-#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 4))
 
 #define KERNEL_START      _text
 #define KERNEL_END        _end
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 60e3482..4258f4d 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -19,6 +19,10 @@
 #ifndef __ASM_PROCESSOR_H
 #define __ASM_PROCESSOR_H
 
+#define TASK_SIZE_64		(UL(1) << VA_BITS)
+
+#ifndef __ASSEMBLY__
+
 /*
  * Default implementation of macro that returns current
  * instruction pointer ("program counter").
@@ -37,6 +41,22 @@
 #include <asm/ptrace.h>
 #include <asm/types.h>
 
+/*
+ * TASK_SIZE - the maximum size of a user space task.
+ * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area.
+ */
+#ifdef CONFIG_COMPAT
+#define TASK_SIZE_32		UL(0x100000000)
+#define TASK_SIZE		(test_thread_flag(TIF_32BIT) ? \
+				TASK_SIZE_32 : TASK_SIZE_64)
+#define TASK_SIZE_OF(tsk)	(test_tsk_thread_flag(tsk, TIF_32BIT) ? \
+				TASK_SIZE_32 : TASK_SIZE_64)
+#else
+#define TASK_SIZE		TASK_SIZE_64
+#endif /* CONFIG_COMPAT */
+
+#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 4))
+
 #define STACK_TOP_MAX		TASK_SIZE_64
 #ifdef CONFIG_COMPAT
 #define AARCH32_VECTORS_BASE	0xffff0000
@@ -192,4 +212,5 @@ int cpu_enable_pan(void *__unused);
 int cpu_enable_uao(void *__unused);
 int cpu_enable_cache_maint_trap(void *__unused);
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ASM_PROCESSOR_H */
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index b4c7db4..478f0fe 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -28,7 +28,7 @@
 #include <asm/errno.h>
 #include <asm/esr.h>
 #include <asm/irq.h>
-#include <asm/memory.h>
+#include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/asm-uaccess.h>
 #include <asm/unistd.h>
-- 
2.7.4

  parent reply	other threads:[~2018-02-26  8:21 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1519633227-29832-1-git-send-email-alex.shi@linaro.org>
2018-02-26  8:19 ` [PATCH 01/52] mm: Introduce lm_alias Alex Shi
2018-02-26  8:19 ` [PATCH 02/52] arm64: alternatives: apply boot time fixups via the linear mapping Alex Shi
2018-02-26  8:19 ` [PATCH 03/52] arm64: barrier: Add CSDB macros to control data-value prediction Alex Shi
2018-02-26  8:19 ` [PATCH 04/52] arm64: Implement array_index_mask_nospec() Alex Shi
2018-02-26  8:19 ` Alex Shi [this message]
2018-02-26  8:19 ` [PATCH 06/52] arm64: Factor out PAN enabling/disabling into separate uaccess_* macros Alex Shi
2018-02-26  8:19 ` [PATCH 07/52] arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro Alex Shi
2018-02-26  8:19 ` [PATCH 08/52] arm64: uaccess: consistently check object sizes Alex Shi
2018-02-26  8:19 ` [PATCH 09/52] arm64: Make USER_DS an inclusive limit Alex Shi
2018-02-26  8:19 ` [PATCH 10/52] arm64: Use pointer masking to limit uaccess speculation Alex Shi
2018-02-26  8:19 ` [PATCH 11/52] arm64: syscallno is secretly an int, make it official Alex Shi
2018-02-26  8:19 ` [PATCH 12/52] arm64: entry: Ensure branch through syscall table is bounded under speculation Alex Shi
2018-02-26  8:19 ` [PATCH 13/52] arm64: uaccess: Prevent speculative use of the current addr_limit Alex Shi
2018-02-26  8:19 ` [PATCH 14/52] arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user Alex Shi
2018-02-26  8:19 ` [PATCH 15/52] arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user Alex Shi
2018-02-26  8:19 ` [PATCH 16/52] arm64: futex: Mask __user pointers prior to dereference Alex Shi
2018-02-26  8:19 ` [PATCH 17/52] drivers/firmware: Expose psci_get_version through psci_ops structure Alex Shi
2018-02-26  8:19 ` [PATCH 18/52] arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early Alex Shi
2018-02-26  8:19 ` [PATCH 19/52] arm64: cpu_errata: Allow an erratum to be match for all revisions of a core Alex Shi
2018-02-26  8:19 ` [PATCH 20/52] arm64: Run enable method for errata work arounds on late CPUs Alex Shi
2018-02-26  8:19 ` [PATCH 21/52] arm64: cpufeature: Pass capability structure to ->enable callback Alex Shi
2018-02-26  8:19 ` [PATCH 22/52] arm64: Move post_ttbr_update_workaround to C code Alex Shi
2018-02-26  8:19 ` [PATCH 23/52] arm64: Add skeleton to harden the branch predictor against aliasing attacks Alex Shi
2018-02-26  8:19 ` [PATCH 24/52] arm64: Move BP hardening to check_and_switch_context Alex Shi
2018-02-26  8:19 ` [PATCH 25/52] arm64: KVM: Use per-CPU vector when BP hardening is enabled Alex Shi
2018-02-26  8:20 ` [PATCH 26/52] arm64: entry: Apply BP hardening for high-priority synchronous exceptions Alex Shi
2018-02-26  8:20 ` [PATCH 27/52] arm64: entry: Apply BP hardening for suspicious interrupts from EL0 Alex Shi
2018-02-26  8:20 ` [PATCH 28/52] arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 Alex Shi
2018-02-26  8:20 ` [PATCH 29/52] arm64: Implement branch predictor hardening for affected Cortex-A CPUs Alex Shi
2018-02-26  8:20 ` [PATCH 30/52] arm64: KVM: Increment PC after handling an SMC trap Alex Shi
2018-02-26  8:20 ` [PATCH 31/52] arm/arm64: KVM: Consolidate the PSCI include files Alex Shi
2018-02-26  8:20 ` [PATCH 32/52] arm/arm64: KVM: Add PSCI_VERSION helper Alex Shi
2018-02-26  8:20 ` [PATCH 33/52] arm/arm64: KVM: Add smccc accessors to PSCI code Alex Shi
2018-02-26  8:20 ` [PATCH 34/52] arm/arm64: KVM: Implement PSCI 1.0 support Alex Shi
2018-02-26  8:20 ` [PATCH 35/52] arm/arm64: KVM: Advertise SMCCC v1.1 Alex Shi
2018-02-26  8:20 ` [PATCH 36/52] arm64: KVM: Make PSCI_VERSION a fast path Alex Shi
2018-02-26  8:20 ` [PATCH 37/52] arm/arm64: KVM: Turn kvm_psci_version into a static inline Alex Shi
2018-02-26  8:20 ` [PATCH 38/52] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Alex Shi
2018-02-26  8:20 ` [PATCH 39/52] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Alex Shi
2018-02-26  8:20 ` [PATCH 40/52] firmware/psci: Expose PSCI conduit Alex Shi
2018-02-26  8:20 ` [PATCH 41/52] firmware/psci: Expose SMCCC version through psci_ops Alex Shi
2018-02-26  8:20 ` [PATCH 42/52] arm/arm64: smccc: Make function identifiers an unsigned quantity Alex Shi
2018-02-26  8:20 ` [PATCH 43/52] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Alex Shi
2018-02-26  8:20 ` [PATCH 44/52] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Alex Shi
2018-02-26  8:20 ` [PATCH 45/52] arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Alex Shi
2018-02-26  8:20 ` [PATCH 46/52] arm: Add BTB invalidation on switch_mm for Cortex-A9, A12 and A17 Alex Shi
2018-02-26 10:05   ` Greg KH
2018-02-26 10:40     ` Alex Shi
2018-02-26 10:45       ` Will Deacon
2018-02-28  4:10         ` Alex Shi
2018-02-26  8:20 ` [PATCH 47/52] arm: Invalidate BTB on prefetch abort outside of user mapping on Cortex A8, A9, " Alex Shi
2018-02-26  8:20 ` [PATCH 48/52] arm: KVM: Invalidate BTB on guest exit for Cortex-A12/A17 Alex Shi
2018-02-26  8:20 ` [PATCH 49/52] arm: Add icache invalidation on switch_mm for Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 50/52] arm: Invalidate icache on prefetch abort outside of user mapping on Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 51/52] arm: KVM: Invalidate icache on guest exit for Cortex-A15 Alex Shi
2018-02-26  8:20 ` [PATCH 52/52] arm64: Add README describing the branch Alex Shi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519633227-29832-6-git-send-email-alex.shi@linaro.org \
    --to=alex.shi@linaro.org \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=james.morse@arm.com \
    --cc=labbott@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=stable@vger.kernel.org \
    --cc=will.deacon@arm.com \
    --cc=ynorov@caviumnetworks.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).