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 BB55CC433F5 for ; Mon, 7 Feb 2022 10:46:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F8AE6B0074; Mon, 7 Feb 2022 05:46:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A7646B0075; Mon, 7 Feb 2022 05:46:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB0B66B0078; Mon, 7 Feb 2022 05:46:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id D8F036B0074 for ; Mon, 7 Feb 2022 05:46:44 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 87B488249980 for ; Mon, 7 Feb 2022 10:46:44 +0000 (UTC) X-FDA: 79115655528.20.4C35F0D Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf04.hostedemail.com (Postfix) with ESMTP id 030874000B for ; Mon, 7 Feb 2022 10:46:43 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 22D0FB80E4C; Mon, 7 Feb 2022 10:46:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81654C340F0; Mon, 7 Feb 2022 10:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644230800; bh=JOHuvSu0RQEMIt4Zzch2eeYu1H0BUFLaBbYPrXModLI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Oj7N1uQJmagKS1uoY/v/7hFNdBVZN6X9pVR61qjGYcJ7hKNM4aCXKSL3aG1s7OemY aG7lN2aogxiYfk6ADmBtPQXZCZcEHWGr7XuSKH4SuosXg0it58X2BxBNhLKSB32vcV tEcdUGx/0Ac9uTCI7kYSukZttviakQuZExGDKseZt+bLkW8M10uLKNZbbuGVr0KRRL ef5Iu92fu8/9ag03BD/ajx95lAI+3y6TrwYGyJjvNKXKGD9c0K2tTCmFvOqnYqnEpK ZJ3zJq1UPe4pmzaLxrlSrNU1pyocAFPN1rSzwu0RziLef2Vy4DeaKOEXkaujUg2jrb RmL13PiUUAHpQ== Date: Mon, 7 Feb 2022 12:46:34 +0200 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 47/75] mm/mlock: Turn mlock_vma_page() into mlock_vma_folio() Message-ID: References: <20220204195852.1751729-1-willy@infradead.org> <20220204195852.1751729-48-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220204195852.1751729-48-willy@infradead.org> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 030874000B X-Stat-Signature: uceoxd3apactwydfxxsqju9entmc56ed Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Oj7N1uQJ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Rspam-User: nil X-HE-Tag: 1644230803-63326 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: On Fri, Feb 04, 2022 at 07:58:24PM +0000, Matthew Wilcox (Oracle) wrote: > 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)); > +} This will make no-mmu unhappy, e.g. arm allnoconfig: CC mm/folio-compat.o mm/folio-compat.c:174:6: error: redefinition of 'mlock_vma_page' 174 | void mlock_vma_page(struct page *page) | ^~~~~~~~~~~~~~ In file included from mm/folio-compat.c:11: mm/internal.h:501:20: note: previous definition of 'mlock_vma_page' was here 501 | static inline void mlock_vma_page(struct page *page) { } | ^~~~~~~~~~~~~~ mm/folio-compat.c: In function 'mlock_vma_page': mm/folio-compat.c:176:2: error: implicit declaration of function 'mlock_vma_folio'; did you mean 'mlock_vma_page'? [-Werror=implicit-function-declaration] 176 | mlock_vma_folio(page_folio(page)); | ^~~~~~~~~~~~~~~ | mlock_vma_page This also applies to munlock_vma_page() and page_mlock(). For some reason no build yelled about clear_page_mlock()... > 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_area_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); > > 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)); > > - 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); > > - if (!TestSetPageMlocked(page)) { > - int nr_pages = thp_nr_pages(page); > + if (!folio_test_set_mlocked(folio)) { > + long nr_pages = folio_nr_pages(folio); > > - 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); > } > } > > -- > 2.34.1 > > -- Sincerely yours, Mike.