Skip to contentSkip to conversation

RISC-V: fix sifive and thead section mismatches in errata

PATCH Applied Randy Dunlap 4 participants 10 messages Apr 29, 2023 – May 1, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 RISC-V: fix sifive and thead section mismatches in errata

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---
v2: use corrected Fixes: commit info (thanks Conor)

 arch/riscv/errata/sifive/errata.c |    8 +++-----
 arch/riscv/errata/thead/errata.c  |    6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)
arch/riscv/errata/sifive/errata.c +3 -5
diff -- a/arch/riscv/errata/sifive/errata.c b/arch/riscv/errata/sifive/errata.c
@@ -82,11 +82,9 @@ static void __init_or_module warn_miss_e
 	pr_warn("----------------------------------------------------------------\n");
 }
 
-void __init_or_module sifive_errata_patch_func(struct alt_entry *begin,
-					       struct alt_entry *end,
-					       unsigned long archid,
-					       unsigned long impid,
-					       unsigned int stage)
+void sifive_errata_patch_func(struct alt_entry *begin, struct alt_entry *end,
+			      unsigned long archid, unsigned long impid,
+			      unsigned int stage)
 {
 	struct alt_entry *alt;
 	u32 cpu_req_errata;
arch/riscv/errata/thead/errata.c +3 -3
diff -- a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c
@@ -83,9 +83,9 @@ static u32 thead_errata_probe(unsigned i
 	return cpu_req_errata;
 }
 
-void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alt_entry *end,
-					      unsigned long archid, unsigned long impid,
-					      unsigned int stage)
+void thead_errata_patch_func(struct alt_entry *begin, struct alt_entry *end,
+			     unsigned long archid, unsigned long impid,
+			     unsigned int stage)
 {
 	struct alt_entry *alt;
 	u32 cpu_req_errata = thead_errata_probe(stage, archid, impid);
Reviewed-by on v2 1/1
#1 lore raw
Quoted 17 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>
Quoted 1 line

---

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Reviewed-by
#2 lore raw
Quoted 20 lines · Evan Green
Quoted 17 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>
Quoted 1 line

---

Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

Thanks for changing the fixes tag Randy,

Thanks,
Conor.

#3 lore raw
Quoted 22 lines · Conor Dooley
Quoted 20 lines · Evan Green
Quoted 18 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 6 lines
Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

It was weird, my original "fix" (the one listed in this Fixes tag) was needed because while the hwprobe series was clean on Palmer's branch, it generated a "section mismatch" on linux-next. As noted here, it was only with !CONFIG_MODULES, so I explicitly remember generating that config and checking it on linux-next to generate this "fix", and it came out clean. It's like the robots are getting smarter. -Evan

#4 lore raw
Quoted 30 lines · Evan Green
Quoted 22 lines · Conor Dooley
Quoted 20 lines · Evan Green
Quoted 18 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 6 lines
Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

Quoted 7 lines

It was weird, my original "fix" (the one listed in this Fixes tag) was needed because while the hwprobe series was clean on Palmer's branch, it generated a "section mismatch" on linux-next. As noted here, it was only with !CONFIG_MODULES, so I explicitly remember generating that config and checking it on linux-next to generate this "fix", and it came out clean. It's like the robots are getting smarter. -Evan

I observed the problem in 8 out of 20 randconfig builds, using linux-next 20230427.

Signature · 6 lines
~Randy

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#5 lore raw
Quoted 42 lines · Randy Dunlap
Quoted 30 lines · Evan Green
Quoted 22 lines · Conor Dooley
Quoted 20 lines · Evan Green
Quoted 18 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 6 lines
Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

Quoted 7 lines

It was weird, my original "fix" (the one listed in this Fixes tag) was needed because while the hwprobe series was clean on Palmer's branch, it generated a "section mismatch" on linux-next. As noted here, it was only with !CONFIG_MODULES, so I explicitly remember generating that config and checking it on linux-next to generate this "fix", and it came out clean. It's like the robots are getting smarter. -Evan

Quoted 2 lines

I observed the problem in 8 out of 20 randconfig builds, using linux-next 20230427.

Oh interesting, so not the stock k210_nommu defconfig. That makes me feel a little better at least.
-Evan

#6 lore raw
Quoted 43 lines · Evan Green
Quoted 42 lines · Randy Dunlap
Quoted 37 lines · Evan Green
Quoted 22 lines · Conor Dooley
Quoted 20 lines · Evan Green
Quoted 18 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 6 lines
Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

It was weird, my original "fix" (the one listed in this Fixes tag) was needed because while the hwprobe series was clean on Palmer's branch, it generated a "section mismatch" on linux-next. As noted here, it was only with !CONFIG_MODULES, so I explicitly remember generating that config and checking it on linux-next to generate this "fix", and it came out clean. It's like the robots are getting smarter. -Evan

Quoted 5 lines
Quoted 2 lines

I observed the problem in 8 out of 20 randconfig builds, using linux-next 20230427.

Oh interesting, so not the stock k210_nommu defconfig. That makes me feel a little better at least.

Ohh man, that's a pretty bad config to try use (if that's your default) for build testing stuff. The k210_mmu defconfig doesn't enable anything other than SOC_CANAAN.
I could reproduce Randy's issue on defconfig w/ CONFIG_MODULES disabled.

