Bug#688449: unblock: kfreebsd-9/9.0-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package kfreebsd-9
This fixes an kernel panic with an patch from upstream VCS. Patched
kernel is tested and works fine now for almost a week on the affected
system
unblock kfreebsd-9/9.0-6
-- System Information:
Debian Release: 6.0.5
APT prefers stable
APT policy: (990, 'stable'), (500, 'proposed-updates'), (500, 'unstable'), (1, 'experimental')
Architecture: mipsel (mips64)
Kernel: Linux 3.2.0-0.bpo.2-loongson-2f
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru kfreebsd-9-9.0/debian/changelog kfreebsd-9-9.0/debian/changelog
--- kfreebsd-9-9.0/debian/changelog 2012-07-21 07:08:11.000000000 -0700
+++ kfreebsd-9-9.0/debian/changelog 2012-09-22 11:35:11.000000000 -0700
@@ -1,3 +1,11 @@
+kfreebsd-9 (9.0-6) unstable; urgency=low
+
+ * Team upload.
+ * Pick SVN 236364 from FreeBSD-9 to fix a kernel panic on pf config
+ reload if counters are used (Closes: #688268)
+
+ -- Christoph Egger <christoph@debian.org> Sat, 22 Sep 2012 11:32:52 -0700
+
kfreebsd-9 (9.0-5) unstable; urgency=low
* Remove /boot symlink kludge. (Closes: #672255)
diff -Nru kfreebsd-9-9.0/debian/patches/pf_counter_initialization_SVN236364.diff kfreebsd-9-9.0/debian/patches/pf_counter_initialization_SVN236364.diff
--- kfreebsd-9-9.0/debian/patches/pf_counter_initialization_SVN236364.diff 1969-12-31 16:00:00.000000000 -0800
+++ kfreebsd-9-9.0/debian/patches/pf_counter_initialization_SVN236364.diff 2012-09-22 11:11:02.000000000 -0700
@@ -0,0 +1,55 @@
+Index: kfreebsd-9-9.0/sys/contrib/pf/net/pf_ioctl.c
+===================================================================
+--- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pf_ioctl.c 2011-10-26 19:09:09.000000000 +0200
++++ kfreebsd-9-9.0/sys/contrib/pf/net/pf_ioctl.c 2012-09-19 01:17:56.000000000 +0200
+@@ -308,7 +308,7 @@
+ V_pf_altq_pl = V_pf_pooladdr_pl = NULL;
+ V_pf_frent_pl = V_pf_frag_pl = V_pf_cache_pl = V_pf_cent_pl = NULL;
+ V_pf_state_scrub_pl = NULL;
+- V_pfr_ktable_pl = V_pfr_kentry_pl = NULL;
++ V_pfr_ktable_pl = V_pfr_kentry_pl = V_pfr_kcounters_pl = NULL;
+ }
+
+ void
+@@ -327,6 +327,7 @@
+ UMA_DESTROY(V_pf_cent_pl);
+ UMA_DESTROY(V_pfr_ktable_pl);
+ UMA_DESTROY(V_pfr_kentry_pl);
++ UMA_DESTROY(V_pfr_kcounters_pl);
+ UMA_DESTROY(V_pf_state_scrub_pl);
+ UMA_DESTROY(V_pfi_addr_pl);
+ }
+@@ -347,6 +348,7 @@
+ UMA_CREATE(V_pf_pooladdr_pl, struct pf_pooladdr, "pfpooladdrpl");
+ UMA_CREATE(V_pfr_ktable_pl, struct pfr_ktable, "pfrktable");
+ UMA_CREATE(V_pfr_kentry_pl, struct pfr_kentry, "pfrkentry");
++ UMA_CREATE(V_pfr_kcounters_pl, struct pfr_kcounters, "pfrkcounters");
+ UMA_CREATE(V_pf_frent_pl, struct pf_frent, "pffrent");
+ UMA_CREATE(V_pf_frag_pl, struct pf_fragment, "pffrag");
+ UMA_CREATE(V_pf_cache_pl, struct pf_fragment, "pffrcache");
+Index: kfreebsd-9-9.0/sys/contrib/pf/net/pfvar.h
+===================================================================
+--- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pfvar.h 2011-10-26 19:09:09.000000000 +0200
++++ kfreebsd-9-9.0/sys/contrib/pf/net/pfvar.h 2012-09-19 01:17:56.000000000 +0200
+@@ -1871,6 +1871,8 @@
+ #define V_pfr_ktable_pl VNET(pfr_ktable_pl)
+ VNET_DECLARE(uma_zone_t, pfr_kentry_pl);
+ #define V_pfr_kentry_pl VNET(pfr_kentry_pl)
++VNET_DECLARE(uma_zone_t, pfr_kcounters_pl);
++#define V_pfr_kcounters_pl VNET(pfr_kcounters_pl)
+ VNET_DECLARE(uma_zone_t, pf_cache_pl);
+ #define V_pf_cache_pl VNET(pf_cache_pl)
+ VNET_DECLARE(uma_zone_t, pf_cent_pl);
+Index: kfreebsd-9-9.0/sys/contrib/pf/net/pf_table.c
+===================================================================
+--- kfreebsd-9-9.0.orig/sys/contrib/pf/net/pf_table.c 2011-10-26 19:09:09.000000000 +0200
++++ kfreebsd-9-9.0/sys/contrib/pf/net/pf_table.c 2012-09-19 01:17:56.000000000 +0200
+@@ -179,7 +179,6 @@
+ VNET_DEFINE(uma_zone_t, pfr_ktable_pl);
+ VNET_DEFINE(uma_zone_t, pfr_kentry_pl);
+ VNET_DEFINE(uma_zone_t, pfr_kcounters_pl);
+-#define V_pfr_kcounters_pl VNET(pfr_kcounters_pl)
+ VNET_DEFINE(struct sockaddr_in, pfr_sin);
+ #define V_pfr_sin VNET(pfr_sin)
+ VNET_DEFINE(struct sockaddr_in6, pfr_sin6);
+
diff -Nru kfreebsd-9-9.0/debian/patches/series kfreebsd-9-9.0/debian/patches/series
--- kfreebsd-9-9.0/debian/patches/series 2012-07-21 06:40:39.000000000 -0700
+++ kfreebsd-9-9.0/debian/patches/series 2012-09-22 11:11:54.000000000 -0700
@@ -5,6 +5,7 @@
SA-12_04.sysret.patch
EN-12_02.ipv6refcount.patch
fix_VOP_VPTOCNP_bypass_for_nullfs.diff
+pf_counter_initialization_SVN236364.diff
# Other patches that might or might not be mergeable
001_misc.diff
Reply to: