From 75aa0fb9df32f01b2f7d7ed8f19bfd7ec33a1d96 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 9 Jun 2022 10:03:15 -0400 Subject: [PATCH] Drop arm64-initialize-jump-labels-before-setup_machine_fd.patch Signed-off-by: Sasha Levin --- ...-jump-labels-before-setup_machine_fd.patch | 93 ------------------- queue-5.10/series | 1 - ...-jump-labels-before-setup_machine_fd.patch | 93 ------------------- queue-5.15/series | 1 - ...-jump-labels-before-setup_machine_fd.patch | 93 ------------------- queue-5.17/series | 1 - ...-jump-labels-before-setup_machine_fd.patch | 93 ------------------- queue-5.18/series | 1 - 8 files changed, 376 deletions(-) delete mode 100644 queue-5.10/arm64-initialize-jump-labels-before-setup_machine_fd.patch delete mode 100644 queue-5.15/arm64-initialize-jump-labels-before-setup_machine_fd.patch delete mode 100644 queue-5.17/arm64-initialize-jump-labels-before-setup_machine_fd.patch delete mode 100644 queue-5.18/arm64-initialize-jump-labels-before-setup_machine_fd.patch diff --git a/queue-5.10/arm64-initialize-jump-labels-before-setup_machine_fd.patch b/queue-5.10/arm64-initialize-jump-labels-before-setup_machine_fd.patch deleted file mode 100644 index 129dc1e6e30..00000000000 --- a/queue-5.10/arm64-initialize-jump-labels-before-setup_machine_fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 7ead32d48ae1ed5d4d09546bc894b4a18ae70091 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 1 Jun 2022 19:21:09 -0700 -Subject: arm64: Initialize jump labels before setup_machine_fdt() - -From: Stephen Boyd - -[ Upstream commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae ] - -A static key warning splat appears during early boot on arm64 systems -that credit randomness from devicetrees that contain an "rng-seed" -property. This is because setup_machine_fdt() is called before -jump_label_init() during setup_arch(). Let's swap the order of these two -calls so that jump labels are initialized before the devicetree is -unflattened and the rng seed is credited. - - static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init() - WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8 - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff - pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) - pc : static_key_enable_cpuslocked+0xb0/0xb8 - lr : static_key_enable_cpuslocked+0xb0/0xb8 - sp : ffffffe51c393cf0 - x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10 - x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000 - x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000 - x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020 - x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708 - x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000 - x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 - x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027 - x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05 - x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065 - Call trace: - static_key_enable_cpuslocked+0xb0/0xb8 - static_key_enable+0x2c/0x40 - crng_set_ready+0x24/0x30 - execute_in_process_context+0x80/0x90 - _credit_init_bits+0x100/0x154 - add_bootloader_randomness+0x64/0x78 - early_init_dt_scan_chosen+0x140/0x184 - early_init_dt_scan_nodes+0x28/0x4c - early_init_dt_scan+0x40/0x44 - setup_machine_fdt+0x7c/0x120 - setup_arch+0x74/0x1d8 - start_kernel+0x84/0x44c - __primary_switched+0xc0/0xc8 - ---[ end trace 0000000000000000 ]--- - random: crng init done - Machine model: Google Lazor (rev1 - 2) with LTE - -Cc: Hsin-Yi Wang -Cc: Douglas Anderson -Cc: Ard Biesheuvel -Cc: Steven Rostedt -Cc: Jason A. Donenfeld -Cc: Dominik Brodowski -Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") -Signed-off-by: Stephen Boyd -Reviewed-by: Jason A. Donenfeld -Link: https://lore.kernel.org/r/20220602022109.780348-1-swboyd@chromium.org -Signed-off-by: Catalin Marinas -Signed-off-by: Sasha Levin ---- - arch/arm64/kernel/setup.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index eb4b24652c10..2360ff765979 100644 ---- a/arch/arm64/kernel/setup.c -+++ b/arch/arm64/kernel/setup.c -@@ -300,13 +300,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) - early_fixmap_init(); - early_ioremap_init(); - -- setup_machine_fdt(__fdt_pointer); -- - /* - * Initialise the static keys early as they may be enabled by the -- * cpufeature code and early parameters. -+ * cpufeature code, early parameters, and DT setup. - */ - jump_label_init(); -+ -+ setup_machine_fdt(__fdt_pointer); -+ - parse_early_param(); - - /* --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index cc822c519cc..51e6c2ec048 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -71,6 +71,5 @@ gpio-pca953x-use-the-correct-register-address-to-do-.patch afs-fix-infinite-loop-found-by-xfstest-generic-676.patch scsi-sd-fix-potential-null-pointer-dereference.patch tipc-check-attribute-length-for-bearer-name.patch -arm64-initialize-jump-labels-before-setup_machine_fd.patch driver-core-fix-wait_for_device_probe-deferred_probe.patch perf-c2c-fix-sorting-in-percent_rmt_hitm_cmp.patch diff --git a/queue-5.15/arm64-initialize-jump-labels-before-setup_machine_fd.patch b/queue-5.15/arm64-initialize-jump-labels-before-setup_machine_fd.patch deleted file mode 100644 index 76c0ce6741a..00000000000 --- a/queue-5.15/arm64-initialize-jump-labels-before-setup_machine_fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 801341d73c47ad13e2b091d2befc813efd2f4e15 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 1 Jun 2022 19:21:09 -0700 -Subject: arm64: Initialize jump labels before setup_machine_fdt() - -From: Stephen Boyd - -[ Upstream commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae ] - -A static key warning splat appears during early boot on arm64 systems -that credit randomness from devicetrees that contain an "rng-seed" -property. This is because setup_machine_fdt() is called before -jump_label_init() during setup_arch(). Let's swap the order of these two -calls so that jump labels are initialized before the devicetree is -unflattened and the rng seed is credited. - - static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init() - WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8 - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff - pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) - pc : static_key_enable_cpuslocked+0xb0/0xb8 - lr : static_key_enable_cpuslocked+0xb0/0xb8 - sp : ffffffe51c393cf0 - x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10 - x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000 - x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000 - x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020 - x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708 - x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000 - x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 - x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027 - x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05 - x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065 - Call trace: - static_key_enable_cpuslocked+0xb0/0xb8 - static_key_enable+0x2c/0x40 - crng_set_ready+0x24/0x30 - execute_in_process_context+0x80/0x90 - _credit_init_bits+0x100/0x154 - add_bootloader_randomness+0x64/0x78 - early_init_dt_scan_chosen+0x140/0x184 - early_init_dt_scan_nodes+0x28/0x4c - early_init_dt_scan+0x40/0x44 - setup_machine_fdt+0x7c/0x120 - setup_arch+0x74/0x1d8 - start_kernel+0x84/0x44c - __primary_switched+0xc0/0xc8 - ---[ end trace 0000000000000000 ]--- - random: crng init done - Machine model: Google Lazor (rev1 - 2) with LTE - -Cc: Hsin-Yi Wang -Cc: Douglas Anderson -Cc: Ard Biesheuvel -Cc: Steven Rostedt -Cc: Jason A. Donenfeld -Cc: Dominik Brodowski -Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") -Signed-off-by: Stephen Boyd -Reviewed-by: Jason A. Donenfeld -Link: https://lore.kernel.org/r/20220602022109.780348-1-swboyd@chromium.org -Signed-off-by: Catalin Marinas -Signed-off-by: Sasha Levin ---- - arch/arm64/kernel/setup.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index be5f85b0a24d..644b7cd38e3e 100644 ---- a/arch/arm64/kernel/setup.c -+++ b/arch/arm64/kernel/setup.c -@@ -307,13 +307,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) - early_fixmap_init(); - early_ioremap_init(); - -- setup_machine_fdt(__fdt_pointer); -- - /* - * Initialise the static keys early as they may be enabled by the -- * cpufeature code and early parameters. -+ * cpufeature code, early parameters, and DT setup. - */ - jump_label_init(); -+ -+ setup_machine_fdt(__fdt_pointer); -+ - parse_early_param(); - - /* --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 3b3bd601eb4..f8308c301b1 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -107,6 +107,5 @@ gpio-pca953x-use-the-correct-register-address-to-do-.patch afs-fix-infinite-loop-found-by-xfstest-generic-676.patch scsi-sd-fix-potential-null-pointer-dereference.patch tipc-check-attribute-length-for-bearer-name.patch -arm64-initialize-jump-labels-before-setup_machine_fd.patch driver-core-fix-wait_for_device_probe-deferred_probe.patch perf-c2c-fix-sorting-in-percent_rmt_hitm_cmp.patch diff --git a/queue-5.17/arm64-initialize-jump-labels-before-setup_machine_fd.patch b/queue-5.17/arm64-initialize-jump-labels-before-setup_machine_fd.patch deleted file mode 100644 index be5cec495e1..00000000000 --- a/queue-5.17/arm64-initialize-jump-labels-before-setup_machine_fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 89c40524967b133c987a12594bc623b1c4af8479 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 1 Jun 2022 19:21:09 -0700 -Subject: arm64: Initialize jump labels before setup_machine_fdt() - -From: Stephen Boyd - -[ Upstream commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae ] - -A static key warning splat appears during early boot on arm64 systems -that credit randomness from devicetrees that contain an "rng-seed" -property. This is because setup_machine_fdt() is called before -jump_label_init() during setup_arch(). Let's swap the order of these two -calls so that jump labels are initialized before the devicetree is -unflattened and the rng seed is credited. - - static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init() - WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8 - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff - pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) - pc : static_key_enable_cpuslocked+0xb0/0xb8 - lr : static_key_enable_cpuslocked+0xb0/0xb8 - sp : ffffffe51c393cf0 - x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10 - x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000 - x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000 - x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020 - x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708 - x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000 - x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 - x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027 - x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05 - x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065 - Call trace: - static_key_enable_cpuslocked+0xb0/0xb8 - static_key_enable+0x2c/0x40 - crng_set_ready+0x24/0x30 - execute_in_process_context+0x80/0x90 - _credit_init_bits+0x100/0x154 - add_bootloader_randomness+0x64/0x78 - early_init_dt_scan_chosen+0x140/0x184 - early_init_dt_scan_nodes+0x28/0x4c - early_init_dt_scan+0x40/0x44 - setup_machine_fdt+0x7c/0x120 - setup_arch+0x74/0x1d8 - start_kernel+0x84/0x44c - __primary_switched+0xc0/0xc8 - ---[ end trace 0000000000000000 ]--- - random: crng init done - Machine model: Google Lazor (rev1 - 2) with LTE - -Cc: Hsin-Yi Wang -Cc: Douglas Anderson -Cc: Ard Biesheuvel -Cc: Steven Rostedt -Cc: Jason A. Donenfeld -Cc: Dominik Brodowski -Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") -Signed-off-by: Stephen Boyd -Reviewed-by: Jason A. Donenfeld -Link: https://lore.kernel.org/r/20220602022109.780348-1-swboyd@chromium.org -Signed-off-by: Catalin Marinas -Signed-off-by: Sasha Levin ---- - arch/arm64/kernel/setup.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index f70573928f1b..505617bb6761 100644 ---- a/arch/arm64/kernel/setup.c -+++ b/arch/arm64/kernel/setup.c -@@ -314,13 +314,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) - early_fixmap_init(); - early_ioremap_init(); - -- setup_machine_fdt(__fdt_pointer); -- - /* - * Initialise the static keys early as they may be enabled by the -- * cpufeature code and early parameters. -+ * cpufeature code, early parameters, and DT setup. - */ - jump_label_init(); -+ -+ setup_machine_fdt(__fdt_pointer); -+ - parse_early_param(); - - /* --- -2.35.1 - diff --git a/queue-5.17/series b/queue-5.17/series index 5cc61dc9b00..e398f7d6691 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -126,7 +126,6 @@ drm-msm-dp-always-clear-mask-bits-to-disable-interru.patch scsi-sd-fix-potential-null-pointer-dereference.patch ax25-fix-ax25-session-cleanup-problems.patch tipc-check-attribute-length-for-bearer-name.patch -arm64-initialize-jump-labels-before-setup_machine_fd.patch driver-core-fix-wait_for_device_probe-deferred_probe.patch perf-evsel-fixes-topdown-events-in-a-weak-group-for-.patch perf-parse-events-move-slots-event-for-the-hybrid-pl.patch diff --git a/queue-5.18/arm64-initialize-jump-labels-before-setup_machine_fd.patch b/queue-5.18/arm64-initialize-jump-labels-before-setup_machine_fd.patch deleted file mode 100644 index 5b4c068a338..00000000000 --- a/queue-5.18/arm64-initialize-jump-labels-before-setup_machine_fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d0902fd8a406d64b1b287cfa8a397f1606884486 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 1 Jun 2022 19:21:09 -0700 -Subject: arm64: Initialize jump labels before setup_machine_fdt() - -From: Stephen Boyd - -[ Upstream commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae ] - -A static key warning splat appears during early boot on arm64 systems -that credit randomness from devicetrees that contain an "rng-seed" -property. This is because setup_machine_fdt() is called before -jump_label_init() during setup_arch(). Let's swap the order of these two -calls so that jump labels are initialized before the devicetree is -unflattened and the rng seed is credited. - - static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init() - WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8 - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff - pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) - pc : static_key_enable_cpuslocked+0xb0/0xb8 - lr : static_key_enable_cpuslocked+0xb0/0xb8 - sp : ffffffe51c393cf0 - x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10 - x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000 - x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000 - x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020 - x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708 - x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000 - x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 - x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027 - x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05 - x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065 - Call trace: - static_key_enable_cpuslocked+0xb0/0xb8 - static_key_enable+0x2c/0x40 - crng_set_ready+0x24/0x30 - execute_in_process_context+0x80/0x90 - _credit_init_bits+0x100/0x154 - add_bootloader_randomness+0x64/0x78 - early_init_dt_scan_chosen+0x140/0x184 - early_init_dt_scan_nodes+0x28/0x4c - early_init_dt_scan+0x40/0x44 - setup_machine_fdt+0x7c/0x120 - setup_arch+0x74/0x1d8 - start_kernel+0x84/0x44c - __primary_switched+0xc0/0xc8 - ---[ end trace 0000000000000000 ]--- - random: crng init done - Machine model: Google Lazor (rev1 - 2) with LTE - -Cc: Hsin-Yi Wang -Cc: Douglas Anderson -Cc: Ard Biesheuvel -Cc: Steven Rostedt -Cc: Jason A. Donenfeld -Cc: Dominik Brodowski -Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") -Signed-off-by: Stephen Boyd -Reviewed-by: Jason A. Donenfeld -Link: https://lore.kernel.org/r/20220602022109.780348-1-swboyd@chromium.org -Signed-off-by: Catalin Marinas -Signed-off-by: Sasha Levin ---- - arch/arm64/kernel/setup.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index 3505789cf4bd..2ba07248bad2 100644 ---- a/arch/arm64/kernel/setup.c -+++ b/arch/arm64/kernel/setup.c -@@ -314,13 +314,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) - early_fixmap_init(); - early_ioremap_init(); - -- setup_machine_fdt(__fdt_pointer); -- - /* - * Initialise the static keys early as they may be enabled by the -- * cpufeature code and early parameters. -+ * cpufeature code, early parameters, and DT setup. - */ - jump_label_init(); -+ -+ setup_machine_fdt(__fdt_pointer); -+ - parse_early_param(); - - /* --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 363f1ca22a5..042c52e02fb 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -145,7 +145,6 @@ scsi-sd-fix-potential-null-pointer-dereference.patch ax25-fix-ax25-session-cleanup-problems.patch nfp-remove-padding-in-nfp_nfdk_tx_desc.patch tipc-check-attribute-length-for-bearer-name.patch -arm64-initialize-jump-labels-before-setup_machine_fd.patch driver-core-fix-wait_for_device_probe-deferred_probe.patch perf-evsel-fixes-topdown-events-in-a-weak-group-for-.patch perf-parse-events-move-slots-event-for-the-hybrid-pl.patch -- 2.47.3