From patchwork Wed Aug 17 10:18:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 12945690 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 E7A62C25B08 for ; Wed, 17 Aug 2022 10:19:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A4276B007D; Wed, 17 Aug 2022 06:19:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 855B86B007E; Wed, 17 Aug 2022 06:19:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F4D26B0082; Wed, 17 Aug 2022 06:19:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6147B6B007D for ; Wed, 17 Aug 2022 06:19:28 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3F1E5C082A for ; Wed, 17 Aug 2022 10:19:28 +0000 (UTC) X-FDA: 79808687616.22.B760F41 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf29.hostedemail.com (Postfix) with ESMTP id E35C31201D9 for ; Wed, 17 Aug 2022 10:19:27 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id o14-20020a17090a0a0e00b001fabfd3369cso46274pjo.5 for ; Wed, 17 Aug 2022 03:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Daa1VQEO90b1RAILID/2eNYhl4WJ1tJNJRwlSK6+APs=; b=W6PsCrjgbKrvxCBQCQHMSo2WhEZ8f/XuU5argCzxfQbBHYDA1W+hhpS31AosnPk6c3 TElwq517lBeG71MGD7nDV2ZvRWe9isPvVlbvTEil+r7q/kjZ0aNeUrN1juLGdNQyuFJh uJj5MGga4wTp0NxUlS7V7NDJ9eL/w6uQjug0SXLFsnMRn8NhKiFmcu9NFlmAx4G0ntZj dYnxkRsZN1UIAQbOtXGrJpVZF7XG6XG72fY/9/4yvSnFY7NPplZJX6vHi2yNc2ekS7bw qDfKyvCT+s9isO3UuKeGikXmR15NMOykh6JOFOPYQKQS5imqPTpNszSyBQHc1X20QdVh eONA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Daa1VQEO90b1RAILID/2eNYhl4WJ1tJNJRwlSK6+APs=; b=NePjTyPpnhSXashkpwLqrkNJ9U56/Ha0uo/GkhtmWD2S7SulKYVc+TQSgWgHtE+6vm SlvVo9s8bK0b5dnpAXltlIrDHQzwfQUEOkEIjsyiCOH3KZlVaXmBYhZULvncp4BSguHN RcMsf0fBsaTwD4lUY4pGru7Ay1tFroCwm4TzDY3vojoZ1PFD5ARflOVtyOhDqGKTourq P7jPNfScSyLO6zHuFFJ73WtR6NAHvDZNT05h0A0GuJXoPRcr/EgPTllaan2Bo3CE9oEs yhbg4SctfpNlbe0ekrTf0PWo2RfKomUzhHyfS18Mt150zuX6hyVk6fa5MTx2qrIpFmma G4lw== X-Gm-Message-State: ACgBeo0PtqiiLdUliFGsl+xrHbUBcaQ1yAkTpNcScZgiZN7e2su2Re/X hPtfwMTwKx9AyL8NcByHwIE= X-Google-Smtp-Source: AA6agR5NX3zrqI+s7B2wouE/rq8MdzR3qps4dt4XbqfqKpvrdEuq5/VqipgEphbdDE+OOpPjq7+FaQ== X-Received: by 2002:a17:90b:3ecd:b0:1f5:6330:8295 with SMTP id rm13-20020a17090b3ecd00b001f563308295mr2966134pjb.174.1660731567045; Wed, 17 Aug 2022 03:19:27 -0700 (PDT) Received: from hyeyoo.. ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id d8-20020a170903230800b00172633fc236sm1071318plh.174.2022.08.17.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 03:19:26 -0700 (PDT) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 11/17] mm/sl[au]b: introduce common alloc/free functions without tracepoint Date: Wed, 17 Aug 2022 19:18:20 +0900 Message-Id: <20220817101826.236819-12-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220817101826.236819-1-42.hyeyoo@gmail.com> References: <20220817101826.236819-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660731567; a=rsa-sha256; cv=none; b=tNJ5OoHkl68I6mSXPX+uy8D7bOC4OOD+gxmeUtF3Zwz73IE24Ot3dS6YqyW1wFNFx9C0xL W96n89VZVrbZFNleuKqOa1oUpeoh5GzNhMiMOZzntHIiIpwd/O/O3A3EXZlKiyrQCunk94 /sXOmvZQ0bbwbluK0JThozhEabYgWCE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W6PsCrjg; spf=pass (imf29.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660731567; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Daa1VQEO90b1RAILID/2eNYhl4WJ1tJNJRwlSK6+APs=; b=nDBqKUMYdKroV5UgnZfRZuq1AEQWuJjaqmwA500JCs2yeTJB5W697Es0cxi4pq9C03OJZx 1ygtIHf0eK7Ge2xKOEacwECtPLHVEW7HyM9B6YDi/+XXfXSK3Hnv/0jnPNI+pSCsKgx5l5 AU15uWjSZGBiH30qOJ8XRG92eSRJ4g8= X-Stat-Signature: mbhzi6nt5z83mgpm4c9bm919t5t4yynr X-Rspamd-Queue-Id: E35C31201D9 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W6PsCrjg; spf=pass (imf29.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam03 X-HE-Tag: 1660731567-676411 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: To unify kmalloc functions in later patch, introduce common alloc/free functions that does not have tracepoint. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Vlastimil Babka --- mm/slab.c | 36 +++++++++++++++++++++++++++++------- mm/slab.h | 4 ++++ mm/slub.c | 13 +++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 10c9af904410..aa61851b0a07 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3560,6 +3560,14 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) } EXPORT_SYMBOL(kmem_cache_alloc_node); +void *__kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, + int nodeid, size_t orig_size, + unsigned long caller) +{ + return slab_alloc_node(cachep, NULL, flags, nodeid, + orig_size, caller); +} + #ifdef CONFIG_TRACING void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, @@ -3645,6 +3653,26 @@ void *__kmalloc(size_t size, gfp_t flags) } EXPORT_SYMBOL(__kmalloc); +static __always_inline +void __do_kmem_cache_free(struct kmem_cache *cachep, void *objp, + unsigned long caller) +{ + unsigned long flags; + + local_irq_save(flags); + debug_check_no_locks_freed(objp, cachep->object_size); + if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) + debug_check_no_obj_freed(objp, cachep->object_size); + __cache_free(cachep, objp, caller); + local_irq_restore(flags); +} + +void __kmem_cache_free(struct kmem_cache *cachep, void *objp, + unsigned long caller) +{ + __do_kmem_cache_free(cachep, objp, caller); +} + /** * kmem_cache_free - Deallocate an object * @cachep: The cache the allocation was from. @@ -3655,18 +3683,12 @@ EXPORT_SYMBOL(__kmalloc); */ void kmem_cache_free(struct kmem_cache *cachep, void *objp) { - unsigned long flags; cachep = cache_from_obj(cachep, objp); if (!cachep) return; trace_kmem_cache_free(_RET_IP_, objp, cachep->name); - local_irq_save(flags); - debug_check_no_locks_freed(objp, cachep->object_size); - if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) - debug_check_no_obj_freed(objp, cachep->object_size); - __cache_free(cachep, objp, _RET_IP_); - local_irq_restore(flags); + __do_kmem_cache_free(cachep, objp, _RET_IP_); } EXPORT_SYMBOL(kmem_cache_free); diff --git a/mm/slab.h b/mm/slab.h index 381ba3e6b2a1..4e90ed0ab635 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -275,6 +275,10 @@ void create_kmalloc_caches(slab_flags_t); struct kmem_cache *kmalloc_slab(size_t, gfp_t); void *kmalloc_large_node_notrace(size_t size, gfp_t flags, int node); +void *__kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, + int node, size_t orig_size, + unsigned long caller); +void __kmem_cache_free(struct kmem_cache *s, void *x, unsigned long caller); #endif gfp_t kmalloc_fix_flags(gfp_t flags); diff --git a/mm/slub.c b/mm/slub.c index a659874c5d44..a11f78c2647c 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3262,6 +3262,14 @@ void *kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, } EXPORT_SYMBOL(kmem_cache_alloc_lru); +void *__kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, + int node, size_t orig_size, + unsigned long caller) +{ + return slab_alloc_node(s, NULL, gfpflags, node, + caller, orig_size); +} + #ifdef CONFIG_TRACING void *kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size) { @@ -3526,6 +3534,11 @@ void ___cache_free(struct kmem_cache *cache, void *x, unsigned long addr) } #endif +void __kmem_cache_free(struct kmem_cache *s, void *x, unsigned long caller) +{ + slab_free(s, virt_to_slab(x), x, NULL, &x, 1, caller); +} + void kmem_cache_free(struct kmem_cache *s, void *x) { s = cache_from_obj(s, x);