From patchwork Thu Nov 3 07:50:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 13029655 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 EE80DC4332F for ; Thu, 3 Nov 2022 07:51:50 +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=J3FwrSqIY/k8NVhLw66jrgmkP5KgnQSsezVSU5rdHTI=; b=ahtZMcmtGvbEOJ dBf+8PJ+ODP8KCdMwDE3STRMX7UYj14KpsNaATIHI5rgo5JGYQJylzuxokfET+48KzZTZ49HbgN8p qLf57w4s/GXdnE209kYYcWkUhJEbuEnPKWs3IJciaihFlootFVLhv3bcMB4WMctSFT73OedvYubWD E0d45TZJU/uCIeiQ2av0vqSjhxBShgdik16FfMOgfq0ypPTZURXiIEK5KR0cK/NTBaV4E2gL1FAJS dXCWom9TpWnbJD3+RtFZ/EaGnOIs0ZfCqTvxwmzCxXCGmbmj2Sj4N0+j6gthqTs+Xn5hm5gb0QqqO pGpYA/UWBIj7s0K6Ef7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqV0j-00GVf5-A4; Thu, 03 Nov 2022 07:51:37 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqV0f-00GVdx-8I for linux-riscv@lists.infradead.org; Thu, 03 Nov 2022 07:51:35 +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 sin.source.kernel.org (Postfix) with ESMTPS id 74DDFCE254A; Thu, 3 Nov 2022 07:51:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 565D6C433C1; Thu, 3 Nov 2022 07:51:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667461885; bh=tdZW+aaPVm0AB0zotKPFgvIWDIGs5UJnWygjbEAcTfg=; h=From:To:Cc:Subject:Date:From; b=tY2CRKa2az8VYk6gPFBtQaYFdo95ZYvWQ8tHAcjwcJ4h+GqL77DjhEt9YQg+AkVYr bwM1ret33PFfDNHf9jGhzGAH2+c+u4y4nLG44AbS0r8NZ8uixIYHglxMd8D/x7m7qL 29TJ4s5Rt8yaK3dwZ3wq2yzJqag/hjpB/vCS5mZ83sOAdXB6OMTuk1+O7TENGLC1yx kqZumJPMVOGzGMm+qcwXnehU2Tyfh25l/U7jJHT1n9O7LiPfC3riCf9SeDCUeGIKl7 mS7ovoF2+EpEjF68n7PxNaLDivoxQ7A+h5+BfEcpYehu5MH5qgBdZgiij+NVwnICuH S+ahn4kFQVkKw== 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 Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH -next V8 00/14] riscv: Add GENERIC_ENTRY support and related features Date: Thu, 3 Nov 2022 03:50:33 -0400 Message-Id: <20221103075047.1634923-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-20221103_005133_660394_5947178E X-CRM114-Status: GOOD ( 15.78 ) 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. We have tested it with rv64, rv32, rv64 + 32rootfs, all are passed. You can directly try it with: [1] https://github.com/guoren83/linux/tree/generic_entry_v8 Any reviews and tests are helpful. v8: - 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/ Dao Lu (1): riscv: Add support for STACKLEAK gcc plugin Guo Ren (9): riscv: elf_kexec: Fixup compile warning riscv: compat_syscall_table: Fixup compile warning riscv: ptrace: Remove duplicate operation riscv: traps: Add noinstr to prevent instrumentation inserted riscv: convert to generic entry riscv: Support HAVE_IRQ_EXIT_ON_IRQ_STACK riscv: Support HAVE_SOFTIRQ_ON_OWN_STACK riscv: Add config of thread stack size riscv: Typo fixup for addi -> andi in comment Jisheng Zhang (3): riscv: remove extra level wrappers of trace_hardirqs_{on,off} riscv: 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 | 21 ++ 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 | 3 +- arch/riscv/kernel/elf_kexec.c | 2 +- arch/riscv/kernel/entry.S | 327 +++----------------------- 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 | 27 +++ 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 +- drivers/firmware/efi/libstub/Makefile | 2 +- include/linux/compiler_types.h | 15 +- 24 files changed, 407 insertions(+), 502 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 Tested-by: Jisheng Zhang