Commit baea9944 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

sunrpc: add xprt_switch direcotry to sunrpc's sysfs 



Add xprt_switch directory to the sysfs and create individual
xprt_swith subdirectories for multipath transport group.

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent d3abc739

include/linux/sunrpc/xprtmultipath.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define _NET_SUNRPC_XPRTMULTIPATH_H



struct rpc_xprt_iter_ops;

struct rpc_sysfs_xprt_switch;

struct rpc_xprt_switch {

	spinlock_t		xps_lock;

	struct kref		xps_kref;
@@ -24,6 +25,7 @@ struct rpc_xprt_switch { 


	const struct rpc_xprt_iter_ops *xps_iter_ops;



	struct rpc_sysfs_xprt_switch *xps_sysfs;

	struct rcu_head		xps_rcu;

};

net/sunrpc/sysfs.c

+92 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "sysfs.h"



static struct kset *rpc_sunrpc_kset;

static struct kobject *rpc_sunrpc_client_kobj;

static struct kobject *rpc_sunrpc_client_kobj, *rpc_sunrpc_xprt_switch_kobj;



static void rpc_sysfs_object_release(struct kobject *kobj)

{
@@ -48,14 +48,23 @@ int rpc_sysfs_init(void) 
	rpc_sunrpc_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);

	if (!rpc_sunrpc_kset)

		return -ENOMEM;

	rpc_sunrpc_client_kobj = rpc_sysfs_object_alloc("client", rpc_sunrpc_kset, NULL);

	if (!rpc_sunrpc_client_kobj) {

		kset_unregister(rpc_sunrpc_kset);

	rpc_sunrpc_client_kobj =

		rpc_sysfs_object_alloc("rpc-clients", rpc_sunrpc_kset, NULL);

	if (!rpc_sunrpc_client_kobj)

		goto err_client;

	rpc_sunrpc_xprt_switch_kobj =

		rpc_sysfs_object_alloc("xprt-switches", rpc_sunrpc_kset, NULL);

	if (!rpc_sunrpc_xprt_switch_kobj)

		goto err_switch;

	return 0;

err_switch:

	kobject_put(rpc_sunrpc_client_kobj);

	rpc_sunrpc_client_kobj = NULL;

err_client:

	kset_unregister(rpc_sunrpc_kset);

	rpc_sunrpc_kset = NULL;

	return -ENOMEM;

}

	return 0;

}



static void rpc_sysfs_client_release(struct kobject *kobj)

{
@@ -65,20 +74,40 @@ static void rpc_sysfs_client_release(struct kobject *kobj) 
	kfree(c);

}



static void rpc_sysfs_xprt_switch_release(struct kobject *kobj)

{

	struct rpc_sysfs_xprt_switch *xprt_switch;



	xprt_switch = container_of(kobj, struct rpc_sysfs_xprt_switch, kobject);

	kfree(xprt_switch);

}



static const void *rpc_sysfs_client_namespace(struct kobject *kobj)

{

	return container_of(kobj, struct rpc_sysfs_client, kobject)->net;

}



static const void *rpc_sysfs_xprt_switch_namespace(struct kobject *kobj)

{

	return container_of(kobj, struct rpc_sysfs_xprt_switch, kobject)->net;

}



static struct kobj_type rpc_sysfs_client_type = {

	.release = rpc_sysfs_client_release,

	.sysfs_ops = &kobj_sysfs_ops,

	.namespace = rpc_sysfs_client_namespace,

};



static struct kobj_type rpc_sysfs_xprt_switch_type = {

	.release = rpc_sysfs_xprt_switch_release,

	.sysfs_ops = &kobj_sysfs_ops,

	.namespace = rpc_sysfs_xprt_switch_namespace,

};



void rpc_sysfs_exit(void)

{

	kobject_put(rpc_sunrpc_client_kobj);

	kobject_put(rpc_sunrpc_xprt_switch_kobj);

	kset_unregister(rpc_sunrpc_kset);

}
@@ -100,6 +129,28 @@ static struct rpc_sysfs_client *rpc_sysfs_client_alloc(struct kobject *parent, 
	return NULL;

}



static struct rpc_sysfs_xprt_switch *

rpc_sysfs_xprt_switch_alloc(struct kobject *parent,

			    struct rpc_xprt_switch *xprt_switch,

			    struct net *net,

			    gfp_t gfp_flags)

