leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: make id-to-name cache allocated per network namespace context

Browse Source 
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2012-04-11 17:32:51 +04:00 committed by J. Bruce Fields
parent 43ec1a20bf
commit c2e76ef5e0
2 changed files with 26 additions and 10 deletions

3
fs/nfsd/netns.h
View File

@ -31,6 +31,9 @@ struct nfsd_net {
struct cache_detail *svc_expkey_cache; struct cache_detail *svc_expkey_cache;
struct cache_detail *svc_export_cache; struct cache_detail *svc_export_cache;
struct cache_detail *idtoname_cache;
}; };
extern int nfsd_net_id; extern int nfsd_net_id;

33
fs/nfsd/nfs4idmap.c
View File

@ -36,9 +36,11 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sunrpc/svc_xprt.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include "idmap.h" #include "idmap.h"
#include "nfsd.h" #include "nfsd.h"
#include "netns.h"
/* /*
* Turn off idmapping when using AUTH_SYS. * Turn off idmapping when using AUTH_SYS.
@ -107,8 +109,6 @@ ent_alloc(void)
* ID -> Name cache * ID -> Name cache
*/ */
static struct cache_head *idtoname_table[ENT_HASHMAX];
static uint32_t static uint32_t
idtoname_hash(struct ent *ent) idtoname_hash(struct ent *ent)
{ {
@ -187,10 +187,9 @@ static struct ent *idtoname_lookup(struct cache_detail *, struct ent *);
static struct ent *idtoname_update(struct cache_detail *, struct ent *, static struct ent *idtoname_update(struct cache_detail *, struct ent *,
struct ent *); struct ent *);
static struct cache_detail idtoname_cache = { static struct cache_detail idtoname_cache_template = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hash_size = ENT_HASHMAX, .hash_size = ENT_HASHMAX,
.hash_table = idtoname_table,
.name = "nfs4.idtoname", .name = "nfs4.idtoname",
.cache_put = ent_put, .cache_put = ent_put,
.cache_upcall = idtoname_upcall, .cache_upcall = idtoname_upcall,
@ -472,21 +471,34 @@ int
nfsd_idmap_init(struct net *net) nfsd_idmap_init(struct net *net)
{ {
int rv; int rv;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
rv = cache_register_net(&idtoname_cache, net); nn->idtoname_cache = cache_create_net(&idtoname_cache_template, net);
if (IS_ERR(nn->idtoname_cache))
return PTR_ERR(nn->idtoname_cache);
rv = cache_register_net(nn->idtoname_cache, net);
if (rv) if (rv)
return rv; goto destroy_idtoname_cache;
rv = cache_register_net(&nametoid_cache, net); rv = cache_register_net(&nametoid_cache, net);
if (rv) if (rv)
cache_unregister_net(&idtoname_cache, net); goto unregister_idtoname_cache;
return 0;
unregister_idtoname_cache:
cache_unregister_net(nn->idtoname_cache, net);
destroy_idtoname_cache:
cache_destroy_net(nn->idtoname_cache, net);
return rv; return rv;
} }
void void
nfsd_idmap_shutdown(struct net *net) nfsd_idmap_shutdown(struct net *net)
{ {
cache_unregister_net(&idtoname_cache, net); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
cache_unregister_net(nn->idtoname_cache, net);
cache_unregister_net(&nametoid_cache, net); cache_unregister_net(&nametoid_cache, net);
cache_destroy_net(nn->idtoname_cache, net);
} }
static int static int
@ -553,9 +565,10 @@ idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)
.type = type, .type = type,
}; };
int ret; int ret;
struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);
strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname)); strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
ret = idmap_lookup(rqstp, idtoname_lookup, &key, &idtoname_cache, &item); ret = idmap_lookup(rqstp, idtoname_lookup, &key, nn->idtoname_cache, &item);
if (ret == -ENOENT) if (ret == -ENOENT)
return sprintf(name, "%u", id); return sprintf(name, "%u", id);
if (ret) if (ret)
@ -563,7 +576,7 @@ idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)
ret = strlen(item->name); ret = strlen(item->name);
BUG_ON(ret > IDMAP_NAMESZ); BUG_ON(ret > IDMAP_NAMESZ);
memcpy(name, item->name, ret); memcpy(name, item->name, ret);
cache_put(&item->h, &idtoname_cache); cache_put(&item->h, nn->idtoname_cache);
return ret; return ret;
} }