From patchwork Wed Aug 2 23:14:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 130242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp849799vqx; Wed, 2 Aug 2023 18:56:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlFhFg0sasInQp7S/iHa4YlxsrsJ5R/wQL6o6AIRLm1HQVuBbsZUefQ73fK2rQDmVxpKr8Rg X-Received: by 2002:a17:902:d2d1:b0:1b8:ac61:ffcd with SMTP id n17-20020a170902d2d100b001b8ac61ffcdmr18500648plc.3.1691027810557; Wed, 02 Aug 2023 18:56:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691027810; cv=none; d=google.com; s=arc-20160816; b=pXC/lM9sAt/7JrvlS+5bkrd4qlB98gupUL7JB5PKDZHVU+DEIFM4NPUvdlCsYaz+Qe eEwJOVN6X4SMMa0M8vFVhVYpwAXVIkUwDtrjuRqDqCl0poMhVDi01iso0WMl9N1UemlY RT3EJ6BRdkSInfst9Eeh0B2yJlHPa7rTCRN/A08ewnKM9atB+aa/YVDUwfex49bIP5uV 9yrAXRy5fx4tWCYgF0EYEvFdtghIC7QaEs+r69Ds/rHBYzu1rF8GTl9ClrUrw6Rw2V+B 7VuxdhU4ctNtYDXuU3/ZGoypu+u/uveywHU07t6U7sijx90RkRMz6VC0Qv546pKm1vpp HaGA== 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=ZVMrEkXrlbn/ItTJ4HiS7H6RgOlSwZhVqf1SA1QexX2ObQfQklWRwIRtDyYmP6srE8 YBk/NSx14EWUUcXcgYKv3LTM79ekZoowZUmcrKaFRq0N1yFrxnxhVT7IdBZsn4IKHmMO 3KQU80TQHdrepxWcOmN2bTQ1LAQii0r/RcLBGxU9Ng225lhrw6d+hQ35ulWyNbZmeWCU OXQaq5Z8UKdG5QmxG78GwxzAk7//7qZ5EONOWlv5KAwmW+90Wa9zk3nvWMwSCPUGjkGl Tjg0XRGED6TyMFNLmlEo4UBBHAYCaJAAz01jrAae9Y3Qt5HLONBjlDnE5/WMU/hT3oQU QYhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=VvLqsRm2; 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 l17-20020a170903245100b001b8a2774d60si12122909pls.486.2023.08.02.18.56.37; Wed, 02 Aug 2023 18:56:50 -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=VvLqsRm2; 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 S232452AbjHBXPO (ORCPT + 99 others); Wed, 2 Aug 2023 19:15:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232454AbjHBXPK (ORCPT ); Wed, 2 Aug 2023 19:15:10 -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 6A66E2D73 for ; Wed, 2 Aug 2023 16:14:49 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-686f74a8992so59277b3a.1 for ; Wed, 02 Aug 2023 16:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1691018089; x=1691622889; 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=VvLqsRm2OJJU+D1M0rQbLPXxUftobv7dOQuACj7+lEUWYSbCpZrRdum9arEJRpP6ZV foTPkMFYT2P2s+xHw4MltELp2HXcKx/0V3ic1d23NgGVFndvLNP9oY87foFS2DBiLedT oeChmSpVCBUhO/fCH0jp5bVYp2cMM2tVlEomNUshrTP3pSwQS2A1zyhseuKV+d3+A183 njGjTCTc7Sw6rGyupEfH/N2kT02i3JaGSKpzP2PMWbFzbaU5Wj+mOVGAlegiNhTjpuN8 eh+WJhobV2o8TeVm+5GNvWY/IZceK7XasS5NiIamNk/fe/HrS8d+ddNgDB4p8nM6OoNF YnEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691018089; x=1691622889; 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=XcIAzS4TWu33tf9X9OludSR7gcHhlnR9HEWqie+fDxWwi4wZxfbP0/etEpY+jOJ51u keObqwNLcsSiwuraMCFJ0QAX5JfCNE11jC8JJUjTNzA1Xu1qe8BuI73xgCn1xWJV96NO eMF3X/wn29RX3u5W3TtpxfUWvykrN3di2YR//rD5OvTiaK4NRpV2hwYQLyrjq/Hsc7OG Cq8vTFrmUJHLlSD+tZwDmHnayVJuZQlzHMLYlDpznWAH9AEh7t+YYJEu/xglVVddngrr p1hgSwt8YgsUNzYL4iB/JwO6ifxsfn2cXNq3qpuZUZd+V1gOmcGGZHcEj/iSnXIvp85Z eHxw== X-Gm-Message-State: ABy/qLZ5Nc+r93HDyUUoD8EC7q334nfpWlltRhg4eLuCxxkmXrX8t6Ra NcbfBivC8dWLLDr7hqbMN6IRTfPMy+sDQtIlxwo= X-Received: by 2002:a05:6a00:419a:b0:67d:308b:97ef with SMTP id ca26-20020a056a00419a00b0067d308b97efmr16742452pfb.2.1691018088830; Wed, 02 Aug 2023 16:14:48 -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:48 -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: abtract out should_wake helper for child_wait_callback() Date: Wed, 2 Aug 2023 17:14:38 -0600 Message-Id: <20230802231442.275558-2-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=unavailable 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: 1773171177719527943 X-GMAIL-MSGID: 1773171177719527943 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)