From patchwork Thu Jan 26 17:25:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 48822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp398153wrn; Thu, 26 Jan 2023 09:36:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXub659bU5qmgFP26FRHwi2UGqMWk1a2eaNESwbNhKdq7MWLBuNrjpv4QPKfFjHC6C8pjSzo X-Received: by 2002:a17:907:3e18:b0:84d:3403:f4f2 with SMTP id hp24-20020a1709073e1800b0084d3403f4f2mr51150220ejc.62.1674754601750; Thu, 26 Jan 2023 09:36:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674754601; cv=none; d=google.com; s=arc-20160816; b=DI9169s64V+Kh8BSEGK/49ltI1Mq8rd7w7QmJEKxC3n7z7rL35RHJSjXh5ESctVRMg gVsGhNYZV/EBbBijdAQBx9Poj7W1ps0SoeAQEXvNLalx/H2PtOwufW6KGauoqZZHYXZI Plc92ACmzUsDuJeNneN9lPf9Omwzh76chAPLAsam1og1urlgVWToBrFaJ0upgAVR63Wz +x7QcEOvcaKWMSShpFGwex6Wm8wcI3815FweiD3NZMlobSaMvl0rHHNsDzTE4YTwzHLK M1zpntUE1DEis0tIhwKoJkJ2kTOrtpDD1jyXJkK7OJ0ViDdPHHcIdsUd1e/WZRacSQWW 4ecw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OjafgatZrBmHOJEqFE+6S/O5Al9bUyH3Qn6DEZwKBGs=; b=DHzMNbiP9kXaVK4E1NeSpTbO0EexT4IyMuddiN0JsZ/q5B+aEaWiGiDjHUGXHy29X5 tqbM/QxQc0oCunuqA8Vjo4vzpe42xqvnLiKdjjxoFSHJn9q+tQLlgF1wbgeewd/0noR2 qWI+IwrXnb4oYJnrKshUU9s4cKz7rMX/sejKbeRTCmsZydX5FM1f+nwj9af9Q38bRcOZ ZS3928ubDKHBIOpYRoPH2PDsVKsF1yizopTDp7liGer5E0BTfyII5ZsMIgFTvQvkdokI njU5tfZl+awo1Hwa2eQRYRKAWy8sQYevZFNavOJYKfWBDFWHDgIlfdTbNgfCRV20tXLt ZuxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SEooqbqV; 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 l24-20020a170907915800b0087255f934f7si1700625ejs.214.2023.01.26.09.36.19; Thu, 26 Jan 2023 09:36:41 -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=SEooqbqV; 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 S231941AbjAZR0w (ORCPT + 99 others); Thu, 26 Jan 2023 12:26:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231968AbjAZR0Z (ORCPT ); Thu, 26 Jan 2023 12:26:25 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0918F6C116; Thu, 26 Jan 2023 09:26:18 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 8EE28618B4; Thu, 26 Jan 2023 17:26:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0432C433EF; Thu, 26 Jan 2023 17:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674753977; bh=NZL7k5T/gq/CBdcI/CQC/x9NElRVpSMRhseuithZiTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SEooqbqVMsn2TlMRnXsNo9Y+PaFPnvDX3csu/9gIT177v+8ZILm2Wzk3PESi+bHlG mkE6nY6+naMdQcujHVEdccadtYSM8U79429TADKGRiVV+yoC4nEGulZ10sgZMhq40Y Um6vru9wBz1AZCvv/OUOaCqXVGBMRu3ozl5nAJG91SIiUX90n80J9tin0JFX8rmrI1 F5IKtNA2pPv7e+ZmeSB8EawgCsgqAyrLirnWkDSCiO5F/TOtKrdo93O9SkENtoPVQe ao3+fDIkJWs9cCuXSsGGBY9TS7NfXIH77GYkagvDaHXaBMA34hruRzwYWVKyrnCe+s cjMqggrp5dSyA== 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, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH -next V15 6/7] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork Date: Thu, 26 Jan 2023 12:25:15 -0500 Message-Id: <20230126172516.1580058-7-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230126172516.1580058-1-guoren@kernel.org> References: <20230126172516.1580058-1-guoren@kernel.org> 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?1756107481093538719?= X-GMAIL-MSGID: =?utf-8?q?1756107481093538719?= From: Jisheng Zhang The ret_from_kernel_thread() behaves similarly with ret_from_fork(), the only difference is whether call the fn(arg) or not, this can be achieved by testing fn is NULL or not, I.E s0 is 0 or not. Many architectures have done the same thing, it makes entry.S more clean. Signed-off-by: Jisheng Zhang Reviewed-by: Björn Töpel Reviewed-by: Guo Ren Tested-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/entry.S | 12 +++--------- arch/riscv/kernel/process.c | 5 ++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index bc322f92ba34..5ccef259498d 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -132,7 +132,6 @@ SYM_CODE_END(handle_exception) * caller list: * - handle_exception * - ret_from_fork - * - ret_from_kernel_thread */ SYM_CODE_START_NOALIGN(ret_from_exception) REG_L s0, PT_STATUS(sp) @@ -334,20 +333,15 @@ SYM_CODE_END(handle_kernel_stack_overflow) SYM_CODE_START(ret_from_fork) call schedule_tail - move a0, sp /* pt_regs */ - la ra, ret_from_exception - tail syscall_exit_to_user_mode -SYM_CODE_END(ret_from_fork) - -SYM_CODE_START(ret_from_kernel_thread) - call schedule_tail + beqz s0, 1f /* not from kernel thread */ /* Call fn(arg) */ move a0, s1 jalr s0 +1: move a0, sp /* pt_regs */ la ra, ret_from_exception tail syscall_exit_to_user_mode -SYM_CODE_END(ret_from_kernel_thread) +SYM_CODE_END(ret_from_fork) /* * Integer register context switch diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 8955f2432c2d..46806d5d10fa 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -34,7 +34,6 @@ EXPORT_SYMBOL(__stack_chk_guard); #endif extern asmlinkage void ret_from_fork(void); -extern asmlinkage void ret_from_kernel_thread(void); void arch_cpu_idle(void) { @@ -174,7 +173,6 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) /* Supervisor/Machine, irqs on: */ childregs->status = SR_PP | SR_PIE; - p->thread.ra = (unsigned long)ret_from_kernel_thread; p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; } else { @@ -184,8 +182,9 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ - p->thread.ra = (unsigned long)ret_from_fork; + p->thread.s[0] = 0; } + p->thread.ra = (unsigned long)ret_from_fork; p->thread.sp = (unsigned long)childregs; /* kernel sp */ return 0; }