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 C9028C7618D for ; Wed, 15 Mar 2023 05:32:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 544158E0003; Wed, 15 Mar 2023 01:32:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F42E8E0001; Wed, 15 Mar 2023 01:32:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BD648E0003; Wed, 15 Mar 2023 01:32:35 -0400 (EDT) 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 2160C8E0001 for ; Wed, 15 Mar 2023 01:32:35 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D348A1A0F4D for ; Wed, 15 Mar 2023 05:32:34 +0000 (UTC) X-FDA: 80570012628.07.698B349 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id E2CAB100012 for ; Wed, 15 Mar 2023 05:32:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vvhYyf+z; spf=none (imf05.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=1678858353; 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=PaqUJoSuStWz+a+eZ6H5Czv2RDkRGCSPMhY7d1rRpLQ=; b=6mbn3rHv2rWy00bHar3Nz0O/HUqZwmRV3T/kr1HvO28N5639+YRkXR4pZ0E7sue5aznBWs ocqfzffBa64kgr5KDMgVGPUfBf2s/VO2g7tT0VbIZ+piKjMNq61Ehq0CRXxvf0yq5Oa4ZR HQ0EdaD60VDYLqLt1a7f3P62Skrg/8I= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vvhYyf+z; spf=none (imf05.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=1678858353; a=rsa-sha256; cv=none; b=Ei62aix5Umvw7rhzMbSgtN8vfCX2u9RPJkVlVop5s6CqhgTW3wb8QUTmVVE8bOlLDEfgaw vWhb8ia3zqtkFSH8PZlNy1hoJGqFH3huI1A9Y9PSlHZBMl7TQLvJr4mB9TtsZDCZCnAsoH VGZQevvxj0mW1xMEFzSrAHh6R5U47+E= 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=PaqUJoSuStWz+a+eZ6H5Czv2RDkRGCSPMhY7d1rRpLQ=; b=vvhYyf+z+JwQ/j/pQJl+0gs8Cg Z7U9+n33E4ya8Rs6VKmmnqEH28jdQ4DqxJoZzM5mdflmtSMd+yi4QD5DY7G6MwTu/aY/fxbFfqpzA GNRHXJsPYag8wyB2MsDXq0FNR167SZ8hfIU8jfQYsAEEWY7xVUG2EUAiHGSR8zgrURZk0SBcC/tw3 /zcFkUw5x8LSpC4C5WwfSqdey12gZW0dngWQsr7691RQiTnLYh7PJh4w2M+kkStz9lDF4v7fY+LUA HFBny6CHlaD22KncUJZ6rWt/MD07tTSoYRCHZOIQywVMEC83Jj2z/yp/0ev2MTAuRFR9j6kKg88OI cmYZqZ9g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTO-00DYDm-Gh; Wed, 15 Mar 2023 05:14:50 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v4 33/36] filemap: Add filemap_map_folio_range() Date: Wed, 15 Mar 2023 05:14:41 +0000 Message-Id: <20230315051444.3229621-34-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: orfwjsp9pn3imt5cfbbj71n7gnacy3pj X-Rspamd-Queue-Id: E2CAB100012 X-HE-Tag: 1678858352-166834 X-HE-Meta: U2FsdGVkX18naZFhqp1vIQ2wl4iwRuyEr6IDRtqBcvnZEVe/Bm4D3y2/qY08uimXiU9S4Dmnzr7TvY1LwCLtHiZHhFpIUX6qvEkXqmcD0LoyfcxKRcspyd9llgLoHyqfTVdHtJrTZMdxEUDJUjKMuGvX5Z9e/r3OZAYYwNgBVpKKpxMGPOSMSwXMsupWFnQURASdup8P6Xlc1Q/xzxiIQ6XYCslMBpNtkI3QR7D+mJz36KWT3ZEBP6nvJzsAsA3P9is7ppBzkYod4BWuEm5mwGd51/+zpftKTjFSuijDQe3PYg/B2FOAqBIfZUrvM5iXGwhnuMn6F1R8oE32GhvyB6VITwBc40OoJ4IbV7EXb0wbRpRr/TqYOFozzW5xikzik2ZOKU43H0smKpjdW1Nd6m6F9cUJ06LlvXpQTnfDBU71xJaVK1GZZMm1glm48oOUyot5HJhb7oSpcASMi+4H7nIXO0oiUWu4rdxR87ceNzSs1Y9VmlArM2YFJTevpWLCxBKNLJDWD2MTgI4cJuQLxvIH69PAEfUvdvuK/6DVC4JkBdwlfTZkb6eHlsfe6Zhz7EVZyh6Zh4C8+VSudQ9h9Thi7j2MbpVT8vySrwmfsaswmOIv8FlRNr0ZRuRDQQ5ciOZXExP9yGY9BhTqOdBfEZtD2QA0RpoR5ORutFGKX99vnM/N25jF+XlRCVtbwu5h3H5f8RgtBtRnPSLoHFFC2OSd05Uz8nCAEvpwpPJRPTbIZu+jkJma8IGZEj1WMwt4XqT/TZjMEzfxTPXSVEyE7j9SPspZMS1DdI2J2oz2J0nYaURe5FS6iB9QRaKOT9dk2VQxnvwD90OEix4WquPYYMYRzXlRWFjKGk+7oWXazmdu4NO1+yVpMX/8oMlZOQn1yEbrZkUPst2hphE8pBUO/J/Qb/z4sFvu7L6aAmm8uMaA95kQ9ok08Gy9ZRm2pN4UqUhaehjdvUBNyBZ3WRI JZcnGkid 3wznexCunnjsAicsNNwqtrQ0FEM1UgDN084Y0pnX093dK+jkIZrG/7fMejYlBhVvM+1DO37nEUtc5GEAXsMcHlxGgzhIPIEEwx8lbi8KFnKLgL4zoZyGn2VuIHVqZb1VI/8eVnXMgBCaj7DpYADgo3yc3T43U6jFtOAplzrggGNld00FbxhMh016tDkbhCBlZXeciuY35494FdRpQRQIbYyh5aZYbqlYJ2oIxhonDY6Lf0TDE1QAV2rxWIF1lwm/x+gh+VCWni2KjRhgHuLj/+sm3I2sbxpTE4Ctw 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 a34abfe8c654..6e2b0778db45 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2199,16 +2199,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 @@ -3480,6 +3470,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) { @@ -3490,9 +3527,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); @@ -3507,45 +3544,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.2