From patchwork Tue Nov 22 20:02:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1707990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=uo58c8Ew; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NGwCz2PqSz23my for ; Wed, 23 Nov 2022 07:02:55 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oxZTm-0000xz-72; Tue, 22 Nov 2022 20:02:50 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oxZTg-0000pu-UA for kernel-team@lists.ubuntu.com; Tue, 22 Nov 2022 20:02:44 +0000 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AAE9C3F480 for ; Tue, 22 Nov 2022 20:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1669147364; bh=GEICd4saiRDXES/dQn0EXQ/Ew3gMn1th5B5VFWGOf50=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uo58c8Ew5mq/iMHKzLorB7aWo6ysb9jx7iz1vjJN5gSt3ip1mfh33gHhWVB5eIB2U KHS/Nbtjikd9RVmli3uGOyS+PMDonWfJ3zcjJ5hQ+qDlajcLDASH/J34m5eVLcFo4O eXGbp4uBFFlcaKyxUx/F163GwGjNMUFDy2ElsFfx4sdDKmmS3DarX2C/oEayaqk9Ia jXNzOaMelmP0HXRIqwR6+yg71ww7LCKPjg5A0uNArSsb22RTvjEu8B4XQPImwES8u9 UexNk6xVWi+zVeYxvWqEwMifW3xPzw2ElC7wi88P9nZs03KOuMR+6OoXXt5i66ABTj TO20HDxiuES1A== Received: by mail-qk1-f200.google.com with SMTP id u5-20020a05620a0c4500b006fb30780443so20442104qki.22 for ; Tue, 22 Nov 2022 12:02:44 -0800 (PST) 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=GEICd4saiRDXES/dQn0EXQ/Ew3gMn1th5B5VFWGOf50=; b=KMY+ESYG417zTMKMVNCpYK2EIQjUM7kVNe8Y+PIvM5nLKtHvYjRY07P1ijk8jlGkR+ Ooh8emITKYehXUs1bIZraiNMO01PxUQNGR6m/lomoEuZPNQ87ftPPzVDPgjwv7Qri9M2 zUWmTH+nowywHQk15HW4RLGU4ZTfapUgOiBpUPGQGgtUErjLt1Cz65wKuPhTopzeQw4l AI6uRGlyULyGno9pOMFM6We+iyPQo+UAWK/W91qjlD7LKGE/ONgpxhjqj1cJy1pWrdGX iRCvNwBoGaGVwFQCD3SFDTToiPybDULJHKKDaLLvXJN3w8OkBBuNltp+GCV2CxDthCOv KOLg== X-Gm-Message-State: ANoB5pkxyxC5ehP87HL+xAkCc2BO8IPtbAQHmxNIZxi0vaXQ2p7/ehT8 mpvTpSDt+tg+fYN1cUBZnYojmgYOEgqa54X+U4OYmK4eFwqSeAGnzUOkHHsIHOTrCZhrgzNBeeJ dDMhjIgtDlzeBY2qyVpRkCjWjaICKfoChYGU+bg0Y+g== X-Received: by 2002:ac8:4802:0:b0:3a4:f056:1e81 with SMTP id g2-20020ac84802000000b003a4f0561e81mr6348979qtq.229.1669147363389; Tue, 22 Nov 2022 12:02:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ndeBJqIEU2b8Zvr4APtV0sdYo/fuQA9z3gPqiVeSo9cbL7QnLpB2I5kT8S4GCAfAPlAY3tQ== X-Received: by 2002:ac8:4802:0:b0:3a4:f056:1e81 with SMTP id g2-20020ac84802000000b003a4f0561e81mr6348944qtq.229.1669147362915; Tue, 22 Nov 2022 12:02:42 -0800 (PST) Received: from k2.fuzzbuzz.org ([38.147.253.164]) by smtp.gmail.com with ESMTPSA id n30-20020ac81e1e000000b003a50b9f099esm8826505qtl.12.2022.11.22.12.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 12:02:42 -0800 (PST) From: Khalid Elmously To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy][PATCH 1/1] UBUNTU: SAUCE: Revert "epoll: autoremove wakers even more aggressively" Date: Tue, 22 Nov 2022 15:02:35 -0500 Message-Id: <20221122200236.104315-3-khalid.elmously@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122200236.104315-1-khalid.elmously@canonical.com> References: <20221122200236.104315-1-khalid.elmously@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1996678 This reverts commit 697e78d7d185f0fa4b3c97c5119dd266094a1e70. That commit was suspected of causing regressions, like the one reported in the BugLink, as well as other suspected containerd/runc regressions reported on Azure and elsewhere, e.g.: https://canonical.lightning.force.com/lightning/r/Case/5004K00000OnSZDQA3/view https://github.com/opencontainers/runc/issues/3641 https://www.spinics.net/lists/kernel/msg4565924.html Investigation is ongoing but there is a high probability/confidence that bcf91619e32fe584ecfafa49a3db3d1db4ff70b2 is indeed the problem. Signed-off-by: Khalid Elmously --- fs/eventpoll.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index cf326c53db0f..06f4c5ae1451 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1740,21 +1740,6 @@ static struct timespec64 *ep_timeout_to_timespec(struct timespec64 *to, long ms) return to; } -/* - * autoremove_wake_function, but remove even on failure to wake up, because we - * know that default_wake_function/ttwu will only fail if the thread is already - * woken, and in that case the ep_poll loop will remove the entry anyways, not - * try to reuse it. - */ -static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, - unsigned int mode, int sync, void *key) -{ - int ret = default_wake_function(wq_entry, mode, sync, key); - - list_del_init(&wq_entry->entry); - return ret; -} - /** * ep_poll - Retrieves ready events, and delivers them to the caller-supplied * event buffer. @@ -1836,15 +1821,8 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, * normal wakeup path no need to call __remove_wait_queue() * explicitly, thus ep->lock is not taken, which halts the * event delivery. - * - * In fact, we now use an even more aggressive function that - * unconditionally removes, because we don't reuse the wait - * entry between loop iterations. This lets us also avoid the - * performance issue if a process is killed, causing all of its - * threads to wake up without being removed normally. */ init_wait(&wait); - wait.func = ep_autoremove_wake_function; write_lock_irq(&ep->lock); /*