From patchwork Wed Aug 2 23:14:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 130241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp848828vqx; Wed, 2 Aug 2023 18:53:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlF+CwTnM/ItjoUuTlyHCbstxIQugkqDbeHR+WNsiWNGkewA2WpDEndoOIk/fTYCGdBUviTZ X-Received: by 2002:a05:6a00:419a:b0:67d:308b:97ef with SMTP id ca26-20020a056a00419a00b0067d308b97efmr17055762pfb.2.1691027628610; Wed, 02 Aug 2023 18:53:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691027628; cv=none; d=google.com; s=arc-20160816; b=I0u2Grm/EArXsVjHvuEEudPQ/w7PIWHQMHoO/SpxWu/S9fffzqGeWsc1bhXK1KzbaI S6V7U35u8PPBEXL4sulKAixuYxizRFOBgfZh4z6OcFoW7tMHed8s7FhL1Yo79gTOZLea EmpaUcXQT6r5ONuXxjgsl95D7EUduM8U9iRQ+OI7a81IfTrgRFHWe+58newBWS8Qg34O /wh9vyr9HPYflLgtm7vxNNHN5uwFVzEL/k+uin/RpP50/U6vDHbAD520Beq0m2nlE9DD 5mB7Ztug27W1nRUsznxg223M1K5Aqvq4DuX8AqE9ZOPOnOMLZ0uNQcUE2DHT50vbDtXd 6BkQ== 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=f+mLzQiRjim1MaNN23WQQV9xVXMWWDimwJxzp5ox54nOwGhqZzE9vqvxG69pzxhBq6 A409kaQu3rnPOpJAKMF32AvCfdU+35wE6n39CHiODakGHmVIjtcuKppGZ63CcbzXewSq lDGgS6Mbk/+r6UnNT9kAgG0NNV8ek1YoQC3fYAJEjkkRAhrx19NclwmcUnhDmCcazyq4 flnL/Ov+umjQVMqa5L4bDhtMgyR/deT5y5nNmtwIJhsQBIW/Tm8jZRQipD/Wyh7e56i8 I6L+ymBPL0zt80QiOKEBny6UwxzVEz3XiOn509Ib9bIG+reJMbuh2SzT2RqkfIwaJZ31 NT/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b="fW/ZRQer"; 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 h11-20020a056a00170b00b006797c2c00besi9129801pfc.144.2023.08.02.18.53.35; Wed, 02 Aug 2023 18:53:48 -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="fW/ZRQer"; 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 S232697AbjHBXPR (ORCPT + 99 others); Wed, 2 Aug 2023 19:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232491AbjHBXPK (ORCPT ); Wed, 2 Aug 2023 19:15:10 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FC0830C3 for ; Wed, 2 Aug 2023 16:14:50 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68781a69befso62594b3a.0 for ; Wed, 02 Aug 2023 16:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691018090; x=1691622890; 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=fW/ZRQer1agPI61N0YIVyKetq1QNjGBCi7YCG1B4WYW19AOZNDS01zZ/Gskbn10aQv zPL0Gm9sWpm/+j9NGMFN9h0w454eLFh0MroSEEZFdj/piNjbc+BVIIq/SGXmFihPWFDD IolSyAxo0zr/0bHyo5nOgMNrX9dj/i+tZ9Ri5p3emb24cxEjrptIIM/88boLDwSglNux x9CeZr4wOQ/1DPRO3IwpLWxrFw7mfVV1C/+m9RduIA8VF4yWJUL2lXfxEQLxvSNXcy8N bsZ9AwBf9lAaRobv/k0nOZ9H9rDxbF/4B1fsJfRUxzwvFyI0AgxZkYKDFNMdIrT5yHsC NWJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691018090; x=1691622890; 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=WjNFw7zrB/otOshp+tK0bMox+8e3TadBqhVTlTLxlHSq0suBKqiNchp07BoQPR/3SG daJFiMYQrJhoqbci3jJEeKFGa2vN3vWdNmvwOuTuJNqvTeY6L1D9unphRdicIimVUx2w MeFCvMC4z3o9kmW2nIhzhhO8ZyqlPGTZS50HCLTCqtLjx13DUi6xWRWJM2/jB95IcL4T LL+vE1bKBHTV0Uqg9UM9h6CIGId5k2SELs1iZ8eET46GhdPb4AJSg5BjPjoJBP4k2a1m MpX3DUFucQ7JR5JI2fqVm1wmM7rG8J2t25g7iGorJ0nsXXvXASrZubPVpt8q+PJ2XPQA t5gA== X-Gm-Message-State: ABy/qLYSLrKc0fDg9B1Qd2atEqUZrHvfQ5qaFZlf9ccwA0tKX7hZHlHC ihptHX6mO56n0VEdqzXUX4Jh4w== X-Received: by 2002:a05:6a21:9989:b0:111:a0e5:d2b7 with SMTP id ve9-20020a056a21998900b00111a0e5d2b7mr18562254pzb.4.1691018089962; Wed, 02 Aug 2023 16:14:49 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id s6-20020aa78d46000000b006871859d9a1sm8588086pfe.7.2023.08.02.16.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 16:14:49 -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: Wed, 2 Aug 2023 17:14:39 -0600 Message-Id: <20230802231442.275558-3-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230802231442.275558-1-axboe@kernel.dk> References: <20230802231442.275558-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, T_SCC_BODY_TEXT_LINE 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: 1773170986932928484 X-GMAIL-MSGID: 1773170986932928484 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;