d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only decrease refcnt once when flushing SPD entries, to

Browse Source 
avoid flushing entries which are still used.

Approved by:	gnn(mentor)
Obtained from:	NETASQ
MFC after:	1 month
This commit is contained in:
vanhu 2009-05-27 09:31:50 +00:00
parent b0f73e19e7
commit 6e1cb07c00
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/netipsec/key.c
View File

@ -4103,10 +4103,21 @@ key_flush_spd(time_t now)
if (sp->scangen == gen) /* previously handled */
continue;
sp->scangen = gen;
if (sp->state == IPSEC_SPSTATE_DEAD) {
/* NB: clean entries created by key_spdflush */
if (sp->state == IPSEC_SPSTATE_DEAD &&
sp->refcnt == 1) {
/*
* Ensure that we only decrease refcnt once,
* when we're the last consumer.
* Directly call SP_DELREF/key_delsp instead
* of KEY_FREESP to avoid unlocking/relocking
* SPTREE_LOCK before key_delsp: may refcnt
* be increased again during that time ?
* NB: also clean entries created by
* key_spdflush
*/
SP_DELREF(sp);
key_delsp(sp);
SPTREE_UNLOCK();
KEY_FREESP(&sp);
goto restart;
}
if (sp->lifetime == 0 && sp->validtime == 0)
@ -4116,7 +4127,6 @@ key_flush_spd(time_t now)
sp->state = IPSEC_SPSTATE_DEAD;
SPTREE_UNLOCK();
key_spdexpire(sp);
KEY_FREESP(&sp);
goto restart;
}
}