d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use callout_drain() (outside the lock) when unloading the module.

Browse Source 
This prevents a potential deadlock.

Submitted by:	Francesco Magno
This commit is contained in:
Luigi Rizzo 2010-03-04 16:53:38 +00:00
parent 6aada3117b
commit 44e510399b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/ipfw/ip_dummynet.c
View File

@ -1690,8 +1690,8 @@ compute_space(struct dn_id *cmd, int *to_copy)
* link, scheduler template, flowset
* integrated in scheduler and header
* for flowset list
* (NSI)*(dn_flow + dn_queue) all scheduler instance + one
* queue per instance
* (NSI)*(dn_flow) all scheduler instance (includes
* the queue instance)
* - ipfw sched show
* (NP/2)*(dn_link + dn_sch + dn_id + dn_fs) only half scheduler
* link, scheduler template, flowset
@ -1708,11 +1708,13 @@ compute_space(struct dn_id *cmd, int *to_copy)
default:
return -1;
/* XXX where do LINK and SCH differ ? */
/* 'ipfw sched show' could list all queues associated to
* a scheduler. This feature for now is disabled
*/
case DN_LINK: /* pipe show */
x = DN_C_LINK | DN_C_SCH | DN_C_FLOW;
need += dn_cfg.schk_count *
(sizeof(struct dn_fs) + profile_size) / 2;
need += dn_cfg.si_count * sizeof(struct dn_queue);
need += dn_cfg.fsk_count * sizeof(uint32_t);
break;
case DN_SCH: /* sched show */
@ -2072,11 +2074,12 @@ ip_dn_init(void)
static void
ip_dn_destroy(void)
{
callout_drain(&dn_timeout);
DN_BH_WLOCK();
ip_dn_ctl_ptr = NULL;
ip_dn_io_ptr = NULL;
callout_stop(&dn_timeout);
dummynet_flush();
DN_BH_WUNLOCK();
taskqueue_drain(dn_tq, &dn_task);