From patchwork Wed Aug 2 23:14:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 130233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp808673vqx; Wed, 2 Aug 2023 17:10:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFOqdGgLOA6h6ZOMV82b9o5iWcwG8bn88whB/rYSFNTNg/z5A9KhMrn+mp0J+boV1nUtVzD X-Received: by 2002:a05:6a20:4312:b0:136:f3ef:4d2 with SMTP id h18-20020a056a20431200b00136f3ef04d2mr16264705pzk.3.1691021442964; Wed, 02 Aug 2023 17:10:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691021442; cv=none; d=google.com; s=arc-20160816; b=C0VJbyoKW25oz9bx3/m47BHReDJfd26wv+I4EWHMql2t5I+zYWC0O4mxAyPLxymvy0 MRBiWzds9u7aCO62WK7V4x9E0G+ELDVkCS2N+VKPpzNbCtIK7qQx9+vDQpU9wLaj248e 5W2zjuj4rwSNCue5VOr9pcrBHC1QJUepjY01hI2ZtrZyW+WDIsDDsQHjs8Xp1YXmaP9b DG79st8zStLAhvjJRUpd/Hg10fQYzft1AcXyE8/8kHgvV3Q/aOoNb6Mwec0Vpu13AJ8p 2eJC37CapHqIsOQU4jkgboApqOdMkzEG3F98cm6vy4RU3CvdXIlQIYG9VLh2gcCov4+z r8EQ== 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=WYDIyeoAajuf9ZWE7uQTqbgmYwdh8IUMjMetvGRNy4k=; fh=p+wOSmeLusTVqUKR8aQc56XBO9QP4vSQ6AXDIQF3284=; b=pNK0Oov6Rb6Dhc6BLSgA7hbf7dVj+TVo5Z9BYSjQyU3Ljj8H6wH/dWJsxVZuVkbQkZ a77Wy3X5XYmZFYPpD6qztm+Dh8Eb232F/BhWUtWT6krcLgKSr+GP8Wj6S4nct9EbXH2P 9zp3M9KYLSLbX4uNhw8Tk93nv/zqtbYvI09AOo1L1DDDPUpYsZ7mVBhScF3ZMCYHRnBn GqPS1NbuYa3gSBdG6288oCYCuJdbLkKmUexQE6uxzbRjjiAPwXDiO6bASlh9aKJJAZlT D0Y6osPNRxbD/hNHF908wIakGfD9KN2lmKPxuq9LsOO9jP9SnygpYBz2DMewPMD9T0d6 raUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b="j/TOQbbG"; 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 b26-20020a6567da000000b0056428dcea78si8401142pgs.17.2023.08.02.17.10.29; Wed, 02 Aug 2023 17:10:42 -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="j/TOQbbG"; 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 S232659AbjHBXPV (ORCPT + 99 others); Wed, 2 Aug 2023 19:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232418AbjHBXPM (ORCPT ); Wed, 2 Aug 2023 19:15:12 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D06030CD for ; Wed, 2 Aug 2023 16:14:51 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-5648fca18b9so52931a12.0 for ; Wed, 02 Aug 2023 16:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691018091; x=1691622891; 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=WYDIyeoAajuf9ZWE7uQTqbgmYwdh8IUMjMetvGRNy4k=; b=j/TOQbbGU9Y515OgPvP1VwT9KdHRrb9ZDbEFT0J9+QwQPRL96cGPPaAJbKHcolCg/v itATAWdxTMiqX3Zkqg1wadUnLchhbL6hXdOtbXCGVe2v3V4z8Nt0T/y81lotBAxPNuFS 3jQhHAaOLb63IEUn9WrcCVk4CiP6j51lN5RIN8jWDUznmFcpRC0hHBxbV/CvEYlaB9t9 VsKqVb2kgmdSxFvDCGyvQXAfDtKM6QuKUyBID07WNA6SlVltqxVQSndTDhhEBd1K3IG5 VmMZiaqMTLTyG+f4FleKE8FQKsdnp/uKHb4rblU9yxmqwjG9IEtCcxXKW9yhHclmyFLw 7tVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691018091; x=1691622891; 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=WYDIyeoAajuf9ZWE7uQTqbgmYwdh8IUMjMetvGRNy4k=; b=O3CE0PRmOJu3ENSTEtFJAAggm+6dzOoahba9hh1XkPs8InhIe7PxA3x3Qb5IOc6YOZ Sv0I1mE3K7tUU9IUoF9UkRGiNEcF+pTB0nP5fIa+llNmbBOmsdvcJcy3wPYkPMDT55Os KU97t7po1gQW6SKvXi6K8y0KXcJc42xYlriCuetVeodjeI8m4XevlbevPv3idKZZtFIB vCrrMuLOcGwE21gJEbVOgvkdccNstWfsHxdtbbOSH1T13tx0ghZd7q2lxdwG3kdtbSRU O/i8tqQFKyRyza4aXqhWNRYH+i4bGAwY6PtxQ2CFsXz4ucCKv/9j38g7/xmOU6fG1pF1 bXhQ== X-Gm-Message-State: ABy/qLaKl33sc/IEyzsazshtGGxHC66fpn02r+0wW6pj95/bh16m44iJ +oHl2/T/dr3LQP4A8BIsm+ZZcMKOivvS4MvLZvA= X-Received: by 2002:a05:6a21:33a6:b0:134:1671:6191 with SMTP id yy38-20020a056a2133a600b0013416716191mr17934352pzb.0.1691018090915; Wed, 02 Aug 2023 16:14:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 16:14:50 -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: Wed, 2 Aug 2023 17:14:40 -0600 Message-Id: <20230802231442.275558-4-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: 1773164500341687321 X-GMAIL-MSGID: 1773164500341687321 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 | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index d8fb124cc038..8934c91a9fe1 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1662,14 +1662,12 @@ 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, unsigned int *f_flags) { - struct wait_opts wo; 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)) @@ -1703,7 +1701,7 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, if (upid < 0) return -EINVAL; - pid = pidfd_get_pid(upid, &f_flags); + pid = pidfd_get_pid(upid, f_flags); if (IS_ERR(pid)) return PTR_ERR(pid); @@ -1712,19 +1710,34 @@ 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; - if (f_flags & O_NONBLOCK) - wo.wo_flags |= WNOHANG; + 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; + + 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; + unsigned int f_flags = 0; + + ret = kernel_waitid_prepare(&wo, which, upid, infop, options, ru, + &f_flags); + if (ret) + return ret; ret = do_wait(&wo); if (!ret && !(options & WNOHANG) && (f_flags & O_NONBLOCK)) ret = -EAGAIN; - put_pid(pid); + put_pid(wo.wo_pid); return ret; }