From patchwork Mon Jul 29 16:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13745287 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 B0E80C3DA4A for ; Mon, 29 Jul 2024 16:20:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B29F6B0099; Mon, 29 Jul 2024 12:20:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43A996B009A; Mon, 29 Jul 2024 12:20:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28D956B009B; Mon, 29 Jul 2024 12:20:50 -0400 (EDT) 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 044106B0099 for ; Mon, 29 Jul 2024 12:20:49 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9EA48C0275 for ; Mon, 29 Jul 2024 16:20:49 +0000 (UTC) X-FDA: 82393303818.05.ECD4ED1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id F097F180013 for ; Mon, 29 Jul 2024 16:20:47 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CZTeiPjt; spf=pass (imf24.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=1722270020; a=rsa-sha256; cv=none; b=hFfrbC8In7U0heC7Est9pl/FXoNZaB6ecJ67Gld1c/4vNKBXiMNzKTzBLlNmn/6ZnqgxuJ x+AT1AL5Jt/aIW7aessXfsrhekm3LwrTSAA30b5jKpcSaruU9u/jyA4Ns5Y7tXMhKu+b5C LDKEosFeNK7O7LF1qrAl3d7GQjwUwjY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CZTeiPjt; spf=pass (imf24.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=1722270020; 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=F/C9WrG6BYlJn1MThU+vLifcr7uTE6h0SmWU43419Ppk5a8nVwFdtIoh+H/B6dP6kZj6ra IJDuUbjVwUaikLwZe4Yn5Fal/yRBR7dQdWvyN6zxorMfBUOXanQfGhSgOwhNbslLvurr1d fCjGZnOa48hjKK/QSBj1Z8UdWw+hsmk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722270047; 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=CZTeiPjtK/hL6OswXvR3bOTH4mxGa5ZTlNKkSP2Vx7iaiusCbOhtHMqY8Nnea2ebvZUZ4X n/MJ108xenP6Eu9GNKlv+/YOClp0/OOvInoku9vg6f8EzzLrh1y3BIynw041KeKFSpFRKp Gq6w0Fb8ZRsHCJy5rl8xgfli3O7G6Fw= 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-139-Wrs6ae_MPFKUPRt8EssjBw-1; Mon, 29 Jul 2024 12:20:41 -0400 X-MC-Unique: Wrs6ae_MPFKUPRt8EssjBw-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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 24DDC1955F08; Mon, 29 Jul 2024 16:20:38 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.216]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CF3B819560AA; Mon, 29 Jul 2024 16:20:31 +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 03/24] netfs: Adjust labels in /proc/fs/netfs/stats Date: Mon, 29 Jul 2024 17:19:32 +0100 Message-ID: <20240729162002.3436763-4-dhowells@redhat.com> In-Reply-To: <20240729162002.3436763-1-dhowells@redhat.com> References: <20240729162002.3436763-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Stat-Signature: efkwd4b9tbydungmbwtagwyb3bkqynsd X-Rspamd-Queue-Id: F097F180013 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1722270047-76481 X-HE-Meta: U2FsdGVkX1+g3lgmvaM/KIMJZhQftB1Aeuu66sitTvU5tN7N6+l52IUElHU8moht2+q31LcjMtG0H73jgefP53HsQxw/AAcZjMMp7o85W5zyrVwGCsIZ8Kdjs14Kv1gSk+ggMfHez1hpoZp0OdVyNxU7ZZQTdU+7tYZkyO7uR2kTJ9cCaN2HaUbCJyW8Z+JbkCTqsCo0ILd4WL4c7diUyb7XiAtpWMAO4Cfc4CGC44u/dJPSmKO72Wnl1NxbtE01ZHmn+iE0YWw/v4bxxvcz4qC2ULZNjvXEP6hH6yWy+kdqe65BkPY2EoUGuSvnqUWYuinqKW/fTCY50XIXPD0YsgzPPAn8nDTJB/n37nUeIQd4/5/g+ndcTcEV89Uqb2dESR5EvzJvI7RAq3F/w/YDJjJymIXd6s3aI8MSqykLiOXxFlij7+luAwpAaYDD+6puPed4AHY1g0gkfdiKDuMhT8eF6a8KgP5iJe52sUXoN33oNgsFtL5Rg+fDQusnYkAfSV1TrALrHsEzvR79IlAKHQM0PARsDOtDqUWetSZKxVActojDdQLiJSKsBaikGziZL/tvRCioccQKkeLWzJik8C35ZjCG7N1tieBh4CQh2zMp5dUL4FhbuftcOLna1xIfzufUuFKBPJUs5F9QD5HXJo26JrtTQDbTASjWPrkpx+w9meqbZLK0uf5TH9f+0pWmyhEBC/S1nsBLflfljJkab5MzHWB8dhXVI71YFOL1o+40lrvGUUsxGj7n1dk9MwY5AVxl8DxkiheW4GwIAqbjEm7YBZHnqMAEaCc1WT7DcfOBNYHmYNS/KBgkVBGCV2wDf8/BTNCoePVCUdE4+ndXE3qDZb8ZqebRtYs6lbQy9eq5oevsI34ZUWaD1FJrntVLYExYLJUGI5eIGq/4XSp1GrI94SQulZGjRql5B5iKXbVab/XpiMARqps5eVH1o7XYB6dEvDMbQBLT6DKlY6f 0ALrwFLh sH53xwttR80hl37/NJTa4L0AFTE00TXtRNqNsRNG2QTmgCK5ntNrim5NAWZ1ZhZRecqYCpzUe/0ZXep9Gxnt8p+ltH9O+4YFjyHdh3OWGr1BnqqYwdz8Xy/t/Dd0fYtR4SVtj8/TuvtbnfVwK1F3kAgQm+v0yE5jSMxL7BF72gkUpkV/5QGYNoFlC6r4SwdIw2xFYmpoXj53L+2c8IzCzIZVfJj2a0r0HCN7SGFsKFBclgpfpP99XqLjRo46Sw94ihtX2Us6lhTAwtQiR7Ix2hkC+TQVMH2OKLyNemButTiTP3pV0Th7KZomeUQ24i6aBWB0bKGzHyNyJknP77OG7MBrTTVo4lfFfliSHOMrY4dMn8Rk= 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));