Skip to content

Commit

Permalink
nfsd: make conf_id_hashtbl allocated per net
Browse files Browse the repository at this point in the history 
This hash holds nfs4_clients info, which are network namespace aware.
So let's make it allocated per network namespace.

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: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
Stanislav Kinsbursky authored and J. Bruce Fields committed Nov 15, 2012
1 parent 52e19c0 commit 8daae4d
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 21 deletions.
1 change: 1 addition & 0 deletions fs/nfsd/netns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ struct nfsd_net {
*/
struct list_head *reclaim_str_hashtbl;
int reclaim_str_hashtbl_size;
struct list_head *conf_id_hashtbl;
};

extern int nfsd_net_id;
Expand Down
75 changes: 54 additions & 21 deletions fs/nfsd/nfs4state.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,6 @@ static unsigned int clientstr_hashval(const char *name)
*
* All of the above fields are protected by the client_mutex.
*/
static struct list_head conf_id_hashtbl[CLIENT_HASH_SIZE];
static struct list_head unconf_id_hashtbl[CLIENT_HASH_SIZE];
static struct rb_root conf_name_tree;
static struct rb_root unconf_name_tree;
Expand Down Expand Up @@ -1385,22 +1384,23 @@ static void
move_to_confirmed(struct nfs4_client *clp)
{
unsigned int idhashval = clientid_hashval(clp->cl_clientid.cl_id);
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);

dprintk("NFSD: move_to_confirm nfs4_client %p\n", clp);
list_move(&clp->cl_idhash, &conf_id_hashtbl[idhashval]);
list_move(&clp->cl_idhash, &nn->conf_id_hashtbl[idhashval]);
rb_erase(&clp->cl_namenode, &unconf_name_tree);
add_clp_to_name_tree(clp, &conf_name_tree);
set_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags);
renew_client(clp);
}

