Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp1151355lqj; Mon, 3 Jun 2024 11:40:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXNh1QchC5/fyTNtTrfEqnHZP4yPbH34j2Frrh/yTW0Z6dMbEluo7P9/wPn2RUr+C4kl5FNx1G5ZiUTrr4DVLSGF1eBPUUUgY8mpyu/hA== X-Google-Smtp-Source: AGHT+IEEjwHVWIXm8Jd4hU2/pPS4hrjijZqlEhqrwOQgPwvPhX1+1cdwp0ebAQjFDScER3S12inH X-Received: by 2002:a05:6358:7247:b0:19b:5f12:8f68 with SMTP id e5c5f4694b2df-19b5f1290efmr1294236455d.20.1717440004008; Mon, 03 Jun 2024 11:40:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717440003; cv=pass; d=google.com; s=arc-20160816; b=jvne5sAdM47RLPGP1ENJZTJOmVKUUYMUm6LfYE1D/IqulwopuOY/DKVVdWZX+KkEWh nUD653e44yd5TDr87lb+1PVj3A5ZmJ47wkaWtSpvNES4tIXnFqGEvX6aQ30QMqbtI7cl 9n1XInOs+LG8sTlgcGFQJ5N0j+71s2S8ushLKhLjGWnMvQhOkG8fQa92pi9t1qGviC/i iFWoLurrX9kMUjnDF/+6SH/D2j7FJgtMywMyWfNDZLVAnH9i18bPuCQefd1t6yc9b5NX 7w1IWocjSGHisJFLzhAdY/rsAD2NFUQvbwDvXXhxSmShSyiABc0u5CgH1ML5AqRtv7Bd M9mw== 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=FmeZJMzwt0JcszT68HZLrSXeCG4+yzcPvLbTOt4rjXw=; fh=o4Hcqb3O5JdNU7fUtYJ+R5UxQa8VnSaG28wHzXE50SY=; b=Dagfzx1JnxiiFTqZAX9NtlYzgdfENEfllY0gx0gWzMV+2j511NxQq/Hf7bU/D609Be D+zNTamB0sh9kCuBeeaPAF9ptLYL7S2IL4Cew+BmtZSOVbwtKdNPUi1YDQIg54qlRadf kuS5vNffqaaXcnyKUb3fZeLKzTi79AX02qvs2oL/Ggp749hHzc1wHNlIYzpWg67Zg62F x7lZww2cki21MOYcRBkai/ej/rT9zuT1lPlY6JUW9YmRI+ZiX/wcP5SZmBF7m6WFSXqt fSzOme5XG29Hb0WENEWaLBQj7g8Ez+cQL0tIyupedXJe4/CRGEqb/zyKY1IIX2hmnvtC T1Rg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="IV/uu3G9"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-4660-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4660-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id 41be03b00d2f7-6c35b40c83esi6809684a12.552.2024.06.03.11.40.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 11:40:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto+bounces-4660-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="IV/uu3G9"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-4660-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4660-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id ADAEDB210C7 for ; Mon, 3 Jun 2024 18:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F372213A3F0; Mon, 3 Jun 2024 18:39:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IV/uu3G9" 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 AACA013A256; Mon, 3 Jun 2024 18:39:04 +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=1717439944; cv=none; b=PW/POhJlAAhzDN6XO1MGlXr09QLJdNlsGeulh9JO+Jrly8jE4JRbO2N78xOpmTGN3vuQrgaLEp67EN1lll29B28hYnDk9ghT4+nPZAuHOCZZ3AQa+Sp0TrvWzp9KIldDIeLRvLU+8Nffk8vpFzswcsjLkTWSt3T1QICk0sK5xSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717439944; c=relaxed/simple; bh=go1hofDgjbToFyhdkcL/G7WzrmF1OcIcsTP28zg7dmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DuWnN5JabXKprFggbzq+E79LPfQP/ODT/TnPR2smiCXnodnWCNJrFoZdyhKBfg3KkB84796pTDJtVgj8ykbJIt9BINxKnvzfvsFakZb5SvXfPDpPQP5+1T2ctO1yKB0zvZnu1oIwFUAl+CeGgz8+2FU4gZxVeulUipsL0xdMmZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IV/uu3G9; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CF46C4AF10; Mon, 3 Jun 2024 18:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717439944; bh=go1hofDgjbToFyhdkcL/G7WzrmF1OcIcsTP28zg7dmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IV/uu3G9ippqyrflrG8rGVsVvCdpIYTcGvR66C3qmYzQ4++pzlp8FqgOIOf9d88vN i92PcpUyqN0LmC0RfSkJ9DLOLOQIPBth0bM6tKdbOGoja9aUi0X5QuBJQYpf+1FjAe jLt5IzjC/CjwOgH7JG5TP50L4HQSSEdh0WogfqdmRT11zd+zIeOxjBuO5e1bSSKFTY ASeFr/vwmfhT9Fe0NEiDFGK91TpdDeWlD4rmGRLKiA50/dbaJAqsLswbelJnxV5qcI mAofQ/DCgdq3asEU1EFEyTNwQVRz3Dw8C5k59OiJojMYDQZk/D3IpQPOotcRVog4+x 8szCQY4IBWSmQ== From: Eric Biggers To: linux-crypto@vger.kernel.org, fsverity@lists.linux.dev, dm-devel@lists.linux.dev, Herbert Xu Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Sami Tolvanen , Bart Van Assche Subject: [PATCH v4 3/8] crypto: testmgr - add tests for finup_mb Date: Mon, 3 Jun 2024 11:37:26 -0700 Message-ID: <20240603183731.108986-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240603183731.108986-1-ebiggers@kernel.org> References: <20240603183731.108986-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 2c57ebcaf368..3253dc1501e4 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 (if finup_mb is used). + * @multibuffer_count: random number used to generate the num_msgs parameter to + * finup_mb (if finup_mb is used). + * * @nosimd: execute with SIMD disabled? Requires !CRYPTO_TFM_REQ_MAY_SLEEP. */ struct testvec_config { const char *name; enum inplace_mode inplace_mode; @@ -303,10 +309,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; }; #define TESTVEC_CONFIG_NAMELEN 192 @@ -1109,19 +1117,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; } @@ -1270,10 +1286,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, @@ -1346,11 +1389,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) @@ -1358,28 +1404,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