Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove WQ_PERCPU flag for the workqueue that does configurations

Browse Source 
such as link up and down

And added kpreempt_disable and kpreempt_enable around
workqueue_enqueue to call it in non-WQ_PERCPU thread context.

pointed out and reviewed by knakahara@n.o., thanks.
This commit is contained in:
yamaguchi 2020-02-25 07:05:57 +00:00
parent e99dedd666
commit 12a5bb547f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pci/if_ixl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ixl.c,v 1.43 2020/02/25 07:00:26 yamaguchi Exp $ */ /* $NetBSD: if_ixl.c,v 1.44 2020/02/25 07:05:57 yamaguchi Exp $ */
/* /*
* Copyright (c) 2013-2015, Intel Corporation * Copyright (c) 2013-2015, Intel Corporation
@ -74,7 +74,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.43 2020/02/25 07:00:26 yamaguchi Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.44 2020/02/25 07:05:57 yamaguchi Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h" #include "opt_net_mpsafe.h"
@ -1341,7 +1341,7 @@ ixl_attach(device_t parent, device_t self, void *aux)
snprintf(xnamebuf, sizeof(xnamebuf), "%s_wq_cfg", device_xname(self)); snprintf(xnamebuf, sizeof(xnamebuf), "%s_wq_cfg", device_xname(self));
sc->sc_workq = ixl_workq_create(xnamebuf, IXL_WORKQUEUE_PRI, sc->sc_workq = ixl_workq_create(xnamebuf, IXL_WORKQUEUE_PRI,
IPL_NET, WQ_PERCPU | WQ_MPSAFE); IPL_NET, WQ_MPSAFE);
if (sc->sc_workq == NULL) if (sc->sc_workq == NULL)
goto teardown_sysctls; goto teardown_sysctls;
@ -6642,7 +6642,9 @@ ixl_work_add(struct workqueue *wq, struct ixl_work *work)
if (atomic_cas_uint(&work->ixw_added, 0, 1) != 0) if (atomic_cas_uint(&work->ixw_added, 0, 1) != 0)
return; return;
kpreempt_disable();
workqueue_enqueue(wq, &work->ixw_cookie, NULL); workqueue_enqueue(wq, &work->ixw_cookie, NULL);
kpreempt_enable();
} }
static void static void