Skip to content

Commit

Permalink
[PATCH] knfsd: Convert ip_map cache to use the new lookup routine
Browse files Browse the repository at this point in the history 
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Mar 27, 2006
1 parent 15a5f6b commit 1a9917c
Showing 1 changed file with 95 additions and 47 deletions.
142 changes: 95 additions & 47 deletions net/sunrpc/svcauth_unix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,28 +106,38 @@ static inline int hash_ip(unsigned long ip)
return (hash ^ (hash>>8)) & 0xff;
}
#endif

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)
static int ip_map_match(struct cache_head *corig, struct cache_head *cnew)
{
return strcmp(tmp->m_class, item->m_class) == 0
&& tmp->m_addr.s_addr == item->m_addr.s_addr;
struct ip_map *orig = container_of(corig, struct ip_map, h);
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);
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);
new->m_client = item->m_client;
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,
struct cache_head *h,
Expand All @@ -148,7 +158,8 @@ static void ip_map_request(struct cache_detail *cd,
(*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,
char *mesg, int mlen)
Expand All @@ -160,7 +171,11 @@ static int ip_map_parse(struct cache_detail *cd,
int len;
int b1,b2,b3,b4;
char c;
struct ip_map ipm, *ipmp;
char class[8];
struct in_addr addr;
int err;

struct ip_map *ipmp;
struct auth_domain *dom;
time_t expiry;

Expand All @@ -169,7 +184,7 @@ static int ip_map_parse(struct cache_detail *cd,
mesg[mlen-1] = 0;

/* class */
len = qword_get(&mesg, ipm.m_class, sizeof(ipm.m_class));
len = qword_get(&mesg, class, sizeof(class));
if (len <= 0) return -EINVAL;

/* ip address */
Expand All @@ -194,25 +209,22 @@ static int ip_map_parse(struct cache_detail *cd,
} else
dom = NULL;

ipm.m_addr.s_addr =
addr.s_addr =
htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
ipm.h.flags = 0;
if (dom) {
ipm.m_client = container_of(dom, struct unix_domain, h);
ipm.m_add_change = ipm.m_client->addr_changes;

ipmp = ip_map_lookup(class,addr);
if (ipmp) {
err = ip_map_update(ipmp,
container_of(dom, struct unix_domain, h),
expiry);
} else
set_bit(CACHE_NEGATIVE, &ipm.h.flags);
ipm.h.expiry_time = expiry;
err = -ENOMEM;

ipmp = ip_map_lookup(&ipm, 1);
if (ipmp)
ip_map_put(&ipmp->h, &ip_map_cache);
if (dom)
auth_domain_put(dom);
if (!ipmp)
return -ENOMEM;

cache_flush();
return 0;
return err;
}

static int ip_map_show(struct seq_file *m,
Expand Down Expand Up @@ -256,32 +268,70 @@ struct cache_detail ip_map_cache = {
.cache_request = ip_map_request,
.cache_parse = ip_map_parse,
.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)
{
struct unix_domain *udom;
struct ip_map ip, *ipmp;
struct ip_map *ipmp;

if (dom->flavour != &svcauth_unix)
return -EINVAL;
udom = container_of(dom, struct unix_domain, h);
strcpy(ip.m_class, "nfsd");
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);
ipmp = ip_map_lookup("nfsd", addr);

if (ipmp) {
ip_map_put(&ipmp->h, &ip_map_cache);
return 0;
} else
if (ipmp)
return ip_map_update(ipmp, udom, NEVER);
else
return -ENOMEM;
}

Expand All @@ -304,7 +354,7 @@ struct auth_domain *auth_unix_lookup(struct in_addr addr)
strcpy(key.m_class, "nfsd");
key.m_addr = addr;

ipm = ip_map_lookup(&key, 0);
ipm = ip_map_lookup("nfsd", addr);

if (!ipm)
return NULL;
Expand All @@ -331,16 +381,14 @@ void svcauth_unix_purge(void)
static int
svcauth_unix_set_client(struct svc_rqst *rqstp)
{
struct ip_map key, *ipm;
struct ip_map *ipm;

rqstp->rq_client = NULL;
if (rqstp->rq_proc == 0)
return SVC_OK;

strcpy(key.m_class, rqstp->rq_server->sv_program->pg_class);
key.m_addr = rqstp->rq_addr.sin_addr;

ipm = ip_map_lookup(&key, 0);
ipm = ip_map_lookup(rqstp->rq_server->sv_program->pg_class,
rqstp->rq_addr.sin_addr);

if (ipm == NULL)
return SVC_DENIED;
Expand Down

0 comments on commit 1a9917c

Please sign in to comment.