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 7508AC433EF for ; Fri, 4 Feb 2022 20:00:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC80C6B00A2; Fri, 4 Feb 2022 14:59:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1ADD58D001A; Fri, 4 Feb 2022 14:59:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07A8D8D0014; Fri, 4 Feb 2022 14:59:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0236.hostedemail.com [216.40.44.236]) by kanga.kvack.org (Postfix) with ESMTP id 96B9C8D0018 for ; Fri, 4 Feb 2022 14:59:13 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 56D31824C451 for ; Fri, 4 Feb 2022 19:59:13 +0000 (UTC) X-FDA: 79106161386.11.99C5DDB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id EDF1440003 for ; Fri, 4 Feb 2022 19:59:12 +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=cuGkyAFOQfL5bVQqvk6Qt9S1Xyv5/CUvEOJSA3z2JA4=; b=jB5EWxe1wkvjtwoUKi9itzym7U 7JdC3/tO+viBbDdeQyOm+vcqNytohwf5/uFx9nu9kl8N7/tfHWas71CDkAXUICy4l6j6iqHjqvjzc WeWzFNWcMTV0p7TIAwCeUQKO1glrZ6jVXs8ilVY87VQ7StkB6vdsGZ6M98zz7o6WR/iix0tpajLIh 4vzWZcFZnAlDxaUo/1809ZMNu4QURSkv7Zr9vGrR88Vqsl93tS3NYlaUsc/RzGOxwbiG5jLfpLJgu ArHnSHI3FlsFfsAhtkXTU+lhhOdkc5QIO0MB6qBnUSpMkhrK8BQcisA/tcLNFvTDqoKwCmYt0zxxZ J8SjrsCQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jY-007Lnw-Gr; Fri, 04 Feb 2022 19:59:04 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH 47/75] mm/mlock: Turn mlock_vma_page() into mlock_vma_folio() Date: Fri, 4 Feb 2022 19:58:24 +0000 Message-Id: <20220204195852.1751729-48-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: EDF1440003 X-Rspam-User: nil Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jB5EWxe1; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: 4g6fzhbst38u1hc73rkgq16oamy1j8oy X-Rspamd-Server: rspam08 X-HE-Tag: 1644004752-538825 Content-Transfer-Encoding: quoted-printable 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: Add mlock_vma_page() back as a wrapper. Saves a few calls to compound_head() and an assertion that the page is not a tail page. Signed-off-by: Matthew Wilcox (Oracle) --- mm/folio-compat.c | 5 +++++ mm/internal.h | 3 ++- mm/mlock.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/mm/folio-compat.c b/mm/folio-compat.c index bcb037d9cec3..9cb0867d5b38 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -169,3 +169,8 @@ void clear_page_mlock(struct page *page) { folio_end_mlock(page_folio(page)); } + +void mlock_vma_page(struct page *page) +{ + mlock_vma_folio(page_folio(page)); +} diff --git a/mm/internal.h b/mm/internal.h index 041c76a4c284..18b024aa7e59 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -411,7 +411,8 @@ static inline void munlock_vma_pages_all(struct vm_ar= ea_struct *vma) /* * must be called with vma's mmap_lock held for read or write, and page = locked. */ -extern void mlock_vma_page(struct page *page); +void mlock_vma_page(struct page *page); +void mlock_vma_folio(struct folio *folio); extern unsigned int munlock_vma_page(struct page *page); =20 extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, diff --git a/mm/mlock.c b/mm/mlock.c index ff067d64acc5..d998fd5c84bf 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -94,21 +94,21 @@ void folio_end_mlock(struct folio *folio) * Mark page as mlocked if not already. * If page on LRU, isolate and putback to move to unevictable list. */ -void mlock_vma_page(struct page *page) +void mlock_vma_folio(struct folio *folio) { /* Serialize with page migration */ - BUG_ON(!PageLocked(page)); + BUG_ON(!folio_test_locked(folio)); =20 - VM_BUG_ON_PAGE(PageTail(page), page); - VM_BUG_ON_PAGE(PageCompound(page) && PageDoubleMap(page), page); + VM_BUG_ON_FOLIO(folio_test_large(folio) && folio_test_double_map(folio)= , + folio); =20 - if (!TestSetPageMlocked(page)) { - int nr_pages =3D thp_nr_pages(page); + if (!folio_test_set_mlocked(folio)) { + long nr_pages =3D folio_nr_pages(folio); =20 - mod_zone_page_state(page_zone(page), NR_MLOCK, nr_pages); + zone_stat_mod_folio(folio, NR_MLOCK, nr_pages); count_vm_events(UNEVICTABLE_PGMLOCKED, nr_pages); - if (!isolate_lru_page(page)) - putback_lru_page(page); + if (!folio_isolate_lru(folio)) + folio_putback_lru(folio); } } =20 --=20 2.34.1