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 BC0AEC48BC1 for ; Wed, 14 Feb 2024 19:20:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2838C6B0096; Wed, 14 Feb 2024 14:20:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 232516B0098; Wed, 14 Feb 2024 14:20:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 087886B009B; Wed, 14 Feb 2024 14:20:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E64416B0096 for ; Wed, 14 Feb 2024 14:20:06 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6BF59C0346 for ; Wed, 14 Feb 2024 19:20:06 +0000 (UTC) X-FDA: 81791374812.21.93E3CAA Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) by imf12.hostedemail.com (Postfix) with ESMTP id 7619A40011 for ; Wed, 14 Feb 2024 19:20:03 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xdSb77iC; spf=pass (imf12.hostedemail.com: domain of surenb@google.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707938403; 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=BeLyV2BNkjBFN275c/stAXS4Zt5cMLEm0RT7xxWo7xU=; b=2ev+7rfsEZ1TSvdFV24S5c7lN4jSYuRUJd/nWMSVwftvtBwuSlxmBC8SFgUdTaf4ODQWZs XRBYU38vRM2fSHqtkT6fDdu6d7Fx6R33M+8JOfZQ+2TZZqF4zkYdMo4xfTmp6yrlRaEiV0 3fUrlML1OWkRd3D3prt2usI0c/lGd30= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707938403; a=rsa-sha256; cv=none; b=CA+R6Sqk9/+TJ3NbWil0jhyi/KLo8+Ug6sCYpl+rsvGWWU3nz9DMV5JvRkKQX+SFijeFcz GRt5hg+FZOHDECdB0U/91f0DC0ZYOASjmT1ScI99rtk89pd4RFA1ZVCpfCM4I4/ODrlYvC aWev+LAI5gGuOrP3sMPUbRWCfOr/l+0= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xdSb77iC; spf=pass (imf12.hostedemail.com: domain of surenb@google.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-dcc4de7d901so24690276.0 for ; Wed, 14 Feb 2024 11:20:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707938402; x=1708543202; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=BeLyV2BNkjBFN275c/stAXS4Zt5cMLEm0RT7xxWo7xU=; b=xdSb77iCN1GdOuLo0t6qO6xS6QuU5TYxc4UO/u9qdgt4l2bDvosJNzkFquIXQSvkG2 z/Dw1yGl2fzgCXzGSBcN/VhCiv7s6Pkwv7MvZ3J4Ndwb56jVC5g5TJi2FPxxq00+VV/Z rSqsbE3zVYdiXC9l6y7nWhBHkzycReK9MgggRUbWC3e3INQ5FbPgj+8MP8W1QtApkCF3 B/cm17QaYDxk2t8ZdmL1cjXRotTf041N78nSSRaGUYR34q6M+YkZSD4d52YnZOUgqCjq Thh34cvkrNN2uTI+PlrEIVaRBKZhFhUAnCmFFT/UbfMZuBVpnZ8QhuDHEHGckrYUSnjH C6lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707938402; x=1708543202; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BeLyV2BNkjBFN275c/stAXS4Zt5cMLEm0RT7xxWo7xU=; b=RUoLIvfEw9UsDW9100bQS+OvyhebywSasUbtMgfXczYHJKF62SZQvEnMPUpe8kQ0Nw WmmQ4dtsXFnbAeq5BPpWQGJuK0WylFoMnDlgKNSWkf1eVmE0/OL3YF3zN5kE4BOCODu9 XeW+F+KI/9d4kw1lNe+F/KAw3389yTNmdSBWL3euqtH76PxIrypV3VslyKks2AoU67xz ovikO4kypOM1OlMJkXULKYufbVfm3IETTGvoPbFDXM5BCN2d4GArL2TqZzbq9XDMmWW8 9+NMXOR6yl/BEu1z5iwszpxi7ccmkM+y0ci6RYaEL603a7CN36bjfNj10pancT3A4Os7 IiXw== X-Forwarded-Encrypted: i=1; AJvYcCVd7pB0+WCNXr/nzdMhfotrLfA3qcDZImqMc4XcxyClAObKgE7U7etnbf7+ZdUzXqj8PDM45V+BEWDHmkgY41fc+tg= X-Gm-Message-State: AOJu0YzwCpIVJIlO8fHmpwEaxNI/ts46s4lnXm3SuVsaaJFQiN24JQii QGzIFYqfhesV2gQoZcS9TXuDHJwWrxlaZR7Nom24XZSpH+MCv3eGhcOqoTBqPXB8BnNnaNKB3Qw vYR1TearnuuG9uS91bJBczk2yDWczqMfakEAz X-Google-Smtp-Source: AGHT+IF2W3nFVUFRR9wPoi/qm4zOQswf3iODsFgqsQ39xkvihJBeUWVirJIMSGlhcPqgmo6BGDfddGXZmkzLZyBUkMg= X-Received: by 2002:a25:8708:0:b0:dc6:c617:7ca with SMTP id a8-20020a258708000000b00dc6c61707camr3594670ybl.29.1707938402225; Wed, 14 Feb 2024 11:20:02 -0800 (PST) MIME-Version: 1.0 References: <20240212213922.783301-1-surenb@google.com> <20240212213922.783301-6-surenb@google.com> <3cf2acae-cb8d-455a-b09d-a1fdc52f5774@suse.cz> In-Reply-To: <3cf2acae-cb8d-455a-b09d-a1fdc52f5774@suse.cz> From: Suren Baghdasaryan Date: Wed, 14 Feb 2024 11:19:51 -0800 Message-ID: Subject: Re: [PATCH v3 05/35] mm: introduce slabobj_ext to support slab object extensions To: Vlastimil Babka Cc: akpm@linux-foundation.org, 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 7619A40011 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: rpfjirhmb78b34ns7uc133xfypx6cd9t X-HE-Tag: 1707938403-398356 X-HE-Meta: U2FsdGVkX1+7VPGM7ReVBPqVQAU22KGFFxypLs02V1YAHLHDnnX2Pkdc3fUWwwSdY/prQTDrTKoyJP3JULbuKcuTw9JDPw92gAuvTO3EfcPcUgVhgEMr3MfRLP+DlOn3pc+cpTIe/44BlxQHsFKj489ey2gwtZwJrbsbE9WhpHAe0Kt0Dh3f2M5alqHghZQGCLcRbkEgE0v+KPdM1YrI1ly63PooxC5Kv7Blhs//KTDwu2eKTf+YoqmMfN5L4A/8NeaLDz7qqtJbUjqaSw4mwJhnbG0+iUI/7jAj4GBuP+/AClJ1VY0bRvG8Z4qwJZyMBaWu91l40ZzS3fpPpOfd99nSZKY1iYEaxIk25hoR99GODdEap2pcEw8H0qdWH0BERaEqUITkTUWoz16AJIIOsN4+hqYOUwQK1dkTMiTEcs/3QeRhxCwMRBeLpnaDYG+aJqx2fqurm8mzo8M9xoUONMVf2ZIg1ygEYaqwchSXKRv11JvhnSnj+iMNCfdX8nigWFrO6XVWp+AhFxM3xIgCXCjYt7vR0MFsLjSimzsDvPoU9MX51kTpltxXRhF/WosPXk9FASf1rcm3DuepFZILJ4PyIe+mlXifC65RJJcCn/XlpDnxXyQ0514fUQ3f57qN+cCublN/S+Tmo7UlcGNKBH4dQ1mKynwBMjB5AvZa2CwA8cUeog9Wgb67rJf1yBj5OqmC93zFzb+G8/d+01WigmgBRTBhe3cZ5IqvKAlTCq2c3oUuJ0fJWVWNkRMOGWO6LOCjNeVT5L+Raj8fXCweo30L6aCQ0DKNSJGVm5bDgX083P9zklW4PLejWLVPyyt3gzLwafchAStgiyk5m/eeRJ8yx5ytF0Lqw9M2o29U8VIiLx/+DGsY8JgnmIAJWJNRf0CIAag4z8jQT5/Rqr1RRbKLcKkrZFhTMgJWB/u7B3D/JeHddcyX4mAybwo03pp3SwCzMxeDd5wZ/beMGS2 OlEgaQQq FVHLjB2ktEPTcZ1hikCGvoYjSQSEWwXy0Pa6hFp4M5zGvsBWdsq4bQvqQaMt6remJXROoQOZWpiblyz5HV3MpSCZaBUV5pSFHjysT3FqaTj5QHuxHWo+Efz9hSjZ3UJys7lsLq0RfyEpwYdeJjRp+jrS6WVQdgiRKy3yaD3QbLpi3249jvtsYKXh0J8G9Qdhn2TqQrEmqZ5Gxn39e4iIM/9KpM4XYlkHVLyZGYCk73LrPq/OV59DlQHo4Vs1l5huuoZB1X78DeQMEtWrEOamkXoWt1LUmHnycVpZdJnliZmYk6SUvQ7NO6CQXuiUmAUPwDFi0qRrBLTJgbhUyGYwfDHXngY3C9vFqDs3imYwh2aHZ8zx9q8J2Unj3GRZ89PvzXuiJXyjYVe86G686ITVE+k7iNmBKJ396MHKz 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 Wed, Feb 14, 2024 at 9:59=E2=80=AFAM Vlastimil Babka wr= ote: > > 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 conditi= onally > > + * 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 =3D 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_ext= s > but unused. Maybe introduce this only in a later patch where it becomes > relevant? Ack. I'll move it into the patch where we start using obj_exts. > > > --- a/mm/slab_common.c > > +++ b/mm/slab_common.c > > @@ -201,6 +201,54 @@ struct kmem_cache *find_mergeable(unsigned int siz= e, 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. Will do. > > > +{ > > + unsigned int objects =3D objs_per_slab(s, slab); > > + unsigned long obj_exts; > > + void *vec; > > + > > + gfp &=3D ~OBJCGS_CLEAR_MASK; > > + vec =3D kcalloc_node(objects, sizeof(struct slabobj_ext), gfp, > > + slab_nid(slab)); > > + if (!vec) > > + return -ENOMEM; > > + > > + obj_exts =3D (unsigned long)vec; > > +#ifdef CONFIG_MEMCG > > + obj_exts |=3D 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 =3D obj_exts; > > + } else if (cmpxchg(&slab->obj_exts, 0, obj_exts)) { > > + /* > > + * If the slab is already in use, somebody can allocate a= nd > > + * assign slabobj_exts in parallel. In this case the exis= ting > > + * 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 =3D __update_freelist_fast(slab, freelist_old, counte= rs_old, > > - freelist_new, counters_new); > > + freelist_new, counters_new); > > } else { > > ret =3D __update_freelist_slow(slab, freelist_old, counte= rs_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 km= em_cache *s, struct slab *slab, > > > > if (s->flags & __CMPXCHG_DOUBLE) { > > ret =3D __update_freelist_fast(slab, freelist_old, counte= rs_old, > > - freelist_new, counters_new); > > + freelist_new, counters_new); > > } else { > > unsigned long flags; > > > > local_irq_save(flags); > > ret =3D __update_freelist_slow(slab, freelist_old, counte= rs_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 a= s > part of the series? I'll fix them in the next version. > > > 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, s= truct 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 =3D 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. Yes, I'll move that into the patch where we start using it. Thanks for the review, Vlastimil! > > > } > > > > memcg_slab_post_alloc_hook(s, objcg, flags, size, p); > > -- > To unsubscribe from this group and stop receiving emails from it, send an= email to kernel-team+unsubscribe@android.com. >