{

	struct rpc_sysfs_xprt_switch *p;



	p = kzalloc(sizeof(*p), gfp_flags);

	if (p) {

		p->net = net;

		p->kobject.kset = rpc_sunrpc_kset;

		if (kobject_init_and_add(&p->kobject,

					 &rpc_sysfs_xprt_switch_type,

					 parent, "switch-%d",

					 xprt_switch->xps_id) == 0)

			return p;

		kobject_put(&p->kobject);

	}

	return NULL;

}



void rpc_sysfs_client_setup(struct rpc_clnt *clnt, struct net *net)

{

	struct rpc_sysfs_client *rpc_client;
@@ -111,6 +162,28 @@ void rpc_sysfs_client_setup(struct rpc_clnt *clnt, struct net *net) 
	}

}



void rpc_sysfs_xprt_switch_setup(struct rpc_xprt_switch *xprt_switch,

				 struct rpc_xprt *xprt,

				 gfp_t gfp_flags)

{

	struct rpc_sysfs_xprt_switch *rpc_xprt_switch;

	struct net *net;



	if (xprt_switch->xps_net)

		net = xprt_switch->xps_net;

	else

		net = xprt->xprt_net;

	rpc_xprt_switch =

		rpc_sysfs_xprt_switch_alloc(rpc_sunrpc_xprt_switch_kobj,

					    xprt_switch, net, gfp_flags);

	if (rpc_xprt_switch) {

		xprt_switch->xps_sysfs = rpc_xprt_switch;

		rpc_xprt_switch->xprt_switch = xprt_switch;

		rpc_xprt_switch->xprt = xprt;

		kobject_uevent(&rpc_xprt_switch->kobject, KOBJ_ADD);

	}

}



void rpc_sysfs_client_destroy(struct rpc_clnt *clnt)

{

	struct rpc_sysfs_client *rpc_client = clnt->cl_sysfs;
@@ -122,3 +195,15 @@ void rpc_sysfs_client_destroy(struct rpc_clnt *clnt) 
		clnt->cl_sysfs = NULL;

	}

}



void rpc_sysfs_xprt_switch_destroy(struct rpc_xprt_switch *xprt_switch)

{

	struct rpc_sysfs_xprt_switch *rpc_xprt_switch = xprt_switch->xps_sysfs;



	if (rpc_xprt_switch) {

		kobject_uevent(&rpc_xprt_switch->kobject, KOBJ_REMOVE);

		kobject_del(&rpc_xprt_switch->kobject);

		kobject_put(&rpc_xprt_switch->kobject);

		xprt_switch->xps_sysfs = NULL;

	}

}

net/sunrpc/sysfs.h

+10 −0
Original line number Diff line number Diff line
@@ -10,10 +10,20 @@ struct rpc_sysfs_client { 
	struct net *net;

};



struct rpc_sysfs_xprt_switch {

	struct kobject kobject;

	struct net *net;

	struct rpc_xprt_switch *xprt_switch;

	struct rpc_xprt *xprt;

};



int rpc_sysfs_init(void);

void rpc_sysfs_exit(void);



void rpc_sysfs_client_setup(struct rpc_clnt *clnt, struct net *net);

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, gfp_t gfp_flags);

void rpc_sysfs_xprt_switch_destroy(struct rpc_xprt_switch *xprt);



#endif

net/sunrpc/xprtmultipath.c

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/sunrpc/addr.h>

#include <linux/sunrpc/xprtmultipath.h>



#include "sysfs.h"



typedef struct rpc_xprt *(*xprt_switch_find_xprt_t)(struct rpc_xprt_switch *xps,

		const struct rpc_xprt *cur);
@@ -133,6 +135,7 @@ struct rpc_xprt_switch *xprt_switch_alloc(struct rpc_xprt *xprt, 
		xps->xps_net = NULL;

		INIT_LIST_HEAD(&xps->xps_xprt_list);

		xps->xps_iter_ops = &rpc_xprt_iter_singular;

		rpc_sysfs_xprt_switch_setup(xps, xprt, gfp_flags);

		xprt_switch_add_xprt_locked(xps, xprt);

	}
@@ -161,6 +164,7 @@ static void xprt_switch_free(struct kref *kref) 
			struct rpc_xprt_switch, xps_kref);



	xprt_switch_free_entries(xps);

	rpc_sysfs_xprt_switch_destroy(xps);

	xprt_switch_free_id(xps);

	kfree_rcu(xps, xps_rcu);

}