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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11F32C433EF for ; Thu, 7 Apr 2022 03:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239963AbiDGDSs (ORCPT ); Wed, 6 Apr 2022 23:18:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239860AbiDGDSZ (ORCPT ); Wed, 6 Apr 2022 23:18:25 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2253375215 for ; Wed, 6 Apr 2022 20:16:03 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2eb645be8dbso38166257b3.11 for ; Wed, 06 Apr 2022 20:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=0gDL2pvTD5zxTlqUvzGVrkqMwF+WWHMG6CzLJtufS9M=; b=QICSklTnaaKrO6/CXXqJRjo6eUoMfPz4jqJsprXE9+mK/IdywVQeWsiiKfkQzApu8E io4jZTYfk+M2pMZWRjWFCLRIdy4NtX6ZsC2I+g4xsFu5eLUI1hci3N0Drcy7JIguNy5K RLAw+HBz0UxECtKLdy3aUU8a/9UqGtIpri8M0oTvcgQC1m7+xPlp35VoWv8m920YL6NM GjgHvHcdIRjPovqKGoeuusODGjIBEdxv59NO9FePJjy28RshR3nHegG91QPzvdIySuve b1Y7KAmXVj0xLVH0KzccTpDl62qkV19v+SnBwH4Q+yJwvKT+Hq28lrFMCeA3SVYkl+pf AkTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=0gDL2pvTD5zxTlqUvzGVrkqMwF+WWHMG6CzLJtufS9M=; b=tFZ+qSuB3TCMe0wTV2x7fYnmU443vaOVARngFLtdnUwc958SY6oZFpTcwOpjLHNfd4 7wKiiA+9LDrUwk43NAeoH7KnqjhGM8eSjh5kdC1Q2xcZcT8El4RTHMNNsoOcyCwxEiSo 9RORPsPzbSyKEibQi4WZkVXj8TAIm+QAXy2h6XOiH2rroi4XXEPZdLoZDkUtz0z6ab1r eX63vo1S4zc/U0/VFW0ZLKNkROxX7/BFRl1AFwFAS+qJALLW4KNlgb1Ibo3XKDpv0HHl br2LaWBDQMNWvMQQg+RoZe9ViZUTQzrsbudsl+d0Rv/8M3xtcKxo6e9PyBzvkSDo9hFY MjMg== X-Gm-Message-State: AOAM533irUVBnLWoEPsag4gEdxxDcOeHlzNoCfhE+Z1IHqpQxtNY9fCM Ygsp5ZgeGDTBMc1hE2kngYuBqR68ZOo= X-Google-Smtp-Source: ABdhPJy0qDaWGmrAHqYOlAxiHODGv8oSz35pnKw1CmjSNap+V1hJvi+veG0m6uQb5qNeS9I6XInk5X7RAis= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:9ea2:c755:ae22:6862]) (user=yuzhao job=sendgmr) by 2002:a25:3247:0:b0:63d:8e17:ac77 with SMTP id y68-20020a253247000000b0063d8e17ac77mr8382368yby.325.1649301362972; Wed, 06 Apr 2022 20:16:02 -0700 (PDT) Date: Wed, 6 Apr 2022 21:15:16 -0600 In-Reply-To: <20220407031525.2368067-1-yuzhao@google.com> Message-Id: <20220407031525.2368067-5-yuzhao@google.com> Mime-Version: 1.0 References: <20220407031525.2368067-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH v10 04/14] Revert "include/linux/mm_inline.h: fold __update_lru_size() into its sole caller" From: Yu Zhao To: Stephen Rothwell , linux-mm@kvack.org Cc: Andi Kleen , Andrew Morton , Aneesh Kumar , Barry Song <21cnbao@gmail.com>, Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Jesse Barnes , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Rik van Riel , Vlastimil Babka , Will Deacon , Ying Huang , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, page-reclaim@google.com, x86@kernel.org, Yu Zhao , 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 ac32125745ab..7c9c2157e9a8 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -32,7 +32,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) { @@ -41,6 +41,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, + int 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.35.1.1094.g7c7d902a7c-goog 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 66A01C433EF for ; Thu, 7 Apr 2022 03:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oltOGeKGujMBjf0mXfTV+mXjaNyYpmxWagfCOD6ay3E=; b=gW1crwtn3QHVfB+xUw7r6rlLcd GhPm5cmb1/yAC3wltJO55zzuB8R8JkCRx+rdBLux/49LqTdVa+DmOpESJoehJuuDuG0yQjBuWuSud 5K6W8XUgV8ykk6diiM7GVx/deWJIGdeaYFHj88IDi8c7rZ2vFUpP+IhpGO3J7RYj02KxjEu7zw8bo h/jwlMxzs5ZZzW7nf//BaDrJwNJj6pu3Lcf3rZpT8f/EcaAaYqaxwwuKT7lna/gE5w0UUPcDLn0Cc McyealtAjjuFNXxWnWOVRXfwmamCjbgToTD4EPrJ7SpDHm4VTMxtEmLZ18GSYWaC8/ejzGWze7PaA 2JZWWj2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncImJ-0095G4-Mq; Thu, 07 Apr 2022 03:25:48 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncIcu-0091Xk-KI for linux-arm-kernel@lists.infradead.org; Thu, 07 Apr 2022 03:16:08 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2e644c76556so38280987b3.15 for ; Wed, 06 Apr 2022 20:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=0gDL2pvTD5zxTlqUvzGVrkqMwF+WWHMG6CzLJtufS9M=; b=QICSklTnaaKrO6/CXXqJRjo6eUoMfPz4jqJsprXE9+mK/IdywVQeWsiiKfkQzApu8E io4jZTYfk+M2pMZWRjWFCLRIdy4NtX6ZsC2I+g4xsFu5eLUI1hci3N0Drcy7JIguNy5K RLAw+HBz0UxECtKLdy3aUU8a/9UqGtIpri8M0oTvcgQC1m7+xPlp35VoWv8m920YL6NM GjgHvHcdIRjPovqKGoeuusODGjIBEdxv59NO9FePJjy28RshR3nHegG91QPzvdIySuve b1Y7KAmXVj0xLVH0KzccTpDl62qkV19v+SnBwH4Q+yJwvKT+Hq28lrFMCeA3SVYkl+pf AkTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=0gDL2pvTD5zxTlqUvzGVrkqMwF+WWHMG6CzLJtufS9M=; b=tGXqAo4MDzSoBCRzWTyPsrsKEEYMJzw5D11GzIs3lVubSMyirBp/IUfiJ52vaxlVA7 YbCXYlYH/EKftzhzev4PzgvjhvUvAj2YV31oMeQl05TAnOuaZYvXhzJqrBi++n7qiyhq HRfNUiZM+vdW/+eV3Qrw0Rzq/h17p8rkgOEdA4g8mnu9yJCNWATXQQnaMX+aGooktb4y R4G7KGF/b8Vgz1/kMTZadlT/LKWVcrZQquMpjTRTlJw0+2+8wZr86nXSmmmS7fa0jtLT jlTbnalEnC86ZChMBJMmLFGbLgcI1slYTOX0Wo0K01w8fmUErLYJEMFUDG8sOYFKsKNQ 8ALA== X-Gm-Message-State: AOAM533F/50gkD05t8auznEU6qL7AZUR/13Y3FGlRQD+39t3vLvWt+4h BUF8sehfxMWaePCY37/dy6qS7ISrrr0= X-Google-Smtp-Source: ABdhPJy0qDaWGmrAHqYOlAxiHODGv8oSz35pnKw1CmjSNap+V1hJvi+veG0m6uQb5qNeS9I6XInk5X7RAis= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:9ea2:c755:ae22:6862]) (user=yuzhao job=sendgmr) by 2002:a25:3247:0:b0:63d:8e17:ac77 with SMTP id y68-20020a253247000000b0063d8e17ac77mr8382368yby.325.1649301362972; Wed, 06 Apr 2022 20:16:02 -0700 (PDT) Date: Wed, 6 Apr 2022 21:15:16 -0600 In-Reply-To: <20220407031525.2368067-1-yuzhao@google.com> Message-Id: <20220407031525.2368067-5-yuzhao@google.com> Mime-Version: 1.0 References: <20220407031525.2368067-1-yuzhao@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH v10 04/14] Revert "include/linux/mm_inline.h: fold __update_lru_size() into its sole caller" From: Yu Zhao To: Stephen Rothwell , linux-mm@kvack.org Cc: Andi Kleen , Andrew Morton , Aneesh Kumar , Barry Song <21cnbao@gmail.com>, Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Jesse Barnes , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Rik van Riel , Vlastimil Babka , Will Deacon , Ying Huang , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, page-reclaim@google.com, x86@kernel.org, Yu Zhao , 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220406_201604_804913_191644FB X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhpcyBwYXRjaCB1bmRvZXMgdGhlIGZvbGxvd2luZyByZWZhY3RvcjoKY29tbWl0IDI4OWNjYmEx OGFmNCAoImluY2x1ZGUvbGludXgvbW1faW5saW5lLmg6IGZvbGQgX191cGRhdGVfbHJ1X3NpemUo KSBpbnRvIGl0cyBzb2xlIGNhbGxlciIpCgpUaGUgdXBjb21pbmcgY2hhbmdlcyB0byBpbmNsdWRl L2xpbnV4L21tX2lubGluZS5oIHdpbGwgcmV1c2UKX191cGRhdGVfbHJ1X3NpemUoKS4KClNpZ25l ZC1vZmYtYnk6IFl1IFpoYW8gPHl1emhhb0Bnb29nbGUuY29tPgpBY2tlZC1ieTogQnJpYW4gR2Vm Zm9uIDxiZ2VmZm9uQGdvb2dsZS5jb20+CkFja2VkLWJ5OiBKYW4gQWxleGFuZGVyIFN0ZWZmZW5z IChoZWZ0aWcpIDxoZWZ0aWdAYXJjaGxpbnV4Lm9yZz4KQWNrZWQtYnk6IE9sZWtzYW5kciBOYXRh bGVua28gPG9sZWtzYW5kckBuYXRhbGVua28ubmFtZT4KQWNrZWQtYnk6IFN0ZXZlbiBCYXJyZXR0 IDxzdGV2ZW5AbGlxdW9yaXgubmV0PgpBY2tlZC1ieTogU3VsZWltYW4gU291aGxhbCA8c3VsZWlt YW5AZ29vZ2xlLmNvbT4KVGVzdGVkLWJ5OiBEYW5pZWwgQnlybmUgPGRqYnlybmVAbXR1LmVkdT4K VGVzdGVkLWJ5OiBEb25hbGQgQ2FyciA8ZEBjaGFvcy1yZWlucy5jb20+ClRlc3RlZC1ieTogSG9s Z2VyIEhvZmZzdMOkdHRlIDxob2xnZXJAYXBwbGllZC1hc3luY2hyb255LmNvbT4KVGVzdGVkLWJ5 OiBLb25zdGFudGluIEtoYXJsYW1vdiA8SGktQW5nZWxAeWFuZGV4LnJ1PgpUZXN0ZWQtYnk6IFNo dWFuZyBaaGFpIDxzemhhaTJAY3Mucm9jaGVzdGVyLmVkdT4KVGVzdGVkLWJ5OiBTb2ZpYSBUcmlu aCA8c29maWEudHJpbmhAZWRpLndvcmtzPgpUZXN0ZWQtYnk6IFZhaWJoYXYgSmFpbiA8dmFpYmhh dkBsaW51eC5pYm0uY29tPgotLS0KIGluY2x1ZGUvbGludXgvbW1faW5saW5lLmggfCA5ICsrKysr KysrLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbW1faW5saW5lLmggYi9pbmNsdWRlL2xpbnV4L21tX2lu bGluZS5oCmluZGV4IGFjMzIxMjU3NDVhYi4uN2M5YzIxNTdlOWE4IDEwMDY0NAotLS0gYS9pbmNs dWRlL2xpbnV4L21tX2lubGluZS5oCisrKyBiL2luY2x1ZGUvbGludXgvbW1faW5saW5lLmgKQEAg LTMyLDcgKzMyLDcgQEAgc3RhdGljIGlubGluZSBpbnQgcGFnZV9pc19maWxlX2xydShzdHJ1Y3Qg cGFnZSAqcGFnZSkKIAlyZXR1cm4gZm9saW9faXNfZmlsZV9scnUocGFnZV9mb2xpbyhwYWdlKSk7 CiB9CiAKLXN0YXRpYyBfX2Fsd2F5c19pbmxpbmUgdm9pZCB1cGRhdGVfbHJ1X3NpemUoc3RydWN0 IGxydXZlYyAqbHJ1dmVjLAorc3RhdGljIF9fYWx3YXlzX2lubGluZSB2b2lkIF9fdXBkYXRlX2xy dV9zaXplKHN0cnVjdCBscnV2ZWMgKmxydXZlYywKIAkJCQllbnVtIGxydV9saXN0IGxydSwgZW51 bSB6b25lX3R5cGUgemlkLAogCQkJCWxvbmcgbnJfcGFnZXMpCiB7CkBAIC00MSw2ICs0MSwxMyBA QCBzdGF0aWMgX19hbHdheXNfaW5saW5lIHZvaWQgdXBkYXRlX2xydV9zaXplKHN0cnVjdCBscnV2 ZWMgKmxydXZlYywKIAlfX21vZF9scnV2ZWNfc3RhdGUobHJ1dmVjLCBOUl9MUlVfQkFTRSArIGxy dSwgbnJfcGFnZXMpOwogCV9fbW9kX3pvbmVfcGFnZV9zdGF0ZSgmcGdkYXQtPm5vZGVfem9uZXNb emlkXSwKIAkJCQlOUl9aT05FX0xSVV9CQVNFICsgbHJ1LCBucl9wYWdlcyk7Cit9CisKK3N0YXRp YyBfX2Fsd2F5c19pbmxpbmUgdm9pZCB1cGRhdGVfbHJ1X3NpemUoc3RydWN0IGxydXZlYyAqbHJ1 dmVjLAorCQkJCWVudW0gbHJ1X2xpc3QgbHJ1LCBlbnVtIHpvbmVfdHlwZSB6aWQsCisJCQkJaW50 IG5yX3BhZ2VzKQoreworCV9fdXBkYXRlX2xydV9zaXplKGxydXZlYywgbHJ1LCB6aWQsIG5yX3Bh Z2VzKTsKICNpZmRlZiBDT05GSUdfTUVNQ0cKIAltZW1fY2dyb3VwX3VwZGF0ZV9scnVfc2l6ZShs cnV2ZWMsIGxydSwgemlkLCBucl9wYWdlcyk7CiAjZW5kaWYKLS0gCjIuMzUuMS4xMDk0Lmc3Yzdk OTAyYTdjLWdvb2cKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3Rz LmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5m by9saW51eC1hcm0ta2VybmVsCg==