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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA708C07E96 for ; Thu, 15 Jul 2021 05:13:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 63E8261278 for ; Thu, 15 Jul 2021 05:13:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63E8261278 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BC3E58D007B; Thu, 15 Jul 2021 01:13:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B73428D0065; Thu, 15 Jul 2021 01:13:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A14568D007B; Thu, 15 Jul 2021 01:13:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id 72E538D0065 for ; Thu, 15 Jul 2021 01:13:32 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6A77322882 for ; Thu, 15 Jul 2021 05:13:31 +0000 (UTC) X-FDA: 78363654222.39.41FB73B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id EA248D0000BD for ; Thu, 15 Jul 2021 05:13:30 +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=ubkBUcZkQq7PEz+ieCUNeeq4MwyrT33JYJHMPgq6Lhk=; b=p8ZEbAMZsDVunWkl1areZpIQfW 61kna7QKhWLs4vqHciKHU/MJViW2/ZeWw/M6hg9pH8ewB3y7e1R1tzl1Cw0WXWMIRIVzTVfeK7vTp sZZeeyDOyoOUD1X3GQqjTPm/d6e1T4+ZdrWC+AI5kR8a1tTi1uS1L0WAfLiZRwKyCPsYlFVZaS5wj zAxf7Pw78n5NymBncm4vKDIK/rJbphyJXMegMTI86/87AAH5vRdnVQQLYzIGg+/K6Q5ArQSfO5oXO i8XbmpqehAEG0BHi0VFLg4qwlDbgch2Dc0GRohH3ds0NJqVlzjUhrARu/lrcxAp2eK0geb2qTNkrf oXQppnhw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3tfR-0030IM-AL; Thu, 15 Jul 2021 05:12:22 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v14 117/138] mm/filemap: Convert filemap_fault to folio Date: Thu, 15 Jul 2021 04:36:43 +0100 Message-Id: <20210715033704.692967-118-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: EA248D0000BD X-Stat-Signature: 4hry63gx83d4ohowocpdtdds6yu3tsso Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=p8ZEbAMZ; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1626326010-775317 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: Instead of converting back-and-forth between the actual page and the head page, just convert once at the end of the function where we set the vmf->page. Saves 241 bytes of text, or 15% of the size of filemap_fault(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 78 +++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 078c318e2f16..b0fe3234a20b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2801,21 +2801,20 @@ loff_t mapping_seek_hole_data(struct address_spac= e *mapping, loff_t start, #ifdef CONFIG_MMU #define MMAP_LOTSAMISS (100) /* - * lock_page_maybe_drop_mmap - lock the page, possibly dropping the mmap= _lock + * lock_folio_maybe_drop_mmap - lock the page, possibly dropping the mma= p_lock * @vmf - the vm_fault for this fault. - * @page - the page to lock. + * @folio - the folio to lock. * @fpin - the pointer to the file we may pin (or is already pinned). * - * This works similar to lock_page_or_retry in that it can drop the mmap= _lock. - * It differs in that it actually returns the page locked if it returns = 1 and 0 - * if it couldn't lock the page. If we did have to drop the mmap_lock t= hen fpin - * will point to the pinned file and needs to be fput()'ed at a later po= int. + * This works similar to lock_folio_or_retry in that it can drop the + * mmap_lock. It differs in that it actually returns the folio locked + * if it returns 1 and 0 if it couldn't lock the folio. If we did have + * to drop the mmap_lock then fpin will point to the pinned file and + * needs to be fput()'ed at a later point. */ -static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *= page, +static int lock_folio_maybe_drop_mmap(struct vm_fault *vmf, struct folio= *folio, struct file **fpin) { - struct folio *folio =3D page_folio(page); - if (folio_trylock(folio)) return 1; =20 @@ -2904,7 +2903,7 @@ static struct file *do_sync_mmap_readahead(struct v= m_fault *vmf) * was pinned if we have to drop the mmap_lock in order to do IO. */ static struct file *do_async_mmap_readahead(struct vm_fault *vmf, - struct page *page) + struct folio *folio) { struct file *file =3D vmf->vma->vm_file; struct file_ra_state *ra =3D &file->f_ra; @@ -2919,10 +2918,10 @@ static struct file *do_async_mmap_readahead(struc= t vm_fault *vmf, mmap_miss =3D READ_ONCE(ra->mmap_miss); if (mmap_miss) WRITE_ONCE(ra->mmap_miss, --mmap_miss); - if (PageReadahead(page)) { + if (folio_test_readahead(folio)) { fpin =3D maybe_unlock_mmap_for_io(vmf, fpin); page_cache_async_readahead(mapping, ra, file, - page, offset, ra->ra_pages); + &folio->page, offset, ra->ra_pages); } return fpin; } @@ -2941,7 +2940,7 @@ static struct file *do_async_mmap_readahead(struct = vm_fault *vmf, * vma->vm_mm->mmap_lock must be held on entry. * * If our return value has VM_FAULT_RETRY set, it's because the mmap_loc= k - * may be dropped before doing I/O or by lock_page_maybe_drop_mmap(). + * may be dropped before doing I/O or by lock_folio_maybe_drop_mmap(). * * If our return value does not have VM_FAULT_RETRY set, the mmap_lock * has not been released. @@ -2957,58 +2956,57 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) struct file *fpin =3D NULL; struct address_space *mapping =3D file->f_mapping; struct inode *inode =3D mapping->host; - pgoff_t offset =3D vmf->pgoff; - pgoff_t max_off; - struct page *page; + pgoff_t max_idx, index =3D vmf->pgoff; + struct folio *folio; vm_fault_t ret =3D 0; =20 - max_off =3D DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); - if (unlikely(offset >=3D max_off)) + max_idx =3D DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + if (unlikely(index >=3D max_idx)) return VM_FAULT_SIGBUS; =20 /* * Do we have something in the page cache already? */ - page =3D find_get_page(mapping, offset); - if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) { + folio =3D filemap_get_folio(mapping, index); + if (likely(folio) && !(vmf->flags & FAULT_FLAG_TRIED)) { /* * We found the page, so try async readahead before * waiting for the lock. */ - fpin =3D do_async_mmap_readahead(vmf, page); - } else if (!page) { + fpin =3D do_async_mmap_readahead(vmf, folio); + } else if (!folio) { /* No page in the page cache at all */ count_vm_event(PGMAJFAULT); count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT); ret =3D VM_FAULT_MAJOR; fpin =3D do_sync_mmap_readahead(vmf); retry_find: - page =3D pagecache_get_page(mapping, offset, + folio =3D __filemap_get_folio(mapping, index, FGP_CREAT|FGP_FOR_MMAP, vmf->gfp_mask); - if (!page) { + if (!folio) { if (fpin) goto out_retry; return VM_FAULT_OOM; } } =20 - if (!lock_page_maybe_drop_mmap(vmf, page, &fpin)) + if (!lock_folio_maybe_drop_mmap(vmf, folio, &fpin)) goto out_retry; =20 /* Did it get truncated? */ - if (unlikely(compound_head(page)->mapping !=3D mapping)) { - unlock_page(page); - put_page(page); + if (unlikely(folio->mapping !=3D mapping)) { + folio_unlock(folio); + folio_put(folio); goto retry_find; } - VM_BUG_ON_PAGE(page_to_pgoff(page) !=3D offset, page); + VM_BUG_ON_FOLIO(!folio_contains(folio, index), folio); =20 /* * We have a locked page in the page cache, now we need to check * that it's up-to-date. If not, it is going to be due to an error. */ - if (unlikely(!PageUptodate(page))) + if (unlikely(!folio_test_uptodate(folio))) goto page_not_uptodate; =20 /* @@ -3017,7 +3015,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) * redo the fault. */ if (fpin) { - unlock_page(page); + folio_unlock(folio); goto out_retry; } =20 @@ -3025,14 +3023,14 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) * Found the page and have a reference on it. * We must recheck i_size under page lock. */ - max_off =3D DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); - if (unlikely(offset >=3D max_off)) { - unlock_page(page); - put_page(page); + max_idx =3D DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + if (unlikely(index >=3D max_idx)) { + folio_unlock(folio); + folio_put(folio); return VM_FAULT_SIGBUS; } =20 - vmf->page =3D page; + vmf->page =3D folio_file_page(folio, index); return ret | VM_FAULT_LOCKED; =20 page_not_uptodate: @@ -3043,10 +3041,10 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) * and we need to check for errors. */ fpin =3D maybe_unlock_mmap_for_io(vmf, fpin); - error =3D filemap_read_folio(file, mapping, page_folio(page)); + error =3D filemap_read_folio(file, mapping, folio); if (fpin) goto out_retry; - put_page(page); + folio_put(folio); =20 if (!error || error =3D=3D AOP_TRUNCATED_PAGE) goto retry_find; @@ -3059,8 +3057,8 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) * re-find the vma and come back and find our hopefully still populated * page. */ - if (page) - put_page(page); + if (folio) + folio_put(folio); if (fpin) fput(fpin); return ret | VM_FAULT_RETRY; --=20 2.30.2