From patchwork Tue Oct 24 08:32:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13434038 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 98602C07545 for ; Tue, 24 Oct 2023 08:33:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 328036B019F; Tue, 24 Oct 2023 04:33:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B22B6B01A0; Tue, 24 Oct 2023 04:33:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12A786B01A1; Tue, 24 Oct 2023 04:33:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EEFB56B019F for ; Tue, 24 Oct 2023 04:33:39 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C4B94B61DC for ; Tue, 24 Oct 2023 08:33:39 +0000 (UTC) X-FDA: 81379691358.16.DA0DC26 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf07.hostedemail.com (Postfix) with ESMTP id E00C74001C for ; Tue, 24 Oct 2023 08:33:37 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Ux7EtGhL; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698136417; a=rsa-sha256; cv=none; b=5C2jC1D7IIebtHpJEdLb28mDZuHxyx86UagIfykdmYoxR1zb2ZQr5NWuBURByXcj1KLoWs CPYMF+z8mD48xIgIMNQ1TSEV5P/IvrOsNP5c+m+ErJjf+Yy3uNGH6cv5+HtWPFg7bEXrdn 2LD84tj1CEN/Jp05t8p2k/W7HrqOy8U= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Ux7EtGhL; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698136417; 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=XXZWHgZHrQ6fRhi1dWH8Hwu+H4KBhNEo2ODkb4cUdHA=; b=DEyX9JV21yehil04quHrmZ5C0HWoajTObKW+Ao6vkDjovIu6PvStSMvjsI9g+4OsvkHJet 8pdbA6XQ4o15h+KQgshai9qPtz9Vi8OnkzYEvzgzb7b5snCFo0aIoYzfNBam7HVR/RV76i /nIE4zc3bIkz7SoBq8ozp0YwSHGJc5M= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6be840283ceso3421627b3a.3 for ; Tue, 24 Oct 2023 01:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1698136417; x=1698741217; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XXZWHgZHrQ6fRhi1dWH8Hwu+H4KBhNEo2ODkb4cUdHA=; b=Ux7EtGhLU2/DIoTShEYeQ81ZwmaOot4uf1qtqGHrh8g68kHnNkmOyxoFicfYRqlwjG 9tbWZx+vNWMsGIyaSqg4GvzUn9WiAPUAee9hSbSULmui7eC4O/xXz8pQ/UdiCQiaRj2+ Egd5Kiw1uJrAl0BDwPTj9gMonjZ8531armAgsUv6dHj76amgT2IYB4blXYuBtD0LGGn6 5s5SLjPy137nNmvkekdOHiM0LvdfKC6R13fVo4hPaqYjBxIuTKgdoH98YgXuPYu1ahit U4GAbIq0gMaX14+c/CcY7c0crRf5ZQ7EXTEOsoEl7srXRLiR463DGQrkA/XsRg4j6MqT etog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698136417; x=1698741217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XXZWHgZHrQ6fRhi1dWH8Hwu+H4KBhNEo2ODkb4cUdHA=; b=qBpcfndrRErlTKgKkWY4cc7UgzB/EGgpZxTXSXEI+mOJjyvIlZdj7tB4ZU9vqNFf7l 186y5TdKoQHmNOiEa52kbjd39gVbhQHs8Wos6F/ZI3qLKXnW8J6wAbTLTf8Xk5XCs2/+ UZSwR5I4x1Fi+G8JEBxpp5ALXd8X5vVmXykcZTEmJlOnCjXEmaWJzu6El9TiR8+YhOAM aFZif4em7J4EvTqtfwHZdkvjZDxj+k49pIoeXwuA4itphPIFd+hdlY7vYUpAJoXdLiT9 Y1LycOfxBnTvNVoVOL/uzNrNANBMFsdzDH7/ow5MqZTQEMjsEUawXhXFw9Fcxem3MfLC Ybhw== X-Gm-Message-State: AOJu0Yy5m1T0Td9Tvfx54sNvR2OXq6I2YpU3FT0BQ3NRznhX1jZ+XvGb loYJm3a+xazIw4gRCOT2MGbvEg== X-Google-Smtp-Source: AGHT+IF7YgpjhTzyLSokdtvDXNfCbJQY3JWpF75jJ39WYAp97AHtn6ttEhmwYaz4RKxtcXMftuCXLw== X-Received: by 2002:a05:6a20:9381:b0:130:d5a:e40e with SMTP id x1-20020a056a20938100b001300d5ae40emr2254231pzh.7.1698136416831; Tue, 24 Oct 2023 01:33:36 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id y21-20020aa79af5000000b0068be348e35fsm7236977pfp.166.2023.10.24.01.33.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Oct 2023 01:33:36 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com, corbet@lwn.net, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, surenb@google.com, michael.christie@oracle.com, mjguzik@gmail.com, mathieu.desnoyers@efficios.com, npiggin@gmail.com, peterz@infradead.org, oliver.sang@intel.com, mst@redhat.com Cc: zhangpeng.00@bytedance.com, maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v6 04/10] radix tree test suite: Align kmem_cache_alloc_bulk() with kernel behavior. Date: Tue, 24 Oct 2023 16:32:52 +0800 Message-Id: <20231024083258.65750-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231024083258.65750-1-zhangpeng.00@bytedance.com> References: <20231024083258.65750-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E00C74001C X-Stat-Signature: 8jib4gr5nkfmuphuiiir1css6doyzocy X-HE-Tag: 1698136417-173759 X-HE-Meta: U2FsdGVkX1+vz+yC82gEQ6NsFae3PQOy8Yuyuz8AbiC2DadboouEtE0+xpUWwKPYku8GMEOtdrZTmPRlwBEmq2poq1EoJ9wf76kD97HPl3KPjcbaP5AlANvxoqZEkusuUVQKpiPVyOtA4Fm/vYQ3Bgak8aad1hBAat4QnXp8UHSrveUYJvYIj1LN8QJp1mGtDZKCJxIc3Yf/i04pfp1rhyL9YH9LB0dyM34xupmJ7/aKQswhkTx3iP30y4zanbw+JXutnQjL+GupXDML/mx7Z24jc5YyhSVL1rpUUkAXhHHqFmdqfXjzl0se4PrKg7yKCLWnymtj7An+wr4k0SPzDW5XCZzL4mbJ5xgjN0mWYIPHYKnouwbci0EwdJ3GohCLWKMOPi2/WJRdOgv4BDTYkNarLeMpua2oveX+hydFMPySY0AzUD7INwwdl9aESzv4CAQG9fqmGEj9GB4poyuHU7IFeS0G8Ijk/ZxHqFI0y4VgmabuDGC/Hrcns70PkWC4kPUMjYp0gwNUenu6MO8F4ZqdVG2H+wieE6n7HCfWzSjDiQ6jvgo2Hfq8fYp/LAhYnDJ228cW36gxEVUPA9/30LmaEHMZoKygMM3vCoxBkbpwXwmDXkqittOpHwTAw1PtgjCY70Q9UpyGr6QvIv4nccQkVV+lqyGyp6HXnP71rkuqiZRHkTxAWiuTNPOQIct6WKeyDsu2OM9AWUb3oOOteOy24z405Sqjej4iTMFTh2sF8Kl3sswsvXLogET9fECHukRRv6VCmhL9ysqfYVf8GGbRkchiNRrOmSo2VKrRUT5Xcp2wY7iRzvErdOiEqPD6923DHCJBt5Muc5YXn/EAgGka+xbG1l9DA7kmy7NnUul+hXxrTyX3MU63Z6iD8wZjvTbVigWn4Z3kZIsPLvwT41pFvXK7YLdd/xYIQjFiwo9UvLCZSslLNNSMY5930EPTieiOKNou4D07kCcQhYK VEcB+yTj zN5NsLEn8iWzQj668RtWQiMjc3p8ol/vXw+znSXWsnoKzee2ZmRCiZJrvZUShohXNL5mPa2YPzHo8nZtTBpb9v11BzX2d42zuRl/INovueddUHCaNGyB8lycYIqFFeB7KCDr3HzG2ihrKoDLSFuwygi9ttVxSjd+16gWPbNlZgkg8/C/a8/+LhhuPCQ0CWfSiTPqnwquAIy47IE4nXnVA4DKeE3tBwD3pKdIc3cDIyz3UbwdCd4IkGGf36aji2XUt3bI+ze1NmnV/Y2PZbaWIE2zgbwHVkiOfKN9JLjWZZOVsknj16Ad1/9Xhb7SGPeS6rEtaFEedQJQVUQzlGeVKJJQ4CC/zXXBACSN43gMZs7TA8wfq7HsMKFRMPjP60IOrrQm2HPTPzh5cQinuQBGLw9+98FAf36RIYWynUtgVrNM2abga/QtuyP182xmSVjYseEqAFXqgRs6Gmn6dRkkQD9yEKQ== 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: When kmem_cache_alloc_bulk() fails to allocate, leave the freed pointers in the array. This enables a more accurate simulation of the kernel's behavior and allows for testing potential double-free scenarios. Signed-off-by: Peng Zhang --- tools/testing/radix-tree/linux.c | 45 +++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c index 61fe2601cb3a..4eb442206d01 100644 --- a/tools/testing/radix-tree/linux.c +++ b/tools/testing/radix-tree/linux.c @@ -93,13 +93,9 @@ void *kmem_cache_alloc_lru(struct kmem_cache *cachep, struct list_lru *lru, return p; } -void kmem_cache_free_locked(struct kmem_cache *cachep, void *objp) +void __kmem_cache_free_locked(struct kmem_cache *cachep, void *objp) { assert(objp); - uatomic_dec(&nr_allocated); - uatomic_dec(&cachep->nr_allocated); - if (kmalloc_verbose) - printf("Freeing %p to slab\n", objp); if (cachep->nr_objs > 10 || cachep->align) { memset(objp, POISON_FREE, cachep->size); free(objp); @@ -111,6 +107,15 @@ void kmem_cache_free_locked(struct kmem_cache *cachep, void *objp) } } +void kmem_cache_free_locked(struct kmem_cache *cachep, void *objp) +{ + uatomic_dec(&nr_allocated); + uatomic_dec(&cachep->nr_allocated); + if (kmalloc_verbose) + printf("Freeing %p to slab\n", objp); + __kmem_cache_free_locked(cachep, objp); +} + void kmem_cache_free(struct kmem_cache *cachep, void *objp) { pthread_mutex_lock(&cachep->lock); @@ -141,18 +146,17 @@ int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size, if (kmalloc_verbose) pr_debug("Bulk alloc %lu\n", size); - if (!(gfp & __GFP_DIRECT_RECLAIM)) { - if (cachep->non_kernel < size) - return 0; - - cachep->non_kernel -= size; - } - pthread_mutex_lock(&cachep->lock); if (cachep->nr_objs >= size) { struct radix_tree_node *node; for (i = 0; i < size; i++) { + if (!(gfp & __GFP_DIRECT_RECLAIM)) { + if (!cachep->non_kernel) + break; + cachep->non_kernel--; + } + node = cachep->objs; cachep->nr_objs--; cachep->objs = node->parent; @@ -163,11 +167,19 @@ int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size, } else { pthread_mutex_unlock(&cachep->lock); for (i = 0; i < size; i++) { + if (!(gfp & __GFP_DIRECT_RECLAIM)) { + if (!cachep->non_kernel) + break; + cachep->non_kernel--; + } + if (cachep->align) { posix_memalign(&p[i], cachep->align, cachep->size); } else { p[i] = malloc(cachep->size); + if (!p[i]) + break; } if (cachep->ctor) cachep->ctor(p[i]); @@ -176,6 +188,15 @@ int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size, } } + if (i < size) { + size = i; + pthread_mutex_lock(&cachep->lock); + for (i = 0; i < size; i++) + __kmem_cache_free_locked(cachep, p[i]); + pthread_mutex_unlock(&cachep->lock); + return 0; + } + for (i = 0; i < size; i++) { uatomic_inc(&nr_allocated); uatomic_inc(&cachep->nr_allocated);