Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com>
To:     Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>,
        Ard Biesheuvel <ardb@kernel.org>
Cc:     Pankaj Gupta <pankaj.gupta@nxp.com>, linux-crypto@vger.kernel.org,
        NXP Linux Team <linux-imx@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH] crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks
Date:   Fri, 15 Oct 2021 10:39:18 +0300
Message-Id: <20211015073918.4837-1-horia.geanta@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZWJMNzM3UDAzMmRFeFI0UWw3ZGlVS0JSVktrZzFCbDNSajZLVzZPRlRkVXEx?=
 =?utf-8?B?RUhPbnAyUE9SYWJQNEZERW55N29lTDRFZ3hBelVudnFIcXFnR3VGYmxrZkI3?=
 =?utf-8?B?VE9MVnpxVUl1U0NCQjAzb1NmbTNRa2IwWFNua3VqOVdiTzF0Mk5mZ1U0Zzht?=
 =?utf-8?B?VUJkbVZ4Vk5jS1BuRkJ1V1BQWlgzMVNEUVNMWFRqYXByZ2UxZlpYMk5LUFRS?=
 =?utf-8?B?bjFncXk2ejNMdDUwVWxReWJvOFEzWkQ1VCtJNVF0Qk5TbjJoY2c2cGFFTTV6?=
 =?utf-8?B?cVcvUUdVWU1TT1pYZDVPN3V4ZnhwNDUvYURNMHdhNjh6S2pibDFITHF6dGl3?=
 =?utf-8?B?S1FheDhnYklSanY2NFp1UHZtMUR4bHd2dW54TlpDQTlDcHRtQmJJUDdoTDZj?=
 =?utf-8?B?dlhTMVJXN3h6dWZMMGRUdTBUMTFwWFlYNGtSQTZxKzJncVMrbjRXZzNsRUxo?=
 =?utf-8?B?QlhnUWEwcTRSdFBHMGlZVXRMbEhjQ0lJSHpjcW1mQnM0ZHhiR0xNS3dYS1pv?=
 =?utf-8?B?OThPMFQ1M09xQzJhc2hQdlJxQ0NRTkxrNEtaZWh1K1FWSnMxS3c3dlAxMlhM?=
 =?utf-8?B?Vnd1Zk0ySDlvbFAzaVgyUkhRSlBFWHZLRmxCY2xUOEZpY2hsWDFvMkRSR1pQ?=
 =?utf-8?B?MDQ1cFF4M3phR290QUU2cHFTRitGdnFTMGlkUk1JdW1tcUFBc1RLZmR0c0xh?=
 =?utf-8?B?N0V5Y3B4SXdhV0RBUFF2VW0wL0tleHE3L3VVSXVsbEoyM1UzREwyUktZSUUy?=
 =?utf-8?B?cEV0WlRNSit5UGpvMnd1cnloa3dDL09KT3NmWk53MXpvTjVLYkh2UlY3SEps?=
 =?utf-8?B?Z2hza3IySVRrcHJlYS9EUjdpOVg0RkwwUkhkYjdGeVlVY1BCUXBKQVZzK2NL?=
 =?utf-8?B?cTIwMUtXQ0EyMyt4OWJyKzZ4RXEva28yRE1uOVhIRjdZaEVBenE0Q0h5NjJm?=
 =?utf-8?B?VTJiYXZHMy9iUUo2OFFITnVJZXpkMFVTRFdhT0sxc0cyVHdueVFOdldubG9q?=
 =?utf-8?B?Wmd2ZWNIUVliRDVwN09DOWdIblNuVmI4alFoOXhRaXUzTGZWSFhkVGZpN0d1?=
 =?utf-8?B?NXVwb0hDbGtwQnJPejQ4bnllZ01mbzZhS0tFMFdrazIrRU9WZTU0L0w1WEQv?=
 =?utf-8?B?amtGdTdwRlZtWk9hYnV4cDhiRHIxMlFvVEF0cy9zZnFmUStzUThNZTE3L1B0?=
 =?utf-8?B?bFVQcmw2MDJFSFNKZEhrd09Zbk1vbkhUdG5lSVFJQklnUU1EWitTSEczOVdj?=
 =?utf-8?B?Wnd2TW5sVHZlR3JadW1YeGdldEZUMFFoNXlrTlg0QTM4SFlBSTE5MEM4NG9v?=
 =?utf-8?B?bWZMTUh6T1FuazRsVmw1RnRxc05rN281SU02OXlUZTY3aWVla1NkWmlQZ2J0?=
 =?utf-8?B?dVFVUStNVEFZc3Y4QWdua3YrWmp5L1Z3dUZNd3UxbllVRzNkYnJMT2xkYlgy?=
 =?utf-8?B?UWFjRTlpUWEzdmJWelNtWUkwMXBFS3ZXdWVsNmMrRCt2eWxqUkFCa1lIYVlE?=
 =?utf-8?B?eXFvOHpXN3BQRkxPSXk1THdXRDM2Qm5Bd21BZ1hvdCtlRHhuN1lrWmQwekNX?=
 =?utf-8?B?VHpPajZZWEJQWk16VWpuN3NvNGErZDlseks2OEJkQmZaUmNsTmF3NFVsUGxx?=
 =?utf-8?B?R0l5cjZld2dLMk1BNktSL2NaQS9CQkwreWlJVk0zcEpCUllManhPTmNLcWYv?=
 =?utf-8?B?UVg5V3lHOG9VWEQzQVV4b2pXaklGMnZabkgxcTZkcEtnMzhHcjhRSG5SRkZu?=
 =?utf-8?Q?/zuCEqxFa8ZPhR7bBvQsQeiRyt4WqSDBTRQD0DE?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bc2f43b1-0cb9-4e51-64e9-08d98faf145f
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2021 07:40:37.5659
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UQoshKrIyGiCyWAXMXzk4CbKobZBHFf44NwP4Ip9qy8DmnGh+BDAQDTJg2r4N1gJvOzt2Y8CgjTdhVmcPAUphA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2878
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Commit ad6d66bcac77e ("crypto: tcrypt - include 1420 byte blocks in aead and skcipher benchmarks")
mentions:
> power-of-2 block size. So let's add 1420 bytes explicitly, and round
> it up to the next blocksize multiple of the algo in question if it
> does not support 1420 byte blocks.
but misses updating skcipher multi-buffer tests.

Fix this by using the proper (rounded) input size.

Fixes: ad6d66bcac77e ("crypto: tcrypt - include 1420 byte blocks in aead and skcipher benchmarks")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
 crypto/tcrypt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 82b0400985a5..00149657a4bc 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1333,7 +1333,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs,
 
 			if (bs > XBUFSIZE * PAGE_SIZE) {
 				pr_err("template (%u) too big for buffer (%lu)\n",
-				       *b_size, XBUFSIZE * PAGE_SIZE);
+				       bs, XBUFSIZE * PAGE_SIZE);
 				goto out;
 			}
 
@@ -1386,8 +1386,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs,
 				memset(cur->xbuf[p], 0xff, k);
 
 				skcipher_request_set_crypt(cur->req, cur->sg,
-							   cur->sg, *b_size,
-							   iv);
+							   cur->sg, bs, iv);
 			}
 
 			if (secs) {
-- 
2.17.1