From patchwork Mon Dec 16 20:41:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13910508 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 3BFCBE77183 for ; Mon, 16 Dec 2024 20:44:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4BE96B00E5; Mon, 16 Dec 2024 15:44:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BADA56B00E6; Mon, 16 Dec 2024 15:44:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DAB96B00E7; Mon, 16 Dec 2024 15:44:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 78D1B6B00E5 for ; Mon, 16 Dec 2024 15:44:54 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3989216011F for ; Mon, 16 Dec 2024 20:44:54 +0000 (UTC) X-FDA: 82902000636.05.2DA9D02 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id F0518A000B for ; Mon, 16 Dec 2024 20:44:10 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UvDzA9nt; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734381872; 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=OD7OFhROQKelkcByNJaNSCbQEDK9VQdKlLwzfBYpReY=; b=3hRIEqHKqEe6eOIhG9O75k2r2s2UdAShXuvfAas0m2ykOR5sxX/xCuodrT7cWVkF2LuN8u 0mnvgeqP41jfSdRS08yQ9pTbgh45M9ILwps5oXh4LS/r25gwSxpgHSKtmr4uSssbkyG7SA LSB+F1Y4q9/Z6vn9weWccreF0VN1ces= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734381872; a=rsa-sha256; cv=none; b=j+l13KybaXUhjpFvGHbIwDRJuDlnmhm6PyBSwy081PXUGfk3sKWobvorCOoREQBeqHs8+X gXv+Ul5uSxCx7SeT4Bsus/Yq1+N4YP7dJOA2QPSFJFc37D5zL/Z0NBv8tg/LJpQK+P36r+ wu+4/6fSRAnjx91bgpge6ghIPWj/amc= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UvDzA9nt; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734381891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OD7OFhROQKelkcByNJaNSCbQEDK9VQdKlLwzfBYpReY=; b=UvDzA9ntHMCtwMYmvdTk/0mZs1iOaLNfMAy7f+iaNOYz3l8b9e35SrmEZf/Jg57wDvRq2m uF23y+CB5M8OeGJBX7HC6mPYYvCoSPU8ES2Dd9Xs67A63BKbjb8yY6gmz61w/onUCoEp7s /6Kpu41ChoO5p9tFPE8O8XRU774Jtc0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-f8sLclnoMPWiiWVwG3_7qA-1; Mon, 16 Dec 2024 15:44:48 -0500 X-MC-Unique: f8sLclnoMPWiiWVwG3_7qA-1 X-Mimecast-MFC-AGG-ID: f8sLclnoMPWiiWVwG3_7qA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C0E1719560A1; Mon, 16 Dec 2024 20:44:45 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.48]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3908430044C1; Mon, 16 Dec 2024 20:44:40 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 26/32] Display waited-on page index after 1min of waiting Date: Mon, 16 Dec 2024 20:41:16 +0000 Message-ID: <20241216204124.3752367-27-dhowells@redhat.com> In-Reply-To: <20241216204124.3752367-1-dhowells@redhat.com> References: <20241216204124.3752367-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: F0518A000B X-Stat-Signature: 1oi47x1m148tg3kfr3rn4qr4fcaehefp X-Rspam-User: X-HE-Tag: 1734381850-544400 X-HE-Meta: U2FsdGVkX19F8PJhWR36mM2Dxa/ssNhg1VQZSQ4hz471a324jjODXvikW8X0xAxDkodsr+F6kILXq4HZmGxNYGtA4ECllnjN0xLWw1OBm+hIPeU7OjtdOGJJ7FLKyMPPAGr0xKyrOzJCB1cJDIwZ/yhxBfLSK+txWjGFCUdVuA7FH0k0tAo50wZv6sOa/gd5BnES8Do4us+XGORgY5IMxuR7Df4hZONMdcE4IJkGGXjKEUiBZ8GTfMnhkXF2ZGRQnc8q7Cv7x/GkS7P+EKFj7QRYCBJwFNl3h+2QYnPSpqI61xB98TcQTep2D+QE/MOb3hRCceM1TMb8FBBbGEf37xs1Hkq9Zr/iEvdzD1Po1uUAaeuj/gqIpTyzCV5v2TjNnHicU4or487GhsSpWehXj8bXsnEjMrDuiG3LakaGqQMB1wPcLbAdNRs6E2XbfJAn3Qe+7n5XByulszlw97DxQRNk9+9HLq1MP/gDkx3I6ppb14LOvQ8unNyx+5fxM2Bv4A+hPWwRJ2EvO4MINE8kdjO8/drTe+u5SCU2RVmV9eRHxug/3xKoPpH8M4xM9U2zc2ICkTvDQOsHpFeP2ai+r4v5hFlnEThhg930Z2GiXKwMkuT98y4wQkzb8u989RsWzFYtIycBLk4iBQAl14ChI0KcCAtxj6me2qHb+d6MUaWQw//dZ02a03SwNMh2Ll5cEz8hIshrgcoGV4LmVKFXdKMg0RYwW2r9yjjlxm78slGgdCkqRpG3VBSbz12Z30IlJRK5+d/2yHT0xyXwPBfW4AeaYorF3zzNPsaT8DNd1Bw47BE+IupQMQF5zpV3RGHQX4c7eurbIzRvVy1zVyL5DdK0O+Ae8/mxAkREUw9+XQWgZyg5LZ0gfgWEQZ7fHWBnAAVkcSqX6WI0R/+7ddx7lVw6x4iSXydzzkbgeC+msV668ircuXZNjkazNO+xBAzEgxgNvXccpoXZz8BJ5Am R7+0U1rt 9SoeNL0tO1WyFWd0ET8SXGrWCoe2A1UYuTgwL5zZ5Z7/BenzEtxAvbdHs2hls5aB/I8ztRdOdfJgGmnjpJ9YR4xKAG2wtV9QHuXaFBfTyqPPGpZfpLWSyJX2Y99G6zUsVTn7yz7spn7ghQ9ty+BRZ3xaqWRxT+hF1HH8DvKxjYqk+CCbNDYzxzlu2ZJpDRGV3NvYUeDS+4torHdwYfL6jgOv6LLtb8Z5StpgxvM04iqIBqPTsRr2xOeTYsb98LnDlFvqEqyx375rsSN8Gy6SCYWtuP46bXpIFvB1VJdmCVCotxmc= 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: List-Subscribe: List-Unsubscribe: --- mm/filemap.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index f61cf51c2238..1b6ab9915bc8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1236,6 +1236,8 @@ static inline int folio_wait_bit_common(struct folio *folio, int bit_nr, bool thrashing = false; unsigned long pflags; bool in_thrashing; + pgoff_t index = folio->index; + long timeout = 60 * HZ; if (bit_nr == PG_locked && !folio_test_uptodate(folio) && folio_test_workingset(folio)) { @@ -1305,7 +1307,14 @@ static inline int folio_wait_bit_common(struct folio *folio, int bit_nr, if (signal_pending_state(state, current)) break; - io_schedule(); + if (timeout > 0) { + timeout = io_schedule_timeout(timeout); + if (timeout <= 0) + pr_warn("folio wait took too long (ix=%lx)\n", + index); + } else { + io_schedule(); + } continue; }