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 3647FC4332F for ; Thu, 22 Dec 2022 06:13:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56CEB900003; Thu, 22 Dec 2022 01:13:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F60F900002; Thu, 22 Dec 2022 01:13:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36F8C900003; Thu, 22 Dec 2022 01:13:54 -0500 (EST) 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 24781900002 for ; Thu, 22 Dec 2022 01:13:54 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id ECD3B1A07C5 for ; Thu, 22 Dec 2022 06:13:53 +0000 (UTC) X-FDA: 80268926346.23.112C6B3 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf01.hostedemail.com (Postfix) with ESMTP id 685964000B for ; Thu, 22 Dec 2022 06:13:52 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=UQLFFeIh; spf=pass (imf01.hostedemail.com: domain of 3n_WjYwcKCD43zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3n_WjYwcKCD43zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671689632; 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:in-reply-to: references:dkim-signature; bh=8Le8KFegdWN7VOvwiSTZxOW/cPswDLVsipipyKMUN9w=; b=qURK9lQZ7eTqfB81EdQw4U8vQp40bAMyaccDdB6fLMlgFv14dRYU8M0EBUKUWc6j56yu7c II7AtIeFxGWX46g5LB46RHqfJaHktdvnsQyeaG4IjMHP/TC8tGEad1gXJpptpkZKVe3xZu 9DX4u6DAEEbjcFYXPLaLhRsXP1kUD9g= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=UQLFFeIh; spf=pass (imf01.hostedemail.com: domain of 3n_WjYwcKCD43zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3n_WjYwcKCD43zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671689632; a=rsa-sha256; cv=none; b=l/r+nkBCSuXjL23+dlOTMk5jSyekY78QAd7KPM3EiiGkzxGkXKqE1zaME/k77Xzj80SThV OyzgMKg09FerVtLecl3Fi5BGuLA88xe+Y4CBx6KUK1BFihX/K+dj5Hg2HrkGfuV6ZeOtMg Q5tBoJHpcsggpgSjUaOPDfU1J3kr+T0= Received: by mail-yb1-f201.google.com with SMTP id n190-20020a25dac7000000b007447d7a25e4so893086ybf.9 for ; Wed, 21 Dec 2022 22:13:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=8Le8KFegdWN7VOvwiSTZxOW/cPswDLVsipipyKMUN9w=; b=UQLFFeIhjIWZyOHbh766YF4zaDiPwecxKodmacSEW6SoeKvWLAANA2ORk1zDqAa79K Ok9LBmyTbEXE89i418xyguLDYYkncT2f1wwWoKV05PoWdQvwUndD2wK0uBTWZvEh9sd8 hhlv/sEDoaPC+62NuD7RQrTeX4CLZK2HmOj8gMHuxv+xJ6QVeB1N44ASzA3X41gRYTRL rmuP/84EeO4O+fMrTDRuoAVtmIGeakbi3lgMAltJm6UG9D9g+DIaR+vDiu1sHOTzSWjA PNhnrcqO0uf2vF2QnfpLWbv+eDs+363X/LJXaw5sYSbeRwxqQkFX2V4ToaOqWsajBynx ncHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8Le8KFegdWN7VOvwiSTZxOW/cPswDLVsipipyKMUN9w=; b=nK/jGP9Ob9B/ZGWiXnqo5tsnaqyrAaFwYba2qeY3YXgsVp4MdtGBn5hc/UKqoMT+/X YJY2DCNyN8ZVdZYYyzUDzViO5tUGvLGx2JpVqZusKwLlgnnYMXt9D0xCdD86hU0lpnxD ZNAhaolfjmp6SrpKmjx3TeGK5EP9AK52VuJuqmxN4cM16qleHvmm6b0G0XlY1jCbhLzi 4JpHCyXRFZinZ1J5waKFcxhMM+VpelCSY/54tJFb6op7VhEQOphe3tBxEoaC/84b7jv/ NlQgs+chwrpPdvAU4YO8JDYZuHDNMqFuCgSxMBesKpzi2z7UST1Z4iZwyoBUCg7M5hCY xNtw== X-Gm-Message-State: AFqh2krEU8F8bkwEBcS3p/OzZT/gg3wP0KWKCFLCqnmMv8aUgXEVUQyd 6PF6lzsr/+yIfAeAy7kGYDoSr8pyMl13 X-Google-Smtp-Source: AMrXdXvo10X0PFc2i3O8+Mk/Q8RYfTFg9phEaoUQQml0p7MG1zUyhZMLdGFJTtVyrfp5cgswcUNMDQJhNvUX X-Received: from yuanchu.svl.corp.google.com ([2620:15c:2d4:203:bd6e:5c67:5831:adad]) (user=yuanchu job=sendgmr) by 2002:a25:5144:0:b0:753:4db:6fcc with SMTP id f65-20020a255144000000b0075304db6fccmr471923ybb.1.1671689631358; Wed, 21 Dec 2022 22:13:51 -0800 (PST) Date: Wed, 21 Dec 2022 22:13:40 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221222061341.381903-1-yuanchu@google.com> Subject: [PATCH 1/2] mm: add vma_has_locality() From: Yuanchu Xie To: Ivan Babrou , Johannes Weiner , Yu Zhao Cc: Alexander Viro , Andrew Morton , Steven Barrett , Brian Geffon , Oleksandr Natalenko , Suren Baghdasaryan , Arnd Bergmann , Peter Xu , Hugh Dickins , Gaosheng Cui , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yuanchu Xie Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: uuhtqrafaqap59x6ghumc6cq5xt4ny8c X-Rspam-User: X-Rspamd-Queue-Id: 685964000B X-Rspamd-Server: rspam06 X-HE-Tag: 1671689632-136834 X-HE-Meta: U2FsdGVkX1/SE8qujsJJjJi75W79sniENoX+DIQs7sLvD0iqzp7QGMm1mXNU/8aWwhAPcUEkrYMuqYdU2JOLND5N1NjPCtFedFGReJ2pk2pAwaO2oDK5YB1jD6n4M7LZpApxu634ZTTzKOxKWUiktja1Fvm1qupkcKuODnpf/HP+DiNB/jxQyOx5BVuNU/FUaxGWqVkGZ/9OSSkGy8p9/0Swshss2EGavB9/8wTdll2TaeAPloky7X+3fNoIwlFYG1+Y9+wfNCTAwo1fLADXFp9QSlm71VLEOmHorNZp9cfMOk7UIcQ+VAjWCncsRY3domp3AX4FLerkzIITbnGgY/WxvCLrlk9TTaMn6B51TUFKY//lBPtLQxYi5XdPktEUnyS1IAlT9oxVGn5d7R9SJ79Hjdz8bnvKL11JlJ7bQkWcQ8yUDDUASyWoBxAysM7yxWduZoJ1G4a0qD7IKlqgr1A/RgxH3SP9vDW4aoYb20Fbj3TA+Y0jdvG4UTSwntBsG4FQn5zamlwsAtJ36IeYs3ln/M6wCGBLFJ3FfmmS7b3JoWtRurIoagwmBHXLOBqWJ1gK0SD+hTM1dpXeqjY1ZHwRUwxFnX9LRkBxxvyUxpk0cw2+kInVSvyBYsjCWjXEierKP4y2n9+/gAlq5hv1thN1Ck7jPxBVKBnemAfDhFgzx6AiQhWaVImizDPlD+yjvybN9uVsC3FW3AilOgm/19EZfLJgRabfG1a4JkiSjgESNchBMaCfu6M4k8i8kMbNQi2qMyyvmAW7Of4GXAzf996qC3cp95mqI3qTUYITFutyBR0ZPNFS82FrkO5dFIXlJMu45aRgr4nbKyaDc+k5CAiDhGD+hKRLfx3A3wLfbyhq2a1H3j515rGWvnsGsowPU8Y23eWMTLfXneXABrDlKrUK7BXtTdHrxOMJlEaF/MuUaXoqbouWWDnPLqVblv2xaph5HSoLViTyLaWQ7Yx w4ksLOL9 yTZFS4tI/WOoYoTQr3OtOyBjqEY0qXobvG3kVQDoZbRVEjGhhrxgmig0dU82XjKdcDUDtbLMxEVY2meOZJ5uHtM5lTpAgFqbijSfZ2e96rKciVVkDJJ9ItE0qV8rBgEjUB6cNvj7oSdsUULR74IYgbaFaMBn6yY2ZFwiizGi7gBfq5JPMaSoFWWZDt6fbxprkL/GSd3GNU9Ff7i4fG3UqOTokWXFhAyNS75Zk89BEiDCQPdzgEmK0Qs4w9XHobPBZwjeZNkdjr7zB1tUnrFC2dvjViHdJFPwvbskaMa5Zl1/1QgMwunfWAK36EVJE4YB62co03BiOecrxUYFD0aY7dlT+GaiMTU9tal0O9Nh/ShmttlJk8L6may20tOGPW43ZiMVqscx+HCBpjolrBZVdtb4fkLeSJow5FlqYJxZ5tV/W45E= 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: Yu Zhao Currently in vm_flags in vm_area_struct, both VM_SEQ_READ and VM_RAND_READ indicate a lack of locality in accesses to the vma. Some places that check for locality are missing one of them. We add vma_has_locality to replace the existing locality checks for clarity. Signed-off-by: Yu Zhao Signed-off-by: Yuanchu Xie --- include/linux/mm_inline.h | 8 ++++++++ mm/memory.c | 7 +++---- mm/rmap.c | 42 +++++++++++++++++---------------------- mm/vmscan.c | 5 ++++- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index e8ed225d8f7c..80c0f6901ead 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -578,4 +578,12 @@ pte_install_uffd_wp_if_needed(struct vm_area_struct *vma, unsigned long addr, #endif } +static inline bool vma_has_locality(struct vm_area_struct *vma) +{ + if (vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ)) + return false; + + return true; +} + #endif diff --git a/mm/memory.c b/mm/memory.c index 4000e9f017e0..a3f60e53f348 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1402,8 +1402,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, force_flush = 1; } } - if (pte_young(ptent) && - likely(!(vma->vm_flags & VM_SEQ_READ))) + if (pte_young(ptent) && likely(vma_has_locality(vma))) mark_page_accessed(page); } rss[mm_counter(page)]--; @@ -5148,8 +5147,8 @@ static inline void mm_account_fault(struct pt_regs *regs, #ifdef CONFIG_LRU_GEN static void lru_gen_enter_fault(struct vm_area_struct *vma) { - /* the LRU algorithm doesn't apply to sequential or random reads */ - current->in_lru_fault = !(vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ)); + /* the LRU algorithm only applies to accesses with locality */ + current->in_lru_fault = vma_has_locality(vma); } static void lru_gen_exit_fault(void) diff --git a/mm/rmap.c b/mm/rmap.c index 32e48b1c5847..a2e83fea6fed 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -823,25 +823,14 @@ static bool folio_referenced_one(struct folio *folio, } if (pvmw.pte) { - if (lru_gen_enabled() && pte_young(*pvmw.pte) && - !(vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ))) { + if (lru_gen_enabled() && pte_young(*pvmw.pte)) { lru_gen_look_around(&pvmw); referenced++; } if (ptep_clear_flush_young_notify(vma, address, - pvmw.pte)) { - /* - * Don't treat a reference through - * a sequentially read mapping as such. - * If the folio has been used in another mapping, - * we will catch it; if this other mapping is - * already gone, the unmap path will have set - * the referenced flag or activated the folio. - */ - if (likely(!(vma->vm_flags & VM_SEQ_READ))) - referenced++; - } + pvmw.pte)) + referenced++; } else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { if (pmdp_clear_flush_young_notify(vma, address, pvmw.pmd)) @@ -875,7 +864,20 @@ static bool invalid_folio_referenced_vma(struct vm_area_struct *vma, void *arg) struct folio_referenced_arg *pra = arg; struct mem_cgroup *memcg = pra->memcg; - if (!mm_match_cgroup(vma->vm_mm, memcg)) + /* + * Ignore references from this mapping if it has no locality. If the + * folio has been used in another mapping, we will catch it; if this + * other mapping is already gone, the unmap path will have set the + * referenced flag or activated the folio in zap_pte_range(). + */ + if (!vma_has_locality(vma)) + return true; + + /* + * If we are reclaiming on behalf of a cgroup, skip counting on behalf + * of references from different cgroups + */ + if (memcg && !mm_match_cgroup(vma->vm_mm, memcg)) return true; return false; @@ -906,6 +908,7 @@ int folio_referenced(struct folio *folio, int is_locked, .arg = (void *)&pra, .anon_lock = folio_lock_anon_vma_read, .try_lock = true, + .invalid_vma = invalid_folio_referenced_vma, }; *vm_flags = 0; @@ -921,15 +924,6 @@ int folio_referenced(struct folio *folio, int is_locked, return 1; } - /* - * If we are reclaiming on behalf of a cgroup, skip - * counting on behalf of references from different - * cgroups - */ - if (memcg) { - rwc.invalid_vma = invalid_folio_referenced_vma; - } - rmap_walk(folio, &rwc); *vm_flags = pra.vm_flags; diff --git a/mm/vmscan.c b/mm/vmscan.c index e83d2a74e942..5cf39f314876 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3782,7 +3782,10 @@ static int should_skip_vma(unsigned long start, unsigned long end, struct mm_wal if (is_vm_hugetlb_page(vma)) return true; - if (vma->vm_flags & (VM_LOCKED | VM_SPECIAL | VM_SEQ_READ | VM_RAND_READ)) + if (!vma_has_locality(vma)) + return true; + + if (vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) return true; if (vma == get_gate_vma(vma->vm_mm)) -- 2.39.0.314.g84b9a713c41-goog