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 CF490C54734 for ; Tue, 27 Aug 2024 14:05:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E69E6B007B; Tue, 27 Aug 2024 10:05:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 595B06B0082; Tue, 27 Aug 2024 10:05:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E81F6B0083; Tue, 27 Aug 2024 10:05:17 -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 1C18E6B007B for ; Tue, 27 Aug 2024 10:05:17 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 65A44121ABD for ; Tue, 27 Aug 2024 14:05:16 +0000 (UTC) X-FDA: 82498197432.27.789BE9E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf07.hostedemail.com (Postfix) with ESMTP id CD0A040015 for ; Tue, 27 Aug 2024 14:05:13 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="d8v/ZBZ+"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=6LdNFCbN; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=AuKObXAh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=KQmovOfN; spf=pass (imf07.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724767494; 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=wJycPyQZbVtB7fnQVFGQ+k0FHHvI+eO9Mm2lydz/Y7U=; b=3hRkiLBoctrHnnkyLuzYetgcvlDR27efdCOMcwDHsRCo4pgAnV96eZH3lrBzSE4tVpJyBK QWmhjmIccPggZSBvlSJsGeSv6khOiArqko8UuC8YyhvyyjGw23IBMnWj3M7JG7bwErfdzr BsLCzG1pE9ThV+cDIRrPWQn6RX6hw6U= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="d8v/ZBZ+"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=6LdNFCbN; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=AuKObXAh; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=KQmovOfN; spf=pass (imf07.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724767494; a=rsa-sha256; cv=none; b=8mvr8tHqhEkaK0MTwWB5KoM89eN04fid2k96CJEhARqW+3EqqhR6H8K2t7ueTXZRGSo7GY WqlSOjoiDJnSTSj31X67sblHAEoOZmDiH6W/hWXCsGlFxMGOAvYMLCQ3RGWrZgASow0jXB S38x5ZEYOcZn7rpNwJ/UOdizJmD07gI= 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-out1.suse.de (Postfix) with ESMTPS id 79F9721B17; Tue, 27 Aug 2024 14:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1724767511; 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:autocrypt:autocrypt; bh=wJycPyQZbVtB7fnQVFGQ+k0FHHvI+eO9Mm2lydz/Y7U=; b=d8v/ZBZ+fKFWB600LAzUKFn+7j7t8LFRbUsE3tQYYelvTLJbgTS3Xq1KFx1iTqtwPISrlq G3ftF1ml3weUS7fl9ZvPr4LfAw96pgOjb5QXUcXe3QDz2jy84wvbfZTKnajx4AjWge0xGR EbLfqj75DH45IZc+7lwUT8898NnqXkw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1724767511; 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:autocrypt:autocrypt; bh=wJycPyQZbVtB7fnQVFGQ+k0FHHvI+eO9Mm2lydz/Y7U=; b=6LdNFCbNANRILN1DrWfSWin2/XNzbTlvoOjSUVIobokDxRl2UE+QNWsGl7wyZk9LJ5RlYR baDnwJF7/NbZUlBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1724767510; 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:autocrypt:autocrypt; bh=wJycPyQZbVtB7fnQVFGQ+k0FHHvI+eO9Mm2lydz/Y7U=; b=AuKObXAhPy3hgjntnd1vTApaMB5ud3BB2VbOljUgcay4bIJYkEBFN/+Kt/WFw2/O3VPoD8 9GSO3R60J3aF9aMvvDen6r2kQiw6fW2lZhBMATIOIINY0GwS2fuum+orx3/6CGDl3CZ5MA /JkVsOXB2CSmCYRA/ScjJLxc7PzG5HI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1724767510; 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:autocrypt:autocrypt; bh=wJycPyQZbVtB7fnQVFGQ+k0FHHvI+eO9Mm2lydz/Y7U=; b=KQmovOfNL3tStv/f+nS8WZQg6/zNw20Xy2sr7JohiugyYfs7bq/uF0bs7+4cGYzAJAKsT+ t8Y5G+5Em8ZvctAw== 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 6518013A44; Tue, 27 Aug 2024 14:05:10 +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 z5RWGBbdzWYYCQAAD6G6ig (envelope-from ); Tue, 27 Aug 2024 14:05:10 +0000 Message-ID: <6063be1b-7d4f-487e-9890-7e8f727d6324@suse.cz> Date: Tue, 27 Aug 2024 16:05:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] [RFC] mm: add kmem_cache_create_rcu() Content-Language: en-US To: Christian Brauner , Jens Axboe , "Paul E. McKenney" , Roman Gushchin , Linus Torvalds , Jann Horn Cc: linux-mm@kvack.org References: <20240826-zweihundert-luftkammer-9b2b47f4338e@brauner> <20240826-okkupieren-nachdenken-d88ac627e9bc@brauner> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= xsFNBFZdmxYBEADsw/SiUSjB0dM+vSh95UkgcHjzEVBlby/Fg+g42O7LAEkCYXi/vvq31JTB KxRWDHX0R2tgpFDXHnzZcQywawu8eSq0LxzxFNYMvtB7sV1pxYwej2qx9B75qW2plBs+7+YB 87tMFA+u+L4Z5xAzIimfLD5EKC56kJ1CsXlM8S/LHcmdD9Ctkn3trYDNnat0eoAcfPIP2OZ+ 9oe9IF/R28zmh0ifLXyJQQz5ofdj4bPf8ecEW0rhcqHfTD8k4yK0xxt3xW+6Exqp9n9bydiy tcSAw/TahjW6yrA+6JhSBv1v2tIm+itQc073zjSX8OFL51qQVzRFr7H2UQG33lw2QrvHRXqD Ot7ViKam7v0Ho9wEWiQOOZlHItOOXFphWb2yq3nzrKe45oWoSgkxKb97MVsQ+q2SYjJRBBH4 8qKhphADYxkIP6yut/eaj9ImvRUZZRi0DTc8xfnvHGTjKbJzC2xpFcY0DQbZzuwsIZ8OPJCc LM4S7mT25NE5kUTG/TKQCk922vRdGVMoLA7dIQrgXnRXtyT61sg8PG4wcfOnuWf8577aXP1x 6mzw3/jh3F+oSBHb/GcLC7mvWreJifUL2gEdssGfXhGWBo6zLS3qhgtwjay0Jl+kza1lo+Cv BB2T79D4WGdDuVa4eOrQ02TxqGN7G0Biz5ZLRSFzQSQwLn8fbwARAQABzSBWbGFzdGltaWwg QmFia2EgPHZiYWJrYUBzdXNlLmN6PsLBlAQTAQoAPgIbAwULCQgHAwUVCgkICwUWAgMBAAIe AQIXgBYhBKlA1DSZLC6OmRA9UCJPp+fMgqZkBQJkBREIBQkRadznAAoJECJPp+fMgqZkNxIQ ALZRqwdUGzqL2aeSavbum/VF/+td+nZfuH0xeWiO2w8mG0+nPd5j9ujYeHcUP1edE7uQrjOC Gs9sm8+W1xYnbClMJTsXiAV88D2btFUdU1mCXURAL9wWZ8Jsmz5ZH2V6AUszvNezsS/VIT87 AmTtj31TLDGwdxaZTSYLwAOOOtyqafOEq+gJB30RxTRE3h3G1zpO7OM9K6ysLdAlwAGYWgJJ V4JqGsQ/lyEtxxFpUCjb5Pztp7cQxhlkil0oBYHkudiG8j1U3DG8iC6rnB4yJaLphKx57NuQ PIY0Bccg+r9gIQ4XeSK2PQhdXdy3UWBr913ZQ9AI2usid3s5vabo4iBvpJNFLgUmxFnr73SJ KsRh/2OBsg1XXF/wRQGBO9vRuJUAbnaIVcmGOUogdBVS9Sun/Sy4GNA++KtFZK95U7J417/J Hub2xV6Ehc7UGW6fIvIQmzJ3zaTEfuriU1P8ayfddrAgZb25JnOW7L1zdYL8rXiezOyYZ8Fm ZyXjzWdO0RpxcUEp6GsJr11Bc4F3aae9OZtwtLL/jxc7y6pUugB00PodgnQ6CMcfR/HjXlae h2VS3zl9+tQWHu6s1R58t5BuMS2FNA58wU/IazImc/ZQA+slDBfhRDGYlExjg19UXWe/gMcl De3P1kxYPgZdGE2eZpRLIbt+rYnqQKy8UxlszsBNBFsZNTUBCACfQfpSsWJZyi+SHoRdVyX5 J6rI7okc4+b571a7RXD5UhS9dlVRVVAtrU9ANSLqPTQKGVxHrqD39XSw8hxK61pw8p90pg4G /N3iuWEvyt+t0SxDDkClnGsDyRhlUyEWYFEoBrrCizbmahOUwqkJbNMfzj5Y7n7OIJOxNRkB IBOjPdF26dMP69BwePQao1M8Acrrex9sAHYjQGyVmReRjVEtv9iG4DoTsnIR3amKVk6si4Ea X/mrapJqSCcBUVYUFH8M7bsm4CSxier5ofy8jTEa/CfvkqpKThTMCQPNZKY7hke5qEq1CBk2 wxhX48ZrJEFf1v3NuV3OimgsF2odzieNABEBAAHCwXwEGAEKACYCGwwWIQSpQNQ0mSwujpkQ PVAiT6fnzIKmZAUCZAUSmwUJDK5EZgAKCRAiT6fnzIKmZOJGEACOKABgo9wJXsbWhGWYO7mD 8R8mUyJHqbvaz+yTLnvRwfe/VwafFfDMx5GYVYzMY9TWpA8psFTKTUIIQmx2scYsRBUwm5VI EurRWKqENcDRjyo+ol59j0FViYysjQQeobXBDDE31t5SBg++veI6tXfpco/UiKEsDswL1WAr tEAZaruo7254TyH+gydURl2wJuzo/aZ7Y7PpqaODbYv727Dvm5eX64HCyyAH0s6sOCyGF5/p eIhrOn24oBf67KtdAN3H9JoFNUVTYJc1VJU3R1JtVdgwEdr+NEciEfYl0O19VpLE/PZxP4wX PWnhf5WjdoNI1Xec+RcJ5p/pSel0jnvBX8L2cmniYnmI883NhtGZsEWj++wyKiS4NranDFlA HdDM3b4lUth1pTtABKQ1YuTvehj7EfoWD3bv9kuGZGPrAeFNiHPdOT7DaXKeHpW9homgtBxj 8aX/UkSvEGJKUEbFL9cVa5tzyialGkSiZJNkWgeHe+jEcfRT6pJZOJidSCdzvJpbdJmm+eED w9XOLH1IIWh7RURU7G1iOfEfmImFeC3cbbS73LQEFGe1urxvIH5K/7vX+FkNcr9ujwWuPE9b 1C2o4i/yZPLXIVy387EjA6GZMqvQUFuSTs/GeBcv0NjIQi8867H3uLjz+mQy63fAitsDwLmR EP+ylKVEKb0Q2A== In-Reply-To: <20240826-okkupieren-nachdenken-d88ac627e9bc@brauner> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: d3f45r1ghq5sbfffigbed5ny8wxnj6w4 X-Rspamd-Queue-Id: CD0A040015 X-Rspamd-Server: rspam11 X-HE-Tag: 1724767513-987436 X-HE-Meta: U2FsdGVkX1/gxgilFl+UM0yvUqpzMFKTuV/csmvvCjJ2LiwkbYojmQpdYlJ/ufjtXzjLBm3Et+Qcl0RK/AA+zCXieGtbmrtw2tNzdEb8iLr93jjcJoz1KFo5VG0cCTXC4HUJesxtj6OVYCD8gP2CpqGK7WNzepMSAQjtnaADSZgDMWk+dR0myc/dMOtoLMki/edMoI4OrNRk0WaFix62e8LyGH4SgB07b1vq0QnHtKDoQkxXsajDUyqzMXqD7AgOHuwgfajhxz198Km9biWoW0r2sAKqqlmUH9Rmk7SCxk9yDkq9Ql6hsc7EVkJSj1xxr4li05h3agccEWNp0r7NbvuILtD+vzYvopgqQ7AZqLQo7pi3VGTPR58iqGiVhQ3djjGEeAUHZsKL9yNM8n7mwAa+O9+eH+nI1pacjyH+XAw4VrGiSbKLkumgpPi2CF+9Sqw+m/G0vxAMVLVMa3hZwzcJyQ4A81I1IkjlW9678sEzppZFNRVBTELq65E8rl4EPtxa4Hfrzr54GCVlIxNLi1du6ekUttSO3XxUtR6PKKZYIu7e70uBL0Sg1+W6h6wvCLaNTE7Qeq6mKcagjLaVVA60wl728DUHkvOJpNs25AzRSgxqEioi+H+SKndRTmYrw6wVnv0G6GuEZxIoYBIFklv8mHJgU2VcsIpZsLB6hp3x5hXL59Kl/HUYxBCsaQmkwtTinLrMTlm7PkfvGNwUDb2wU9cl1S6qKD2i9y76zh2p5zyJInUSej9k8t1kaWNGfvVvVNJOXlyj9FqJy2IL9NK09GVps/n8uGF13JcyaW6zH9bRweGS4PChLKYzZmKIIn7mtGYYBv66feEVfVfIb+utg9qZfBOhjZYARUidQGqt6d+NPl5okupAD44N/KLv0qFBKAx36CTgIWwB0pr8sp41kINmdwHbyu8StPkGf6sT6Uz8vwxDS90rlJBZun41DtOyj2kOblmiidobluI FvkHVDjd +quTyZI+AB6DY7OvMCHMOW/fVEEqgtTrBNqbPb9Is49rzYEeAWcQXMXcAns6R01zy/pzvy0yRssW5vv8UdBRroG8E3aJQXbzhF6yICH0jp3KXGgDS77zkB/n3OHQHeiRslygbRJ4ugYvmJ+xRjm/4EMPEf0IhcOYypCLfiwc0tOaoAxSXWhAb3CGLKM0q/JMyk+nyaV7NV6H2lRREmr3PH62E9JEdZTtLTnL58M6kRa75UcjF0YpAF4KjPCjC1stOpf/vDLP2LSAcKUJVoxZFe+dO7knQ+o5sW7/vYbrch1M3zRELCuBddji+a0sfrKgeeIjckDY6B+sAoA8CkgCIqWobcu0SWW1vVGvXEK7tKhv2ZTpzxzzYf4Bu8A== 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: On 8/26/24 18:04, Christian Brauner wrote: > When a kmem cache is created with SLAB_TYPESAFE_BY_RCU the free pointer > must be located outside of the object because we don't know what part of > the memory can safely be overwritten as it may be needed to prevent > object recycling. > > That has the consequence that SLAB_TYPESAFE_BY_RCU may end up adding a > new cacheline. This is the case for .e.g, struct file. After having it > shrunk down by 40 bytes and having it fit in three cachelines we still > have SLAB_TYPESAFE_BY_RCU adding a fourth cacheline because it needs to > accomodate the free pointer and is hardware cacheline aligned. > > I tried to find ways to rectify this as struct file is pretty much > everywhere and having it use less memory is a good thing. So here's a > proposal that might be totally the wrong api and broken but I thought I > give it a try. > > Signed-off-by: Christian Brauner Thanks! In addition to Mike's feedback: > --- > fs/file_table.c | 7 ++-- > include/linux/fs.h | 1 + > include/linux/slab.h | 4 +++ > mm/slab.h | 1 + > mm/slab_common.c | 76 +++++++++++++++++++++++++++++++++++++------- > mm/slub.c | 22 +++++++++---- > 6 files changed, 91 insertions(+), 20 deletions(-) > > diff --git a/fs/file_table.c b/fs/file_table.c > index 694199a1a966..a69b8a71eacb 100644 > --- a/fs/file_table.c > +++ b/fs/file_table.c > @@ -514,9 +514,10 @@ EXPORT_SYMBOL(__fput_sync); > > void __init files_init(void) > { > - filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, > - SLAB_TYPESAFE_BY_RCU | SLAB_HWCACHE_ALIGN | > - SLAB_PANIC | SLAB_ACCOUNT, NULL); > + filp_cachep = kmem_cache_create_rcu("filp", sizeof(struct file), > + offsetof(struct file, __f_slab_free_ptr), > + SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT, > + NULL); > percpu_counter_init(&nr_files, 0, GFP_KERNEL); > } > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 61097a9cf317..de509f5d1446 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1057,6 +1057,7 @@ struct file { > struct callback_head f_task_work; > struct llist_node f_llist; > struct file_ra_state f_ra; > + void *__f_slab_free_ptr; > }; > /* --- cacheline 3 boundary (192 bytes) --- */ > } __randomize_layout > diff --git a/include/linux/slab.h b/include/linux/slab.h > index eb2bf4629157..fc3c3cc9f689 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -242,6 +242,10 @@ struct kmem_cache *kmem_cache_create_usercopy(const char *name, > slab_flags_t flags, > unsigned int useroffset, unsigned int usersize, > void (*ctor)(void *)); > +struct kmem_cache *kmem_cache_create_rcu(const char *name, unsigned int size, > + unsigned int offset, > + slab_flags_t flags, > + void (*ctor)(void *)); I wonder if there's a way to do this in a more generic way, we'd now have 3 variants and neither supports everything (what about both rcu offset and usercopy?). > void kmem_cache_destroy(struct kmem_cache *s); > int kmem_cache_shrink(struct kmem_cache *s); > > diff --git a/mm/slab.h b/mm/slab.h > index dcdb56b8e7f5..122ca41fea34 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -261,6 +261,7 @@ struct kmem_cache { > unsigned int object_size; /* Object size without metadata */ > struct reciprocal_value reciprocal_size; > unsigned int offset; /* Free pointer offset */ > + bool dedicated_offset; /* Specific free pointer requested */ > #ifdef CONFIG_SLUB_CPU_PARTIAL > /* Number of per cpu partial objects to keep around */ > unsigned int cpu_partial; > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 40b582a014b8..b6ca63859b3a 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -202,10 +202,10 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, > } > > static struct kmem_cache *create_cache(const char *name, > - unsigned int object_size, unsigned int align, > - slab_flags_t flags, unsigned int useroffset, > - unsigned int usersize, void (*ctor)(void *), > - struct kmem_cache *root_cache) > + unsigned int object_size, unsigned int offset, > + unsigned int align, slab_flags_t flags, > + unsigned int useroffset, unsigned int usersize, > + void (*ctor)(void *), struct kmem_cache *root_cache) I've noticed we forgot to remove root_cache so it could be done now. > { > struct kmem_cache *s; > int err; > @@ -213,6 +213,10 @@ static struct kmem_cache *create_cache(const char *name, > if (WARN_ON(useroffset + usersize > object_size)) > useroffset = usersize = 0; > > + if (WARN_ON(offset >= object_size || > + (offset && !(flags & SLAB_TYPESAFE_BY_RCU)))) > + offset = 0; Wonder if we should just return -EINVAL rather than continue with a potentially dangerously broken cache. > + > err = -ENOMEM; > s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL); > if (!s) > @@ -226,6 +230,10 @@ static struct kmem_cache *create_cache(const char *name, > s->useroffset = useroffset; > s->usersize = usersize; > #endif > + if (offset > 0) { What if someone wants a zero offset as it's what works for their struct? Maybe we should make the default "don't care" value -1 or something? > + s->offset = offset; > + s->dedicated_offset = true; > + } > > err = __kmem_cache_create(s, flags); > if (err) > @@ -269,10 +277,10 @@ static struct kmem_cache *create_cache(const char *name, > * > * Return: a pointer to the cache on success, NULL on failure. > */ the kerneldoc above should be moved to kmem_cache_create_usercopy()? > -struct kmem_cache * > -kmem_cache_create_usercopy(const char *name, > - unsigned int size, unsigned int align, > - slab_flags_t flags, > +static struct kmem_cache * > +do_kmem_cache_create_usercopy(const char *name, > + unsigned int size, unsigned int offset, > + unsigned int align, slab_flags_t flags, > unsigned int useroffset, unsigned int usersize, > void (*ctor)(void *)) > { > @@ -332,7 +340,7 @@ kmem_cache_create_usercopy(const char *name, > goto out_unlock; > } > > - s = create_cache(cache_name, size, > + s = create_cache(cache_name, size, offset, > calculate_alignment(flags, align, size), > flags, useroffset, usersize, ctor, NULL); > if (IS_ERR(s)) { > @@ -356,6 +364,16 @@ kmem_cache_create_usercopy(const char *name, > } > return s; > } > + > +struct kmem_cache * > +kmem_cache_create_usercopy(const char *name, unsigned int size, > + unsigned int align, slab_flags_t flags, > + unsigned int useroffset, unsigned int usersize, > + void (*ctor)(void *)) > +{ > + return do_kmem_cache_create_usercopy(name, size, 0, align, flags, > + useroffset, usersize, ctor); > +} > EXPORT_SYMBOL(kmem_cache_create_usercopy); > > /** > @@ -387,11 +405,47 @@ struct kmem_cache * > kmem_cache_create(const char *name, unsigned int size, unsigned int align, > slab_flags_t flags, void (*ctor)(void *)) > { > - return kmem_cache_create_usercopy(name, size, align, flags, 0, 0, > - ctor); > + return do_kmem_cache_create_usercopy(name, size, 0, align, flags, 0, 0, > + ctor); > } > EXPORT_SYMBOL(kmem_cache_create); > > +/** > + * kmem_cache_create_rcu - Create a SLAB_TYPESAFE_BY_RCU cache. > + * @name: A string which is used in /proc/slabinfo to identify this cache. > + * @size: The size of objects to be created in this cache. > + * @offset: The offset into the memory to the free pointer > + * @flags: SLAB flags > + * @ctor: A constructor for the objects. > + * > + * Cannot be called within a interrupt, but can be interrupted. > + * The @ctor is run when new pages are allocated by the cache. > + * > + * The flags are > + * > + * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5) > + * to catch references to uninitialised memory. > + * > + * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check > + * for buffer overruns. > + * > + * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware > + * cacheline. This can be beneficial if you're counting cycles as closely > + * as davem. I guess we could refer the flags to another function than copy/paste. We should rather document the implications of specifying the freepointer offset for rcu readers, and in case of ctor being also used, that field also won't be set according to the ctor. > + * Return: a pointer to the cache on success, NULL on failure. > + */ > +struct kmem_cache *kmem_cache_create_rcu(const char *name, unsigned int size, > + unsigned int offset, > + slab_flags_t flags, > + void (*ctor)(void *)) > +{ > + return do_kmem_cache_create_usercopy(name, size, offset, 0, > + flags | SLAB_TYPESAFE_BY_RCU, 0, 0, > + ctor); > +} > +EXPORT_SYMBOL(kmem_cache_create_rcu); > + > static struct kmem_cache *kmem_buckets_cache __ro_after_init; > > /** > diff --git a/mm/slub.c b/mm/slub.c > index c9d8a2497fd6..34eac3f9a46e 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3926,7 +3926,7 @@ static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s, > void *obj) > { > if (unlikely(slab_want_init_on_free(s)) && obj && > - !freeptr_outside_object(s)) > + !freeptr_outside_object(s) && !s->dedicated_offset) I think maybe_wipe_obj_freeptr() is correct without the new condition. If we want the freepointer to be inside object because stale rcu readers won't be confused by seeing it in a particular field, it's ok to wipe it when the object is allocated as a new one? > memset((void *)((char *)kasan_reset_tag(obj) + s->offset), > 0, sizeof(void *)); > } > @@ -5153,6 +5153,7 @@ static int calculate_sizes(struct kmem_cache *s) > slab_flags_t flags = s->flags; > unsigned int size = s->object_size; > unsigned int order; > + bool must_use_freeptr_offset; > > /* > * Round up object size to the next word boundary. We can only > @@ -5189,9 +5190,12 @@ static int calculate_sizes(struct kmem_cache *s) > */ > s->inuse = size; > > - if ((flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON)) || s->ctor || > - ((flags & SLAB_RED_ZONE) && > - (s->object_size < sizeof(void *) || slub_debug_orig_size(s)))) { > + must_use_freeptr_offset = > + (flags & SLAB_POISON) || s->ctor || > + ((flags & SLAB_RED_ZONE) && > + (s->object_size < sizeof(void *) || slub_debug_orig_size(s))); > + > + if ((flags & SLAB_TYPESAFE_BY_RCU) || must_use_freeptr_offset) { > /* > * Relocate free pointer after the object if it is not > * permitted to overwrite the first word of the object on > @@ -5208,8 +5212,13 @@ static int calculate_sizes(struct kmem_cache *s) > * freeptr_outside_object() function. If that is no > * longer true, the function needs to be modified. > */ > - s->offset = size; > - size += sizeof(void *); > + if (!(flags & SLAB_TYPESAFE_BY_RCU) || must_use_freeptr_offset) { > + s->offset = size; > + size += sizeof(void *); > + s->dedicated_offset = false; > + } else { > + s->dedicated_offset = true; > + } > } else { > /* > * Store freelist pointer near middle of object to keep > @@ -5301,6 +5310,7 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) > if (get_order(s->size) > get_order(s->object_size)) { > s->flags &= ~DEBUG_METADATA_FLAGS; > s->offset = 0; > + s->dedicated_offset = false; > if (!calculate_sizes(s)) > goto error; > }