| Message ID | 20230222033021.983168-1-guoren@kernel.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | riscv: Add GENERIC_ENTRY support | expand |
On Tue, 21 Feb 2023 22:30:14 -0500, guoren@kernel.org wrote: > From: Guo Ren <guoren@linux.alibaba.com> > > The patches convert riscv to use the generic entry infrastructure from > kernel/entry/*. Some optimization for entry.S with new .macro and merge > ret_from_kernel_thread into ret_from_fork. > > The 1,2 are the preparation of generic entry. 3~7 are the main part > of generic entry. > > [...] Applied, thanks! [2/7] riscv: ptrace: Remove duplicate operation https://git.kernel.org/palmer/c/8574bf8d0ddd [3/7] riscv: entry: Add noinstr to prevent instrumentation inserted https://git.kernel.org/palmer/c/d0db02c62879 [4/7] riscv: entry: Convert to generic entry https://git.kernel.org/palmer/c/f0bddf50586d [5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} https://git.kernel.org/palmer/c/0bf298ad2b61 [6/7] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork https://git.kernel.org/palmer/c/ab9164dae273 [7/7] riscv: entry: Consolidate general regs saving/restoring https://git.kernel.org/palmer/c/45b32b946a97 Best regards,
Hello: This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Tue, 21 Feb 2023 22:30:14 -0500 you wrote: > From: Guo Ren <guoren@linux.alibaba.com> > > The patches convert riscv to use the generic entry infrastructure from > kernel/entry/*. Some optimization for entry.S with new .macro and merge > ret_from_kernel_thread into ret_from_fork. > > The 1,2 are the preparation of generic entry. 3~7 are the main part > of generic entry. > > [...] Here is the summary with links: - [-next,V17,1/7] compiler_types.h: Add __noinstr_section() for noinstr (no matching commit) - [-next,V17,2/7] riscv: ptrace: Remove duplicate operation https://git.kernel.org/riscv/c/8574bf8d0ddd - [-next,V17,3/7] riscv: entry: Add noinstr to prevent instrumentation inserted https://git.kernel.org/riscv/c/d0db02c62879 - [-next,V17,4/7] riscv: entry: Convert to generic entry https://git.kernel.org/riscv/c/f0bddf50586d - [-next,V17,5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} https://git.kernel.org/riscv/c/0bf298ad2b61 - [-next,V17,6/7] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork https://git.kernel.org/riscv/c/ab9164dae273 - [-next,V17,7/7] riscv: entry: Consolidate general regs saving/restoring https://git.kernel.org/riscv/c/45b32b946a97 You are awesome, thank you!
On Tue, 21 Feb 2023 19:30:14 PST (-0800), guoren@kernel.org wrote: > From: Guo Ren <guoren@linux.alibaba.com> > > The patches convert riscv to use the generic entry infrastructure from > kernel/entry/*. Some optimization for entry.S with new .macro and merge > ret_from_kernel_thread into ret_from_fork. > > The 1,2 are the preparation of generic entry. 3~7 are the main part > of generic entry. > > All tested with rv64, rv32, rv64 + 32rootfs, all are passed. > > You can directly try it with: > [1] https://github.com/guoren83/linux/tree/generic_entry_v17 > > Any reviews and tests are helpful. > > v17: > - Rebase on newest palmer/for-next 20230222 > - Modify save_from_x6_to_x31/restore_from_x6_to_x31 to fit > ftrace size reduce patch in for-next. > > v16: > https://lore.kernel.org/linux-riscv/20230204070213.753369-1-guoren@kernel.org/ > - Re-order commit tags for "compiler_types.h: Add __noinstr_section() > for noinstr" (Thx Miguel) > > v15: > https://lore.kernel.org/linux-riscv/20230126172516.1580058-1-guoren@kernel.org/ > - Fixup compile error for !MMU (Thx Conor) > - Rebase on riscv for-next (20230127) > > v14: > https://lore.kernel.org/linux-riscv/20230112095848.1464404-1-guoren@kernel.org/ > - Fixup W=1 warning reported by kernel test robot <lkp@intel.com> > > v13: > https://lore.kernel.org/linux-riscv/20230107113838.3969149-1-guoren@kernel.org/ > - Remove noinstr for original do_page_fault > - Centralize all the necesarily-noinstr bits in > arch/riscv/kernel/traps.c > > v12: > https://lore.kernel.org/linux-riscv/20230103033531.2011112-1-guoren@kernel.org/ > - Rebase on newest for-next-20230103 (Linux 6.2-rc1) > - Add Reviewed-by: Björn Töpel > > v11: > https://lore.kernel.org/linux-riscv/20221210171141.1120123-1-guoren@kernel.org/ > - Rebase on newest for-next-20221211 > - Remove stack optimization patch series > - Optimize comments > - Replace ENTRY with SYM_CODE/FUNC_START in entry.S > > v10: > https://lore.kernel.org/linux-riscv/20221208025816.138712-1-guoren@kernel.org/ > - Rebase on palmer/for-next branch (20221208) > - Remove unrelated patches from the series (Suggested-by: Bjorn) > - Fixup Typos. > > v9: > https://lore.kernel.org/linux-riscv/20221130034059.826599-1-guoren@kernel.org/ > - Fixup NR_syscalls check (by Ben Hutchings) > - Add Tested-by: Jisheng Zhang > > v8: > https://lore.kernel.org/linux-riscv/20221103075047.1634923-1-guoren@kernel.org/ > - Rebase on palmer/for-next branch (20221102) > - Add save/restore_from_x5_to_x31 .macro (JishengZhang) > - Consolidate ret_from_kernel_thread into ret_from_fork (JishengZhang) > - Optimize __noinstr_section comment (JiangshanLai) > > v7: > https://lore.kernel.org/linux-riscv/20221015114702.3489989-1-guoren@kernel.org/ > - Fixup regs_irqs_disabled with SR_PIE > - Optimize stackleak_erase -> stackleak_erase_on_task_stack (Thx Mark > Rutland) > - Add BUG_ON(!irqs_disabled()) in trap handlers > - Using regs_irqs_disabled in __do_page_fault > - Remove unnecessary irq disable in ret_from_exception and add comment > > v6: > https://lore.kernel.org/linux-riscv/20221002012451.2351127-1-guoren@kernel.org/ > - Use THEAD_SIZE_ORDER for thread size adjustment in kconfig (Thx Arnd) > - Move call_on_stack to inline style (Thx Peter Zijlstra) > - Fixup fp chain broken (Thx Chen Zhongjin) > - Remove common entry modification, and fixup page_fault entry (Thx > Peter Zijlstra) > - Treat some traps as nmi entry (Thx Peter Zijlstra) > > v5: > https://lore.kernel.org/linux-riscv/20220918155246.1203293-1-guoren@kernel.org/ > - Add riscv own stackleak patch instead of generic entry modification > (by Mark Rutland) > - Add EXPERT dependency for THREAD_SIZE (by Arnd) > - Add EXPERT dependency for IRQ_STACK (by Sebastian, David Laight) > - Corrected __trap_section (by Peter Zijlstra) > - Add Tested-by (Yipeng Zou) > - Use CONFIG_SOFTIRQ_ON_OWN_STACK replace "#ifndef CONFIG_PREEMPT_RT" > - Fixup systrace_enter compile error > - Fixup exit_to_user_mode_prepare preempt_disable warning > > V4: > https://lore.kernel.org/linux-riscv/20220908022506.1275799-1-guoren@kernel.org/ > - Fixup entry.S with "la" bug (by Conor.Dooley) > - Fixup missing noinstr bug (by Peter Zijlstra) > > V3: > https://lore.kernel.org/linux-riscv/20220906035423.634617-1-guoren@kernel.org/ > - Fixup CONFIG_COMPAT=n compile error > - Add THREAD_SIZE_ORDER config > - Optimize elf_kexec.c warning fixup > - Add static to irq_stack_ptr definition > > V2: > https://lore.kernel.org/linux-riscv/20220904072637.8619-1-guoren@kernel.org/ > - Fixup compile error by include "riscv: ptrace: Remove duplicate > operation" > - Fixup compile warning > Reported-by: kernel test robot <lkp@intel.com> > - Add test repo link in cover letter > > V1: > https://lore.kernel.org/linux-riscv/20220903163808.1954131-1-guoren@kernel.org/ > > Guo Ren (3): > riscv: ptrace: Remove duplicate operation > riscv: entry: Add noinstr to prevent instrumentation inserted > riscv: entry: Convert to generic entry > > Jisheng Zhang (3): > riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} > riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork > riscv: entry: Consolidate general regs saving/restoring > > Lai Jiangshan (1): > compiler_types.h: Add __noinstr_section() for noinstr > > arch/riscv/Kconfig | 1 + > arch/riscv/include/asm/asm-prototypes.h | 2 + > arch/riscv/include/asm/asm.h | 61 +++++ > arch/riscv/include/asm/csr.h | 1 - > arch/riscv/include/asm/entry-common.h | 11 + > arch/riscv/include/asm/ptrace.h | 10 +- > arch/riscv/include/asm/stacktrace.h | 5 + > arch/riscv/include/asm/syscall.h | 21 ++ > arch/riscv/include/asm/thread_info.h | 13 +- > arch/riscv/kernel/Makefile | 2 - > arch/riscv/kernel/entry.S | 321 +++--------------------- > arch/riscv/kernel/head.h | 1 - > arch/riscv/kernel/mcount-dyn.S | 57 +---- > arch/riscv/kernel/process.c | 5 +- > arch/riscv/kernel/ptrace.c | 44 ---- > arch/riscv/kernel/signal.c | 29 +-- > arch/riscv/kernel/trace_irq.c | 27 -- > arch/riscv/kernel/trace_irq.h | 11 - > arch/riscv/kernel/traps.c | 144 +++++++++-- > arch/riscv/mm/fault.c | 6 +- > include/linux/compiler_types.h | 15 +- > 21 files changed, 289 insertions(+), 498 deletions(-) > create mode 100644 arch/riscv/include/asm/entry-common.h > delete mode 100644 arch/riscv/kernel/trace_irq.c > delete mode 100644 arch/riscv/kernel/trace_irq.h Thanks, this is on for-next.
From: Guo Ren <guoren@linux.alibaba.com> The patches convert riscv to use the generic entry infrastructure from kernel/entry/*. Some optimization for entry.S with new .macro and merge ret_from_kernel_thread into ret_from_fork. The 1,2 are the preparation of generic entry. 3~7 are the main part of generic entry. All tested with rv64, rv32, rv64 + 32rootfs, all are passed. You can directly try it with: [1] https://github.com/guoren83/linux/tree/generic_entry_v17 Any reviews and tests are helpful. v17: - Rebase on newest palmer/for-next 20230222 - Modify save_from_x6_to_x31/restore_from_x6_to_x31 to fit ftrace size reduce patch in for-next. v16: https://lore.kernel.org/linux-riscv/20230204070213.753369-1-guoren@kernel.org/ - Re-order commit tags for "compiler_types.h: Add __noinstr_section() for noinstr" (Thx Miguel) v15: https://lore.kernel.org/linux-riscv/20230126172516.1580058-1-guoren@kernel.org/ - Fixup compile error for !MMU (Thx Conor) - Rebase on riscv for-next (20230127) v14: https://lore.kernel.org/linux-riscv/20230112095848.1464404-1-guoren@kernel.org/ - Fixup W=1 warning reported by kernel test robot <lkp@intel.com> v13: https://lore.kernel.org/linux-riscv/20230107113838.3969149-1-guoren@kernel.org/ - Remove noinstr for original do_page_fault - Centralize all the necesarily-noinstr bits in arch/riscv/kernel/traps.c v12: https://lore.kernel.org/linux-riscv/20230103033531.2011112-1-guoren@kernel.org/ - Rebase on newest for-next-20230103 (Linux 6.2-rc1) - Add Reviewed-by: Björn Töpel v11: https://lore.kernel.org/linux-riscv/20221210171141.1120123-1-guoren@kernel.org/ - Rebase on newest for-next-20221211 - Remove stack optimization patch series - Optimize comments - Replace ENTRY with SYM_CODE/FUNC_START in entry.S v10: https://lore.kernel.org/linux-riscv/20221208025816.138712-1-guoren@kernel.org/ - Rebase on palmer/for-next branch (20221208) - Remove unrelated patches from the series (Suggested-by: Bjorn) - Fixup Typos. v9: https://lore.kernel.org/linux-riscv/20221130034059.826599-1-guoren@kernel.org/ - Fixup NR_syscalls check (by Ben Hutchings) - Add Tested-by: Jisheng Zhang v8: https://lore.kernel.org/linux-riscv/20221103075047.1634923-1-guoren@kernel.org/ - Rebase on palmer/for-next branch (20221102) - Add save/restore_from_x5_to_x31 .macro (JishengZhang) - Consolidate ret_from_kernel_thread into ret_from_fork (JishengZhang) - Optimize __noinstr_section comment (JiangshanLai) v7: https://lore.kernel.org/linux-riscv/20221015114702.3489989-1-guoren@kernel.org/ - Fixup regs_irqs_disabled with SR_PIE - Optimize stackleak_erase -> stackleak_erase_on_task_stack (Thx Mark Rutland) - Add BUG_ON(!irqs_disabled()) in trap handlers - Using regs_irqs_disabled in __do_page_fault - Remove unnecessary irq disable in ret_from_exception and add comment v6: https://lore.kernel.org/linux-riscv/20221002012451.2351127-1-guoren@kernel.org/ - Use THEAD_SIZE_ORDER for thread size adjustment in kconfig (Thx Arnd) - Move call_on_stack to inline style (Thx Peter Zijlstra) - Fixup fp chain broken (Thx Chen Zhongjin) - Remove common entry modification, and fixup page_fault entry (Thx Peter Zijlstra) - Treat some traps as nmi entry (Thx Peter Zijlstra) v5: https://lore.kernel.org/linux-riscv/20220918155246.1203293-1-guoren@kernel.org/ - Add riscv own stackleak patch instead of generic entry modification (by Mark Rutland) - Add EXPERT dependency for THREAD_SIZE (by Arnd) - Add EXPERT dependency for IRQ_STACK (by Sebastian, David Laight) - Corrected __trap_section (by Peter Zijlstra) - Add Tested-by (Yipeng Zou) - Use CONFIG_SOFTIRQ_ON_OWN_STACK replace "#ifndef CONFIG_PREEMPT_RT" - Fixup systrace_enter compile error - Fixup exit_to_user_mode_prepare preempt_disable warning V4: https://lore.kernel.org/linux-riscv/20220908022506.1275799-1-guoren@kernel.org/ - Fixup entry.S with "la" bug (by Conor.Dooley) - Fixup missing noinstr bug (by Peter Zijlstra) V3: https://lore.kernel.org/linux-riscv/20220906035423.634617-1-guoren@kernel.org/ - Fixup CONFIG_COMPAT=n compile error - Add THREAD_SIZE_ORDER config - Optimize elf_kexec.c warning fixup - Add static to irq_stack_ptr definition V2: https://lore.kernel.org/linux-riscv/20220904072637.8619-1-guoren@kernel.org/ - Fixup compile error by include "riscv: ptrace: Remove duplicate operation" - Fixup compile warning Reported-by: kernel test robot <lkp@intel.com> - Add test repo link in cover letter V1: https://lore.kernel.org/linux-riscv/20220903163808.1954131-1-guoren@kernel.org/ Guo Ren (3): riscv: ptrace: Remove duplicate operation riscv: entry: Add noinstr to prevent instrumentation inserted riscv: entry: Convert to generic entry Jisheng Zhang (3): riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork riscv: entry: Consolidate general regs saving/restoring Lai Jiangshan (1): compiler_types.h: Add __noinstr_section() for noinstr arch/riscv/Kconfig | 1 + arch/riscv/include/asm/asm-prototypes.h | 2 + arch/riscv/include/asm/asm.h | 61 +++++ arch/riscv/include/asm/csr.h | 1 - arch/riscv/include/asm/entry-common.h | 11 + arch/riscv/include/asm/ptrace.h | 10 +- arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/syscall.h | 21 ++ arch/riscv/include/asm/thread_info.h | 13 +- arch/riscv/kernel/Makefile | 2 - arch/riscv/kernel/entry.S | 321 +++--------------------- arch/riscv/kernel/head.h | 1 - arch/riscv/kernel/mcount-dyn.S | 57 +---- arch/riscv/kernel/process.c | 5 +- arch/riscv/kernel/ptrace.c | 44 ---- arch/riscv/kernel/signal.c | 29 +-- arch/riscv/kernel/trace_irq.c | 27 -- arch/riscv/kernel/trace_irq.h | 11 - arch/riscv/kernel/traps.c | 144 +++++++++-- arch/riscv/mm/fault.c | 6 +- include/linux/compiler_types.h | 15 +- 21 files changed, 289 insertions(+), 498 deletions(-) create mode 100644 arch/riscv/include/asm/entry-common.h delete mode 100644 arch/riscv/kernel/trace_irq.c delete mode 100644 arch/riscv/kernel/trace_irq.h