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 67D30C43334 for ; Sun, 19 Jun 2022 15:50:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF6598D000B; Sun, 19 Jun 2022 11:50:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA6388D0006; Sun, 19 Jun 2022 11:50:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD22A8D000B; Sun, 19 Jun 2022 11:50:56 -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 B94C68D0006 for ; Sun, 19 Jun 2022 11:50:56 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8A9CBAF9 for ; Sun, 19 Jun 2022 15:50:56 +0000 (UTC) X-FDA: 79595423712.26.CF588B4 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf02.hostedemail.com (Postfix) with ESMTP id 2CBD480017 for ; Sun, 19 Jun 2022 15:50:55 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id r66so2239087pgr.2 for ; Sun, 19 Jun 2022 08:50:55 -0700 (PDT) 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=FQMzfPqgezzDzrRv8wh1613ZP98YLQGz+eOS2SGIRLM=; b=S2PD9ftCpBG9QGAr4mB7ADu83tpdlow4NteqA06BGj1jvJIQVzAOTvJlSYYGTshREd ytbN//cR3Cko4oTkb4pBv5/BrHknENhFGZctfFs0Qi1/gVnhHshITRo1VcjHMDlYkLn6 nZ3e4fCEeR34zHBeLzGBpoEVYP7KOIBifF/zcGFh54GRLKBN9XKlyMZoWPEt5v7MQ7/t GdNhDv+p9RGJnaOAvYSAUiRKkdPlY4JTGSPMPzwRG3AzdhoyAe4NXxQ0Fmt8SEnI0ll2 NYEpYVFgVOk6U7AMLGJXT5kvhZ9DtorIopbsQdHbxVGh0iEbAVqltUkvZBYgmFYdvaUz Ey2A== 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=FQMzfPqgezzDzrRv8wh1613ZP98YLQGz+eOS2SGIRLM=; b=Wy3XKdi/WbBy+1QGs2D33o9EB0TPvbXOXbXDdX2CMDmCzRwQQEILTiTFVUCpwAIUHa LXSZhyA5Z7waxnmJhI36ewoTJTaADP7348s02HZK9vhE6b4hALe0jZkv5MT3cGpS4/hL sTogBANBx7KR+UuHoq8mleYaRDNu+xA/r5vm6heGBGRi6I0cBMs+pzJiuIuarzvGVoME NNmEy2Vp1UGIEh4avx7lBjhRnCJRmORlK2FON5K6LplvYuDM/96NnDkGpg2FHkpY4hTw UCn7ZO87aigrxsXJ4kCWb4JKD1BOIQUOdIccUIgMayLR+XdZSNejsbZkXrrfGjZNx/12 V0lw== X-Gm-Message-State: AJIora8hPtSKRdH1F7OEiwlg34DUrfPOHBqBsaZw0ocuaPUuApFVrz3h I2iygbFeXXv4fzp77ZGh5Es= X-Google-Smtp-Source: AGRyM1sefUlfO+kxoEWF8nnzpyg1oWx0iO3gGkduXWLQM7oyJzs209FUxi9aQRx8YGBdp74a/WvUWw== X-Received: by 2002:a63:130f:0:b0:401:ce98:24eb with SMTP id i15-20020a63130f000000b00401ce9824ebmr18468553pgl.217.1655653855042; Sun, 19 Jun 2022 08:50:55 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:2b24:5400:4ff:fe09:b144]) by smtp.gmail.com with ESMTPSA id z10-20020a1709027e8a00b001690a7df347sm6381761pla.96.2022.06.19.08.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 08:50:54 -0700 (PDT) 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, quentin@isovalent.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, akpm@linux-foundation.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, vbabka@suse.cz Cc: linux-mm@kvack.org, bpf@vger.kernel.org, Yafang Shao Subject: [RFC PATCH bpf-next 06/10] mm: Add helper to recharge vmalloc'ed address Date: Sun, 19 Jun 2022 15:50:28 +0000 Message-Id: <20220619155032.32515-7-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220619155032.32515-1-laoar.shao@gmail.com> References: <20220619155032.32515-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655653856; a=rsa-sha256; cv=none; b=N6v1ESLLYT/94UQCHT4AOj3HCM2JLTXnYfSaOIpLfS/+lbbpC/pc3RGj2YuAeqtqs2Ii6M U9luSmET03Aygiwgz9+XN3SpLSVie2FdipWI+0DipE5Nm46wLtpWvDrwWBKLgmCb7pg8vY srtfZQOYN9aWrPrkMXAmC3ziUcm7wnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655653856; 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=FQMzfPqgezzDzrRv8wh1613ZP98YLQGz+eOS2SGIRLM=; b=8oZbDeol1D7laESYlwy+Nk/scCwyUdQTP35fLW/xMpNJs1DIXoZxfBn3cm8fpu993tWwri p+z0tma3NGotnsxI0FlVhh13nfcTYt6hwmk7j6L1W5NHTu5aqkV13F1NRkOKSFTBxv8Q5s 33LcHqmNezza7/g/mtsLlwS3aBuhPQA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=S2PD9ftC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=S2PD9ftC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2CBD480017 X-Stat-Signature: ycwfzpswrw8sz7jqdc6yfcz18e9uetib X-HE-Tag: 1655653855-765617 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 introduces a helper to recharge the corresponding pages of a given vmalloc'ed address. It is similar with how to recharge a kmalloced'ed address. Signed-off-by: Yafang Shao --- include/linux/slab.h | 1 + include/linux/vmalloc.h | 2 + mm/util.c | 9 +++++ mm/vmalloc.c | 87 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/include/linux/slab.h b/include/linux/slab.h index 18ab30aa8fe8..e8fb0f6a3660 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -794,6 +794,7 @@ extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flag __alloc_size(3); extern void kvfree(const void *addr); extern void kvfree_sensitive(const void *addr, size_t len); +bool kvrecharge(const void *addr, int step); unsigned int kmem_cache_size(struct kmem_cache *s); void __init kmem_cache_init_late(void); diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 096d48aa3437..37c6d0e7b8d5 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -162,6 +162,8 @@ extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2); extern void vfree(const void *addr); extern void vfree_atomic(const void *addr); +bool vrecharge(const void *addr, int step); +void vuncharge(const void *addr); extern void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot); diff --git a/mm/util.c b/mm/util.c index 0837570c9225..312c05e83132 100644 --- a/mm/util.c +++ b/mm/util.c @@ -656,6 +656,15 @@ void kvfree(const void *addr) } EXPORT_SYMBOL(kvfree); +bool kvrecharge(const void *addr, int step) +{ + if (is_vmalloc_addr(addr)) + return vrecharge(addr, step); + + return krecharge(addr, step); +} +EXPORT_SYMBOL(kvrecharge); + /** * kvfree_sensitive - Free a data object containing sensitive information. * @addr: address of the data object to be freed. diff --git a/mm/vmalloc.c b/mm/vmalloc.c index effd1ff6a4b4..7da6e429a45f 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2745,6 +2745,93 @@ void vfree(const void *addr) } EXPORT_SYMBOL(vfree); +bool vrecharge(const void *addr, int step) +{ + struct obj_cgroup *objcg_new; + unsigned int page_order; + struct vm_struct *area; + struct folio *folio; + int i; + + WARN_ON(!in_task()); + + if (!addr) + return true; + + area = find_vm_area(addr); + if (unlikely(!area)) + return true; + + page_order = vm_area_page_order(area); + + switch (step) { + case MEMCG_KMEM_PRE_CHARGE: + for (i = 0; i < area->nr_pages; i += 1U << page_order) { + struct page *page = area->pages[i]; + + WARN_ON(!page); + objcg_new = get_obj_cgroup_from_current(); + WARN_ON(!objcg_new); + if (obj_cgroup_charge_pages(objcg_new, GFP_KERNEL, + 1 << page_order)) + goto out_pre; + cond_resched(); + } + break; + case MEMCG_KMEM_UNCHARGE: + for (i = 0; i < area->nr_pages; i += 1U << page_order) { + struct page *page = area->pages[i]; + struct obj_cgroup *objcg_old; + + WARN_ON(!page); + folio = page_folio(page); + WARN_ON(!folio_memcg_kmem(folio)); + objcg_old = __folio_objcg(folio); + + obj_cgroup_uncharge_pages(objcg_old, 1 << page_order); + /* mod memcg from page */ + mod_memcg_state(page_memcg(page), MEMCG_VMALLOC, + -(1U << page_order)); + page->memcg_data = 0; + obj_cgroup_put(objcg_old); + cond_resched(); + } + break; + case MEMCG_KMEM_POST_CHARGE: + objcg_new = obj_cgroup_from_current(); + for (i = 0; i < area->nr_pages; i += 1U << page_order) { + struct page *page = area->pages[i]; + + page->memcg_data = (unsigned long)objcg_new | MEMCG_DATA_KMEM; + /* mod memcg from current */ + mod_memcg_state(page_memcg(page), MEMCG_VMALLOC, + 1U << page_order); + + } + break; + case MEMCG_KMEM_CHARGE_ERR: + objcg_new = obj_cgroup_from_current(); + for (i = 0; i < area->nr_pages; i += 1U << page_order) { + obj_cgroup_uncharge_pages(objcg_new, 1 << page_order); + obj_cgroup_put(objcg_new); + cond_resched(); + } + break; + } + + return true; + +out_pre: + for (; i > 0; i -= 1U << page_order) { + obj_cgroup_uncharge_pages(objcg_new, 1 << page_order); + obj_cgroup_put(objcg_new); + cond_resched(); + } + + return false; +} +EXPORT_SYMBOL(vrecharge); + /** * vunmap - release virtual mapping obtained by vmap() * @addr: memory base address -- 2.17.1