From owner-svn-src-projects@freebsd.org  Fri Jan 20 17:21:01 2017
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 26964CB9CE4
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 20 Jan 2017 17:21:01 +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 E8DB6122B;
 Fri, 20 Jan 2017 17:21:00 +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 v0KHL0cv040230;
 Fri, 20 Jan 2017 17:21:00 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KHL0ov040229;
 Fri, 20 Jan 2017 17:21:00 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201701201721.v0KHL0ov040229@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: Fri, 20 Jan 2017 17:21:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r312545 - 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: Fri, 20 Jan 2017 17:21:01 -0000

Author: ae
Date: Fri Jan 20 17:20:59 2017
New Revision: 312545
URL: https://svnweb.freebsd.org/changeset/base/312545

Log:
  Count more malloc fails in the PFKEY statistics.

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

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Fri Jan 20 17:16:48 2017	(r312544)
+++ projects/ipsec/sys/netipsec/key.c	Fri Jan 20 17:20:59 2017	(r312545)
@@ -2659,8 +2659,10 @@ key_newsah(struct secasindex *saidx)
 
 	sah = malloc(sizeof(struct secashead), M_IPSEC_SAH,
 	    M_NOWAIT | M_ZERO);
-	if (sah == NULL)
+	if (sah == NULL) {
+		PFKEYSTAT_INC(in_nomem);
 		return (NULL);
+	}
 	TAILQ_INIT(&sah->savtree_larval);
 	TAILQ_INIT(&sah->savtree_alive);
 	sah->saidx = *saidx;
@@ -2746,12 +2748,14 @@ key_newsav(const struct sadb_msghdr *mhp
 
 	sav = malloc(sizeof(struct secasvar), M_IPSEC_SA, M_NOWAIT | M_ZERO);
 	if (sav == NULL) {
+		PFKEYSTAT_INC(in_nomem);
 		ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__));
 		*errp = ENOBUFS;
 		goto done;
 	}
 	sav->lft_c = uma_zalloc(V_key_lft_zone, M_NOWAIT);
 	if (sav->lft_c == NULL) {
+		PFKEYSTAT_INC(in_nomem);
 		ipseclog((LOG_DEBUG, "%s: No more memory.\n", __func__));
 		free(sav, M_IPSEC_SA), sav = NULL;
 		*errp = ENOBUFS;