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 18D33C3DA79 for ; Mon, 26 Dec 2022 08:44:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 840AF940009; Mon, 26 Dec 2022 03:44:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CAC4940008; Mon, 26 Dec 2022 03:44:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F591940009; Mon, 26 Dec 2022 03:44:35 -0500 (EST) 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 512F4940008 for ; Mon, 26 Dec 2022 03:44:35 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2A042C05FA for ; Mon, 26 Dec 2022 08:44:35 +0000 (UTC) X-FDA: 80283821310.28.8BAB926 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by imf01.hostedemail.com (Postfix) with ESMTP id 82C7940006 for ; Mon, 26 Dec 2022 08:44:33 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=FgkDWhxX; spf=pass (imf01.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672044273; 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=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=jN8lnvDGZAqf4HhPDgUo2ozBAB7H/RSKCPkcsirTn8il4rk8zEaP+/+K+1eYa0X7XOroxJ 1QRTCmK1eASxAYjWiuA8DfucMiEe+kkx44luJ9drNMS96memMdP1Fa0v1Imsbf6rTO+bZa pzwBpONo3nB6GB5ib65yFNQWGqWiILE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=FgkDWhxX; spf=pass (imf01.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672044273; a=rsa-sha256; cv=none; b=7tZbiBuX0IqHehTFvm4mht1CPITnNkn/UtP0kzdHYAPdcx8wcQNxC6hTyNc9iAxTmK3bs9 E3y4bicJyVUhXydftjpTV6vorEiPVClFvTW89dqeZN+7Z72RDuezrrrpSyPTvA+fiyspYY UxVJsrZouUdPH5Y5OiLZUZOx9MEMSN4= Received: by mail-wr1-f42.google.com with SMTP id j17so4203307wrr.7 for ; Mon, 26 Dec 2022 00:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=FgkDWhxXChE2Ah6CAPAdtfnpZw2aUSmE9f8oFWA0FnR8ofTYUM1SDtwnT6VuCIBVNy PTMlbo4WkY0LpvkaVci/gogKcodFLwGQNAvF56lh2J0b6k/o+RGBIBtOFfVGggfA1tyh d6DG7FBQqIBKSoQY6KL3aKyVUq+3UAFwt8v/NevHvrNlJ4hsTj8jX1FiT3vdO/uj7SeO NYvf3X2VK5jEswRAfscG5X/I6pmd+e9ifMdsTrRNKKWzyCQ90hufV3nfffCgjuidGU3Y qMnOxEPFJ6f95vhqsj/XUwM+7uaOP5SYhs/t5uz40SFCHEBAneKTY22D/Z22mFN+P917 Am8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=GFAmqpWqIcdjWIk5KPsJAKAsPjLpZ8L3DQFQVXCtx2IG4xSSv4HcY20DGBhY5MRRTw L6+b9U090fN0wuuRdW80uBWo33b7OcVSi7k5t/gwx11YGQ4TahWdA/eUVJSAiuX1LISI /D7bTsFY+qTuT0kStMCJKmt3fVA7jsh3CPkUjHtjSwaWHI4HcUdyT9p2tQJjJATWunGV 4SNGpzciii/fvQBbE/FF0rAdf5ggHBuvFrZgkbQ3xiCgCbGyzpwTHmHv1PE4iSC9PkIA L6ALDPuFesSbJKiQ92otvumYb5q9YSaFNaacdt9NqTklPpApi7dKA/EApWC1EsTYxncQ HkWQ== X-Gm-Message-State: AFqh2kqAMBX2bupzsUK8uDmNC55i9CacJrpvIBD17lfRtnZOLKtipTFC AYpVO2qibKeXImlQ/moEJO8xuyzref0= X-Google-Smtp-Source: AMrXdXslUa0w4r+uVtAIHdIox5/CO/jCEnlpT1uvf+NMtbH+3xN1khmtIZti8q1jPLjsins5m6+Olw== X-Received: by 2002:adf:e5ce:0:b0:27e:520f:1093 with SMTP id a14-20020adfe5ce000000b0027e520f1093mr1282397wrn.37.1672044272478; Mon, 26 Dec 2022 00:44:32 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id m16-20020adffe50000000b00241bd7a7165sm10593253wrs.82.2022.12.26.00.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 00:44:31 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Geert Uytterhoeven , Lorenzo Stoakes Subject: [PATCH v3 4/5] mm: mlock: update the interface to use folios Date: Mon, 26 Dec 2022 08:44:22 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 82C7940006 X-Stat-Signature: k87cdk9mq4jwxx85diumhrgge7u89i3e X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672044273-523122 X-HE-Meta: U2FsdGVkX1+klQ3ym6EdBsrpWvqTDonlqGATI1BZ6iTdv9mlJt5NVN+iLXlEZnJFVH/cW0dcjTALMKHuVPCgz5iuSVe7SzSFxP4v16BACySoZmtrIwlAwXWS6G6xKLwSx0UWzTh8K9yJHS66DpEpal+D4CXlFgTfXgonMEcA6kSXkcddtYa5JxzINUecN+lbzIFf6R6Js1OUD5mnEaG5FX0cnV57DOEt5QDSHqT4GocO8TmRMB4kqHXnQMDlfubEhFBEpvOGRuFDdBoZvw41P7/JfX1TjNTqcVtHHOT1W2hGuN/f2pUKXzJNwakfA9XCLwfwTWjf6zXGBguvQrXl5H0+2E+CFSoiJcmNKMsXc/KW9nqcE0+eyUQGyQtHj1F3IOWWgutNjLThyDM/G1iFRvxkY9Mnp2eoHgvGuoExy2VXHvnftpM/Ot7OPHs9f9wuMXcc6EvsdY3/EhJrFXMadwoNDhUCCYtX1w3rVnLQKDFxxkD1nAEyi/7bG0aOB8D2BNmVwQawFXYsvcoz9fb3B0cBavD+Ls40+M+2Y1QTUDt/gDhM1S5L6BNoD6PM0z0hy1n7A5VcLzrPHSkMnB2PI7PNzRWick+zy4gNtHzFhMwNHrhkWJKjbVS3r1EZOBgETQEo7BWMWjonJgUF/f59rvQVJE7+nRb99bIZRrBg5Gv8+GuJuS8u5bSStVllJ0LqQ6BVcDyzhkUyFNaGYF0SyDSM0EHJC5j9rXgdxpAVTjvjiGysVk28VMc+iSOH7/ahLXVZcFlWhB4qStSr3qoqgVDIg7I6/cS5ZVjbxdDTMieRakkk0FHeRpilEwSFux8IXz7w6jVR5uP1RPy0XmSSCZI4HPLVNQZWySs7ObyUkhyO1N/eUD0eOWspsFc52BId1SFL7ICguW/0jST4+/EW49CX9oOkTIZUz0aQXE//SUTDmBT4Rb7eAZYVhkxWhYywQdKBmZEZtHBUjs37M9K Z++2QMxX vP081IJgkJctmSWBp3hXQPuzCMVVd9tODMSZhc1l42LezvtOG5MHYF6uQVtZYZ8+4hq1u9m3xiCezwhmfAddLXefX22DKUEvMCcZnrUqWBzyv+JgpeV5+LWpjP7fcPBAARvrk 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: This patch updates the mlock interface to accept folios rather than pages, bringing the interface in line with the internal implementation. munlock_vma_page() still requires a page_folio() conversion, however this is consistent with the existent mlock_vma_page() implementation and a product of rmap still dealing in pages rather than folios. Signed-off-by: Lorenzo Stoakes --- mm/internal.h | 26 ++++++++++++++++---------- mm/mlock.c | 32 +++++++++++++++----------------- mm/swap.c | 2 +- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 1d6f4e168510..8a6e83315369 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -515,10 +515,9 @@ extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, * should be called with vma's mmap_lock held for read or write, * under page table lock for the pte/pmd being added or removed. * - * mlock is usually called at the end of page_add_*_rmap(), - * munlock at the end of page_remove_rmap(); but new anon - * pages are managed by lru_cache_add_inactive_or_unevictable() - * calling mlock_new_page(). + * mlock is usually called at the end of page_add_*_rmap(), munlock at + * the end of page_remove_rmap(); but new anon folios are managed by + * folio_add_lru_vma() calling mlock_new_folio(). * * @compound is used to include pmd mappings of THPs, but filter out * pte mappings of THPs, which cannot be consistently counted: a pte @@ -547,15 +546,22 @@ static inline void mlock_vma_page(struct page *page, mlock_vma_folio(page_folio(page), vma, compound); } -void munlock_page(struct page *page); -static inline void munlock_vma_page(struct page *page, +void munlock_folio(struct folio *folio); + +static inline void munlock_vma_folio(struct folio *folio, struct vm_area_struct *vma, bool compound) { if (unlikely(vma->vm_flags & VM_LOCKED) && - (compound || !PageTransCompound(page))) - munlock_page(page); + (compound || !folio_test_large(folio))) + munlock_folio(folio); +} + +static inline void munlock_vma_page(struct page *page, + struct vm_area_struct *vma, bool compound) +{ + munlock_vma_folio(page_folio(page), vma, compound); } -void mlock_new_page(struct page *page); +void mlock_new_folio(struct folio *folio); bool need_mlock_page_drain(int cpu); void mlock_page_drain_local(void); void mlock_page_drain_remote(int cpu); @@ -647,7 +653,7 @@ static inline void mlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } static inline void munlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } -static inline void mlock_new_page(struct page *page) { } +static inline void mlock_new_folio(struct folio *folio) { } static inline bool need_mlock_page_drain(int cpu) { return false; } static inline void mlock_page_drain_local(void) { } static inline void mlock_page_drain_remote(int cpu) { } diff --git a/mm/mlock.c b/mm/mlock.c index e9ba47fe67ed..3982ef4d1632 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -262,13 +262,12 @@ void mlock_folio(struct folio *folio) } /** - * mlock_new_page - mlock a newly allocated page not yet on LRU - * @page: page to be mlocked, either a normal page or a THP head. + * mlock_new_folio - mlock a newly allocated folio not yet on LRU + * @folio: folio to be mlocked, either normal or a THP head. */ -void mlock_new_page(struct page *page) +void mlock_new_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio = page_folio(page); int nr_pages = folio_nr_pages(folio); local_lock(&mlock_fbatch.lock); @@ -286,13 +285,12 @@ void mlock_new_page(struct page *page) } /** - * munlock_page - munlock a page - * @page: page to be munlocked, either a normal page or a THP head. + * munlock_folio - munlock a folio + * @folio: folio to be munlocked, either normal or a THP head. */ -void munlock_page(struct page *page) +void munlock_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio = page_folio(page); local_lock(&mlock_fbatch.lock); fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); @@ -314,7 +312,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, struct vm_area_struct *vma = walk->vma; spinlock_t *ptl; pte_t *start_pte, *pte; - struct page *page; + struct folio *folio; ptl = pmd_trans_huge_lock(pmd, vma); if (ptl) { @@ -322,11 +320,11 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, goto out; if (is_huge_zero_pmd(*pmd)) goto out; - page = pmd_page(*pmd); + folio = page_folio(pmd_page(*pmd)); if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); goto out; } @@ -334,15 +332,15 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, for (pte = start_pte; addr != end; pte++, addr += PAGE_SIZE) { if (!pte_present(*pte)) continue; - page = vm_normal_page(vma, addr, *pte); - if (!page || is_zone_device_page(page)) + folio = vm_normal_folio(vma, addr, *pte); + if (!folio || folio_is_zone_device(folio)) continue; - if (PageTransCompound(page)) + if (folio_test_large(folio)) continue; if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); } pte_unmap(start_pte); out: diff --git a/mm/swap.c b/mm/swap.c index e54e2a252e27..7df297b143f9 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -562,7 +562,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); if (unlikely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) == VM_LOCKED)) - mlock_new_page(&folio->page); + mlock_new_folio(folio); else folio_add_lru(folio); } -- 2.39.0