From patchwork Tue Nov 22 19:57:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1707986 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=uI6I+oWX; 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 4NGw662VZlz23nR for ; Wed, 23 Nov 2022 06:57:50 +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 1oxZOr-000816-2U; Tue, 22 Nov 2022 19:57:45 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oxZOm-0007wk-Nv for kernel-team@lists.ubuntu.com; Tue, 22 Nov 2022 19:57:40 +0000 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (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-0.canonical.com (Postfix) with ESMTPS id C763E3F128 for ; Tue, 22 Nov 2022 19:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1669147059; bh=+BXVrzmJkDard3uaF3gK9/xutT/TYQFX6Hqs7zM8Lrc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uI6I+oWX4Z4Roruf+PffTkHBMnOOT4Jdbxgd82vHmuWw/DEyu9gttEMGck9HjrmOf G/aOcgcHPfkj57qjCMQQTWAgwGYLQtR8CUTQVPsYO9AsQbfiHRHtmy/gAlTy7OyTw5 2kDiwZQWuiH0JV8vBr1fYVAgAyyCBTSvRXBuZzt1scpml/qIk25f0aN2ea2btZdWhs +HHN2Ngvz2VAw6qPQTPLd+2rZoTIiU9Kbb5T6cEv3Z+lP/Fuof1vwXCwu+xPS4vYo3 QsveBH2PmToGfWY9JmxmzFwyaXFCpWt21eT1cGx2nBh3ZythhChefNi9uMSaPCsnVw 8w/WTDKvCp7Qw== Received: by mail-qt1-f198.google.com with SMTP id u31-20020a05622a199f00b003a51fa90654so15392981qtc.19 for ; Tue, 22 Nov 2022 11:57:39 -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=+BXVrzmJkDard3uaF3gK9/xutT/TYQFX6Hqs7zM8Lrc=; b=pYd15tcz3uooLwAn/By+vk0eMn5xYP/tfD9cJhFNfFcNCX5kaSbmwa3vLRdmkItMfs uIuNfjdiDPxAX/QA9fOBUsy5PZR92tDIe7ON8McRjhnPN4aRCTZ2HTa1Ooxk5KcyhnuN gg0NGxJow9bPmCA+sEt3EFu6IrhPIFn35SOFQVbGy6pq+kdFdQ2JSqOcbWI2lARWYmb2 WV+hsQihObsXg7vKVVNE2EJ/phd5igAWTQuxHXe5uOJLcm+GDBICXPZdkv2Zw4sY3aT4 /Ava5KLQjka8v4HJOZncgCWu4LDQCUF42V6XoeSPdVabi18nXkFXwZaVL23uh/3WSG+t gB5g== X-Gm-Message-State: ANoB5pl7UBSfXmYgureWKOeHH9kkXi3FWuTANO+CG+rSX0LuuoktWcNr jgjESvCFw+6ob+k19SQRqXQRY+AgfsTaqn71v4/wkhrYahhSYZ+x8IZre+hTkXyXpeU2klz9uFq 3PY6IKEMtiDyE/auc3cYpbrK0R7e58kBr6mAKa9HJqA== X-Received: by 2002:a05:622a:4c15:b0:398:8048:6f75 with SMTP id ey21-20020a05622a4c1500b0039880486f75mr7014964qtb.316.1669147058850; Tue, 22 Nov 2022 11:57:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf4FGLKFiYkwsOKwqKeO+kSAHiSu2vP8CwmN+YApn3vBlxSzmKdC4Tuzab+IJELiDXnwzFmSMg== X-Received: by 2002:a05:622a:4c15:b0:398:8048:6f75 with SMTP id ey21-20020a05622a4c1500b0039880486f75mr7014952qtb.316.1669147058474; Tue, 22 Nov 2022 11:57:38 -0800 (PST) Received: from k2.fuzzbuzz.org ([38.147.253.164]) by smtp.gmail.com with ESMTPSA id dt18-20020a05620a479200b006ea7f9d8644sm10728892qkb.96.2022.11.22.11.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 11:57:37 -0800 (PST) From: Khalid Elmously To: kernel-team@lists.ubuntu.com Subject: [SRU][Kinetic][PATCH] Revert "epoll: autoremove wakers even more aggressively" Date: Tue, 22 Nov 2022 14:57:26 -0500 Message-Id: <20221122195726.104087-4-khalid.elmously@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122195726.104087-1-khalid.elmously@canonical.com> References: <20221122195726.104087-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 aeb95eabcd5f9e5074095e54636258bce48c2eb4. 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 8b56b94e2f56..e2daa940ebce 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1747,21 +1747,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. @@ -1843,15 +1828,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); /*