From patchwork Wed Mar 23 03:48:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoke Wang X-Patchwork-Id: 12789429 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 50B7CC433EF for ; Wed, 23 Mar 2022 03:48:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EF666B0072; Tue, 22 Mar 2022 23:48:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69EBD6B0073; Tue, 22 Mar 2022 23:48:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58D486B0074; Tue, 22 Mar 2022 23:48:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id 468586B0072 for ; Tue, 22 Mar 2022 23:48:46 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0F5352072E for ; Wed, 23 Mar 2022 03:48:46 +0000 (UTC) X-FDA: 79274269452.04.94520F8 Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by imf14.hostedemail.com (Postfix) with ESMTP id 37C1210001F for ; Wed, 23 Mar 2022 03:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1648007320; bh=aPCfa2VR27sIrzeHgV7GyBgO3tUA+0rcNecygkJYcgQ=; h=From:To:Cc:Subject:Date; b=Mmc+oGhqpCYTKxy1vTZ0ENqdY6QvrAvzbptDGOgHumhlJvsVtF1Sq/3jjyJNpRR7z WbtHzFKgLJjvhaLkALbe/RLSZ9yxe+S+ZJaXMgoPnuvqS4K+cnOOlrEMsnUH86tAhd y0ybqVbu8sJq5uvN79ddag3tjB88fUnUE+34WmJ4= Received: from localhost.localdomain ([43.227.136.188]) by newxmesmtplogicsvrszc8.qq.com (NewEsmtp) with SMTP id C242AE0C; Wed, 23 Mar 2022 11:48:36 +0800 X-QQ-mid: xmsmtpt1648007316th29usvoz Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur93WeYZSV4oqu8CMBJfbeHrGR5Ufzg0ImwLGgFHkCDtc9aEgz4Yq NGeDZYXHFyzLjBKNk/RIiHuLbFczN4z8nCi1+byjjaEsg0lGS7ubJznSqXmEBc7eSfkIgmer3RI1 ZdorD4YNjQYzly7jxbkJnu5e4FlNVXQDl9z02dsS4RlkizNLOPKW9Gbn5NSvb8fJA0V9O1JiovYY t2g2wgMCC9ZKAM2rWSMFUuroGE0pjtCSLoAR88Q6TDijBdHTUV6dwH5oOTuv1xWKS+aHd/KwjhdX Z0bWhHL73BjBUgAsZ93CSUbV4KOKXkYz0vA0VZQQJQcNCfqiEzdWUPygEbWBXWFy5t8ms7MEe3Ah V820Atney3HBHBPtsR0yTU0O+Ix5daei5nxB5rCDKImY6oI9G8Xjh0valst5TUXEsVR4GmP0va4n QGXiexvDOA6V7nfF7peIFql3JNHE8chLIZKOaqEX2W9LpIFbjun+OkgT2UZn5ydo1yqNwm9IKWxX syDDdfgvv7GM3PA0ggcle5ngFDKXPgE4xTvKG5hEtLFa2qsEklAT1oCNsp9pbbiPW6flTvO6xbb8 SJXOhqSuEyEywpdMQW9XwBK9ERlekOnrDhJpl1l1C1VX82dlzVa64SAfkB6YB9jZy+bkevD2O7vo 8IRDGwkqCmUwzsmVrhnH3djC7aiRun08g9oLfQykm9x7+1X0FFJf8CPlx/hAwUsA1p0Oek2mmug6 X5+nkMBLHCdW12YByAhJMecE2c7vs++PZBw0peFXuzdTd06QnRiTg+XUwMcqKmVP/0BvcbcYFVeF z7mkSntim5zCXfwKvf60Q1z89Z1iZvfw9VHXh86Mr/dSxh1dbxFWFNUcenrpMEqgm45QVHUa1OYx gIcynbaOD1jWv4FL5/INMC90Kx0Z55Sst24Q8Dj3oQt7NdGAvDt/UacLLQSUyrOsKtIRTcuBAX8R n6pGNs4A3VLVapGaICeKn/fkSstcoOzrGWa6O7KromO4VGsyYdIEMiKKmbbNc1 From: xkernel.wang@foxmail.com To: glider@google.com, akpm@linux-foundation.org Cc: andreyknvl@gmail.com, elver@google.com, dvyukov@google.com, ryabinin.a.a@gmail.com, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoke Wang Subject: [PATCH] lib/test_meminit: optimize do_kmem_cache_rcu_persistent() test Date: Wed, 23 Mar 2022 11:48:24 +0800 X-OQ-MSGID: <20220323034824.2026-1-xkernel.wang@foxmail.com> MIME-Version: 1.0 X-Rspam-User: Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=foxmail.com header.s=s201512 header.b=Mmc+oGhq; spf=pass (imf14.hostedemail.com: domain of xkernel.wang@foxmail.com designates 162.62.57.137 as permitted sender) smtp.mailfrom=xkernel.wang@foxmail.com; dmarc=pass (policy=none) header.from=foxmail.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 37C1210001F X-Stat-Signature: wt8wj6dhbuf39b35k7xyym6ki4xzncze X-HE-Tag: 1648007323-277786 X-Bogosity: Ham, tests=bogofilter, spamicity=0.001889, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Xiaoke Wang To make the test more robust, there are the following changes: 1. add a check for the return value of kmem_cache_alloc(). 2. properly release the object `buf` on several error paths. 3. release the objects of `used_objects` if we never hit `saved_ptr`. 4. destroy the created cache by default. Signed-off-by: Xiaoke Wang --- lib/test_meminit.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- diff --git a/lib/test_meminit.c b/lib/test_meminit.c index 2f4c4bc..8d77c3f 100644 --- a/lib/test_meminit.c +++ b/lib/test_meminit.c @@ -300,13 +300,18 @@ static int __init do_kmem_cache_rcu_persistent(int size, int *total_failures) c = kmem_cache_create("test_cache", size, size, SLAB_TYPESAFE_BY_RCU, NULL); buf = kmem_cache_alloc(c, GFP_KERNEL); + if (!buf) + goto out; saved_ptr = buf; fill_with_garbage(buf, size); buf_contents = kmalloc(size, GFP_KERNEL); - if (!buf_contents) + if (!buf_contents) { + kmem_cache_free(c, buf); goto out; + } used_objects = kmalloc_array(maxiter, sizeof(void *), GFP_KERNEL); if (!used_objects) { + kmem_cache_free(c, buf); kfree(buf_contents); goto out; } @@ -327,11 +332,14 @@ static int __init do_kmem_cache_rcu_persistent(int size, int *total_failures) } } + for (iter = 0; iter < maxiter; iter++) + kmem_cache_free(c, used_objects[iter]); + free_out: - kmem_cache_destroy(c); kfree(buf_contents); kfree(used_objects); out: + kmem_cache_destroy(c); *total_failures += fail; return 1; }