From patchwork Mon Mar 17 14:33:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 14019359 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 A2781C282EC for ; Mon, 17 Mar 2025 14:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA91B280002; Mon, 17 Mar 2025 10:33:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF073280006; Mon, 17 Mar 2025 10:33:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1E3E280002; Mon, 17 Mar 2025 10:33:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6FBAC280004 for ; Mon, 17 Mar 2025 10:33:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5BE14AF45F for ; Mon, 17 Mar 2025 14:33:44 +0000 (UTC) X-FDA: 83231286768.30.D5AF78E Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf26.hostedemail.com (Postfix) with ESMTP id 0E5CF140019 for ; Mon, 17 Mar 2025 14:33:41 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=J1z9sCkK; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="4vHhu/4o"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="iuP/iyFD"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=qjhsgMgd; dmarc=none; spf=pass (imf26.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=1742222022; a=rsa-sha256; cv=none; b=hF/EyyJjR7GGntSxB/z2cuK/A9TfFEvL7PmBCv61FouEVjponPvmqEt9otInG4Yqclcaxk 1xA7sWxXfPhBwl0KrqDbS1ONekDoeCAZO7KSTnGZJqEePkTI5K071zJXLmOOOEXk/pWIvE IJ5+w8yOMaq8ki5S4Wr2dp1seAEtu30= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=J1z9sCkK; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="4vHhu/4o"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="iuP/iyFD"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=qjhsgMgd; dmarc=none; spf=pass (imf26.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=1742222022; 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:dkim-signature; bh=v7LjiyKxoBHCwpYxFBSZ+SdyyQuEt95Pyyo7ifzYDjc=; b=KMoDoAUSgU5sQ2y34HQU4GebsX0FBHjKD6LT/gMJrqm5ZU3HjBAni3dLSfOtucQ5bOXMaA NOM6aSzzJq2xGeRW6FPsnc+mGuUgiesl81podJ1QFon0jm4U9tj2iuIXKBJohzgSqnFJFF st75A3AX9ba7lZrSdGQN+SmRDb49jGw= Received: from imap1.dmz-prg2.suse.org (unknown [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 EC2431F7F1; Mon, 17 Mar 2025 14:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1742222014; h=from:from:reply-to: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=v7LjiyKxoBHCwpYxFBSZ+SdyyQuEt95Pyyo7ifzYDjc=; b=J1z9sCkKBd6NksdG1vOMEelg8N+dfX8Jc47e+I3hxw925eaZLWG/hU5rnQngC19YqORSdX pDcP6BHDZYVXe3uZggFJXYy17pd3Kwl2ulVacgh1fBA5QYwq02tN7CWzypD/YmCbxMYge4 r/riH5XQZHbKaEfXO6F3uYcmW3YP8UM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1742222014; h=from:from:reply-to: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=v7LjiyKxoBHCwpYxFBSZ+SdyyQuEt95Pyyo7ifzYDjc=; b=4vHhu/4oFj0pRG7RVQZMcJ/0jYI+q7pHFedL3kG9S5TBBme5s4Rrvb2skuUhQt1D9psNnP WwSFpiDFI3X59fCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1742222013; h=from:from:reply-to: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=v7LjiyKxoBHCwpYxFBSZ+SdyyQuEt95Pyyo7ifzYDjc=; b=iuP/iyFDie83Pjl1IrjP3xORPeQL8i1B0ifEoHRcZUXpVGqUxDrjtsIJZsx+Fb8IvocbO8 gnC86kOvpykbEobLlYBX1ygsCLVCZghuY05SZFLQnHLlCEYQJycpdLioryN/hXFe5JU8Sk voKjVkuuC6uapZ2blXZeDz3NoA4n45A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1742222013; h=from:from:reply-to: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=v7LjiyKxoBHCwpYxFBSZ+SdyyQuEt95Pyyo7ifzYDjc=; b=qjhsgMgdDjN5xs8ckbl6z9q7ODeFrvJkhEKh4hYEhmnQc59Hrh764qUDs8U73D5QHhxjek YiMq261tozX/O6BA== 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 CC2AA13A5A; Mon, 17 Mar 2025 14:33:33 +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 WI+RMb0y2GcycQAAD6G6ig (envelope-from ); Mon, 17 Mar 2025 14:33:33 +0000 From: Vlastimil Babka Date: Mon, 17 Mar 2025 15:33:04 +0100 Subject: [PATCH RFC v3 3/8] slab: add sheaf support for batching kfree_rcu() operations MIME-Version: 1.0 Message-Id: <20250317-slub-percpu-caches-v3-3-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 X-Mailer: b4 0.14.2 X-Stat-Signature: hodzxg6y7rwp9hcjexdp9scfm6znjing X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0E5CF140019 X-Rspam-User: X-HE-Tag: 1742222021-677556 X-HE-Meta: U2FsdGVkX19Y97U8puIvNb0aEYejwXPcIvh+KiuCVBVj5RpD7w4fT+E6jUk2C8cg+XhPxVnvu52qWfZA7Bjy6WNqgcl5ON++gYdBQ/w6BRfTvu6ufGpaH/iX3URoD2p1V0ntkoydEo04y3ZbtsJRCqyi+4uVXuHYu7d16sKbfF0pc6YEZXjrgH4H7F//MpqFBZIryIrOd29zXLPKktY0nbhm7zX4gw5wT0Fbm5l49nxb7htaEYJZoQZuAP5rZRs9v4cWrrGtzCL7LZFEKozdzKALYhMErlMpp3ppr6kVl9lqLo3kufgcHNuVviq+rhquEuUzjfvHryjrFO6dX2GsZK0nylO2W2MwAa8oi1uiwO4uqn+Od0lT5Cz6lqHbEVqC/mFavGlzZkLba29q2FOLX856ZaJ9kIjVdwawu0P4/5WmTxRlxBSFjHy4D1NrPar9S5K5VCbZkrYs69STC8l46sNjgLYglg2kgIy3Py+hHbUd7d883T5b4ixx9voFJNqxwDmIbIMrVRMne8M+YX3VNGaIZwVjMmKz7+dUzKPhluc1kzIc+YXYmuMK5fE8gfILTRhECf8aZmgNUXgdD1OHTfmogUkKzKvETW/EZeg056h+JzTJOAcpzZDAiB3dX5TSFtXVY/EbGvK0o8hkckjyMOicI9SNcVTTg5W0oZBplF9zaAFPHFCva0hoM7wIw0n2scvzl2ehlNxcZX5FgOoglh1yZ/u0mGUTOP59ZXE6djXYNFZLiDbjUT9tkzWl+il5MvHH+YmZ+cxWd9SlPGa/MxRV0CFtOakkKftwnm84d1s75YCkcPxhMMFmVbiljRW/It8ODsWXuViz7I+c47Hc8R4j1AEzwJcv0ANyIgHBAlf0mmbnSD3ttqBBYbjp/43XE0g4JPI7ffP8FhyuUxYrRHEt3bAmlBFipRhDsnSEmhuWgJDmWFZSqqY9Q23//cLzgJO5W7FCC1jOwMkPWl/ 14pjFvKR p0heeMJ16cJGNlaM7sHB8oMvaaUkms3P+M1rbriMb06L7xSWWGjaL1DZmeGKq/RuXgQagph3ahd6jyh622kzgSg1vodWRehZ15UrEpUgfrsNyyHMCrWS4L3eeEKTyHur/gCDVX8J5ZzP0ls+9sCMdnGq01TKbK0+aemMgK1cJ/jGG18Zn375AFG3sJpBY/yFzi5tGKP79ev8VGX99Xyjp7JPVke0RGGZW4kIvgB/Ktky9rd2HWcuhgajNshQZWmXGvOyBce65nV0rdWwtZNt9maC/T+WoSoQ7APENU3Dm37EXdeftjUP+RQNI/M0tJqsOEOvw 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: Extend the sheaf infrastructure for more efficient kfree_rcu() handling. For caches with sheaves, on each cpu maintain a rcu_free sheaf in addition to main and spare sheaves. kfree_rcu() operations will try to put objects on this sheaf. Once full, the sheaf is detached and submitted to call_rcu() with a handler that will try to put it in the barn, or flush to slab pages using bulk free, when the barn is full. Then a new empty sheaf must be obtained to put more objects there. It's possible that no free sheaves are available to use for a new rcu_free sheaf, and the allocation in kfree_rcu() context can only use GFP_NOWAIT and thus may fail. In that case, fall back to the existing kfree_rcu() machinery. Expected advantages: - batching the kfree_rcu() operations, that could eventually replace the existing batching - sheaves can be reused for allocations via barn instead of being flushed to slabs, which is more efficient - this includes cases where only some cpus are allowed to process rcu callbacks (Android) Possible disadvantage: - objects might be waiting for more than their grace period (it is determined by the last object freed into the sheaf), increasing memory usage - but the existing batching does that too? Only implement this for CONFIG_KVFREE_RCU_BATCHED as the tiny implementation favors smaller memory footprint over performance. Signed-off-by: Vlastimil Babka Reviewed-by: Suren Baghdasaryan --- mm/slab.h | 2 + mm/slab_common.c | 24 ++++++++ mm/slub.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 189 insertions(+), 2 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 8daaec53b6ecfc44171191d421adb12e5cba2c58..94e9959e1aefa350d3d74e3f5309fde7a5cf2ec8 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -459,6 +459,8 @@ static inline bool is_kmalloc_normal(struct kmem_cache *s) return !(s->flags & (SLAB_CACHE_DMA|SLAB_ACCOUNT|SLAB_RECLAIM_ACCOUNT)); } +bool __kfree_rcu_sheaf(struct kmem_cache *s, void *obj); + /* Legal flag mask for kmem_cache_create(), for various configurations */ #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | \ SLAB_CACHE_DMA32 | SLAB_PANIC | \ diff --git a/mm/slab_common.c b/mm/slab_common.c index ceeefb287899a82f30ad79b403556001c1860311..9496176770ed47491e01ed78e060a74771d5541e 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1613,6 +1613,27 @@ static void kfree_rcu_work(struct work_struct *work) kvfree_rcu_list(head); } +static bool kfree_rcu_sheaf(void *obj) +{ + struct kmem_cache *s; + struct folio *folio; + struct slab *slab; + + if (is_vmalloc_addr(obj)) + return false; + + folio = virt_to_folio(obj); + if (unlikely(!folio_test_slab(folio))) + return false; + + slab = folio_slab(folio); + s = slab->slab_cache; + if (s->cpu_sheaves) + return __kfree_rcu_sheaf(s, obj); + + return false; +} + static bool need_offload_krc(struct kfree_rcu_cpu *krcp) { @@ -1957,6 +1978,9 @@ void kvfree_call_rcu(struct rcu_head *head, void *ptr) if (!head) might_sleep(); + if (kfree_rcu_sheaf(ptr)) + return; + // Queue the object but don't yet schedule the batch. if (debug_rcu_head_queue(ptr)) { // Probable double kfree_rcu(), just leak. diff --git a/mm/slub.c b/mm/slub.c index fa3a6329713a9f45b189f27d4b1b334b54589c38..83f4395267dccfbc144920baa7d0a85a27fbb1b4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -350,6 +350,8 @@ enum stat_item { ALLOC_FASTPATH, /* Allocation from cpu slab */ ALLOC_SLOWPATH, /* Allocation by getting a new cpu slab */ FREE_PCS, /* Free to percpu sheaf */ + FREE_RCU_SHEAF, /* Free to rcu_free sheaf */ + FREE_RCU_SHEAF_FAIL, /* Failed to free to a rcu_free sheaf */ FREE_FASTPATH, /* Free to cpu slab */ FREE_SLOWPATH, /* Freeing not to cpu slab */ FREE_FROZEN, /* Freeing to frozen slab */ @@ -442,6 +444,7 @@ struct slab_sheaf { struct rcu_head rcu_head; struct list_head barn_list; }; + struct kmem_cache *cache; unsigned int size; void *objects[]; }; @@ -450,6 +453,7 @@ struct slub_percpu_sheaves { localtry_lock_t lock; struct slab_sheaf *main; /* never NULL when unlocked */ struct slab_sheaf *spare; /* empty or full, may be NULL */ + struct slab_sheaf *rcu_free; /* for batching kfree_rcu() */ struct node_barn *barn; }; @@ -2461,6 +2465,8 @@ static struct slab_sheaf *alloc_empty_sheaf(struct kmem_cache *s, gfp_t gfp) if (unlikely(!sheaf)) return NULL; + sheaf->cache = s; + stat(s, SHEAF_ALLOC); return sheaf; @@ -2585,6 +2591,24 @@ static void sheaf_flush_unused(struct kmem_cache *s, struct slab_sheaf *sheaf) sheaf->size = 0; } +static void __rcu_free_sheaf_prepare(struct kmem_cache *s, + struct slab_sheaf *sheaf); + +static void rcu_free_sheaf_nobarn(struct rcu_head *head) +{ + struct slab_sheaf *sheaf; + struct kmem_cache *s; + + sheaf = container_of(head, struct slab_sheaf, rcu_head); + s = sheaf->cache; + + __rcu_free_sheaf_prepare(s, sheaf); + + sheaf_flush_unused(s, sheaf); + + free_empty_sheaf(s, sheaf); +} + /* * Caller needs to make sure migration is disabled in order to fully flush * single cpu's sheaves @@ -2597,7 +2621,7 @@ static void sheaf_flush_unused(struct kmem_cache *s, struct slab_sheaf *sheaf) static void pcs_flush_all(struct kmem_cache *s) { struct slub_percpu_sheaves *pcs; - struct slab_sheaf *spare; + struct slab_sheaf *spare, *rcu_free; localtry_lock(&s->cpu_sheaves->lock); pcs = this_cpu_ptr(s->cpu_sheaves); @@ -2605,6 +2629,9 @@ static void pcs_flush_all(struct kmem_cache *s) spare = pcs->spare; pcs->spare = NULL; + rcu_free = pcs->rcu_free; + pcs->rcu_free = NULL; + localtry_unlock(&s->cpu_sheaves->lock); if (spare) { @@ -2612,6 +2639,9 @@ static void pcs_flush_all(struct kmem_cache *s) free_empty_sheaf(s, spare); } + if (rcu_free) + call_rcu(&rcu_free->rcu_head, rcu_free_sheaf_nobarn); + sheaf_flush_main(s); } @@ -2628,6 +2658,11 @@ static void __pcs_flush_all_cpu(struct kmem_cache *s, unsigned int cpu) free_empty_sheaf(s, pcs->spare); pcs->spare = NULL; } + + if (pcs->rcu_free) { + call_rcu(&pcs->rcu_free->rcu_head, rcu_free_sheaf_nobarn); + pcs->rcu_free = NULL; + } } static void pcs_destroy(struct kmem_cache *s) @@ -2644,6 +2679,7 @@ static void pcs_destroy(struct kmem_cache *s) continue; WARN_ON(pcs->spare); + WARN_ON(pcs->rcu_free); if (!WARN_ON(pcs->main->size)) { free_empty_sheaf(s, pcs->main); @@ -3707,7 +3743,7 @@ static bool has_pcs_used(int cpu, struct kmem_cache *s) pcs = per_cpu_ptr(s->cpu_sheaves, cpu); - return (pcs->spare || pcs->main->size); + return (pcs->spare || pcs->rcu_free || pcs->main->size); } static void pcs_flush_all(struct kmem_cache *s); @@ -5240,6 +5276,122 @@ bool free_to_pcs(struct kmem_cache *s, void *object) return true; } +static void __rcu_free_sheaf_prepare(struct kmem_cache *s, + struct slab_sheaf *sheaf) +{ + bool init = slab_want_init_on_free(s); + void **p = &sheaf->objects[0]; + unsigned int i = 0; + + while (i < sheaf->size) { + struct slab *slab = virt_to_slab(p[i]); + + memcg_slab_free_hook(s, slab, p + i, 1); + alloc_tagging_slab_free_hook(s, slab, p + i, 1); + + if (unlikely(!slab_free_hook(s, p[i], init, false))) { + p[i] = p[--sheaf->size]; + continue; + } + + i++; + } +} + +static void rcu_free_sheaf(struct rcu_head *head) +{ + struct slab_sheaf *sheaf; + struct node_barn *barn; + struct kmem_cache *s; + + sheaf = container_of(head, struct slab_sheaf, rcu_head); + + s = sheaf->cache; + + __rcu_free_sheaf_prepare(s, sheaf); + + barn = get_node(s, numa_mem_id())->barn; + + /* due to slab_free_hook() */ + if (unlikely(sheaf->size == 0)) + goto empty; + + if (!barn_put_full_sheaf(barn, sheaf, false)) + return; + + sheaf_flush_unused(s, sheaf); + +empty: + if (!barn_put_empty_sheaf(barn, sheaf, false)) + return; + + free_empty_sheaf(s, sheaf); +} + +bool __kfree_rcu_sheaf(struct kmem_cache *s, void *obj) +{ + struct slub_percpu_sheaves *pcs; + struct slab_sheaf *rcu_sheaf; + + if (!localtry_trylock(&s->cpu_sheaves->lock)) + goto fail; + + pcs = this_cpu_ptr(s->cpu_sheaves); + + if (unlikely(!pcs->rcu_free)) { + + struct slab_sheaf *empty; + + empty = barn_get_empty_sheaf(pcs->barn); + + if (empty) { + pcs->rcu_free = empty; + goto do_free; + } + + localtry_unlock(&s->cpu_sheaves->lock); + + empty = alloc_empty_sheaf(s, GFP_NOWAIT); + + if (!empty) + goto fail; + + if (!localtry_trylock(&s->cpu_sheaves->lock)) + goto fail; + + pcs = this_cpu_ptr(s->cpu_sheaves); + + if (unlikely(pcs->rcu_free)) + barn_put_empty_sheaf(pcs->barn, empty, true); + else + pcs->rcu_free = empty; + } + +do_free: + + rcu_sheaf = pcs->rcu_free; + + rcu_sheaf->objects[rcu_sheaf->size++] = obj; + + if (likely(rcu_sheaf->size < s->sheaf_capacity)) { + localtry_unlock(&s->cpu_sheaves->lock); + stat(s, FREE_RCU_SHEAF); + return true; + } + + pcs->rcu_free = NULL; + localtry_unlock(&s->cpu_sheaves->lock); + + call_rcu(&rcu_sheaf->rcu_head, rcu_free_sheaf); + + stat(s, FREE_RCU_SHEAF); + return true; + +fail: + stat(s, FREE_RCU_SHEAF_FAIL); + return false; +} + /* * Bulk free objects to the percpu sheaves. * Unlike free_to_pcs() this includes the calls to all necessary hooks @@ -6569,6 +6721,11 @@ int __kmem_cache_shutdown(struct kmem_cache *s) struct kmem_cache_node *n; flush_all_cpus_locked(s); + + /* we might have rcu sheaves in flight */ + if (s->cpu_sheaves) + rcu_barrier(); + /* Attempt to free all objects */ for_each_kmem_cache_node(s, node, n) { if (n->barn) @@ -7974,6 +8131,8 @@ STAT_ATTR(ALLOC_PCS, alloc_cpu_sheaf); STAT_ATTR(ALLOC_FASTPATH, alloc_fastpath); STAT_ATTR(ALLOC_SLOWPATH, alloc_slowpath); STAT_ATTR(FREE_PCS, free_cpu_sheaf); +STAT_ATTR(FREE_RCU_SHEAF, free_rcu_sheaf); +STAT_ATTR(FREE_RCU_SHEAF_FAIL, free_rcu_sheaf_fail); STAT_ATTR(FREE_FASTPATH, free_fastpath); STAT_ATTR(FREE_SLOWPATH, free_slowpath); STAT_ATTR(FREE_FROZEN, free_frozen); @@ -8069,6 +8228,8 @@ static struct attribute *slab_attrs[] = { &alloc_fastpath_attr.attr, &alloc_slowpath_attr.attr, &free_cpu_sheaf_attr.attr, + &free_rcu_sheaf_attr.attr, + &free_rcu_sheaf_fail_attr.attr, &free_fastpath_attr.attr, &free_slowpath_attr.attr, &free_frozen_attr.attr,