From patchwork Mon Mar 17 14:33:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 14019364 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 B5508C282EC for ; Mon, 17 Mar 2025 14:34:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F1B5528000A; Mon, 17 Mar 2025 10:34:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA36F280009; Mon, 17 Mar 2025 10:34:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1EC928000A; Mon, 17 Mar 2025 10:34:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B3336280009 for ; Mon, 17 Mar 2025 10:34:02 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B5D904BFFF for ; Mon, 17 Mar 2025 14:34:03 +0000 (UTC) X-FDA: 83231287566.20.B1DFC19 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf27.hostedemail.com (Postfix) with ESMTP id 6AAE14000B for ; Mon, 17 Mar 2025 14:34:01 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742222041; a=rsa-sha256; cv=none; b=lBHPaBzXWyFbKtoTn3hN0i6ShFQWbKxByv/FAxtT/umJrmXTDPC5MmHFJbIku8qsCv9rvu mtbkEz7MBN5VVebr38KKoM5gu6/hZjW+FbMOvVfqizd3gTaIT6rjVsU+hs9SsRKEM/69bS 1FCuHM8VhjbZUXdG9FFF6MAyKPVK+D0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742222041; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PjFVlcsr+qf6NE7vGqH0rVwP/2BNHmoTxp+iBx2dj3o=; b=z/dZcTao5nOFjUCJ1KctWx+cK14QOPeBNYJFC3p+riElXNO1J0dKnPPqXppzukIZrk/vkc luRu8Y3UU7Nqy5G6Q4LVgNSrkC4QZrEGp2Q1APZFqLlpr8VDwCcpKg0DoamACogu9x4kQs v0H/0/Ngp2hwyFLafSt9bED5TvkMqeA= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3980C1F834; Mon, 17 Mar 2025 14:33:34 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 21CA613A31; Mon, 17 Mar 2025 14:33:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GHf6B74y2GcycQAAD6G6ig (envelope-from ); Mon, 17 Mar 2025 14:33:34 +0000 From: Vlastimil Babka Date: Mon, 17 Mar 2025 15:33:08 +0100 Subject: [PATCH RFC v3 7/8] tools: Add sheafs support to testing infrastructure MIME-Version: 1.0 Message-Id: <20250317-slub-percpu-caches-v3-7-9d9884d8b643@suse.cz> References: <20250317-slub-percpu-caches-v3-0-9d9884d8b643@suse.cz> In-Reply-To: <20250317-slub-percpu-caches-v3-0-9d9884d8b643@suse.cz> To: Suren Baghdasaryan , "Liam R. Howlett" , Christoph Lameter , David Rientjes Cc: Roman Gushchin , Harry Yoo , Uladzislau Rezki , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rcu@vger.kernel.org, maple-tree@lists.infradead.org, vbabka@suse.cz, "Liam R. Howlett" X-Mailer: b4 0.14.2 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Queue-Id: 6AAE14000B X-Rspamd-Server: rspam05 X-Stat-Signature: gdwjj3okak3jytdgz6iec4dbkfegtynh X-HE-Tag: 1742222041-735419 X-HE-Meta: U2FsdGVkX19jTsq9QFp6FM6QQYYNAM5JQUZoeHXPhBqjMnI34LLcATqiAGuEnJf4sQB7zWivONZH4HzIcJOv+bb1FVEEFTqD9S7YN/GCFbsSJzYHK215jHCTX+4OiA/UPxhYvXKB7BDA/gjlUMctoQz4Cpjx20zpNWBqdRKnG+x8OYI/xCDN+bdb9SAkFxnL7GyxxTAlvauY/JU2MbKQFoamIGDEMZiTE67RRKwCphf8hk3AwZt9VxhhtEaPqD8yl1ldGxHb8VFSvJMbR3AFHUCcWIFB1DTKXWPEK++tqH/hPT4Kl+zoG2RXjhvwNiJV8+Pn+BAkJU3OIJlLXpQjc1Qey4GG/OeapFY2gWKs+NMcmCLEHIRHMRQt4ghAh6Lw9gYb6HHEhLx7SGMVPHU2BMvKMmMdoCVSiEL2xeCeYNYxoFbejBLaXWTbzf17IaCyntOP3tgA0qD3CMoVLrOA3KRApSW/u0NqEINogXGiELBUSZ/ICgg5b8FzyL5CeKjeWNHt8x1KH1zocResQWF1bMibXV4/IF0apy2DNH35iU+CJc05f+myxCKRM6ifUzHFda3dg5qAGDAVPt0aRnjASPLA25cHPwgBHDqeAwV0g9UJ6rpTc0WNZR2r07E+r1cv6XGza6ZJzypL1TqS9nwRicibguGPaL9Q+ycp8kK62eFGnIsfzp7IzDHd2ENnQNGVmjTjebP92L3RgR5Z4h1idhg0lhNLKyBn+kxF6hvR97v1r2Pg0R0IcFZQv/v0p/TgMRCcNZhTFUKFjpNfFWVj7DD8dYSkwv7x6GpmyX6MV7YwigGXy6E4P8EZSfIhNfQEWIhE+7HQq1FsQt0y93yEPRzqqBzLRydYU0eDd0FGBgcTq+C1O8wjHE2pNS9KnZUbFj3M+l5XBpwCde3qYMl1K9QuPs09oIKBunzYbdO8a/g7EU5l2xTwPSUuhbpD1z4ScgIEAHYlGmIKo0UaV6C H3Ezavi3 l199w0DUJJVgtrH4R6plhdeLfcMJB/T0jXJPlvi3qRLunWOAHHBxsVDhW4kqdGfmgZQQGB59R/PR4P8zCcbCooRGgCBB0g9heCXQzWXSgKjFIo2mRbP56eR0M3Y5/NDwSFWhGNdsikdVcatk= 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: From: "Liam R. Howlett" Allocate a sheaf and fill it to the count amount. Does not fill to the sheaf limit to detect incorrect allocation requests. Signed-off-by: Liam R. Howlett --- tools/include/linux/slab.h | 24 +++++++++++++ tools/testing/shared/linux.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/tools/include/linux/slab.h b/tools/include/linux/slab.h index a475364cfd9fcdb10db252aab18ea3a620326b6b..0b6b42c9921fc402b4f3d4f681a95c9067d128db 100644 --- a/tools/include/linux/slab.h +++ b/tools/include/linux/slab.h @@ -22,6 +22,13 @@ enum slab_state { FULL }; +struct slab_sheaf { + struct kmem_cache *cache; + unsigned int size; + unsigned int capacity; + void *objects[]; +}; + struct kmem_cache_args { unsigned int align; unsigned int sheaf_capacity; @@ -79,4 +86,21 @@ void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t size, void **list); int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size, void **list); +struct slab_sheaf * +kmem_cache_prefill_sheaf(struct kmem_cache *s, gfp_t gfp, unsigned int size); + +void * +kmem_cache_alloc_from_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf *sheaf); + +void kmem_cache_return_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf *sheaf); +int kmem_cache_refill_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf **sheafp, unsigned int size); + +static inline unsigned int kmem_cache_sheaf_size(struct slab_sheaf *sheaf) +{ + return sheaf->size; +} + #endif /* _TOOLS_SLAB_H */ diff --git a/tools/testing/shared/linux.c b/tools/testing/shared/linux.c index 9f5fd722f27f1d3877be8927be30409cd74ab3c3..a61c755c3c87e80036a5173115e955bfe7d5a80c 100644 --- a/tools/testing/shared/linux.c +++ b/tools/testing/shared/linux.c @@ -181,6 +181,12 @@ 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 (cachep->exec_callback) { + if (cachep->callback) + cachep->callback(cachep->private); + cachep->exec_callback = false; + } + pthread_mutex_lock(&cachep->lock); if (cachep->nr_objs >= size) { struct radix_tree_node *node; @@ -270,6 +276,84 @@ __kmem_cache_create_args(const char *name, unsigned int size, return ret; } +struct slab_sheaf * +kmem_cache_prefill_sheaf(struct kmem_cache *s, gfp_t gfp, unsigned int size) +{ + struct slab_sheaf *sheaf; + unsigned int capacity; + + if (size > s->sheaf_capacity) + capacity = size; + else + capacity = s->sheaf_capacity; + + sheaf = malloc(sizeof(*sheaf) + sizeof(void *) * s->sheaf_capacity * capacity); + if (!sheaf) { + return NULL; + } + + memset(sheaf, 0, size); + sheaf->cache = s; + sheaf->capacity = capacity; + sheaf->size = kmem_cache_alloc_bulk(s, gfp, size, sheaf->objects); + if (!sheaf->size) { + free(sheaf); + return NULL; + } + + return sheaf; +} + +int kmem_cache_refill_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf **sheafp, unsigned int size) +{ + struct slab_sheaf *sheaf = *sheafp; + int refill; + + if (sheaf->size >= size) + return 0; + + if (size > sheaf->capacity) { + sheaf = kmem_cache_prefill_sheaf(s, gfp, size); + if (!sheaf) + return -ENOMEM; + + kmem_cache_return_sheaf(s, gfp, *sheafp); + *sheafp = sheaf; + return 0; + } + + refill = kmem_cache_alloc_bulk(s, gfp, size - sheaf->size, + &sheaf->objects[sheaf->size]); + if (!refill) + return -ENOMEM; + + sheaf->size += refill; + return 0; +} + +void kmem_cache_return_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf *sheaf) +{ + if (sheaf->size) { + //s->non_kernel += sheaf->size; + kmem_cache_free_bulk(s, sheaf->size, &sheaf->objects[0]); + } + free(sheaf); +} + +void * +kmem_cache_alloc_from_sheaf(struct kmem_cache *s, gfp_t gfp, + struct slab_sheaf *sheaf) +{ + if (sheaf->size == 0) { + printf("Nothing left in sheaf!\n"); + return NULL; + } + + return sheaf->objects[--sheaf->size]; +} + /* * Test the test infrastructure for kem_cache_alloc/free and bulk counterparts. */