From patchwork Wed Oct 26 19:16:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Venkataramanan X-Patchwork-Id: 13021159 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21889C38A2D for ; Wed, 26 Oct 2022 19:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234920AbiJZTPx (ORCPT ); Wed, 26 Oct 2022 15:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234994AbiJZTPk (ORCPT ); Wed, 26 Oct 2022 15:15:40 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B79A915FDD for ; Wed, 26 Oct 2022 12:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666811738; x=1698347738; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rIy1pm1E3UTsh2lHEs2DoJFDIsysiXeoPioWwBYIRDg=; b=cyj8ZSdEwv4prF589lQUMCdtP5GzI0Gf1dSAOqMndDrh0rsaNLIcjCiO pqjvI93y4qxWFoAeTD2hWmZMDsfFQOMhoGl+7SDBLr17a30+MeiP71lBX wCzH008pKL068HfZF/0GLaiYT9QwVKUdu7KswRy7ht5VwrWYbqk4McXOs k2aKbUvo56okp3Wzq2Qs2YJIA2xRkfGBsErTuSTfAFBmyuNRgEL8bxXGC WdD4nTfHWdl3Ay4t+lISRFDD1GhWi9/Y6o/916x71Ea28vk/QIO6Q2PNc qo/n75avjo/iOqKBZCJ+qrtEjTRs827JIM/ND4z/WnsS07dfzi4YKDWW0 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="334662185" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="334662185" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 12:15:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="757430826" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="757430826" Received: from avenkata-desk0.sc.intel.com ([172.25.112.42]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2022 12:15:18 -0700 From: Anirudh Venkataramanan To: Herbert Xu , linux-crypto@vger.kernel.org Cc: Robert Elliott , Anirudh Venkataramanan Subject: [PATCH v2 1/4] crypto: tcrypt - Use pr_cont to print test results Date: Wed, 26 Oct 2022 12:16:13 -0700 Message-Id: <20221026191616.9169-2-anirudh.venkataramanan@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> References: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org For some test cases, a line break gets inserted between the test banner and the results. For example, with mode=211 this is the output: [...] testing speed of rfc4106(gcm(aes)) (rfc4106-gcm-aesni) encryption [...] test 0 (160 bit key, 16 byte blocks): [...] 1 operation in 2373 cycles (16 bytes) --snip-- [...] testing speed of gcm(aes) (generic-gcm-aesni) encryption [...] test 0 (128 bit key, 16 byte blocks): [...] 1 operation in 2338 cycles (16 bytes) Similar behavior is seen in the following cases as well: modprobe tcrypt mode=212 modprobe tcrypt mode=213 modprobe tcrypt mode=221 modprobe tcrypt mode=300 sec=1 modprobe tcrypt mode=400 sec=1 This doesn't happen with mode=215: [...] tcrypt: testing speed of multibuffer rfc4106(gcm(aes)) (rfc4106-gcm-aesni) encryption [...] tcrypt: test 0 (160 bit key, 16 byte blocks): 1 operation in 2215 cycles (16 bytes) --snip-- [...] tcrypt: testing speed of multibuffer gcm(aes) (generic-gcm-aesni) encryption [...] tcrypt: test 0 (128 bit key, 16 byte blocks): 1 operation in 2191 cycles (16 bytes) This print inconsistency is because printk() is used instead of pr_cont() in a few places. Change these to be pr_cont(). checkpatch warns that pr_cont() shouldn't be used. This can be ignored in this context as tcrypt already uses pr_cont(). Signed-off-by: Anirudh Venkataramanan --- Changes v1 -> v2: Rebase to tag v6.1-p2 --- crypto/tcrypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index a82679b..6aed45c 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -506,8 +506,8 @@ static int test_aead_cycles(struct aead_request *req, int enc, int blen) out: if (ret == 0) - printk("1 operation in %lu cycles (%d bytes)\n", - (cycles + 4) / 8, blen); + pr_cont("1 operation in %lu cycles (%d bytes)\n", + (cycles + 4) / 8, blen); return ret; } @@ -727,8 +727,8 @@ static int test_ahash_jiffies_digest(struct ahash_request *req, int blen, return ret; } - printk("%6u opers/sec, %9lu bytes/sec\n", - bcount / secs, ((long)bcount * blen) / secs); + pr_cont("%6u opers/sec, %9lu bytes/sec\n", + bcount / secs, ((long)bcount * blen) / secs); return 0; } From patchwork Wed Oct 26 19:16:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Venkataramanan X-Patchwork-Id: 13021163 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25EDFFA373E for ; Wed, 26 Oct 2022 19:16:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234565AbiJZTP6 (ORCPT ); Wed, 26 Oct 2022 15:15:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235005AbiJZTPn (ORCPT ); Wed, 26 Oct 2022 15:15:43 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31EC74684D for ; Wed, 26 Oct 2022 12:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666811743; x=1698347743; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mK1z+lgAAA6HzwL5SvTV3An8gucz7W/J956Gwuujhn8=; b=M+ANFQ24jjwB3+WZzTFrmpWGTrTyy1sB+zYnNgoyuSijf0TS1VLn+ZP1 hUGIpf1cAhyXXU4pWhE46493Q6I0UqWuUfSdOpwdmi6d2VdiFylY5UKVL r57RqDfRQh7Esrf2Y4zZnzsXY1M1lZZRzzc0bgUVoQh+FhjX2ActGD6zC ZSN+j4PY6owVWvyzniaFp0iAEeAJGOWS/Pf5fxhl3DB2jEcWRiLEaQ/Z9 lvgLi50QR6yR21JppsCtE/a3ijHqn2irRGwL59H7KV3dwU1cGubWyxSgi /bCNHGETBd4AtoLnsr1SNzZphPuFsGjI+rFU0EhKxgTmLSR69QEow1y65 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="334662186" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="334662186" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 12:15:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="757430831" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="757430831" Received: from avenkata-desk0.sc.intel.com ([172.25.112.42]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2022 12:15:19 -0700 From: Anirudh Venkataramanan To: Herbert Xu , linux-crypto@vger.kernel.org Cc: Robert Elliott , Anirudh Venkataramanan Subject: [PATCH v2 2/4] crypto: tcrypt - Use pr_info/pr_err Date: Wed, 26 Oct 2022 12:16:14 -0700 Message-Id: <20221026191616.9169-3-anirudh.venkataramanan@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> References: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Currently, there's mixed use of printk() and pr_info()/pr_err(). The latter prints the module name (because pr_fmt() is defined so) but the former does not. As a result there's inconsistency in the printed output. For example: modprobe mode=211: [...] test 0 (160 bit key, 16 byte blocks): 1 operation in 2320 cycles (16 bytes) [...] test 1 (160 bit key, 64 byte blocks): 1 operation in 2336 cycles (64 bytes) modprobe mode=215: [...] tcrypt: test 0 (160 bit key, 16 byte blocks): 1 operation in 2173 cycles (16 bytes) [...] tcrypt: test 1 (160 bit key, 64 byte blocks): 1 operation in 2241 cycles (64 bytes) Replace all instances of printk() with pr_info()/pr_err() so that the module name is printed consistently. Signed-off-by: Anirudh Venkataramanan --- Changes v1 -> v2: Rebase to tag v6.1-p2, resolve conflicts --- crypto/tcrypt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 6aed45c..d380ff8 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -575,8 +575,8 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, } crypto_init_wait(&wait); - printk(KERN_INFO "\ntesting speed of %s (%s) %s\n", algo, - get_driver_name(crypto_aead, tfm), e); + pr_info("\ntesting speed of %s (%s) %s\n", algo, + get_driver_name(crypto_aead, tfm), e); req = aead_request_alloc(tfm, GFP_KERNEL); if (!req) { @@ -624,8 +624,8 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, memset(iv, 0xff, iv_len); crypto_aead_clear_flags(tfm, ~0); - printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ", - i, *keysize * 8, bs); + pr_info("test %u (%d bit key, %d byte blocks): ", + i, *keysize * 8, bs); memset(tvmem[0], 0xff, PAGE_SIZE); @@ -877,8 +877,8 @@ static void test_ahash_speed_common(const char *algo, unsigned int secs, return; } - printk(KERN_INFO "\ntesting speed of async %s (%s)\n", algo, - get_driver_name(crypto_ahash, tfm)); + pr_info("\ntesting speed of async %s (%s)\n", algo, + get_driver_name(crypto_ahash, tfm)); if (crypto_ahash_digestsize(tfm) > MAX_DIGEST_SIZE) { pr_err("digestsize(%u) > %d\n", crypto_ahash_digestsize(tfm), @@ -2885,7 +2885,7 @@ static int __init tcrypt_mod_init(void) err = do_test(alg, type, mask, mode, num_mb); if (err) { - printk(KERN_ERR "tcrypt: one or more tests failed!\n"); + pr_err("one or more tests failed!\n"); goto err_free_tv; } else { pr_debug("all tests passed\n"); From patchwork Wed Oct 26 19:16:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Venkataramanan X-Patchwork-Id: 13021161 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8086C433FE for ; Wed, 26 Oct 2022 19:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233473AbiJZTP4 (ORCPT ); Wed, 26 Oct 2022 15:15:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234998AbiJZTPn (ORCPT ); Wed, 26 Oct 2022 15:15:43 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B09220F4B for ; Wed, 26 Oct 2022 12:15:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666811740; x=1698347740; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RITt5TGcuKkow+MO1NXZ10BR1D+1ocjCoXNF0jm33sM=; b=Oa4EnT+EdQScGFP5/I3PVVNsa8a2MZL05//mmaI3KMf8A7dtiNOAixmI CjM4QCbAdXPsi8Z02GojYYjf1i/P9syIYTtWsqf/GbiaNSuMWQSESdMTU miIjgRJ5qM6501dqlbSvsIsjXPcoZz33yDU30blfG9P8Jd/zHm6nuAvhD vxJj0ZYnEicrVjXtgT0HRII+OvA7wKhQ13DvjIJm1aek81JKp3bOxndGq Y6MPU3mtNUdnGkB7t1NeB4Xnr8MlsGBy+oXTnbJSMJ5yIrxgDf5Cf7XtA 4/qh8xu/T8D4ylCaXb8k2KK7Z3ZapTZTOHqSKLTS/vmeJoLlNuGFQtspo g==; X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="334662187" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="334662187" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 12:15:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="757430836" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="757430836" Received: from avenkata-desk0.sc.intel.com ([172.25.112.42]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2022 12:15:19 -0700 From: Anirudh Venkataramanan To: Herbert Xu , linux-crypto@vger.kernel.org Cc: Robert Elliott , Anirudh Venkataramanan Subject: [PATCH v2 3/4] crypto: tcrypt - Drop module name from print string Date: Wed, 26 Oct 2022 12:16:15 -0700 Message-Id: <20221026191616.9169-4-anirudh.venkataramanan@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> References: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The pr_fmt() define includes KBUILD_MODNAME, and so there's no need for pr_err() to also print it. Drop module name from the print string. Signed-off-by: Anirudh Venkataramanan --- Changes v1 -> v2: Rebase to tag v6.1-p2 --- crypto/tcrypt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index d380ff8..2878d0e 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1329,8 +1329,7 @@ static void test_skcipher_speed(const char *algo, int enc, unsigned int secs, req = skcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { - pr_err("tcrypt: skcipher: Failed to allocate request for %s\n", - algo); + pr_err("skcipher: Failed to allocate request for %s\n", algo); goto out; } From patchwork Wed Oct 26 19:16:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Venkataramanan X-Patchwork-Id: 13021162 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9323FECDFA1 for ; Wed, 26 Oct 2022 19:15:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234460AbiJZTP5 (ORCPT ); Wed, 26 Oct 2022 15:15:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235004AbiJZTPn (ORCPT ); Wed, 26 Oct 2022 15:15:43 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E8FA60CB for ; Wed, 26 Oct 2022 12:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666811743; x=1698347743; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Bhkap2igs6sTW14iN9WOb9LJ/lQI/UrGD8kgMMJInos=; b=Uo90X4ibA/D1O7tu8F2Zq7fn7pQXqxyCtjFCbfLUijOS6iKgCsB/p97a 7uaOeA+kynSQaw/BQs6FvpE6ehNmE3TWOowgJr9IJTToJrmc4yLIdTpqc TDU3A+p4Q9ryI94OyW4gOKRxF/0AiZevmXoIYgl0RZ9oEa1t9oebnPLNV CqYHzcLRTKSHQTtOpnq4JCP0Ot8ZPgK+WCWLh+N1nuDHKcppv3gnUwzPJ 8cyStRJhArsuxec3XWuro/uas4OsJlyRVlsL1RA4jclQJMePZ0jXgn/3Z zoE2ZEUjEvyk+6ZIxRkdoedzV/kUb0FIgmuuB5sqZZyNvwKkwenuT39Gd A==; X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="334662188" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="334662188" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Oct 2022 12:15:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="757430841" X-IronPort-AV: E=Sophos;i="5.95,215,1661842800"; d="scan'208";a="757430841" Received: from avenkata-desk0.sc.intel.com ([172.25.112.42]) by orsmga004.jf.intel.com with ESMTP; 26 Oct 2022 12:15:19 -0700 From: Anirudh Venkataramanan To: Herbert Xu , linux-crypto@vger.kernel.org Cc: Robert Elliott , Anirudh Venkataramanan Subject: [PATCH v2 4/4] crypto: tcrypt - Drop leading newlines from prints Date: Wed, 26 Oct 2022 12:16:16 -0700 Message-Id: <20221026191616.9169-5-anirudh.venkataramanan@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> References: <20221026191616.9169-1-anirudh.venkataramanan@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The top level print banners have a leading newline. It's not entirely clear why this exists, but it makes it harder to parse tcrypt test output using a script. Drop said newlines. tcrypt output before this patch: [...] testing speed of rfc4106(gcm(aes)) (rfc4106-gcm-aesni) encryption [...] test 0 (160 bit key, 16 byte blocks): 1 operation in 2320 cycles (16 bytes) tcrypt output with this patch: [...] testing speed of rfc4106(gcm(aes)) (rfc4106-gcm-aesni) encryption [...] test 0 (160 bit key, 16 byte blocks): 1 operation in 2320 cycles (16 bytes) Signed-off-by: Anirudh Venkataramanan --- Changes v1 -> v2: Rebase to tag v6.1-p2 --- crypto/tcrypt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 2878d0e..af3ea95 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -324,7 +324,7 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs, crypto_req_done, &data[i].wait); } - pr_info("\ntesting speed of multibuffer %s (%s) %s\n", algo, + pr_info("testing speed of multibuffer %s (%s) %s\n", algo, get_driver_name(crypto_aead, tfm), e); i = 0; @@ -575,7 +575,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, } crypto_init_wait(&wait); - pr_info("\ntesting speed of %s (%s) %s\n", algo, + pr_info("testing speed of %s (%s) %s\n", algo, get_driver_name(crypto_aead, tfm), e); req = aead_request_alloc(tfm, GFP_KERNEL); @@ -877,7 +877,7 @@ static void test_ahash_speed_common(const char *algo, unsigned int secs, return; } - pr_info("\ntesting speed of async %s (%s)\n", algo, + pr_info("testing speed of async %s (%s)\n", algo, get_driver_name(crypto_ahash, tfm)); if (crypto_ahash_digestsize(tfm) > MAX_DIGEST_SIZE) { @@ -1117,7 +1117,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs, crypto_init_wait(&data[i].wait); } - pr_info("\ntesting speed of multibuffer %s (%s) %s\n", algo, + pr_info("testing speed of multibuffer %s (%s) %s\n", algo, get_driver_name(crypto_skcipher, tfm), e); i = 0; @@ -1324,7 +1324,7 @@ static void test_skcipher_speed(const char *algo, int enc, unsigned int secs, return; } - pr_info("\ntesting speed of %s %s (%s) %s\n", async ? "async" : "sync", + pr_info("testing speed of %s %s (%s) %s\n", async ? "async" : "sync", algo, get_driver_name(crypto_skcipher, tfm), e); req = skcipher_request_alloc(tfm, GFP_KERNEL);