[GIT,PULL] RISC-V Patches for the 6.6 Merge Window, Part 1

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw1

Message

Palmer Dabbelt Sept. 1, 2023, 2:41 p.m. UTC

The following changes since commit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5:

  Linux 6.5-rc1 (2023-07-09 13:53:13 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw1

for you to fetch changes up to 89775a27ff6d0396b44de0d6f44dcbc25221fdda:

  lib/Kconfig.debug: Restrict DEBUG_INFO_SPLIT for RISC-V (2023-08-31 00:18:37 -0700)

----------------------------------------------------------------
RISC-V Patches for the 6.6 Merge Window, Part 1

* Support for the new "riscv,isa-extensions" and "riscv,isa-base" device
  tree interfaces for probing extensions.
* Support for userspace access to the performance counters.
* Support for more instructions in kprobes.
* Crash kernels can be allocated above 4GiB.
* Support for KCFI.
* Support for ELFs in !MMU configurations.
* ARCH_KMALLOC_MINALIGN has been reduced to 8.
* mmap() defaults to sv48-sized addresses, with longer addresses hidden
  behind a hint (similar to Arm and Intel).
* Also various fixes and cleanups.

----------------------------------------------------------------
I'll all but certainly have a second pull request, there's already some stuff
stacking up on for-next and there's a few stragglers on the lists -- mostly
stuff with dependencies on other trees, but this cycle has been a bit clunkier
than usual on my end so there's a little more floating around that usual.

I had to fix up two merge conflicts manually, only one managed to show up in
git.  There's some more --cc diff in cpufeature.c, I remember having fixed that
all up on the merge side but apologies if something ended up in rerere and I
forgot about it.

Here's the one that showed up in git:

diff --cc arch/riscv/mm/init.cindex c07ff3e2c90a,156e09a1ceee..8f47a6ee353e---
a/arch/riscv/mm/init.c+++ b/arch/riscv/mm/init.c@@@ -1347,12 -1393,37 +1395,38
@@@ static void __init reserve_crashkernel(         * swiotlb can work on the
crash kernel.         */        crash_base =
memblock_phys_alloc_range(crash_size, PMD_SIZE, -                             
               search_start, search_end); +                                   
         search_start, +                                            
min(search_end, (unsigned long)(SZ_4G - 1)));

for the other the result I ended up with was

extern pgd_t early_pg_dir[PTRS_PER_PGD];
static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;

though that's not showing up in the git diff, so I may have something odd going
on here.

----------------------------------------------------------------
Alexandre Ghiti (12):
      perf: Fix wrong comment about default event_idx
      include: riscv: Fix wrong include guard in riscv_pmu.h
      riscv: Make legacy counter enum match the HW numbering
      drivers: perf: Rename riscv pmu sbi driver
      riscv: Prepare for user-space perf event mmap support
      drivers: perf: Implement perf event mmap support in the legacy backend
      drivers: perf: Implement perf event mmap support in the SBI backend
      Documentation: admin-guide: Add riscv sysctl_perf_user_access
      tools: lib: perf: Implement riscv mmap support
      perf: tests: Adapt mmap-basic.c for riscv
      riscv: Mark KASAN tmp* page tables variables as static
      riscv: Move create_tmp_mapping() to init sections

Björn Töpel (1):
      riscv: Require FRAME_POINTER for some configurations

Charlie Jenkins (4):
      RISC-V: mm: Restrict address space for sv39,sv48,sv57
      RISC-V: mm: Add tests for RISC-V mm
      RISC-V: mm: Update pgtable comment documentation
      RISC-V: mm: Document mmap changes

Chen Jiahao (2):
      riscv: kdump: Implement crashkernel=X,[high,low]
      docs: kdump: Update the crashkernel description for riscv

Conor Dooley (9):
      RISC-V: drop a needless check in print_isa_ext()
      RISC-V: shunt isa_ext_arr to cpufeature.c
      RISC-V: repurpose riscv_isa_ext array in riscv_fill_hwcap()
      RISC-V: add missing single letter extension definitions
      RISC-V: add single letter extensions to riscv_isa_ext
      RISC-V: split riscv_fill_hwcap() in 3
      RISC-V: enable extension detection from dedicated properties
      RISC-V: try new extension properties in of_early_processor_hartid()
      RISC-V: provide Kconfig & commandline options to control parsing "riscv,isa"

Greg Ungerer (2):
      binfmt_elf_fdpic: support 64-bit systems
      riscv: support the elf-fdpic binfmt loader

Guo Ren (1):
      riscv: sigcontext: Correct the comment of sigreturn

Heiko Stuebner (1):
      RISC-V: don't parse dt/acpi isa string to get rv32/rv64

Jisheng Zhang (4):
      riscv: allow kmalloc() caches aligned to the smallest value
      riscv: enable DMA_BOUNCE_UNALIGNED_KMALLOC for !dma_coherent
      riscv: enable DEBUG_FORCE_FUNCTION_ALIGN_64B
      riscv: support PREEMPT_DYNAMIC with static keys

Justin Stitt (1):
      RISC-V: cpu: refactor deprecated strncpy

Nam Cao (4):
      riscv: kprobes: simulate c.j instruction
      riscv: kprobes: simulate c.jr and c.jalr instructions
      riscv: kprobes: simulate c.beqz and c.bnez
      riscv: remove redundant mv instructions

Nathan Chancellor (1):
      lib/Kconfig.debug: Restrict DEBUG_INFO_SPLIT for RISC-V

Palmer Dabbelt (9):
      RISC-V: Provide a more helpful error message on invalid ISA strings
      Merge patch series "RISC-V: Probe DT extension support using riscv,isa-extensions & riscv,isa-base"
      Merge patch series "riscv: Allow userspace to directly access perf counters"
      Merge patch series "riscv: kprobes: simulate some instructions"
      Merge patch series "support allocating crashkernel above 4G explicitly on riscv"
      Merge patch series "riscv: KCFI support"
      Merge patch series "riscv: support ELF format binaries in nommu mode"
      Merge patch series "riscv: Reduce ARCH_KMALLOC_MINALIGN to 8"
      Merge patch series "RISC-V: mm: Make SV48 the default address space"

Sami Tolvanen (6):
      riscv: Implement syscall wrappers
      riscv: Add types to indirectly called assembly functions
      riscv: Add ftrace_stub_graph
      riscv: Add CFI error handling
      riscv/purgatory: Disable CFI
      riscv: Allow CONFIG_CFI_CLANG to be selected

Ye Xingchen (1):
      riscv: mm: use bitmap_zero() API

Yuan Tan (1):
      riscv: alternatives: fix a typo in comment

 Documentation/admin-guide/kernel-parameters.txt    |  22 +-
 Documentation/admin-guide/sysctl/kernel.rst        |  27 +-
 Documentation/riscv/vm-layout.rst                  |  22 +
 arch/riscv/Kconfig                                 |  24 +
 arch/riscv/Makefile                                |   3 -
 arch/riscv/include/asm/alternative-macros.h        |   2 +-
 arch/riscv/include/asm/cache.h                     |  14 +
 arch/riscv/include/asm/cacheflush.h                |   2 +
 arch/riscv/include/asm/cfi.h                       |  22 +
 arch/riscv/include/asm/elf.h                       |  13 +-
 arch/riscv/include/asm/hwcap.h                     |  17 +-
 arch/riscv/include/asm/insn.h                      |  10 +
 arch/riscv/include/asm/mmu.h                       |   4 +
 arch/riscv/include/asm/pgtable.h                   |  33 +-
 arch/riscv/include/asm/processor.h                 |  52 +-
 arch/riscv/include/asm/syscall.h                   |   5 +-
 arch/riscv/include/asm/syscall_wrapper.h           |  87 ++++
 arch/riscv/include/uapi/asm/ptrace.h               |   5 +
 arch/riscv/include/uapi/asm/sigcontext.h           |   2 +-
 arch/riscv/kernel/Makefile                         |   2 +
 arch/riscv/kernel/cfi.c                            |  77 +++
 arch/riscv/kernel/compat_syscall_table.c           |   8 +-
 arch/riscv/kernel/cpu.c                            | 181 +++----
 arch/riscv/kernel/cpufeature.c                     | 521 ++++++++++++++-------
 arch/riscv/kernel/head.S                           |   6 +-
 arch/riscv/kernel/mcount.S                         |   9 +-
 arch/riscv/kernel/probes/decode-insn.c             |  11 +-
 arch/riscv/kernel/probes/simulate-insn.c           | 105 +++++
 arch/riscv/kernel/probes/simulate-insn.h           |   5 +
 arch/riscv/kernel/setup.c                          |   6 +
 arch/riscv/kernel/suspend_entry.S                  |   5 +-
 arch/riscv/kernel/sys_riscv.c                      |   6 +
 arch/riscv/kernel/syscall_table.c                  |   8 +-
 arch/riscv/kernel/traps.c                          |   4 +-
 arch/riscv/mm/context.c                            |   2 +-
 arch/riscv/mm/dma-noncoherent.c                    |   8 +
 arch/riscv/mm/init.c                               |  93 +++-
 arch/riscv/mm/kasan_init.c                         |   8 +-
 arch/riscv/purgatory/Makefile                      |   4 +
 drivers/perf/riscv_pmu.c                           | 113 +++++
 drivers/perf/riscv_pmu_legacy.c                    |  28 +-
 drivers/perf/riscv_pmu_sbi.c                       | 196 +++++++-
 fs/Kconfig.binfmt                                  |   2 +-
 fs/binfmt_elf_fdpic.c                              |  38 +-
 include/asm-generic/preempt.h                      |  14 +-
 include/linux/elf-fdpic.h                          |  14 +-
 include/linux/perf/riscv_pmu.h                     |  12 +-
 include/linux/perf_event.h                         |   3 +-
 include/uapi/linux/elf-fdpic.h                     |  15 +
 lib/Kconfig.debug                                  |   7 +-
 tools/lib/perf/mmap.c                              |  66 +++
 tools/perf/tests/mmap-basic.c                      |   6 +-
 tools/testing/selftests/riscv/Makefile             |   2 +-
 tools/testing/selftests/riscv/mm/.gitignore        |   2 +
 tools/testing/selftests/riscv/mm/Makefile          |  15 +
 .../selftests/riscv/mm/testcases/mmap_bottomup.c   |  35 ++
 .../selftests/riscv/mm/testcases/mmap_default.c    |  35 ++
 .../selftests/riscv/mm/testcases/mmap_test.h       |  64 +++
 .../selftests/riscv/mm/testcases/run_mmap.sh       |  12 +
 59 files changed, 1707 insertions(+), 407 deletions(-)
 create mode 100644 arch/riscv/include/asm/cfi.h
 create mode 100644 arch/riscv/include/asm/syscall_wrapper.h
 create mode 100644 arch/riscv/kernel/cfi.c
 create mode 100644 tools/testing/selftests/riscv/mm/.gitignore
 create mode 100644 tools/testing/selftests/riscv/mm/Makefile
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h
 create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh

Comments

Linus Torvalds Sept. 1, 2023, 3:21 p.m. UTC | #1

On Fri, 1 Sept 2023 at 07:41, Palmer Dabbelt <[e-mail]> wrote:
>
> for the other the result I ended up with was
>
> extern pgd_t early_pg_dir[PTRS_PER_PGD];
> static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
> static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
> static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;

That's wrong, you should have removed the 'early_pg_dir' declaration
that is now in <asm/pgtable.h>, as done by commit d2402048bc8a
("riscv: mm: fix 2 instances of -Wmissing-variable-declarations").

> though that's not showing up in the git diff, so I may have something odd going
> on here.

So what's going on is that you resolved the merge conflict by taking
everything from one side (not correct, as above), and then git no
longer considers it a conflict after-the-fact.

Side n ote in case you care about the actual git logic:

The git rules for merge conflicts are different when doing the merge
and when showing the result after doing a merge.

When doing the merge, git will do the expensive history calculations
to figure out the merge base and do a 3-way merge of the base and the
two sides.

So at merge time, git looks back in the history from the two merge
heads, and does the three-way diff based on the history leading up to
the two points.

But after the merge, "git show" will basically do the reverse: it
won't look back in the history, but look at the *result* of the merge.
You are, after all, asking it to show the merge itself.

So then it will again do a three-way diff, but not of the merge base,
but of the merge _result_ and the two sides.

And if the merge result is the same as one of the sides, there's no
conflict remaining, and so no three-way diff.

So that's how conflicts sometimes "disappear" after the merge.

                       Linus

[e-mail] Sept. 1, 2023, 3:23 p.m. UTC | #2

The pull request you sent on Fri, 01 Sep 2023 07:41:21 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9

Thank you!

Palmer Dabbelt Sept. 1, 2023, 3:52 p.m. UTC | #3

On Fri, 01 Sep 2023 08:21:35 PDT (-0700), Linus Torvalds wrote:
> On Fri, 1 Sept 2023 at 07:41, Palmer Dabbelt <[e-mail]> wrote:
>>
>> for the other the result I ended up with was
>>
>> extern pgd_t early_pg_dir[PTRS_PER_PGD];
>> static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
>> static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
>> static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
>
> That's wrong, you should have removed the 'early_pg_dir' declaration
> that is now in <asm/pgtable.h>, as done by commit d2402048bc8a
> ("riscv: mm: fix 2 instances of -Wmissing-variable-declarations").

Thanks, Nick had pointed that out too but looks like I missed it.

>> though that's not showing up in the git diff, so I may have something odd going
>> on here.
>
> So what's going on is that you resolved the merge conflict by taking
> everything from one side (not correct, as above), and then git no
> longer considers it a conflict after-the-fact.
>
> Side n ote in case you care about the actual git logic:

Ya, I'm always interested to hear -- as I'm sure you can tell it's still 
a bit of a mystery on my end, but I'd rather learn when I get lost than 
just keep being lost ;)

