From patchwork Wed Sep 11 06:45:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 13799751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37C30EE0213 for ; Wed, 11 Sep 2024 06:46:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A635940009; Wed, 11 Sep 2024 02:46:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 856AB6B0385; Wed, 11 Sep 2024 02:46:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F64B940009; Wed, 11 Sep 2024 02:46:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4CB8F6B0383 for ; Wed, 11 Sep 2024 02:46:19 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0176C14046E for ; Wed, 11 Sep 2024 06:46:18 +0000 (UTC) X-FDA: 82551523278.23.2C5DC23 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by imf01.hostedemail.com (Postfix) with ESMTP id CC1EF40004 for ; Wed, 11 Sep 2024 06:46:16 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=X7nZKmfY; spf=pass (imf01.hostedemail.com: domain of feng.tang@intel.com designates 198.175.65.12 as permitted sender) smtp.mailfrom=feng.tang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726037039; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1BHG+Zromux7mCdATmh4gGmA49XGYtvRJwCiGSv6jro=; b=2MUD3qAeIZYRkuDrdehYYMbUg37I6/ZeLnpubjrfvxEDWyPzM+ybVknd2O5qYGNygCmEkx zbZ4MbJ16VOr3eSyJaok9W5HUzEaJJ1rYMJ6fg37REqEqw5ZGP1Q8lUbEq0PsbzqZhNPZp XsTHdAFl2/yW8lQlLlot6Oop5MfYbeA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=X7nZKmfY; spf=pass (imf01.hostedemail.com: domain of feng.tang@intel.com designates 198.175.65.12 as permitted sender) smtp.mailfrom=feng.tang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726037039; a=rsa-sha256; cv=none; b=5u7fVrZD+SEQIIYsD/x/rjX7/w9y5muarnw8N4heSTeAcUC/0ArH+xkOFrv5nlKc7TDo+g IPBnT+gF5PLZhoI1aNlpqsOfvqsFiFq/+97z7AgWsCw/G8bfKHTlzxz5M9MVDKxfFG0jeE aWRWA4ACOS/ih8UfrKw43t8ojlUoCo4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726037177; x=1757573177; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=spRk1KgMCNNaHSmFuRFHc+16C4JN3bxZV6odFONV/Uw=; b=X7nZKmfYhR/YHqK+NFpGhIf2YlNk0gmq0U6cp3NxaOZTX/uUmR8hjyqc OVn+WnnMfQGseaueWMaEa22WJeNh/8KHSeXPg04gcjFclEwAfMEWtWVYa QZls+C/GfkKQtvHxoDy1lUSJJ70B4pumsl/O+S1pkO9q7O3oPzq0jZFqx axoz8EN2xTPFqFzcsqInRruDnEOQeHPKZZfd7hUEtpRAns3HbgPxigi7+ /uyMA3y2E46OO5DKulO6EUGMlLOqnBvXfqKeYJnwxxl8b8nEA49bbxnxF yoHsiIin/MyVeeqVHBnGsCEa/hKSP2vsjjXSSmc+4a+MPDofLPsvxZRKu Q==; X-CSE-ConnectionGUID: fHgyyj0FQtK5PoZPi6jIWA== X-CSE-MsgGUID: sMohAUJ3Qqu8BdOE7S2mmQ== X-IronPort-AV: E=McAfee;i="6700,10204,11191"; a="36173050" X-IronPort-AV: E=Sophos;i="6.10,219,1719903600"; d="scan'208";a="36173050" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2024 23:46:12 -0700 X-CSE-ConnectionGUID: tvwWZ/Y9QRKy+QIHoKa/xw== X-CSE-MsgGUID: V2Tkj4x9QrGrTc/GWUmeNQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,219,1719903600"; d="scan'208";a="67771512" Received: from feng-clx.sh.intel.com ([10.239.159.50]) by orviesa007.jf.intel.com with ESMTP; 10 Sep 2024 23:46:05 -0700 From: Feng Tang To: Vlastimil Babka , Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Konovalov , Marco Elver , Shuah Khan , David Gow , Danilo Krummrich , Alexander Potapenko , Andrey Ryabinin , Dmitry Vyukov , Vincenzo Frascino Cc: linux-mm@kvack.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Feng Tang Subject: [PATCH v2 5/5] mm/slub, kunit: Add testcase for krealloc redzone and zeroing Date: Wed, 11 Sep 2024 14:45:35 +0800 Message-Id: <20240911064535.557650-6-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240911064535.557650-1-feng.tang@intel.com> References: <20240911064535.557650-1-feng.tang@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CC1EF40004 X-Stat-Signature: mk61rpiky7e3kup5cxj6n8ixhewc9p95 X-Rspam-User: X-HE-Tag: 1726037176-387927 X-HE-Meta: U2FsdGVkX1+7olxtAWuIbVgQb8qN7atbONrmY6JKcrlgkx5EQzngpfS6TiR3v1xQGK8iPZ6lnL6er4CCmkRR6KxUYr044kuAzee9ZP2o5H8+Fymvsw2Vj1PoL/6Ew05wwYwOYpP9v/8zxERkm/0HMfaVAfVACtBDMkPogCwG7t0KJbLv8vmDAD1uixQuzIeAZbBXJOSn8ICKDztqLNSc2VplBzFlDYhj8ZzGpP/kGriKJai6ixfQrKXYB6YFi0n69Vm2v7jAh72ZGYax32hJiB8AUAgQyGY5D500RF95HsuL80X2TylMJEHMSTvqK7AWTV15BbX2CN+jatVDNQj8nzS73XUrJU6SsqMfVd/f3nE//WBgc9X59GmKRcxZvs4AUNv/VTvC3Ob9Tv9lXgAzXEaCkGhsUsZtjInULsxqchWD6UoobDDtsDTIBDaZC/GdSCBI8AJB6Mt4/U/qKEqVC73P7xNpOsaDdLFGWPqnYOh7ftD3BQyy4FQEgj3s61eIiXNOzixzdQ9oHzFYAYCei41qixdiHK1GZosCw/c8KWGRVxrlGTd3H5GAx2U1+fbXLNNQ/ryJx/D8Tgi0KOikApXACBnuoo5sljvFEzSz7mVaGvTzVctBcwjigALZyQcI3wMyQ+9X0qqfPl6rfRnLTUp/suPsBDa+sD8ymX1IriN/WB2s42oH1lqrs5PIJYD7qO5UZDjE4MCAeZOl1RhQ+tu4EyndqKgLB/Xzsz1Z+GOzpCNtR8LBVHmA8vE/2YQ/MBZz6nxK3weF3RO1+eCO+4N0T45bDyPg7RIUwRn1e51AENy5W2QHuewVGFaG/IZJjHd9QfNIVegcJGDmgpiYvSCECJLqv9Bl0XoTmqr9jXgVAjvwo02EI4iJ4i5y7y4vjColqGtZduHvtxxjSRvAlo7eWSzPIQ1QB6rOYrI9lwol9aPbcrFZuF+Q38AY/N5y1MbB/kzyY3/SKtcQ5Px pBuDGMJR fKQnR2PKx44NqBd0/dYnVNZ4jdQh0y1W+Yy0EZNn5bO/x7aX9AZEbw1ymXKk2mpeRAvTV3ByuxHofGeezYHSH+M1968WT/k59Em+i/E3FE4inKH655GmmU6lMurXrgnwc2N9qkp4Vl6u0IVDvIpNpTR0z+xgdXjOi92JBwPDu7PvbzKKHX7fpVA6TUW1F1oYUV91MSlbnrnoP+BVQtd6ll6RLWAZv1YYPUlmObFmEb7P3GOfXGXAEnGATpcKeLBzPf8i0Oe7xv6sI6aK0lFTNlSudeQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Danilo Krummrich raised issue about krealloc+GFP_ZERO [1], and Vlastimil suggested to add some test case which can sanity test the kmalloc-redzone and zeroing by utilizing the kmalloc's 'orig_size' debug feature. It covers the grow and shrink case of krealloc() re-using current kmalloc object, and the case of re-allocating a new bigger object. [1]. https://lore.kernel.org/lkml/20240812223707.32049-1-dakr@kernel.org/ Suggested-by: Vlastimil Babka Signed-off-by: Feng Tang Reviewed-by: Danilo Krummrich --- Hi Danilo, I keep your Reviewed-By tag, as I think this v2 mostly changes what kmalloc slab to be used. Let me know if you want it dropped, thanks. lib/slub_kunit.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c index 6e3a1e5a7142..b3d158f38b98 100644 --- a/lib/slub_kunit.c +++ b/lib/slub_kunit.c @@ -186,6 +186,47 @@ static void test_leak_destroy(struct kunit *test) KUNIT_EXPECT_EQ(test, 1, slab_errors); } +static void test_krealloc_redzone_zeroing(struct kunit *test) +{ + u8 *p; + int i; + struct kmem_cache *s = test_kmem_cache_create("TestSlub_krealloc", 64, + SLAB_KMALLOC|SLAB_STORE_USER|SLAB_RED_ZONE); + + p = __kmalloc_cache_noprof(s, GFP_KERNEL, 48); + memset(p, 0xff, 48); + + kasan_disable_current(); + OPTIMIZER_HIDE_VAR(p); + + /* Test shrink */ + p = krealloc(p, 40, GFP_KERNEL | __GFP_ZERO); + for (i = 40; i < 64; i++) + KUNIT_EXPECT_EQ(test, p[i], SLUB_RED_ACTIVE); + + /* Test grow within the same 64B kmalloc object */ + p = krealloc(p, 56, GFP_KERNEL | __GFP_ZERO); + for (i = 40; i < 56; i++) + KUNIT_EXPECT_EQ(test, p[i], 0); + for (i = 56; i < 64; i++) + KUNIT_EXPECT_EQ(test, p[i], SLUB_RED_ACTIVE); + + validate_slab_cache(s); + KUNIT_EXPECT_EQ(test, 0, slab_errors); + + memset(p, 0xff, 56); + /* Test grow with allocating a bigger 128B object */ + p = krealloc(p, 112, GFP_KERNEL | __GFP_ZERO); + for (i = 0; i < 56; i++) + KUNIT_EXPECT_EQ(test, p[i], 0xff); + for (i = 56; i < 112; i++) + KUNIT_EXPECT_EQ(test, p[i], 0); + + kfree(p); + kasan_enable_current(); + kmem_cache_destroy(s); +} + static int test_init(struct kunit *test) { slab_errors = 0; @@ -208,6 +249,7 @@ static struct kunit_case test_cases[] = { KUNIT_CASE(test_kmalloc_redzone_access), KUNIT_CASE(test_kfree_rcu), KUNIT_CASE(test_leak_destroy), + KUNIT_CASE(test_krealloc_redzone_zeroing), {} };