From patchwork Thu Dec 7 21:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13484026 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 34665C10DCE for ; Thu, 7 Dec 2023 21:22:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEA546B0088; Thu, 7 Dec 2023 16:22:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B9AA26B0089; Thu, 7 Dec 2023 16:22:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3AB26B008A; Thu, 7 Dec 2023 16:22:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 900516B0088 for ; Thu, 7 Dec 2023 16:22:39 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 612B116027A for ; Thu, 7 Dec 2023 21:22:39 +0000 (UTC) X-FDA: 81541296438.16.5069C77 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id A56C91C0023 for ; Thu, 7 Dec 2023 21:22:37 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EuxRnmFh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1701984157; 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=gYUIXZ+PiNdh85g2qszNwYuewLXwpj0jIftWKnkTXRI=; b=MXK+dtPFVVIf3deS6pyZ6bCTblu6E76Fkr6Nlbqjb7VG85QLDt/qly+nb/UP2CAPmlI1vq 7tpQKX63cKdBq4VFIyzE3nypmMZGwyy/udxh01QceO0750t2yErZ4ggwbmXhE82jBbn0+B wfDBMu2Gkb9/U9UWhcUwUDueFGu3qm8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EuxRnmFh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701984157; a=rsa-sha256; cv=none; b=JQXKERnqbZcDUjI9AYl2zw/Uzm5cZz0EbKIrofAZJ+hYQbHrkSpgmRxKW/BHHGPpRC/EY8 5ZC6F/fCMg8es9cncsXupoaavEAdZQwU5HTZsv9pmcqhu/W9C7JmkaXFL5M601ZYTcMw4p aoPqFh9hh4EVp55rerrfddGEsHo35UE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701984156; 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=gYUIXZ+PiNdh85g2qszNwYuewLXwpj0jIftWKnkTXRI=; b=EuxRnmFhjyMV+nF/K2wTnxPZokw468Gp5PCojO9toatyP2fFOmTZ+NLx02CT2rOytRDtSq dMMKj/HbtcPFSsI8S+h4Q3xKt8QAizSoVvYtsKRZCLZKAg05ZzDw4PTzyUidOdjxXGgT0N gqm8sLC5IG51Y09Aw6Yt7HM4RJ6djtc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-9TFoskq0M--Sa6dgwYyDuA-1; Thu, 07 Dec 2023 16:22:33 -0500 X-MC-Unique: 9TFoskq0M--Sa6dgwYyDuA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id CFEB33813BC8; Thu, 7 Dec 2023 21:22:31 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DE911C060AF; Thu, 7 Dec 2023 21:22:29 +0000 (UTC) From: David Howells To: Jeff Layton , Steve French Cc: David Howells , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Eric Van Hensbergen , Ilya Dryomov , Christian Brauner , linux-cachefs@redhat.com, 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-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 06/59] netfs: Add a procfile to list in-progress requests Date: Thu, 7 Dec 2023 21:21:13 +0000 Message-ID: <20231207212206.1379128-7-dhowells@redhat.com> In-Reply-To: <20231207212206.1379128-1-dhowells@redhat.com> References: <20231207212206.1379128-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: A56C91C0023 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: spa4dnmwxo5w4erdyqgzhxmazbnyi9ng X-HE-Tag: 1701984157-189835 X-HE-Meta: U2FsdGVkX18djeiCgufyJSc66oSeR8EUkllBYVtS/qDaNZi1juhYmz/BDGsnaLact67Y04OxxHIVXUJWDAgTMP+lVg7z8K7T33xI6uB7dmvnxaTOC6qdMzLdmSrCooL6FsuB43eZCJB55TmGTjtrasCqgtN9fQSO2qrEAvhpZbJgxJy1gwaBGF7nmvFVDU/v5LbaV1MpbB2NSG2NooV8/ivIc+noFGL+dCzKSdIfzPXiX9owT+A4WT74d+xlEhVOInFU9G6Y4re9zI2eYj+M2cdI6fweu5+IwRQZ2PlX9DjqKZNpUA2+4pE85Pu2vBIGmAykd7V2ln/0yjlii/q6qHO2n1ho9xTtA6VOt9HjthpjzqqJaYav8M/LicZ8wYNt2ks3ijXoS/mK0OuxJHAUi53sRaCZPAIVOutGbtPKNv5Bd2DDOt/1FjSaUJeTjL+bBk9zxGvMCQnjUG3dNWFAoX9Wr0FmbQnT6NbfO07a1IQaPB+ay/v02EPbTpcqd0W7BS+HzDx8CvRSV3NXOSbLYI2wwEJzDk2x+ukmv72zNx70ZPhvZRNlTGOa3p6ZJJyXp8dvrZnE+sqSC0flwZmQlhvNR8c+PLswShPkpv0g8EZxzARyGPz+q1IO9RJgm9tAoxhb02mB9JiKwG8/pVtowxTcnQ8y3P9b3k7X3NeC5kRQi/ArqP77geotg1h8mjd02iVjLUvdll28UN222Yk66VdDUS1fPuBGp9s1q1mw1RpS/l8pQ98n7QbjVwtDUiJ5aK8FY9TYiKc13Gkbrkj6mGDAxn9binMicqT5Nmsu1sHmoeX6r771AcJJIidA5ahI4h1e2JiGn+ROh2flvmeJqzzHkp3/mHYmwI+EKLTmuPlWE/JBNEIENmqWb6ToFcQTzAC8/hvgrCGcochRY5Bev4t1eTDd0Tsw5XxkPy/xdoONCJQPAS2jY/LuWgFKxqxgn6AmaVZLyCbctiB0NU5 DG1VZduE obquPfE7Nvt5D/vKEfidxzMnXiBB8n3pAE1BbZSB9Rs0xti2bSOQQmEHeaDYVbCUOwToWV2QXy21Ac9rBOY+pD4d6t5vef9Ay2/UqkWYdgKjmg4eTkBf9AmBz1zoHT+dkFYGvklo0LzOzamPJ1Tnuboma7Q565gSA3U5sWWNJvzwvk2+Qtl43L2FrAPhIj8R83PHD30my2DTLChLAr2dBRXEIjRW7KDKj6DFXT7do/fOM+2TpIbY8KqTBqzZFpB0eo3h2lmquxeCliXQHBShntS0FCrMN4b6Pt2wV5PESsWCz+g8= 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 a procfile, /proc/fs/netfs/requests, to list in-progress netfslib I/O requests. Signed-off-by: David Howells cc: Jeff Layton cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/netfs/internal.h | 22 ++++++++++++++ fs/netfs/main.c | 69 ++++++++++++++++++++++++++++++++++++++++++- fs/netfs/objects.c | 4 ++- include/linux/netfs.h | 6 +++- 4 files changed, 98 insertions(+), 3 deletions(-) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 3e6e6a2c0375..2bd99989dd7f 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -33,6 +33,28 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync); * main.c */ extern unsigned int netfs_debug; +extern struct list_head netfs_io_requests; +extern spinlock_t netfs_proc_lock; + +#ifdef CONFIG_PROC_FS +static inline void netfs_proc_add_rreq(struct netfs_io_request *rreq) +{ + spin_lock(&netfs_proc_lock); + list_add_tail_rcu(&rreq->proc_link, &netfs_io_requests); + spin_unlock(&netfs_proc_lock); +} +static inline void netfs_proc_del_rreq(struct netfs_io_request *rreq) +{ + if (!list_empty(&rreq->proc_link)) { + spin_lock(&netfs_proc_lock); + list_del_rcu(&rreq->proc_link); + spin_unlock(&netfs_proc_lock); + } +} +#else +static inline void netfs_proc_add_rreq(struct netfs_io_request *rreq) {} +static inline void netfs_proc_del_rreq(struct netfs_io_request *rreq) {} +#endif /* * objects.c diff --git a/fs/netfs/main.c b/fs/netfs/main.c index c9af6e0896d3..97ce1436615b 100644 --- a/fs/netfs/main.c +++ b/fs/netfs/main.c @@ -21,13 +21,80 @@ unsigned netfs_debug; module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO); MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask"); +#ifdef CONFIG_PROC_FS +LIST_HEAD(netfs_io_requests); +DEFINE_SPINLOCK(netfs_proc_lock); + +static const char *netfs_origins[] = { + [NETFS_READAHEAD] = "RA", + [NETFS_READPAGE] = "RP", + [NETFS_READ_FOR_WRITE] = "RW", +}; + +/* + * Generate a list of I/O requests in /proc/fs/netfs/requests + */ +static int netfs_requests_seq_show(struct seq_file *m, void *v) +{ + struct netfs_io_request *rreq; + + if (v == &netfs_io_requests) { + seq_puts(m, + "REQUEST OR REF FL ERR OPS COVERAGE\n" + "======== == === == ==== === =========\n" + ); + return 0; + } + + rreq = list_entry(v, struct netfs_io_request, proc_link); + seq_printf(m, + "%08x %s %3d %2lx %4d %3d @%04llx %zx/%zx", + rreq->debug_id, + netfs_origins[rreq->origin], + refcount_read(&rreq->ref), + rreq->flags, + rreq->error, + atomic_read(&rreq->nr_outstanding), + rreq->start, rreq->submitted, rreq->len); + seq_putc(m, '\n'); + return 0; +} + +static void *netfs_requests_seq_start(struct seq_file *m, loff_t *_pos) + __acquires(rcu) +{ + rcu_read_lock(); + return seq_list_start_head(&netfs_io_requests, *_pos); +} + +static void *netfs_requests_seq_next(struct seq_file *m, void *v, loff_t *_pos) +{ + return seq_list_next(v, &netfs_io_requests, _pos); +} + +static void netfs_requests_seq_stop(struct seq_file *m, void *v) + __releases(rcu) +{ + rcu_read_unlock(); +} + +static const struct seq_operations netfs_requests_seq_ops = { + .start = netfs_requests_seq_start, + .next = netfs_requests_seq_next, + .stop = netfs_requests_seq_stop, + .show = netfs_requests_seq_show, +}; +#endif /* CONFIG_PROC_FS */ + static int __init netfs_init(void) { int ret = -ENOMEM; if (!proc_mkdir("fs/netfs", NULL)) goto error; - + if (!proc_create_seq("fs/netfs/requests", S_IFREG | 0444, NULL, + &netfs_requests_seq_ops)) + goto error_proc; #ifdef CONFIG_FSCACHE_STATS if (!proc_create_single("fs/netfs/stats", S_IFREG | 0444, NULL, netfs_stats_show)) diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c index e17cdf53f6a7..85f428fc52e6 100644 --- a/fs/netfs/objects.c +++ b/fs/netfs/objects.c @@ -45,6 +45,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, } } + netfs_proc_add_rreq(rreq); netfs_stat(&netfs_n_rh_rreq); return rreq; } @@ -76,12 +77,13 @@ static void netfs_free_request(struct work_struct *work) container_of(work, struct netfs_io_request, work); trace_netfs_rreq(rreq, netfs_rreq_trace_free); + netfs_proc_del_rreq(rreq); netfs_clear_subrequests(rreq, false); if (rreq->netfs_ops->free_request) rreq->netfs_ops->free_request(rreq); if (rreq->cache_resources.ops) rreq->cache_resources.ops->end_operation(&rreq->cache_resources); - kfree(rreq); + kfree_rcu(rreq, rcu); netfs_stat_d(&netfs_n_rh_rreq); } diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 32faf6c89702..7244ddebd974 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -175,10 +175,14 @@ enum netfs_io_origin { * operations to a variety of data stores and then stitch the result together. */ struct netfs_io_request { - struct work_struct work; + union { + struct work_struct work; + struct rcu_head rcu; + }; struct inode *inode; /* The file being accessed */ struct address_space *mapping; /* The mapping being accessed */ struct netfs_cache_resources cache_resources; + struct list_head proc_link; /* Link in netfs_iorequests */ struct list_head subrequests; /* Contributory I/O operations */ void *netfs_priv; /* Private data for the netfs */ unsigned int debug_id;