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 10675ECAAD5 for ; Fri, 2 Sep 2022 19:48:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26734800FF; Fri, 2 Sep 2022 15:47:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A937D80117; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E0F9800FF; Fri, 2 Sep 2022 15:47:07 -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 5237F80113 for ; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 28CB8403C9 for ; Fri, 2 Sep 2022 19:47:05 +0000 (UTC) X-FDA: 79868178810.31.5B6E8CB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id AE096140064 for ; Fri, 2 Sep 2022 19:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=eQz2L5Sd+WJhCeFxF2qMEcGTWQTSZ58GjI77k+ag9os=; b=mjOhpv6Go0YRvlYId1vfhit+KW HgsTHobw/0hgzgnon7wvXjCVpNNNf541CB1r0sZg5cl2wizUDZn+dxf9qW5komXYDKz3LC5rIS1rX 6qKDn3b3SrwKgc4aL1oeQJr+V0xNghqcgCwtZXHQjMw8iNDYcSmyAuZACMCDTFo5H8sysYV0KyvWY +JJpBV/bB/okb2y6c0z24zHMbUpP7WDfaicvIs6tiX1qN/X5nvG8sU9+yALeT9sYA8Byy3ZM9yTKp P28Jefww4teCzdIGL9nf2qYRRpBIiHn8i5JljdeX9l5pxFtOPxb1jCawFET4QOxmZTxEA7GOuP2EX c06/JOuQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd0-007Ibl-AQ; Fri, 02 Sep 2022 19:46:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 05/57] mm: Add folio_add_lru_vma() Date: Fri, 2 Sep 2022 20:46:01 +0100 Message-Id: <20220902194653.1739778-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148024; a=rsa-sha256; cv=none; b=gMLK3Uyt7CjhFkNKgEPYlCMnfXdeCb/gxgEsNqgwZh2K90CKN3pN6r8ZIgiKrXGYkB2Zhl aCFLOD23KluZL2AKv25388mL/ZpH+5TgC24OfuEkfW4vUIw+GOdfY92Osim3MFfc0sYOxS HvaiYmnHGkNeA/Y0FhVHISUHY1KqNIg= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mjOhpv6G; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148024; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eQz2L5Sd+WJhCeFxF2qMEcGTWQTSZ58GjI77k+ag9os=; b=LnfdZrlBkWLmhlA820zAjfduILy+z/kekLfbIqwT0W0QCg1eLEL/i+VXvLIuKWrPw3hzf+ jdHjAADijGewTh6Vmc8YtNp+Pa35iAraVRP3qNs8yg28Rc3M5dVRaiUf4wUIoMhc9CNFc3 ggS5TI4EY4k2+A5fMM23DRhGOCvxaPo= X-Stat-Signature: uxo8c48zkibumxwhf75s6cjjmee46qkk X-Rspamd-Queue-Id: AE096140064 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mjOhpv6G; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1662148024-499517 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: Convert lru_cache_add_inactive_or_unevictable() to folio_add_lru_vma() and add a compatibility wrapper. --- include/linux/swap.h | 10 +++++----- mm/folio-compat.c | 6 ++++++ mm/swap.c | 19 +++++++++---------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 43150b9bbc5c..333d5588dc2d 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -375,11 +375,11 @@ extern unsigned long totalreserve_pages; /* linux/mm/swap.c */ -extern void lru_note_cost(struct lruvec *lruvec, bool file, - unsigned int nr_pages); -extern void lru_note_cost_folio(struct folio *); -extern void folio_add_lru(struct folio *); -extern void lru_cache_add(struct page *); +void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages); +void lru_note_cost_folio(struct folio *); +void folio_add_lru(struct folio *); +void folio_add_lru_vma(struct folio *, struct vm_area_struct *); +void lru_cache_add(struct page *); void mark_page_accessed(struct page *); void folio_mark_accessed(struct folio *); diff --git a/mm/folio-compat.c b/mm/folio-compat.c index 458618c7302c..e1e23b4947d7 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -88,6 +88,12 @@ void lru_cache_add(struct page *page) } EXPORT_SYMBOL(lru_cache_add); +void lru_cache_add_inactive_or_unevictable(struct page *page, + struct vm_area_struct *vma) +{ + folio_add_lru_vma(page_folio(page), vma); +} + int add_to_page_cache_lru(struct page *page, struct address_space *mapping, pgoff_t index, gfp_t gfp) { diff --git a/mm/swap.c b/mm/swap.c index 9cee7f6a3809..6525011b715e 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -493,22 +493,21 @@ void folio_add_lru(struct folio *folio) EXPORT_SYMBOL(folio_add_lru); /** - * lru_cache_add_inactive_or_unevictable - * @page: the page to be added to LRU - * @vma: vma in which page is mapped for determining reclaimability + * folio_add_lru_vma() - Add a folio to the appropate LRU list for this VMA. + * @folio: The folio to be added to the LRU. + * @vma: VMA in which the folio is mapped. * - * Place @page on the inactive or unevictable LRU list, depending on its - * evictability. + * If the VMA is mlocked, @folio is added to the unevictable list. + * Otherwise, it is treated the same way as folio_add_lru(). */ -void lru_cache_add_inactive_or_unevictable(struct page *page, - struct vm_area_struct *vma) +void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) { - VM_BUG_ON_PAGE(PageLRU(page), page); + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); if (unlikely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) == VM_LOCKED)) - mlock_new_page(page); + mlock_new_page(&folio->page); else - lru_cache_add(page); + folio_add_lru(folio); } /* -- 2.35.1