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: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v4 14/16] powerpc/kconfig: make _etext and data areas alignment configurable on Book3s 32
Date: Thu, 21 Feb 2019 08:05:02 +0000 (UTC) [thread overview]
Message-ID: <7ed390a0c72d9bba6a1ea5bdda92dde287b18fa0.1550692943.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1550692943.git.christophe.leroy@c-s.fr>
Depending on the number of available BATs for mapping the different
kernel areas, it might be needed to increase the alignment of _etext
and/or of data areas.
This patchs allows the user to do it via Kconfig.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/Kconfig | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 26ddea487d72..127259179b4d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -728,16 +728,44 @@ 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_BOOL
+ bool "Set custom etext alignment" if STRICT_KERNEL_RWX && PPC_BOOK3S_32
+ depends on ADVANCED_OPTIONS
+ help
+ This option allows you to set the kernel end of text alignment. When
+ RAM is mapped by blocks, the alignment needs to fit the size and
+ number of possible blocks. The default should be OK for most configs.
+
+ Say N here unless you know what you are doing.
+
config ETEXT_SHIFT
- int
+ int "_etext shift" if ETEXT_SHIFT_BOOL
+ range 17 28 if STRICT_KERNEL_RWX && PPC_BOOK3S_32
default 17 if STRICT_KERNEL_RWX && PPC_BOOK3S_32
default PPC_PAGE_SHIFT
+ help
+ On Book3S 32 (603+), IBATs are used to map kernel text.
+ Smaller is the alignment, greater is the number of necessary IBATs.
+
+config DATA_SHIFT_BOOL
+ bool "Set custom data alignment" if STRICT_KERNEL_RWX && PPC_BOOK3S_32
+ depends on ADVANCED_OPTIONS
+ help
+ This option allows you to set the kernel data alignment. When
+ RAM is mapped by blocks, the alignment needs to fit the size and
+ number of possible blocks. The default should be OK for most configs.
+
+ Say N here unless you know what you are doing.
config DATA_SHIFT
- int
+ int "Data shift" if DATA_SHIFT_BOOL
default 24 if STRICT_KERNEL_RWX && PPC64
+ range 17 28 if STRICT_KERNEL_RWX && PPC_BOOK3S_32
default 22 if STRICT_KERNEL_RWX && PPC_BOOK3S_32
default PPC_PAGE_SHIFT
+ help
+ On Book3S 32 (603+), DBATs are used to map kernel text and rodata RO.
+ Smaller is the alignment, greater is the number of necessary DBATs.
config FORCE_MAX_ZONEORDER
int "Maximum zone order"
--
2.13.3
next prev parent reply other threads:[~2019-02-21 8:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 8:04 [PATCH v4 00/16] powerpc/32: Use BATs/LTLBs for STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 01/16] powerpc/wii: properly disable use of BATs when requested Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 02/16] powerpc/mm/32: add base address to mmu_mapin_ram() Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 03/16] powerpc/mm/32s: rework mmu_mapin_ram() Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 04/16] powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks Christophe Leroy
2019-02-21 13:51 ` Michael Ellerman
2019-02-21 14:38 ` Christophe Leroy
2019-02-21 19:02 ` Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 05/16] powerpc/32: always populate page tables for Abatron BDI Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 06/16] powerpc/wii: remove wii_mmu_mapin_mem2() Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 07/16] powerpc/mm/32s: use _PAGE_EXEC in setbat() Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 08/16] powerpc/32: add helper to write into segment registers Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 09/16] powerpc/mmu: add is_strict_kernel_rwx() helper Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 10/16] powerpc/kconfig: define PAGE_SHIFT inside Kconfig Christophe Leroy
2019-02-21 8:04 ` [PATCH v4 11/16] powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT Christophe Leroy
2019-02-21 8:05 ` [PATCH v4 12/16] powerpc/mm/32s: add setibat() clearibat() and update_bats() Christophe Leroy
2019-02-21 8:05 ` [PATCH v4 13/16] powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 8:05 ` Christophe Leroy [this message]
2019-02-21 8:05 ` [PATCH v4 15/16] powerpc/8xx: don't disable large TLBs with CONFIG_STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 8:05 ` [PATCH v4 16/16] powerpc/kconfig: make _etext and data areas alignment configurable on 8xx 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=7ed390a0c72d9bba6a1ea5bdda92dde287b18fa0.1550692943.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).