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 F171BC6FA92 for ; Sun, 18 Sep 2022 08:01:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 881728000C; Sun, 18 Sep 2022 04:01:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8309480007; Sun, 18 Sep 2022 04:01:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BF578000C; Sun, 18 Sep 2022 04:01:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4393880007 for ; Sun, 18 Sep 2022 04:01:08 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 18683120C15 for ; Sun, 18 Sep 2022 08:01:08 +0000 (UTC) X-FDA: 79924460616.08.CDC3650 Received: from mail-il1-f202.google.com (mail-il1-f202.google.com [209.85.166.202]) by imf06.hostedemail.com (Postfix) with ESMTP id BF70D180093 for ; Sun, 18 Sep 2022 08:01:07 +0000 (UTC) Received: by mail-il1-f202.google.com with SMTP id i13-20020a056e02152d00b002f58aea654fso684291ilu.20 for ; Sun, 18 Sep 2022 01:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date; bh=LfXLdPDU9TThOhZ4D2zE649TQFD3EB2UjkrzF5+qab4=; b=SlZAvCwe70kcEYStzy3ejhcQi3d7Xy7elLllvxMkvk59q1SQYhhYi7+r2b7aX/pqim BjIUN56FwknIr6rOSB7nJUWyc9ojfXyUH72SJ+F+8lQnaJWUfJ/3BRto0kDqMWrcoEqn BwcVk95+p2CPlmy4aZoHof2DqblnOfudgeZ9DbzjGlwGUNunV9jUU5Lj96I/sobaZZzJ l1AErF1eCZf+PiVTrxC3kOBunHre5Tl5HOqGwUGYvngWRQEDq81KsC6PLSXX9BDfaxn2 ldS1LqZwQ122hUlG4bJC3reWnejDFjkXs5VdXrwDVPXA84qoBlylRQ9lhOEnZ7Zl4Ps9 o5Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date; bh=LfXLdPDU9TThOhZ4D2zE649TQFD3EB2UjkrzF5+qab4=; b=J/Adyj5gyUk0S9p3ItnEvDDEykRhWmRhUt1AP2cXCBnBFsPMJf7YM6VdrCnxVLnJ83 RBPmUzHvX4M32U+wJByNdR5Dgkb0JaLXxycwW/GqWmjHMmTd9fzpA04/l9J1GQo0CyI4 jwlsJNvK40Arc328p4TWOTQWe8El5agiHuLzzEhJK/XS6gO0DvbD5tx6GoGdLwMCF6ZH kvTTE26GcPXs3L9/a6P7vk4CIP8OFRuPb6XUjXEaz3QNzyOFw085qaqY/3qJ4U+HOntd nkI3UK/RGeZ3RenpbvnGB4rEqd4xIZqLepzwDAUV5BHucq8KlCZNGuRXSlyPqqSHb6f3 tAuA== X-Gm-Message-State: ACrzQf1cGYUbsgBby192BAXIWYClfz5H6rOPE8x4QIFbt+F5bJ81jSAu ElQFN8jGLlSmFhNmMozKLwat5FLsQW4= X-Google-Smtp-Source: AMsMyM755bmDWnBK6LJsVSzni+E6x/QOF90An1XIDUfgsb2t5MR125J+BErzWcPBoilK3Vf0mfhlesRNgHg= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:c05a:2e99:29cd:d157]) (user=yuzhao job=sendgmr) by 2002:a05:6602:2f01:b0:678:935f:abd8 with SMTP id q1-20020a0566022f0100b00678935fabd8mr4892732iow.20.1663488067079; Sun, 18 Sep 2022 01:01:07 -0700 (PDT) Date: Sun, 18 Sep 2022 02:00:01 -0600 In-Reply-To: <20220918080010.2920238-1-yuzhao@google.com> Message-Id: <20220918080010.2920238-5-yuzhao@google.com> Mime-Version: 1.0 References: <20220918080010.2920238-1-yuzhao@google.com> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog Subject: [PATCH mm-unstable v15 04/14] Revert "include/linux/mm_inline.h: fold __update_lru_size() into its sole caller" From: Yu Zhao To: Andrew Morton Cc: Andi Kleen , Aneesh Kumar , Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Peter Zijlstra , Tejun Heo , Vlastimil Babka , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, page-reclaim@google.com, Yu Zhao , Miaohe Lin , Brian Geffon , Jan Alexander Steffens , Oleksandr Natalenko , Steven Barrett , Suleiman Souhlal , Daniel Byrne , Donald Carr , "=?UTF-8?q?Holger=20Hoffst=C3=A4tte?=" , Konstantin Kharlamov , Shuang Zhai , Sofia Trinh , Vaibhav Jain Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663488067; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LfXLdPDU9TThOhZ4D2zE649TQFD3EB2UjkrzF5+qab4=; b=WSAt52ERoGYMzimdHNHrmLeA1NjBlO9VJyDay6joWb51RcqxunG4VHrQNXmfYvh+lBmRHT u+jRX1pdxdMEr0SpOXnb6T063xFC+tLdJAygMzQ8VAiZq3+zZhLcL5NDLNzV9VaoNBp5YE kQge7gudeoU9L5UBxpLCbxi9yzDkg5A= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=SlZAvCwe; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3Q9AmYwYKCJ4WSXF8MEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yuzhao.bounces.google.com designates 209.85.166.202 as permitted sender) smtp.mailfrom=3Q9AmYwYKCJ4WSXF8MEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yuzhao.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663488067; a=rsa-sha256; cv=none; b=uYYA979UJ+SkRRFS0iik5kAZBkycL0D3MWUpKtBM1z81IfQEYMoypxI7Tewq+WRJblgDEp 96NAkxfz2CNwoDnTJ/BrOqX2kewCnYWoeIv/Aj03vMJgl9o9t/bGDdQCzECUkOo/7KGrlU W9WQFbpKi6aRupWDqVKOo/s9qAvo3yA= Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=SlZAvCwe; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3Q9AmYwYKCJ4WSXF8MEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yuzhao.bounces.google.com designates 209.85.166.202 as permitted sender) smtp.mailfrom=3Q9AmYwYKCJ4WSXF8MEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yuzhao.bounces.google.com X-Rspam-User: X-Stat-Signature: 66k53mdmgjdrq6goo6y7cnc6kn1agjfm X-Rspamd-Queue-Id: BF70D180093 X-Rspamd-Server: rspam12 X-HE-Tag: 1663488067-129945 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 undoes the following refactor: commit 289ccba18af4 ("include/linux/mm_inline.h: fold __update_lru_size() i= nto its sole caller") The upcoming changes to include/linux/mm_inline.h will reuse __update_lru_size(). Signed-off-by: Yu Zhao Reviewed-by: Miaohe Lin Acked-by: Brian Geffon Acked-by: Jan Alexander Steffens (heftig) Acked-by: Oleksandr Natalenko Acked-by: Steven Barrett Acked-by: Suleiman Souhlal Tested-by: Daniel Byrne Tested-by: Donald Carr Tested-by: Holger Hoffst=C3=A4tte Tested-by: Konstantin Kharlamov Tested-by: Shuang Zhai Tested-by: Sofia Trinh Tested-by: Vaibhav Jain --- include/linux/mm_inline.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 7b25b53c474a..fb8aadb81cd6 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -34,7 +34,7 @@ static inline int page_is_file_lru(struct page *page) return folio_is_file_lru(page_folio(page)); } =20 -static __always_inline void update_lru_size(struct lruvec *lruvec, +static __always_inline void __update_lru_size(struct lruvec *lruvec, enum lru_list lru, enum zone_type zid, long nr_pages) { @@ -43,6 +43,13 @@ static __always_inline void update_lru_size(struct lruve= c *lruvec, __mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages); __mod_zone_page_state(&pgdat->node_zones[zid], NR_ZONE_LRU_BASE + lru, nr_pages); +} + +static __always_inline void update_lru_size(struct lruvec *lruvec, + enum lru_list lru, enum zone_type zid, + long nr_pages) +{ + __update_lru_size(lruvec, lru, zid, nr_pages); #ifdef CONFIG_MEMCG mem_cgroup_update_lru_size(lruvec, lru, zid, nr_pages); #endif --=20 2.37.3.968.ga6b4b080e4-goog