Thu Aug 27 18:49:36 2020 UTC ()

npf: Don't stop early after sleeping and before processing instances.

We already check winfo->exit below, after processing instances and
before sleeping again.

Candidate fix for:

panic: kernel diagnostic assertion "LIST_EMPTY(&winfo->instances)" failed: file "/home/riastradh/netbsd/current/src/sys/rump/net/lib/libnpf/../../../..//net/npf/npf_worker.c", line 300 NPF instances must be discharged before the npfk_sysfini() call


(riastradh)

diff -r1.9 -r1.10 src/sys/net/npf/npf_worker.c

--- src/sys/net/npf/npf_worker.c 2020/05/30 20:54:54	1.9
+++ src/sys/net/npf/npf_worker.c 2020/08/27 18:49:36	1.10

 @@ -19,27 +19,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_worker.c,v 1.9 2020/05/30 20:54:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_worker.c,v 1.10 2020/08/27 18:49:36 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/cprng.h>
 #endif
 #include "npf_impl.h"
 @@ -261,27 +261,27 @@ process_npf_instance(npf_workerinfo_t *w
  * npf_worker: the main worker loop, processing enlisted NPF instances.
+ *
  * XXX: Currently, npf_workerinfo_t::lock would serialize all workers,
  * so there is no point to have more than one worker; but there might
  * not be much point anyway.
  */
 static void
 npf_worker(void *arg)
+{
 	npf_workerinfo_t *winfo = arg;
 	npf_t *npf;
 	mutex_enter(&winfo->lock);
-	while (!winfo->exit) {
+	for (;;) {
 		unsigned wait_time = NPF_GC_MAXWAIT;
 		/*
 		 * Iterate all instances.  We do not use LIST_FOREACH here,
 		 * since the instance can be removed.
 		 */
 		npf = LIST_FIRST(&winfo->instances);
 		while (npf) {
 			npf_t *next = LIST_NEXT(npf, worker_entry);
 			unsigned i_wait_time = process_npf_instance(winfo, npf);
 			wait_time = MIN(wait_time, i_wait_time);
 			npf = next;
+		}