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 5F4C5C10F1A for ; Tue, 7 May 2024 09:07:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7AA26B00A0; Tue, 7 May 2024 05:07:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2ADA6B00A3; Tue, 7 May 2024 05:07:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C19406B00A5; Tue, 7 May 2024 05:07:06 -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 AA59B6B00A0 for ; Tue, 7 May 2024 05:07:06 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 18927160183 for ; Tue, 7 May 2024 09:07:06 +0000 (UTC) X-FDA: 82091020452.12.165D374 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf28.hostedemail.com (Postfix) with ESMTP id A8C85C0013 for ; Tue, 7 May 2024 09:07:02 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715072824; 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; bh=fPs2eI5uOHySJ+1+J6K5Z94xtXAk7d8oDBk7t2/kXX8=; b=4PF4IcEqC9vBWgND6zOoDkbAij8B4/yH3Rdq1sotkbXXlzZ2/bPSHc0G9hHOvWijoGSIJf T15PW7ZuQXzEuxAMieYNAphib29Fy7TeM5SdU8p7EOooqs8SY7deQG75HkcekwojgXQ9Dz 9aNLZJqKowPkdBL8SNPe0OLkOMj1JNk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715072824; a=rsa-sha256; cv=none; b=J0Wa05/TuMh9OXdjbjjezOClpxQFDLuKFIhlIHyJoG3D7SJbifpEwfhU8+bXvMp6UHUeq+ qlZ2mqPbzKDOQk/nqtEarGEHjICM9zPGxSFkMXwqTJm+CQ+YPDiXCblh33ak3g6wxyfkIU 7+wQhKThu0LZiO+Vn+BRHFG2ALSHgrs= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4VYXPm0YqCz1R8sZ; Tue, 7 May 2024 17:03:40 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 798AA18007B; Tue, 7 May 2024 17:06:58 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 7 May 2024 17:06:57 +0800 Message-ID: <411eb896-56c6-4895-a2ba-6c492f8b51fd@huawei.com> Date: Tue, 7 May 2024 17:06:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH rfc 4/4] mm: filemap: try to batch lruvec stat updating Content-Language: en-US To: Andrew Morton , David Hildenbrand , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt CC: "Matthew Wilcox (Oracle)" , , , Muchun Song References: <20240429072417.2146732-1-wangkefeng.wang@huawei.com> <20240429072417.2146732-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: <20240429072417.2146732-5-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100001.china.huawei.com (7.185.36.93) X-Stat-Signature: g9hb71138oem8tgum7wxroxkyerd5xbh X-Rspamd-Queue-Id: A8C85C0013 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1715072822-426790 X-HE-Meta: U2FsdGVkX18ljtByFQxnjvhXoGgQEkuc/y/dG5fyUSyd+wtcjLrDDESQPknCgfCcNFgKgSce8MtMUK9XDTyRH93FhL4+W5zI65hzQbUeIjucIhHiVIuqonJapBSQ2AyDvApdB8z2ZB15BAa4PjzZGJcD7pzLne27fqr5/aY2Bn2ZYZKziEwBG1zezkL61CeV588yeYsse+1hapD2FNyR6LgJYFoJ7NoJFWXkoNQALdR/yXCot09TTpcm1/ZdYEx5/PmsYjropqkFiIpYNB2b+Vo0Xum35dtb4QUwIijO0UkS9/+1yr+aA+1SoChODKzPh+mcNT/7xljGktcsCDjMjNDhiDgDAAq+waaM+wyEBW01ZRE0arYzWVNpqCud4EUf5z+zn0fssQZQoBj2Qb4816zI6I5YHp/NKXy/Ir/Rlq/6EQKR85D1+ooHlVu5lYxedYQ7FeCQAGYk0TWmbKV0fNc3maK/feNOVcnT2sVkTafi3NdVOF6rq/KQwZ5N1RAUUW2DGU0O8wsa4VTyUA5205TNk2KeV3kIw/U+SQ8c49YguNjlXP8TH1G6OhH7YzyNw/aBWhdGcmHHiXulTVOfQMO3bU1Inbj3USpDxnaQT8Pgi6HSY0rY1u0RuVWp9W/m9pgeXel8FlcSepuWH5bd4uxCJYl4JA01+cN9/J2cVpB/TB24Ufd2GksaA5boA2nNH4J+fnyd7o7Ayoruw+jWqKKnZr4q6vfY7w7DqYWlVN/mlW/EXZJW59ltps2yHZE7aAQrEIdPKY1U3uP5h6iNm1c/oJznv+hVKyXLpnYcXKgN5Z0EIVl0i0OEfKyMZijxQAFlnPFQ1oA6b9yFsOAWfHZZJS/xhXPKn281r2W5dLTdGEK+9aTHi33gKb5WJ0ivzO8867S1iVjAaAp3ICkaLqgMe11oNYGaoSrP6MghqDzG9kkhLv9FdGnfGjIUtSomqb5SJGgM1ofz3/6KF3R 5IKkOsDw PBjRgOqmmGjh4pOFPVOT2/udTD1/9UG6mGE6BLvARFE9Q2AZBoNkY8H4ojTpJKt7NbEWN1THX7XLPvcq07/SGdrnA85g7hci8sECYgnHli5O5VngDJ/Y3V5L8TjVPJ0L5UF/Y3QXZNadolEmknygT3Ikef24vZC8oxmuJDHpXCNcpIpgjrr0BxaKSkYSHcYMl5kc5A6zsjVviGS7wEaNcj0jevFObv8t7NpCnjbx/YGmo17oULwEU1cxsiCJP2I5Zqsy9 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: List-Subscribe: List-Unsubscribe: + memcg maintainers and David too, please check all patches from link https://lore.kernel.org/linux-mm/20240429072417.2146732-1-wangkefeng.wang@huawei.com/ Thanks On 2024/4/29 15:24, Kefeng Wang wrote: > The filemap_map_pages() tries to map few pages(eg, 16 pages), but the > lruvec stat updating is called on each mapping, since the updating is > time-consuming, especially with memcg, so try to batch it when the memcg > and pgdat are same during the mapping, if luckily, we could save most of > time of lruvec stat updating, the lat_pagefault shows 3~4% improvement. > > Signed-off-by: Kefeng Wang > --- > mm/filemap.c | 33 ++++++++++++++++++++++++++++++--- > 1 file changed, 30 insertions(+), 3 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index 3966b6616d02..b27281707098 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -3615,6 +3615,20 @@ static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf, > return ret; > } > > +static void filemap_lruvec_stat_update(struct mem_cgroup *memcg, > + pg_data_t *pgdat, int nr) > +{ > + struct lruvec *lruvec; > + > + if (!memcg) { > + __mod_node_page_state(pgdat, NR_FILE_MAPPED, nr); > + return; > + } > + > + lruvec = mem_cgroup_lruvec(memcg, pgdat); > + __mod_lruvec_state(lruvec, NR_FILE_MAPPED, nr); > +} > + > vm_fault_t filemap_map_pages(struct vm_fault *vmf, > pgoff_t start_pgoff, pgoff_t end_pgoff) > { > @@ -3628,6 +3642,9 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > vm_fault_t ret = 0; > unsigned long rss = 0; > unsigned int nr_pages = 0, mmap_miss = 0, mmap_miss_saved, folio_type; > + struct mem_cgroup *memcg, *memcg_cur; > + pg_data_t *pgdat, *pgdat_cur; > + int nr_mapped = 0; > > rcu_read_lock(); > folio = next_uptodate_folio(&xas, mapping, end_pgoff); > @@ -3648,9 +3665,20 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > } > > folio_type = mm_counter_file(folio); > + memcg = folio_memcg(folio); > + pgdat = folio_pgdat(folio); > do { > unsigned long end; > - int nr_mapped = 0; > + > + memcg_cur = folio_memcg(folio); > + pgdat_cur = folio_pgdat(folio); > + > + if (unlikely(memcg != memcg_cur || pgdat != pgdat_cur)) { > + filemap_lruvec_stat_update(memcg, pgdat, nr_mapped); > + nr_mapped = 0; > + memcg = memcg_cur; > + pgdat = pgdat_cur; > + } > > addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; > vmf->pte += xas.xa_index - last_pgoff; > @@ -3668,11 +3696,10 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > nr_pages, &rss, &nr_mapped, > &mmap_miss); > > - __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr_mapped); > - > folio_unlock(folio); > folio_put(folio); > } while ((folio = next_uptodate_folio(&xas, mapping, end_pgoff)) != NULL); > + filemap_lruvec_stat_update(memcg, pgdat, nr_mapped); > add_mm_counter(vma->vm_mm, folio_type, rss); > pte_unmap_unlock(vmf->pte, vmf->ptl); > out: