Skip to contentSkip to conversation

arm64: Move jump_label_init() before parse_early_param()

PATCH Superseded Kees Cook 4 participants 7 messages Jun 26, 2019 – Jun 28, 2019 arm64

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 arm64: Move jump_label_init() before parse_early_param()

While jump_label_init() was moved earlier in the boot process in commit efd9e03facd0 ("arm64: Use static keys for CPU features"), it wasn't early enough for early params to use it. The old state of things was as described here...

init/main.c calls out to arch-specific things before general jump label and early param handling:

asmlinkage __visible void __init start_kernel(void)

{
        ...
        setup_arch(&command_line);
        ...
        smp_prepare_boot_cpu();
        ...
        /* parameters may set static keys */
        jump_label_init();
        parse_early_param();
        ...
}

x86 setup_arch() wants those earlier, so it handles jump label and early param:

void __init setup_arch(char **cmdline_p)

{
        ...
        jump_label_init();
        ...
        parse_early_param();
        ...
}

arm64 setup_arch() only had early param:

void __init setup_arch(char **cmdline_p)

{
        ...
        parse_early_param();
        ...
}

with jump label later in smp_prepare_boot_cpu():

void __init smp_prepare_boot_cpu(void)

{
        ...
        jump_label_init();
        ...
}

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

---
 arch/arm64/kernel/setup.c | 5 +++++
 arch/arm64/kernel/smp.c   | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/kernel/setup.c +5 -0
index 7e541f947b4c..9c4bad7d7131 100644
@@ -283,6 +283,11 @@ void __init setup_arch(char **cmdline_p)
 
 	setup_machine_fdt(__fdt_pointer);
 
+	/*
+	 * Initialise the static keys early as they may be enabled by the
+	 * cpufeature code and early parameters.
+	 */
+	jump_label_init();
 	parse_early_param();
 
 	/*
arch/arm64/kernel/smp.c +0 -5
index 6dcf9607d770..20c456b3862c 100644
@@ -424,11 +424,6 @@ void __init smp_cpus_done(unsigned int max_cpus)
 void __init smp_prepare_boot_cpu(void)
 {
 	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
-	/*
-	 * Initialise the static keys early as they may be enabled by the
-	 * cpufeature code.
-	 */
-	jump_label_init();
 	cpuinfo_store_boot_cpu();
 
 	/*
Signature · 5 lines
2.17.1


-- 
Kees Cook
Acked-by on v1 1/1
#1 lore raw
Quoted 52 lines · Kees Cook

While jump_label_init() was moved earlier in the boot process in commit efd9e03facd0 ("arm64: Use static keys for CPU features"), it wasn't early enough for early params to use it. The old state of things was as described here...

init/main.c calls out to arch-specific things before general jump label and early param handling:

asmlinkage __visible void __init start_kernel(void)

{
        ...
        setup_arch(&command_line);
        ...
        smp_prepare_boot_cpu();
        ...
        /* parameters may set static keys */
        jump_label_init();
        parse_early_param();
        ...
}

x86 setup_arch() wants those earlier, so it handles jump label and early param:

void __init setup_arch(char **cmdline_p)

{
        ...
        jump_label_init();
        ...
        parse_early_param();
        ...
}

arm64 setup_arch() only had early param:

void __init setup_arch(char **cmdline_p)

{
        ...
        parse_early_param();
        ...
}

with jump label later in smp_prepare_boot_cpu():

void __init smp_prepare_boot_cpu(void)

{
        ...
        jump_label_init();
        ...
}
Quoted 6 lines

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

Quoted 43 lines
---
 arch/arm64/kernel/setup.c | 5 +++++
 arch/arm64/kernel/smp.c   | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/kernel/setup.c +5 -0
index 7e541f947b4c..9c4bad7d7131 100644
@@ -283,6 +283,11 @@ void __init setup_arch(char **cmdline_p)
 
        setup_machine_fdt(__fdt_pointer);
 
+       /*
+        * Initialise the static keys early as they may be enabled by the
+        * cpufeature code and early parameters.
+        */
+       jump_label_init();
        parse_early_param();
 
        /*
arch/arm64/kernel/smp.c +0 -6
index 6dcf9607d770..20c456b3862c 100644
@@ -424,11 +424,6 @@ void __init smp_cpus_done(unsigned int max_cpus)
 void __init smp_prepare_boot_cpu(void)
 {
        set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
-       /*
-        * Initialise the static keys early as they may be enabled by the
-        * cpufeature code.
-        */
-       jump_label_init();
        cpuinfo_store_boot_cpu();
 
        /*
--

2.17.1

--
Kees Cook

maintainer
#2 lore raw
In reply to Kees Cook

Hi Kees,

Quoted 4 lines · Kees Cook

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

This looks fine to me. Is there any other series to be merged soon that depends on this patch (the init_on_alloc/fail one)? If not, I can queue it for 5.3.

Signature · 1 line
Catalin
author
#3 lore raw
Quoted 9 lines · Catalin Marinas
Quoted 4 lines · Kees Cook

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

This looks fine to me. Is there any other series to be merged soon that depends on this patch (the init_on_alloc/fail one)? If not, I can queue it for 5.3.

Yes, but that series will be in 5.3 also, so there's rush for 5.2. Do you want Alexander (via akpm) to include it in his series instead of it going through the arm64 tree?

Signature · 1 line
Kees Cook
maintainer Acked-by
#4 lore raw
Quoted 7 lines · Kees Cook
Quoted 6 lines · Catalin Marinas
Quoted 4 lines · Kees Cook

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

Quoted 7 lines
Quoted 3 lines

This looks fine to me. Is there any other series to be merged soon that depends on this patch (the init_on_alloc/fail one)? If not, I can queue it for 5.3.

Yes, but that series will be in 5.3 also, so there's rush for 5.2. Do you want Alexander (via akpm) to include it in his series instead of it going through the arm64 tree?

It's pretty late for 5.2, especially since it hasn't had extensive testing (though I'm fairly sure it won't break). Anyway, it's better if it goes together with Alexander's series.

#5 lore raw
Quoted 13 lines · Catalin Marinas
Quoted 11 lines · Kees Cook
Quoted 9 lines · Catalin Marinas
Quoted 4 lines · Kees Cook

This moves arm64 jump_label_init() from smp_prepare_boot_cpu() to setup_arch(), as done already on x86, in preparation from early param usage in the init_on_alloc/free() series:
https://lkml.kernel.org/r/[email protected]

This looks fine to me. Is there any other series to be merged soon that depends on this patch (the init_on_alloc/fail one)? If not, I can queue it for 5.3.

Quoted 7 lines
Quoted 3 lines

Yes, but that series will be in 5.3 also, so there's rush for 5.2. Do you want Alexander (via akpm) to include it in his series instead of it going through the arm64 tree?

It's pretty late for 5.2, especially since it hasn't had extensive testing (though I'm fairly sure it won't break). Anyway, it's better if it goes together with Alexander's series.

Am I understanding right this is already covered by Kees having sent his patch to -mm tree and I don't need to explicitly include it into my series?

Quoted 1 line
Signature · 10 lines
Alexander Potapenko
Software Engineer

Google Germany GmbH
Erika-Mann-Straße, 33
80636 München

Geschäftsführer: Paul Manicle, Halimah DeLaine Prado
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
author
#6 lore raw
Quoted 3 lines · Alexander Potapenko

Am I understanding right this is already covered by Kees having sent his patch to -mm tree and I don't need to explicitly include it into my series?

Correct; Andrew added it to -mm already.

Signature · 1 line
Kees Cook