Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp2020809rbb; Tue, 27 Feb 2024 08:16:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVGCukV+dtqnz3BvdKc/XPHNLEhHErjQJKaAR0F4Fcott1iwUGzNuk4WLYiEARQLWYQbmNbnJOobHyDrXZC9dgAmepNnWjf+MGHQXVqug== X-Google-Smtp-Source: AGHT+IGnqXLtWkqAOQzdS9e+OjINBQJ4VjXLVyJrMc9z1wmnw1lkOqDeS4SFHlwGN4OJPYUCxgIx X-Received: by 2002:a0c:ca8c:0:b0:690:2164:d977 with SMTP id a12-20020a0cca8c000000b006902164d977mr1850058qvk.36.1709050572085; Tue, 27 Feb 2024 08:16:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709050572; cv=pass; d=google.com; s=arc-20160816; b=b+cWTZMb3Fl5wLrHYR54TfE7F3DWZYBgAYxKJIO3Oyofe+cWoSB3zXR8QFkQCGwBWa 3kp6qfUg7INDH1ZW2YCtihynYdSOOSAaeB5BBuoWUSNUuFF6Q/1Hl9MPsIjv8a3cBQzY lL1kzcyyPZkpIZF1CCIpn25lZE5G20OvM+MaW0TWhVJR4VPDXg7OPxCQxJrt7/9DpwR5 5aYePXR2X85RbmC4ImOGcAXkVrUZ05+XJF7CgMWSBUjxKtJzTo6Ttxu7V1LUKkNQ3HAL ArEQ/8y5IBYnjb23P8x/C8vk3YkRZ/ce1pUrCFoc3if9KKYjJuxtzCFZiEgZ9SgSu4Em fLdw== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=ZloQyEfaETeQijlRAwOnh+6LdkHN4go8OsrngRPtsAM=; fh=uY09D6wvhYAROYRnonTnTcMxzelfUJYpAbvS7zf+2Cg=; b=euPygv8pdz8YhRLqQDcWwgB2ftLqgOgOl37QMF2meQ7C1vug2irdubvqJyfHTvE/dr n2MS/Gkw6dyoVE1mkO4NLxB3MHzU7bt5WTb7Ao7cQw1jby18YCBK2Hko0axeQR2R9PYg vuASLnhV4lzk2TJwX4+2C95MsnqWw1us5/y+7ya6RanxWW6zia7knb4cqbgI9I578DDs JcnYL5Xtj0287lHD8nCo+XeMbPt3iXCLErQsLgJVNo/nINdy+CeDxCRiKP/Tx4hfDLqR ZzfNctCzPyofWAxSrAczYjszhGX0T2SvtHYWkyyYsZSKHfAnbxQ1YEl7DqlAgBZoNJGX wcWg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ef3Jo3Li; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-ext4+bounces-1406-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1406-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gv3-20020a056214262300b0068cb0aa2ec6si8006767qvb.518.2024.02.27.08.16.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 08:16:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4+bounces-1406-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ef3Jo3Li; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-ext4+bounces-1406-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1406-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id D12431C21838 for ; Tue, 27 Feb 2024 16:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 868A914830A; Tue, 27 Feb 2024 16:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ef3Jo3Li" X-Original-To: linux-ext4@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 0F8B31474B0; Tue, 27 Feb 2024 16:16:00 +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=1709050562; cv=none; b=Qoqt+3b9FXXZiDzqfttLPhjJi5kRKEDZ33z5+rEdSyEX825qV+uKf4wFAJXaxwinadPYbWNO0i3f06kXwfnb1VPwmN0afUW8hq4ayMpDt3iXDZCWV2LnUNQ7ABvVDMwbvC18CML03BjZJlCvZzcSMn50BM0QgBC2yuZc5MwHPhY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709050562; c=relaxed/simple; bh=rAUcFZjcQztUVMKvFPprvfUZ+DjGOWduITQ7I1pUtvM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cN2EaP3CUHmHuT3ypwmEsLJci7WZJcUlyt+fesNeoMLcuTJBUVzzqsmKT7LAgnOx5CXJHqlf/cVf3QTC8QJxHOy5cas0HtHQ6Ru/TrTFyBXqnTe1eFvBqAE3xBKM0roiKrvqkLdvw3gZ37VFzjYRrP3zl6X6hiDP1u72tMgEySI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ef3Jo3Li; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EEFCC433C7; Tue, 27 Feb 2024 16:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709050560; bh=rAUcFZjcQztUVMKvFPprvfUZ+DjGOWduITQ7I1pUtvM=; h=From:To:Cc:Subject:Date:From; b=Ef3Jo3LiGmBxEmLRS8oa+hTrClXtsgp2WW1PQEQPevSva8so4N+zEbyUT/2yVDpSh 5aAb3gQHgmrtbqXrVmw8IXJTlNkgtNBPZiOztf11xNwbYeLjVUPBarg/hEg6isFpcG FuF7OltHj13mo7rXMuLASrqP49K6B70U0MydPwG7VhCEqJcf/1Nn9/wpU6xPVc/fj8 qZRpvNxgoqwny7lqmC8J0rVvuPHOlG8zfCVxoLjfsO/reQQ+TXJzcCAEUbPf2E7t8h /JzVMQKTS7VKRqFG7f0hDyt9VjJJjVPZcsMdAsqY1yIe7tvt9Lfk+KI12Npu2Gjur3 sxuYunja7y9jg== From: Arnd Bergmann To: "Theodore Ts'o" , Andreas Dilger , Kemeng Shi Cc: Arnd Bergmann , "Ritesh Harjani (IBM)" , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext4: kunit: use dynamic inode allocation Date: Tue, 27 Feb 2024 17:15:39 +0100 Message-Id: <20240227161548.2929881-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnd Bergmann Storing an inode structure on the stack pushes some functions over the warning limit for stack frame size: In file included from fs/ext4/mballoc.c:7039: fs/ext4/mballoc-test.c:506:13: error: stack frame size (1032) exceeds limit (1024) in 'test_mark_diskspace_used' [-Werror,-Wframe-larger-than] 506 | static void test_mark_diskspace_used(struct kunit *test) | ^ Use kunit_kzalloc() for all inodes. There may be a better way to do it by preallocating the inode, which would result in a larger rework. Fixes: 2b81493f8eb6 ("ext4: Add unit test for ext4_mb_mark_diskspace_used") Signed-off-by: Arnd Bergmann --- fs/ext4/mballoc-test.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c index 12d0b22cabe1..3b43301054b6 100644 --- a/fs/ext4/mballoc-test.c +++ b/fs/ext4/mballoc-test.c @@ -332,14 +332,19 @@ static void mbt_kunit_exit(struct kunit *test) static void test_new_blocks_simple(struct kunit *test) { struct super_block *sb = (struct super_block *)test->priv; - struct inode inode = { .i_sb = sb, }; + struct inode *inode; struct ext4_allocation_request ar; ext4_group_t i, goal_group = TEST_GOAL_GROUP; int err = 0; ext4_fsblk_t found; struct ext4_sb_info *sbi = EXT4_SB(sb); - ar.inode = &inode; + inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL); + if (!inode) + return; + + inode->i_sb = sb; + ar.inode = inode; /* get block at goal */ ar.goal = ext4_group_first_block_no(sb, goal_group); @@ -441,15 +446,20 @@ test_free_blocks_simple_range(struct kunit *test, ext4_group_t goal_group, { struct super_block *sb = (struct super_block *)test->priv; struct ext4_sb_info *sbi = EXT4_SB(sb); - struct inode inode = { .i_sb = sb, }; + struct inode *inode; ext4_fsblk_t block; + inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL); + if (!inode) + return; + inode->i_sb = sb; + if (len == 0) return; block = ext4_group_first_block_no(sb, goal_group) + EXT4_C2B(sbi, start); - ext4_free_blocks_simple(&inode, block, len); + ext4_free_blocks_simple(inode, block, len); validate_free_blocks_simple(test, sb, goal_group, start, len); mbt_ctx_mark_used(sb, goal_group, 0, EXT4_CLUSTERS_PER_GROUP(sb)); } @@ -506,16 +516,21 @@ test_mark_diskspace_used_range(struct kunit *test, static void test_mark_diskspace_used(struct kunit *test) { struct super_block *sb = (struct super_block *)test->priv; - struct inode inode = { .i_sb = sb, }; + struct inode *inode; struct ext4_allocation_context ac; struct test_range ranges[TEST_RANGE_COUNT]; int i; mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT); + inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL); + if (!inode) + return; + inode->i_sb = sb; + ac.ac_status = AC_STATUS_FOUND; ac.ac_sb = sb; - ac.ac_inode = &inode; + ac.ac_inode = inode; for (i = 0; i < TEST_RANGE_COUNT; i++) test_mark_diskspace_used_range(test, &ac, ranges[i].start, ranges[i].len); -- 2.39.2