#7 lore raw
Quoted 48 lines · Conor Dooley
Quoted 46 lines · Evan Green
Quoted 44 lines · Randy Dunlap
Quoted 30 lines · Evan Green
Quoted 22 lines · Conor Dooley
Quoted 20 lines · Evan Green
Quoted 18 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")
Cc Heiko Stuebner <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Conor Dooley <[email protected]>
Cc Evan Green <[email protected]>

---

Quoted 6 lines
Quoted 3 lines

Thanks, Randy. I'm confused at how I didn't see that when I made the original fix. I feel like repro of these section mismatch errors depend on some other factor I'm not understanding. In any case:

Perhaps you had a cut-down config that did not enable either of the relevant ARCH_ options to get those errata compiled?

Quoted 7 lines

It was weird, my original "fix" (the one listed in this Fixes tag) was needed because while the hwprobe series was clean on Palmer's branch, it generated a "section mismatch" on linux-next. As noted here, it was only with !CONFIG_MODULES, so I explicitly remember generating that config and checking it on linux-next to generate this "fix", and it came out clean. It's like the robots are getting smarter. -Evan

I observed the problem in 8 out of 20 randconfig builds, using linux-next 20230427.

Quoted 7 lines
Quoted 2 lines

Oh interesting, so not the stock k210_nommu defconfig. That makes me feel a little better at least.

Ohh man, that's a pretty bad config to try use (if that's your default) for build testing stuff. The k210_mmu defconfig doesn't enable anything other than SOC_CANAAN.
I could reproduce Randy's issue on defconfig w/ CONFIG_MODULES disabled.

That's the one that caught me before, so I remembered it as being "different". I'll try what you describe above next time I'm hunting for section mismatches.
-Evan

#8 lore raw
Quoted 10 lines · Evan Green
Quoted 4 lines · Conor Dooley

Ohh man, that's a pretty bad config to try use (if that's your default) for build testing stuff. The k210_mmu defconfig doesn't enable anything other than SOC_CANAAN.
I could reproduce Randy's issue on defconfig w/ CONFIG_MODULES disabled.

That's the one that caught me before, so I remembered it as being "different". I'll try what you describe above next time I'm hunting for section mismatches.

By nature of being nommu with lots of stuff disabled, it is a good niche config to test - the nommu stuff mostly gets forgotten about.. On the other hand, it does skip the errata handling stuff which is what caught us out here.

Cheers,
Conor.

#9 lore raw
In reply to Randy Dunlap
Quoted 8 lines · Randy Dunlap

When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:

WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)

[...]

Applied, thanks!

[1/1] RISC-V: fix sifive and thead section mismatches in errata

      https://git.kernel.org/palmer/c/a2a58b5ca124

Best regards,

Signature · 1 line
Palmer Dabbelt <[email protected]>