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 6B07DC00144 for ; Fri, 29 Jul 2022 11:47:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68AC88E0001; Fri, 29 Jul 2022 07:47:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63A8F6B0072; Fri, 29 Jul 2022 07:47:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 501928E0001; Fri, 29 Jul 2022 07:47:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3D2856B0071 for ; Fri, 29 Jul 2022 07:47:26 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0EAF8A16C4 for ; Fri, 29 Jul 2022 11:47:26 +0000 (UTC) X-FDA: 79739962092.09.6A4BC56 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf04.hostedemail.com (Postfix) with ESMTP id 7762C400B8 for ; Fri, 29 Jul 2022 11:47:25 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 10BB134727; Fri, 29 Jul 2022 11:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1659095244; h=from:from:reply-to: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; bh=rboBrKYOhQuJ3PgN2+0Gi74K24zaet/UD86WBExDovY=; b=r2vd2/MEu+HFFhXUS46Mhvw6FwtGRgr7CENAZDYHtrf8oa7jL9PIkwvZwrTR78bBPbCay8 7vXL8LdAYjvm6KDXz5W5UJTzSFXFtBWzJCZpGfEHIOTmGeejBecuGwac5Q8RGrD7IEq2VP O7ngEhEVUKGQyFkXne8igDIqE6m62g4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1659095244; h=from:from:reply-to: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; bh=rboBrKYOhQuJ3PgN2+0Gi74K24zaet/UD86WBExDovY=; b=koK/Nh7IJh+gJR38zFrKRNTeQqcLef0cL9tzvmJOoWybAJamHn7Cpqfm+ZbhnrJ+TSN7PZ ixDYQAed23A5ZTBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D619013A1B; Fri, 29 Jul 2022 11:47:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2P+OM8vI42K3IAAAMHmgww (envelope-from ); Fri, 29 Jul 2022 11:47:23 +0000 Message-ID: <35ee9435-97b4-4161-b21c-15467b56d004@suse.cz> Date: Fri, 29 Jul 2022 13:47:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH 15/16] mm/slab_common: move definition of __ksize() to mm/slab.h Content-Language: en-US To: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Joe Perches , Vasily Averin , Matthew WilCox Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20220712133946.307181-1-42.hyeyoo@gmail.com> <20220712133946.307181-16-42.hyeyoo@gmail.com> From: Vlastimil Babka In-Reply-To: <20220712133946.307181-16-42.hyeyoo@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659095245; a=rsa-sha256; cv=none; b=BJ0yLR8RIVRCQKfgxKSUu4dTZoz8ZEO25MjkJ4rJoauYuqE90lgh7sUJMbCYtlPJbcbdAW stTGiEMUDBd8OchFdr0cQJAEeUifn2EGj6yWDFmTpf69ALtncAHhcnxB/jgQStnMKbRPk7 IG99oAbl5VJYVl+fdEIjVlnsnR845vU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="r2vd2/ME"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="koK/Nh7I"; spf=pass (imf04.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659095245; 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=rboBrKYOhQuJ3PgN2+0Gi74K24zaet/UD86WBExDovY=; b=mF/Rie5526iraqZ0f3biFtjDRU//eGnuFNQLqZghlV2bd9aVj7sONm/7KrBugy7c0PJFBy B0zZx8D4UyCuLYqVZ4DRIa+bAdmA0hPMVwPlZ7/f4aSYHZ1npe85F6HGvDfGDB+XKkQnQ2 fFQxmC63Ya4M1lgYf+Wcj6G3yTMKVlY= Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="r2vd2/ME"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="koK/Nh7I"; spf=pass (imf04.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7762C400B8 X-Stat-Signature: 7f45t4bzairi111jwxh57e4xuxq74c75 X-HE-Tag: 1659095245-424820 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: On 7/12/22 15:39, 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. > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > Reviewed-by: Vlastimil Babka Nit: The subject and changelog should probably say declaration, not definition. > --- > include/linux/slab.h | 1 - > mm/slab.h | 2 ++ > mm/slab_common.c | 11 +---------- > mm/slob.c | 1 - > 4 files changed, 3 insertions(+), 12 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 4ee5b2fed164..701fe538650f 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -187,7 +187,6 @@ int kmem_cache_shrink(struct kmem_cache *s); > void * __must_check krealloc(const void *objp, size_t new_size, gfp_t flags) __alloc_size(2); > void kfree(const void *objp); > void kfree_sensitive(const void *objp); > -size_t __ksize(const void *objp); > size_t ksize(const void *objp); > #ifdef CONFIG_PRINTK > bool kmem_valid_obj(void *object); > diff --git a/mm/slab.h b/mm/slab.h > index 9193e9c1f040..ad634e02b3cb 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -678,6 +678,8 @@ 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 c01c6b8f0d34..1f8db7959366 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -1003,15 +1003,7 @@ void kfree(const void *object) > } > EXPORT_SYMBOL(kfree); > > -/** > - * __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 > - */ > +/* Uninstrumented ksize. Only called by KASAN. */ > size_t __ksize(const void *object) > { > struct folio *folio; > @@ -1026,7 +1018,6 @@ size_t __ksize(const void *object) > > return slab_ksize(folio_slab(folio)->slab_cache); > } > -EXPORT_SYMBOL(__ksize); > #endif /* !CONFIG_SLOB */ > > gfp_t kmalloc_fix_flags(gfp_t flags) > diff --git a/mm/slob.c b/mm/slob.c > index 97a4d2407f96..91d6e2b19929 100644 > --- a/mm/slob.c > +++ b/mm/slob.c > @@ -584,7 +584,6 @@ size_t __ksize(const void *block) > m = (unsigned int *)(block - align); > return SLOB_UNITS(*m) * SLOB_UNIT; > } > -EXPORT_SYMBOL(__ksize); > > int __kmem_cache_create(struct kmem_cache *c, slab_flags_t flags) > {