[PATCH v10 00/12] riscv: support for Svpbmt and D1 memory types

Fri May 13 14:41:09 PDT 2022

Am Freitag, 13. Mai 2022, 05:32:49 CEST schrieb Palmer Dabbelt:
> On Wed, 11 May 2022 12:29:09 PDT (-0700), heiko at sntech.de wrote:
> > Svpbmt is an extension defining "Supervisor-mode: page-based memory types"
> > for things like non-cacheable pages or I/O memory pages.
> >
> >
> > So this is my 2nd try at implementing Svpbmt (and the diverging D1 memory
> > types) using the alternatives framework.
> >
> > This includes a number of changes to the alternatives mechanism itself.
> > The biggest one being the move to a more central location, as I expect
> > in the future, nearly every chip needing some sort of patching, be it
> > either for erratas or for optional features (svpbmt or others).
> >
> > Detection of the svpbmt functionality is done via Atish's isa extension
> > handling series [0] and thus does not need any dt-parsing of its own
> > anymore.
> >
> > The series also introduces support for the memory types of the D1
> > which are implemented differently to svpbmt. But when patching anyway
> > it's pretty clean to add the D1 variant via ALTERNATIVE_2 to the same
> > location.
> >
> > The only slightly bigger difference is that the "normal" type is not 0
> > as with svpbmt, so kernel patches for this PMA type need to be applied
> > even before the MMU is brought up, so the series introduces a separate
> > stage for that.
> >
> >
> > In theory this series is 2 parts:
> > - alternatives improvements
> > - svpbmt+d1
> >
> > I picked the recipient list from the previous versions, hopefully
> > I didn't forget anybody.
> >
> > I tested the series on:
> > - qemu-rv32 + buildroot rootfs
> > - qemu-rv64 + debian roots
> > - Allwinner D1-Nezha
> > - BeagleV - it at least reached the same point as without the series
> 
> IMO that's fine, it's also broken due to issues around non-coherence but 
> it has an entirely different way of handling things than.
> 
> > I also ran Palmers CI environment on 5.18-rc6 + this series and
> > it passed with all testcases now.
> 
> Thanks, I know that's a bit of a mess.  If I ever get some time I'll try 
> and clean it up, but it keeps finding issues so I'm sort of stuck with 
> it for now.

No worries, once I got it to run, it was easy to use, though needs
quite a bit of time to build everything.

But now that I made it to run, I'll try to use in the future as well :-) .

> As expected it now passes locally, so I've put this on 
> for-next.  I hadn't noticed your testing was on rc6, I put this on top 
> of rc1 -- that's what I usually do for merge window stuff, but if 
> there's something specific between rc1 and rc6 this depends on then LMK 
> and I'll sort it out.

In the past I also had it run on -rc1 without any issues.
Just after refreshing with with your recent changes, it was back at
5.17-something and then I went to 5.18-rc6 as base.

So there wasn't any real reason for -rc6 except was the most current
release :-)

Heiko

