From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 06:01:09 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 17B193B2; Sun, 16 Nov 2014 06:01:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CCAD43B0
 for <perforce@freebsd.org>; Sun, 16 Nov 2014 06:01:08 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 B9E87CB6
 for <perforce@freebsd.org>; Sun, 16 Nov 2014 06:01:08 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sAG618dC048901
 for <perforce@freebsd.org>; Sun, 16 Nov 2014 06:01:08 GMT
 (envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sAG618Yp048898
 for perforce@freebsd.org; Sun, 16 Nov 2014 06:01:08 GMT
 (envelope-from jmg@freebsd.org)
Date: Sun, 16 Nov 2014 06:01:08 GMT
Message-Id: <201411160601.sAG618Yp048898@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Subject: PERFORCE change 1202878 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Nov 2014 06:01:09 -0000

http://p4web.freebsd.org/@@1202878?ac=10

Change 1202878 by jmg@jmg_carbon2 on 2014/11/16 06:00:34

	reenable avoid allocation of memory for single mbufs...  I wasn't
	taking into account the crd_skip...  All of these need to take
	this into account, so pull it out of the set of if statements..
	
	Sponsored by:	FreeBSD Foundation
	Sponsored by:	Netgate

Affected files ...

.. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#16 edit

Differences ...

==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#16 (text+ko) ====

@@ -382,7 +382,6 @@
 	uint8_t *addr;
 
 	if (crp->crp_flags & CRYPTO_F_IMBUF) {
-		goto alloc;
 		m = (struct mbuf *)crp->crp_buf;
 		if (m->m_next != NULL)
 			goto alloc;
@@ -392,10 +391,11 @@
 		if (uio->uio_iovcnt != 1)
 			goto alloc;
 		iov = uio->uio_iov;
-		addr = (uint8_t *)iov->iov_base + enccrd->crd_skip;
+		addr = (uint8_t *)iov->iov_base;
 	} else
 		addr = (uint8_t *)crp->crp_buf;
 	*allocated = 0;
+	addr += enccrd->crd_skip;
 	return (addr);
 
 alloc: