Skip to content

riscv: improve boot time isa extensions handling

Jisheng Zhang kvm kvm-riscv linux-riscv lkml regressions 5 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest13 patches 14 repliesApplied 13/13
  2. v413 patches 9 repliesSuperseded 1 of 13 applied
  3. v313 patches 21 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v213 patches38 repliesSuperseded
v18 patches24 repliesSuperseded

Changes in v5 from the cover letter

- collect Reviewed-by and Acked-by tag
- rebase on the latest riscv for-next
- add Andrew's patch to add ADD16 and SUB16 rela types
- adopt Conor's nit comment to patch9

Patches in v5 All 13 applied

#Subject and filesSizeRepliesApplied
1/13riscv: move riscv_noncoherent_supported() out of ZICBOM probearch/riscv/kernel/cpufeature.c arch/riscv/kernel/setup.c+3 -10 repliesApplied
2/13riscv: cpufeature: detect RISCV_ALTERNATIVES_EARLY_BOOT earlierarch/riscv/kernel/cpufeature.c+3 -00 repliesApplied
3/13riscv: hwcap: make ISA extension ids can be used in asmarch/riscv/include/asm/hwcap.h+21 -240 repliesApplied
4/13riscv: cpufeature: extend riscv_cpufeature_patch_func to all ISA extensionsarch/riscv/include/asm/errata_list.h arch/riscv/kernel/cpufeature.c+11 -620 repliesApplied
5/13riscv: introduce riscv_has_extension_[un]likely()arch/riscv/include/asm/hwcap.h+37 -00 repliesApplied
6/13riscv: fpu: switch has_fpu() to riscv_has_extension_likely()arch/riscv/include/asm/switch_to.h+2 -111 repliesApplied
7/13riscv: module: move find_section to module.harch/riscv/include/asm/module.h arch/riscv/kernel/module.c+16 -150 repliesApplied
8/13riscv: module: Add ADD16 and SUB16 rela typesarch/riscv/kernel/module.c+16 -00 repliesApplied
9/13riscv: switch to relative alternative entriesarch/riscv/errata/sifive/errata.c arch/riscv/errata/thead/errata.c arch/riscv/include/asm/alternative-macros.h +2 more+36 -230 repliesApplied
10/13riscv: alternative: patch alternatives in the vDSOarch/riscv/include/asm/vdso.h arch/riscv/kernel/alternative.c arch/riscv/kernel/vdso.c +1 more+40 -50 repliesApplied
11/13riscv: cpu_relax: switch to riscv_has_extension_likely()arch/riscv/include/asm/vdso/processor.h+1 -10 repliesApplied
12/13riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely()arch/riscv/kvm/tlb.c+1 -20 repliesApplied
13/13riscv: remove riscv_isa_ext_keys[] array and related usagearch/riscv/include/asm/hwcap.h arch/riscv/kernel/cpufeature.c+0 -410 repliesApplied

Reviews trailers per patch

All 13 patches have a Reviewed-by or Acked-by.

PatchAndrew JonesConor DooleyHeiko StuebnerGuo RenAnup Patel
1/13R-b R-b
2/13R-b R-b R-b
3/13R-b R-b R-b
4/13R-b R-b
5/13R-b A-b
6/13R-b R-b R-b R-b R-b
7/13R-b R-b
8/13R-b
9/13R-b R-b
10/13R-b R-b
11/13R-b R-b R-b R-b
12/13R-b A-b
13/13R-b R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v5 thread

Cover letter [PATCH v5 00/13] riscv: improve boot time isa extensions handling

Generally, riscv ISA extensions are fixed for any specific hardware platform, so a hart's features won't change after booting, this chacteristic makes it straightforward to use a static branch to check a specific ISA extension is supported or not to optimize performance.

However, some ISA extensions such as SVPBMT and ZICBOM are handled via. the alternative sequences.

