From patchwork Fri Aug 11 14:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 134559 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1174302vqi; Fri, 11 Aug 2023 08:29:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH15ffZ+KslU7Wvwsfdn2MTB+hDS/HQ0aPE+yjsQmIx7iI+6l4tEiZdnNVGimlGniymEwYx X-Received: by 2002:a17:906:11:b0:99c:dc3e:f8e3 with SMTP id 17-20020a170906001100b0099cdc3ef8e3mr2076977eja.28.1691767740911; Fri, 11 Aug 2023 08:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691767740; cv=none; d=google.com; s=arc-20160816; b=DLRf/xwjfV4IaTAdiCkM396hVviaNSmNwvNfDv9btgMlbydAAL29Mgbfr0x08iJRLp zUgukNTUAVoWyic+QDfFFgRWa9j4XTCz6XxT90IJyEixyolvxtQtuEOXsjw5MPKYEwZD +Wjog6TijpcM0UHY8YqzraE82ReJV/0kZGd1Qo947WAcEuHyqqCJz3DvFQhZTTuQ4SBS D+IayjcGuHO9dcEhP5zlSTBDpxpvPWKnTrlIlSSs+9DILisPsVPQAhd/WJ33zbDmdkFQ 05d8HwQEiVkJ39eRfY8YEWjHCs8nFdV+ay/XN16ZBQv04PH98gcwuyv6cH99tsLFRK1a yCHA== 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=0W4hkYYGlPKafnFtIfHw3u5JfmMzy8zkW1KZ07xxWOU=; fh=p+wOSmeLusTVqUKR8aQc56XBO9QP4vSQ6AXDIQF3284=; b=DY50tqcs+Xdbbfpq6Ji3yJuM2ZmG+IWYQCLs2LJ/x0bCzgWpo44GFCKR8evSf51OXZ aF1U0WeXLkA30XyHjR1nWeNvPwGrLGzUKFlvKt+puagEU1z/1tmNbfjYwUNWIg/YbP9Z MOxaFNHvxuSv6DsOy0qjvDvuc0Bwa+6ilFFaPTbsTvhN3tCQESBphb3CMlrqPKgwIGQA 6wHAFwSpmcZrHSj8axc8Ja8eUUiKDZyB9JCk1NZJ3aJFIzPem7sKsnuKe24I8kZmBBcg fgUZ5iYPRSMXNRP+suRw5BUYrq6ROVgaZpmgpm3e69pgJCdL5mw8FaCt27Yt3TAAfPuV AgrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=KzQycaVb; 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 a24-20020a170906245800b0099bd0683c1esi3277971ejb.949.2023.08.11.08.28.36; Fri, 11 Aug 2023 08:29:00 -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=KzQycaVb; 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 S235446AbjHKOQc (ORCPT + 99 others); Fri, 11 Aug 2023 10:16:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235244AbjHKOQa (ORCPT ); Fri, 11 Aug 2023 10:16:30 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 379FBFA for ; Fri, 11 Aug 2023 07:16:30 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-68781a69befso348187b3a.0 for ; Fri, 11 Aug 2023 07:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691763390; x=1692368190; 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=0W4hkYYGlPKafnFtIfHw3u5JfmMzy8zkW1KZ07xxWOU=; b=KzQycaVbeQFqn6gTdLfSsgzYGwAkhqL6P3muxw2AlRiyuWbnNPG8OuNJ/N0p6RPBUc fuIkGlIMxfVAsZ505aZKk+mLHx4KhxGZQ5AdYJqQ2MnuQL3oJZ6ILW3TRl+uUH6vhtOJ wPcvXOp/Bi5hwk6simuX6VR0kBwYBAt6Cqos2/VeKV6N4OXymfd3kHtP5QcP003+Pwcs Z6oGoKjL4NQZqXadRpaTOsnO0dZfcAH58YrOSWdIUEqY+Ba5yRH1Q2BsUAIu1CV+l2W+ QMOcOzTC7K9nGnxDbB3LtBDOznBzg6+wrSYlZMZDEpi3qmKsu1C4ts3UI8nGvkNM61Bp FASA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691763390; x=1692368190; 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=0W4hkYYGlPKafnFtIfHw3u5JfmMzy8zkW1KZ07xxWOU=; b=F3s8u6P0VAKpAEl9BxlXfdL4eVufB446K2Bd4Nsqig9M2PPUhjzq+6h1+O0pYny0k9 XZw6Sd14zVwHcN57i1SetluyJEdF38+patgIe0Z229+uhvcBaAps14rpYf04jo7NNO+X 64YUYuVF4h8uL8Ow+FmOUKQudTooK5t2X9ULCEMhYyuGBMB07SQF0v5u+6Gwju9bAMxm 3Uni1F0XcAf2JNRYfhPNL01Mn509dsO5H2ZT81GeEtNo5QRUxnJLrc1wMjFVolGow/cG WqBQOLGdgZRN3WFzIqS0PnFVQGM/PJ+gbTKRTehsfYmrWljF005K4xSSjR33Vic1lGXO k7qA== X-Gm-Message-State: AOJu0YwrDEGh0VtVTmVE47rNvM8ddWkOBss3RdZQ3xcIaHTaRwjlsey8 P7LE4hRjr9+/x88gLjSCSkRLOOMfSHwLKMuwU7M= X-Received: by 2002:a05:6a00:4986:b0:67d:308b:97ef with SMTP id dn6-20020a056a00498600b0067d308b97efmr2489718pfb.2.1691763389670; Fri, 11 Aug 2023 07:16:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 07:16:29 -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 1/5] exit: abstract out should_wake helper for child_wait_callback() Date: Fri, 11 Aug 2023 08:16:22 -0600 Message-Id: <20230811141626.161210-2-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_NONE,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: 1773947050323495661 X-GMAIL-MSGID: 1773947050323495661 Abstract out the helper that decides if we should wake up following a wake_up() callback on our internal waitqueue. No functional changes intended in this patch. Acked-by: Christian Brauner Signed-off-by: Jens Axboe --- kernel/exit.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index edb50b4c9972..2809dad69492 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1520,6 +1520,17 @@ static int ptrace_do_wait(struct wait_opts *wo, struct task_struct *tsk) return 0; } +static bool pid_child_should_wake(struct wait_opts *wo, struct task_struct *p) +{ + if (!eligible_pid(wo, p)) + return false; + + if ((wo->wo_flags & __WNOTHREAD) && wo->child_wait.private != p->parent) + return false; + + return true; +} + static int child_wait_callback(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) { @@ -1527,13 +1538,10 @@ static int child_wait_callback(wait_queue_entry_t *wait, unsigned mode, child_wait); struct task_struct *p = key; - if (!eligible_pid(wo, p)) - return 0; + if (pid_child_should_wake(wo, p)) + return default_wake_function(wait, mode, sync, key); - if ((wo->wo_flags & __WNOTHREAD) && wait->private != p->parent) - return 0; - - return default_wake_function(wait, mode, sync, key); + return 0; } void __wake_up_parent(struct task_struct *p, struct task_struct *parent)