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: 13910538 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B09051DBB32 for ; Mon, 16 Dec 2024 20:44:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734381895; cv=none; b=OrUXruKLRgCNu5/m7PQWwDtN1IMvWeb0QYGjXKieUwqIn/dtikk2jFk4+wW5+8WmgfiamDUSPmtEHUOGi/1o/LCoQ6XCQ/5CscGdQyGDHS9YD5eCvIQ2K2/YOvISChv6AR6dSrGdfND79F1bJtI7CMejeDGHz+FkJK1wJzp0tXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734381895; c=relaxed/simple; bh=G9M2CdZd1/Iidbx/IRLia6b1QNESxaYg31j0RUGTiJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HZHeeWGB7HwAaz2aAjYaBXou8ndjkx7zxktDhlN+/XKXwst1dgMWNBJ2eM7tCQfVZGNsvsSaV5hBUtUy/O5QD/xP7sAr1g75iRdXeB8RWtfbK19YjfojvcuUc1RVx6OTu/sG/pnW6NoO9Lj0wHV1RWfrXzAi2X6OlWE0n7lPfiM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FMGdOIND; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FMGdOIND" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734381892; 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=FMGdOINDDIP0DE83sQeq1lI7xUiIapyjBD45T8rBdxyYQrrpTxELKQkdZhex77EOTQ5yjQ bqsr5R6pt2BrKUpXonT7twQm8NANxu6QrVsgm8r6PY2pGL4UTUv/hXnrhlXkbmz72JMROF buBEDNvALozHLxyMPA/6fSdmyP5Ce4A= 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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 --- 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; }