From patchwork Tue Oct 10 03:58:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13414798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E49E5CD68EA for ; Tue, 10 Oct 2023 03:58:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8018380043; Mon, 9 Oct 2023 23:58:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 78A2880027; Mon, 9 Oct 2023 23:58:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62ACF80043; Mon, 9 Oct 2023 23:58:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4FB5A80027 for ; Mon, 9 Oct 2023 23:58:47 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1A0941C9AC4 for ; Tue, 10 Oct 2023 03:58:47 +0000 (UTC) X-FDA: 81328195494.18.3457D36 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 69A5140014 for ; Tue, 10 Oct 2023 03:58:45 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="aj1TKu+/"; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696910325; a=rsa-sha256; cv=none; b=mZePBvIvvWs1QboM2e4vKReK9yRYsJwSrSsKm5W1btutzM3zyWj/3BhaVAZ+r8MvOxXMpQ 7D13vwPEXYaPfmeVTuoKmK537dcaTwPK9kbns5CuNMv8OPaTX3iE8soS5zShpvdAyXrDam fObFybrc2t3iDgI3KU2tG2n452PWFSo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="aj1TKu+/"; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696910325; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xonbTILnfRDSSpwlD7/OIaZi3FMBcEwweuvW4yZCh2w=; b=onUrcWRv3F6M4vKgMzWykgSBbMXIMqfzaYjvdB6D/6hxVvSWU8YU5v1Utd35+Ntq2+OAuS IyhQeK2jg2JnR//sh0TgaEHRKiIb/F4EkDBRWvZ4GfpLDdVCfiEwZtAxOv9Mp7peuSK+Nk 2hvdq/xfsKjivIpssvffUYiBImlHgWM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=xonbTILnfRDSSpwlD7/OIaZi3FMBcEwweuvW4yZCh2w=; b=aj1TKu+/EtwxufLyebFk8DMNnQ 4UfGF4beGegRl9svNF5CGC8UMlk5h/XNEvviQQnRsb86wmbyKmOVzGmKiA9fTL3dadUOqvxayQgqr v16IZoYVhxC8zB7U+YMbEgAA7LrIoxiEftMqZzMDhtpXZFpDQxi9srXjZ2yE/hpaCZT1XzxEUlwzx 7c+b9g4gVNvfVNbtsmPwZAH9nJsebScv8IRnSBF39BwyAFFYt0JA4STfeMYbCpY1bz7h4tYnF1lWf IUwcIoIkSJ4FkWrc17yeLi4vvxY5aVeUZP/oRUrew/Ldg7pZ3I5l96aVSVcb1R+Z5nQoub/S3+48R tOwzb87A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qq3tC-002Haa-ET; Tue, 10 Oct 2023 03:58:34 +0000 From: "Matthew Wilcox (Oracle)" To: Bin Lai Cc: "Matthew Wilcox (Oracle)" , mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, akpm@linux-foundation.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/2] filemap: Remove use of wait bookmarks Date: Tue, 10 Oct 2023 04:58:28 +0100 Message-Id: <20231010035829.544242-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231010032833.398033-1-robinlai@tencent.com> References: <20231010032833.398033-1-robinlai@tencent.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 69A5140014 X-Stat-Signature: 94ds5gwn9cx4jz7oidbfmh7yeewephn1 X-HE-Tag: 1696910325-564411 X-HE-Meta: U2FsdGVkX18Yi+h39AG+NYGwE/efAgLLAwNhTmnpnv6oszwobAdUP90HrQSUeNKpGMXwbo321yWqwDloGkSKJnYfpozDE9wF1kyH5fNizYtOQekmDBNz8tLNFDZUy2nJ1kwxJZviWQwhokMsFJ/iSNBkBpIvJr/syKCxR54GQAixSgaGM2eZtJzXpWAQ8nRMio+BVZOcfDdS0w8wa3dDRSaHwnzDBzDMyYdeW+no7yFe23++5Sba+ESjH4C/rrkYzXtZpZhwGRCGH6KYVwJYiaEIw4AlvwmDA3mrbAqFMwqE+zVbx8wbTRhHyCniGRcMySEQbmZ8PhmPhDi+1ry+cJyatlIDrZbiQFb01Cnx2mUIUdehmsR5HCjK/sWw+9QTPitIXxG8I7dgWnr3nLnMisQV15DzSbK0U+a7MZNAByrJ16BSDL7nO8wnnuvAmhf2bX9kf3TcMr/GPdYXv8Pa/MtwzBs4+Rk8lSP5P8Lp/etPMW/Ck+MTT3weIhshX5kC5is/luY2bSFC0ilYLOFbckLtnwqbo1NKJAPVdgS3TQAYpiqzbP6gYISSb1WY+eIuWI8WGpbrunmKN9Acy/GIHrXACuFqhW/UfHISvAPSAunkRBx6sWfn7ZCKyP0BSQZLyxR6xHsb4glSwX7IcNrYccz8XzfEyGNGOBt7ye20qvV8zbdBXzYWsKbolStws7hSdKNpjj/nqBbM8SmZpQBvFoeGrroP9kpe2etb9b/otO3XVECg0t+qydCvgyj2RS9Mc6S9NHU+l9ZR/kLYIpPHaxPVugYq6Q/GTybvirIXLP4uRk79SyNAHBC2a4E4PWHmwdZavZDE6CQ8HfO8LZ21EDxvrRtFW+OycqF6DFfgwmSVlnEzfcpA9Kx35c07kG/jMQ291wQHlQ9aEsFuW5yx1HuNEknMYaXH/mbKId90azCrFOOoQwAV/0uaAtsLQIBN/0rke0AimGB6Eklx/CN 03CkYajK DP679sobgpugEcQjuf2RT3nego0CaOk0JHoa1EaRARVsLY37nh8b7ikXGlSlTQhnuMf0/ZmsgXixeM7+nUdnbbwzGm6s3frZljKTfosPM9uiPM4HbZmsGNt9JTfphRCozdve+8QbGHO0NQy813zStU/JiHZqPTk+yUDhX/kTrDgzwuESyOXxUSgsOYA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The original problem of the overly long list of waiters on a locked page was solved properly by commit 9a1ea439b16b ("mm: put_and_wait_on_page_locked() while page is migrated"). In the meantime, using bookmarks for the writeback bit can cause livelocks, so we need to stop using them. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index f0a15ce1bd1b..1f9adad2d781 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1135,32 +1135,13 @@ static void folio_wake_bit(struct folio *folio, int bit_nr) wait_queue_head_t *q = folio_waitqueue(folio); struct wait_page_key key; unsigned long flags; - wait_queue_entry_t bookmark; key.folio = folio; key.bit_nr = bit_nr; key.page_match = 0; - bookmark.flags = 0; - bookmark.private = NULL; - bookmark.func = NULL; - INIT_LIST_HEAD(&bookmark.entry); - spin_lock_irqsave(&q->lock, flags); - __wake_up_locked_key_bookmark(q, TASK_NORMAL, &key, &bookmark); - - while (bookmark.flags & WQ_FLAG_BOOKMARK) { - /* - * Take a breather from holding the lock, - * allow pages that finish wake up asynchronously - * to acquire the lock and remove themselves - * from wait queue - */ - spin_unlock_irqrestore(&q->lock, flags); - cpu_relax(); - spin_lock_irqsave(&q->lock, flags); - __wake_up_locked_key_bookmark(q, TASK_NORMAL, &key, &bookmark); - } + __wake_up_locked_key(q, TASK_NORMAL, &key); /* * It's possible to miss clearing waiters here, when we woke our page