lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] RISC-V Patches for the 5.14 Merge Window, Part 1
Hi Palmer,

On Fri, Jul 9, 2021 at 10:54 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> The following changes since commit 8a4102a0cf07cc76a18f373f6b49485258cc6af4:
>
> riscv: mm: Fix W+X mappings at boot (2021-06-01 21:15:09 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-5.14-mw0
>
> for you to fetch changes up to 1958e5aef5098e28b7d6e6a2972649901ebecace:
>
> riscv: xip: Fix duplicate included asm/pgtable.h (2021-07-06 16:17:40 -0700)
>
> ----------------------------------------------------------------
> RISC-V Patches for the 5.14 Merge Window, Part 1
>
> In addition to We have a handful of new features for 5.14:
>
> * Support for transparent huge pages.
> * Support for generic PCI resources mapping.
> * Support for the mem= kernel parameter.
> * Support for KFENCE.
> * A handful of fixes to avoid W+X mappings in the kernel.
> * Support for VMAP_STACK based overflow detection.
> * An optimized copy_{to,from}_user.
> ----------------------------------------------------------------
> There are some Kconfig merge conflicts. They should be pretty
> straight-forward, but we do have a symbol out of order -- I thought I had a
> script to check for that, but I guess it doesn't work. I just sent out a patch
> to fix it up.
>
> diff --cc arch/riscv/Kconfig
> index 3590eb76000e,469a70bd8da6..d36f3c5029fd
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@@ -60,12 -61,11 +61,12 @@@ config RISC
> select GENERIC_TIME_VSYSCALL if MMU && 64BIT
> select HANDLE_DOMAIN_IRQ
> select HAVE_ARCH_AUDITSYSCALL
> - select HAVE_ARCH_JUMP_LABEL
> - select HAVE_ARCH_JUMP_LABEL_RELATIVE
> + select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
> + select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
> select HAVE_ARCH_KASAN if MMU && 64BIT
> select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
> + select HAVE_ARCH_KFENCE if MMU && 64BIT
> - select HAVE_ARCH_KGDB
> + select HAVE_ARCH_KGDB if !XIP_KERNEL
> select HAVE_ARCH_KGDB_QXFER_PKT
> select HAVE_ARCH_MMAP_RND_BITS if MMU
> select HAVE_ARCH_SECCOMP_FILTER
> @@@ -81,11 -80,9 +82,14 @@@
> select HAVE_GCC_PLUGINS
> select HAVE_GENERIC_VDSO if MMU && 64BIT
> select HAVE_IRQ_TIME_ACCOUNTING
> + select HAVE_KPROBES
> + select HAVE_KPROBES_ON_FTRACE
> + select HAVE_KRETPROBES
> + select HAVE_KPROBES if !XIP_KERNEL
> + select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
> + select HAVE_KRETPROBES if !XIP_KERNEL
> + select HAVE_MOVE_PMD
> + select HAVE_MOVE_PUD
> select HAVE_PCI
> select HAVE_PERF_EVENTS
> select HAVE_PERF_REGS
> @@@ -108,7 -104,7 +112,8 @@@
> select SYSCTL_EXCEPTION_TRACE
> select THREAD_INFO_IN_TASK
> select UACCESS_MEMCPY if !MMU
> + select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
> + select ZONE_DMA32 if 64BIT
>
> config ARCH_MMAP_RND_BITS_MIN
> default 18 if 64BIT
> ----------------------------------------------------------------
> Akira Tsukamoto (1):
> riscv: __asm_copy_to-from_user: Optimize unaligned memory access and pipeline stall
>
> Alexandre Ghiti (6):
> riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED
> riscv: Simplify xip and !xip kernel address conversion macros
> riscv: Introduce set_kernel_memory helper
> riscv: Map the kernel with correct permissions the first time
> riscv: Introduce structure that group all variables regarding kernel mapping
> riscv: Fix PTDUMP output now BPF region moved back to module region
>
> Bixuan Cui (1):
> riscv: fix build error when CONFIG_SMP is disabled
>
> Christoph Hellwig (1):
> riscv: pass the mm_struct to __sbi_tlb_flush_range
>
> Guo Ren (3):
> riscv: Use global mappings for kernel pages
> riscv: Cleanup unused functions
> riscv: add ASID-based tlbflushing methods
>
> Jeff Xie (1):
> riscv: ptrace: add argn syntax
>
> Jiapeng Chong (1):
> riscv: xip: Fix duplicate included asm/pgtable.h
>
> Jisheng Zhang (7):
> riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD
> riscv: mm: Remove setup_zero_page()
> riscv: Optimize switch_mm by passing "cpu" to flush_icache_deferred()
> riscv: Turn has_fpu into a static key if FPU=y
> riscv: kprobes: Remove redundant kprobe_step_ctx
> riscv: Add __init section marker to some functions again
> riscv: mm: init: Consolidate vars, functions
>
> Kefeng Wang (5):
> riscv: Move setup_bootmem into paging_init
> riscv: mm: Drop redundant _sdata and _edata declaration
> riscv: mm: Use better bitmap_zalloc()
> riscv: Only initialize swiotlb when necessary
> riscv: Add mem kernel parameter support

This patch should not be merged as it mixed two things into one patch,
as discussed here:
http://lists.infradead.org/pipermail/linux-riscv/2021-July/007486.html

You remained silent on my "ping", sigh ...

>
> Liu Shixin (1):
> riscv: Enable KFENCE for riscv64
>
> Nanyong Sun (5):
> riscv: mm: add _PAGE_LEAF macro
> riscv: mm: make pmd_bad() check leaf condition
> riscv: mm: add param stride for __sbi_tlb_flush_range
> riscv: mm: add THP support on 64-bit
> riscv: mm: fix build errors caused by mk_pmd()
>
> Palmer Dabbelt (2):
> RISC-V: Use asm-generic for {in,out}{bwlq}
> Merge branch 'riscv-wx-mappings' into for-next
>
> Randy Dunlap (1):
> riscv: TRANSPARENT_HUGEPAGE: depends on MMU
>
> Stanislaw Kardach (1):
> riscv: enable generic PCI resource mapping
>
> Tong Tiangen (1):
> riscv: add VMAP_STACK overflow detection
>
> Vitaly Wool (1):
> riscv: fix typo in init.c

Regards,
Bin

\
 
 \ /
  Last update: 2021-07-16 04:24    [W:0.094 / U:0.400 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site