Commit 1a9917c2 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

[PATCH] knfsd: Convert ip_map cache to use the new lookup routine

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 15a5f6bd
...@@ -106,28 +106,38 @@ static inline int hash_ip(unsigned long ip) ...@@ -106,28 +106,38 @@ static inline int hash_ip(unsigned long ip)
return (hash ^ (hash>>8)) & 0xff; return (hash ^ (hash>>8)) & 0xff;
} }
#endif #endif
static int ip_map_match(struct cache_head *corig, struct cache_head *cnew)
static inline int ip_map_hash(struct ip_map *item)
{
return hash_str(item->m_class, IP_HASHBITS) ^
hash_ip((unsigned long)item->m_addr.s_addr);
}
static inline int ip_map_match(struct ip_map *item, struct ip_map *tmp)
{ {
return strcmp(tmp->m_class, item->m_class) == 0 struct ip_map *orig = container_of(corig, struct ip_map, h);
&& tmp->m_addr.s_addr == item->m_addr.s_addr; struct ip_map *new = container_of(cnew, struct ip_map, h);
return strcmp(orig->m_class, new->m_class) == 0
&& orig->m_addr.s_addr == new->m_addr.s_addr;
} }
static inline void ip_map_init(struct ip_map *new, struct ip_map *item) static void ip_map_init(struct cache_head *cnew, struct cache_head *citem)
{ {
struct ip_map *new = container_of(cnew, struct ip_map, h);
struct ip_map *item = container_of(citem, struct ip_map, h);
strcpy(new->m_class, item->m_class); strcpy(new->m_class, item->m_class);
new->m_addr.s_addr = item->m_addr.s_addr; new->m_addr.s_addr = item->m_addr.s_addr;
} }
static inline void ip_map_update(struct ip_map *new, struct ip_map *item) static void update(struct cache_head *cnew, struct cache_head *citem)
{ {
struct ip_map *new = container_of(cnew, struct ip_map, h);
struct ip_map *item = container_of(citem, struct ip_map, h);
kref_get(&item->m_client->h.ref); kref_get(&item->m_client->h.ref);
new->m_client = item->m_client; new->m_client = item->m_client;
new->m_add_change = item->m_add_change; new->m_add_change = item->m_add_change;
} }
static struct cache_head *ip_map_alloc(void)
{
struct ip_map *i = kmalloc(sizeof(*i), GFP_KERNEL);
if (i)
return &i->h;
else
return NULL;
}
static void ip_map_request(struct cache_detail *cd, static void ip_map_request(struct cache_detail *cd,
struct cache_head *h, struct cache_head *h,
...@@ -148,7 +158,8 @@ static void ip_map_request(struct cache_detail *cd, ...@@ -148,7 +158,8 @@ static void ip_map_request(struct cache_detail *cd,
(*bpp)[-1] = '\n'; (*bpp)[-1] = '\n';
} }
static struct ip_map *ip_map_lookup(struct ip_map *, int); static struct ip_map *ip_map_lookup(char *class, struct in_addr addr);
static int ip_map_update(struct ip_map *ipm, struct unix_domain *udom, time_t expiry);
static int ip_map_parse(struct cache_detail *cd, static int ip_map_parse(struct cache_detail *cd,
char *mesg, int mlen) char *mesg, int mlen)
...@@ -160,7 +171,11 @@ static int ip_map_parse(struct cache_detail *cd, ...@@ -160,7 +171,11 @@ static int ip_map_parse(struct cache_detail *cd,
int len; int len;
int b1,b2,b3,b4; int b1,b2,b3,b4;
char c; char c;
struct ip_map ipm, *ipmp; char class[8];
struct in_addr addr;
int err;
struct ip_map *ipmp;
struct auth_domain *dom; struct auth_domain *dom;
time_t expiry; time_t expiry;
...@@ -169,7 +184,7 @@ static int ip_map_parse(struct cache_detail *cd, ...@@ -169,7 +184,7 @@ static int ip_map_parse(struct cache_detail *cd,
mesg[mlen-1] = 0; mesg[mlen-1] = 0;
/* class */ /* class */
len = qword_get(&mesg, ipm.m_class, sizeof(ipm.m_class)); len = qword_get(&mesg, class, sizeof(class));
if (len <= 0) return -EINVAL; if (len <= 0) return -EINVAL;
/* ip address */ /* ip address */
...@@ -194,25 +209,22 @@ static int ip_map_parse(struct cache_detail *cd, ...@@ -194,25 +209,22 @@ static int ip_map_parse(struct cache_detail *cd,
} else } else
dom = NULL; dom = NULL;
ipm.m_addr.s_addr = addr.s_addr =
htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4); htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
ipm.h.flags = 0;
if (dom) { ipmp = ip_map_lookup(class,addr);
ipm.m_client = container_of(dom, struct unix_domain, h); if (ipmp) {
ipm.m_add_change = ipm.m_client->addr_changes; err = ip_map_update(ipmp,
container_of(dom, struct unix_domain, h),
expiry);
} else } else
set_bit(CACHE_NEGATIVE, &ipm.h.flags); err = -ENOMEM;
ipm.h.expiry_time = expiry;
ipmp = ip_map_lookup(&ipm, 1);
if (ipmp)
ip_map_put(&ipmp->h, &ip_map_cache);
if (dom) if (dom)
auth_domain_put(dom); auth_domain_put(dom);
if (!ipmp)
return -ENOMEM;
cache_flush(); cache_flush();
return 0; return err;
} }
static int ip_map_show(struct seq_file *m, static int ip_map_show(struct seq_file *m,
...@@ -256,32 +268,70 @@ struct cache_detail ip_map_cache = { ...@@ -256,32 +268,70 @@ struct cache_detail ip_map_cache = {
.cache_request = ip_map_request, .cache_request = ip_map_request,
.cache_parse = ip_map_parse, .cache_parse = ip_map_parse,
.cache_show = ip_map_show, .cache_show = ip_map_show,
.match = ip_map_match,
.init = ip_map_init,
.update = update,
.alloc = ip_map_alloc,
}; };
static DefineSimpleCacheLookup(ip_map, ip_map) static struct ip_map *ip_map_lookup(char *class, struct in_addr addr)
{
struct ip_map ip;
struct cache_head *ch;
strcpy(ip.m_class, class);
ip.m_addr = addr;
ch = sunrpc_cache_lookup(&ip_map_cache, &ip.h,
hash_str(class, IP_HASHBITS) ^
hash_ip((unsigned long)addr.s_addr));
if (ch)
return container_of(ch, struct ip_map, h);
else
return NULL;
}
static int ip_map_update(struct ip_map *ipm, struct unix_domain *udom, time_t expiry)
{
struct ip_map ip;
struct cache_head *ch;
ip.m_client = udom;
ip.h.flags = 0;
if (!udom)
set_bit(CACHE_NEGATIVE, &ip.h.flags);
else {
ip.m_add_change = udom->addr_changes;
/* if this is from the legacy set_client system call,
* we need m_add_change to be one higher
*/
if (expiry == NEVER)
ip.m_add_change++;
}
ip.h.expiry_time = expiry;
ch = sunrpc_cache_update(&ip_map_cache,
&ip.h, &ipm->h,
hash_str(ipm->m_class, IP_HASHBITS) ^
hash_ip((unsigned long)ipm->m_addr.s_addr));
if (!ch)
return -ENOMEM;
ip_map_put(ch, &ip_map_cache);
return 0;
}
int auth_unix_add_addr(struct in_addr addr, struct auth_domain *dom) int auth_unix_add_addr(struct in_addr addr, struct auth_domain *dom)
{ {
struct unix_domain *udom; struct unix_domain *udom;
struct ip_map ip, *ipmp; struct ip_map *ipmp;
if (dom->flavour != &svcauth_unix) if (dom->flavour != &svcauth_unix)
return -EINVAL; return -EINVAL;
udom = container_of(dom, struct unix_domain, h); udom = container_of(dom, struct unix_domain, h);
strcpy(ip.m_class, "nfsd"); ipmp = ip_map_lookup("nfsd", addr);
ip.m_addr = addr;
ip.m_client = udom;
ip.m_add_change = udom->addr_changes+1;
ip.h.flags = 0;
ip.h.expiry_time = NEVER;
ipmp = ip_map_lookup(&ip, 1);
if (ipmp) { if (ipmp)
ip_map_put(&ipmp->h, &ip_map_cache); return ip_map_update(ipmp, udom, NEVER);
return 0; else
} else
return -ENOMEM; return -ENOMEM;
} }
...@@ -304,7 +354,7 @@ struct auth_domain *auth_unix_lookup(struct in_addr addr) ...@@ -304,7 +354,7 @@ struct auth_domain *auth_unix_lookup(struct in_addr addr)
strcpy(key.m_class, "nfsd"); strcpy(key.m_class, "nfsd");
key.m_addr = addr; key.m_addr = addr;
ipm = ip_map_lookup(&key, 0); ipm = ip_map_lookup("nfsd", addr);
if (!ipm) if (!ipm)
return NULL; return NULL;
...@@ -331,16 +381,14 @@ void svcauth_unix_purge(void) ...@@ -331,16 +381,14 @@ void svcauth_unix_purge(void)
static int static int
svcauth_unix_set_client(struct svc_rqst *rqstp) svcauth_unix_set_client(struct svc_rqst *rqstp)
{ {
struct ip_map key, *ipm; struct ip_map *ipm;
rqstp->rq_client = NULL; rqstp->rq_client = NULL;
if (rqstp->rq_proc == 0) if (rqstp->rq_proc == 0)
return SVC_OK; return SVC_OK;
strcpy(key.m_class, rqstp->rq_server->sv_program->pg_class); ipm = ip_map_lookup(rqstp->rq_server->sv_program->pg_class,
key.m_addr = rqstp->rq_addr.sin_addr; rqstp->rq_addr.sin_addr);
ipm = ip_map_lookup(&key, 0);
if (ipm == NULL) if (ipm == NULL)
return SVC_DENIED; return SVC_DENIED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment