svn commit: r283106 - head/sys/netpfil/pf

[Gleb Smirnoff]

Author: glebius
Date: Tue May 19 14:02:40 2015
New Revision: 283106
URL: https://svnweb.freebsd.org/changeset/base/283106

Log:
  During module unload unlock rules before destroying UMA zones, which
  may sleep in uma_drain(). It is safe to unlock here, since we are already
  dehooked from pfil(9) and all pf threads had quit.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/netpfil/pf/pf_ioctl.c

Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c	Tue May 19 11:33:04 2015	(r283105)
+++ head/sys/netpfil/pf/pf_ioctl.c	Tue May 19 14:02:40 2015	(r283106)
@@ -3756,6 +3756,7 @@ pf_unload(void)
 		wakeup_one(pf_purge_thread);
 		rw_sleep(pf_purge_thread, &pf_rules_lock, 0, "pftmo", 0);
 	}
+	PF_RULES_WUNLOCK();
 	pf_normalize_cleanup();
 	pfi_cleanup();
 	pfr_cleanup();
@@ -3763,7 +3764,6 @@ pf_unload(void)
 	pf_cleanup();
 	if (IS_DEFAULT_VNET(curvnet))
 		pf_mtag_cleanup();
-	PF_RULES_WUNLOCK();
 	destroy_dev(pf_dev);
 	rw_destroy(&pf_rules_lock);
 	sx_destroy(&pf_ioctl_lock);