Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp4534214rwb; Sat, 10 Dec 2022 10:00:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5tjOOrm7IFxqxgkbLV6bMU4QJM+3hyY1B52V/FBBZSfRSwWyCAG9KGOd04TWaTP6CweX3Y X-Received: by 2002:a17:90a:7383:b0:20d:bd60:a0ed with SMTP id j3-20020a17090a738300b0020dbd60a0edmr10061436pjg.30.1670695233909; Sat, 10 Dec 2022 10:00:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670695233; cv=none; d=google.com; s=arc-20160816; b=vyRvvnODTEQ0SwzALDJE9Gjus9Kt0AlRGnL6R7zxhasqpmLTePnYJGgaAwFZHXljaF OPjR30NHTDtqUDHW3jBnP64Kpd+9FV+u13AO4B+qFmw4B424Wr76Ls5HTWEz76ZTR+ku JJx/AI/WZm2rAoz99gy/pdb33pbXwynrUVVYJRiaeaoH8kt0q0r6rrFOfrHsEjx2gPqE 7J5gLorQGLuXwCrWYpRmRc0yE1jsLJPPLLY2bizdN6lAAIsLXXM4se25G9RFUOPXffTc dALH95/wGz4k+98Sq9AfQXWo/wAidXK0Fmm5vXJ7SuyNNG1GLj6icfaJXWtAz3k7fTaj cTqg== 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=z+ACKykUBFZ41b5+l+wvwN4UAtxDC3Ma2q6BlYateFI=; b=WUJ3tIyjE16WtVkl4OwvmK/OdVUkbESSQ37WPhHJet5uPYRZedqjTugeMyQ4JkxBYo FjsCj4Bfai1IJfB0QHP10fHg3qt4HO+dk4PffiGxhKa3X+izYM9ipptgnPBTak0rhYrT Ni3CdS2/FKKEsC29byAZAQB7c/qR4UWlIh0NJ7jcI0Jw/cmqXkAhnOAFGp5iyo204eyc pefNKeCKWpng9aq1x1Ax3kwbVfuBp+6eiHYhnr8sK1M3IMCtzNzEx1jrLKK+RzCEhvCB KpkRkMQUYCA3a0qzEe9DPhfIMIk2+sCpj+fPO1V/ckspJ/ud0a2TvSHMaNqfNxjLn+ao ydRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YPsbUiWI; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp8-20020a17090b4a8800b002135e1f5a7bsi6086030pjb.155.2022.12.10.10.00.24; Sat, 10 Dec 2022 10:00:33 -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=YPsbUiWI; 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 S229769AbiLJRM0 (ORCPT + 74 others); Sat, 10 Dec 2022 12:12:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbiLJRMY (ORCPT ); Sat, 10 Dec 2022 12:12:24 -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 60572BC9A; Sat, 10 Dec 2022 09:12:23 -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 9FCE7B8069D; Sat, 10 Dec 2022 17:12:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D2B3C433EF; Sat, 10 Dec 2022 17:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670692340; bh=JkuMnpyvpDgmLbRKf6NYs0jOELdsWfwSNqEpAY5kch0=; h=From:To:Cc:Subject:Date:From; b=YPsbUiWIBRJHsyrXewa5Tggk2EBv8iohwX9IizvP7bD5R5sSQrTk5dKxEhAEjXLBV OiGjUfPPTKvqDjpBnCu6ou8lD83Z9s7QWT+5QO+NA2LHr4Vbc2z0xT/51wo6fivPHK cwI+V16jYTZd8+9wq+C8cwBQ7PeaMbp7GgSYvDeISp7vQnHv3hKTk7d9YslCKbCE5W t8VoW2biDIAzK/QZBSf7UcPa4M4SkCHKJFL9vqu+lwwrg3jilg5qmANjstiJLmF7ZQ FJxrqjByWh1znSM38j9YRtyC9G5J1ReFn1WpkQnss69uSjdUktiEiqdY6h/5ns3tvf EvQ1qfKKBR5TQ== 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, paul.walmsley@sifive.com, mark.rutland@arm.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 V11 0/7] riscv: Add GENERIC_ENTRY support Date: Sat, 10 Dec 2022 12:11:34 -0500 Message-Id: <20221210171141.1120123-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 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_v11 Any reviews and tests are helpful. v11: - 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.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 | 13 +- arch/riscv/kernel/Makefile | 2 - arch/riscv/kernel/entry.S | 334 +++----------------------- arch/riscv/kernel/irq.c | 15 ++ arch/riscv/kernel/mcount-dyn.S | 56 +---- arch/riscv/kernel/process.c | 5 +- arch/riscv/kernel/ptrace.c | 44 ---- arch/riscv/kernel/signal.c | 29 +-- arch/riscv/kernel/sys_riscv.c | 31 +++ arch/riscv/kernel/trace_irq.c | 27 --- arch/riscv/kernel/trace_irq.h | 11 - arch/riscv/kernel/traps.c | 86 +++++-- arch/riscv/mm/fault.c | 16 +- include/linux/compiler_types.h | 15 +- 21 files changed, 279 insertions(+), 499 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 -- 2.36.1