From patchwork Tue Mar 8 13:10:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12773790 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 A1BE7C433EF for ; Tue, 8 Mar 2022 13:11:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 967A28D0007; Tue, 8 Mar 2022 08:11:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 89FE38D0001; Tue, 8 Mar 2022 08:11:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CA208D0007; Tue, 8 Mar 2022 08:11:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 5DB198D0001 for ; Tue, 8 Mar 2022 08:11:19 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2FB21248BB for ; Tue, 8 Mar 2022 13:11:19 +0000 (UTC) X-FDA: 79221255078.08.5B2FB31 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by imf15.hostedemail.com (Postfix) with ESMTP id 9ECB7A000A for ; Tue, 8 Mar 2022 13:11:18 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id t14so16437896pgr.3 for ; Tue, 08 Mar 2022 05:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BdKzZoxcCHUk05nIKgEhaGedb/vHkDzRSP6HrqUzWkw=; b=mVG368BLiMOTpvYHAUUF4Hl0SvELdZmvTum03FPpeGhXzLHWktVasfzvvXjRTjOz8v OeRQAhrdpy137X55NmR+Q/Kuzq9xiVfXNfSvJp32pazR2MPbIlJ8Vzb0Bd7V7G/na2UQ /kfik/XTfzvUUpTBTd1qB8DMG2kpuKdtEfRyYh14NVfqPCAXvfHKDJ+64jnLsvC2UHCd Q3sUYvjb4wA56QqTFnZWhIKlsDgOcCCK5NzY5cMPJAHGwN6RbCmGB1z9nZM4JR4/0Zny plLD1LQTq3acxLCjuPV6GmozEA9rAtVuiBPQKKhaxmdk4ZZHaK0851qNleWCQ6+8DyHd neGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BdKzZoxcCHUk05nIKgEhaGedb/vHkDzRSP6HrqUzWkw=; b=NKjwMrri7/EaHVmKk6e/JMv/WEZDeR2R0RyZLz3c4E3JN7B+k4844tTE4ujyBdV1Nj E2LCnVgGLBULe3GSRKwWDr+2UFslxtLH9QbG/uMvXYaT+EnOx5rKPazyJbbsQtozevGd dxF1UtXppjXLIo7CjyaVeXZryN5IYE0TeKqiJ9H2x9hre+swYSFuXgaUTjaXZc6/vNnW zqBpf5L9v6ASSsid0sBImzWZOPb+3LvrXys8l7Do6t0u4YNKiRpUJtlafxp/6ATZzzfW We5WnFvi1z5ziwDtkDnaFZ7LoJzGtcZDOmhqwqa0yh2IpG4TXw4D7cs6U/cgvCeTb1VX 0FFg== X-Gm-Message-State: AOAM531XoDwszq/HAk8+1u7Lw3QtroVpk2e6im4pfTBcjJrWHRgbSJ/V V4n7OYSTkllB3zWAEeltS0U= X-Google-Smtp-Source: ABdhPJxi1T75LgLTxomuRmkgtIa5sVE1omWzFmGT1bjc4dtbt/cmnHAw3/PxWVByPMfUm079lFsD0Q== X-Received: by 2002:a63:61d3:0:b0:37f:f9c5:bbb8 with SMTP id v202-20020a6361d3000000b0037ff9c5bbb8mr13005281pgb.332.1646745077687; Tue, 08 Mar 2022 05:11:17 -0800 (PST) Received: from vultr.guest ([149.248.19.67]) by smtp.gmail.com with ESMTPSA id s20-20020a056a00179400b004f709998d13sm7378598pfg.10.2022.03.08.05.11.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 05:11:17 -0800 (PST) From: Yafang Shao To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, akpm@linux-foundation.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, vbabka@suse.cz, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, guro@fb.com Cc: linux-mm@kvack.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Yafang Shao Subject: [PATCH RFC 3/9] mm: add methord to charge kmalloc-ed address Date: Tue, 8 Mar 2022 13:10:50 +0000 Message-Id: <20220308131056.6732-4-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220308131056.6732-1-laoar.shao@gmail.com> References: <20220308131056.6732-1-laoar.shao@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9ECB7A000A X-Stat-Signature: wc4o9tskyamzdntz8w75zbwjzo4rrmc4 Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mVG368BL; spf=pass (imf15.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-HE-Tag: 1646745078-980822 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: This patch implements a methord to charge or uncharge related pages or objects from a given kmalloc-ed address. It is similar to kfree, except that it doesn't touch the pages or objects while does account only. Signed-off-by: Yafang Shao --- include/linux/slab.h | 1 + mm/slab.c | 6 ++++++ mm/slob.c | 6 ++++++ mm/slub.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/include/linux/slab.h b/include/linux/slab.h index 5b6193f..ae82e23 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -182,6 +182,7 @@ struct kmem_cache *kmem_cache_create_usercopy(const char *name, 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); +void kcharge(const void *objp, bool charge); size_t __ksize(const void *objp); size_t ksize(const void *objp); #ifdef CONFIG_PRINTK diff --git a/mm/slab.c b/mm/slab.c index ddf5737..fbff613 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3796,6 +3796,12 @@ void kfree(const void *objp) } EXPORT_SYMBOL(kfree); +void kcharge(const void *objp, bool charge) +{ + /* Not implemented yet */ +} +EXPORT_SYMBOL(kfree); + /* * This initializes kmem_cache_node or resizes various caches for all nodes. */ diff --git a/mm/slob.c b/mm/slob.c index 60c5842..d3a789f 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -569,6 +569,12 @@ void kfree(const void *block) } EXPORT_SYMBOL(kfree); +void kcharge(const void *block, bool charge) +{ + /* not implemented yet. */ +} +EXPORT_SYMBOL(kcharge); + /* can't use ksize for kmem_cache_alloc memory, only kmalloc */ size_t __ksize(const void *block) { diff --git a/mm/slub.c b/mm/slub.c index 2614740..e933d45 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -4563,6 +4563,38 @@ void kfree(const void *x) } EXPORT_SYMBOL(kfree); +void kcharge(const void *x, bool charge) +{ + void *object = (void *)x; + struct folio *folio; + struct slab *slab; + + WARN_ON(!in_task()); + + if (unlikely(ZERO_OR_NULL_PTR(x))) + return; + + folio = virt_to_folio(x); + if (unlikely(!folio_test_slab(folio))) { + unsigned int order = folio_order(folio); + int sign = charge ? 1 : -1; + + mod_lruvec_page_state(folio_page(folio, 0), NR_SLAB_UNRECLAIMABLE_B, + sign * (PAGE_SIZE << order)); + + return; + } + + slab = folio_slab(folio); + if (charge) + memcg_slab_post_alloc_hook(slab->slab_cache, + get_obj_cgroup_from_current(), GFP_KERNEL, 1, &object); + else + memcg_slab_free_hook(slab->slab_cache, &object, 1); + +} +EXPORT_SYMBOL(kcharge); + #define SHRINK_PROMOTE_MAX 32 /*