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 906BBC48BC1 for ; Wed, 14 Feb 2024 17:59:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 096DA6B0083; Wed, 14 Feb 2024 12:59:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 01F8B6B008A; Wed, 14 Feb 2024 12:59:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8CF86B008C; Wed, 14 Feb 2024 12:59:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C2A756B0083 for ; Wed, 14 Feb 2024 12:59:12 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8CB731C1815 for ; Wed, 14 Feb 2024 17:59:12 +0000 (UTC) X-FDA: 81791170944.18.81E8B20 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf01.hostedemail.com (Postfix) with ESMTP id 31B7A40011 for ; Wed, 14 Feb 2024 17:59:09 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aK+8VjyI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Psgv+7MZ; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aK+8VjyI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Psgv+7MZ; spf=pass (imf01.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 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=1707933550; 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=f2RWtNk8U1R2XRFQl1j1CoYNmJnR10fxgpFPBsng0LI=; b=DF7sHVMyoDGRMtKhzZ3M7oVgWL/hyZP6tvASI+Znfs/dWHZz/+Q1zC3PC3/QRMIU7iEDFb MyzgkzOa9Ndkg5hlMwTrF0DPgqoouxvkTkMz3ZLwD0oiAgG3dzLHktsimft+06TLk+gFtm ACqvlrTZ+DeDShoDteklJ6mTf3STnX4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707933550; a=rsa-sha256; cv=none; b=BImiG2vl1uzGdVIIvorSVLzEW9WL2XTDtmPyyl8SWChQnGtTlCIuTNPrdLmpyTNMDftYUX z9oTv5GFp+YVu+mAqJqmug8cYz/rra5vmgIhzEHgyGELHEn49vhtWT95JnyjKMngvm3sxg 06uct2k2Gd6gS6UwO4Gat49o28USEaM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aK+8VjyI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Psgv+7MZ; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aK+8VjyI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Psgv+7MZ; spf=pass (imf01.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none 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 113CF1F815; Wed, 14 Feb 2024 17:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1707933548; 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=f2RWtNk8U1R2XRFQl1j1CoYNmJnR10fxgpFPBsng0LI=; b=aK+8VjyIaHpcdTKDOIsz5Dbg+qMpGN+F023AOzqddNbIfq73gfsEKREJMDDJVrMeddBxDH y/jmcG8oIsiuYjaYRXJ6hRHScHzyIkrEsxooTPm81qEVH9/NYPfK+XH92v4riFamS0n3vK g0CfCWblAz1VGwP7B6hXh/8EdncqQxM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1707933548; 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=f2RWtNk8U1R2XRFQl1j1CoYNmJnR10fxgpFPBsng0LI=; b=Psgv+7MZTA60P9ZPDJ7pfz/hWkKqrnS24bNJS16VF6X116lWn7Dj9qqKsI0svfIgaI+dz6 w/Ig421ykrX9vsAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1707933548; 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=f2RWtNk8U1R2XRFQl1j1CoYNmJnR10fxgpFPBsng0LI=; b=aK+8VjyIaHpcdTKDOIsz5Dbg+qMpGN+F023AOzqddNbIfq73gfsEKREJMDDJVrMeddBxDH y/jmcG8oIsiuYjaYRXJ6hRHScHzyIkrEsxooTPm81qEVH9/NYPfK+XH92v4riFamS0n3vK g0CfCWblAz1VGwP7B6hXh/8EdncqQxM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1707933548; 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=f2RWtNk8U1R2XRFQl1j1CoYNmJnR10fxgpFPBsng0LI=; b=Psgv+7MZTA60P9ZPDJ7pfz/hWkKqrnS24bNJS16VF6X116lWn7Dj9qqKsI0svfIgaI+dz6 w/Ig421ykrX9vsAw== 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 5910813A6D; Wed, 14 Feb 2024 17:59:07 +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 Om60FGv/zGWRTgAAD6G6ig (envelope-from ); Wed, 14 Feb 2024 17:59:07 +0000 Message-ID: <3cf2acae-cb8d-455a-b09d-a1fdc52f5774@suse.cz> Date: Wed, 14 Feb 2024 18:59:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 05/35] mm: introduce slabobj_ext to support slab object extensions To: Suren Baghdasaryan , akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org References: <20240212213922.783301-1-surenb@google.com> <20240212213922.783301-6-surenb@google.com> Content-Language: en-US From: Vlastimil Babka In-Reply-To: <20240212213922.783301-6-surenb@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 31B7A40011 X-Rspam-User: X-Stat-Signature: 3ee7ebeg7h1say9uibryqecketz7rths X-Rspamd-Server: rspam03 X-HE-Tag: 1707933549-26235 X-HE-Meta: U2FsdGVkX1+M9Ev006r1mnkdwhznusVYHgBFl4HAMBISEE1gCdQEumqBP7ytIL+Zz5fJene72mRojFSYegNcpA+aL0E2ExXqvPMvwX/bvEOetgLgDDaZWb1KyyschzkFj6l+JXH2LpZU3sfNKCRMGje9zacbOJj2R926pO1ynHj5NIoi0N//ERva6ZDm7fuP9LJYo4zbU8fubBb8nzwEKEjagMh2jw/vRhJDZqRxl6waj7tewQ3d9/27xpopQOPAaNKtJ0/VfTz2qKWbCkecIO6wMR0RF9tlpM7P0jJTplwozEZbj3orVs8XTiTzNLwBt2qhsL7hp3bi97F3Y17x9eBuF5KWluKgt6iweVS02wPgpUBNviD9+eQou90txk2QE/m5zvyKVEZb2aXVcNVhGcHIudaHeW/yRB9gyQS0sO0+65Qh/cgXwp4nxyoOQtLrsbxEYF+cHCg9uO01mQFq6bakQrNvvngaJRa/zazyNVxAxLO8WoqxSoeF8pNeTyHUgsgGFxJqodOE5j1G3qR5fqmJ7SW3f0429pcDN5gAqaPiIrSqHOUUZ9vEc7F2vfUnJyckZpxoPvmNLYAiTOjmKADPTFlWeLDPDiVyb5X584NJZMI77A5RkNJnImpQoaJe6xIg2CfIXqoINynBXUNx3FX2LJ7dXCdMXk51o0iSDbylITQyask4mvKHjCcsWgkQFmndslvyZQ2Wd214arMhfDx19l51fI1qlcPv9JvTKwKNhNicawJ4SFl96G80OeBJiLy/Micd70cYzxGFU0yKeypJA5uYnIiQRobD+yqm4ucI3I2O9TTcHZYn+o60rIawzNPRS/jR9LOHL42zui5+vtA9I67+u1G6pJ5xoPo8TdKD3mELfjuGF94HR72QEOm5kOwNP0bTKdjiNiIIqtoDXDYi820ejRrpCOCG435Fs4P9lvfi91l1B6i80fL+IMhRyT5VqUs0fhMqtdl2O7a 5vX1wNNQ WT+gbImt/GZkKemzkqhyun4ZEMHlKXKc612ZY0b2nAj7zBBxFmRMRqo1T0Jq6TpfOJPMPzBwGPer2kIpSzOTBsetdr/JDNcp3rFYTwD1AeaeNxhx0xTYp26UDKejEUCNsRUbTdLiWcRYIfOgeHlgcZJGE9Gjj7lLLKAEX67FvSCojTH7fHpYBdsirgfW58EyZlXxH42T8ddjpvEy3P10z/cv3kvjpN2mIfLOBNUQDrM/FOv95GSqal5ja6CZszEhZPTHQVyMjJ1JqNEFBBwXmZ460A3+ln8KXkC50dAy+YkLkYA0/S2udYucPIkcb/XXQb965Q76j8kfaGHc1J6t6jSDM3UHeo2UKT+E79qVTsREJG9eWz0isWJQbFR+o3NzfmWYvq5K52Sf7DGQbuv0xCX260g== 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 2/12/24 22:38, Suren Baghdasaryan wrote: > Currently slab pages can store only vectors of obj_cgroup pointers in > page->memcg_data. Introduce slabobj_ext structure to allow more data > to be stored for each slab object. Wrap obj_cgroup into slabobj_ext > to support current functionality while allowing to extend slabobj_ext > in the future. > > Signed-off-by: Suren Baghdasaryan ... > +static inline bool need_slab_obj_ext(void) > +{ > + /* > + * CONFIG_MEMCG_KMEM creates vector of obj_cgroup objects conditionally > + * inside memcg_slab_post_alloc_hook. No other users for now. > + */ > + return false; > +} > + > +static inline struct slabobj_ext * > +prepare_slab_obj_exts_hook(struct kmem_cache *s, gfp_t flags, void *p) > +{ > + struct slab *slab; > + > + if (!p) > + return NULL; > + > + if (!need_slab_obj_ext()) > + return NULL; > + > + slab = virt_to_slab(p); > + if (!slab_obj_exts(slab) && > + WARN(alloc_slab_obj_exts(slab, s, flags, false), > + "%s, %s: Failed to create slab extension vector!\n", > + __func__, s->name)) > + return NULL; > + > + return slab_obj_exts(slab) + obj_to_index(s, slab, p); This is called in slab_post_alloc_hook() and the result stored to obj_exts but unused. Maybe introduce this only in a later patch where it becomes relevant? > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -201,6 +201,54 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, > return NULL; > } > > +#ifdef CONFIG_SLAB_OBJ_EXT > +/* > + * The allocated objcg pointers array is not accounted directly. > + * Moreover, it should not come from DMA buffer and is not readily > + * reclaimable. So those GFP bits should be masked off. > + */ > +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | \ > + __GFP_ACCOUNT | __GFP_NOFAIL) > + > +int alloc_slab_obj_exts(struct slab *slab, struct kmem_cache *s, > + gfp_t gfp, bool new_slab) Since you're moving this function between files anyway, could you please instead move it to mm/slub.c. I expect we'll eventually (maybe even soon) move the rest of performance sensitive kmemcg hooks there as well to make inlining possible. > +{ > + unsigned int objects = objs_per_slab(s, slab); > + unsigned long obj_exts; > + void *vec; > + > + gfp &= ~OBJCGS_CLEAR_MASK; > + vec = kcalloc_node(objects, sizeof(struct slabobj_ext), gfp, > + slab_nid(slab)); > + if (!vec) > + return -ENOMEM; > + > + obj_exts = (unsigned long)vec; > +#ifdef CONFIG_MEMCG > + obj_exts |= MEMCG_DATA_OBJEXTS; > +#endif > + if (new_slab) { > + /* > + * If the slab is brand new and nobody can yet access its > + * obj_exts, no synchronization is required and obj_exts can > + * be simply assigned. > + */ > + slab->obj_exts = obj_exts; > + } else if (cmpxchg(&slab->obj_exts, 0, obj_exts)) { > + /* > + * If the slab is already in use, somebody can allocate and > + * assign slabobj_exts in parallel. In this case the existing > + * objcg vector should be reused. > + */ > + kfree(vec); > + return 0; > + } > + > + kmemleak_not_leak(vec); > + return 0; > +} > +#endif /* CONFIG_SLAB_OBJ_EXT */ > + > static struct kmem_cache *create_cache(const char *name, > unsigned int object_size, unsigned int align, > slab_flags_t flags, unsigned int useroffset, > diff --git a/mm/slub.c b/mm/slub.c > index 2ef88bbf56a3..1eb1050814aa 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -683,10 +683,10 @@ static inline bool __slab_update_freelist(struct kmem_cache *s, struct slab *sla > > if (s->flags & __CMPXCHG_DOUBLE) { > ret = __update_freelist_fast(slab, freelist_old, counters_old, > - freelist_new, counters_new); > + freelist_new, counters_new); > } else { > ret = __update_freelist_slow(slab, freelist_old, counters_old, > - freelist_new, counters_new); > + freelist_new, counters_new); > } > if (likely(ret)) > return true; > @@ -710,13 +710,13 @@ static inline bool slab_update_freelist(struct kmem_cache *s, struct slab *slab, > > if (s->flags & __CMPXCHG_DOUBLE) { > ret = __update_freelist_fast(slab, freelist_old, counters_old, > - freelist_new, counters_new); > + freelist_new, counters_new); > } else { > unsigned long flags; > > local_irq_save(flags); > ret = __update_freelist_slow(slab, freelist_old, counters_old, > - freelist_new, counters_new); > + freelist_new, counters_new); I can see the mixing of tabs and spaces is wrong but perhaps not fix it as part of the series? > local_irq_restore(flags); > } > if (likely(ret)) > @@ -1881,13 +1881,25 @@ static inline enum node_stat_item cache_vmstat_idx(struct kmem_cache *s) > NR_SLAB_RECLAIMABLE_B : NR_SLAB_UNRECLAIMABLE_B; > } > > -#ifdef CONFIG_MEMCG_KMEM > -static inline void memcg_free_slab_cgroups(struct slab *slab) > +#ifdef CONFIG_SLAB_OBJ_EXT > +static inline void free_slab_obj_exts(struct slab *slab) Right, freeing is already here, so makes sense put the allocation here as well. > @@ -3817,6 +3820,7 @@ void slab_post_alloc_hook(struct kmem_cache *s, struct obj_cgroup *objcg, > kmemleak_alloc_recursive(p[i], s->object_size, 1, > s->flags, init_flags); > kmsan_slab_alloc(s, p[i], init_flags); > + obj_exts = prepare_slab_obj_exts_hook(s, flags, p[i]); Yeah here's the hook used. Doesn't it generate a compiler warning? Maybe at least postpone the call until the result is further used. > } > > memcg_slab_post_alloc_hook(s, objcg, flags, size, p);