From patchwork Fri Aug 11 14:16:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 134551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1161849vqi; Fri, 11 Aug 2023 08:08:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEyx0T9yNTLlKexGHjzXpNbnQ7tFj9FiZzk6XawVdXM6R5zSSL6vqx3xZC+xzIAeUuttrim X-Received: by 2002:a17:902:ecce:b0:1af:e302:123 with SMTP id a14-20020a170902ecce00b001afe3020123mr2675763plh.3.1691766507145; Fri, 11 Aug 2023 08:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691766507; cv=none; d=google.com; s=arc-20160816; b=Nkdqv88YXmuGBfd5KTX6ECYsIKQea2zPFfvrmyTb0T1Qmx1/OJEbBsUQ8ubtBMsRey bSymbL8iqJanCzfFwz99SFcCptFlPxTFaejGsi1MOjWbOjRR8nkGPqZ8AAmvGOplKq3w XT92UKJjUWjCUqoBLA8jtPgAE5/kqxAfNrd8+NBm0gx5lK9dmS0WTcv+p7K/1C+e1YNQ 52QzDdiZ93nk1iWD0MShFNdS26xMvcx6wbUwvkChcToJ9u97hAOX9kMx55S3ObxFBFTg JpJ+VnqgZPN4tq22v25LqNp41y3faBRnrsgxgmEkIWKh89pbw/mMqaHOQlK6JaGdAWXY l+yw== 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=qOKoMn5bZK+SN77CCIJEeYWpwJKTharQ/mIzkTPuUOw=; fh=p+wOSmeLusTVqUKR8aQc56XBO9QP4vSQ6AXDIQF3284=; b=fTs7LKB0qTKdcyS09q80cvaMFmtQsXupx9hCfzbMZwil/o+sHO4wOLmwb3mzy8URHk mdg6u/vh3dDPtj1QwdDq1LSjVM/Vs8b2X+MS4VRGUQLtkqPBft4m9deBUL5innDz4A2D 16d4WyuDHyXCIWl+WKt6NXzYFgHavUC6VX6zC+2TAoMUxmNoj9i5sd/ZXbz9p0gWYqAo tp/03I3GpnQUKMUrKouJv4gGor7bBLO5RY3z3gIZ+Tz4nMolfSQbIueHxRm6xB+XLs1N lLDg9Zfjz4MhEUWWC7X6kOKBbUqEfhI8EsJmy2AGlliu4f+C9d7J9OvkwK+Ts+KgS30F xUUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=Fr5qDzmr; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a170902f7d100b001bba53994acsi3476571plw.243.2023.08.11.08.08.12; Fri, 11 Aug 2023 08:08:27 -0700 (PDT) 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-dk.20221208.gappssmtp.com header.s=20221208 header.b=Fr5qDzmr; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235606AbjHKOQe (ORCPT + 99 others); Fri, 11 Aug 2023 10:16:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233485AbjHKOQc (ORCPT ); Fri, 11 Aug 2023 10:16:32 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 751E0FC for ; Fri, 11 Aug 2023 07:16:31 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6872c60b572so414111b3a.1 for ; Fri, 11 Aug 2023 07:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691763391; x=1692368191; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qOKoMn5bZK+SN77CCIJEeYWpwJKTharQ/mIzkTPuUOw=; b=Fr5qDzmrAy1xDvekdT2iNkrexabX/hs5iQLUXxadawHbBbzk+RSE46f718kVopldKR MImJ/7himOqEyn8S1veUmdA7+ou5itO5weo/m20hLMFIRnwxvfaAmOzRY0zB9vs/5sD8 kwRe6HJJPhmMTVvj+xMytfw/99DO4JJq82w02ZzCfr9ZvnB57t/IH5nO+nJ3BUFOUvUV sJ32FRfSuafhtEu8GTvH0wTm5B2uLXEFHneJht4Thm6LOo4PwW+55ylkELretTuQ+JY9 D63zYdzkqz9n4OYQonmnzjLHdNxfFsEoPiiJhUfMfHTa7ApGtKueR+CBBe63bdgIo0wj fFag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691763391; x=1692368191; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qOKoMn5bZK+SN77CCIJEeYWpwJKTharQ/mIzkTPuUOw=; b=jKG9CGOTrnY3xhgR7rNEGMdPAgSPLRwJ1tSc48/kdP2cdr5IyDU8WeoObIsgpy+tTZ asH/Tm2nuksJIcyHIQc0vZmQnWjD6i0QkCa5kvBWN7vaEkVRHRe9QB2mo1LihiS5R64R Act+gWjzfPnaR8x9DgZWUOzJOzqyHrt2Hacae50rJhrEthjGwakwu+HU6spLs32j+cRZ TbriYmuJFY8fVVn4JQzfa5MZviMxpYO6+p2l4FamTVDbI3sNc/04gLMCo9LJslh72iq+ 89afXe/zp6majlg2mRGRhovpbz42qiTshqxVJLRxb0PWTMazyYmtasihI4+5+l7H19cD 8Mdg== X-Gm-Message-State: AOJu0Yyd1A4+FEpzx3PSO8yxuSpj0USjkOgbekYUxj+z9yMe/CAO8ruv mNBt2f5Y4NUk2VfY2BfGmMAAOw== X-Received: by 2002:a05:6a21:6d92:b0:13e:1d49:7249 with SMTP id wl18-20020a056a216d9200b0013e1d497249mr3188783pzb.2.1691763390888; Fri, 11 Aug 2023 07:16:30 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id s21-20020a639255000000b00564ca424f79sm3422311pgn.48.2023.08.11.07.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 07:16:30 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: brauner@kernel.org, arnd@arndb.de, Jens Axboe Subject: [PATCH 2/5] exit: move core of do_wait() into helper Date: Fri, 11 Aug 2023 08:16:23 -0600 Message-Id: <20230811141626.161210-3-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230811141626.161210-1-axboe@kernel.dk> References: <20230811141626.161210-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1773945757093776077 X-GMAIL-MSGID: 1773945757093776077 Rather than have a maze of gotos, put the actual logic in __do_wait() and have do_wait() loop deal with waitqueue setup/teardown and whether to call __do_wait() again. No functional changes intended in this patch. Acked-by: Christian Brauner Signed-off-by: Jens Axboe --- kernel/exit.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 2809dad69492..d8fb124cc038 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1590,16 +1590,10 @@ static int do_wait_pid(struct wait_opts *wo) return 0; } -static long do_wait(struct wait_opts *wo) +static long __do_wait(struct wait_opts *wo) { - int retval; - - trace_sched_process_wait(wo->wo_pid); + long retval; - init_waitqueue_func_entry(&wo->child_wait, child_wait_callback); - wo->child_wait.private = current; - add_wait_queue(¤t->signal->wait_chldexit, &wo->child_wait); -repeat: /* * If there is nothing that can match our criteria, just get out. * We will clear ->notask_error to zero if we see any child that @@ -1617,18 +1611,18 @@ static long do_wait(struct wait_opts *wo) if (wo->wo_type == PIDTYPE_PID) { retval = do_wait_pid(wo); if (retval) - goto end; + return retval; } else { struct task_struct *tsk = current; do { retval = do_wait_thread(wo, tsk); if (retval) - goto end; + return retval; retval = ptrace_do_wait(wo, tsk); if (retval) - goto end; + return retval; if (wo->wo_flags & __WNOTHREAD) break; @@ -1638,14 +1632,31 @@ static long do_wait(struct wait_opts *wo) notask: retval = wo->notask_error; - if (!retval && !(wo->wo_flags & WNOHANG)) { - retval = -ERESTARTSYS; - if (!signal_pending(current)) { - schedule(); - goto repeat; - } - } -end: + if (!retval && !(wo->wo_flags & WNOHANG)) + return -ERESTARTSYS; + + return retval; +} + +static long do_wait(struct wait_opts *wo) +{ + int retval; + + trace_sched_process_wait(wo->wo_pid); + + init_waitqueue_func_entry(&wo->child_wait, child_wait_callback); + wo->child_wait.private = current; + add_wait_queue(¤t->signal->wait_chldexit, &wo->child_wait); + + do { + retval = __do_wait(wo); + if (retval != -ERESTARTSYS) + break; + if (signal_pending(current)) + break; + schedule(); + } while (1); + __set_current_state(TASK_RUNNING); remove_wait_queue(¤t->signal->wait_chldexit, &wo->child_wait); return retval;