From: Trond Myklebust <trondmy@hammerspace.com>
To: "anna.schumaker@netapp.com" <anna.schumaker@netapp.com>,
"olga.kornievskaia@gmail.com" <olga.kornievskaia@gmail.com>
Cc: "linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2 10/13] sunrpc: add add sysfs directory per xprt under each xprt_switch
Date: Fri, 23 Apr 2021 21:21:58 +0000 [thread overview]
Message-ID: <19d456437e36c6ac3e81454399d0e94acdf5510e.camel@hammerspace.com> (raw)
In-Reply-To: <20210416035226.53588-11-olga.kornievskaia@gmail.com>
On Thu, 2021-04-15 at 23:52 -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
>
> Add individual transport directories under each transport switch
> group. For instance, for each nconnect=X connections there will be
> a transport directory. Naming conventions also identifies transport
> type -- xprt-<id>-<type> where type is udp, tcp, rdma, local, bc.
>
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> include/linux/sunrpc/xprt.h | 1 +
> net/sunrpc/sysfs.c | 83
> +++++++++++++++++++++++++++++++++++++
> net/sunrpc/sysfs.h | 9 ++++
> net/sunrpc/xprtmultipath.c | 2 +
> 4 files changed, 95 insertions(+)
>
> diff --git a/include/linux/sunrpc/xprt.h
> b/include/linux/sunrpc/xprt.h
> index a2edcc42e6c4..1e4906759a6a 100644
> --- a/include/linux/sunrpc/xprt.h
> +++ b/include/linux/sunrpc/xprt.h
> @@ -291,6 +291,7 @@ struct rpc_xprt {
> #endif
> struct rcu_head rcu;
> const struct xprt_class *xprt_class;
> + void *xprt_sysfs;
> };
>
> #if defined(CONFIG_SUNRPC_BACKCHANNEL)
> diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
> index ce2cad1b6aa6..5410d8fe1181 100644
> --- a/net/sunrpc/sysfs.c
> +++ b/net/sunrpc/sysfs.c
> @@ -81,6 +81,14 @@ static void rpc_sysfs_xprt_switch_release(struct
> kobject *kobj)
> kfree(xprt_switch);
> }
>
> +static void rpc_sysfs_xprt_switch_xprt_release(struct kobject *kobj)
> +{
> + struct rpc_sysfs_xprt_switch_xprt *xprt;
> +
> + xprt = container_of(kobj, struct rpc_sysfs_xprt_switch_xprt,
> kobject);
> + kfree(xprt);
> +}
> +
> static const void *rpc_sysfs_client_namespace(struct kobject *kobj)
> {
> return container_of(kobj, struct rpc_sysfs_client, kobject)-
> >net;
> @@ -91,6 +99,12 @@ static const void
> *rpc_sysfs_xprt_switch_namespace(struct kobject *kobj)
> return container_of(kobj, struct rpc_sysfs_xprt_switch,
> kobject)->net;
> }
>
> +static const void *rpc_sysfs_xprt_switch_xprt_namespace(struct
> kobject *kobj)
> +{
> + return container_of(kobj, struct rpc_sysfs_xprt_switch_xprt,
> + kobject)->net;
> +}
> +
> static struct kobj_type rpc_sysfs_client_type = {
> .release = rpc_sysfs_client_release,
> .sysfs_ops = &kobj_sysfs_ops,
> @@ -103,6 +117,12 @@ static struct kobj_type
> rpc_sysfs_xprt_switch_type = {
> .namespace = rpc_sysfs_xprt_switch_namespace,
> };
>
> +static struct kobj_type rpc_sysfs_xprt_switch_xprt_type = {
> + .release = rpc_sysfs_xprt_switch_xprt_release,
> + .sysfs_ops = &kobj_sysfs_ops,
> + .namespace = rpc_sysfs_xprt_switch_xprt_namespace,
> +};
> +
> void rpc_sysfs_exit(void)
> {
> kobject_put(rpc_sunrpc_client_kobj);
> @@ -149,6 +169,39 @@ rpc_sysfs_xprt_switch_alloc(struct kobject
> *parent,
> return NULL;
> }
>
> +static struct rpc_sysfs_xprt_switch_xprt *
> +rpc_sysfs_xprt_switch_xprt_alloc(struct kobject *parent,
> + struct rpc_xprt *xprt,
> + struct net *net)
> +{
> + struct rpc_sysfs_xprt_switch_xprt *p;
> +
> + p = kzalloc(sizeof(*p), GFP_KERNEL);
Ditto. This cannot be called from a locked environment.
> + if (p) {
> + char type[6];
> +
> + p->net = net;
> + p->kobject.kset = rpc_sunrpc_kset;
> + if (xprt->xprt_class->ident == XPRT_TRANSPORT_RDMA)
> + snprintf(type, sizeof(type), "rdma");
> + else if (xprt->xprt_class->ident ==
> XPRT_TRANSPORT_TCP)
> + snprintf(type, sizeof(type), "tcp");
> + else if (xprt->xprt_class->ident ==
> XPRT_TRANSPORT_UDP)
> + snprintf(type, sizeof(type), "udp");
> + else if (xprt->xprt_class->ident ==
> XPRT_TRANSPORT_LOCAL)
> + snprintf(type, sizeof(type), "local");
> + else if (xprt->xprt_class->ident ==
> XPRT_TRANSPORT_BC_TCP)
> + snprintf(type, sizeof(type), "bc");
> + if (kobject_init_and_add(&p->kobject,
> +
> &rpc_sysfs_xprt_switch_xprt_type,
> + parent, "xprt-%d-%s", xprt-
> >id,
> + type) == 0)
> + return p;
> + kobject_put(&p->kobject);
> + }
> + return NULL;
> +}
> +
> void rpc_sysfs_client_setup(struct rpc_clnt *clnt,
> struct rpc_xprt_switch *xprt_switch,
> struct net *net)
> @@ -197,6 +250,23 @@ void rpc_sysfs_xprt_switch_setup(struct
> rpc_xprt_switch *xprt_switch,
> }
> }
>
> +void rpc_sysfs_xprt_switch_xprt_setup(struct rpc_xprt_switch
> *xprt_switch,
> + struct rpc_xprt *xprt)
> +{
> + struct rpc_sysfs_xprt_switch_xprt *rpc_xprt_switch_xprt;
> + struct rpc_sysfs_xprt_switch *switch_obj =
> + (struct rpc_sysfs_xprt_switch *)xprt_switch-
> >xps_sysfs;
> +
> + rpc_xprt_switch_xprt =
> + rpc_sysfs_xprt_switch_xprt_alloc(&switch_obj-
> >kobject,
> + xprt, xprt-
> >xprt_net);
> + if (rpc_xprt_switch_xprt) {
> + xprt->xprt_sysfs = rpc_xprt_switch_xprt;
> + rpc_xprt_switch_xprt->xprt = xprt;
> + kobject_uevent(&rpc_xprt_switch_xprt->kobject,
> KOBJ_ADD);
> + }
> +}
> +
> void rpc_sysfs_client_destroy(struct rpc_clnt *clnt)
> {
> struct rpc_sysfs_client *rpc_client = clnt->cl_sysfs;
> @@ -225,3 +295,16 @@ void rpc_sysfs_xprt_switch_destroy(struct
> rpc_xprt_switch *xprt_switch)
> xprt_switch->xps_sysfs = NULL;
> }
> }
> +
> +void rpc_sysfs_xprt_switch_xprt_destroy(struct rpc_xprt *xprt)
> +{
> + struct rpc_sysfs_xprt_switch_xprt *rpc_xprt_switch_xprt =
> + xprt->xprt_sysfs;
> +
> + if (rpc_xprt_switch_xprt) {
> + kobject_uevent(&rpc_xprt_switch_xprt->kobject,
> KOBJ_REMOVE);
> + kobject_del(&rpc_xprt_switch_xprt->kobject);
> + kobject_put(&rpc_xprt_switch_xprt->kobject);
> + xprt->xprt_sysfs = NULL;
> + }
> +}
> diff --git a/net/sunrpc/sysfs.h b/net/sunrpc/sysfs.h
> index 9a0625b1cd65..52abe443ee8d 100644
> --- a/net/sunrpc/sysfs.h
> +++ b/net/sunrpc/sysfs.h
> @@ -19,6 +19,12 @@ struct rpc_sysfs_xprt_switch {
> struct rpc_xprt *xprt;
> };
>
> +struct rpc_sysfs_xprt_switch_xprt {
> + struct kobject kobject;
> + struct net *net;
> + struct rpc_xprt *xprt;
> +};
> +
> int rpc_sysfs_init(void);
> void rpc_sysfs_exit(void);
>
> @@ -29,5 +35,8 @@ void rpc_sysfs_client_destroy(struct rpc_clnt
> *clnt);
> void rpc_sysfs_xprt_switch_setup(struct rpc_xprt_switch
> *xprt_switch,
> struct rpc_xprt *xprt);
> void rpc_sysfs_xprt_switch_destroy(struct rpc_xprt_switch *xprt);
> +void rpc_sysfs_xprt_switch_xprt_setup(struct rpc_xprt_switch
> *xprt_switch,
> + struct rpc_xprt *xprt);
> +void rpc_sysfs_xprt_switch_xprt_destroy(struct rpc_xprt *xprt);
>
> #endif
> diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c
> index 1ed16e4cc465..eba45cbf8448 100644
> --- a/net/sunrpc/xprtmultipath.c
> +++ b/net/sunrpc/xprtmultipath.c
> @@ -33,6 +33,7 @@ static void xprt_switch_add_xprt_locked(struct
> rpc_xprt_switch *xps,
> {
> if (unlikely(xprt_get(xprt) == NULL))
> return;
> + rpc_sysfs_xprt_switch_xprt_setup(xps, xprt);
> list_add_tail_rcu(&xprt->xprt_switch, &xps->xps_xprt_list);
> smp_wmb();
> if (xps->xps_nxprts == 0)
> @@ -66,6 +67,7 @@ static void xprt_switch_remove_xprt_locked(struct
> rpc_xprt_switch *xps,
> return;
> xps->xps_nactive--;
> xps->xps_nxprts--;
> + rpc_sysfs_xprt_switch_xprt_destroy(xprt);
> if (xps->xps_nxprts == 0)
> xps->xps_net = NULL;
> smp_wmb();
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com
next prev parent reply other threads:[~2021-04-23 21:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 3:52 [PATCH v2 00/13] create sysfs files for changing IP address Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 01/13] sunrpc: Create a sunrpc directory under /sys/kernel/ Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 02/13] sunrpc: Create a client/ subdirectory in the sunrpc sysfs Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 03/13] sunrpc: Create per-rpc_clnt sysfs kobjects Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 04/13] sunrpc: Prepare xs_connect() for taking NULL tasks Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 05/13] sunrpc: add xprt id Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 06/13] sunrpc: add IDs to multipath Olga Kornievskaia
2021-04-23 21:16 ` Trond Myklebust
2021-04-16 3:52 ` [PATCH v2 07/13] sunrpc: keep track of the xprt_class in rpc_xprt structure Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 08/13] sunrpc: add xprt_switch direcotry to sunrpc's sysfs Olga Kornievskaia
2021-04-23 21:20 ` Trond Myklebust
2021-04-26 15:30 ` Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 09/13] sunrpc: add a symlink from rpc-client directory to the xprt_switch Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 10/13] sunrpc: add add sysfs directory per xprt under each xprt_switch Olga Kornievskaia
2021-04-22 13:44 ` [sunrpc] dce9cda69f: BUG:sleeping_function_called_from_invalid_context_at_include/linux/sched/mm.h kernel test robot
2021-04-22 13:44 ` kernel test robot
2021-04-23 21:21 ` Trond Myklebust [this message]
2021-04-16 3:52 ` [PATCH v2 11/13] sunrpc: add dst_attr attributes to the sysfs xprt directory Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 12/13] sunrpc: provide transport info in the sysfs directory Olga Kornievskaia
2021-04-16 3:52 ` [PATCH v2 13/13] sunrpc: provide multipath " Olga Kornievskaia
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=19d456437e36c6ac3e81454399d0e94acdf5510e.camel@hammerspace.com \
--to=trondmy@hammerspace.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
/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.