From patchwork Thu Jun 20 17:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13705986 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 A6D14C2BB85 for ; Thu, 20 Jun 2024 17:32:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEBA46B0372; Thu, 20 Jun 2024 13:32:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC26F6B0373; Thu, 20 Jun 2024 13:32:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CED956B0374; Thu, 20 Jun 2024 13:32:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AE18A6B0372 for ; Thu, 20 Jun 2024 13:32:33 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 677DDA1EA7 for ; Thu, 20 Jun 2024 17:32:33 +0000 (UTC) X-FDA: 82251961386.19.908D48E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 98FCC80020 for ; Thu, 20 Jun 2024 17:32:31 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PGwwXak3; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718904744; a=rsa-sha256; cv=none; b=k/hGL2Abp+0LgdJgzOJl01MSLJcuGP2vbphdi4LNq7K/t+rTEFDhRMlwaoOISQTUFakXlX pv4D8aj9MisW+JyVRDk15kV1UKf+q8oxxGoP6n5qJYoBuyAnmu4jJ+Fu4/1/EkVMbBy9a9 Givymn13HAciSVEF7hI+MugDuS60A50= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PGwwXak3; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718904744; 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=nD8BuDcHuaWMd5Fn2FK+IU9NPvXO40RV6M0I0jL+Pvo=; b=iv8CCWoJREtWD9NVD55OPE8HZH4H1K4JROYzJxWTtdfLxMT8wZHbjPN51ARGtz9WdKZYlS D60vJEITz9n/HedP9+rhLKUtPZGOSqtbwpzUZ85L5tDql33AZuNKalki9Nez67T20Kd2a+ 78g1YtAZKssv+NiAGVPKQdg/+1nx71A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718904750; 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=nD8BuDcHuaWMd5Fn2FK+IU9NPvXO40RV6M0I0jL+Pvo=; b=PGwwXak3v982pj9rR6pEc+zxo0un9DDEusz+31YFa46u5rQljGrUygT2TWTy/07uUqk3mg hMz2YrTAPf43VRHgUNsttGDosHEt4XjmCRkGDRxmwnvsX6q9ih022/GQ32B8JXF88OTT4o FtvfQWldXdS3oMCGEuDSIHIicfZQhVg= 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-49-iKP-auBnN7ORn_GOf3niIw-1; Thu, 20 Jun 2024 13:32:27 -0400 X-MC-Unique: iKP-auBnN7ORn_GOf3niIw-1 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66832195609F; Thu, 20 Jun 2024 17:32:24 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.156]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8C4DB19560AF; Thu, 20 Jun 2024 17:32:17 +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 04/17] netfs: Adjust labels in /proc/fs/netfs/stats Date: Thu, 20 Jun 2024 18:31:22 +0100 Message-ID: <20240620173137.610345-5-dhowells@redhat.com> In-Reply-To: <20240620173137.610345-1-dhowells@redhat.com> References: <20240620173137.610345-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Queue-Id: 98FCC80020 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: um3yq8aby9nx6awiqt8stes5aryqs8ng X-HE-Tag: 1718904751-759305 X-HE-Meta: U2FsdGVkX1+RnfAnjeEleZpUIBjqDbGS5sFZtW02Q1hDxdw4KZyd1+Ppu73z8wwaaes7G9a0iYFwuPW4CmpGxXjkkXDWbvEtI6DAaarwh4idFZAjFjeMee1ARSEjqWweOL9nZYMDYegs+Y/90jAVaB3+Nwhf+mVgRCZhiW1iXyBdIVEz5VfRrtky/6MBH69yxv0ru/a8Do61twuVuN2y3NGYZknrXthE3FZejS2bwMnoyJNWdsF4oYt/kTFtv6mcPIo3uaKF0/A19/E9aOlvDfTlvRo+hARUC0rD9lDd2uhzq2YH9wqAPFBQwMYXphnweTR6HjDGG9BsJwqzwkkuDx12JjvImc2U52wcKpkv1qGNYLzfZqsf119gRTy4CnR2rY9QrTc20mql8EGXROVFssR2K413F7He0JnJlW2IwRk1K4ipYsU3+LaQHmxapaPDwjYcUunRWvVYJNqUrlqRl/XVOGgtTF9MrgN6YGvfyxrNHtGld8mLkB8k19qdG+lPVf4m9T5nsj9jSvIZOuAorFMfyhpu22D4Y+uAa6LDwT1yO+nUjETA6uzqgjNdj7/iAnEFnUWMiWgvKO0pxre5KaWM+/OJLRV1NPmSyL12wJWTNDXogJxYGHpHhLPYF2uy8p4c4N2Gwbi7sLPaOoK3QyFp9Mv6/wU64DDoTtTiyeh33ecWfmltdfZS0ZsAfct28ZNeKYNn6WJwb56NezrR/yHkXqBBphREsvnxwanvKXsJL18+yoj+5g5qkVFhy1r1b9T57hDSTvDC4+GWb+4cL3A2OaKmqXIxfEoGN+KTCU92aOfgqmOlm3XyMPfnSDtEk6GxzVH7InkrV7RjKWenyf9pPEaP18Wx8hxVXDwksx9XepH993vVUXQQ++wVbrQbK0KEarfxtHyUbcOgcElIJqYV8N2brSN1IaGor433P+YG7sZYEEVGV5aFcHfxyVov+rdhcRdzpkMadxAfgc1 vdjKkSzf tj2b5G82LkYfsotPNTEhLwcBhF8iaL9vCBT0hEvzSzD6vWu9Q08CozJtVetV0IvaHfMz1In/w/Jf0oot7Nju5GpHSADcfHM8F1Ff7dJeg+KANaqAvrzBXoaEXFjWzJGuf2KawI1xsNmyGNkiGtzbWKnt5xfifuwaZUI3avS1QWSgsN7YJvXvD+SU2hPtr2AqEUOda1IjCXgVgFtRJRlXvvu2vBZWS5Ot1y1w0io/1dddaLOzRC/Et2Okzmxnlel09dP25fDFVcUl/+Wr5PHgX+x+6edInnChYzu6hMMSnNK6w5xZXLKTROG0Ut95TDoVuQ6Q8f+65Bgk/TGASawpctWHYSVloTNuATsqrG3uT90ePh90= 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: Adjust the labels in /proc/fs/netfs/stats that refer to netfs-specific counters. These currently all begin with "Netfs", but change them to begin with more specific labels. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/stats.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/netfs/stats.c b/fs/netfs/stats.c index 0892768eea32..95ed2d2623a8 100644 --- a/fs/netfs/stats.c +++ b/fs/netfs/stats.c @@ -42,39 +42,39 @@ atomic_t netfs_n_wh_write_failed; int netfs_stats_show(struct seq_file *m, void *v) { - seq_printf(m, "Netfs : DR=%u RA=%u RF=%u WB=%u WBZ=%u\n", + seq_printf(m, "Reads : DR=%u RA=%u RF=%u WB=%u WBZ=%u\n", atomic_read(&netfs_n_rh_dio_read), atomic_read(&netfs_n_rh_readahead), atomic_read(&netfs_n_rh_read_folio), atomic_read(&netfs_n_rh_write_begin), atomic_read(&netfs_n_rh_write_zskip)); - seq_printf(m, "Netfs : BW=%u WT=%u DW=%u WP=%u\n", + seq_printf(m, "Writes : BW=%u WT=%u DW=%u WP=%u\n", atomic_read(&netfs_n_wh_buffered_write), atomic_read(&netfs_n_wh_writethrough), atomic_read(&netfs_n_wh_dio_write), atomic_read(&netfs_n_wh_writepages)); - seq_printf(m, "Netfs : ZR=%u sh=%u sk=%u\n", + seq_printf(m, "ZeroOps: ZR=%u sh=%u sk=%u\n", atomic_read(&netfs_n_rh_zero), atomic_read(&netfs_n_rh_short_read), atomic_read(&netfs_n_rh_write_zskip)); - seq_printf(m, "Netfs : DL=%u ds=%u df=%u di=%u\n", + seq_printf(m, "DownOps: DL=%u ds=%u df=%u di=%u\n", atomic_read(&netfs_n_rh_download), atomic_read(&netfs_n_rh_download_done), atomic_read(&netfs_n_rh_download_failed), atomic_read(&netfs_n_rh_download_instead)); - seq_printf(m, "Netfs : RD=%u rs=%u rf=%u\n", + seq_printf(m, "CaRdOps: RD=%u rs=%u rf=%u\n", atomic_read(&netfs_n_rh_read), atomic_read(&netfs_n_rh_read_done), atomic_read(&netfs_n_rh_read_failed)); - seq_printf(m, "Netfs : UL=%u us=%u uf=%u\n", + seq_printf(m, "UpldOps: UL=%u us=%u uf=%u\n", atomic_read(&netfs_n_wh_upload), atomic_read(&netfs_n_wh_upload_done), atomic_read(&netfs_n_wh_upload_failed)); - seq_printf(m, "Netfs : WR=%u ws=%u wf=%u\n", + seq_printf(m, "CaWrOps: WR=%u ws=%u wf=%u\n", atomic_read(&netfs_n_wh_write), atomic_read(&netfs_n_wh_write_done), atomic_read(&netfs_n_wh_write_failed)); - seq_printf(m, "Netfs : rr=%u sr=%u wsc=%u\n", + seq_printf(m, "Objs : rr=%u sr=%u wsc=%u\n", atomic_read(&netfs_n_rh_rreq), atomic_read(&netfs_n_rh_sreq), atomic_read(&netfs_n_wh_wstream_conflict));