> > changes in v10:
> > - add received review-tags
> > - put early patching behind a kconfig symbol
> > - adapt compiler flags of sources in use by early patching
> >   similar to other riscv arch-parts.
> >   This fixes the medlow cmodel issue on rv32 and also issues
> >   with Kasan.
> >
> > changes in v9:
> > - rebase onto 5.18-rc1
> > - drop the sbi null-ptr patch
> >   While I still think this to be non-ideal as is, it isn't really
> >   necessary for svpbmt support anymore
> > - merge cpufeature + svpbmt patch, as otherwise some empty shells
> >   cause build warnings when a bisection stops between these two
> >   patches
> > - address review comments from Christoph Hellwig:
> >   - keep alternatives optional, they now get selected by its
> >     users (erratas and also the newly introduced svpbmt kconfig)
> >   - wrap long lines and keep things below 80 characters
> >   - restyle svpbmt + thead errata assembly
> >   - introduce a helper for the repeated calls to
> >     (val & _PAGE_PFN_MASK) >> _PAGE_PFN_SHIFT
> >
> > changes in v8:
> > - rebase onto 5.17-final + isa extension series
> >   We're halfway through the merge-window, so this series
> >   should be merge after that
> > - adapt to fix limiting alternatives to non-xip-kernels
> > - add .norelax option for alternatives
> > - fix unused cpu_apply_errata in thead errata
> > - don't use static globals to store cpu-manufacturer data
> >   as it makes machines hang if done too early
> >
> > changes in v7:
> > - fix typo in patch1 (Atish)
> > - moved to Atish's isa-extension framework
> > - and therefore move regular boot-alternatives directly behind fill_hwcaps
> > - change T-Head errata Kconfig text (Atish)
> >
> > changes in v6:
> > - rebase onto 5.17-rc1
> > - handle sbi null-ptr differently
> > - improve commit messages
> > - use riscv,mmu as property name
> >
> > changes in v5:
> > - move to use alternatives for runtime-patching
> > - add D1 variant
> >
> >
> > [0] https://lore.kernel.org/r/20220222204811.2281949-2-atishp@rivosinc.com
> >
> > Heiko Stuebner (12):
> >   riscv: integrate alternatives better into the main architecture
> >   riscv: allow different stages with alternatives
> >   riscv: implement module alternatives
> >   riscv: implement ALTERNATIVE_2 macro
> >   riscv: extend concatenated alternatives-lines to the same length
> >   riscv: prevent compressed instructions in alternatives
> >   riscv: move boot alternatives to after fill_hwcap
> >   riscv: Fix accessing pfn bits in PTEs for non-32bit variants
> >   riscv: add RISC-V Svpbmt extension support
> >   riscv: remove FIXMAP_PAGE_IO and fall back to its default value
> >   riscv: don't use global static vars to store alternative data
> >   riscv: add memory-type errata for T-Head
> >
> >  arch/riscv/Kconfig                          |  28 +++++
> >  arch/riscv/Kconfig.erratas                  |  34 ++++--
> >  arch/riscv/Kconfig.socs                     |   1 -
> >  arch/riscv/Makefile                         |   2 +-
> >  arch/riscv/errata/Makefile                  |   2 +-
> >  arch/riscv/errata/alternative.c             |  75 ------------
> >  arch/riscv/errata/sifive/errata.c           |  20 ++-
> >  arch/riscv/errata/thead/Makefile            |  11 ++
> >  arch/riscv/errata/thead/errata.c            |  82 +++++++++++++
> >  arch/riscv/include/asm/alternative-macros.h | 129 +++++++++++++++-----
> >  arch/riscv/include/asm/alternative.h        |  25 +++-
> >  arch/riscv/include/asm/errata_list.h        |  59 +++++++++
> >  arch/riscv/include/asm/fixmap.h             |   2 -
> >  arch/riscv/include/asm/hwcap.h              |   1 +
> >  arch/riscv/include/asm/pgtable-32.h         |  17 +++
> >  arch/riscv/include/asm/pgtable-64.h         |  79 +++++++++++-
> >  arch/riscv/include/asm/pgtable-bits.h       |  10 --
> >  arch/riscv/include/asm/pgtable.h            |  55 +++++++--
> >  arch/riscv/include/asm/vendorid_list.h      |   1 +
> >  arch/riscv/kernel/Makefile                  |  15 +++
> >  arch/riscv/kernel/alternative.c             | 118 ++++++++++++++++++
> >  arch/riscv/kernel/cpu.c                     |   1 +
> >  arch/riscv/kernel/cpufeature.c              |  80 +++++++++++-
> >  arch/riscv/kernel/module.c                  |  29 +++++
> >  arch/riscv/kernel/setup.c                   |   2 +
> >  arch/riscv/kernel/smpboot.c                 |   4 -
> >  arch/riscv/kernel/traps.c                   |   2 +-
> >  arch/riscv/mm/init.c                        |   1 +
> >  28 files changed, 724 insertions(+), 161 deletions(-)
> >  delete mode 100644 arch/riscv/errata/alternative.c
> >  create mode 100644 arch/riscv/errata/thead/Makefile
> >  create mode 100644 arch/riscv/errata/thead/errata.c
> >  create mode 100644 arch/riscv/kernel/alternative.c
> 