From 5909f744cbc3ee2df7e4f0384e69f2c85f4c2f09 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 9 Jul 2013 16:27:14 +0800
Subject: [PATCH] radix: Unshare radix mask tree resources

- Make free mask list per-cpu
- Embed mask last zeroed position into mask radix tree head
---
 sys/net/radix.c | 20 ++++++++++----------
 sys/net/radix.h |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sys/net/radix.c b/sys/net/radix.c
index fe0e5a9136..2724dbaa03 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -63,7 +63,7 @@ static struct radix_node
     *rn_search(const char *, struct radix_node *),
     *rn_search_m(const char *, struct radix_node *, const char *);
 
-static struct radix_mask *rn_mkfreelist;
+static struct radix_mask *rn_mkfreelist[MAXCPU];
 static struct radix_node_head *mask_rnheads[MAXCPU];
 
 static char rn_zeros[RN_MAXKEYLEN];
@@ -432,7 +432,6 @@ rn_addmask(char *netmask, boolean_t search, int skip,
 	char *cp, *cplim;
 	int b = 0, mlen, m0, j;
 	boolean_t maskduplicated, isnormal;
-	static int last_zeroed = 0;
 	char *addmask_key;
 
 	if ((mlen = clen(netmask)) > RN_MAXKEYLEN)
@@ -455,14 +454,14 @@ rn_addmask(char *netmask, boolean_t search, int skip,
 		cp--;
 	mlen = cp - addmask_key;
 	if (mlen <= skip) {
-		if (m0 >= last_zeroed)
-			last_zeroed = mlen;
+		if (m0 >= mask_rnh->rnh_last_zeroed)
+			mask_rnh->rnh_last_zeroed = mlen;
 		Free(addmask_key);
 		return (mask_rnh->rnh_nodes);
 	}
-	if (m0 < last_zeroed)
-		bzero(addmask_key + m0, last_zeroed - m0);
-	*addmask_key = last_zeroed = mlen;
+	if (m0 < mask_rnh->rnh_last_zeroed)
+		bzero(addmask_key + m0, mask_rnh->rnh_last_zeroed - m0);
+	*addmask_key = mask_rnh->rnh_last_zeroed = mlen;
 	x = rn_search(addmask_key, mask_rnh->rnh_treetop);
 	if (x->rn_key == NULL) {
 		kprintf("WARNING: radix_node->rn_key is NULL rn=%p\n", x);
@@ -531,7 +530,7 @@ rn_new_radix_mask(struct radix_node *tt, struct radix_mask *nextmask)
 {
 	struct radix_mask *m;
 
-	m = MKGet(&rn_mkfreelist);
+	m = MKGet(&rn_mkfreelist[mycpuid]);
 	if (m == NULL) {
 		log(LOG_ERR, "Mask for route not entered\n");
 		return (NULL);
@@ -713,6 +712,7 @@ rn_delete(char *key, char *netmask, struct radix_node_head *head)
 	struct radix_mask *m, *saved_m, **mp;
 	struct radix_node *dupedkey, *saved_tt, *top;
 	int b, head_off, klen;
+	int cpu = mycpuid;
 
 	x = head->rnh_treetop;
 	tt = rn_search(key, x);
@@ -761,7 +761,7 @@ rn_delete(char *key, char *netmask, struct radix_node_head *head)
 	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_next)
 		if (m == saved_m) {
 			*mp = m->rm_next;
-			MKFree(&rn_mkfreelist, m);
+			MKFree(&rn_mkfreelist[cpu], m);
 			break;
 		}
 	if (m == NULL) {
@@ -855,7 +855,7 @@ on1:
 
 					x->rn_mklist = NULL;
 					if (--(m->rm_refs) < 0)
-						MKFree(&rn_mkfreelist, m);
+						MKFree(&rn_mkfreelist[cpu], m);
 					m = mm;
 				}
 			if (m)
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 3a59c1b21b..74694ddd96 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -159,8 +159,9 @@ struct radix_node_head {
 
 	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
 
+	int	rnh_last_zeroed;		/* mask last zeroed length */
+
 	/* unused entries */
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
 	int	rnh_pktsize;		/* permit, but not require fixed keys */
 	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
 		    (void *v, char *mask,
-- 
2.41.0