 @@ -1,14 +1,14 @@
-/*	$NetBSD: route.c,v 1.235.2.1 2023/02/22 18:52:45 martin Exp $	*/
+/*	$NetBSD: route.c,v 1.235.2.2 2023/06/08 11:15:26 martin Exp $	*/
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Kevin M. Lahey of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -87,27 +87,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)route.c	8.3 (Berkeley) 1/9/95
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_route.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.235.2.1 2023/02/22 18:52:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.235.2.2 2023/06/08 11:15:26 martin Exp $");
 #include <sys/param.h>
 #ifdef RTFLUSH_DEBUG
 #include <sys/sysctl.h>
 #endif
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 @@ -219,32 +219,34 @@ static void	rt_timer_timer(void *);
  *     otherwise the cache is invalidated
  */
 /*
  * Global lock for the routing table.
  */
 static krwlock_t		rt_lock __cacheline_aligned;
 #ifdef NET_MPSAFE
 #define RT_RLOCK()		rw_enter(&rt_lock, RW_READER)
 #define RT_WLOCK()		rw_enter(&rt_lock, RW_WRITER)
 #define RT_UNLOCK()		rw_exit(&rt_lock)
 #define RT_WLOCKED()		rw_write_held(&rt_lock)
 #define	RT_ASSERT_WLOCK()	KASSERT(rw_write_held(&rt_lock))
 #define RT_WQ_FLAGS		WQ_MPSAFE
 #else
 #define RT_RLOCK()		do {} while (0)
 #define RT_WLOCK()		do {} while (0)
 #define RT_UNLOCK()		do {} while (0)
 #define RT_WLOCKED()		true
 #define	RT_ASSERT_WLOCK()	do {} while (0)
 #define RT_WQ_FLAGS		0
 #endif
 static uint64_t rtcache_generation;
 /*
  * mutex and cv that are used to wait for references to a rtentry left
  * before updating the rtentry.
  */
 static struct {
 	kmutex_t		lock;
 	kcondvar_t		cv;
 	bool			ongoing;
 	const struct lwp	*lwp;
 @@ -467,27 +469,27 @@ rt_init(void)
 	int error;
 #ifdef RTFLUSH_DEBUG
 	sysctl_net_rtcache_setup(NULL);
 #endif
 	mutex_init(&rt_free_global.lock, MUTEX_DEFAULT, IPL_SOFTNET);
 	SLIST_INIT(&rt_free_global.queue);
 	rt_free_global.enqueued = false;
 	rt_psref_class = psref_class_create("rtentry", IPL_SOFTNET);
 	error = workqueue_create(&rt_free_global.wq, "rt_free",
-	    rt_free_work, NULL, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
+	    rt_free_work, NULL, PRI_SOFTNET, IPL_SOFTNET, RT_WQ_FLAGS);
 	if (error)
 		panic("%s: workqueue_create failed (%d)\n", __func__, error);
 	mutex_init(&rt_update_global.lock, MUTEX_DEFAULT, IPL_SOFTNET);
 	cv_init(&rt_update_global.cv, "rt_update");
 	pool_init(&rtentry_pool, sizeof(struct rtentry), 0, 0, 0, "rtentpl",
 	    NULL, IPL_SOFTNET);
 	pool_init(&rttimer_pool, sizeof(struct rttimer), 0, 0, 0, "rttmrpl",
 	    NULL, IPL_SOFTNET);
 	rn_init();	/* initialize all zeroes, all ones, mask table */
 	rtbl_init();
 @@ -1812,27 +1814,27 @@ static void rt_timer_work(struct work *,
 static void
 rt_timer_init(void)
+{
 	int error;
 	assert(rt_init_done == 0);
 	/* XXX should be in rt_init */
 	rw_init(&rt_lock);
 	LIST_INIT(&rttimer_queue_head);
 	callout_init(&rt_timer_ch, CALLOUT_MPSAFE);
 	error = workqueue_create(&rt_timer_wq, "rt_timer",
-	    rt_timer_work, NULL, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
+	    rt_timer_work, NULL, PRI_SOFTNET, IPL_SOFTNET, RT_WQ_FLAGS);
 	if (error)
 		panic("%s: workqueue_create failed (%d)\n", __func__, error);
 	callout_reset(&rt_timer_ch, hz, rt_timer_timer, NULL);
 	rt_init_done = 1;
+}
 struct rttimer_queue *
 rt_timer_queue_create(u_int timeout)
+{
 	struct rttimer_queue *rtq;
 	if (rt_init_done == 0)
 		rt_timer_init();