Module Name: src Committed By: riastradh Date: Thu Dec 5 03:21:08 UTC 2019
Modified Files: src/sys/kern: subr_percpu.c Log Message: Allow equality in this assertion. This can happen if we lose the race mentioned in percpu_cpu_swap. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/kern/subr_percpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_percpu.c diff -u src/sys/kern/subr_percpu.c:1.19 src/sys/kern/subr_percpu.c:1.20 --- src/sys/kern/subr_percpu.c:1.19 Wed Sep 18 15:33:32 2019 +++ src/sys/kern/subr_percpu.c Thu Dec 5 03:21:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_percpu.c,v 1.19 2019/09/18 15:33:32 kamil Exp $ */ +/* $NetBSD: subr_percpu.c,v 1.20 2019/12/05 03:21:08 riastradh Exp $ */ /*- * Copyright (c)2007,2008 YAMAMOTO Takashi, @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.19 2019/09/18 15:33:32 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.20 2019/12/05 03:21:08 riastradh Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -149,7 +149,7 @@ percpu_cpu_enlarge(size_t size) where = xc_unicast(0, percpu_cpu_swap, ci, &pcc, ci); xc_wait(where); } - KASSERT(pcc.pcc_size < size); + KASSERT(pcc.pcc_size <= size); if (pcc.pcc_data != NULL) { kmem_free(pcc.pcc_data, pcc.pcc_size); }