From patchwork Thu Dec 22 06:13:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 35625 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp161247wrn; Wed, 21 Dec 2022 22:16:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXvF85+aE0W2lqJzXxiJy4cDKLWqC4DIQ1f/e8Y6h+PfP1GQpUryuXXIixr8TZN9K1EadKpt X-Received: by 2002:aa7:db8d:0:b0:45c:835c:3679 with SMTP id u13-20020aa7db8d000000b0045c835c3679mr3766037edt.2.1671689779998; Wed, 21 Dec 2022 22:16:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671689779; cv=none; d=google.com; s=arc-20160816; b=RBDt/G+ooIoma/wJCa4DTmsAynuCBBJ8QSDWyFGeHUv7LR+y17owpeQGm8NT6qFLGV 24zxr+Rcxc+bTS9GJ84KIun0xolqde5X0McPMvonM/aw7sFxNr93ATFTZdN6CwEuaSaO 5IHGnaG751T28OyCKecxIawyBTkSPbYV4443wK/PSXqVX6ECyK+6mpesEegbhF4K83oT eOy6waxvJOmiKmm91LKVAJSYUIPxZkF39y0zvOy+LZPg/kUGjcbWE93H3swL/PFpmUYy AYCxoplRicvdRrVI2bMJhQV23ZP3xMdMaaWHi0sXv37+sODOMDIzneEh0vOxz/fk0B72 FS+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=8Le8KFegdWN7VOvwiSTZxOW/cPswDLVsipipyKMUN9w=; b=vdMH831Hglf3mQMYxA8hFwa0PI2CVpVuLIaVXZcCgYiL5ayqKgbhZBG6jj1SXV/pRb Hc2xEJHbxrqLrpDlCAVTEFdqRBPVz1Zfg5Ew2eXGkucetGAmc7sCg8Kx71Z67QKP0vkl SHcH1ZZTbS2bC/jZ92nG4drf6QkpVsbBFGkweb5GGEMvdrLOXf9eZ2JOWADZ4IMxMvZz 6ChTaj+cRzm+0bh1ZoF3Za0UaleDnKM60XSeX2Pi2NjzdEuvikaIGhiuve4ANgt1JAvl +ejc/LYH9PDhcYBgtlGmN+TYvfoK675ZVEMAoA+lpIV3YWqsX5yOC7ssDzXtlcOuqUqG 7Rvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UQLFFeIh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020a056402279100b0046ffa579ca5si17633821ede.407.2022.12.21.22.15.56; Wed, 21 Dec 2022 22:16:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UQLFFeIh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229620AbiLVGNz (ORCPT + 99 others); Thu, 22 Dec 2022 01:13:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbiLVGNx (ORCPT ); Thu, 22 Dec 2022 01:13:53 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 296871A3BB for ; Wed, 21 Dec 2022 22:13:52 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id u17-20020a25f811000000b007647eca7d01so350549ybd.14 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=vpYy5qVp+a3RbE/2D3zA0ltf2zf+5X30C6c9yl0edptShGSxuzECtxWPufZ32rX05Y LSxGOIiHEo4ngH+wIEhNJTWcmb+TvOiMiH8caZW32LG6PCywV1N69QPdRlfUlXBOYyT6 +/vEBucuUbsYjm0rK/m0kf/W7dIhDmozyp6ztEXAWGUDdHaltHQUikDIqYR3bnU0MtMk P7iZvCRtr4FeZtJz/BxSZr+ARUuNhXN1l8f/q+Nef82ykr4x2cndDfzOuIMCCvZyCWbu ZDN7ndG5gK6mGo269oFSkM/GOaeRs6sjfpZ6tr7JRBOy4nOxLSjJ+/TGVsPzwgE+fa3/ qSBQ== X-Gm-Message-State: AFqh2krRJ7Qx772D7OGi0Jfs/BL0LRfBD2rTgCU/VTRe8kzqrKXsWydI gj/FaKmsM9tufw1w8dqD7YstSK8O1FdC 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752893782868733823?= X-GMAIL-MSGID: =?utf-8?q?1752893782868733823?= 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 Acked-by: Johannes Weiner --- 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)) From patchwork Thu Dec 22 06:13:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 35626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp161729wrn; Wed, 21 Dec 2022 22:17:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXt7Asnw2kd236V735Pthox2E3hIJUBd+zEE0u5zIgW2DK97sKfIJ6m9epD4icGD7gjTNbE9 X-Received: by 2002:a17:907:bb85:b0:78d:f455:311d with SMTP id xo5-20020a170907bb8500b0078df455311dmr3631524ejc.69.1671689865508; Wed, 21 Dec 2022 22:17:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671689865; cv=none; d=google.com; s=arc-20160816; b=Sqc+5rMhz2Ag6dEXB1V59fCAXPLX0Vi5UuP2BBLptUt8+E1vDrtWTgWLURLQvXIYpB bLCYnN9kjzqnDNYe2Wqr4K+dujiqNL2uJ1lDOu5v59/y00XhhEf5c15WMO3kBVHPXRTv yRakt3E8BhDlddddTWhS6ZVK9uqO4CVbkmXdIVl2VEDQgUVqv5ViX8DonJkjsZF8qVeV LUbdR5YnkOOhWBo+mFmt4Od6fY+ndyEroE5JqjAC1c3O4LXoBcHO/S1DRigNN8Mrq8Dx Gg9iI32lE/rdDinWXRhC3FoZT+EBixtMEJdOQicQE5U208/65w5SKjjqT0WrlZseIApJ MtoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=sXO+2cqQ2jD3iajPKrzJ7z5yUSuuXzzA/96bixg+F2U=; b=M7JxEjMIXhL2ivddWlt0z6VgzfWkbyk0m8dOKglsM3daompBqUqX4dzXwMpxIjapKo 9s60OGtvf5PpwoYq2tqycnF0ccShO8sbd0LKYarM/2P0qVgSw4zO8Gu6wEaAhTl/Sq5g YXkq5UAsH41ojlzED30EB/44IWc/LzwYcE5lQyGbs5RWN8+LqusUJj3MDEZNLCp62y6i 1uXa49mt2xFqal4uqUZFEuItJQQIIDBkQtvKVWn3/XHgpjP8/Y44OmOnuAqvC8BjTGYp nkyRZEHRpOLLRMBdzJZzxkFxoGIr92GvRbUwPOUa0pLgpKxVaTt23PEFhXfVyeEgY2H5 JaIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=RBzamxSf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne34-20020a1709077ba200b00817f698091csi1322590ejc.301.2022.12.21.22.17.22; Wed, 21 Dec 2022 22:17:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=RBzamxSf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235084AbiLVGOE (ORCPT + 99 others); Thu, 22 Dec 2022 01:14:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235054AbiLVGN5 (ORCPT ); Thu, 22 Dec 2022 01:13:57 -0500 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 13C6F1AF24 for ; Wed, 21 Dec 2022 22:13:56 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-3bd1ff8fadfso11243027b3.18 for ; Wed, 21 Dec 2022 22:13:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sXO+2cqQ2jD3iajPKrzJ7z5yUSuuXzzA/96bixg+F2U=; b=RBzamxSflqz2dnljq8hzGh3K+g7vkV1vpSKFgX6w0JKOg9dUn+Y/WaXJu3DhtVpjuo ALtRZuX1WGVCUNKcpQ3ANWhiGUz73vxYXlmH6StTQnmI8CrYeQDhkLQrIhhy4L47n2hZ X4GN5QLqu301t7NXd8ZZpuBpYYhdqKGubvs5RiZsiQomDETrdTXahMnqZnQFGRqYlgNu im+/kRLg+lX53aiiY4oJwMmfNcEVi2vRTWLGHxJsAwH1UG3k0W10/QMGtsfXREIzH0wH htZIoSXJwK1BlJe4S7NeMCg4ED/HaIuuROna1LPz5R7n+77MkBDwjj6lUVA4LWn//7xl EAbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sXO+2cqQ2jD3iajPKrzJ7z5yUSuuXzzA/96bixg+F2U=; b=Za/GqQrQV8t9kJmbf3k0bcFSkucovq3E8B1DHgjsHDiEqUwwC3RxflbdzgrnpBrINy TGYrmCaKUM9V4iRC9EVJH+UbQxae+iOq6JLc3Z/uiSuaQAnMfn6ZYPsb14a7L+41620V nJg9DavF7bfyNE6bbnTXO8vdJNYP3x94WLeIOqZfGMc2/w+HU5J7914fwTOuSuCO+SWq Q7mlHPwPoO0gnLDgUdinVJFZ3/9TsVm89s/YtfGBmBKI5RR4lZ7nDK6Gp5bi+Okg3pi1 qO1tRVJH5AyjYxxKg1+fBU3LynbCm3zhxoQ7+/8CM7OQpKy9SKNtSRwRSt86Xkv3qowe GcqQ== X-Gm-Message-State: AFqh2kps7UOWEp8fEnt7rlZyZlm/CETpoiA0mdmvsySB4EnbdpuvPNni yG7B9nc0Qsa0kKPaYQN5Lie3WjEk6qZ7 X-Received: from yuanchu.svl.corp.google.com ([2620:15c:2d4:203:bd6e:5c67:5831:adad]) (user=yuanchu job=sendgmr) by 2002:a25:6d56:0:b0:6fa:c7e7:a572 with SMTP id i83-20020a256d56000000b006fac7e7a572mr479654ybc.456.1671689635274; Wed, 21 Dec 2022 22:13:55 -0800 (PST) Date: Wed, 21 Dec 2022 22:13:41 -0800 In-Reply-To: <20221222061341.381903-1-yuanchu@google.com> Mime-Version: 1.0 References: <20221222061341.381903-1-yuanchu@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221222061341.381903-2-yuanchu@google.com> Subject: [PATCH 2/2] mm: support POSIX_FADV_NOREUSE for generic fadvise handler 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752893872348846108?= X-GMAIL-MSGID: =?utf-8?q?1752893872348846108?= From: Yu Zhao POSIX_FADV_NOREUSE allows an application to specify that accesses to file data does not follow LRU and is used only once. Since 2.6.18 this is a no-op. We add FMODE_NOREUSE, checked in vma_has_locality to prevent LRU activation. Signed-off-by: Yu Zhao Signed-off-by: Yuanchu Xie --- include/linux/fs.h | 2 ++ include/linux/mm_inline.h | 3 +++ mm/fadvise.c | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 066555ad1bf8..5660ed0edf1a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -166,6 +166,8 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File supports DIRECT IO */ #define FMODE_CAN_ODIRECT ((__force fmode_t)0x400000) +#define FMODE_NOREUSE ((__force fmode_t)0x800000) + /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x4000000) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 80c0f6901ead..024f834d952d 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -583,6 +583,9 @@ static inline bool vma_has_locality(struct vm_area_struct *vma) if (vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ)) return false; + if (vma->vm_file && (vma->vm_file->f_mode & FMODE_NOREUSE)) + return false; + return true; } diff --git a/mm/fadvise.c b/mm/fadvise.c index bf04fec87f35..fb7c5f43fd2a 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -80,7 +80,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) case POSIX_FADV_NORMAL: file->f_ra.ra_pages = bdi->ra_pages; spin_lock(&file->f_lock); - file->f_mode &= ~FMODE_RANDOM; + file->f_mode &= ~(FMODE_RANDOM | FMODE_NOREUSE); spin_unlock(&file->f_lock); break; case POSIX_FADV_RANDOM: @@ -107,6 +107,9 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) force_page_cache_readahead(mapping, file, start_index, nrpages); break; case POSIX_FADV_NOREUSE: + spin_lock(&file->f_lock); + file->f_mode |= FMODE_NOREUSE; + spin_unlock(&file->f_lock); break; case POSIX_FADV_DONTNEED: __filemap_fdatawrite_range(mapping, offset, endbyte,