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

uma: fix up r334824

Browse Source 
Turns out there is code which ends up passing M_ZERO to counters.
Since counters zero unconditionally on their own, just ignore drop the
flag in that place.
This commit is contained in:
mjg 2018-06-08 05:40:36 +00:00
parent 69a922f7ab
commit 08fabf55c9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/subr_counter.c
View File

@ -62,7 +62,7 @@ counter_u64_alloc(int flags)
{
counter_u64_t r;
r = uma_zalloc(pcpu_zone_64, flags);
r = uma_zalloc(pcpu_zone_64, flags & ~M_ZERO);
if (r != NULL)
counter_u64_zero(r);

2
sys/net/route.c
View File

@ -235,7 +235,7 @@ rtentry_zinit(void *mem, int size, int how)
{
struct rtentry *rt = mem;
rt->rt_pksent = counter_u64_alloc(how & ~M_ZERO);
rt->rt_pksent = counter_u64_alloc(how);
if (rt->rt_pksent == NULL)
return (ENOMEM);

3
sys/vm/uma_core.c
View File

@ -2257,7 +2257,8 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
("uma_zalloc_arg: called with spinlock or critical section held"));
if (zone->uz_flags & UMA_ZONE_PCPU)
MPASS((flags & M_ZERO) == 0);
KASSERT((flags & M_ZERO) == 0, ("allocating from a pcpu zone "
"with M_ZERO passed"));
#ifdef DEBUG_MEMGUARD
if (memguard_cmp_zone(zone)) {