linux-stable.git/arch/powerpc/kernel/vmlinux.lds.S, branch v5.5

powerpc: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-04T17:30:13+00:00

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-25-keescook@chromium.org

vmlinux.lds.h: Move NOTES into RO_DATA

2019-11-04T14:34:41+00:00

The .notes section should be non-executable read-only data. As such,
move it to the RO_DATA macro instead of being per-architecture defined.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-11-keescook@chromium.org

vmlinux.lds.h: Move Program Header restoration into NOTES macro

2019-11-04T14:34:39+00:00

In preparation for moving NOTES into RO_DATA, make the Program Header
assignment restoration be part of the NOTES macro itself.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-10-keescook@chromium.org

vmlinux.lds.h: Provide EMIT_PT_NOTE to indicate export of .notes

2019-11-04T14:34:38+00:00

In preparation for moving NOTES into RO_DATA, provide a mechanism for
architectures that want to emit a PT_NOTE Program Header to do so.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-9-keescook@chromium.org

powerpc: Rename PT_LOAD identifier "kernel" to "text"

2019-11-04T14:34:11+00:00

In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "kernel" to
"text" to match other architectures.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86@kernel.org
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-4-keescook@chromium.org

powerpc: Remove PT_NOTE workaround

2019-11-04T14:33:39+00:00

In preparation for moving NOTES into RO_DATA, remove the PT_NOTE
workaround since the kernel requires at least gcc 4.6 now.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86@kernel.org
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-3-keescook@chromium.org

powerpc: Rename "notes" PT_NOTE to "note"

2019-11-04T14:33:28+00:00

The Program Header identifiers are internal to the linker scripts. In
preparation for moving the NOTES segment declaration into RO_DATA,
standardize the identifier for the PT_NOTE entry to "note" as used by
all other architectures that emit PT_NOTE.

Note that there was discussion about changing all architectures to use
"notes" instead, but I prefer to avoid that at this time. Changing only
powerpc is the smallest change to standardize the entire kernel. And
while this standardization does use singular "note" for a section that
has more than one note in it, this is just an internal identifier. It
matches the ELF "PT_NOTE", and is 4 characters (like "text", and "data")
for pretty alignment. The more exposed macro, "NOTES", use the more
sensible plural wording.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-2-keescook@chromium.org

powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT

2019-02-23T10:04:32+00:00

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 
Signed-off-by: Michael Ellerman

powerpc/32: Include .branch_lt in data section

2019-02-05T04:47:16+00:00

When building a 32 bit powerpc kernel with Binutils 2.31.1 this warning
is emitted:

 powerpc-linux-gnu-ld: warning: orphan section `.branch_lt' from
 `arch/powerpc/kernel/head_44x.o' being placed in section `.branch_lt'

As of binutils commit 2d7ad24e8726 ("Support PLT16 relocs against local
symbols")[1], 32 bit targets can produce .branch_lt sections in their
output.

Include these symbols in the .data section as the ppc64 kernel does.

[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d7ad24e8726ba4c45c9e67be08223a146a837ce
Signed-off-by: Joel Stanley 
Reviewed-by: Alan Modra 
Signed-off-by: Michael Ellerman

powerpc: Use ALIGN instead of BLOCK

2019-01-15T00:12:10+00:00

In the ld documentation under Builtin Functions:

  BLOCK(exp)

    This is a synonym for ALIGN, for compatibility with older linker scripts.

Clang's linker (lld) doesn't know about BLOCK so remove this use of
it.

Suggested-by: George Rimar 
Signed-off-by: Joel Stanley 
Reviewed-by: Nick Desaulniers 
Signed-off-by: Michael Ellerman