Module Name: src Committed By: martin Date: Wed Feb 22 18:53:56 UTC 2023
Modified Files: src/sys/net [netbsd-9]: route.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1602): sys/net/route.c: revision 1.236 route(4): Work around deadlock in rt_free wait path. PR kern/56844 To generate a diff of this commit: cvs rdiff -u -r1.219.2.2 -r1.219.2.3 src/sys/net/route.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/net/route.c diff -u src/sys/net/route.c:1.219.2.2 src/sys/net/route.c:1.219.2.3 --- src/sys/net/route.c:1.219.2.2 Thu Oct 3 17:12:53 2019 +++ src/sys/net/route.c Wed Feb 22 18:53:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.219.2.2 2019/10/03 17:12:53 martin Exp $ */ +/* $NetBSD: route.c,v 1.219.2.3 2023/02/22 18:53:56 martin Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.219.2.2 2019/10/03 17:12:53 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.219.2.3 2023/02/22 18:53:56 martin Exp $"); #include <sys/param.h> #ifdef RTFLUSH_DEBUG @@ -644,8 +644,17 @@ static bool rt_wait_ok(void) { + /* + * This originally returned !cpu_softintr_p(), but that doesn't + * work: the caller may hold a lock (probably softnet lock) + * that a softint is waiting for, in which case waiting here + * would cause a deadlock. See https://gnats.netbsd.org/56844 + * for details. For now, until the locking paths are sorted + * out, we just disable the waiting option altogether and + * always defer to workqueue. + */ KASSERT(!cpu_intr_p()); - return !cpu_softintr_p(); + return false; } void