From patchwork Fri Aug 11 14:16:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 134541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1150414vqi; Fri, 11 Aug 2023 07:51:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzd4ZeRDNq0ISCwwy7jwvt5fUamo6Y/rC3eDNYz6UqtUTJ7vQn1WicLktoNt44Rqvg5IE0 X-Received: by 2002:a05:6a20:160b:b0:140:d536:d434 with SMTP id l11-20020a056a20160b00b00140d536d434mr2870428pzj.10.1691765498758; Fri, 11 Aug 2023 07:51:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691765498; cv=none; d=google.com; s=arc-20160816; b=geppowNP1AT9kJHMA8JzkXyyAMEaox+MjJpH6OqCm/vcHDkB1aiHg/XvfuQEbJBn0N PAS3NVU56xw/MjUYIOPmAPTBkKzrJ0yl2P8AdCsYlKDS7PdN0bFXPt6FrafcLIoWL479 Q0I2KAz4lrRoua41tamN64b7bESxLqu9o/SmLYa2B1TtoEnov1dVq4pH5tYOArdXFWoq NIkHEoyOLZVDOrlMTvvgDSbY0LdSZbKyWAEC7PcrJEd08dgIf6QwdomlWjiJsJvffmm5 HxClaDDJjDqRF4g6PQua4t4UqYRPyjLYNbTkf09I4DdJbM0YHxXs40vJWl34JD9j7PRX aTTw== 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=7SdvGakOC76UVVqy+Q7KBbtdiqly+wN0IeNy1TtcFHw=; fh=p+wOSmeLusTVqUKR8aQc56XBO9QP4vSQ6AXDIQF3284=; b=PHBNQ/mipKaznuWu/BfDrNrzXpEjzUBWcO+G3p7d/nBJfMQIBQh/Eaiyo+wwndjrhV nL98feZuS3KeRBLMt5laqg8ejzTasBsiw9buEDhznTsqiKYrCuN29wbC8qTKfhkDbLIP G+aF4jgzmavCOBxRnVad2bAHjZhaG1sB23MaDQFrZIWj85QJhD2bRYOuEe2ESCtUk2ev iPkp+gWXms60pmfz7v1YSO089IoFy+yY4M0x5AVT161//EzC+/fBPd41nd/J7piDOmY5 gTwfelgXeAFq9gKUgPTnfv3cfwGK+U8w1yuz5MfOD2UKlC4oqfa6mN/nDuxV08fC+S19 bm+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=yZ0jizWL; 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 a7-20020a634d07000000b00563e0e86f17si3603349pgb.573.2023.08.11.07.51.24; Fri, 11 Aug 2023 07:51:38 -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=yZ0jizWL; 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 S235902AbjHKOQs (ORCPT + 99 others); Fri, 11 Aug 2023 10:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235584AbjHKOQd (ORCPT ); Fri, 11 Aug 2023 10:16:33 -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 C4CC8FC for ; Fri, 11 Aug 2023 07:16:32 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6874a386ec7so412809b3a.1 for ; Fri, 11 Aug 2023 07:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691763392; x=1692368192; 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=7SdvGakOC76UVVqy+Q7KBbtdiqly+wN0IeNy1TtcFHw=; b=yZ0jizWLa+0++mgdS1Vx1V5O0p2BLQ4scMOevPUBIl4x8laXJA/aIp0EdjmJz/h/Ua GSQkF52hwg8GF5x28SG7aAqxb+2dp3XK+JF4ZJ/eJfSn2XqBLt6lb1poWLcWV/Fkur4y LCQ+UN1nP2ogkioPaom+xeJrhN+zoxR+/nCe9ur80IwhWo+bczxcjDdDaFEIZ2XrtLV0 0Oo9ummWzCQiDvPP2Ov2Lbz6dSrhtbUL6s5fezYc3uXXNPqbAo4YTCHpBjeQ+gDTeQmr mTSaOGrin7EPkIfPsdViCmwW3wArMNbxEPkVGyqNBMryUCAPet4Qj6V3vv/D0oo+2Q4r 6p9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691763392; x=1692368192; 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=7SdvGakOC76UVVqy+Q7KBbtdiqly+wN0IeNy1TtcFHw=; b=DJ/PanbC+b5adx4lNv8ruXzoeARz/epGE8WsU+Gz3r9i2wUxuYVHChQu21EH2/VApt 9oNKfhW2omN0d/Izg99ILvpIYpeqD0SKzl0UCZlIvEOFT8rHoM0AMLkNI5a8j2JVToyv Uk/j2HPnDkB6WM+/B2iLssibMuBXBMHuPVDq+XCRGYNU7L/yFOQXqZIUZRBGHLNM0wY2 Mnfn28G3Cgx1biJPhUsts2wYL11E472q24N1vJZy9+9vqxKkO9B4YSMYB3LCWGSNm7g3 X+gl+LmjM9zWgxrfEIOD1W0fmO1+ynWQKAbWCCGPKdcC4R9BZ3CWXXlWBCwcXgDTxf1L 74tQ== X-Gm-Message-State: AOJu0YxguQz0PnERAQ+ff2pzz6Eb5XIdZOP11IEXm53JxIhG3Bnah5Y+ ZqBVFHG+5j8UrEHQWHawZmUbtw== X-Received: by 2002:a05:6a21:6d88:b0:13f:9233:58d with SMTP id wl8-20020a056a216d8800b0013f9233058dmr3197361pzb.2.1691763392274; Fri, 11 Aug 2023 07:16:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 07:16:31 -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 3/5] exit: add kernel_waitid_prepare() helper Date: Fri, 11 Aug 2023 08:16:24 -0600 Message-Id: <20230811141626.161210-4-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: 1773944699451926335 X-GMAIL-MSGID: 1773944699451926335 Move the setup logic out of kernel_waitid(), and into a separate helper. No functional changes intended in this patch. Signed-off-by: Jens Axboe --- kernel/exit.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index d8fb124cc038..5c4cd1769641 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1662,14 +1662,13 @@ static long do_wait(struct wait_opts *wo) return retval; } -static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, - int options, struct rusage *ru) +static int kernel_waitid_prepare(struct wait_opts *wo, int which, pid_t upid, + struct waitid_info *infop, int options, + struct rusage *ru) { - struct wait_opts wo; + unsigned int f_flags = 0; struct pid *pid = NULL; enum pid_type type; - long ret; - unsigned int f_flags = 0; if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED| __WNOTHREAD|__WCLONE|__WALL)) @@ -1712,19 +1711,32 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, return -EINVAL; } - wo.wo_type = type; - wo.wo_pid = pid; - wo.wo_flags = options; - wo.wo_info = infop; - wo.wo_rusage = ru; + wo->wo_type = type; + wo->wo_pid = pid; + wo->wo_flags = options; + wo->wo_info = infop; + wo->wo_rusage = ru; if (f_flags & O_NONBLOCK) - wo.wo_flags |= WNOHANG; + wo->wo_flags |= WNOHANG; + + return 0; +} + +static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, + int options, struct rusage *ru) +{ + struct wait_opts wo; + long ret; + + ret = kernel_waitid_prepare(&wo, which, upid, infop, options, ru); + if (ret) + return ret; ret = do_wait(&wo); - if (!ret && !(options & WNOHANG) && (f_flags & O_NONBLOCK)) + if (!ret && !(options & WNOHANG) && (wo.wo_flags & WNOHANG)) ret = -EAGAIN; - put_pid(pid); + put_pid(wo.wo_pid); return ret; }