From patchwork Wed Nov 30 03:40:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 27587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp711439wrr; Tue, 29 Nov 2022 19:46:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf422Ax5lvVCUS17qhQgatxqwKRlXgZBiy2gguAuMBwVxA4ta4uby6zcs6W1iHQZw/BamWUj X-Received: by 2002:a05:6402:1f08:b0:461:d21a:c0f3 with SMTP id b8-20020a0564021f0800b00461d21ac0f3mr23648466edb.71.1669780005131; Tue, 29 Nov 2022 19:46:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669780005; cv=none; d=google.com; s=arc-20160816; b=UHG062QH8Ygm+Z+eqYxOmXwUPiXxraWUgNcE8U0vUKQ4rUhXcs1BYhSsGbZlIajtR4 51pUXJAZyUWISkxD7VpORxMfy6vJMGKisDQ7SOUxuw0Xgprb79gk7LPLgBJVwpLErUyW 9+19jdzrVI9dOeBUFq4QgX5fk18hNKPnOCcUEPzSuF0CxuhuD5eZu4xsSYiLRKbPm66L 9QvEQCl7BiZBcRuFV/g57bbO/z08H7LQ+Kl9XsU5SCfkhZi9a02XWeWFT6Qpolkoc+yd 95XJBkXLcifYc4dMlyOkQpnfL3lkiaq6GVB6FnK+BuFWk7TKCDsJ+iKoX5wkiozZ3ZVH zt+g== 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=l3Y/E60HaYnQNBFQ83QsGApG8OHkbA4jh1kGhpZJnmQ=; b=ntz3svDNBiTnlUyKVqfZiXFCgCrsI8wwYDmOXJFVGirkO1rRCeMdOr3/uSvt/5/ghV XTD2Ss5+JoufsiXytGJLOGnJo+Ud6u+WnZ4H0JsOnpk8wFHFw3EquQ1JLj9X002YZha+ yA/tOZOqCRRpitRPQ/GPq9OPiPM9EEciMGqeHmMedDhZYR75QCDitz7b4/JTyiwmQokL w1cQu5rbz5q9Fp8Ib0mCW1qK8ijVKUCPisd9ss7W7sqFnPXRY1ptCWYUdqzFfrh+jzEe RhRZKbinrQ2kfl8pPGS4xx3XPfD28NEIl/toGohAVAeJaeJ0sK9e8KtWqNw80Uo69jOL bs+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=C87B5dL2; 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 a20-20020a056402169400b004615bea1d62si296511edv.472.2022.11.29.19.46.22; Tue, 29 Nov 2022 19:46:45 -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=C87B5dL2; 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 S233357AbiK3DpG (ORCPT + 99 others); Tue, 29 Nov 2022 22:45:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232933AbiK3DoS (ORCPT ); Tue, 29 Nov 2022 22:44:18 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 501CA95BB; Tue, 29 Nov 2022 19:43:48 -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 sin.source.kernel.org (Postfix) with ESMTPS id EBAA2CE0B8A; Wed, 30 Nov 2022 03:43:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AEB9C433D6; Wed, 30 Nov 2022 03:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669779825; bh=lnoKu28Fc9fEyibwcuIO3LwBsdtybFxiOBpzcEMK9/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C87B5dL2USumUlkcea4T+WHtUwUPBI7DadEe/HbMQYsoYp1OvMXectEjCfyMye5Hv b1nbWU0HOC9asmo32ux7z6+0tY2ETmsljMeGC0w2CgN9pJRwOtNQ3u8PDCCkJCJHy6 P0t4acjHlJFCmDQ5FGzECFV1WSuCsCNoo055gBxosGLMO6M7WEBwNWIzRhCU9x0xWk rIMheOnadphxptAm8icMZoVCXK/wYZ9pyXDXK7cmcihBZZaE/TXAI8NgbcQq2KzhBq CL8zfjOaBn8R+iVDWIRevX0avPkXdRwlYfuKJE3lYpIt0WKldxdnbGNZi7IqBZwa7q WOquzcKvYllvQ== 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, ben@decadent.org.uk Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH -next V9 13/14] riscv: consolidate ret_from_kernel_thread into ret_from_fork Date: Tue, 29 Nov 2022 22:40:58 -0500 Message-Id: <20221130034059.826599-14-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221130034059.826599-1-guoren@kernel.org> References: <20221130034059.826599-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?1750891238778969924?= X-GMAIL-MSGID: =?utf-8?q?1750891238778969924?= 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 make entry.S more clean. Signed-off-by: Jisheng Zhang 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 b1babad5f829..d4c061f7fbfa 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -132,7 +132,6 @@ END(handle_exception) * caller list: * - handle_exception * - ret_from_fork - * - ret_from_kernel_thread */ ENTRY(ret_from_exception) REG_L s0, PT_STATUS(sp) @@ -326,20 +325,15 @@ END(handle_kernel_stack_overflow) ENTRY(ret_from_fork) call schedule_tail - move a0, sp /* pt_regs */ - la ra, ret_from_exception - tail syscall_exit_to_user_mode -ENDPROC(ret_from_fork) - -ENTRY(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 -ENDPROC(ret_from_kernel_thread) +ENDPROC(ret_from_fork) /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index b0c63e8e867e..5108c76a14dd 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) { @@ -172,7 +171,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 { @@ -182,8 +180,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; }