upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-06 15:22:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rangelocks: restore caching of the single rl entry in the struct thread

Browse source 
Reviewed by:	markj, Olivier Certner <olce.freebsd@certner.fr>
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
Differential revision:	https://reviews.freebsd.org/D41787
This commit is contained in:
Konstantin Belousov 2023-08-24 02:29:50 +03:00
parent c31580080e
commit ff1ae3b363
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sys/kern/kern_rangelock.c
View file

@ -82,8 +82,15 @@ static struct rl_q_entry *
rlqentry_alloc(vm_ooffset_t start, vm_ooffset_t end, int flags)
{
struct rl_q_entry *e;
struct thread *td;
e = uma_zalloc_smr(rl_entry_zone, M_WAITOK);
td = curthread;
if (td->td_rlqe != NULL) {
e = td->td_rlqe;
td->td_rlqe = NULL;
} else {
e = uma_zalloc_smr(rl_entry_zone, M_WAITOK);
}
e->rl_q_next = NULL;
e->rl_q_free = NULL;
e->rl_q_start = start;
@ -95,6 +102,12 @@ rlqentry_alloc(vm_ooffset_t start, vm_ooffset_t end, int flags)
return (e);
}
void
rangelock_entry_free(struct rl_q_entry *e)
{
uma_zfree_smr(rl_entry_zone, e);
}
void
rangelock_init(struct rangelock *lock)
{
@ -106,6 +119,7 @@ void
rangelock_destroy(struct rangelock *lock)
{
struct rl_q_entry *e, *ep;
struct thread *td;
MPASS(!lock->sleepers);
for (e = (struct rl_q_entry *)atomic_load_ptr(&lock->head);
@ -386,8 +400,10 @@ rangelock_lock_int(struct rangelock *lock, bool trylock, vm_ooffset_t start,
vm_ooffset_t end, int locktype)
{
struct rl_q_entry *e, *free, *x, *xp;
struct thread *td;
enum RL_INSERT_RES res;
td = curthread;
for (res = RL_LOCK_RETRY; res == RL_LOCK_RETRY;) {
free = NULL;
e = rlqentry_alloc(start, end, locktype);
@ -401,10 +417,15 @@ rangelock_lock_int(struct rangelock *lock, bool trylock, vm_ooffset_t start,
e = NULL;
}
for (x = free; x != NULL; x = xp) {
MPASS(!rl_e_is_marked(x));
xp = x->rl_q_free;
MPASS(!rl_e_is_marked(xp));
uma_zfree_smr(rl_entry_zone, x);
MPASS(!rl_e_is_marked(x));
xp = x->rl_q_free;
MPASS(!rl_e_is_marked(xp));
if (td->td_rlqe == NULL) {
smr_synchronize(rl_smr);
td->td_rlqe = x;
} else {
uma_zfree_smr(rl_entry_zone, x);
}
}
}
return (e);

1
sys/kern/kern_thread.c
View file

@ -480,6 +480,7 @@ thread_fini(void *mem, int size)
EVENTHANDLER_DIRECT_INVOKE(thread_fini, td);
turnstile_free(td->td_turnstile);
sleepq_free(td->td_sleepqueue);
rangelock_entry_free(td->td_rlqe);
umtx_thread_fini(td);
MPASS(td->td_sel == NULL);
}

1
sys/sys/rangelock.h
View file

@ -65,6 +65,7 @@ void *rangelock_wlock(struct rangelock *lock, vm_ooffset_t start,
vm_ooffset_t end);
void *rangelock_trywlock(struct rangelock *lock, vm_ooffset_t start,
vm_ooffset_t end);
void rangelock_entry_free(struct rl_q_entry *e);
#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
void _rangelock_cookie_assert(void *cookie, int what, const char *file,
int line);