From patchwork Wed Feb 12 22:24:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13972517 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 AA91FC021A5 for ; Wed, 12 Feb 2025 22:24:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2262E6B0089; Wed, 12 Feb 2025 17:24:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D6A96B008A; Wed, 12 Feb 2025 17:24:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 077FD6B008C; Wed, 12 Feb 2025 17:24:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DABA76B0089 for ; Wed, 12 Feb 2025 17:24:37 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 501D7121040 for ; Wed, 12 Feb 2025 22:24:37 +0000 (UTC) X-FDA: 83112722994.04.FDFDD96 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 8A9CE12000A for ; Wed, 12 Feb 2025 22:24:35 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KUNtI6Nn; spf=pass (imf29.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1739399075; 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=jAr8WdVllhjcbHJSWKQIBe9IIvyNnreCCr2EOUmv8Zg=; b=Tr0xgB+Oh/jlQSO/fk5xl9P3Wcsc/HMCNZlPzNEdX+6F0WW2IX5+s3stL9yVICzlBR3i5L HDqPd+6HBLc8JwQYyXN/2gHEMipkQKoBHjuGc6lYKf2Dc1WZCYm3KCGybrGOIrxckevMqM geI0RDe1B5ykvcF+UINlltt7/8r0cxQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KUNtI6Nn; spf=pass (imf29.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739399075; a=rsa-sha256; cv=none; b=wK34y/AHjSuxatZp+sKuy41EuS208WMs4mdLz9jqN1390o2Py+EWUrEKmTNKxTQzBl8uwG UsfGtNuYX0KNrXxl0LkQGEZVS+GxHTf/a2uW2c0tclLgPVI2BVYK91mXndbgVpG3M3QUSA x+h+mxugr771RPxymXtApLFOsWHGUzo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739399075; 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=jAr8WdVllhjcbHJSWKQIBe9IIvyNnreCCr2EOUmv8Zg=; b=KUNtI6NnVjUVcakP6ibjClPUVRE6ZWvtTXne8VLUkvsk7BdgdMKms9rpfoLItMDmvNsq7L n2ml/HshSDZiDN5hUqY7sF5iesVfJoInFvN5U+Iq2ij+XNsklt5xrscJlBA4tEgl0WZuiT Ek4fMsr6H0iS6Z9wcFYBAjdlX8n7tds= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-195-O3oVQyhNNce_0bSu5p_Hlg-1; Wed, 12 Feb 2025 17:24:31 -0500 X-MC-Unique: O3oVQyhNNce_0bSu5p_Hlg-1 X-Mimecast-MFC-AGG-ID: O3oVQyhNNce_0bSu5p_Hlg_1739399069 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 630A4180036F; Wed, 12 Feb 2025 22:24:28 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.92]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2772719560A3; Wed, 12 Feb 2025 22:24:22 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Ihor Solodrai , Max Kellermann , Steve French , Marc Dionne , Jeff Layton , Paulo Alcantara , Tom Talpey , Eric Van Hensbergen , Dominique Martinet , 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, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] netfs: Add retry stat counters Date: Wed, 12 Feb 2025 22:24:00 +0000 Message-ID: <20250212222402.3618494-3-dhowells@redhat.com> In-Reply-To: <20250212222402.3618494-1-dhowells@redhat.com> References: <20250212222402.3618494-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8A9CE12000A X-Stat-Signature: tanbmxkehcfoapjtyh9f1yoffmfyx8po X-Rspam-User: X-HE-Tag: 1739399075-720407 X-HE-Meta: U2FsdGVkX18HagJwGzEjISqHiy2gPZXwARYAUOYI0ZTh1X5PBx7Fj3WuBqLNLvyH6DeBBN4h6mQ0LactmLrZyvTC7z2fLcEpXHE69H01Khksa67AefyBN2oYCKk8eNI7TRgwxiBC+LgOzs2QRHcaLc2aFyc9HhfaeUnkufTpr+aeHRaQrQ5m7SnKK2SK1QXDtKEvsjS54HJanf+0xtQ8Fcg36h6mt+Z5VMfQ2lkBXZhGYS1nZhRppEQFkvvYvpyVFh2ftMXYNwfgO/J0LTjCYC5BTfWINJ6IrPpXllyKTv9+fi5jXj1SBM86a7xSoaMkqBvskKKmi6hxTTGf0b6xO7mLkUI3g2ws3d/OEjJ+oB1UJ6UQK6R3AuHOCeMgWdJvymdlD1BKxPnXigdAjOYr10jQ7chOwRRNxHSmOUl37gpc2YNrhXoq2SP9SZwrgL9F4u8T/TtrG8hNrDgQYXR0rEO70D5qas3/ClTcsTafM3D2tjQpnuulEN3sFwaht4q70LzOCGHwcKnwWTScxkRDEjCsVSEz3GKwlBqWVp/ZbQnsLYhBUTlaBCCdiP88OK9O4MjhonmAdFlU5x09/RIxCGGxiGDYlihSJ5HlB837LFc2eSx64TGP6R4L2zAZVHHWJgz2kKsQJpY1g772o+FyuJ16t+DsGxHfTuyEcOMsCWNlhaVdvXiCxIGgPxShTPi4O7L1gEUxnpiwvJ4uZXqb6zoSg8BDilr1sLDSWY3QiBA41039meUoDQzujlukuduRBl9AZqFxo1JvEOAgEXxVN38fvICYidTLnn2lOCF0aEDZaBgp4bzzfAHLySK/HRP+21X/xr7BurD6Xe8oykpaQGpweAqvwjNK6Xm7jH8QfSU6ftEQ4Z8xGSFiruLLumM13eXE6GE553sOF/c8Cg/fAZMJmP0t67gnD9q1CZ8BgkJIiCfVbkWvKYViRsO2M0aFjV5QvVpUxMU/U+CP+M2 0ot5clDz 8+46ACL1rWF7/Eq9uA2x8XKg8kd4QOgnuk/9YX7Kyyi14nj+EtjtbcSIAnqWiJkDOQzp2LjFFDnHr4qMYhY2Kg80xXcbKb8zFjtIBfcT5vt8FX5uyC7w398TshgQ+UA6WEMNS57JAIQ2nrQ5RbxX4XQPCOvmbqorrAJTs0uM0T9FZawDjOosWk3UPsxds9ZkeFLFzk/4KaR1UykRMSWMgoAfdO/2iEgcjIMmVQtvxHH3FLr8o8+tV11OCUV12foJ3/W4GKvbbfKzR89HzPUgsl9Vkk5zLRPQ3WUy0mC2BelfS3H4VQRFFqnemsEn6bMAAJgKY7J5FSowMpmoaXKUBg8aXrL5JBJgPbEtt 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: Add stat counters to count the number of request and subrequest retries and display them in /proc/fs/netfs/stats. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/internal.h | 4 ++++ fs/netfs/read_retry.c | 3 +++ fs/netfs/stats.c | 9 +++++++++ fs/netfs/write_issue.c | 1 + fs/netfs/write_retry.c | 2 ++ 5 files changed, 19 insertions(+) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index eb76f98c894b..1c4f953c3d68 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -135,6 +135,8 @@ extern atomic_t netfs_n_rh_write_begin; extern atomic_t netfs_n_rh_write_done; extern atomic_t netfs_n_rh_write_failed; extern atomic_t netfs_n_rh_write_zskip; +extern atomic_t netfs_n_rh_retry_read_req; +extern atomic_t netfs_n_rh_retry_read_subreq; extern atomic_t netfs_n_wh_buffered_write; extern atomic_t netfs_n_wh_writethrough; extern atomic_t netfs_n_wh_dio_write; @@ -147,6 +149,8 @@ extern atomic_t netfs_n_wh_upload_failed; extern atomic_t netfs_n_wh_write; extern atomic_t netfs_n_wh_write_done; extern atomic_t netfs_n_wh_write_failed; +extern atomic_t netfs_n_wh_retry_write_req; +extern atomic_t netfs_n_wh_retry_write_subreq; extern atomic_t netfs_n_wb_lock_skip; extern atomic_t netfs_n_wb_lock_wait; extern atomic_t netfs_n_folioq; diff --git a/fs/netfs/read_retry.c b/fs/netfs/read_retry.c index 8316c4533a51..0f294b26e08c 100644 --- a/fs/netfs/read_retry.c +++ b/fs/netfs/read_retry.c @@ -14,6 +14,7 @@ static void netfs_reissue_read(struct netfs_io_request *rreq, { __clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags); __set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags); + netfs_stat(&netfs_n_rh_retry_read_subreq); subreq->rreq->netfs_ops->issue_read(subreq); } @@ -260,6 +261,8 @@ void netfs_retry_reads(struct netfs_io_request *rreq) struct netfs_io_stream *stream = &rreq->io_streams[0]; DEFINE_WAIT(myself); + netfs_stat(&netfs_n_rh_retry_read_req); + set_bit(NETFS_RREQ_RETRYING, &rreq->flags); /* Wait for all outstanding I/O to quiesce before performing retries as diff --git a/fs/netfs/stats.c b/fs/netfs/stats.c index f1af344266cc..ab6b916addc4 100644 --- a/fs/netfs/stats.c +++ b/fs/netfs/stats.c @@ -29,6 +29,8 @@ atomic_t netfs_n_rh_write_begin; atomic_t netfs_n_rh_write_done; atomic_t netfs_n_rh_write_failed; atomic_t netfs_n_rh_write_zskip; +atomic_t netfs_n_rh_retry_read_req; +atomic_t netfs_n_rh_retry_read_subreq; atomic_t netfs_n_wh_buffered_write; atomic_t netfs_n_wh_writethrough; atomic_t netfs_n_wh_dio_write; @@ -41,6 +43,8 @@ atomic_t netfs_n_wh_upload_failed; atomic_t netfs_n_wh_write; atomic_t netfs_n_wh_write_done; atomic_t netfs_n_wh_write_failed; +atomic_t netfs_n_wh_retry_write_req; +atomic_t netfs_n_wh_retry_write_subreq; atomic_t netfs_n_wb_lock_skip; atomic_t netfs_n_wb_lock_wait; atomic_t netfs_n_folioq; @@ -81,6 +85,11 @@ int netfs_stats_show(struct seq_file *m, void *v) atomic_read(&netfs_n_wh_write), atomic_read(&netfs_n_wh_write_done), atomic_read(&netfs_n_wh_write_failed)); + seq_printf(m, "Retries: rq=%u rs=%u wq=%u ws=%u\n", + atomic_read(&netfs_n_rh_retry_read_req), + atomic_read(&netfs_n_rh_retry_read_subreq), + atomic_read(&netfs_n_wh_retry_write_req), + atomic_read(&netfs_n_wh_retry_write_subreq)); seq_printf(m, "Objs : rr=%u sr=%u foq=%u wsc=%u\n", atomic_read(&netfs_n_rh_rreq), atomic_read(&netfs_n_rh_sreq), diff --git a/fs/netfs/write_issue.c b/fs/netfs/write_issue.c index 69727411683e..77279fc5b5a7 100644 --- a/fs/netfs/write_issue.c +++ b/fs/netfs/write_issue.c @@ -253,6 +253,7 @@ void netfs_reissue_write(struct netfs_io_stream *stream, subreq->retry_count++; __clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags); __set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags); + netfs_stat(&netfs_n_wh_retry_write_subreq); netfs_do_issue_write(stream, subreq); } diff --git a/fs/netfs/write_retry.c b/fs/netfs/write_retry.c index c841a851dd73..545d33079a77 100644 --- a/fs/netfs/write_retry.c +++ b/fs/netfs/write_retry.c @@ -203,6 +203,8 @@ void netfs_retry_writes(struct netfs_io_request *wreq) struct netfs_io_stream *stream; int s; + netfs_stat(&netfs_n_wh_retry_write_req); + /* Wait for all outstanding I/O to quiesce before performing retries as * we may need to renegotiate the I/O sizes. */