From patchwork Thu Dec 1 18:11:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 28492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp412386wrr; Thu, 1 Dec 2022 10:13:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4LWYTXEP1Fci6jZurMeyFIWHejQzy3ziOrLeuvVZ1h4tS/YM2Vd5QtLOYpmRNtNMNpEt6l X-Received: by 2002:a17:906:9c87:b0:7b2:e875:626b with SMTP id fj7-20020a1709069c8700b007b2e875626bmr6136374ejc.373.1669918424058; Thu, 01 Dec 2022 10:13:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669918424; cv=none; d=google.com; s=arc-20160816; b=QVARMvtgSrZWAEE6hJg+wjsEZk3Mfb2GlwEBBZnOYoLsNufGOw0b5QmYFi8SVCtERd PGa2jD1bBmmlkEsH6bpodxoqjlKyYGFOe3ouUTbYXlDbc5Z2YdxNg5/OjG/0f8H9njfA NgrOxT8kLGRwhzb/1onsDyfWGtYshYKb80pwwMmGHwkHABdwOMJ2uMhhU13GXCQc6A7M HQCOSf1HiKgWsHRH8Naxg7z8ZcFia8y7I44T+hdgOr4b4ZZuT+IkUhvHe/KWCVy9u4i8 53oUaehmVYa78+wUrkPfr1hj7K1/hxNHD1k7e4M6VliqU9sECAkV6B5SysJu07stoF0L ra2A== 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=8PHeEQvI03GO1u4arOs5eKGxrrWj+QcJXenB1+d+Ev4=; b=sJ7FYRuFh57nzi8NrbNLqzSOBNzoRxL6LtIquU0RngC3INbEmHe4bciOXEhEbot5AC ObZs70ctycoLdJDBSqzpvoTS6Y1ubhT6YFAlKXAFOoZwaFBCUSx5W91aSKYqoV9z+RdO 3eNyYvQ0uX6viSG6gM1fa8UyJFgQo11++SOaYS4rdfgQz9MeHEh+AJdXCPuwv2zC8HGW g5eXyUKzNCQ8yYE0p+VFwfIS5I5Il4I5RfOhO6emA1d9iu4W+0jipQ35K93YZqvzAx5t V31VdC0OiQB1wlTj5xyrvhivbmIm37o2tSHDWA0iAstO7JKrr1QUkOMfgoSZjjL/NEEc Ixbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20210112.gappssmtp.com header.s=20210112 header.b="HZsYyn/z"; 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 m9-20020a056402430900b0046ab1d20ca2si4228705edc.439.2022.12.01.10.13.19; Thu, 01 Dec 2022 10:13:44 -0800 (PST) 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.20210112.gappssmtp.com header.s=20210112 header.b="HZsYyn/z"; 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 S230251AbiLASMK (ORCPT + 99 others); Thu, 1 Dec 2022 13:12:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbiLASMG (ORCPT ); Thu, 1 Dec 2022 13:12:06 -0500 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D16AFB7DE8 for ; Thu, 1 Dec 2022 10:12:05 -0800 (PST) Received: by mail-il1-x132.google.com with SMTP id bp12so1089892ilb.9 for ; Thu, 01 Dec 2022 10:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20210112.gappssmtp.com; s=20210112; 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=8PHeEQvI03GO1u4arOs5eKGxrrWj+QcJXenB1+d+Ev4=; b=HZsYyn/z6EZxF36zedEHApAUBJ4P2dRhxWAAmEyxvmr310UQWzVRPVbApPIsSlk1o/ rgSJjhyFcbZgkEzBYSXVuoKf9N6ik+dqn61leEofV6Rr7hRtWk0lyGfnaKdO0PG7+u/+ 44cZp9cYXcWPQk/YuxfkuaNFMmi/6uKPYn8HnxVOej4A7MQVSb/ZXS0V5Rpe6SQ0IeAo NSmxA1q2sZBjPXe37/6uKtE1H4SbpwEB8Gu314VMk29RlzXWaHSGKH7Ri0Yr5PRMbyvl m8y70Uk6erMJKkVghZF++Qv7+nRhEa2ncIOxeLZqW+GFWUPYdDyxCEI0gYmrEfKlxpaN VJ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8PHeEQvI03GO1u4arOs5eKGxrrWj+QcJXenB1+d+Ev4=; b=gdVXWOslFx3XPFWIyyDUr6LrraTAK5/0KEl2e54RlRRIeakValmWUFELU3wNsVNe2y WrAFJsp4p4/PbVmfbLbYli3xf6rc3LsVPhm/IrM/H6j3OSwSwuQDLLSVNlPQHZo/kTIL 4cS3sQR4SGErpU0p4o4vbhCRezo6v2ldE4gzLt0mXEalQ1LXFrwH88NzebsdHFS1OD3K VMtA8M7oCgio+U5vvY8czYsR1q2qQaFb0RbOvsmLC7wkXa/BvlJS032OSIAwDE0e4fVJ gBcgG6IgxIYbAvi6KIwWJlmeVKgr+QNUACL+Je1mTB/B08RQIVxttl4SEbxmaXTI4sGw recQ== X-Gm-Message-State: ANoB5plN6ERdTZje4Mndf1lFITlil1IJDSp0QcKUPqg2JWLkNuUByVDf 4nvDQxyLBkNAorOs+2+kTykWR6eMeZKaOGBh X-Received: by 2002:a05:6e02:1251:b0:303:1c15:2818 with SMTP id j17-20020a056e02125100b003031c152818mr8384519ilq.87.1669918324962; Thu, 01 Dec 2022 10:12:04 -0800 (PST) Received: from m1max.localdomain ([207.135.234.126]) by smtp.gmail.com with ESMTPSA id y21-20020a027315000000b00374fe4f0bc3sm1842028jab.158.2022.12.01.10.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 10:12:04 -0800 (PST) From: Jens Axboe To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: soheil@google.com, willemdebruijn.kernel@gmail.com, stefanha@redhat.com, Jens Axboe Subject: [PATCH 1/7] eventpoll: cleanup branches around sleeping for events Date: Thu, 1 Dec 2022 11:11:50 -0700 Message-Id: <20221201181156.848373-2-axboe@kernel.dk> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221201181156.848373-1-axboe@kernel.dk> References: <20221201181156.848373-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=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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751036381016334607?= X-GMAIL-MSGID: =?utf-8?q?1751036381016334607?= Rather than have two separate branches here, collapse them into a single one instead. No functional changes here, just a cleanup in preparation for changes in this area. Signed-off-by: Jens Axboe --- fs/eventpoll.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 52954d4637b5..3061bdde6cba 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1869,14 +1869,15 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, * important. */ eavail = ep_events_available(ep); - if (!eavail) + if (!eavail) { __add_wait_queue_exclusive(&ep->wq, &wait); - - write_unlock_irq(&ep->lock); - - if (!eavail) + write_unlock_irq(&ep->lock); timed_out = !schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS); + } else { + write_unlock_irq(&ep->lock); + } + __set_current_state(TASK_RUNNING); /*