linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section
@ 2018-09-30 16:49 Ard Biesheuvel
  2018-09-30 16:55 ` Kees Cook
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2018-09-30 16:49 UTC (permalink / raw)
  To: linux-s390
  Cc: linux-kernel, linux, Ard Biesheuvel, Heiko Carstens, Kees Cook,
	Thomas Gleixner, Ingo Molnar, Martin Schwidefsky, Jessica Yu,
	Peter Zijlstra

Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
region") moved the __jump_table input section into the __ro_after_init
output section, but inadvertently put the macro in the wrong place in
the s390 linker script. Let's fix that.

Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/s390/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 4042bbf3f9ad..457713f48734 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -64,9 +64,9 @@ SECTIONS
 	__start_ro_after_init = .;
 	.data..ro_after_init : {
 		 *(.data..ro_after_init)
+		JUMP_TABLE_DATA
 	}
 	EXCEPTION_TABLE(16)
-	JUMP_TABLE_DATA
 	. = ALIGN(PAGE_SIZE);
 	__end_ro_after_init = .;
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section
  2018-09-30 16:49 [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section Ard Biesheuvel
@ 2018-09-30 16:55 ` Kees Cook
  2018-10-01 20:25 ` Heiko Carstens
  2018-10-02  6:12 ` [tip:core/core] s390/vmlinux.lds: Move " tip-bot for Ard Biesheuvel
  2 siblings, 0 replies; 6+ messages in thread
From: Kees Cook @ 2018-09-30 16:55 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: linux-s390, LKML, Guenter Roeck, Heiko Carstens, Thomas Gleixner,
	Ingo Molnar, Martin Schwidefsky, Jessica Yu, Peter Zijlstra

On Sun, Sep 30, 2018 at 9:49 AM, Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
>
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Jessica Yu <jeyu@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  arch/s390/kernel/vmlinux.lds.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
>         __start_ro_after_init = .;
>         .data..ro_after_init : {
>                  *(.data..ro_after_init)
> +               JUMP_TABLE_DATA
>         }
>         EXCEPTION_TABLE(16)
> -       JUMP_TABLE_DATA
>         . = ALIGN(PAGE_SIZE);
>         __end_ro_after_init = .;
>
> --
> 2.17.1
>



