From: Jeff Layton <jlayton@redhat.com>
To: David Howells <dhowells@redhat.com>, linux-cachefs@redhat.com
Cc: Anna Schumaker <anna.schumaker@netapp.com>,
Steve French <sfrench@samba.org>,
Dominique Martinet <asmadeus@codewreck.org>,
David Wysochanski <dwysocha@redhat.com>,
Ilya Dryomov <idryomov@gmail.com>,
Jeffle Xu <jefflexu@linux.alibaba.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-afs@lists.infradead.org, linux-nfs@vger.kernel.org,
linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org,
v9fs-developer@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 05/19] netfs: Split netfs_io_* object handling out
Date: Wed, 09 Mar 2022 10:44:22 -0500 [thread overview]
Message-ID: <b28618df1b6c31f42b75c8f759011444018bbece.camel@redhat.com> (raw)
In-Reply-To: <164678197044.1200972.11511937252083343775.stgit@warthog.procyon.org.uk>
On Tue, 2022-03-08 at 23:26 +0000, David Howells wrote:
> Split netfs_io_* object handling out into a file that's going to contain
> object allocation, get and put routines.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: linux-cachefs@redhat.com
>
> Link: https://lore.kernel.org/r/164622995118.3564931.6089530629052064470.stgit@warthog.procyon.org.uk/ # v1
> ---
>
> fs/netfs/Makefile | 6 ++
> fs/netfs/internal.h | 18 +++++++
> fs/netfs/objects.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
> fs/netfs/read_helper.c | 118 ----------------------------------------------
> 4 files changed, 147 insertions(+), 118 deletions(-)
> create mode 100644 fs/netfs/objects.c
>
> diff --git a/fs/netfs/Makefile b/fs/netfs/Makefile
> index c15bfc966d96..939fd00a1fc9 100644
> --- a/fs/netfs/Makefile
> +++ b/fs/netfs/Makefile
> @@ -1,5 +1,9 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -netfs-y := read_helper.o stats.o
> +netfs-y := \
> + objects.o \
> + read_helper.o
> +
> +netfs-$(CONFIG_NETFS_STATS) += stats.o
>
> obj-$(CONFIG_NETFS_SUPPORT) := netfs.o
> diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h
> index b7f2c4459f33..cf7a3ddb16a4 100644
> --- a/fs/netfs/internal.h
> +++ b/fs/netfs/internal.h
> @@ -5,17 +5,35 @@
> * Written by David Howells (dhowells@redhat.com)
> */
>
> +#include <linux/netfs.h>
> +#include <trace/events/netfs.h>
> +
> #ifdef pr_fmt
> #undef pr_fmt
> #endif
>
> #define pr_fmt(fmt) "netfs: " fmt
>
> +/*
> + * objects.c
> + */
> +struct netfs_io_request *netfs_alloc_request(const struct netfs_request_ops *ops,
> + void *netfs_priv,
> + struct file *file);
> +void netfs_get_request(struct netfs_io_request *rreq);
> +void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async);
> +void netfs_put_request(struct netfs_io_request *rreq, bool was_async);
> +struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq);
> +void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async);
> +void netfs_get_subrequest(struct netfs_io_subrequest *subreq);
> +
> /*
> * read_helper.c
> */
> extern unsigned int netfs_debug;
>
> +void netfs_rreq_work(struct work_struct *work);
> +
> /*
> * stats.c
> */
> diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
> new file mode 100644
> index 000000000000..f7383c28dc6e
> --- /dev/null
> +++ b/fs/netfs/objects.c
> @@ -0,0 +1,123 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/* Object lifetime handling and tracing.
> + *
> + * Copyright (C) 2022 Red Hat, Inc. All Rights Reserved.
> + * Written by David Howells (dhowells@redhat.com)
> + */
> +
> +#include <linux/slab.h>
> +#include "internal.h"
> +
> +/*
> + * Allocate an I/O request and initialise it.
> + */
> +struct netfs_io_request *netfs_alloc_request(
> + const struct netfs_request_ops *ops, void *netfs_priv,
> + struct file *file)
> +{
> + static atomic_t debug_ids;
> + struct netfs_io_request *rreq;
> +
> + rreq = kzalloc(sizeof(struct netfs_io_request), GFP_KERNEL);
> + if (rreq) {
> + rreq->netfs_ops = ops;
> + rreq->netfs_priv = netfs_priv;
> + rreq->inode = file_inode(file);
> + rreq->i_size = i_size_read(rreq->inode);
> + rreq->debug_id = atomic_inc_return(&debug_ids);
> + INIT_LIST_HEAD(&rreq->subrequests);
> + INIT_WORK(&rreq->work, netfs_rreq_work);
> + refcount_set(&rreq->usage, 1);
> + __set_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags);
> + if (ops->init_request)
> + ops->init_request(rreq, file);
> + netfs_stat(&netfs_n_rh_rreq);
> + }
> +
> + return rreq;
> +}
> +
> +void netfs_get_request(struct netfs_io_request *rreq)
> +{
> + refcount_inc(&rreq->usage);
> +}
> +
> +void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async)
> +{
> + struct netfs_io_subrequest *subreq;
> +
> + while (!list_empty(&rreq->subrequests)) {
> + subreq = list_first_entry(&rreq->subrequests,
> + struct netfs_io_subrequest, rreq_link);
> + list_del(&subreq->rreq_link);
> + netfs_put_subrequest(subreq, was_async);
> + }
> +}
> +
> +static void netfs_free_request(struct work_struct *work)
> +{
> + struct netfs_io_request *rreq =
> + container_of(work, struct netfs_io_request, work);
> + netfs_clear_subrequests(rreq, false);
> + if (rreq->netfs_priv)
> + rreq->netfs_ops->cleanup(rreq->mapping, rreq->netfs_priv);
> + trace_netfs_rreq(rreq, netfs_rreq_trace_free);
> + if (rreq->cache_resources.ops)
> + rreq->cache_resources.ops->end_operation(&rreq->cache_resources);
> + kfree(rreq);
> + netfs_stat_d(&netfs_n_rh_rreq);
> +}
> +
> +void netfs_put_request(struct netfs_io_request *rreq, bool was_async)
> +{
> + if (refcount_dec_and_test(&rreq->usage)) {
> + if (was_async) {
> + rreq->work.func = netfs_free_request;
> + if (!queue_work(system_unbound_wq, &rreq->work))
> + BUG();
> + } else {
> + netfs_free_request(&rreq->work);
> + }
> + }
> +}
> +
> +/*
> + * Allocate and partially initialise an I/O request structure.
> + */
> +struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq)
> +{
> + struct netfs_io_subrequest *subreq;
> +
> + subreq = kzalloc(sizeof(struct netfs_io_subrequest), GFP_KERNEL);
> + if (subreq) {
> + INIT_LIST_HEAD(&subreq->rreq_link);
> + refcount_set(&subreq->usage, 2);
> + subreq->rreq = rreq;
> + netfs_get_request(rreq);
> + netfs_stat(&netfs_n_rh_sreq);
> + }
> +
> + return subreq;
> +}
> +
> +void netfs_get_subrequest(struct netfs_io_subrequest *subreq)
> +{
> + refcount_inc(&subreq->usage);
> +}
> +
> +static void __netfs_put_subrequest(struct netfs_io_subrequest *subreq,
> + bool was_async)
> +{
> + struct netfs_io_request *rreq = subreq->rreq;
> +
> + trace_netfs_sreq(subreq, netfs_sreq_trace_free);
> + kfree(subreq);
> + netfs_stat_d(&netfs_n_rh_sreq);
> + netfs_put_request(rreq, was_async);
> +}
> +
> +void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async)
> +{
> + if (refcount_dec_and_test(&subreq->usage))
> + __netfs_put_subrequest(subreq, was_async);
> +}
> diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c
> index 26d54055b17e..ef23ef9889d5 100644
> --- a/fs/netfs/read_helper.c
> +++ b/fs/netfs/read_helper.c
> @@ -27,122 +27,6 @@ unsigned netfs_debug;
> module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO);
> MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask");
>
> -static void netfs_rreq_work(struct work_struct *);
> -static void __netfs_put_subrequest(struct netfs_io_subrequest *, bool);
> -
> -static void netfs_put_subrequest(struct netfs_io_subrequest *subreq,
> - bool was_async)
> -{
> - if (refcount_dec_and_test(&subreq->usage))
> - __netfs_put_subrequest(subreq, was_async);
> -}
> -
> -static struct netfs_io_request *netfs_alloc_request(
> - const struct netfs_request_ops *ops, void *netfs_priv,
> - struct file *file)
> -{
> - static atomic_t debug_ids;
> - struct netfs_io_request *rreq;
> -
> - rreq = kzalloc(sizeof(struct netfs_io_request), GFP_KERNEL);
> - if (rreq) {
> - rreq->netfs_ops = ops;
> - rreq->netfs_priv = netfs_priv;
> - rreq->inode = file_inode(file);
> - rreq->i_size = i_size_read(rreq->inode);
> - rreq->debug_id = atomic_inc_return(&debug_ids);
> - INIT_LIST_HEAD(&rreq->subrequests);
> - INIT_WORK(&rreq->work, netfs_rreq_work);
> - refcount_set(&rreq->usage, 1);
> - __set_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags);
> - if (ops->init_request)
> - ops->init_request(rreq, file);
> - netfs_stat(&netfs_n_rh_rreq);
> - }
> -
> - return rreq;
> -}
> -
> -static void netfs_get_request(struct netfs_io_request *rreq)
> -{
> - refcount_inc(&rreq->usage);
> -}
> -
> -static void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async)
> -{
> - struct netfs_io_subrequest *subreq;
> -
> - while (!list_empty(&rreq->subrequests)) {
> - subreq = list_first_entry(&rreq->subrequests,
> - struct netfs_io_subrequest, rreq_link);
> - list_del(&subreq->rreq_link);
> - netfs_put_subrequest(subreq, was_async);
> - }
> -}
> -
> -static void netfs_free_request(struct work_struct *work)
> -{
> - struct netfs_io_request *rreq =
> - container_of(work, struct netfs_io_request, work);
> - netfs_clear_subrequests(rreq, false);
> - if (rreq->netfs_priv)
> - rreq->netfs_ops->cleanup(rreq->mapping, rreq->netfs_priv);
> - trace_netfs_rreq(rreq, netfs_rreq_trace_free);
> - if (rreq->cache_resources.ops)
> - rreq->cache_resources.ops->end_operation(&rreq->cache_resources);
> - kfree(rreq);
> - netfs_stat_d(&netfs_n_rh_rreq);
> -}
> -
> -static void netfs_put_request(struct netfs_io_request *rreq, bool was_async)
> -{
> - if (refcount_dec_and_test(&rreq->usage)) {
> - if (was_async) {
> - rreq->work.func = netfs_free_request;
> - if (!queue_work(system_unbound_wq, &rreq->work))
> - BUG();
> - } else {
> - netfs_free_request(&rreq->work);
> - }
> - }
> -}
> -
> -/*
> - * Allocate and partially initialise an I/O request structure.
> - */
> -static struct netfs_io_subrequest *netfs_alloc_subrequest(
> - struct netfs_io_request *rreq)
> -{
> - struct netfs_io_subrequest *subreq;
> -
> - subreq = kzalloc(sizeof(struct netfs_io_subrequest), GFP_KERNEL);
> - if (subreq) {
> - INIT_LIST_HEAD(&subreq->rreq_link);
> - refcount_set(&subreq->usage, 2);
> - subreq->rreq = rreq;
> - netfs_get_request(rreq);
> - netfs_stat(&netfs_n_rh_sreq);
> - }
> -
> - return subreq;
> -}
> -
> -static void netfs_get_subrequest(struct netfs_io_subrequest *subreq)
> -{
> - refcount_inc(&subreq->usage);
> -}
> -
> -static void __netfs_put_subrequest(struct netfs_io_subrequest *subreq,
> - bool was_async)
> -{
> - struct netfs_io_request *rreq = subreq->rreq;
> -
> - trace_netfs_sreq(subreq, netfs_sreq_trace_free);
> - kfree(subreq);
> - netfs_stat_d(&netfs_n_rh_sreq);
> - netfs_put_request(rreq, was_async);
> -}
> -
> /*
> * Clear the unread part of an I/O request.
> */
> @@ -558,7 +442,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async)
> netfs_rreq_completed(rreq, was_async);
> }
>
> -static void netfs_rreq_work(struct work_struct *work)
> +void netfs_rreq_work(struct work_struct *work)
> {
> struct netfs_io_request *rreq =
> container_of(work, struct netfs_io_request, work);
>
>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
next prev parent reply other threads:[~2022-03-09 15:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 23:24 [PATCH v2 00/19] netfs: Prep for write helpers David Howells
2022-03-08 23:25 ` [PATCH v2 01/19] fscache: export fscache_end_operation() David Howells
2022-03-09 15:26 ` Jeff Layton
2022-03-10 1:40 ` JeffleXu
2022-03-08 23:25 ` [PATCH v2 02/19] netfs: Generate enums from trace symbol mapping lists David Howells
2022-03-09 15:30 ` Jeff Layton
2022-03-09 15:49 ` David Howells
2022-03-09 18:39 ` Jeff Layton
2022-03-08 23:25 ` [PATCH v2 03/19] netfs: Rename netfs_read_*request to netfs_io_*request David Howells
2022-03-09 15:31 ` Jeff Layton
2022-03-08 23:26 ` [PATCH v2 04/19] netfs: Finish off rename of netfs_read_request to netfs_io_request David Howells
2022-03-09 15:34 ` Jeff Layton
2022-03-08 23:26 ` [PATCH v2 05/19] netfs: Split netfs_io_* object handling out David Howells
2022-03-09 15:44 ` Jeff Layton [this message]
2022-03-08 23:26 ` [PATCH v2 06/19] netfs: Adjust the netfs_rreq tracepoint slightly David Howells
2022-03-09 15:45 ` Jeff Layton
2022-03-08 23:26 ` [PATCH v2 07/19] netfs: Trace refcounting on the netfs_io_request struct David Howells
2022-03-08 23:27 ` [PATCH v2 08/19] netfs: Trace refcounting on the netfs_io_subrequest struct David Howells
2022-03-08 23:27 ` [PATCH v2 09/19] netfs: Adjust the netfs_failure tracepoint to indicate non-subreq lines David Howells
2022-03-08 23:28 ` [PATCH v2 10/19] netfs: Refactor arguments for netfs_alloc_read_request David Howells
2022-03-08 23:28 ` [PATCH v2 11/19] netfs: Change ->init_request() to return an error code David Howells
2022-03-09 16:52 ` Jeff Layton
2022-03-08 23:28 ` [PATCH v2 12/19] netfs: Add a netfs inode context David Howells
2022-03-09 18:22 ` Jeff Layton
2022-03-09 19:23 ` David Howells
2022-03-09 19:46 ` Jeff Layton
2022-03-08 23:29 ` [PATCH v2 13/19] netfs: Add a function to consolidate beginning a read David Howells
2022-03-09 19:26 ` Jeff Layton
2022-03-09 22:08 ` David Howells
2022-03-08 23:29 ` [PATCH v2 14/19] netfs: Prepare to split read_helper.c David Howells
2022-03-08 23:29 ` [PATCH v2 15/19] netfs: Rename read_helper.c to io.c David Howells
2022-03-08 23:29 ` [PATCH v2 16/19] netfs: Split fs/netfs/read_helper.c David Howells
2022-03-09 20:27 ` Jeff Layton
2022-03-08 23:29 ` [PATCH v2 17/19] netfs: Split some core bits out into their own file David Howells
2022-03-08 23:29 ` [PATCH v2 18/19] netfs: Keep track of the actual remote file size David Howells
2022-03-09 20:45 ` Jeff Layton
2022-03-09 22:27 ` David Howells
2022-03-08 23:30 ` [PATCH v2 19/19] afs: Maintain netfs_i_context::remote_i_size David Howells
2022-03-09 21:12 ` Jeff Layton
2022-03-09 22:35 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b28618df1b6c31f42b75c8f759011444018bbece.camel@redhat.com \
--to=jlayton@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=asmadeus@codewreck.org \
--cc=ceph-devel@vger.kernel.org \
--cc=dhowells@redhat.com \
--cc=dwysocha@redhat.com \
--cc=idryomov@gmail.com \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cachefs@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=sfrench@samba.org \
--cc=torvalds@linux-foundation.org \
--cc=v9fs-developer@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.