From patchwork Tue Oct 3 00:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13406630 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 9AE7AE776DB for ; Tue, 3 Oct 2023 00:18:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37A578D0050; Mon, 2 Oct 2023 20:18:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 301A28D0003; Mon, 2 Oct 2023 20:18:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 154638D0050; Mon, 2 Oct 2023 20:18:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 017F98D0003 for ; Mon, 2 Oct 2023 20:18:33 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D6A491C9B37 for ; Tue, 3 Oct 2023 00:18:33 +0000 (UTC) X-FDA: 81302238906.29.E3046A9 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by imf06.hostedemail.com (Postfix) with ESMTP id 050C8180002 for ; Tue, 3 Oct 2023 00:18:31 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=YAYbDG1W; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.160.52 as permitted sender) smtp.mailfrom=nphamcs@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=1696292312; 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=S/ArhJOrTFxsFSzyEEFASkcwnYkX8juRHkl0KQuu84A=; b=VTX8pykqCeC/XBCSVqIsw8cWT/bdV/ecmZMZNHoZfWLnyS+03sb0MEErAan+L+iXuTFcBX 3KTZxc0oM2ym18gaFFRIv+zsLBZUtkFrrv+OdfujQ11VFStY50hFCFoK2Bg1LxAPbRumlt IwOQt/kn45/T12TggvXsOMW+SMZTWSI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=YAYbDG1W; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.160.52 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696292312; a=rsa-sha256; cv=none; b=UVHd8qiafr6t0Rc6fhR0h9zDmwNKGNLB+ir5OtF8z4R8dxLUtjBK15DQlhYB8XnJH0Joii jEMaLa4p0Zriwt4pw1nVpvthSTYiF2TC3Tlpxxi2OADXJPLZFJPQaH8Sy5+n6Se8KoiFpn h7N8HaMo14FV00dp5kRpkwL2+kJ9A1I= Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-1dce0f9e222so225837fac.0 for ; Mon, 02 Oct 2023 17:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696292311; x=1696897111; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S/ArhJOrTFxsFSzyEEFASkcwnYkX8juRHkl0KQuu84A=; b=YAYbDG1W6v8EZSf4iZ7hUSwpDQ0TRTY0exkRJaGc9L7htwc99SAbHgJZpAtkiK+w+6 zh7scpuv894iFy+YJMPcRREZD6cxc1Q9PImqJFFspuB0hk8j04qI0r5h9bZCrxxuK7W7 I6RzAwPO4K4vA+RvTQqoLDfY8r0SzLS8cicfbShslnaTFNCsbnUEInyjC68N9L+nHNgZ OHGcJC8czypqNU9mr1y7m/1wr1XMxw1Bh75nAoFAR/qqV0r4ev3SdxGQbSpjtpI4U8Af w2sXgUzsmoV8BP1G1INIzQl2H1m/5iaX8+5xcoW69wctWHUxC9OtzcnJ89xhdeIvZIN7 VuCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696292311; x=1696897111; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S/ArhJOrTFxsFSzyEEFASkcwnYkX8juRHkl0KQuu84A=; b=wSVSBeQuwGnNK5P/riLFb4r2QY5tN9LS1Uclqf8hxIW1Tb4KgN+pnfu+O17wk7pKp+ Yi1xsFL6EBkjDaOo3gg5SzyR4ScsMjtvkDSgx457zWsVmv9DqM8esjoZf9HwFkY4W9Nx USucmFKnwX7sxDEKsMmEWpEDvyuOnOHLbmY2B7+0knsbzfN4UJY7c4ofnIp+X1LGAzKx sV6UFAO7sn5rImUkfXi5beLJE31jeAt7mo+J4BiesvjbHLyDAeWrSfw9Z/ELVMQVJnuJ VMwSn3OWBGortxv+iUztRS2VLtJ88AAX+iCUukV5NKo2OIu8EDMMIL7hhLSO68grMWW0 bGvQ== X-Gm-Message-State: AOJu0YxXCC0M9zTLZ8wWxshexM+N4sE1QBl0QKNNrZgs1Lr4r9A6AzW1 Q2x3WdK3+O3thuXDuN0yd64= X-Google-Smtp-Source: AGHT+IGeZQJRLurhTr3HaqjP/5G/e4x1v6LKbD/D7agOZxG0/HlpHolysCG6h0wgbFAUW9N/6GU6NQ== X-Received: by 2002:a05:6870:14d0:b0:1d1:3c89:a7e5 with SMTP id l16-20020a05687014d000b001d13c89a7e5mr14709954oab.51.1696292310943; Mon, 02 Oct 2023 17:18:30 -0700 (PDT) Received: from localhost (fwdproxy-prn-002.fbsv.net. [2a03:2880:ff:2::face:b00c]) by smtp.gmail.com with ESMTPSA id q24-20020a637518000000b00578e9751b88sm52212pgc.1.2023.10.02.17.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 17:18:30 -0700 (PDT) From: Nhat Pham To: akpm@linux-foundation.org Cc: riel@surriel.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, tj@kernel.org, lizefan.x@bytedance.com, shuah@kernel.org, mike.kravetz@oracle.com, yosryahmed@google.com, fvdl@google.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH v3 1/3] memcontrol: add helpers for hugetlb memcg accounting Date: Mon, 2 Oct 2023 17:18:26 -0700 Message-Id: <20231003001828.2554080-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003001828.2554080-1-nphamcs@gmail.com> References: <20231003001828.2554080-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 050C8180002 X-Rspam-User: X-Stat-Signature: g673dcajacd8x6uu3w4y5wmhhyzh6zrq X-Rspamd-Server: rspam01 X-HE-Tag: 1696292311-138611 X-HE-Meta: U2FsdGVkX1+KdY4HzJjSfnevHpcd06NA0n9T5DOgJ3MQMnOb8g9ZbkszDQlqtWy1dk8eVj1cTe38njVBFDAqaGbVzvQev8jgX0GWxjIwcNTnOZwIY8yc1DPmc6BrtbDWLLBPN3DzU+QylbpVpOTOR2NQ+e291OdoPY/TnTgOwxNbuOkr058/IeZmDTn6Zo8wbAjeTl947JseP5dEmQrYZF+4e5yN9UWcC1+MnAYCB+VLugOuJ33DEVB6FvIYSam9+4r+F6XzfsbnCmOFcec3WBy//xUMSfkzNCpSMN21FYxHkbbbJzo6a0dWr2y7189znKZM4tupFhr6CXNk6PZtObNNUq8E1CFAekWkBiYO5/3iT22vSqxzyGtQ+4Y37TUwEnX+yt4RpaarhzKQCuFveJciYBfELas8wkUu+wWnmJ5IEKTe3Luwqpa8R6h53nQ664QDoOtZGRiKqpuoI1ozeW5liXjTzzOP7kv1WxSGQQbBVpAGaaPgQB4TbxfRLO/ys0ypwP8CFEPbe/pmHF/OSy6aLEzAp2n21+jdRNoQV9EG7LE4EPXRMyQW857LB8V0odZkCLfJ8pJywxXGgCcy3y1Sb5RAAV5ac18dnN/mF7UxCRB46m6WdrQhXasq/CdNJAKtfB2f98workSSZ6SFRYuwH4MreA09glfz0/mVl0BOMwwKYRC7UhfbGShzAgPpmpO76iJ1XJLTgZrdAbRJh+btIuR807ihc36wYAqGZ52HJObMMtIjJ8LbOUSyaKoPnWewyFyz3AByBJbJGhOQoylLdK48DF0bAT41m6Kjrps1vhu5Vl6BqybECwiYScl9D0lCLnfB4qVVGAxWaaApBfoNnbzPI899VgXs+uF4StAs2418cjDBi8hj3Skp8ZuRlUITJmJ7h0S8zSO8g6iCj0AycTsH3c9C9SlsgwmlByp1hreYYNzRtzUXL8v91HJWfhXrUzYM8tntrwfUzM6 1ieH9I/r q0vaXORjYmUmzhGskIzdKfkmRiFYtstNDBee0tnjWEV2ivZ1ap94H6K3HmdAErNv29idLzzjbxRz+ip4Td/zKUDOxcofG6CREUsIc36t8/Dn2eEv+Znjxf7a+bTuMLZ3nw9SBCHAJn4pQZW6guk/fdvgQJW9HXonc2OsHk5LP3dWJVu80in+mKGEqy4yGWn9steZuvYc/FsFODrVzV3q/FhYWnkh/DGZFhK8eMq/gJOOyFGushP5d93rlHiH2nkPOT4IpNdrpptxuiA6yORBH/0NtNvxGF3G6J/a0EOI7+7/HS25C/4gTyLYY8S+SN794Ux2FJNNJDzXKuIqIb6PHD993G5Tg007+EQ1RhwvY0GYNTh81Yom15gr6CYxz9HFcf2e6M7zi1xavabq1VD8RXr1Tnua8amjdH28IDBfKpxoqoZ8= 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 exposes charge committing and cancelling as parts of the memory controller interface. These functionalities are useful when the try_charge() and commit_charge() stages have to be separated by other actions in between (which can fail). One such example is the new hugetlb accounting behavior in the following patch. The patch also adds a helper function to obtain a reference to the current task's memcg. Signed-off-by: Nhat Pham Acked-by: Michal Hocko Acked-by: Johannes Weiner --- include/linux/memcontrol.h | 21 ++++++++++++++ mm/memcontrol.c | 59 ++++++++++++++++++++++++++++++-------- 2 files changed, 68 insertions(+), 12 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e0cfab58ab71..42bf7e9b1a2f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -653,6 +653,8 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *target, page_counter_read(&memcg->memory); } +void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memcg); + int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp); /** @@ -704,6 +706,8 @@ static inline void mem_cgroup_uncharge_list(struct list_head *page_list) __mem_cgroup_uncharge_list(page_list); } +void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages); + void mem_cgroup_migrate(struct folio *old, struct folio *new); /** @@ -760,6 +764,8 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm); +struct mem_cgroup *get_mem_cgroup_from_current(void); + struct lruvec *folio_lruvec_lock(struct folio *folio); struct lruvec *folio_lruvec_lock_irq(struct folio *folio); struct lruvec *folio_lruvec_lock_irqsave(struct folio *folio, @@ -1245,6 +1251,11 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *target, return false; } +static inline void mem_cgroup_commit_charge(struct folio *folio, + struct mem_cgroup *memcg) +{ +} + static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp) { @@ -1269,6 +1280,11 @@ static inline void mem_cgroup_uncharge_list(struct list_head *page_list) { } +static inline void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, + unsigned int nr_pages) +{ +} + static inline void mem_cgroup_migrate(struct folio *old, struct folio *new) { } @@ -1306,6 +1322,11 @@ static inline struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) return NULL; } +static inline struct mem_cgroup *get_mem_cgroup_from_current(void) +{ + return NULL; +} + static inline struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d1a322a75172..0219befeae38 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1086,6 +1086,27 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) } EXPORT_SYMBOL(get_mem_cgroup_from_mm); +/** + * get_mem_cgroup_from_current - Obtain a reference on current task's memcg. + */ +struct mem_cgroup *get_mem_cgroup_from_current(void) +{ + struct mem_cgroup *memcg; + + if (mem_cgroup_disabled()) + return NULL; + +again: + rcu_read_lock(); + memcg = mem_cgroup_from_task(current); + if (!css_tryget(&memcg->css)) { + rcu_read_unlock(); + goto again; + } + rcu_read_unlock(); + return memcg; +} + static __always_inline bool memcg_kmem_bypass(void) { /* Allow remote memcg charging from any context. */ @@ -2873,7 +2894,12 @@ static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, return try_charge_memcg(memcg, gfp_mask, nr_pages); } -static inline void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) +/** + * mem_cgroup_cancel_charge() - cancel an uncommitted try_charge() call. + * @memcg: memcg previously charged. + * @nr_pages: number of pages previously charged. + */ +void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) { if (mem_cgroup_is_root(memcg)) return; @@ -2898,6 +2924,22 @@ static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) folio->memcg_data = (unsigned long)memcg; } +/** + * mem_cgroup_commit_charge - commit a previously successful try_charge(). + * @folio: folio to commit the charge to. + * @memcg: memcg previously charged. + */ +void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memcg) +{ + css_get(&memcg->css); + commit_charge(folio, memcg); + + local_irq_disable(); + mem_cgroup_charge_statistics(memcg, folio_nr_pages(folio)); + memcg_check_events(memcg, folio_nid(folio)); + local_irq_enable(); +} + #ifdef CONFIG_MEMCG_KMEM /* * The allocated objcg pointers array is not accounted directly. @@ -6105,7 +6147,7 @@ static void __mem_cgroup_clear_mc(void) /* we must uncharge all the leftover precharges from mc.to */ if (mc.precharge) { - cancel_charge(mc.to, mc.precharge); + mem_cgroup_cancel_charge(mc.to, mc.precharge); mc.precharge = 0; } /* @@ -6113,7 +6155,7 @@ static void __mem_cgroup_clear_mc(void) * we must uncharge here. */ if (mc.moved_charge) { - cancel_charge(mc.from, mc.moved_charge); + mem_cgroup_cancel_charge(mc.from, mc.moved_charge); mc.moved_charge = 0; } /* we must fixup refcnts and charges */ @@ -7020,20 +7062,13 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, static int charge_memcg(struct folio *folio, struct mem_cgroup *memcg, gfp_t gfp) { - long nr_pages = folio_nr_pages(folio); int ret; - ret = try_charge(memcg, gfp, nr_pages); + ret = try_charge(memcg, gfp, folio_nr_pages(folio)); if (ret) goto out; - css_get(&memcg->css); - commit_charge(folio, memcg); - - local_irq_disable(); - mem_cgroup_charge_statistics(memcg, nr_pages); - memcg_check_events(memcg, folio_nid(folio)); - local_irq_enable(); + mem_cgroup_commit_charge(folio, memcg); out: return ret; }