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 1EDC9C48BF6 for ; Mon, 26 Feb 2024 17:22:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BFE644018A; Mon, 26 Feb 2024 12:22:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9495C44017F; Mon, 26 Feb 2024 12:22:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C38044018A; Mon, 26 Feb 2024 12:22:45 -0500 (EST) 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 6240A44017F for ; Mon, 26 Feb 2024 12:22:45 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 365E514092F for ; Mon, 26 Feb 2024 17:22:45 +0000 (UTC) X-FDA: 81834624690.03.A2305F2 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf18.hostedemail.com (Postfix) with ESMTP id 494D81C000E for ; Mon, 26 Feb 2024 17:22:42 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uMH20nsJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of surenb@google.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708968163; 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=dv1MR8FFyIVeo2kD5/jRtw1zZdBqiDH8uTYdJ7duKRA=; b=1T8egqwfH8/Jvr+ztYlmGH5pNlvHrqJeo9f4z8NtTvqxFjR8H2QgzEvgKWjMCRj5X3ktQd KefU2zSXmPK7aQ6JKm5vmZ7LbCwb3BJqThNHO+ro/LMespZY4eSSYuPxWcq01shs+vWgRM QeayFn2AMgfsiaEeAUV6zg1zrSGilRc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uMH20nsJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of surenb@google.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708968163; a=rsa-sha256; cv=none; b=AKMM7V2q48rieR9WWxH9k7bOAvMdHtJzWkAMvGWRl6G3Nbw6bzVAB+mFJg7O3t0iY5TUJE XYSyP5S1u8w/Gap1eB9/gK8xf7F7p3bF1zI/p5mGUq82UHk1/yzFa9PrcJP5qFaBqHrIDF GfFhjbMKN0NHdvDmXATNf22Hw5sGsh8= Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2d180d6bd32so48837251fa.1 for ; Mon, 26 Feb 2024 09:22:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708968161; x=1709572961; 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=dv1MR8FFyIVeo2kD5/jRtw1zZdBqiDH8uTYdJ7duKRA=; b=uMH20nsJ+9fFvnWOEFAbLTPw0jdkovXrpeH/Ike2+QQeAC/AjDR65Cy0PDi6d23ohI /sbCyp9HMgCv9X4U3Ujh/zGw2qPabNxXTzyn3nGrt9RXMgFFB+w/EnyQv0qBfcVvDSBO WVPqk5xb0RnXeTlCGmMU97CsAYC87jlRwWp17Qsz5NfD4Z9FQX02hECmgnfulRO+E0Kf Apme2+02anNQg/dspB82ka10ECpiXeO4GY+gvANXX5o5vmyJxgiZw+VSLrYlqYJlgarV wO0Fwajals7Sb5n2l3jy1Y9p3tL11BsxdifSVRQUZI54DVZ4narTWnRitbn/jlI5DeWW X20Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708968161; x=1709572961; 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=dv1MR8FFyIVeo2kD5/jRtw1zZdBqiDH8uTYdJ7duKRA=; b=amJHksDkN9OQIQJlZV2emUeozuwJjBBvvwYuaplBNiOe3UdkO2iWkEuNXkAv/WN6vy N5QKwfrik2DGbDNnZbhxzO1OGh0bs0F5ALgIzoer93WiFnXVImTrbIfC81LI1Xsqfhb9 xL5j/lOxxM6HMtvwMxIZ+RNJpBOdME64oKAMGAZKQncEoISlBHKIhdZ9FkC74C6TeKJ7 qzSs316WlDpZudJiN/lPkG1UFZ4j7IO1Gwr1zvjjOXtvPZTNVcgFGM1b30A3dnxmr8RA ZSGGK59P5b6QvrWPbl/wI2ZyiV/x/pvgIsgjUBqhjPsXwDr0GbuRhI5hV9TWm9E9hykQ xOjw== X-Forwarded-Encrypted: i=1; AJvYcCVGlI44L4rCbDv9G3iBssgQVU4XouPmUhNITlGLnBm8Rla69lOmnhIAtAMttOzhgLk5/8e0b1y69y1L+MblukLtpUw= X-Gm-Message-State: AOJu0YxJgTINgR5ywUnwv9yMu32PIDBQrXvK+FhDTpXs6Pvtg7DCoUML cZdo26mb3jDrQ+T54ukyeMUUq4LFZAuToD/ECC6BDrwc7BSTOUIiCIgpW7ylD1AlQKcJxhDWQRj GEg3mqYbFvJyDCJu7RcLGPNK+v5ZhTTlanl0C X-Google-Smtp-Source: AGHT+IHRxxQsMQSRpnlCaAS8PflYsK1iTOiKydsmAuE0utC3AXspYUhCmo2l3tTpb+Dmf3/YMDJ4hjbxrgCTIuiY2OA= X-Received: by 2002:a2e:990b:0:b0:2d2:7164:c6ba with SMTP id v11-20020a2e990b000000b002d27164c6bamr4367139lji.43.1708968160893; Mon, 26 Feb 2024 09:22:40 -0800 (PST) MIME-Version: 1.0 References: <20240221194052.927623-1-surenb@google.com> <20240221194052.927623-8-surenb@google.com> <6851f8a0-e5d2-4b79-9cee-cff0fdec2970@suse.cz> In-Reply-To: <6851f8a0-e5d2-4b79-9cee-cff0fdec2970@suse.cz> From: Suren Baghdasaryan Date: Mon, 26 Feb 2024 17:22:21 +0000 Message-ID: Subject: Re: [PATCH v4 07/36] 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, penguin-kernel@i-love.sakura.ne.jp, 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: 494D81C000E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: sxbjorgajz153u5crart3q8h9ei7ay41 X-HE-Tag: 1708968162-192536 X-HE-Meta: U2FsdGVkX1/ARfVRqkMwS5m4H95MGdpkYil48mr7uRtA78UCfU0UuLlqRHKZ3bWW8J67pUgA5pm7k+pGe/AzgjpVe1agF2tOHFvEiHSRLJpJ95vP4dKha81x+saeoT6hE1IZR0cqn0QxFOPVTkQCQVJ1gAHcVDB3gWFO6oGgwzWATukvVuhnRVj0DhZVgmkFTCwHRc53l3S75bFWOkqnzvxHoSKXLvKOEmhQX/CenqW3y3ZzBss1ogGkg3WMMSZ9YaflhLsfuKk4XDl62kihe98UPGGomC8XUTlqwJsGhESvqi87BSElTjfKGZwmTZYr6o/0Xy81+08mgAg+9aI+fUGZDgEISfjpgTcaCV+nUkM86E8548Z6LyesiMfPipWEaJT/Shu4acxjQhf6IhxPomd3YqJF9iHQ2TOVl1JKttR63tlu4s8wvWYw9jhP0Yj/MevhH3wNNCgKPKmeMxcs/BpYs44krzbrG7cE8+cLjAtJBz6daqIc6u4jY1TCKfL4IlLww439ZOb9mNBYp1JIIJkwBZ7YQypWX36TkWEGYyPtJiFrrtZWRuIy1EPgLXanOh1xI4o/WKods9ZA7N3A/wTDuLw21CHh7T56i3E5DjNoboSUTPE628pfIuWp3k58TZQsOrPbFC2FwI7+14Spd5tk0TwmwqDBFDHpnq+XNAqIeKA5WMWTgRhv8GyCKofnq3s/tJabQ2mo854JXi+OXzn3dxWIfxnR2nJYJlkgzC3PduwRW6NVwVZPdPdpCAhxS17+e1tyKLkPPDcPylhqrqRIG/uSHXjpdCluQyg31XylNhd9EcZe0CVUypKsRdje1lQkeiyVi7XnY18P8UJ74LaXlW+yoh5+xAKUI3FwLDiA+wow5NPHult6gN7qR9SrARFnMXFk4Ncrx8iv9ibReBWEuxr0LJpG50wR1EvtYnPbKQN6bHyjmV37r0pC6xEWdm24Yv6F8mAX+uk3uvv XSzej1nV MbYHkq2mKUFbPLnZahxOjyihoA3qjx9A508TUP0kGV336dVyC4edZthW+yOBumTx7CYU3GezDSHiMeI3b/i2Vy2SWf5Jkk7MiZJlQtU2a0o/PYPSBlL82QM1Tnx3uXFH2i2EVZxFtXM34xE0h40C2T0Q2EKI6bnQbdjuz4HhKJkJkDlKEouKj6kywlulfxQG8CpBfixXOpAPgS41Myk/K5mO9dWvDngAAZEQVUlxxWK4EG15OlflFBCCv0hGDxPm+lEDf8h5xsOkD7fcMCV7ioAFHKr8XbtyQcHvBEHFpD/vZT2NKusqEv91f6pYM0N0Aj54lMoaUtAeoqqrpZdyiDr+2yV/IJr0GQJJi4mn+B9kpK5TGX65Ud/r4QA== 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 Mon, Feb 26, 2024 at 8:26=E2=80=AFAM Vlastimil Babka wr= ote: > > On 2/21/24 20:40, 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 > > Hi, mostly good from slab perspective, just some fixups: > > > --- a/mm/slab.h > > +++ b/mm/slab.h > > -int memcg_alloc_slab_cgroups(struct slab *slab, struct kmem_cache *s, > > - gfp_t gfp, bool new_slab); > > -void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgd= at, > > - enum node_stat_item idx, int nr); > > -#else /* CONFIG_MEMCG_KMEM */ > > -static inline struct obj_cgroup **slab_objcgs(struct slab *slab) > > +int alloc_slab_obj_exts(struct slab *slab, struct kmem_cache *s, > > + gfp_t gfp, bool new_slab); > > > > We could remove this declaration and make the function static in mm/slub.= c. Ack. > > > +#else /* CONFIG_SLAB_OBJ_EXT */ > > + > > +static inline struct slabobj_ext *slab_obj_exts(struct slab *slab) > > { > > return NULL; > > } > > > > -static inline int memcg_alloc_slab_cgroups(struct slab *slab, > > - struct kmem_cache *s, gfp_= t gfp, > > - bool new_slab) > > +static inline int alloc_slab_obj_exts(struct slab *slab, > > + struct kmem_cache *s, gfp_t gfp, > > + bool new_slab) > > { > > return 0; > > } > > Ditto Ack. > > > -#endif /* CONFIG_MEMCG_KMEM */ > > + > > +static inline struct slabobj_ext * > > +prepare_slab_obj_exts_hook(struct kmem_cache *s, gfp_t flags, void *p) > > +{ > > + return NULL; > > +} > > Same here (and the definition and usage even happens in later patch). Ack. > > > +#endif /* CONFIG_SLAB_OBJ_EXT */ > > + > > +#ifdef CONFIG_MEMCG_KMEM > > +void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgd= at, > > + enum node_stat_item idx, int nr); > > +#endif > > > > size_t __ksize(const void *objp); > > > > diff --git a/mm/slub.c b/mm/slub.c > > index d31b03a8d9d5..76fb600fbc80 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); > > Please no drive-by fixups of whitespace in code you're not actually > changing. I thought you agreed in v3? Sorry, I must have misunderstood your previous comment. I thought you were saying that the alignment I changed to was incorrect. I'll keep them untouched. > > > static inline bool memcg_slab_pre_alloc_hook(struct kmem_cache *s, > > struct list_lru *lru, > > struct obj_cgroup **objcgp, > > @@ -2314,7 +2364,7 @@ static __always_inline void account_slab(struct s= lab *slab, int order, > > struct kmem_cache *s, gfp_t gfp) > > { > > if (memcg_kmem_online() && (s->flags & SLAB_ACCOUNT)) > > - memcg_alloc_slab_cgroups(slab, s, gfp, true); > > + alloc_slab_obj_exts(slab, s, gfp, true); > > This is still guarded by the memcg_kmem_online() static key, which is goo= d. > > > > > mod_node_page_state(slab_pgdat(slab), cache_vmstat_idx(s), > > PAGE_SIZE << order); > > @@ -2323,8 +2373,7 @@ static __always_inline void account_slab(struct s= lab *slab, int order, > > static __always_inline void unaccount_slab(struct slab *slab, int orde= r, > > struct kmem_cache *s) > > { > > - if (memcg_kmem_online()) > > - memcg_free_slab_cgroups(slab); > > + free_slab_obj_exts(slab); > > But this no longer is, yet it still could be? Yes, I missed that, it seems. free_slab_obj_exts() would bail out but still checking the static key is more efficient. I'll revive this check. Thanks for the review! Suren. > > > > > mod_node_page_state(slab_pgdat(slab), cache_vmstat_idx(s), > > -(PAGE_SIZE << order)); >