From patchwork Wed Dec 21 06:58:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 35277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3383110wrn; Tue, 20 Dec 2022 23:22:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXtKcX0i+3BAp17pBDJk0Nch1e2/I19FvLiTuFgPPHpqK1/C0nI/5nZqPOKCCbz7S5A6GrfU X-Received: by 2002:a05:6a20:2d23:b0:b2:6a7a:6072 with SMTP id g35-20020a056a202d2300b000b26a7a6072mr1499919pzl.14.1671607364346; Tue, 20 Dec 2022 23:22:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671607364; cv=none; d=google.com; s=arc-20160816; b=vZ2CnJ5O036gIJSdrh02wcJtWhYQNc8yleCy5uTk4RzFswijkiB/mDFjy4ujAR8CAH 3/z1B3Ir4Wmj19Vd2J9D6T4RiORHOHL3F/exKdr/qZp6WmpaGremMUJD/vqnsxuZXvlV PBZ4JeeWUzzYImEEz+qPglK2qgJXobzBWRysIws98SZYxW9Sl1g8AemG/YsbsFX9Iw2F ne78TrhsOrLwBjL9JJ4ghrIkjF9tj7uxwbziVtzGhvfMFSHB6YJPEO1OMoc9dH5U7WvZ A2Mg45K4MRNwV13V/X09X8n3TrGeD/r5sG1CMrOBwYzOZB8Nh4Di09V3n4lzA/uW15ws jCoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=so30Dwpu7lV2qWPhtse2Rj64WgrynnPk+ShQqb9WUQo=; b=E38CsUbveOw9nbqFIMQpUwndYsULsP1NlrpF4NNrN5SgWmDOFWrysWt7S37oC06CIm MXgRBOaqINJeXn56hEqtwe3o4eU/D9hugqPwCGUjiUW3lMDFXNzqUM5tbqchAEYbccnE I5uemcpDGqCLkHFdwzl9vuL9aZmRmunMyDXC5LTCj7dOOW5PYQo73gVqzk3GOQZlTjx7 9k1FSD44QeX9Ohe1uL4CgA2m9yAqKhZsKEjyRC/iBugCju4rltPSERLJ2iNn8m3kf3Nw tKdBRw5vxpwbwFV47XQyER/cyBthymxx+iRRoD/ynKnCzqF4R8AFradhIetphimDR1Tp NbTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cp9-20020a056a00348900b005771086c184si15500019pfb.51.2022.12.20.23.22.31; Tue, 20 Dec 2022 23:22:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231614AbiLUG6T (ORCPT + 99 others); Wed, 21 Dec 2022 01:58:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbiLUG6R (ORCPT ); Wed, 21 Dec 2022 01:58:17 -0500 Received: from formenos.hmeau.com (helcar.hmeau.com [216.24.177.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 673A31C92B; Tue, 20 Dec 2022 22:58:16 -0800 (PST) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1p7t3I-0098Bf-9y; Wed, 21 Dec 2022 14:58:09 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Wed, 21 Dec 2022 14:58:08 +0800 Date: Wed, 21 Dec 2022 14:58:08 +0800 From: Herbert Xu To: Eric Biggers Cc: "Chen, Rong A" , kernel test robot , "Jason A. Donenfeld" , oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, Linux Crypto Mailing List Subject: [v2 PATCH] crypto: lib/blake2s - Split up test function to halve stack usage Message-ID: References: <202211072109.qvrnjNKo-lkp@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751900582100839217?= X-GMAIL-MSGID: =?utf-8?q?1752807363746463662?= On Tue, Dec 20, 2022 at 08:34:18PM +0000, Eric Biggers wrote: > > Shouldn't these functions have 'noinline_for_stack' added to them? Indeed they should. Thanks! ---8<--- Reduce the stack usage further by splitting up the test function. Also squash blocks and unaligned_blocks into one array. Reported-by: kernel test robot Signed-off-by: Herbert Xu diff --git a/lib/crypto/blake2s-selftest.c b/lib/crypto/blake2s-selftest.c index 7d77dea15587..d0634ed6a937 100644 --- a/lib/crypto/blake2s-selftest.c +++ b/lib/crypto/blake2s-selftest.c @@ -545,7 +545,7 @@ static const u8 blake2s_testvecs[][BLAKE2S_HASH_SIZE] __initconst = { 0xd6, 0x98, 0x6b, 0x07, 0x10, 0x65, 0x52, 0x65, }, }; -bool __init blake2s_selftest(void) +static bool __init noinline_for_stack blake2s_digest_test(void) { u8 key[BLAKE2S_KEY_SIZE]; u8 buf[ARRAY_SIZE(blake2s_testvecs)]; @@ -589,11 +589,20 @@ bool __init blake2s_selftest(void) } } + return success; +} + +static bool __init noinline_for_stack blake2s_random_test(void) +{ + struct blake2s_state state; + bool success = true; + int i, l; + for (i = 0; i < 32; ++i) { enum { TEST_ALIGNMENT = 16 }; - u8 unaligned_block[BLAKE2S_BLOCK_SIZE + TEST_ALIGNMENT - 1] + u8 blocks[BLAKE2S_BLOCK_SIZE * 2 + TEST_ALIGNMENT - 1] __aligned(TEST_ALIGNMENT); - u8 blocks[BLAKE2S_BLOCK_SIZE * 2]; + u8 *unaligned_block = blocks + BLAKE2S_BLOCK_SIZE; struct blake2s_state state1, state2; get_random_bytes(blocks, sizeof(blocks)); @@ -630,3 +639,13 @@ bool __init blake2s_selftest(void) return success; } + +bool __init blake2s_selftest(void) +{ + bool success; + + success = blake2s_digest_test(); + success &= blake2s_random_test(); + + return success; +}