> The git rules for merge conflicts are different when doing the merge
> and when showing the result after doing a merge.
>
> When doing the merge, git will do the expensive history calculations
> to figure out the merge base and do a 3-way merge of the base and the
> two sides.
>
> So at merge time, git looks back in the history from the two merge
> heads, and does the three-way diff based on the history leading up to
> the two points.
>
> But after the merge, "git show" will basically do the reverse: it
> won't look back in the history, but look at the *result* of the merge.
> You are, after all, asking it to show the merge itself.
>
> So then it will again do a three-way diff, but not of the merge base,
> but of the merge _result_ and the two sides.
>
> And if the merge result is the same as one of the sides, there's no
> conflict remaining, and so no three-way diff.
>
> So that's how conflicts sometimes "disappear" after the merge.

OK, that explains why I get such different results between the pre and 
post merge output -- my workflow involves commiting a merge and then 
pushing it up to the test builders, so I guess I should just be 
double-checking the pre-merge rather than trying to figure things out 
after the fact from just looking at the merge.

>                        Linus

[e-mail] Sept. 1, 2023, 4:25 p.m. UTC | #4

Hello:

This pull request was applied to riscv/linux.git (fixes)
by Linus Torvalds <[e-mail]>:

On Fri, 01 Sep 2023 07:41:21 -0700 (PDT) you wrote:
> The following changes since commit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5:
> 
>   Linux 6.5-rc1 (2023-07-09 13:53:13 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw1
> 
> [...]

Here is the summary with links:
  - [GIT,PULL] RISC-V Patches for the 6.6 Merge Window, Part 1
    https://git.kernel.org/riscv/c/e0152e7481c6

You are awesome, thank you!