Skip to content

Commit

Permalink
nfsd: make reclaim_str_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 is used only by legacy tracker. So let's allocate hash in
tracker init.

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 c212cec commit 52e19c0
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 55 deletions.
12 changes: 12 additions & 0 deletions fs/nfsd/netns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
#include <net/net_namespace.h>
#include <net/netns/generic.h>

/* Hash tables for nfs4_clientid state */
#define CLIENT_HASH_BITS 4
#define CLIENT_HASH_SIZE (1 << CLIENT_HASH_BITS)
#define CLIENT_HASH_MASK (CLIENT_HASH_SIZE - 1)

struct cld_net;

struct nfsd_net {
Expand All @@ -38,6 +43,13 @@ struct nfsd_net {
struct lock_manager nfsd4_manager;
bool grace_ended;
time_t boot_time;

/*
* reclaim_str_hashtbl[] holds known client info from previous reset/reboot
* used in reboot/reset lease grace period processing
*/
struct list_head *reclaim_str_hashtbl;
int reclaim_str_hashtbl_size;
};

extern int nfsd_net_id;
Expand Down
100 changes: 77 additions & 23 deletions fs/nfsd/nfs4recover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
struct dentry *dir, *dentry;
struct nfs4_client_reclaim *crp;
int status;
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);

dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname);

Expand Down Expand Up @@ -222,7 +223,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
mutex_unlock(&dir->d_inode->i_mutex);
if (status == 0) {
if (in_grace) {
crp = nfs4_client_to_reclaim(dname);
crp = nfs4_client_to_reclaim(dname, nn);
if (crp)
crp->cr_clp = clp;
}
Expand All @@ -237,7 +238,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
nfs4_reset_creds(original_cred);
}

typedef int (recdir_func)(struct dentry *, struct dentry *);
typedef int (recdir_func)(struct dentry *, struct dentry *, struct nfsd_net *);

struct name_list {
char name[HEXDIR_LEN];
Expand All @@ -263,7 +264,7 @@ nfsd4_build_namelist(void *arg, const char *name, int namlen,
}

static int
nfsd4_list_rec_dir(recdir_func *f)
nfsd4_list_rec_dir(recdir_func *f, struct nfsd_net *nn)
{
const struct cred *original_cred;
struct dentry *dir = rec_file->f_path.dentry;
Expand Down Expand Up @@ -292,7 +293,7 @@ nfsd4_list_rec_dir(recdir_func *f)
status = PTR_ERR(dentry);
break;
}
status = f(dir, dentry);
status = f(dir, dentry, nn);
dput(dentry);
}
list_del(&entry->list);
Expand Down Expand Up @@ -336,6 +337,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
struct nfs4_client_reclaim *crp;
char dname[HEXDIR_LEN];
int status;
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);

if (!rec_file || !test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags))
return;
Expand All @@ -359,9 +361,9 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
vfs_fsync(rec_file, 0);
if (in_grace) {
/* remove reclaim record */
crp = nfsd4_find_reclaim_client(dname);
crp = nfsd4_find_reclaim_client(dname, nn);
if (crp)
nfs4_remove_reclaim_record(crp);
nfs4_remove_reclaim_record(crp, nn);
}
}
out_drop_write:
Expand All @@ -373,11 +375,11 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
}

