From patchwork Thu Dec 8 02:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 13067839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1F455C63703 for ; Thu, 8 Dec 2022 02:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=E6vRfIE5VAcQSn36pS3TR09S+dVdUigO7ZoavsRBCgc=; b=2rJHywXUnZEvaZ O2nqFqHThLXAxFl5jN/s1Lpp30uP+0UkDsH55O7z4K7DRXNaFOnZsGPCx+rO35eha10QRANYBeZTB GW37Dc4FFgW4QQJdrPbFWizivjkvGZfUXYByavI6+IJ/EQPiwKHVyjO3JVilgQa3VbKF4ZWuqotYG KJrRhwn2dQgTy3/6ASBkdVnTGtkgmvcxOGuvrd5rf53XHezaug8GbuUFaUz6ukSDA8NjMJq3ujE6I qOxn6aBB5GsAAuTzaLdQzcIybGcDCRYCTTMlLygeiQFn8THzVUSeOUAoPFeL5XuRHIuInF3YLSC3Y Zrs+MCHv94lQBkwM42Fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p377M-000c0I-67; Thu, 08 Dec 2022 02:58:36 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p377J-000byB-4k for linux-riscv@lists.infradead.org; Thu, 08 Dec 2022 02:58:34 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2978761D42; Thu, 8 Dec 2022 02:58:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 932DCC433D6; Thu, 8 Dec 2022 02:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670468311; bh=JYI9Hp7dZ1odjyTYgEDjXz5LxZRLSGS8C11zX3fnTbw=; h=From:To:Cc:Subject:Date:From; b=H4dCayKJk4UGlnA9I92kWW6FoA4xDJOH3BLcuTFJQBMA3f9SV/D2aA07vhab609Po QW5IGcpFYMSnvH8i8BAZuxkf7sHbPca7qyZ61Hwu9RWFD9XU6t2pwliNA8Jr23S2EO eFVOqlQFcyAgc3Eb23L621zHnqCA6fF5ViGZTyvqN72Y5MS5d4tv1RC0fwH2BpPKxW oKbz8kbd7rFbc5urzbfU2juS5FjDYEIuIj8oiv50XcpsmmX7kTHMtQ0a55kimNxOdS dAAfKzoEXeX7lkMj//bYiAGzTARVJfG5QV/XrzkP0YCJx9Ks5rx+BlDRYQ9EknaHu3 PT2skIDj/uv5g== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, palmer@dabbelt.com, paul.walmsley@sifive.com, mark.rutland@arm.com, zouyipeng@huawei.com, bigeasy@linutronix.de, David.Laight@aculab.com, chenzhongjin@huawei.com, greentime.hu@sifive.com, andy.chiu@sifive.com, ben@decadent.org.uk, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH -next V10 00/10] riscv: Add GENERIC_ENTRY support and related features Date: Wed, 7 Dec 2022 21:58:06 -0500 Message-Id: <20221208025816.138712-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221207_185833_305908_20D1894F X-CRM114-Status: GOOD ( 14.98 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Guo Ren The patches convert riscv to use the generic entry infrastructure from kernel/entry/*. Additionally, add independent irq stacks (IRQ_STACKS) for percpu to prevent kernel stack overflows. Add generic_entry based STACKLEAK support. 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. 8~10 are separate-irq-stack optimizations based on 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_v10 Any reviews and tests are helpful. v10: - 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 - Add test repo link in cover letter V1: https://lore.kernel.org/linux-riscv/20220903163808.1954131-1-guoren@kernel.org/ Guo Ren (6): riscv: ptrace: Remove duplicate operation riscv: entry: Add noinstr to prevent instrumentation inserted riscv: entry: Convert to generic entry riscv: stack: Support HAVE_IRQ_EXIT_ON_IRQ_STACK riscv: stack: Support HAVE_SOFTIRQ_ON_OWN_STACK riscv: stack: Add config of thread stack size 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 | 20 ++ arch/riscv/include/asm/asm.h | 63 +++++ arch/riscv/include/asm/csr.h | 1 - arch/riscv/include/asm/entry-common.h | 8 + arch/riscv/include/asm/ptrace.h | 10 +- arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/syscall.h | 6 + arch/riscv/include/asm/thread_info.h | 27 +-- arch/riscv/include/asm/vmap_stack.h | 28 +++ arch/riscv/kernel/Makefile | 2 - arch/riscv/kernel/entry.S | 325 +++----------------------- arch/riscv/kernel/irq.c | 110 +++++++++ arch/riscv/kernel/mcount-dyn.S | 56 +---- arch/riscv/kernel/process.c | 5 +- arch/riscv/kernel/ptrace.c | 44 ---- arch/riscv/kernel/signal.c | 21 +- arch/riscv/kernel/sys_riscv.c | 29 +++ arch/riscv/kernel/trace_irq.c | 27 --- arch/riscv/kernel/trace_irq.h | 11 - arch/riscv/kernel/traps.c | 74 ++++-- arch/riscv/mm/fault.c | 16 +- include/linux/compiler_types.h | 15 +- 22 files changed, 402 insertions(+), 501 deletions(-) create mode 100644 arch/riscv/include/asm/entry-common.h create mode 100644 arch/riscv/include/asm/vmap_stack.h delete mode 100644 arch/riscv/kernel/trace_irq.c delete mode 100644 arch/riscv/kernel/trace_irq.h