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 922CCC7EE32 for ; Mon, 27 Feb 2023 17:58:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A20A280006; Mon, 27 Feb 2023 12:58:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 92BFE280001; Mon, 27 Feb 2023 12:58:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72F5C280006; Mon, 27 Feb 2023 12:58:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5F739280001 for ; Mon, 27 Feb 2023 12:58:05 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3EEB0407C2 for ; Mon, 27 Feb 2023 17:58:05 +0000 (UTC) X-FDA: 80513830530.01.432636B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 7610B160003 for ; Mon, 27 Feb 2023 17:58:03 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QtMpbNCS; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677520683; 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=i9ts6rBAYolQ1/FBCYccIPnlyslRrUlDUNhaTG0F47Y=; b=rVvRwHbvk6z6FWnlM2MPtyAaXj8MLclAm174op2Xw5KHnvQ0verxW1XI1xcKgQYANa/oKI 91jIQuMX3NVYIr3eyZ9wmE+y/BAP2csObkJFU8jyGZ2T77uy3Ac1p0u88tva811ClemDL7 XjZchEuz+pjLzOIJbzfewpjudh9wlFY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QtMpbNCS; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677520683; a=rsa-sha256; cv=none; b=C+YgVvDpIpKz596siEH/dhE+zQUAeyo59RlK9i7Vc5B2ORPLDDOAwIIGN0UVdtvJ9oF0Vv aAzeBuFc9uQwaZEWL1jU7P4LS9vo3bMfblGXTbSQnNZ4lOtmtfKSLoe+18dW0bWerzuHpG PjWv3Zwi07Rj1IUqoUDGI1U92mla9sk= 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=i9ts6rBAYolQ1/FBCYccIPnlyslRrUlDUNhaTG0F47Y=; b=QtMpbNCSVu4JKKMG0QgiDe3O8b zrRrZY9W8ngOU1X3jxbL7EApreJb8qUkDPJT19/fxOodt64vAkKWFfFaLNqfHZ9+sdL3+c1vWQrRj 2NE/0nH7B7nIR7QjcKZ0zYypB/xIPiolYiv8qRfxdPwrCrunm+GkZ0xcxRNnurK4JbdwEf6ySQSHe HgSLXgm6E8tMHFZeRIGzBIAn2fm9y7NXWTGF9RquGRacqm8JXvQimkq9D7yOlxauD3VPs9qbFF9qD QXolgPXHEX6cV8/guJRIeLHspJekp6ZNQK2p3ze3D8Es1HH1LLmJRIDlpPgh8//zrfMP0c+XO5YtU YsXZXUvw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkw-000IYu-KK; Mon, 27 Feb 2023 17:57:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v2 27/30] filemap: Add filemap_map_folio_range() Date: Mon, 27 Feb 2023 17:57:38 +0000 Message-Id: <20230227175741.71216-28-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 7apr4sopzxtujwhws9wzs61wsibszmz6 X-Rspamd-Queue-Id: 7610B160003 X-HE-Tag: 1677520683-426029 X-HE-Meta: U2FsdGVkX1/A39WP3mS1Cd9vh4wsU1LGVOKkJIM0H4SwQmZmkeO08yGUhO+q9UlmU2zDDJQrO8cCowluuoBKBk8W8A2eFbKJwhTj6yTgJZMalmBH9zJvlo8VThXx+Xgq94ZlmQS33hroyY7WuS+zP24a7uVfexSxZVq0YIfLRxnoKE3izJ6UtPxIxe/E2P8bPzV8PG6mWL13PvvEnQVUcpZRc9G5uunejHShRkqoBRzUxBfqOGK9fefSV+hsQqdU3Slpc0KFdZwWhDxnCPD0hrWJQJXEBJvwT20aoYr50T/1nEnRv6BAH7z37ym7FPDj6OOw37scXEa4ncRRayTaan4kg6N1oNwEx9RNyx/RrQ+aC7kVZT3GXXmRQb1ygm2JMLiJE0qDJjhJUhWtXAcJxH+MsyR0bov19lIqolHmLMVq0Y048jbySUjAAdEkgIGiz1NJlz3PyNKzKLTSVuC+2V7wcBaEvW9FpkHNpkvLTS7/wwuQ7c3bCVdq29vfmMsWBQ2/COFA7ooUYSCXLeNXqcS1XpMdRVjAcFb1BhgOKeBf1JFUzSvD546ylJqt/P9lULAYBQv5QsN3k6SMn11oiZPydE+d3r/GFjOneAjWoUpgSgNTS93AL62G0YqVUdIAHo2sIUvR0d44w38Diwx5PbDtGKYtlDECoO1hENE2K1p2DQWx4iMqPd9dtRhhUm+cG/8hsSM1+ZHXj2l6n4z2Pp88RUEL33ibWFHMTD9PSwGZF9I/Fe1dBCMX6hAXB8BkXsBChVdpQKMW1vm26nmEoI70sy5CsCUIv2PyTuIwYAth1HAlGxeppUMKFW2r00EnFNUBmEovPHOAKANgIfkyn0LZsJJfKnNaj2vgLVRfQaEGNwZ3t3krrKg9nHqpPn9mj0ExvYk9PAnxEqro7eA7Z/lH0oThVi0thBsd4+X3leko+ZXYiQa0w6XmYD+s4fgfut4L8wS0FMxajBh+bDu iarxzgJU OniCYjqlSgRRfvhZvZ9x5v8pakvw+Ugw0NcysIjiqDHTnxm9hePUMa0DM07IG5vf2enlCPUarmXvQI34xqDKTyaSGEPLInN0S+X0vcK2W9CqCe52/zxqRx9NTPSri/mKB8KGdivZ9lgP8XfFdthP1mYUPJ8/3IzlOUXNSSW8LRs47WBCHbu1+lIh8KSlLW6WJ0DmeIjvIOk+w8fRf9ihUHI3ctIyRbM/SBIlHsR9176sWTWxuWElwl4vFuWo1ps7Dcpk0htkoEkR2+8ndsXrqGIVCPn15epqGXjYd 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: From: Yin Fengwei filemap_map_folio_range() maps partial/full folio. Comparing to original filemap_map_pages(), it updates refcount once per folio instead of per page and gets minor performance improvement for large folio. With a will-it-scale.page_fault3 like app (change file write fault testing to read fault testing. Trying to upstream it to will-it-scale at [1]), got 2% performance gain on a 48C/96T Cascade Lake test box with 96 processes running against xfs. [1]: https://github.com/antonblanchard/will-it-scale/pull/37 Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 98 +++++++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 44 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 2723104cc06a..db86e459dde6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2202,16 +2202,6 @@ unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start, } EXPORT_SYMBOL(filemap_get_folios); -static inline -bool folio_more_pages(struct folio *folio, pgoff_t index, pgoff_t max) -{ - if (!folio_test_large(folio) || folio_test_hugetlb(folio)) - return false; - if (index >= max) - return false; - return index < folio->index + folio_nr_pages(folio) - 1; -} - /** * filemap_get_folios_contig - Get a batch of contiguous folios * @mapping: The address_space to search @@ -3483,6 +3473,53 @@ static inline struct folio *next_map_page(struct address_space *mapping, mapping, xas, end_pgoff); } +/* + * Map page range [start_page, start_page + nr_pages) of folio. + * start_page is gotten from start by folio_page(folio, start) + */ +static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, + struct folio *folio, unsigned long start, + unsigned long addr, unsigned int nr_pages) +{ + vm_fault_t ret = 0; + struct vm_area_struct *vma = vmf->vma; + struct file *file = vma->vm_file; + struct page *page = folio_page(folio, start); + unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); + unsigned int ref_count = 0, count = 0; + + do { + if (PageHWPoison(page)) + continue; + + if (mmap_miss > 0) + mmap_miss--; + + /* + * NOTE: If there're PTE markers, we'll leave them to be + * handled in the specific fault path, and it'll prohibit the + * fault-around logic. + */ + if (!pte_none(*vmf->pte)) + continue; + + if (vmf->address == addr) + ret = VM_FAULT_NOPAGE; + + ref_count++; + do_set_pte(vmf, page, addr); + update_mmu_cache(vma, addr, vmf->pte); + } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < nr_pages); + + /* Restore the vmf->pte */ + vmf->pte -= nr_pages; + + folio_ref_add(folio, ref_count); + WRITE_ONCE(file->f_ra.mmap_miss, mmap_miss); + + return ret; +} + vm_fault_t filemap_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgoff_t end_pgoff) { @@ -3493,9 +3530,9 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, unsigned long addr; XA_STATE(xas, &mapping->i_pages, start_pgoff); struct folio *folio; - struct page *page; unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); vm_fault_t ret = 0; + int nr_pages = 0; rcu_read_lock(); folio = first_map_page(mapping, &xas, end_pgoff); @@ -3510,45 +3547,18 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, addr = vma->vm_start + ((start_pgoff - vma->vm_pgoff) << PAGE_SHIFT); vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, addr, &vmf->ptl); do { -again: - page = folio_file_page(folio, xas.xa_index); - if (PageHWPoison(page)) - goto unlock; - - if (mmap_miss > 0) - mmap_miss--; + unsigned long end; addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; vmf->pte += xas.xa_index - last_pgoff; last_pgoff = xas.xa_index; + end = folio->index + folio_nr_pages(folio) - 1; + nr_pages = min(end, end_pgoff) - xas.xa_index + 1; - /* - * NOTE: If there're PTE markers, we'll leave them to be - * handled in the specific fault path, and it'll prohibit the - * fault-around logic. - */ - if (!pte_none(*vmf->pte)) - goto unlock; + ret |= filemap_map_folio_range(vmf, folio, + xas.xa_index - folio->index, addr, nr_pages); + xas.xa_index += nr_pages; - /* We're about to handle the fault */ - if (vmf->address == addr) - ret = VM_FAULT_NOPAGE; - - do_set_pte(vmf, page, addr); - /* no need to invalidate: a not-present page won't be cached */ - update_mmu_cache(vma, addr, vmf->pte); - if (folio_more_pages(folio, xas.xa_index, end_pgoff)) { - xas.xa_index++; - folio_ref_inc(folio); - goto again; - } - folio_unlock(folio); - continue; -unlock: - if (folio_more_pages(folio, xas.xa_index, end_pgoff)) { - xas.xa_index++; - goto again; - } folio_unlock(folio); folio_put(folio); } while ((folio = next_map_page(mapping, &xas, end_pgoff)) != NULL); -- 2.39.1