-- 
Kees Cook
Pixel Security

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section
  2018-09-30 16:49 [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section Ard Biesheuvel
  2018-09-30 16:55 ` Kees Cook
@ 2018-10-01 20:25 ` Heiko Carstens
  2018-10-02  5:48   ` Ard Biesheuvel
  2018-10-02  6:12 ` [tip:core/core] s390/vmlinux.lds: Move " tip-bot for Ard Biesheuvel
  2 siblings, 1 reply; 6+ messages in thread
From: Heiko Carstens @ 2018-10-01 20:25 UTC (permalink / raw)
  To: Ard Biesheuvel, Thomas Gleixner
  Cc: linux-s390, linux-kernel, linux, Kees Cook, Ingo Molnar,
	Martin Schwidefsky, Jessica Yu, Peter Zijlstra

On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
> 
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Jessica Yu <jeyu@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  arch/s390/kernel/vmlinux.lds.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>

I don't think this is very obvious, but this fixes current build breakage
in linux-next and I assume Thomas should pick this up.

> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
>  	__start_ro_after_init = .;
>  	.data..ro_after_init : {
>  		 *(.data..ro_after_init)
> +		JUMP_TABLE_DATA
>  	}
>  	EXCEPTION_TABLE(16)
> -	JUMP_TABLE_DATA
>  	. = ALIGN(PAGE_SIZE);
>  	__end_ro_after_init = .;
> 
> -- 
> 2.17.1
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section
  2018-10-01 20:25 ` Heiko Carstens
@ 2018-10-02  5:48   ` Ard Biesheuvel
  0 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2018-10-02  5:48 UTC (permalink / raw)
  To: Heiko Carstens, Thomas Gleixner, Ingo Molnar
  Cc: linux-s390, Linux Kernel Mailing List, Guenter Roeck, Kees Cook,
	Martin Schwidefsky, Jessica Yu, Peter Zijlstra

On 1 October 2018 at 22:25, Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
>> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
>> region") moved the __jump_table input section into the __ro_after_init
>> output section, but inadvertently put the macro in the wrong place in
>> the s390 linker script. Let's fix that.
>>
>> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
>> Reported-by: Guenter Roeck <linux@roeck-us.net>
>> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>> Cc: Kees Cook <keescook@chromium.org>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>> Cc: Jessica Yu <jeyu@kernel.org>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>>  arch/s390/kernel/vmlinux.lds.S | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
>
> I don't think this is very obvious, but this fixes current build breakage
> in linux-next and I assume Thomas should pick this up.
>

Indeed.

Thomas, Ingo,

Could you please take this fix for the jump lable changes queued in
-next, and the other one I sent out yesterday [0], through core/core
in tip.git as before?

Thanks,
Ard.

[0] https://lore.kernel.org/lkml/20181001081324.11553-1-ard.biesheuvel@linaro.org/

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [tip:core/core] s390/vmlinux.lds: Move JUMP_TABLE_DATA into output section
  2018-09-30 16:49 [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section Ard Biesheuvel
  2018-09-30 16:55 ` Kees Cook
  2018-10-01 20:25 ` Heiko Carstens
@ 2018-10-02  6:12 ` tip-bot for Ard Biesheuvel
  2 siblings, 0 replies; 6+ messages in thread
From: tip-bot for Ard Biesheuvel @ 2018-10-02  6:12 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: hpa, heiko.carstens, ard.biesheuvel, tglx, linux-kernel,
	keescook, jeyu, schwidefsky, mingo, peterz, linux

Commit-ID:  57d15877033e44e9ac283b8c6e82cc67bf6a0aa6
Gitweb:     https://git.kernel.org/tip/57d15877033e44e9ac283b8c6e82cc67bf6a0aa6
Author:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
AuthorDate: Sun, 30 Sep 2018 18:49:50 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 2 Oct 2018 08:08:08 +0200

s390/vmlinux.lds: Move JUMP_TABLE_DATA into output section

Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
region") moved the __jump_table input section into the __ro_after_init
output section, but inadvertently put the macro in the wrong place in
the s390 linker script. Let's fix that.

Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Cc: linux-s390@vger.kernel.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20180930164950.3841-1-ard.biesheuvel@linaro.org

---
 arch/s390/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 4042bbf3f9ad..457713f48734 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -64,9 +64,9 @@ SECTIONS
 	__start_ro_after_init = .;
 	.data..ro_after_init : {
 		 *(.data..ro_after_init)
+		JUMP_TABLE_DATA
 	}
 	EXCEPTION_TABLE(16)
-	JUMP_TABLE_DATA
 	. = ALIGN(PAGE_SIZE);
 	__end_ro_after_init = .;
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section
@ 2018-09-30 17:08 Guenter Roeck
  0 siblings, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2018-09-30 17:08 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: linux-s390, linux-kernel, Heiko Carstens, Kees Cook,
	Thomas Gleixner, Ingo Molnar, Martin Schwidefsky, Jessica Yu,
	Peter Zijlstra

On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
> 
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Jessica Yu <jeyu@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  arch/s390/kernel/vmlinux.lds.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
>  	__start_ro_after_init = .;
>  	.data..ro_after_init : {
>  		 *(.data..ro_after_init)
> +		JUMP_TABLE_DATA
>  	}
>  	EXCEPTION_TABLE(16)
> -	JUMP_TABLE_DATA
>  	. = ALIGN(PAGE_SIZE);
>  	__end_ro_after_init = .;
>  
> -- 
> 2.17.1
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-02  6:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-30 16:49 [PATCH] s390: vmlinux.lds: move JUMP_TABLE_DATA into output section Ard Biesheuvel
2018-09-30 16:55 ` Kees Cook
2018-10-01 20:25 ` Heiko Carstens
2018-10-02  5:48   ` Ard Biesheuvel
2018-10-02  6:12 ` [tip:core/core] s390/vmlinux.lds: Move " tip-bot for Ard Biesheuvel
2018-09-30 17:08 [PATCH] s390: vmlinux.lds: move " Guenter Roeck

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).