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

net: use the frag lru_lock to protect netns_frags.nqueues update

Browse Source 
Move the protection of netns_frags.nqueues updates under the LRU_lock,
instead of the write lock.  As they are located on the same cacheline,
and this is also needed when transitioning to use per hash bucket locking.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jesper Dangaard Brouer 2013-03-27 05:55:56 +00:00 committed by David S. Miller
parent 68399ac37e
commit 1b5ab0def4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/inet_frag.h
View File

@ -143,6 +143,7 @@ static inline void inet_frag_lru_del(struct inet_frag_queue *q)
{ {
spin_lock(&q->net->lru_lock); spin_lock(&q->net->lru_lock);
list_del(&q->lru_list); list_del(&q->lru_list);
q->net->nqueues--;
spin_unlock(&q->net->lru_lock); spin_unlock(&q->net->lru_lock);
} }
@ -151,6 +152,7 @@ static inline void inet_frag_lru_add(struct netns_frags *nf,
{ {
spin_lock(&nf->lru_lock); spin_lock(&nf->lru_lock);
list_add_tail(&q->lru_list, &nf->lru_list); list_add_tail(&q->lru_list, &nf->lru_list);
q->net->nqueues++;
spin_unlock(&nf->lru_lock); spin_unlock(&nf->lru_lock);
} }

2
net/ipv4/inet_fragment.c
View File

@ -124,7 +124,6 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
{ {
write_lock(&f->lock); write_lock(&f->lock);
hlist_del(&fq->list); hlist_del(&fq->list);
fq->net->nqueues--;
write_unlock(&f->lock); write_unlock(&f->lock);
inet_frag_lru_del(fq); inet_frag_lru_del(fq);
} }
@ -260,7 +259,6 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,
atomic_inc(&qp->refcnt); atomic_inc(&qp->refcnt);
hlist_add_head(&qp->list, &f->hash[hash]); hlist_add_head(&qp->list, &f->hash[hash]);
nf->nqueues++;
write_unlock(&f->lock); write_unlock(&f->lock);
inet_frag_lru_add(nf, qp); inet_frag_lru_add(nf, qp);
return qp; return qp;