From owner-svn-src-projects@freebsd.org  Tue Nov 22 12:29:25 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6659C4C703
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 22 Nov 2016 12:29:25 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7342EFCC;
 Tue, 22 Nov 2016 12:29:25 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMCTOGY028612;
 Tue, 22 Nov 2016 12:29:24 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMCTOjj028611;
 Tue, 22 Nov 2016 12:29:24 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201611221229.uAMCTOjj028611@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 22 Nov 2016 12:29:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r308994 - projects/ipsec/sys/netipsec
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Nov 2016 12:29:25 -0000

Author: ae
Date: Tue Nov 22 12:29:24 2016
New Revision: 308994
URL: https://svnweb.freebsd.org/changeset/base/308994

Log:
  Add key_lft_zone UMA zone to keep PCPU current lifetime counters.

Modified:
  projects/ipsec/sys/netipsec/key.c

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Tue Nov 22 12:23:55 2016	(r308993)
+++ projects/ipsec/sys/netipsec/key.c	Tue Nov 22 12:29:24 2016	(r308994)
@@ -59,6 +59,8 @@
 #include <sys/refcount.h>
 #include <sys/syslog.h>
 
+#include <vm/uma.h>
+
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/vnet.h>
@@ -462,6 +464,9 @@ MALLOC_DEFINE(M_IPSEC_MISC, "ipsec-misc"
 MALLOC_DEFINE(M_IPSEC_SAQ, "ipsec-saq", "ipsec sa acquire");
 MALLOC_DEFINE(M_IPSEC_SAR, "ipsec-reg", "ipsec sa acquire");
 
+static VNET_DEFINE(uma_zone_t, key_lft_zone);
+#define	V_key_lft_zone		VNET(key_lft_zone)
+
 /*
  * set parameters into secpolicyindex buffer.
  * Must allocate secpolicyindex buffer passed to this function.
@@ -7438,6 +7443,10 @@ key_init(void)
 	for (i = 0; i < IPSEC_DIR_MAX; i++)
 		TAILQ_INIT(&V_sptree[i]);
 
+	V_key_lft_zone = uma_zcreate("IPsec SA lft_c",
+	    sizeof(uint64_t) * 2, NULL, NULL, NULL, NULL,
+	    UMA_ALIGN_PTR, UMA_ZONE_PCPU);
+
 	LIST_INIT(&V_sahtree);
 	V_sphashtbl = hashinit(SPHASH_NHASH, M_IPSEC_SP, &V_sphash_mask);
 	V_savhashtbl = hashinit(SAVHASH_NHASH, M_IPSEC_SA, &V_savhash_mask);
@@ -7542,6 +7551,7 @@ key_destroy(void)
 		}
 	}
 	SPACQ_UNLOCK();
+	uma_zdestroy(V_key_lft_zone);
 }
 #endif