static struct nfs4_client *
find_confirmed_client(clientid_t *clid, bool sessions)
find_confirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn)
{
struct nfs4_client *clp;
unsigned int idhashval = clientid_hashval(clid->cl_id);

list_for_each_entry(clp, &conf_id_hashtbl[idhashval], cl_idhash) {
list_for_each_entry(clp, &nn->conf_id_hashtbl[idhashval], cl_idhash) {
if (same_clid(&clp->cl_clientid, clid)) {
if ((bool)clp->cl_minorversion != sessions)
return NULL;
Expand Down Expand Up @@ -1787,6 +1787,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
struct nfsd4_conn *conn;
struct nfsd4_clid_slot *cs_slot = NULL;
__be32 status = 0;
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

if (cr_ses->flags & ~SESSION4_FLAG_MASK_A)
return nfserr_inval;
Expand All @@ -1802,7 +1803,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,

nfs4_lock_state();
unconf = find_unconfirmed_client(&cr_ses->clientid, true);
conf = find_confirmed_client(&cr_ses->clientid, true);
conf = find_confirmed_client(&cr_ses->clientid, true, nn);

if (conf) {
cs_slot = &conf->cl_cs_slot;
Expand Down Expand Up @@ -2142,10 +2143,11 @@ nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta
{
struct nfs4_client *conf, *unconf, *clp;
__be32 status = 0;
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

nfs4_lock_state();
unconf = find_unconfirmed_client(&dc->clientid, true);
conf = find_confirmed_client(&dc->clientid, true);
conf = find_confirmed_client(&dc->clientid, true, nn);

if (conf) {
clp = conf;
Expand Down Expand Up @@ -2280,7 +2282,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
return nfserr_stale_clientid;
nfs4_lock_state();

conf = find_confirmed_client(clid, false);
conf = find_confirmed_client(clid, false, nn);
unconf = find_unconfirmed_client(clid, false);
/*
* We try hard to give out unique clientid's, so if we get an
Expand Down Expand Up @@ -2656,7 +2658,8 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate,
oo = find_openstateowner_str(strhashval, open, cstate->minorversion);
open->op_openowner = oo;
if (!oo) {
clp = find_confirmed_client(clientid, cstate->minorversion);
clp = find_confirmed_client(clientid, cstate->minorversion,
nn);
if (clp == NULL)
return nfserr_expired;
goto new_owner;
Expand Down Expand Up @@ -3152,7 +3155,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfserr_stale_clientid;
if (STALE_CLIENTID(clid, nn))
goto out;
clp = find_confirmed_client(clid, cstate->minorversion);
clp = find_confirmed_client(clid, cstate->minorversion, nn);
status = nfserr_expired;
if (clp == NULL) {
/* We assume the client took too long to RENEW. */
Expand Down Expand Up @@ -3428,7 +3431,7 @@ static __be32 nfsd4_lookup_stateid(stateid_t *stateid, unsigned char typemask, s
return nfserr_bad_stateid;
if (STALE_STATEID(stateid, nn))
return nfserr_stale_stateid;
cl = find_confirmed_client(&stateid->si_opaque.so_clid, sessions);
cl = find_confirmed_client(&stateid->si_opaque.so_clid, sessions, nn);
if (!cl)
return nfserr_expired;
*s = find_stateid_by_type(cl, stateid, typemask);
Expand Down Expand Up @@ -4579,9 +4582,10 @@ __be32
nfs4_check_open_reclaim(clientid_t *clid, bool sessions)
{
struct nfs4_client *clp;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);

/* find clientid in conf_id_hashtbl */
clp = find_confirmed_client(clid, sessions);
clp = find_confirmed_client(clid, sessions, nn);
if (clp == NULL)
return nfserr_reclaim_bad;

Expand Down Expand Up @@ -4720,7 +4724,6 @@ nfs4_state_init(void)
int i;

for (i = 0; i < CLIENT_HASH_SIZE; i++) {
INIT_LIST_HEAD(&conf_id_hashtbl[i]);
INIT_LIST_HEAD(&unconf_id_hashtbl[i]);
}
conf_name_tree = RB_ROOT;
Expand Down Expand Up @@ -4761,6 +4764,38 @@ set_max_delegations(void)
max_delegations = nr_free_buffer_pages() >> (20 - 2 - PAGE_SHIFT);
}

static int nfs4_state_start_net(struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
int i;

nn->conf_id_hashtbl = kmalloc(sizeof(struct list_head) *
CLIENT_HASH_SIZE, GFP_KERNEL);
if (!nn->conf_id_hashtbl)
return -ENOMEM;

for (i = 0; i < CLIENT_HASH_SIZE; i++)
INIT_LIST_HEAD(&nn->conf_id_hashtbl[i]);

return 0;
}

static void
__nfs4_state_shutdown_net(struct net *net)
{
int i;
struct nfs4_client *clp = NULL;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

for (i = 0; i < CLIENT_HASH_SIZE; i++) {
while (!list_empty(&nn->conf_id_hashtbl[i])) {
clp = list_entry(nn->conf_id_hashtbl[i].next, struct nfs4_client, cl_idhash);
destroy_client(clp);
}
}
kfree(nn->conf_id_hashtbl);
}

/* initialization to perform when the nfsd service is started: */

int
Expand All @@ -4778,6 +4813,9 @@ nfs4_state_start(void)
* basis.
*/
get_net(net);
ret = nfs4_state_start_net(net);
if (ret)
return ret;
nfsd4_client_tracking_init(net);
nn->boot_time = get_seconds();
locks_start_grace(net, &nn->nfsd4_manager);
Expand All @@ -4804,26 +4842,21 @@ nfs4_state_start(void)
destroy_workqueue(laundry_wq);
out_recovery:
nfsd4_client_tracking_exit(net);
__nfs4_state_shutdown_net(net);
put_net(net);
return ret;
}

/* should be called with the state lock held */
static void
__nfs4_state_shutdown(void)
__nfs4_state_shutdown(struct net *net)
{
int i;
struct nfs4_client *clp = NULL;
struct nfs4_delegation *dp = NULL;
struct list_head *pos, *next, reaplist;
struct rb_node *node, *tmp;

for (i = 0; i < CLIENT_HASH_SIZE; i++) {
while (!list_empty(&conf_id_hashtbl[i])) {
clp = list_entry(conf_id_hashtbl[i].next, struct nfs4_client, cl_idhash);
destroy_client(clp);
}
}
__nfs4_state_shutdown_net(net);

node = rb_first(&unconf_name_tree);
while (node != NULL) {
Expand Down Expand Up @@ -4860,7 +4893,7 @@ nfs4_state_shutdown(void)
destroy_workqueue(laundry_wq);
locks_end_grace(&nn->nfsd4_manager);
nfs4_lock_state();
__nfs4_state_shutdown();
__nfs4_state_shutdown(net);
nfs4_unlock_state();
nfsd4_destroy_callback_queue();
}
Expand Down

0 comments on commit 8daae4d

Please sign in to comment.