| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAJuCfpEsAHSAUP_EFP4yZdyZ1hfVPbQSWn9j-eZQdiRLy5MGYg@mail.gmail.com>
Date: Fri, 15 Mar 2024 17:06:32 +0000
From: Suren Baghdasaryan <surenb@...gle.com>
To: Vlastimil Babka <vbabka@...e.cz>
Cc: akpm@...ux-foundation.org, kent.overstreet@...ux.dev, mhocko@...e.com,
hannes@...xchg.org, roman.gushchin@...ux.dev, mgorman@...e.de,
dave@...olabs.net, willy@...radead.org, liam.howlett@...cle.com,
penguin-kernel@...ove.sakura.ne.jp, corbet@....net, void@...ifault.com,
peterz@...radead.org, juri.lelli@...hat.com, catalin.marinas@....com,
will@...nel.org, arnd@...db.de, tglx@...utronix.de, mingo@...hat.com,
dave.hansen@...ux.intel.com, x86@...nel.org, peterx@...hat.com,
david@...hat.com, axboe@...nel.dk, mcgrof@...nel.org, masahiroy@...nel.org,
nathan@...nel.org, dennis@...nel.org, jhubbard@...dia.com, tj@...nel.org,
muchun.song@...ux.dev, rppt@...nel.org, paulmck@...nel.org,
pasha.tatashin@...een.com, yosryahmed@...gle.com, yuzhao@...gle.com,
dhowells@...hat.com, hughd@...gle.com, andreyknvl@...il.com,
keescook@...omium.org, ndesaulniers@...gle.com, vvvvvv@...gle.com,
gregkh@...uxfoundation.org, ebiggers@...gle.com, ytcoode@...il.com,
vincent.guittot@...aro.org, dietmar.eggemann@....com, rostedt@...dmis.org,
bsegall@...gle.com, bristot@...hat.com, vschneid@...hat.com, cl@...ux.com,
penberg@...nel.org, iamjoonsoo.kim@....com, 42.hyeyoo@...il.com,
glider@...gle.com, elver@...gle.com, dvyukov@...gle.com, shakeelb@...gle.com,
songmuchun@...edance.com, jbaron@...mai.com, aliceryhl@...gle.com,
rientjes@...gle.com, minchan@...gle.com, kaleshsingh@...gle.com,
kernel-team@...roid.com, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, iommu@...ts.linux.dev,
linux-arch@...r.kernel.org, linux-fsdevel@...r.kernel.org, linux-mm@...ck.org,
linux-modules@...r.kernel.org, kasan-dev@...glegroups.com,
cgroups@...r.kernel.org
Subject: Re: [PATCH v5 23/37] mm/slab: add allocation accounting into slab
allocation and free paths
On Fri, Mar 15, 2024 at 4:52 PM Vlastimil Babka <vbabka@...e.cz> wrote:
>
> On 3/15/24 16:43, Suren Baghdasaryan wrote:
> > On Fri, Mar 15, 2024 at 3:58 AM Vlastimil Babka <vbabka@...e.cz> wrote:
> >>
> >> On 3/6/24 19:24, Suren Baghdasaryan wrote:
> >> > Account slab allocations using codetag reference embedded into slabobj_ext.
> >> >
> >> > Signed-off-by: Suren Baghdasaryan <surenb@...gle.com>
> >> > Co-developed-by: Kent Overstreet <kent.overstreet@...ux.dev>
> >> > Signed-off-by: Kent Overstreet <kent.overstreet@...ux.dev>
> >> > Reviewed-by: Kees Cook <keescook@...omium.org>
> >>
> >> Reviewed-by: Vlastimil Babka <vbabka@...e.cz>
> >>
> >> Nit below:
> >>
> >> > @@ -3833,6 +3913,7 @@ void slab_post_alloc_hook(struct kmem_cache *s, struct obj_cgroup *objcg,
> >> > unsigned int orig_size)
> >> > {
> >> > unsigned int zero_size = s->object_size;
> >> > + struct slabobj_ext *obj_exts;
> >> > bool kasan_init = init;
> >> > size_t i;
> >> > gfp_t init_flags = flags & gfp_allowed_mask;
> >> > @@ -3875,6 +3956,12 @@ 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]);
> >> > +#ifdef CONFIG_MEM_ALLOC_PROFILING
> >> > + /* obj_exts can be allocated for other reasons */
> >> > + if (likely(obj_exts) && mem_alloc_profiling_enabled())
>
> Could you at least flip these two checks then so the static key one goes first?
Yes, definitely. I was thinking about removing need_slab_obj_ext()
from prepare_slab_obj_exts_hook() and adding this instead of the above
code:
+ if (need_slab_obj_ext()) {
+ obj_exts = prepare_slab_obj_exts_hook(s, flags, p[i]);
+#ifdef CONFIG_MEM_ALLOC_PROFILING
+ /*
+ * Currently obj_exts is used only for allocation
profiling. If other users appear
+ * then mem_alloc_profiling_enabled() check should be
added here.
+ */
+ if (likely(obj_exts))
+ alloc_tag_add(&obj_exts->ref,
current->alloc_tag, s->size);
+#endif
+ }
Does that look good?
> >> > +#ifdef CONFIG_MEM_ALLOC_PROFILING
> >> > + /* obj_exts can be allocated for other reasons */
> >> > + if (likely(obj_exts) && mem_alloc_profiling_enabled())
>
> >> > + alloc_tag_add(&obj_exts->ref, current->alloc_tag, s->size);
> >> > +#endif
> >>
> >> I think you could still do this a bit better:
> >>
> >> Check mem_alloc_profiling_enabled() once before the whole block calling
> >> prepare_slab_obj_exts_hook() and alloc_tag_add()
> >> Remove need_slab_obj_ext() check from prepare_slab_obj_exts_hook()
> >
> > Agree about checking mem_alloc_profiling_enabled() early and one time,
> > except I would like to use need_slab_obj_ext() instead of
> > mem_alloc_profiling_enabled() for that check. Currently they are
> > equivalent but if there are more slab_obj_ext users in the future then
> > there will be cases when we need to prepare_slab_obj_exts_hook() even
> > when mem_alloc_profiling_enabled()==false. need_slab_obj_ext() will be
> > easy to extend for such cases.
>
> I thought we don't generally future-proof internal implementation details
> like this until it's actually needed. But at least what I suggested above
> would help, thanks.
>
> > Thanks,
> > Suren.
> >
> >>
> >> > }
> >> >
> >> > memcg_slab_post_alloc_hook(s, objcg, flags, size, p);
> >> > @@ -4353,6 +4440,7 @@ void slab_free(struct kmem_cache *s, struct slab *slab, void *object,
> >> > unsigned long addr)
> >> > {
> >> > memcg_slab_free_hook(s, slab, &object, 1);
> >> > + alloc_tagging_slab_free_hook(s, slab, &object, 1);
> >> >
> >> > if (likely(slab_free_hook(s, object, slab_want_init_on_free(s))))
> >> > do_slab_free(s, slab, object, object, 1, addr);
> >> > @@ -4363,6 +4451,7 @@ void slab_free_bulk(struct kmem_cache *s, struct slab *slab, void *head,
> >> > void *tail, void **p, int cnt, unsigned long addr)
> >> > {
> >> > memcg_slab_free_hook(s, slab, p, cnt);
> >> > + alloc_tagging_slab_free_hook(s, slab, p, cnt);
> >> > /*
> >> > * With KASAN enabled slab_free_freelist_hook modifies the freelist
> >> > * to remove objects, whose reuse must be delayed.
> >>
>
> --
> To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe@...roid.com.
>
Powered by blists - more mailing lists