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 AB892C46467 for ; Mon, 26 Dec 2022 07:09:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24810940008; Mon, 26 Dec 2022 02:09:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F699940007; Mon, 26 Dec 2022 02:09:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEF92940008; Mon, 26 Dec 2022 02:09:01 -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 D8AAB940007 for ; Mon, 26 Dec 2022 02:09:01 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C2333402A4 for ; Mon, 26 Dec 2022 07:09:01 +0000 (UTC) X-FDA: 80283580482.25.6279FB2 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by imf08.hostedemail.com (Postfix) with ESMTP id 1FF59160002 for ; Mon, 26 Dec 2022 07:08:59 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ky8mj0aM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 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=1672038540; 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=PvP9A6XKAl/v1o7+nXXmkZgCax5Ofzh4VaB88gRKyTM=; b=uPk/rmL5Mbu1B+XFa35SSLU+Nwos4/8vFqJDh6f5GuBhWS3wWm+FkEpEMcQo8iDIkkdrxu 8obNZ/nSBtrJ0COpnMRZQau0u7lS3mB+2H7jWJYvVcD3MkGEGi7uwYSrFWFcvzXZWzlaT6 m11Y9a+MloqUV2hjTzyot3jYiYKHxTc= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ky8mj0aM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 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=1672038540; a=rsa-sha256; cv=none; b=PVZHrxHiHfAOIi4yGnFMR7IOLF1o3paAyAg7pmvZ97XWnzh1+D3yw+bDJ8zMPsKJwBzGRV TQG9XbEtK2Myq7wTDjWQA8DIfejRET/WCN+5LJ4u8tAaXxJOaTCqx9eeI0h5X/3A8uyVO8 sP2DrpuCfuEDuLBufNoBxc6eu7Ip/d4= Received: by mail-wm1-f53.google.com with SMTP id o15so7129590wmr.4 for ; Sun, 25 Dec 2022 23:08:59 -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=PvP9A6XKAl/v1o7+nXXmkZgCax5Ofzh4VaB88gRKyTM=; b=ky8mj0aMYqAH26amqbof509vhFcQfx/R9JD++pBJfS9LkQ5h7Ku50RfP+Qwr6uqUNV N6jemG0/tTfyufN/1FVlI2FBfR/4NQES9dCn1oBqKrt4hJDGUijI5JwJAsfPa6PZiHze 8taysu/+hfy9TDEcqWUKrxtRdn1IaAA5UBZjBgEErAA4K9QvRPdGwQ/THSI5w+g5Q28o H86M3tygigaBd1IuDGha4O5hp6AbLl0034NdnOvrY8o9ciDPToSU1t3kPp5zPgi9Nu18 7boxfKn+etohB+OD9Kz/HBTbZOmQeX/6V+/Bhvo7KUJ4VUWuzpRUDGrJk2mPHjZ61p9n +Ynw== 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=PvP9A6XKAl/v1o7+nXXmkZgCax5Ofzh4VaB88gRKyTM=; b=ug+Fyby0YjQCropFgkwshVrZC/fzS4Z9KXtlPo5YayRgaLHoz4ugG4kkHY3GV7aD0f JIXTo1MEVp7fT2rvhf03wA+B3Dy5zDqY1xasExfeTXQQCWgTirUwLGyFlW/AaQ02gNh5 CYembjSB5llbtb+RWFUuF5DW4PUyg7vUIRZ2l8DV28vatpn7VS9IOIlZ7ZF7ILjef96e vHXwEa3qGs88STdnyjdTNp9A+R7kkRJMm5LhPgAvQgUjgv6wnW1Hf7Hr0EXomAOXpHJT Gvy0twzBawwCoc7EntamFVVkhkSHVza1hQL9l0rgKDgawZby/1rIRkIS8r2LAe8V+pJB VwGg== X-Gm-Message-State: AFqh2kpic9R1pK1r+xL2jVspr7m7VkMACv13lmhXku/fXoQIXioN6HeT cz+LLhNPpKjVW4mJVwVopOBdPKQ7SX0= X-Google-Smtp-Source: AMrXdXvP/oOJeqG/K19E0NDhr+3RSqXJeDQAjARpuQZuKzrvSV8HjWUvLNnrxYVZJF148QZamrvUcg== X-Received: by 2002:a05:600c:4f55:b0:3d3:5166:2da4 with SMTP id m21-20020a05600c4f5500b003d351662da4mr12246298wmq.8.1672038538554; Sun, 25 Dec 2022 23:08:58 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id e16-20020a05600c4e5000b003c21ba7d7d6sm13191456wmq.44.2022.12.25.23.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Dec 2022 23:08:57 -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 , Lorenzo Stoakes Subject: [PATCH v2 3/4] mm: mlock: update the interface to use folios Date: Mon, 26 Dec 2022 07:08:46 +0000 Message-Id: <555c36b91c4b34a5972f2614395e3c3831e8102f.1672038314.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1FF59160002 X-Stat-Signature: 1qcehux8jcad8g6g5cxt7ynojpsse39j X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672038539-578366 X-HE-Meta: U2FsdGVkX1+nGqbc5isNL901dXEB9y8WyNdInlZrC81SHoL8khDAYGrQ4MDanvNkg7EUCXJdVTShe8FX2KKMxQtJ1X+UwaPhGg10gaVeeh6yUEHSRDFM+KIR2V0gt0O26EsRIPuAhMayFecVtvt3DyiT9HsRJUEVFi7ybvZlj+O/Tbaa23liOX5zaSJoS+KKaGwOBKafN/rIDa0sZFX6LdiIgRKbDfVql5TtY+rUqByKTGNeXUwizbsJ3pVKf8nGfRjThhFisVQaWuJzoLpwuDirftUBhVQSEixeoeApsKGp71DjWyCoVyn2Xh7UY/QjF4RpFa9yJPkuBndqT8/fw+/yVvWDauQlAyOKdhEKxa2BTxfENjqpeTwogLSBEZFYdDYkJvn5jpJCcTFXv9wmdIslmoaneC4CuH1wCRrHOHmWXJqwGXEtOCnIq14M2j9RAXtQWy8UeGj5KpwXyk0ond/b/2PPkgou/yyu6uIaCYMFq9IaKS/KJmvS2EW/r0aDXgYCjmI/pZxp3cr1q8079hgAAE38SlJcLfddp8d99UWeIeq82Us0TDOACTsisBbroFWK+rY8kBKQ1rNTot6yeT1Yc5v6W+lGyFv+A60HNFlJZ3flq4LaMUZJd+Xwx/oXlvV4dG6yBfexfp63H7+KgSfXmqp3m8mJl4wDPQjVVNUWPqZUsu/KFdSgBW/ZvDCfiFG7RWfDVMNLbSnGEH/02FBYLPqsIXd4JaXEEypN8BwRgFVYS+Ng0Cvq+Fp4IH/tg9eXophvqbXxMlb6PxU84DzrCjrIXgBysOgQRmDHw3C0m9gwNQnpK9eWxueOkF8IMI6BFn54Ev+w0jEw3FNo/dU8Ylr19CzXGPG2uRsZ9J7fXSq2exI/tuERFOGpkzGmLmX5Z9NpxVTSTCIOrEC1iRMlKuMpD0H0hYIzNJYxAAEv4mdxMdcgEbEWgshN1VEOQeABEghGj+ygcXT1btX ZUxNUZiD uENDv3q0BJSe101+gD0aiHG/VpYZ/C8xFu0H/9U8t3Q8rpJoiuu2OG7PwHAcjZc7eIySQvg9fA6Ou+3KeN9eOcC9CFKdUcfvdEC1SRGNoxl/IQ7jIFWQPBO+V5D254gpTXGAB 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..0317b33c727f 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((struct page *)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