From patchwork Wed Feb 22 03:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 5713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp363220wrd; Tue, 21 Feb 2023 19:37:08 -0800 (PST) X-Google-Smtp-Source: AK7set/Tibl2YNXsN9xBqBuEbpjenNzZrYivt0fQzPRz1l4RPWk1Hb+wcUq2SgCklI98t7vhPCR7 X-Received: by 2002:a17:903:22c8:b0:192:4f85:b91d with SMTP id y8-20020a17090322c800b001924f85b91dmr8096487plg.46.1677037028593; Tue, 21 Feb 2023 19:37:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677037028; cv=none; d=google.com; s=arc-20160816; b=Rf8cQyiiB5nNx/xpz5xB0KCpBYqFg0qty5yO0KmhXvaI4uoXYUh0HFT5MuTqdQZveF 2wvW2Y/Lr66JTBxGTnbuavUg2bkO4/Z15Ws99aCr0gZGQD4kuJD0z7tk20AHXzJB4eMr v4/rExikZM68Sc3GnjqT5SBjBsP9JaIALXg/SnVMVJil/oIRwd/azErJcRYYoY7I1n2U 0GLqyt9qeFgGixvooFd/xgtSKb1uMw3bDMVB9bToYMuELoHLHtRL1rSiNLtuUiheaZrC YsfeJ+JtcI/o9G8i1XEO91PwcIYgUIZBeIrk97R1eShA8rbCB7p5/eTSZD5KcWliE65p 0BGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZEyzAnIrob5FvWy02ibW7fDLStp8EiXoVV5hKzit3HI=; b=mZopixwKKsTWxXqYg/DR+TXzsKvuDYhZhsb7apge18yPsHH+EV1a4aY7oGYkV1jmiI AKLVoDwGhoxGHtNDVYbOTARPHvXKc+b1fByrnhWmzQxJurgcyHhX2Ir8w+mjBzfTRs+2 IvMmdi+xLEg+QjsY/hGAsQb/TAI6Gqg+G4tG11q0ErGZshrziBwOe/1j4Hm4vYbi8XH3 ErpX0EMq1tGp9aaszyotcova6XXANnefA4TIVbrf4sUwtlrhnaC41yxVA4bn6LaAfPIh HExtHqj6+9KISZr67Y4MFGOLwqMcb2miCuX/6hR+frgXx0yuvBugE/GDeULcEbLY6f+Q O8Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=O4YAHs4J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f14-20020a170902ce8e00b0019a86f57ef4si16412548plg.176.2023.02.21.19.36.55; Tue, 21 Feb 2023 19:37:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=O4YAHs4J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229721AbjBVDaz (ORCPT + 99 others); Tue, 21 Feb 2023 22:30:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjBVDax (ORCPT ); Tue, 21 Feb 2023 22:30:53 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86AAD305EF; Tue, 21 Feb 2023 19:30:52 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 2ECA5B811BC; Wed, 22 Feb 2023 03:30:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55779C433EF; Wed, 22 Feb 2023 03:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677036649; bh=3RUzfDsvVVgBgzcnx76rvAF0DUMcOO1ZHk+8sw6e02c=; h=From:To:Cc:Subject:Date:From; b=O4YAHs4JRkcloW/KwEmvv//Az+VViabsOdDI3LHGrW6llKg84Xi0gm3PVEFuRMIXp Eh9PZLhzfQLJZhLtZ7mEtw//4fq9K8HwrbNt2D4Fyo6wOW1OsbFCB1MajZaFJcr/OZ lFNgcZlw9VaHY+jsew5GHkt/1uk/4IkbkpP0NYcBL266xst+NC/kuEQdxHznu43of2 HD+fgMF2WyiXHh8AH3kHN2CzZ6xI1ZZl3VBvdCyT7YUBsP5WDTeVsYW/zUHgrpRhhx ppch+UbYdoJRycuyx+XaxDnhPA/es343ZzDDMhCF5veQuIvHGH/pS9pZysZvVncLCo UisV5AJ5w26mA== 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, mark.rutland@arm.com, ben@decadent.org.uk, bjorn@kernel.org, palmer@dabbelt.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH -next V17 0/7] riscv: Add GENERIC_ENTRY support Date: Tue, 21 Feb 2023 22:30:14 -0500 Message-Id: <20230222033021.983168-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758500779373778589?= X-GMAIL-MSGID: =?utf-8?q?1758500779373778589?= From: Guo Ren 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 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 - 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