From mboxrd@z Thu Jan 1 00:00:00 1970 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 CCD00E95A8E for ; Mon, 9 Oct 2023 09:04:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 635068D002A; Mon, 9 Oct 2023 05:04:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E41C8D0001; Mon, 9 Oct 2023 05:04:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4862D8D002A; Mon, 9 Oct 2023 05:04:12 -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 3571D8D0001 for ; Mon, 9 Oct 2023 05:04:12 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 06F9C160170 for ; Mon, 9 Oct 2023 09:04:12 +0000 (UTC) X-FDA: 81325336344.13.18BC7CC Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by imf15.hostedemail.com (Postfix) with ESMTP id 35FEFA002F for ; Mon, 9 Oct 2023 09:04:10 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZnbcaTuB; spf=pass (imf15.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.160.44 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696842250; 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=13v6CdAEIF4KjrFYvyEpYEdaHuHpreJiUYI2AdJtBE2FuLdoRGdpObcBtKyNOBFQdMo+EC aamcTs2Vu0b0vIOpsvTv9tdwm3CrMz+fBgGyK3pfpEtlZJskSPu/52h9+0dF8wTlvgxwTd HNFamC6LAFHGtG3K5GjUK1xpLaI66z4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696842250; a=rsa-sha256; cv=none; b=TbbaSXTzMFvse0w2s+qH2I1OK690vxIfbWNtth7etGY5Lb/hn6/L88NJhI6CCExDZQF6Dw Up5NfrWTYCM3xvQ5fJXAkONStM8tiGA6/jsYOXvUrYLPadN76IfwHBiyAMRjusZb35RPEH VYKbSgK0IVxBwrVYZlBop4YvEBH2FxE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZnbcaTuB; spf=pass (imf15.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.160.44 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-1e562706d29so2459950fac.2 for ; Mon, 09 Oct 2023 02:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1696842249; x=1697447049; 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=ZnbcaTuBXglv6Ox6WzyUzapYPoDcvNTOAWc4G9zuS0DN4dhS62Vetw32CwtnXR+dp3 6DEIblhTCXnQ/9eTjvHxDNlMp1GaHyXJSDwPJVQ2GOgzs2JZSDgx9xIEL9jXdSr301xG 1ikz5/L41dcbjQXxyPv642dvDdHO4I5cGe9P6uqIFofrf8GUbDXDtyI0LhCEN4tVha7n 6/eVp3d5kzPTXV5BTt3H14JdTYSNQMq5BVW7C+rGTthC95yFH/tu+En6sFyhfj/ujyZ4 6GSGTiMsR6HhzBOnkEZHYlMcLKwKSIieHccyt89/Wlw1l+48xHAAkd3vuEA6biiQqBOi NQwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696842249; x=1697447049; 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=VKsg2uSzsMg9C8V08+H+pshX7zLvL7c3OcrS4ZVBuOvgNH2a3GEli/v4oWusJK+zQ+ CzCWaIIeFLT2m5unmFIFVhFjw2m7zQbXWgczJyDwS3FyhC9tWjwFHQWGysod/jzVKj1D BfONOUC5HJ7XwExU0YI4duHk4YoMK90UwZXFKbuf4fjHYGTR+8jeYfxsxUJLqESOfLdl bnrd9j3yUfyW4VRvTm1llDMndQMFBhiEV2g+fChpNvLBsy6hOzp1Kgjz4t52+vP/+LIY E5QpEPw5I9caR4LkmZ1HGNVaUyA7reKDO+baLP82SYL28pGiaBbwKlsAZvow9NGes8vg 6GQA== X-Gm-Message-State: AOJu0YxEZvloFPJ2OwtmdLpfguig+2K+zdde7ZXjRPkA4XU1THaGfsuq hqNGfWCc0/IkZt2zL1c+dbSSVA== X-Google-Smtp-Source: AGHT+IHn4oU8w8VyA+/fsyHj61zhR6VGnu4RwZZtoM9wLO0d06HTYfGfAoM8qObwlt0rsYXB73IVJg== X-Received: by 2002:a05:6870:b618:b0:1c8:d72a:d6ba with SMTP id cm24-20020a056870b61800b001c8d72ad6bamr17273488oab.45.1696842248950; Mon, 09 Oct 2023 02:04:08 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id fk3-20020a056a003a8300b00690ca4356f1sm5884847pfb.198.2023.10.09.02.04.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Oct 2023 02:04:08 -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 v4 04/10] radix tree test suite: Align kmem_cache_alloc_bulk() with kernel behavior. Date: Mon, 9 Oct 2023 17:03:14 +0800 Message-Id: <20231009090320.64565-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20231009090320.64565-1-zhangpeng.00@bytedance.com> References: <20231009090320.64565-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 35FEFA002F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 9sw1u5qrdshcgrod39d1p4ystdswy9gf X-HE-Tag: 1696842250-654802 X-HE-Meta: U2FsdGVkX18W8mFLtROvouEI3KxAAXTDhXCZcxe7NxJUIWS2clOBon89Y8fV5uyIMHCD68BIcNcpGEvizyvOa78kEigHPHJqjbn1T3Nkgn9JWajbpHXTsC01f2TOpnp7ClvZMMvbuvOtqqU695pHhIKe3QW0Wwlyl3wDszISywnJndq1KbXhoNznMUAFTHflPik/nkVaQu1Fvqt3zwpEPbKjViiNz8wag1HbD5MXzzW5l9zlIO0+wXVIHdtxGs1DFpSINzZeVQe1k7WWZY2fR02Ouy+wUvNDIsNFsMu6+WwIBGT/P6bPXzUl12Yp+nKuFQCSyKf/4Hr+JvHbs/nfclqjuGbS67JwOhlGR0DNGeYptrE/+oVDzZ/xmKIeAkGLm65gfmVDV6gQoaehz/7gZn+5I+ttPTjslDwD2kiLp0f7Gh1egKe92lf8m7Tm7wuX+InZYuLoVoTfro27wubFnvIvwjEKJ3eo2JHNeDI7JU8spHRg1aBHvDYHv882YCQ8tuRSX8q3E4xOGeCrLgiGrxNVRIBGpsTeTPbwYiAap7gd4+XnSu5fhgcZGIqLYTi2enc4bPLvvNIMfB0uRcZB7mWJ1KtSavVJsuOLwBkVW9pQ8pt561puEre2I4YvP0deCy8d3NCr/xXOhwVldN63mGOxX6nrdzOAPtRGUSB9KM0K7SybCtWDtj5DfiL3md16jFfwMeVl/+qlW0FhpGmtVjrLOSoPa8XT7a6g2Z40bL6t8us3Qut1IQVQ+wc+XdwHVxbCOBi9HffIEjK6oPMGJteMkHmvk6mU9N8UoJhPzFUcw4NYwbx7o4cyc7xF3G14NmBJiEcoheNL6jbLX8vfOlJZFBPPdRiTsLcZJdyLOLJwOfHF0U5FXw8mTIKMkAbAuxYd3jFnsAfVMso25y/MMFEiaHuwrRoL/cfVaEoR2YgGrTDUYCONWGp3Oy4AzVerf1ChahXcVzWJtUrpUOg HTLtKh8T dsDsQGkwRTLXKGGw/O7/QbcpMPVSH4HnNGECN/tJrfA5pEaqp90eZFofWknvYaQWl/e7vTBtLyLVGnQgY5fumOls5lK83XcLdMPLREs0f+owxZW8YE7H3rjWaJD9i5ENahArIAn3qswzVp0/VjSYva0tb9K+xZXgh0GtNydWsYx1aOWTavH5E0tzzfBTl5YpXZU9KHGxSvbEcUDnADhkP7ZZ2swidlo4lRYp+4R+tBgUtOb5epp7d2UJ+0BRnq7R5M911DiAAMfK8rHl2TsrYol4etbwhu82XhCMG2D8+ZvQoUH+i3Dy81X+5Avn/bOi4fUFBvPK4tzlasr88XRppz6l8W57LA8J/P2378f22aXbBvYqJA+RZJ15CM2ZbRYNFeNUG2rOFxJglqc2vvqJGxHf5ki3Eyn3JxbVVZu+fIc4CJS9WFYUw/YRuVbvpm0JQpVaTV082llOq27Xbblb3LJ0wng== 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: 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); -- 2.20.1