From patchwork Wed Mar 29 01:17:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13191811 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 3E6D2C77B61 for ; Wed, 29 Mar 2023 01:17:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 648A76B0072; Tue, 28 Mar 2023 21:17:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F8616B0074; Tue, 28 Mar 2023 21:17:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 499176B0075; Tue, 28 Mar 2023 21:17:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3813F6B0072 for ; Tue, 28 Mar 2023 21:17:38 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 013F140BF4 for ; Wed, 29 Mar 2023 01:17:37 +0000 (UTC) X-FDA: 80620173396.20.5A06854 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by imf26.hostedemail.com (Postfix) with ESMTP id D21CC14000E for ; Wed, 29 Mar 2023 01:17:35 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b=c2vliS6J; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=mKrpjOke; spf=pass (imf26.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680052656; h=from:from:sender:reply-to: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=Yr+uFjBJL/0qCDkJMJuMYA8+4U49oyS8kQRIZ4QnQ48=; b=jrm58sNxly8d8Q4TGiflfb7mSvKd0kp4jsE0YMFTKPgWgiahxIuyBvcBF3XGl/Fq3yrCFh CoFutiiaC55sNR7aPRwT26tzp9S0LP32IuDGZjnSOu5iBQ5Ql3/Ivi/DnobbOgckhHl7Dg SUg2WXIQBUdWi6X+hPytMmzAvSDCVu4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b=c2vliS6J; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=mKrpjOke; spf=pass (imf26.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680052656; a=rsa-sha256; cv=none; b=pZfkbskcFDoMkLiGWQoJun/GX6eE+YnCP6renMBKhLelPevx7ZIjZVpIUpWAcvAqsvDhIh +6INevAax5nHuYwmSf2Zmzxg4CkzGCVHE9teb+YKOZHq9bIlIm0oL/4YR9kv95YIVS5Vl4 G3IKm+RRtHycqdwVPq+4MdycFWD7vTM= Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 5837D5C00DD; Tue, 28 Mar 2023 21:17:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 28 Mar 2023 21:17:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680052655; x=1680139055; bh=Yr+uFjBJL/0qCDkJMJuMYA8+4U49oyS8kQR IZ4QnQ48=; b=c2vliS6JhQxy5/eS0afSs1yoR0oEYtCAkHHfJ2NY2HoMe7XHOOO CpMt1njwoyf3knkBXLIr/09frjWyWNQ6HWyDMuDMqDAsjwx4bN64V4Z1J5laPlco Q+70dNV/AvOttP16sojJ1qlpXAxPTYlsQ0mC1fdyenzk4Zcf7sRdZ/gKgFDqw6Si +6e6b+PpALSBM7Dc5XfhMCKS8eIeNEY/v1JZvJM9wjf+mxXnQbldnkPhHeZx6IYq wepPh+YKS1q6698TPsrzZRfUE9eF1inQwUrBZT6wI+fT84QDqizyidBrXPiNaeqN VLi8wAzUPIOSdjrZ9ZYc0RPUjkhHqg2J6Iw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1680052655; x=1680139055; bh=Yr+uFjBJL/0qCDkJMJuMYA8+4U49oyS8kQR IZ4QnQ48=; b=mKrpjOke7X6OEH7MkeQZ+uLgHdMAhITBjBpB7pRv9Ae+UiAhZ8X bOlmsLDdOJtdChgpQ7DlpAZoC0KEfS45ibzrvGH3CCbA2Hq3Bs7hBFwcAKuKOoh5 y1hy12LARUXJ8yaaWC2CsIo79wufNnEBnWtYlLU5n3t87xuexEQ0JBGdWQWAo3EE V74ZQPgyulK1CJ8ZreNYH+SXNPkH9vccUk7fIoGTfN9YJruBbJLUGP1qRbbM7Tek U0YPeaz6CfQDmeAi/6BiXzHV9FYbJHa2bHHju+IWJ8h7lLbAPfe1QacehYnuL6EE q6S3li6xjFrlFPgAhZM1YtRNhgS6YUoyWtQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehhedggeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrggfgsedtqhertdertddtnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeegge ehudfgudduvdelheehteegledtteeiveeuhfffveekhfevueefieeijeegvdenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 28 Mar 2023 21:17:34 -0400 (EDT) From: Zi Yan To: "Matthew Wilcox (Oracle)" , Yang Shi , Yu Zhao , linux-mm@kvack.org Cc: Zi Yan , "Kirill A . Shutemov" , Ryan Roberts , =?utf-8?q?Michal_Koutn=C3=BD?= , Roman Gushchin , "Zach O'Keefe" , Andrew Morton , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 1/7] mm/memcg: use order instead of nr in split_page_memcg() Date: Tue, 28 Mar 2023 21:17:06 -0400 Message-Id: <20230329011712.3242298-2-zi.yan@sent.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230329011712.3242298-1-zi.yan@sent.com> References: <20230329011712.3242298-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Stat-Signature: qpow84bc41u6q4do3hs1qrq5pgcrpmdu X-Rspam-User: X-Rspamd-Queue-Id: D21CC14000E X-Rspamd-Server: rspam06 X-HE-Tag: 1680052655-822625 X-HE-Meta: U2FsdGVkX1+MKxyAskVlBzWzhI5caDuZSvMjWoM5An1r3KdwQi56pFgc2ctDIFXeZLTFyWZ8vJQ3kvn/bCiMll94f2AmWztHh1RAnUoVvqlerc1avPCG3MYBp83ndcLcH1ivLmQhCle0HmqN3ZRCGMEkryei2pautNGFjpkwWDUzuuA1cNLjMq83lQvV4zeHu5YjVe1UMO87QPRA8/0vQbGwVMW1U1IY34AefWXhho5j2uFMPWuvmA9dCbjxHb5sr2MzTt1jTVdd4PEL4HCNrNi+2rrlj27527zmkJVvl+rEIKS8e40GKyPFdos0/RhSkDmEcdyapn5l6hQy9ErukvyAHcx0k7E5fUVDW1BliDn/8vIWTYw4ItjCF9XZ+uGYwak0SYQu15yEm/xMJ8qsZXNjctZYKolXrCa+vOcfE8Xa3QZQYhEa2KhpEKYmCRvU37SB6X1JdRlKyz2jq2/vIe9BnytVSgmYQH7qvo29Y9u/r8YSfnj0OSHo0t8uzdDb36ZRjD4OIzkhwqEgN+i+Wd4abvFw4EBzCQjbMtXzSG8OOBKzHzuNeAHx8BRkq7H9KbcvoS4yzF5VFrKpAK9zAso23Vaut24cONPr6kIQxinri1UmHfiCiqCGUX1oxrF1Pi9JI4AC+/ZN4lpF0PCxoyC2hYi9LNS0SVr7RxEPMh2Lepz88blShOSBuo+hyIxiACGQNtQwjk4ZQ2J8q80pEUd2Ywdxs8t2ySGJWU9HpKwlnj3BNmhu4oR//IymA5dgnI9bhW3IvImWMWe2xHioMIqwa1u/VFfQ0QlFGjv4gtdrbFkl6LaZfQMR/ubHCW2J+/Gmlr/SF3DFJvS/z7zKdrXN4RyR2ikuiF5iEXGhoWEnlMFIEUeKKRkbeFQaoZV9GSFCeXVQXXhLBjukJCgX5B3H8J2w3PhE7YXpu/Z22NPTWdGifI9u5f6SAD6BKfSBT462nP36Y/V7ouxRrt5 KUn0dzM2 hik7AJI4W8Ik1rdCGfG4VW/fHIP+LhQq9NIujuYkmyksBjtfM+I1Y3LaVamllYofBlH4RJWoUnar/sH3JtJ8FBiQTwqRW0Et9crDCQFlA+/u+rEMx8AE0575lAu5Rp3wAEAv81JFxyMyZaijb7tBMrwob/aWaVFwqR7X4nJNdIu+oxdBDtNHxrL0R6JA86LJRA4YJlUO9YRpZTgpv+dKoEi56m2IlFtMtSlvw1cUSuxT/ZKeUFnL9hHTYewH167e8t2xflaU86vniVGjHF/bFV5l1TL1XeCSazQVXqDP1vkZhREUgvRdcQZ4SVBtk1WKaNuKdJVZsXgv7y06MdE3EoPo7TQ6Esho4UkyZRZyHV13vqcRdtob8mJQOTP2d4FwoiJn+LXzTXMKZzm/ak/19htlcTX/+fiifXvmbtMtka7wQdJFxr1Hvt6pxryedEjmUXMWjmTUA8K0u76NWSX1OIhOOQw== 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: From: Zi Yan We do not have non power of two pages, using nr is error prone if nr is not power-of-two. Use page order instead. Signed-off-by: Zi Yan --- include/linux/memcontrol.h | 4 ++-- mm/huge_memory.c | 3 ++- mm/memcontrol.c | 3 ++- mm/page_alloc.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index aa69ea98e2d8..e06a61ea4fc1 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1151,7 +1151,7 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, rcu_read_unlock(); } -void split_page_memcg(struct page *head, unsigned int nr); +void split_page_memcg(struct page *head, int order); unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, gfp_t gfp_mask, @@ -1588,7 +1588,7 @@ void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx) { } -static inline void split_page_memcg(struct page *head, unsigned int nr) +static inline void split_page_memcg(struct page *head, int order) { } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 81a5689806af..3bb003eb80a3 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2512,10 +2512,11 @@ static void __split_huge_page(struct page *page, struct list_head *list, struct address_space *swap_cache = NULL; unsigned long offset = 0; unsigned int nr = thp_nr_pages(head); + int order = folio_order(folio); int i; /* complete memcg works before add pages to LRU */ - split_page_memcg(head, nr); + split_page_memcg(head, order); if (PageAnon(head) && PageSwapCache(head)) { swp_entry_t entry = { .val = page_private(head) }; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 681e7528a714..cab2828e188d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3414,11 +3414,12 @@ void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size) /* * Because page_memcg(head) is not set on tails, set it now. */ -void split_page_memcg(struct page *head, unsigned int nr) +void split_page_memcg(struct page *head, int order) { struct folio *folio = page_folio(head); struct mem_cgroup *memcg = folio_memcg(folio); int i; + unsigned int nr = 1 << order; if (mem_cgroup_disabled() || !memcg) return; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0767dd6bc5ba..d84b121d1e03 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2781,7 +2781,7 @@ void split_page(struct page *page, unsigned int order) for (i = 1; i < (1 << order); i++) set_page_refcounted(page + i); split_page_owner(page, 1 << order); - split_page_memcg(page, 1 << order); + split_page_memcg(page, order); } EXPORT_SYMBOL_GPL(split_page); @@ -4997,7 +4997,7 @@ static void *make_alloc_exact(unsigned long addr, unsigned int order, struct page *last = page + nr; split_page_owner(page, 1 << order); - split_page_memcg(page, 1 << order); + split_page_memcg(page, order); while (page < --last) set_page_refcounted(last);