From patchwork Fri Nov 17 21:14:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13459372 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 C4289C5ACB3 for ; Fri, 17 Nov 2023 21:16:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2EA9F8D000C; Fri, 17 Nov 2023 16:16:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29A9B8D0002; Fri, 17 Nov 2023 16:16:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 116668D000C; Fri, 17 Nov 2023 16:16:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F29BA8D0002 for ; Fri, 17 Nov 2023 16:15:59 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CA7DA120DB1 for ; Fri, 17 Nov 2023 21:15:59 +0000 (UTC) X-FDA: 81468703638.26.09D1980 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 16AE4A0028 for ; Fri, 17 Nov 2023 21:15:57 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KEZwM7hI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.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=1700255758; 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=KKwIDnJBdKbpqLQU76AV5hRxBgMKROUmlCRt7k06nqI=; b=l+n6RdOIlB7ifc4BhVSxSSJls1kfvdgzsibviPMIwl8GnzGPJp3It6koYh76/YvfVASC7P sMxFMScpd17pWR2X04g5RBokD0Wpj18Ew5qZhCAl2pCup087vDLE2OoZybmvIADpPuBm2j JcjIlCML1eJIn/G+QYAR1DWhrPkgdAY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KEZwM7hI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.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=1700255758; a=rsa-sha256; cv=none; b=50hfa2apMMR1pIdWG18eofmIvukHALWNRDfXZm7Qb45mlmQcXcUdTu8v+wHjOIoTZST/Dl mo/f0qcIcsLQ2s/DKoGnt8WPiJk1TOEXmPY8isdjG7W1Hk3aegdNMbrVVGbyzeVHNuzFJF 8TVefIMkSP6hoUCt5Nzjsi2cAerNECI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700255757; 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=KKwIDnJBdKbpqLQU76AV5hRxBgMKROUmlCRt7k06nqI=; b=KEZwM7hIpWM4wxLp1L2HkHrOcn3ovc3eKqRLlAJYzvYTtJKNkpPXupJKxsCZ07xYs/ACWn 6xkcThbm/XPscxuf4LpxtvhXfAmJCvpUPpydOWMQ2fWsZb+Hchp6JAJT47KJUNlhEV0YER cyKZ9EWI2+Dbi4rNaNvnXwgHzqaeEzQ= 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-6-qBo_BpJuO5OdUkyDbOozmA-1; Fri, 17 Nov 2023 16:15:53 -0500 X-MC-Unique: qBo_BpJuO5OdUkyDbOozmA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 B279F1C060C6; Fri, 17 Nov 2023 21:15:52 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EE6E492BE0; Fri, 17 Nov 2023 21:15:50 +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 , 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 v2 01/51] netfs: Add a procfile to list in-progress requests Date: Fri, 17 Nov 2023 21:14:53 +0000 Message-ID: <20231117211544.1740466-2-dhowells@redhat.com> In-Reply-To: <20231117211544.1740466-1-dhowells@redhat.com> References: <20231117211544.1740466-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Rspam-User: X-Stat-Signature: niknb9fx6iso7gpwexezoynffoquuu7g X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 16AE4A0028 X-HE-Tag: 1700255757-273903 X-HE-Meta: U2FsdGVkX1/vxgfuhjBcOohEIiwTwHvP2arCWskmlYbApYaj1Tc0qpYysf8MicCF0cqZV3nOL/cVPzBnnPYMlbHmIBMV3I3Ru/FOaqVkVal3phgX2OYAc144P6L56W0orHK3dqjuVXP+spOlACJ9o9wWzgt5m0LGgDYyf41HbqjbR2pvKo4UQaXGIHzVGVLuuZlNzAx2lhNuehmFHDHtIWkvT0gIx+96Mp8pTSa2NQ2ZD2apSR4frXHYWGYgcS37RS9ZYebaJOljiZaIqaJS32RtC+PDA2V+QqMsMaA58yAYJHPTmwkigvfjNo9v8mGaMHViyuXWpO6U6DgLPeRUkechtZru5+d2ntOCJnB0pxTtegVlkic68K8Wnh7R2SGkhWfrVeH8gfCsFb0W0Cqzzg44Tr0dVm2j6Ua3TT+jvIXKMDSuL3+zVg+x3+igi4VIZiQ1iKmskK/ulkaUaCvQKtbqJ46rtu543oepcYGnlJVdHH1exRDGfeNQQwGj8yuJchg9tMAw/H4GHvlna3qE/ldRr6yTENoA08GPxiDjCRHhCUH7AKwdmnd+gIuj94T73Vlkvt6UiPl2oZaxaXOIyhFrY+wMi941ymFmIK1943yIVAxWii36Vf+DnFUwBmWhHQde4vZMF37XaGH3YZer6238KJkfcDJc6/x5Bge4GKFhPHq95gBO9nP1Tx3edtGb8ndfA0fHcrjkIc15mNP3m/4BLjTMVHJC8uYKbS+m/zCXlqMeIoxT3ErimIt9fTJ5b/bUb3dFf3x8fbVN110Zir5K6jYCOY9u5tIC6paad8RqblW3QighhcJsV+deibi7vyW3qk85jLLJ5GvPGRxN9sEpWD7kaGfmz6dXpO+JjwHRY4lDnLF3lFI7Fsf1SbWs7XXwKeKqnaf1oTUZTl8I/51t8rmaEOasQhZgQ5RjlbuTPh8KOiYJxnqY2xpAE0Xj1Udrq0VJmpnHbLzoWG4 e38S6EYs W+MWnBaHuogyYIg+VB//aiLNRton1jBgro7ezZ6tdEr+WqhO1o44yCk/JGlCRpCBSqQktCpWRul8j982LLzGcNnV1nTR7ULI8MOoIQXs8fdjIg9C1m1ejhudyVg53IgddR0M4yCSHZC2paY6PMuH3aoLqCxuYjZ/yNCyywp+srsBBkJIB2Y5OjJFwU/T2sKNwymSl+WLifk7Tb6DncDwCXBt6NCIiBF2viCO8/bV1yMSj1P3sJt0OOIEBxndLgNtx6VoiVV/a8y2Z7Wo56NXTPV/GVU6L0YryMz6tOfV1eu7R6Bs= 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 | 91 +++++++++++++++++++++++++++++++++++++++++++ fs/netfs/objects.c | 4 +- include/linux/netfs.h | 6 ++- 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 43fac1b14e40..1f067aa96c50 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -29,6 +29,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 068568702957..21f814eee6af 100644 --- a/fs/netfs/main.c +++ b/fs/netfs/main.c @@ -7,6 +7,8 @@ #include #include +#include +#include #include "internal.h" #define CREATE_TRACE_POINTS #include @@ -18,3 +20,92 @@ MODULE_LICENSE("GPL"); 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) +{ + 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; + + return 0; + +error_proc: + remove_proc_entry("fs/netfs", NULL); +error: + return -ENOMEM; +} +fs_initcall(netfs_init); + +static void __exit netfs_exit(void) +{ + remove_proc_entry("fs/netfs", NULL); +} +module_exit(netfs_exit); 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 b11a84f6c32b..b447cb67f599 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;