From patchwork Sat Jan 7 11:38:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 3688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1260283wrt; Sat, 7 Jan 2023 03:39:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsUlqPOEHNG514oitZDuFHuRkMOJ4sD8tgjjDWzVa5YevezCgVRdoqyt3K10m6l5idUqsqL X-Received: by 2002:a17:90a:1345:b0:226:1495:3dca with SMTP id y5-20020a17090a134500b0022614953dcamr36041882pjf.45.1673091595474; Sat, 07 Jan 2023 03:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673091595; cv=none; d=google.com; s=arc-20160816; b=boRkZLTNlBQv5nmeZWwpCYuJ82Xtqs+ZBsBpMGhkUOTeaM/27zz52b/aD03yzq1gbT u/sCxwV6xTvmdcrLTNqqkmAbFLuv+TBavlANZBpiN/LyTWWp0cvLfYTkmuVx3Ax2zWHt gDCpM5HfI57LWnMNb9PqTpH51jO12nnFiztjAhRp1YwFpn7zuOjm4ZNX05PiuqG5jB97 m+kNllqjFK34N9zhWWUG/pLMrTfcGT6SgWx4edX+McpxAB4bXOyaf0nVAewQ/GC+eHXw 1iIUXhiZ0OY+Q5BrcXLXVX/XCtJxql2hDOk4WNS1UP18zPABRsdT+jmkPwpDwi1Gm7WM TitA== 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=fvpczWlK9Dc6qI1JuPcBFvozKnxAQusAsPWvB4m/RBU=; b=lGwg/b9tvMwdPFY//+roTn4mu2H10jS4cLBfntmY5vxq3bFDd8bc7Kz2AtsmiJjMQM 4yyrUQDsCSOZen1hVAc837lC6SUYEHxst35VyQXYxn5MyqAyB0cWc1qDwTG+WyzVnluh aobpX0uHolQwrN42inbkVzrv9k/FN2uFgEaSLAHJr3aLf+d4DPZGwUWAT4Ki9Z2SBD6e yDakBisRFObOEjXthtu77c7ske7h2Qga4Bl7G2P4nbQqRF0bpUHl+vm+0DOYJrDzwVZQ Yl3T4IDMsFbDOMyKaueGJeSXUL8fdanP/z4jRmhXbpZHWOC8hHJkmrxCf8/l9GvEKrAW n33Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M26xroeZ; 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 mq6-20020a17090b380600b00226ef87dce3si2699030pjb.98.2023.01.07.03.39.43; Sat, 07 Jan 2023 03:39:55 -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=M26xroeZ; 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 S231706AbjAGLi4 (ORCPT + 99 others); Sat, 7 Jan 2023 06:38:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231708AbjAGLiy (ORCPT ); Sat, 7 Jan 2023 06:38:54 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 719EB75D0D; Sat, 7 Jan 2023 03:38:53 -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 2A44CB81F87; Sat, 7 Jan 2023 11:38:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55EA0C433EF; Sat, 7 Jan 2023 11:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673091530; bh=GvhH9csgC/V0atgFlKQ0L7QRA/UMYOBTUf9EDlPChlY=; h=From:To:Cc:Subject:Date:From; b=M26xroeZumKQfiNn6qCYcO8J+F17cPKiER+8kWt93q8FGKmbEYpQfk0GfijqwxA1u pqJYskS3OgYdwWtpkU/AsevAXD/lTIiAmj0p9wXCnBxOXbfKbALjzKxv+swYnpv6+R Tc0xcWDnJ/1w4fZHcPC/pzbXxU4dYgmOPy3Ti2uRQ+gFwqggWQgPewSHqs7DKyxUTj lPlFR8AEYL/V8AoMSS3LdL/lPDV+6WCzj/dnTJ6WrQKBsXHA4By2GB6EOUsblm/XuT UjnR0TF0X9UCAlTYEUqlS48HG+swLjSFXlM2SmanFRhPkIhWCC0MyjctqhBYEFdvIW q9iHikGKJo6VA== 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 Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH -next V13 0/7] riscv: Add GENERIC_ENTRY support Date: Sat, 7 Jan 2023 06:38:31 -0500 Message-Id: <20230107113838.3969149-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754363692641106702?= X-GMAIL-MSGID: =?utf-8?q?1754363692641106702?= 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_v13 Any reviews and tests are helpful. v13: - 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.h | 63 +++++ arch/riscv/include/asm/csr.h | 1 - arch/riscv/include/asm/entry-common.h | 10 + arch/riscv/include/asm/ptrace.h | 10 +- arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/syscall.h | 29 +++ arch/riscv/include/asm/thread_info.h | 13 +- arch/riscv/kernel/Makefile | 2 - arch/riscv/kernel/entry.S | 324 +++----------------------- arch/riscv/kernel/mcount-dyn.S | 56 +---- arch/riscv/kernel/process.c | 5 +- arch/riscv/kernel/ptrace.c | 44 ---- arch/riscv/kernel/signal.c | 28 +-- arch/riscv/kernel/trace_irq.c | 27 --- arch/riscv/kernel/trace_irq.h | 11 - arch/riscv/kernel/traps.c | 135 +++++++++-- arch/riscv/mm/fault.c | 5 +- include/linux/compiler_types.h | 15 +- 19 files changed, 283 insertions(+), 501 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