linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	 j.neuschaefer@gmx.net
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 11/13] powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT
Date: Thu, 29 Nov 2018 19:00:32 +0000 (UTC)	[thread overview]
Message-ID: <aa90e128e9822dc0f43f42941f339ae5edca9c63.1543517818.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1543517818.git.christophe.leroy@c-s.fr>

CONFIG_STRICT_KERNEL_RWX requires a special alignment
for DATA for some subarches. Today it is just defined
as an #ifdef in vmlinux.lds.S

In order to get more flexibility, this patch moves the
definition of this alignment in Kconfig

On some subarches, CONFIG_STRICT_KERNEL_RWX will
require a special alignment of _etext.

This patch also adds a configuration item for it in Kconfig

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/Kconfig              | 9 +++++++++
 arch/powerpc/kernel/vmlinux.lds.S | 9 +++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 4a81a80d0635..f3e420f3f1d7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -728,6 +728,15 @@ config THREAD_SHIFT
 	  Used to define the stack size. The default is almost always what you
 	  want. Only change this if you know what you are doing.
 
+config ETEXT_SHIFT
+	int
+	default PPC_PAGE_SHIFT
+
+config DATA_SHIFT
+	int
+	default 24 if STRICT_KERNEL_RWX && PPC64
+	default PPC_PAGE_SHIFT
+
 config FORCE_MAX_ZONEORDER
 	int "Maximum zone order"
 	range 8 9 if PPC64 && PPC_64K_PAGES
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 1148c3c60c3b..d210dcfe915a 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -12,11 +12,8 @@
 #include <asm/cache.h>
 #include <asm/thread_info.h>
 
-#if defined(CONFIG_STRICT_KERNEL_RWX) && !defined(CONFIG_PPC32)
-#define STRICT_ALIGN_SIZE	(1 << 24)
-#else
-#define STRICT_ALIGN_SIZE	PAGE_SIZE
-#endif
+#define STRICT_ALIGN_SIZE	(1 << CONFIG_DATA_SHIFT)
+#define ETEXT_ALIGN_SIZE	(1 << CONFIG_ETEXT_SHIFT)
 
 ENTRY(_stext)
 
@@ -131,7 +128,7 @@ SECTIONS
 
 	} :kernel
 
-	. = ALIGN(PAGE_SIZE);
+	. = ALIGN(ETEXT_ALIGN_SIZE);
 	_etext = .;
 	PROVIDE32 (etext = .);
 
-- 
2.13.3


  parent reply	other threads:[~2018-11-29 19:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-29 19:00 [PATCH v1 00/13] powerpc/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 01/13] powerpc/mm: add exec protection on powerpc 603 Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 02/13] powerpc/mm/32: add base address to mmu_mapin_ram() Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 03/13] powerpc/mm/32s: rework mmu_mapin_ram() Christophe Leroy
2018-12-03 21:55   ` Jonathan Neuschäfer
2018-12-13 12:16     ` Christophe Leroy
2018-12-13 14:51       ` Christophe Leroy
2018-12-17  1:28         ` Jonathan Neuschäfer
2018-12-17  9:29           ` Christophe Leroy
2018-12-18  3:05             ` Jonathan Neuschäfer
2018-12-18  9:18               ` Christophe Leroy
2018-12-18 14:07                 ` Jonathan Neuschäfer
2018-12-18 14:15                   ` Christophe Leroy
2018-12-18 14:55                     ` Christophe Leroy
2018-12-18 15:04                       ` Christophe Leroy
2018-12-18 17:04                         ` Jonathan Neuschäfer
2018-12-18 18:13                           ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 04/13] powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 05/13] powerpc/wii: remove wii_mmu_mapin_mem2() Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 06/13] powerpc/mm/32s: use _PAGE_EXEC in setbat() Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 07/13] powerpc/mm/32s: add setibat() clearibat() and update_bats() Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 08/13] powerpc/32: add helper to write into segment registers Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 09/13] powerpc/mmu: add is_strict_kernel_rwx() helper Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 10/13] powerpc/kconfig: define PAGE_SHIFT inside Kconfig Christophe Leroy
2018-11-29 19:00 ` Christophe Leroy [this message]
2018-11-29 19:00 ` [PATCH v1 12/13] powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 13/13] powerpc/kconfig: make _etext and data areas alignment configurable on Book3s 32 Christophe Leroy

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=aa90e128e9822dc0f43f42941f339ae5edca9c63.1543517818.git.christophe.leroy@c-s.fr \
    --to=christophe.leroy@c-s.fr \
    --cc=benh@kernel.crashing.org \
    --cc=j.neuschaefer@gmx.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    /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).