Basically, for ease of maintenance, we prefer to use static branches in C code, but recently, Samuel found that the static branch usage in cpu_relax() breaks building with CONFIG_CC_OPTIMIZE_FOR_SIZE[1]. As Samuel pointed out, "Having a static branch in cpu_relax() is problematic because that function is widely inlined, including in some quite complex functions like in the VDSO. A quick measurement shows this static branch is responsible by itself for around 40% of the jump table."

Samuel's findings pointed out one of a few downsides of static branches usage in C code to handle ISA extensions detected at boot time:
static branch's metadata in the __jump_table section, which is not discarded after ISA extensions are finalized, wastes some space.

I want to try to solve the issue for all possible dynamic handling of ISA extensions at boot time. Inspired by Mark[2], this patch introduces riscv_has_extension_*() helpers, which work like static branches but are patched using alternatives, thus the metadata can be freed after patching.

Since v4
- collect Reviewed-by and Acked-by tag
- rebase on the latest riscv for-next
- add Andrew's patch to add ADD16 and SUB16 rela types
- adopt Conor's nit comment to patch9

Since v3
- collect Reviewed-by tag and remove Heiko's reviewed-by from patch5
- address Conor and Andrew comments
- fix two building errors of !MMU and RV32

Since v2
- rebase on riscv-next
- collect Reviewed-by tag
- fix jal imm construction
- combine Heiko's code and my code for jal patching, thus add Co-developed-by tag
- address comments from Conor

Since v1
- rebase on v6.1-rc7 + Heiko's alternative improvements[3]
- collect Reviewed-by tag
- add one patch to update jal offsets in patched alternatives
- add one patch to switch to relative alternative entries
- add patches to patch vdso

[1]https://lore.kernel.org/linux-riscv/20220922060958.44203-1-samuel at sholland.org/ [2]https://lore.kernel.org/linux-arm-kernel/20220912162210.3626215-8-mark.rutland at arm.com/ [3]https://lore.kernel.org/linux-riscv/20221130225614.1594256-1-heiko at sntech.de/

Andrew Jones (2):
riscv: module: Add ADD16 and SUB16 rela types
riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely()

Jisheng Zhang (11):
riscv: move riscv_noncoherent_supported() out of ZICBOM probe
riscv: cpufeature: detect RISCV_ALTERNATIVES_EARLY_BOOT earlier
riscv: hwcap: make ISA extension ids can be used in asm
riscv: cpufeature: extend riscv_cpufeature_patch_func to all ISA
extensions
riscv: introduce riscv_has_extension_[un]likely()
riscv: fpu: switch has_fpu() to riscv_has_extension_likely()
riscv: module: move find_section to module.h
riscv: switch to relative alternative entries
riscv: alternative: patch alternatives in the vDSO
riscv: cpu_relax: switch to riscv_has_extension_likely()
riscv: remove riscv_isa_ext_keys[] array and related usage

 arch/riscv/errata/sifive/errata.c           |  3 +-
 arch/riscv/errata/thead/errata.c            | 11 ++-
 arch/riscv/include/asm/alternative-macros.h | 20 ++---
 arch/riscv/include/asm/alternative.h        | 17 ++--
 arch/riscv/include/asm/errata_list.h        |  9 +-
 arch/riscv/include/asm/hwcap.h              | 98 +++++++++++----------
 arch/riscv/include/asm/module.h             | 16 ++++
 arch/riscv/include/asm/switch_to.h          |  3 +-
 arch/riscv/include/asm/vdso.h               |  4 +
 arch/riscv/include/asm/vdso/processor.h     |  2 +-
 arch/riscv/kernel/alternative.c             | 29 ++++++
 arch/riscv/kernel/cpufeature.c              | 79 +++--------------
 arch/riscv/kernel/module.c                  | 31 +++----
 arch/riscv/kernel/setup.c                   |  3 +
 arch/riscv/kernel/vdso.c                    |  5 --
 arch/riscv/kernel/vdso/vdso.lds.S           |  7 ++
 arch/riscv/kvm/tlb.c                        |  3 +-
 17 files changed, 176 insertions(+), 164 deletions(-)
Signature · 1 line
2.38.1