From owner-svn-src-all@FreeBSD.ORG Sun Apr 27 09:05:35 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E81E06B6;
Sun, 27 Apr 2014 09:05:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D402C1D03;
Sun, 27 Apr 2014 09:05:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3R95Z23043738;
Sun, 27 Apr 2014 09:05:35 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3R95ZeT043735;
Sun, 27 Apr 2014 09:05:35 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201404270905.s3R95ZeT043735@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 27 Apr 2014 09:05:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265008 - in stable/10/sys: net netpfil/pf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Apr 2014 09:05:36 -0000
Author: mm
Date: Sun Apr 27 09:05:34 2014
New Revision: 265008
URL: http://svnweb.freebsd.org/changeset/base/265008
Log:
MFC r264689:
De-virtualize UMA zone pf_mtag_z and move to global initialization part.
The m_tag struct does not know about vnet context and the pf_mtag_free()
callback is called unaware of current vnet. This causes a panic.
PR: kern/182964
Modified:
stable/10/sys/net/pfvar.h
stable/10/sys/netpfil/pf/pf.c
stable/10/sys/netpfil/pf/pf_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/net/pfvar.h
==============================================================================
--- stable/10/sys/net/pfvar.h Sun Apr 27 08:22:44 2014 (r265007)
+++ stable/10/sys/net/pfvar.h Sun Apr 27 09:05:34 2014 (r265008)
@@ -1531,6 +1531,8 @@ VNET_DECLARE(struct pf_rulequeue, pf_unl
#define V_pf_unlinked_rules VNET(pf_unlinked_rules)
void pf_initialize(void);
+void pf_mtag_initialize(void);
+void pf_mtag_cleanup(void);
void pf_cleanup(void);
struct pf_mtag *pf_get_mtag(struct mbuf *);
Modified: stable/10/sys/netpfil/pf/pf.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf.c Sun Apr 27 08:22:44 2014 (r265007)
+++ stable/10/sys/netpfil/pf/pf.c Sun Apr 27 09:05:34 2014 (r265008)
@@ -186,8 +186,7 @@ struct mtx pf_unlnkdrules_mtx;
static VNET_DEFINE(uma_zone_t, pf_sources_z);
#define V_pf_sources_z VNET(pf_sources_z)
-static VNET_DEFINE(uma_zone_t, pf_mtag_z);
-#define V_pf_mtag_z VNET(pf_mtag_z)
+uma_zone_t pf_mtag_z;
VNET_DEFINE(uma_zone_t, pf_state_z);
VNET_DEFINE(uma_zone_t, pf_state_key_z);
@@ -282,7 +281,7 @@ static int pf_insert_src_node(struct p
struct pf_rule *, struct pf_addr *, sa_family_t);
static u_int pf_purge_expired_states(u_int, int);
static void pf_purge_unlinked_rules(void);
-static int pf_mtag_init(void *, int, int);
+static int pf_mtag_uminit(void *, int, int);
static void pf_mtag_free(struct m_tag *);
#ifdef INET
static void pf_route(struct mbuf **, struct pf_rule *, int,
@@ -727,7 +726,16 @@ pf_free_src_nodes(struct pf_src_node_lis
return (count);
}
-/* Data storage structures initialization. */
+void
+pf_mtag_initialize()
+{
+
+ pf_mtag_z = uma_zcreate("pf mtags", sizeof(struct m_tag) +
+ sizeof(struct pf_mtag), NULL, NULL, pf_mtag_uminit, NULL,
+ UMA_ALIGN_PTR, 0);
+}
+
+/* Per-vnet data storage structures initialization. */
void
pf_initialize()
{
@@ -786,10 +794,6 @@ pf_initialize()
V_pf_altqs_active = &V_pf_altqs[0];
V_pf_altqs_inactive = &V_pf_altqs[1];
- /* Mbuf tags */
- V_pf_mtag_z = uma_zcreate("pf mtags", sizeof(struct m_tag) +
- sizeof(struct pf_mtag), NULL, NULL, pf_mtag_init, NULL,
- UMA_ALIGN_PTR, 0);
/* Send & overload+flush queues. */
STAILQ_INIT(&V_pf_sendqueue);
@@ -805,6 +809,13 @@ pf_initialize()
}
void
+pf_mtag_cleanup()
+{
+
+ uma_zdestroy(pf_mtag_z);
+}
+
+void
pf_cleanup()
{
struct pf_keyhash *kh;
@@ -841,14 +852,13 @@ pf_cleanup()
mtx_destroy(&pf_overloadqueue_mtx);
mtx_destroy(&pf_unlnkdrules_mtx);
- uma_zdestroy(V_pf_mtag_z);
uma_zdestroy(V_pf_sources_z);
uma_zdestroy(V_pf_state_z);
uma_zdestroy(V_pf_state_key_z);
}
static int
-pf_mtag_init(void *mem, int size, int how)
+pf_mtag_uminit(void *mem, int size, int how)
{
struct m_tag *t;
@@ -865,7 +875,7 @@ static void
pf_mtag_free(struct m_tag *t)
{
- uma_zfree(V_pf_mtag_z, t);
+ uma_zfree(pf_mtag_z, t);
}
struct pf_mtag *
@@ -876,7 +886,7 @@ pf_get_mtag(struct mbuf *m)
if ((mtag = m_tag_find(m, PACKET_TAG_PF, NULL)) != NULL)
return ((struct pf_mtag *)(mtag + 1));
- mtag = uma_zalloc(V_pf_mtag_z, M_NOWAIT);
+ mtag = uma_zalloc(pf_mtag_z, M_NOWAIT);
if (mtag == NULL)
return (NULL);
bzero(mtag + 1, sizeof(struct pf_mtag));
Modified: stable/10/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_ioctl.c Sun Apr 27 08:22:44 2014 (r265007)
+++ stable/10/sys/netpfil/pf/pf_ioctl.c Sun Apr 27 09:05:34 2014 (r265008)
@@ -204,6 +204,8 @@ pfattach(void)
u_int32_t *my_timeout = V_pf_default_rule.timeout;
int error;
+ if (IS_DEFAULT_VNET(curvnet))
+ pf_mtag_initialize();
pf_initialize();
pfr_initialize();
pfi_initialize();
@@ -3721,6 +3723,8 @@ pf_unload(void)
pfr_cleanup();
pf_osfp_flush();
pf_cleanup();
+ if (IS_DEFAULT_VNET(curvnet))
+ pf_mtag_cleanup();
PF_RULES_WUNLOCK();
destroy_dev(pf_dev);
rw_destroy(&pf_rules_lock);