static int
purge_old(struct dentry *parent, struct dentry *child)
purge_old(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)
{
int status;

if (nfs4_has_reclaimed_state(child->d_name.name))
if (nfs4_has_reclaimed_state(child->d_name.name, nn))
return 0;

status = vfs_rmdir(parent->d_inode, child);
Expand All @@ -392,45 +394,47 @@ static void
nfsd4_recdir_purge_old(struct net *net, time_t boot_time)
{
int status;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

in_grace = false;
if (!rec_file)
return;
status = mnt_want_write_file(rec_file);
if (status)
goto out;
status = nfsd4_list_rec_dir(purge_old);
status = nfsd4_list_rec_dir(purge_old, nn);
if (status == 0)
vfs_fsync(rec_file, 0);
mnt_drop_write_file(rec_file);
out:
nfs4_release_reclaim();
nfs4_release_reclaim(nn);
if (status)
printk("nfsd4: failed to purge old clients from recovery"
" directory %s\n", rec_file->f_path.dentry->d_name.name);
}

static int
load_recdir(struct dentry *parent, struct dentry *child)
load_recdir(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)
{
if (child->d_name.len != HEXDIR_LEN - 1) {
printk("nfsd4: illegal name %s in recovery directory\n",
child->d_name.name);
/* Keep trying; maybe the others are OK: */
return 0;
}
nfs4_client_to_reclaim(child->d_name.name);
nfs4_client_to_reclaim(child->d_name.name, nn);
return 0;
}

static int
nfsd4_recdir_load(void) {
nfsd4_recdir_load(struct net *net) {
int status;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

if (!rec_file)
return 0;

status = nfsd4_list_rec_dir(load_recdir);
status = nfsd4_list_rec_dir(load_recdir, nn);
if (status)
printk("nfsd4: failed loading clients from recovery"
" directory %s\n", rec_file->f_path.dentry->d_name.name);
Expand Down Expand Up @@ -474,25 +478,71 @@ nfsd4_init_recdir(void)
return status;
}


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

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

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

return 0;
}

static void
nfs4_legacy_state_shutdown(struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

kfree(nn->reclaim_str_hashtbl);
}

static int
nfsd4_load_reboot_recovery_data(struct net *net)
{
int status;

nfs4_lock_state();
status = nfsd4_init_recdir();
if (!status)
status = nfsd4_recdir_load(net);
nfs4_unlock_state();
if (status)
printk(KERN_ERR "NFSD: Failure reading reboot recovery data\n");
return status;
}

static int
nfsd4_legacy_tracking_init(struct net *net)
{
int status;

/* XXX: The legacy code won't work in a container */
if (net != &init_net) {
WARN(1, KERN_ERR "NFSD: attempt to initialize legacy client "
"tracking in a container!\n");
return -EINVAL;
}

nfs4_lock_state();
status = nfsd4_init_recdir();
if (!status)
status = nfsd4_recdir_load();
nfs4_unlock_state();
status = nfs4_legacy_state_init(net);
if (status)
printk(KERN_ERR "NFSD: Failure reading reboot recovery data\n");
return status;

status = nfsd4_load_reboot_recovery_data(net);
if (status)
goto err;
return 0;

err:
nfs4_legacy_state_shutdown(net);
return status;
}

Expand All @@ -508,8 +558,11 @@ nfsd4_shutdown_recdir(void)
static void
nfsd4_legacy_tracking_exit(struct net *net)
{
nfs4_release_reclaim();
struct nfsd_net *nn = net_generic(net, nfsd_net_id);

nfs4_release_reclaim(nn);
nfsd4_shutdown_recdir();
nfs4_legacy_state_shutdown(net);
}

/*
Expand Down Expand Up @@ -545,6 +598,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp)
int status;
char dname[HEXDIR_LEN];
struct nfs4_client_reclaim *crp;
struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);

/* did we already find that this client is stable? */
if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags))
Expand All @@ -557,7 +611,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp)
}

/* look for it in the reclaim hashtable otherwise */
crp = nfsd4_find_reclaim_client(dname);
crp = nfsd4_find_reclaim_client(dname, nn);
if (crp) {
set_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags);
crp->cr_clp = clp;
Expand All @@ -568,7 +622,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp)
}

static struct nfsd4_client_tracking_ops nfsd4_legacy_tracking_ops = {
.init = nfsd4_load_reboot_recovery_data,
.init = nfsd4_legacy_tracking_init,
.exit = nfsd4_legacy_tracking_exit,
.create = nfsd4_create_clid_dir,
.remove = nfsd4_remove_clid_dir,
Expand Down
Loading

0 comments on commit 52e19c0

Please sign in to comment.