On Wed, Sep 07, 2022 at 10:57:34PM +0800, Hyeonggon Yoo wrote:
> On Wed, Sep 07, 2022 at 03:10:21PM +0800, Feng Tang wrote:
> > kzalloc/kmalloc will round up the request size to a fixed size
> > (mostly power of 2), so the allocated memory could be more than
> > requested. Currently kzalloc family APIs will zero all the
> > allocated memory.
> >
> > To detect out-of-bound usage of the extra allocated memory, only
> > zero the requested part, so that sanity check could be added to
> > the extra space later.
> >
> > For kzalloc users who will call ksize() later and utilize this
> > extra space, please be aware that the space is not zeroed any
> > more.
>
> Can this break existing users?
> or should we initialize extra bytes to zero when someone called ksize()?
Good point!
As kmalloc caches' size are not strictly power of 2, the logical
usage for users is to call ksize() first to know the actual size.
I did a grep of both "xxzalloc" + "ksize" with cmd
#git-grep " ksize(" | cut -f 1 -d':' | xargs grep zalloc | cut -f 1 -d':' | sort -u
and got:
arch/x86/kernel/cpu/microcode/amd.c
drivers/base/devres.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
fs/btrfs/send.c
include/linux/slab.h
lib/test_kasan.c
mm/mempool.c
mm/nommu.c
mm/slab_common.c
security/tomoyo/memory.c
I roughly went through these files, and haven't found obvious breakage
regarding with data zeroing (I could miss something)
Also these patches has been in a tree monitored by 0Day, and some basic
sanity tests should have been run with 0Day's help, no problem with
this patch so far (one KASAN related problem was found though, see
patch 3/4).
And in worst case there is problem, we can fix it quickly.
> If it is not going to break something - I think we can add a comment of this.
> something like "... kzalloc() will initialize to zero only for @size bytes ..."
Agree, this is necessary.
> > Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
> > ---
> > mm/slab.c | 6 +++---
> > mm/slab.h | 9 +++++++--
> > mm/slub.c | 6 +++---
> > 3 files changed, 13 insertions(+), 8 deletions(-)
> >
> > diff --git a/mm/slab.c b/mm/slab.c
> > index a5486ff8362a..73ecaa7066e1 100644
> > --- a/mm/slab.c
> > +++ b/mm/slab.c
> > @@ -3253,7 +3253,7 @@ slab_alloc_node(struct kmem_cache *cachep, struct list_lru *lru, gfp_t flags,
> > init = slab_want_init_on_alloc(flags, cachep);
> >
> > out:
> > - slab_post_alloc_hook(cachep, objcg, flags, 1, &objp, init);
> > + slab_post_alloc_hook(cachep, objcg, flags, 1, &objp, init, 0);
> > return objp;
> > }
> >
> > @@ -3506,13 +3506,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
> > * Done outside of the IRQ disabled section.
> > */
> > slab_post_alloc_hook(s, objcg, flags, size, p,
> > - slab_want_init_on_alloc(flags, s));
> > + slab_want_init_on_alloc(flags, s), 0);
> > /* FIXME: Trace call missing. Christoph would like a bulk variant */
> > return size;
> > error:
> > local_irq_enable();
> > cache_alloc_debugcheck_after_bulk(s, flags, i, p, _RET_IP_);
> > - slab_post_alloc_hook(s, objcg, flags, i, p, false);
> > + slab_post_alloc_hook(s, objcg, flags, i, p, false, 0);
> > kmem_cache_free_bulk(s, i, p);
> > return 0;
> > }
> > diff --git a/mm/slab.h b/mm/slab.h
> > index d0ef9dd44b71..20f9e2a9814f 100644
> > --- a/mm/slab.h
> > +++ b/mm/slab.h
> > @@ -730,12 +730,17 @@ static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s,
> >
> > static inline void slab_post_alloc_hook(struct kmem_cache *s,
> > struct obj_cgroup *objcg, gfp_t flags,
> > - size_t size, void **p, bool init)
> > + size_t size, void **p, bool init,
> > + unsigned int orig_size)
> > {
> > size_t i;
> >
> > flags &= gfp_allowed_mask;
> >
> > + /* If original request size(kmalloc) is not set, use object_size */
> > + if (!orig_size)
> > + orig_size = s->object_size;
>
> I think it is more readable to pass s->object_size than zero
OK, will change.
Thanks,
Feng
