From patchwork Wed Aug 14 20:38:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13763950 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 96A9DC3DA4A for ; Wed, 14 Aug 2024 20:39:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 291D06B008A; Wed, 14 Aug 2024 16:39:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 241316B008C; Wed, 14 Aug 2024 16:39:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0947C6B0093; Wed, 14 Aug 2024 16:39:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DFD566B008C for ; Wed, 14 Aug 2024 16:39:34 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B1C2161168 for ; Wed, 14 Aug 2024 20:39:34 +0000 (UTC) X-FDA: 82452016668.28.F3C7814 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id DD501140012 for ; Wed, 14 Aug 2024 20:39:32 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0Dp82ic; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.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=1723667892; 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=GVv/lllS6GxTNuEmHCd7TYTxjwGsfJ1FUk/viF2wLkkXpD1IezFifV7e/ejgnhGIJsEGmG rkNr1nX4+Bjutvc23QP/rWEvkL3ArW/iFU3qaaz/R88W32m+IrBtVn+DoADSy9BdthMMfI 2jdxs0TCHX7xF4QoFD9MKSg3jDnTkrs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723667892; a=rsa-sha256; cv=none; b=FUOUQ/kmApW87HrUJjVuy9h5ogD/oEWh7e5k1SW87/fYv+AkxobqK9h7gTDO0SP7YFqAw3 FwUJf1g7Cl7JqMfVHTs2EjNiBSJz7IeV2jWdXq9dZSCBkEPytI3UcpBomnOJCWrYOon6Vo D5coqNhNqVRt7pgbmBNSK26Ly8pR3bU= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0Dp82ic; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723667972; 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=S0Dp82ic6SEMm5HK+KXfJg7DPG5HqKMyl/c80i8HW6lm4rufruLicAYLFfsjrF2qgGdmei n3mI85VR9VaIBiIGPeNywh9vvr4QEXtkLJ1CWl5QOUx4BqpPDXLRejWqaSkQG2oYX3O85B 6yWwZRYBpoP3njBdjyaXWhLn4Rk0yfk= Received: from mx-prod-mc-05.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-437-Vr_VRDFSNTuDCt44PrJuxw-1; Wed, 14 Aug 2024 16:39:30 -0400 X-MC-Unique: Vr_VRDFSNTuDCt44PrJuxw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB18B1955F6A; Wed, 14 Aug 2024 20:39:26 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.30]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CCA5919560A3; Wed, 14 Aug 2024 20:39:20 +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 v2 03/25] netfs: Adjust labels in /proc/fs/netfs/stats Date: Wed, 14 Aug 2024 21:38:23 +0100 Message-ID: <20240814203850.2240469-4-dhowells@redhat.com> In-Reply-To: <20240814203850.2240469-1-dhowells@redhat.com> References: <20240814203850.2240469-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DD501140012 X-Stat-Signature: hk1di3kdewuuo39i89beuzmh8we3ozup X-Rspam-User: X-HE-Tag: 1723667972-712973 X-HE-Meta: U2FsdGVkX1/VrcBKSUBoNZZhCla+XBNFwFX2LIeDRd0YOMZnu0D6x23XdLkI9i34aWbjJ1nkz9H8wyxttQNQs6KDG+UzGVhQNn1ZKJpJUMAcYJCet9KeaivFnTzSnOStz/v9lxRpMtuSqztz7LDP+nz4VPOH5s2d22PUxPneazc+O3M7GDipxokeo8lIL8c9kRyRpafzUjnQhTsIpmjkzbD4ypI4BPK4sB7KmeHvRdXXXZuc7iXi78VJ/YMFA9HxAVCoh/2mZwhOR/mPDlIdaeq0ueEs0xbuFV6+IrmCz33UxyvqSUmwztQzhWpxgbQ6DF5SDH2EJUnRs1aJcIkXMnlut5/BrH/z+yiCffeSfhQf37uySQ1mZJcQeXMhDpFqOx+vOpEjazkVfqU21BHxoHfYb3LDf7xtK9Uchl743AjRlR1ur7rtu5jTE+pMccjx8X41IDSX9lKkHmW+hB9qDdMkL4qvzYWpfCFVBOHFFO9FsJq2XgvzuXGrP1op5Q76BBYK+K29iZkbAKV3N75XyYkhX+S+LeY+TgkLD74s1sS79RCOxE26o0qM+7QKA/IEBSNjCRd1Ypb9RsyZc35GShON/h0KomIFViMBFMVxb5NRxCoaPrADGBM6nonmZnEC5w4gotgfq6e9uSnwBpsY9nrehwWCNc5qL3B9QzYeSQt0SRtao8vzHerJkMMYQtThICTX9+XPe4hdO+Eqb0POC1XEw6KXXu/RAeQc1tRb5qp7ZjQJY7JZXsufS+TH+o5Tq1It7bZyDJY7maCLrRQYe82mKGMA1oP0Jb6XgxX0LFsgo39aMRLRgd72gQnXyjlMU+gXrjhzOgtSjhA9Mx6JOSQjmyzpF3MtRt/etvGjTtd0KRBSvcGh/UzYJY2jd9TFEyDf73lhF5T0VafAfveIj4BR2Xw5ujVgGsQ6p1ATzSWKuh9F7Ys/NaJNcXx35Lfy1GI0XIYrVokYGKm6njf HcoVGpd5 DlpRtcxS8053ul/cOUWwrzHqHzi//R1cVkWzkMrKVKNWinEOOzpM/p0dKo5AZSSGlW5r0hCF+oWyEs8ncxGsSTIUphCbMYAnHHwp26j4hlNmGoInQx0mhV6N9ZwAARJE7CZAX4jDVYo4TJ/zBLprBHZosAz0fjOWUXoI7fPwOlzAgG0tlpo8a8TAi4ld5P2E2Ynqrc4uYyXTGVXj3CGdNvBKMAPXIDblFx3D52jIZQaihKwphVWwnzJUPWGdKU4IFtcyL+upBV0BD0FOXSsiVIyZP5DAn97CK1FBgpGEhaGI7PS9adg95CyT8CcUbWifcWHRTr6UtgnTztVe6KrhlRQGcenDbKaYIcTFZX1OhAXtrAsY= 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));