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 B55BCC636D4 for ; Tue, 7 Feb 2023 19:49:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2085A6B0113; Tue, 7 Feb 2023 14:49:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B84D6B0116; Tue, 7 Feb 2023 14:49:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A7B46B0118; Tue, 7 Feb 2023 14:49:57 -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 F02356B0113 for ; Tue, 7 Feb 2023 14:49:56 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 80C3C80B1D for ; Tue, 7 Feb 2023 19:49:56 +0000 (UTC) X-FDA: 80441536392.02.0F8FF6A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id CFEBA4001C for ; Tue, 7 Feb 2023 19:49:54 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HjrvvkkO; spf=none (imf07.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=1675799394; 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=bn5An6YEWxMcfUEOmywANJ1SZY1Ff2p38vPeWaR0GaE=; b=dlw85Ao5GxIDXj8mgODHAOjkJhA8AP0dQnkyBm5ozdbe/hGEXWtl5ld5Nkqu/KOPfAcZKV OCLyrQzHUQXn0hTPO7PLbHzB7IWZxabc2dAsy23SxE8BkTADxdmyaQjyT6/aKSBa5NN/Fq s/Whm3rTQnjrRWLQqWgJhxZBuAgy2Gs= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HjrvvkkO; spf=none (imf07.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=1675799394; a=rsa-sha256; cv=none; b=pQXalnlEhpIlcWNNx+QzgW+yv2dyhLVohkWf7brXqm2bycsfN9WOPrQbvCZkhEfQVV85LJ BSm5hL5zBAgIUDaHtM5kv0vUqSdnxYGD8c9lV41HK2jGVZweMkxq1JxJjFkdvfWffOgX87 Bh67y4/XEUPa84MxsK38jigjUSgurR0= 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=bn5An6YEWxMcfUEOmywANJ1SZY1Ff2p38vPeWaR0GaE=; b=HjrvvkkO9s+2iI37Dc/8I1NP9R xT2giehYlbAF1vDzT9DzJOk4b69YJhBJI6yWGYOSLcfuEFug3o5XW4T8pJBv3iL1l4KNbx+Bjw2JO mylPqHi3UAlh/Mrz3BhlMJUZPZ3jieKSgSjY5equAqi90yKEiuFPT1shhqAm2f3OJ8aFGusDUyaGe 68CAlLq8y/GIfUzhdMZNkxBsGJqkyhYq+96g1MWWbDnWd0tLOCz93P5ugKH/T+pAyXgH26HIlEBs/ mhqjcs7lgXjT8Prnbm/F9o8o9JmQpBn2ZxH3M7igg8KcXwElERG6vnvvzVOE/e1WQdU8IxJIoMb9m ma0JoM3A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPTyF-000Vsp-KC; Tue, 07 Feb 2023 19:49:39 +0000 From: "Matthew Wilcox (Oracle)" To: Yin Fengwei , linux-mm@kvack.org Cc: david@redhat.com, dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, Matthew Wilcox Subject: [PATCH v5 1/5] filemap: Add filemap_map_folio_range() Date: Tue, 7 Feb 2023 19:49:31 +0000 Message-Id: <20230207194937.122543-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230207194937.122543-1-willy@infradead.org> References: <20230207194937.122543-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: kqh485goj64i3jc6bjsqppud5mkzhz3p X-Rspam-User: X-Rspamd-Queue-Id: CFEBA4001C X-Rspamd-Server: rspam06 X-HE-Tag: 1675799394-555937 X-HE-Meta: U2FsdGVkX1/NoYGCMcREry7wW4A12kwQJyL2FtOMvLTQi2sY/1p7TuVbPMnENwHgIrS9nKtiuaOSVWJ5UOfzpw/o2+0IMDc3hBHsOg9UJPA4uyn4u35gvvtSp6qtHNuA2gJ728AW6vW6uzu4NeaONZ1rCYbFpV5Yri16+PstouZK3XBlPtIjdoqCzUQ249K5lxrfKbOr6lcRhUIsccGpcpQggTmxcfHWSPD8c2VE8op3WbdDxjUvRSqV8BBkMZYWogL1jjqv3up51FcHK8rwkWY+tAAjJf8zsznp5dhrL4NLHCr6XZ2VNBm5UwjPI3dCs/QrPDVBvrY7bT8dKDLwlSqYQgtfgx2/ZCrRxlEmqIWuIokOpbKQL+0C+htpLUZ5EC7plwW02fVjOZy8M7gdoIsEDm1VNt/iTAM6J3Gx43tUxOLU+nUkU2YiQKuSbmFv6Y7eXI1ZlJ5PQePaob9mn2XHQuBmqSedhAR9ql1TwqyGczoC4bbMl0tWKt62rM1tfP8uB8n8tJOt837U9ZC+JNyjyrR3l5bzw5xzKQ9uOh5Zb32dA673ihMyT233xqKNuuALYpBMyysEIAPJ6f82PWYut37fDzmvZOUDtisrBMavp+H/yr22rfkvTPgF7dnLLpgI8hR8Mh1C+RCIRrcyDmbMJvYobmE0uUz/ylujGen+g3xX+CZAhz5XWC3j2CpqKVH1V/EmNsoWqdJXEC/FNePg1gFP9uFj9RSy6YmG8HKUCaczGwAVYXnsZKtRdAESvXCF9EBFOquJz3oT4jA1lw8fWFj2LeiffgrtstP4Tt8+Eh0qJaqdtXxLaW+b+igcr4+BCaRd+HVMXFy2gupurDH0z0uRt3kyq5NJjmzCTA6PX2LDYG6t8Kf6XB7ia/YGSyVDUXTibxAimreEAf9N+VxHfqg1HxDkeX35Iz7pEvJkhEMt4RoGncR+fyQDPqybXHxUwOX0M327SyFsC+H D/5pXWbY V5udOpJVJQ9G42azfy7nePGv86Xe0Dv9CZ/dEDg7WIz20ddQAzDLOm6Pep9G7ozg3ZxLqjHNa/Cr5w+LRUI7nSWNWBVtC490MOguhgyHqAnmFgB3kymdfMzinxnpOGY3xbelyrsPySzG8gaK2aD/hDQM1yJDR848qtXk4Dxb9Ssadqv4wJMrdy1T8MS5Ju7vKC0qiTawk8vJk07w9oRaquMnd7eV0jIcj7xuFZDc8PmXphekv3TWPETVbK39/VkUBsayrl6GBxxtlwZ8z5yKs7XI5JVDTfRVGbZkz 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 2ebcf500871d..9aa7a4fdc374 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2200,16 +2200,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 @@ -3351,6 +3341,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) { @@ -3361,9 +3398,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); @@ -3378,45 +3415,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; - - /* We're about to handle the fault */ - if (vmf->address == addr) - ret = VM_FAULT_NOPAGE; + ret |= filemap_map_folio_range(vmf, folio, + xas.xa_index - folio->index, addr, nr_pages); + xas.xa_index += nr_pages; - 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.35.1