Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20e9e2bc authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

nfsd: make lockowner_ino_hashtbl allocated per net 



This hash holds file lock owners and closely associated with nfs4_clients info,
which are network namespace aware. So let's make it allocated per network
namespace too.

Note: this hash can be allocated in per-net operations. But it looks
better to allocate it on nfsd state start and thus don't waste resources
if server is not running.

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 9b531137

fs/nfsd/netns.h

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define CLIENT_HASH_SIZE                (1 << CLIENT_HASH_BITS)

#define CLIENT_HASH_MASK                (CLIENT_HASH_SIZE - 1)



#define LOCKOWNER_INO_HASH_BITS		8

#define LOCKOWNER_INO_HASH_SIZE		(1 << LOCKOWNER_INO_HASH_BITS)



struct cld_net;



struct nfsd_net {
@@ -61,6 +64,7 @@ struct nfsd_net { 
	struct list_head *unconf_id_hashtbl;

	struct rb_root unconf_name_tree;

	struct list_head *ownerstr_hashtbl;

	struct list_head *lockowner_ino_hashtbl;

};



extern int nfsd_net_id;

fs/nfsd/nfs4state.c

+16 −11
Original line number Diff line number Diff line
@@ -3862,8 +3862,6 @@ out: 


#define LOFF_OVERFLOW(start, len)      ((u64)(len) > ~(u64)(start))



#define LOCKOWNER_INO_HASH_BITS 8

#define LOCKOWNER_INO_HASH_SIZE (1 << LOCKOWNER_INO_HASH_BITS)

#define LOCKOWNER_INO_HASH_MASK (LOCKOWNER_INO_HASH_SIZE - 1)



static inline u64
@@ -3893,8 +3891,6 @@ static unsigned int lockowner_ino_hashval(struct inode *inode, u32 cl_id, struct 
		& LOCKOWNER_INO_HASH_MASK;

}



static struct list_head lockowner_ino_hashtbl[LOCKOWNER_INO_HASH_SIZE];



/*

 * TODO: Linux file offsets are _signed_ 64-bit quantities, which means that

 * we can't properly handle lock requests that go beyond the (2^63 - 1)-th
@@ -3960,12 +3956,12 @@ static bool same_lockowner_ino(struct nfs4_lockowner *lo, struct inode *inode, c 


static struct nfs4_lockowner *

find_lockowner_str(struct inode *inode, clientid_t *clid,

		struct xdr_netobj *owner)

		   struct xdr_netobj *owner, struct nfsd_net *nn)

{

	unsigned int hashval = lockowner_ino_hashval(inode, clid->cl_id, owner);

	struct nfs4_lockowner *lo;



	list_for_each_entry(lo, &lockowner_ino_hashtbl[hashval], lo_owner_ino_hash) {

	list_for_each_entry(lo, &nn->lockowner_ino_hashtbl[hashval], lo_owner_ino_hash) {

		if (same_lockowner_ino(lo, inode, clid, owner))

			return lo;

	}
@@ -3980,7 +3976,7 @@ static void hash_lockowner(struct nfs4_lockowner *lo, unsigned int strhashval, s 
	struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);



	list_add(&lo->lo_owner.so_strhash, &nn->ownerstr_hashtbl[strhashval]);

	list_add(&lo->lo_owner_ino_hash, &lockowner_ino_hashtbl[inohash]);

	list_add(&lo->lo_owner_ino_hash, &nn->lockowner_ino_hashtbl[inohash]);

	list_add(&lo->lo_perstateid, &open_stp->st_lockowners);

}
@@ -4054,8 +4050,10 @@ static __be32 lookup_or_create_lock_state(struct nfsd4_compound_state *cstate, s 
	struct nfs4_client *cl = oo->oo_owner.so_client;

	struct nfs4_lockowner *lo;

	unsigned int strhashval;

	struct nfsd_net *nn = net_generic(cl->net, nfsd_net_id);



	lo = find_lockowner_str(fi->fi_inode, &cl->cl_clientid, &lock->v.new.owner);

	lo = find_lockowner_str(fi->fi_inode, &cl->cl_clientid,

				&lock->v.new.owner, nn);

	if (lo) {

		if (!cstate->minorversion)

			return nfserr_bad_seqid;
@@ -4308,7 +4306,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		goto out;

	}



	lo = find_lockowner_str(inode, &lockt->lt_clientid, &lockt->lt_owner);

	lo = find_lockowner_str(inode, &lockt->lt_clientid, &lockt->lt_owner, nn);

	if (lo)

		file_lock->fl_owner = (fl_owner_t)lo;

	file_lock->fl_pid = current->tgid;
@@ -4726,8 +4724,6 @@ nfs4_state_init(void) 
	for (i = 0; i < FILE_HASH_SIZE; i++) {

		INIT_LIST_HEAD(&file_hashtbl[i]);

	}

	for (i = 0; i < LOCKOWNER_INO_HASH_SIZE; i++)

		INIT_LIST_HEAD(&lockowner_ino_hashtbl[i]);

	INIT_LIST_HEAD(&close_lru);

	INIT_LIST_HEAD(&client_lru);

	INIT_LIST_HEAD(&del_recall_lru);
@@ -4771,6 +4767,10 @@ static int nfs4_state_start_net(struct net *net) 
			OWNER_HASH_SIZE, GFP_KERNEL);

	if (!nn->ownerstr_hashtbl)

		goto err_ownerstr;

	nn->lockowner_ino_hashtbl = kmalloc(sizeof(struct list_head) *

			LOCKOWNER_INO_HASH_SIZE, GFP_KERNEL);

	if (!nn->lockowner_ino_hashtbl)

		goto err_lockowner_ino;



	for (i = 0; i < CLIENT_HASH_SIZE; i++) {

		INIT_LIST_HEAD(&nn->conf_id_hashtbl[i]);
@@ -4778,11 +4778,15 @@ static int nfs4_state_start_net(struct net *net) 
	}

	for (i = 0; i < OWNER_HASH_SIZE; i++)

		INIT_LIST_HEAD(&nn->ownerstr_hashtbl[i]);

	for (i = 0; i < LOCKOWNER_INO_HASH_SIZE; i++)

		INIT_LIST_HEAD(&nn->lockowner_ino_hashtbl[i]);

	nn->conf_name_tree = RB_ROOT;

	nn->unconf_name_tree = RB_ROOT;



	return 0;



err_lockowner_ino:

	kfree(nn->ownerstr_hashtbl);

err_ownerstr:

	kfree(nn->unconf_id_hashtbl);

err_unconf_id:
@@ -4815,6 +4819,7 @@ __nfs4_state_shutdown_net(struct net *net) 
		destroy_client(clp);

	}



	kfree(nn->lockowner_ino_hashtbl);

	kfree(nn->ownerstr_hashtbl);

	kfree(nn->unconf_id_hashtbl);

	kfree(nn->conf_id_hashtbl);