Received: by 2002:ab2:69cc:0:b0:1fd:c486:4f03 with SMTP id n12csp105854lqp; Mon, 10 Jun 2024 20:49:50 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUVrlh+XI+NPb7CV2yhYzhUjgICA+xy9s0+AgmHfR6JxLjE6cGVR4/1/ZvlwokE+76fQCDIhoPTMIa81gLA7krpNwG7m0b3UK+yrW3v1w== X-Google-Smtp-Source: AGHT+IFBQH3nekChlYiJv2O7dnVlwUPBdKYMm5WaKgPvq+lgWd85++vT8wf3mUUZiVaaBVfuQnPn X-Received: by 2002:a05:6e02:b46:b0:374:ad7c:948d with SMTP id e9e14a558f8ab-375802f0460mr138223015ab.6.1718077790625; Mon, 10 Jun 2024 20:49:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718077790; cv=pass; d=google.com; s=arc-20160816; b=sbKeWED+asnHNFxf3gOtwXbiqOK85r6KZZJldZq/7ob+YNAQG/8NV54KSt0QWHdvTi e7qtstvmdYtRL6dkbml1lveAbNNjrhMXNz45EG4WWZzovIrLKOtU7NCtlGdMNo6uuDFv ZFCbd1ZMbcL1axFL+f4k7CUSpW1B+olErI0HGiKTJWCYsLd/xkTNWh5s20ze+Tcc0ZIQ 5dmnO5nlvj7HF6y4Eo7BMjoPTOgE2o8kUBYIucadGzoFASjTZq9fruizmkS8trPRvEcz T0bkGdfKBzVooP9b6TVrhL+9ttK9FyoDBRQN7vFX9+H1cvrCOjZUOzkFBap4fpxQtEl5 kV6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=d3bUn9OdEn5urt5L34gUkML2k+8zj7ckPlu2hVqqIAE=; fh=VNAK3rZTmzGmLjsPiuN/ds8cSSZe1Uv1lmlL2pGWyq4=; b=s8Ag622Pzz+9wpUJCHZ1HndtTuBk70EtHBpYYGvClrf+MCaGry6KygStk4cFfAIkQg KB5YaGcIc4ulkNDuunZAx4aYRfwsGktwsNGCvJ8xbBdWgQT4FMKKl+rMrV7miydk7x2D r0uO0FnZ9sDcamc5Op8VhExvEu/V0+ijrQaI2fEvvS9WCNsNor6EEk6YNYyELNE7ZUts +ma1JU5v1Nf+U58sUyjFGSwWZ0GFt9M8Wz9hyihwJqS09wqkB5mIfciRerkcFany4rip vNC5GTh6SLctE6hjrtkaTez0ooA8xtqjpNJ1eKcQbTQImwM392PHPqJIkAIp7O65Jt8H 9/Nw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=btEFbByb; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-4878-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4878-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 41be03b00d2f7-6e79e66e58dsi5092967a12.893.2024.06.10.20.49.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 20:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto+bounces-4878-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=btEFbByb; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-4878-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4878-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 3B46D284F7D for ; Tue, 11 Jun 2024 03:49:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A43F5170842; Tue, 11 Jun 2024 03:49:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="btEFbByb" X-Original-To: linux-crypto@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D9E22AE8C; Tue, 11 Jun 2024 03:49:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718077752; cv=none; b=ECAXijXxt7Oo6LExHFtA6PhA5LSwDrzzYJUKtX65kBFQquLfB5RRknB4SZ4/zzJk9ut+suCU47hX8hrdOe+uUvtRS1r4a/Om/kQjeCUuPMWUjIr9acgyhDDg5OC/CVQ93eumgY3R7nY7GPJ4cAQ3b3lAVTNe0WzdAVjEnZzQK1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718077752; c=relaxed/simple; bh=mgcA9/VaAhfYwv9la52xMjo9QqbTPlUl/g1+mlouqB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dXOp2ngJlBl0+pSOCFm9T4ETCJ0AFRPgApuN0BKMuIrB9qDvUNloQYCdjx83zL5dGbC+A2+Ih/oZX0pJ3EUwE75Bvzjhe+a9eGbKOSGQF6SQ1KK3NfRZ9rSAJ7MbgwwXPshkiN1ZkSKPa/wtidL+1KqlDY7HWB1nLn4CUxHxhvc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=btEFbByb; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA8C1C4AF50; Tue, 11 Jun 2024 03:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718077752; bh=mgcA9/VaAhfYwv9la52xMjo9QqbTPlUl/g1+mlouqB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=btEFbBybYfQoYZS2SiozNCZ1BjxvwNT0An0mVIQTGgdGckaedJXxRm+dsEEu0Uvt6 IQz0Ya6Rt+NOzOsibq24OQkCn4MVgITo9HuG5RzC+ibgmLNUyTue8f3V3bwr2gQYsi XxTtuZSCkQWfU0RrGblvpiPc6RYdRiNjTncLCPOPTHr4+R7rHoTJmcnjqOlPhkTbjX H2T3n9cQQDaCoUTmWfKJIJW5ecOCymfyfF9sjMx93d0MLC8OWGk88ckyTy7GqqIELc Ikh/ntyucjxh7Xm7Oq54OR+T1gNg4DRIJhFAryJr+tMmdQvT6o7D7t547klr69lDTc 2U4rDhwuvaefw== From: Eric Biggers To: linux-crypto@vger.kernel.org, fsverity@lists.linux.dev, dm-devel@lists.linux.dev Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Sami Tolvanen , Bart Van Assche , Herbert Xu Subject: [PATCH v5 03/15] crypto: testmgr - add tests for finup_mb Date: Mon, 10 Jun 2024 20:48:10 -0700 Message-ID: <20240611034822.36603-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240611034822.36603-1-ebiggers@kernel.org> References: <20240611034822.36603-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Eric Biggers Update the shash self-tests to test the new finup_mb method when CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y. Signed-off-by: Eric Biggers --- crypto/testmgr.c | 74 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index cea2de6b1532..23de8dad052f 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -227,10 +227,11 @@ enum flush_type { /* finalization function for hash algorithms */ enum finalization_type { FINALIZATION_TYPE_FINAL, /* use final() */ FINALIZATION_TYPE_FINUP, /* use finup() */ + FINALIZATION_TYPE_FINUP_MB, /* use finup_mb() */ FINALIZATION_TYPE_DIGEST, /* use digest() */ }; /* * Whether the crypto operation will occur in-place, and if so whether the @@ -290,10 +291,15 @@ struct test_sg_division { * the @iv_offset * @key_offset: misalignment of the key, where 0 is default alignment * @key_offset_relative_to_alignmask: if true, add the algorithm's alignmask to * the @key_offset * @finalization_type: what finalization function to use for hashes + * @multibuffer_index: random number used to generate the message index to use + * for finup_mb (when finup_mb is used). + * @multibuffer_count: random number used to generate the num_msgs parameter to + * finup_mb (when finup_mb is used). + * * @nosimd: execute with SIMD disabled? Requires !CRYPTO_TFM_REQ_MAY_SLEEP. * This applies to the parts of the operation that aren't controlled * individually by @nosimd_setkey or @src_divs[].nosimd. * @nosimd_setkey: set the key (if applicable) with SIMD disabled? Requires * !CRYPTO_TFM_REQ_MAY_SLEEP. @@ -307,10 +313,12 @@ struct testvec_config { unsigned int iv_offset; unsigned int key_offset; bool iv_offset_relative_to_alignmask; bool key_offset_relative_to_alignmask; enum finalization_type finalization_type; + unsigned int multibuffer_index; + unsigned int multibuffer_count; bool nosimd; bool nosimd_setkey; }; #define TESTVEC_CONFIG_NAMELEN 192 @@ -1122,19 +1130,27 @@ static void generate_random_testvec_config(struct rnd_state *rng, if (prandom_bool(rng)) { cfg->req_flags |= CRYPTO_TFM_REQ_MAY_SLEEP; p += scnprintf(p, end - p, " may_sleep"); } - switch (prandom_u32_below(rng, 4)) { + switch (prandom_u32_below(rng, 8)) { case 0: + case 1: cfg->finalization_type = FINALIZATION_TYPE_FINAL; p += scnprintf(p, end - p, " use_final"); break; - case 1: + case 2: cfg->finalization_type = FINALIZATION_TYPE_FINUP; p += scnprintf(p, end - p, " use_finup"); break; + case 3: + case 4: + cfg->finalization_type = FINALIZATION_TYPE_FINUP_MB; + cfg->multibuffer_index = prandom_u32_state(rng); + cfg->multibuffer_count = prandom_u32_state(rng); + p += scnprintf(p, end - p, " use_finup_mb"); + break; default: cfg->finalization_type = FINALIZATION_TYPE_DIGEST; p += scnprintf(p, end - p, " use_digest"); break; } @@ -1289,10 +1305,37 @@ static inline int check_shash_op(const char *op, int err, pr_err("alg: shash: %s %s() failed with err %d on test vector %s, cfg=\"%s\"\n", driver, op, err, vec_name, cfg->name); return err; } +static int do_finup_mb(struct shash_desc *desc, + const u8 *data, unsigned int len, u8 *result, + const struct testvec_config *cfg, + const struct test_sglist *tsgl) +{ + struct crypto_shash *tfm = desc->tfm; + const u8 *unused_data = tsgl->bufs[XBUFSIZE - 1]; + u8 unused_result[HASH_MAX_DIGESTSIZE]; + const u8 *datas[HASH_MAX_MB_MSGS]; + u8 *outs[HASH_MAX_MB_MSGS]; + unsigned int num_msgs; + unsigned int msg_idx; + unsigned int i; + + num_msgs = 1 + (cfg->multibuffer_count % crypto_shash_mb_max_msgs(tfm)); + if (WARN_ON_ONCE(num_msgs > HASH_MAX_MB_MSGS)) + return -EINVAL; + msg_idx = cfg->multibuffer_index % num_msgs; + for (i = 0; i < num_msgs; i++) { + datas[i] = unused_data; + outs[i] = unused_result; + } + datas[msg_idx] = data; + outs[msg_idx] = result; + return crypto_shash_finup_mb(desc, datas, len, outs, num_msgs); +} + /* Test one hash test vector in one configuration, using the shash API */ static int test_shash_vec_cfg(const struct hash_testvec *vec, const char *vec_name, const struct testvec_config *cfg, struct shash_desc *desc, @@ -1365,11 +1408,14 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec, return -EINVAL; } goto result_ready; } - /* Using init(), zero or more update(), then final() or finup() */ + /* + * Using init(), zero or more update(), then either final(), finup(), or + * finup_mb(). + */ if (cfg->nosimd) crypto_disable_simd_for_test(); err = crypto_shash_init(desc); if (cfg->nosimd) @@ -1377,28 +1423,42 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec, err = check_shash_op("init", err, driver, vec_name, cfg); if (err) return err; for (i = 0; i < tsgl->nents; i++) { + const u8 *data = sg_virt(&tsgl->sgl[i]); + unsigned int len = tsgl->sgl[i].length; + if (i + 1 == tsgl->nents && cfg->finalization_type == FINALIZATION_TYPE_FINUP) { if (divs[i]->nosimd) crypto_disable_simd_for_test(); - err = crypto_shash_finup(desc, sg_virt(&tsgl->sgl[i]), - tsgl->sgl[i].length, result); + err = crypto_shash_finup(desc, data, len, result); if (divs[i]->nosimd) crypto_reenable_simd_for_test(); err = check_shash_op("finup", err, driver, vec_name, cfg); if (err) return err; goto result_ready; } + if (i + 1 == tsgl->nents && + cfg->finalization_type == FINALIZATION_TYPE_FINUP_MB) { + if (divs[i]->nosimd) + crypto_disable_simd_for_test(); + err = do_finup_mb(desc, data, len, result, cfg, tsgl); + if (divs[i]->nosimd) + crypto_reenable_simd_for_test(); + err = check_shash_op("finup_mb", err, driver, vec_name, + cfg); + if (err) + return err; + goto result_ready; + } if (divs[i]->nosimd) crypto_disable_simd_for_test(); - err = crypto_shash_update(desc, sg_virt(&tsgl->sgl[i]), - tsgl->sgl[i].length); + err = crypto_shash_update(desc, data, len); if (divs[i]->nosimd) crypto_reenable_simd_for_test(); err = check_shash_op("update", err, driver, vec_name, cfg); if (err) return err; -- 2.45.1