Re: [PATCH v2 3/5] mm/sl[auo]b: move definition of __ksize() to mm/slab.h
From: Vlastimil Babka
Date: Fri Mar 04 2022 - 13:29:31 EST
On 3/4/22 07:34, Hyeonggon Yoo wrote:
> __ksize() is only called by KASAN. Remove export symbol and move
> definition to mm/slab.h as we don't want to grow its callers.
>
> [ willy@xxxxxxxxxxxxx: Move definition to mm/slab.h and reduce comments ]
>
> Signed-off-by: Hyeonggon Yoo <42.hyeyoo@xxxxxxxxx>
Reviewed-by: Vlastimil Babka <vbabka@xxxxxxx>
> --- a/mm/slab.h
> +++ b/mm/slab.h
> @@ -685,6 +685,8 @@ static inline void free_large_kmalloc(struct folio *folio, void *object)
> }
> #endif /* CONFIG_SLOB */
>
> +size_t __ksize(const void *objp);
> +
> static inline size_t slab_ksize(const struct kmem_cache *s)
> {
> #ifndef CONFIG_SLUB
> diff --git a/mm/slab_common.c b/mm/slab_common.c
> index 1d2f92e871d2..b126fc7247b9 100644
> --- a/mm/slab_common.c
> +++ b/mm/slab_common.c
> @@ -1247,13 +1247,7 @@ EXPORT_SYMBOL(kfree_sensitive);
>
> #ifndef CONFIG_SLOB
> /**
Maybe just /* so it's not even parsed as a kernel-doc anymore?
> - * __ksize -- Uninstrumented ksize.
> - * @objp: pointer to the object
> - *
> - * Unlike ksize(), __ksize() is uninstrumented, and does not provide the same
> - * safety checks as ksize() with KASAN instrumentation enabled.
> - *
> - * Return: size of the actual memory used by @objp in bytes
> + * __ksize -- Uninstrumented ksize. Only called by KASAN.
> */
> size_t __ksize(const void *object)
> {
> @@ -1269,7 +1263,6 @@ size_t __ksize(const void *object)
>
> return slab_ksize(folio_slab(folio)->slab_cache);
> }
> -EXPORT_SYMBOL(__ksize);
> #endif
>