From patchwork Thu Nov 30 10:09:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 120097 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp470112qgn; Thu, 30 Nov 2017 02:11:14 -0800 (PST) X-Google-Smtp-Source: AGs4zMZjvbbPzSo/8aPmT6Egoxqv1rM/HQAVKERM5kvDM/1cdqnNMSBwtQEJGvdY6jx9pzoxbXJi X-Received: by 10.99.120.195 with SMTP id t186mr1919017pgc.62.1512036673963; Thu, 30 Nov 2017 02:11:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512036673; cv=none; d=google.com; s=arc-20160816; b=zhe0LHDnEmmrzLRMbJRFunKYJTDkKLWTuFAHX/WKjD1MgQ9NeLdA3A+01b56KOnaZw 8eolbOrkhpCwHvAIk1gihYhPA8N7YsBgt3LRZq4PYUzBAXsBetXktgg/GN3ArxZvlVUr PHzLKjA1YgdWonmaiZ9PyzjQpfKLF+1efuvEHAI6fJ0sGCiCJws7Dcl84VHLuh+ujv/4 oMW6/DVz1ZuluOfcdrN5g68JIcQ6ZqD4AtHpJlH3f83ZuApv++nGvom5+m6nsfX93sex 6EG1Gk88c6uCwMquhgJgUjO265T0xSeqaAFk40tjasg9O3qFZxR7HKu8s70o8H7d1XRP 9C+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=zqGX5q3T4qa6+mtYHqt28Z1oih4RuxdZWEfwvgKB3YE=; b=nfZJiiZ9UtJYsRise5FcWZ3SjorAugtwMyqnDRU4yoe4xlXodT6RT3uhdSRRnm3ZSm 5McrDmJzyYXIfCDNbvuQiRak9wtGINCDMM1pK6ysAAEG6uI1LnIiBI8nZfGTZsrhtnxy EWLOdSVz1Or0UhnSXbpCRw03mlpTlCF/t+LNr/0UJ6KYSA+KQOiGmL/G9swZrJ03guv7 jxwszcZRMnaHm3+1YzIh8X7HLzeLyOnGU6v650v/4xCTARcHIoDWHRZSR4ONk9qmmzTS +bIJe65ZGcn+eHbHPeQmCsTP7QwDM08u66bMBS3ija5aoehUmrHiQ/MBvwtghKro5xiV K97A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a61si2571384pla.121.2017.11.30.02.11.13; Thu, 30 Nov 2017 02:11:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752604AbdK3KLM (ORCPT + 26 others); Thu, 30 Nov 2017 05:11:12 -0500 Received: from foss.arm.com ([217.140.101.70]:50212 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752149AbdK3KJr (ORCPT ); Thu, 30 Nov 2017 05:09:47 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2981415A2; Thu, 30 Nov 2017 02:09:47 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.154]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C13E13F246; Thu, 30 Nov 2017 02:09:45 -0800 (PST) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" Cc: Ofir Drang , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] crypto: tcrypt: fix AEAD decryption speed test Date: Thu, 30 Nov 2017 10:09:28 +0000 Message-Id: <1512036574-26665-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512036574-26665-1-git-send-email-gilad@benyossef.com> References: <1512036574-26665-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The AEAD speed test pretended to support decryption, however that support was broken as decryption requires a valid auth field which the test did not provide. Fix this by running the encryption path once with inout/output sgls switched to calculate the auth field prior to performing decryption speed tests. Signed-off-by: Gilad Ben-Yossef --- crypto/tcrypt.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index d1fd033..56fb6a6 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -327,10 +327,30 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, sg_set_buf(&sg[0], assoc, aad_size); sg_set_buf(&sgout[0], assoc, aad_size); + aead_request_set_ad(req, aad_size); + + if (!enc) { + + /* + * For decryption we need a proper auth so + * we do the encryption path once with buffers + * reversed (input <-> output) to calculate it + */ + aead_request_set_crypt(req, sgout, sg, + *b_size, iv); + ret = do_one_aead_op(req, + crypto_aead_encrypt(req)); + + if (ret) { + pr_err("calculating auth failed failed (%d)\n", + ret); + break; + } + } + aead_request_set_crypt(req, sg, sgout, *b_size + (enc ? 0 : authsize), iv); - aead_request_set_ad(req, aad_size); if (secs) ret = test_aead_jiffies(req, enc, *b_size, @@ -1564,16 +1584,24 @@ static int do_test(const char *alg, u32 type, u32 mask, int m) NULL, 0, 16, 16, aead_speed_template_20); test_aead_speed("gcm(aes)", ENCRYPT, sec, NULL, 0, 16, 8, speed_template_16_24_32); + test_aead_speed("rfc4106(gcm(aes))", DECRYPT, sec, + NULL, 0, 16, 16, aead_speed_template_20); + test_aead_speed("gcm(aes)", DECRYPT, sec, + NULL, 0, 16, 8, speed_template_16_24_32); break; case 212: test_aead_speed("rfc4309(ccm(aes))", ENCRYPT, sec, NULL, 0, 16, 16, aead_speed_template_19); + test_aead_speed("rfc4309(ccm(aes))", DECRYPT, sec, + NULL, 0, 16, 16, aead_speed_template_19); break; case 213: test_aead_speed("rfc7539esp(chacha20,poly1305)", ENCRYPT, sec, NULL, 0, 16, 8, aead_speed_template_36); + test_aead_speed("rfc7539esp(chacha20,poly1305)", DECRYPT, sec, + NULL, 0, 16, 8, aead_speed_template_36); break; case 214: