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 01C66C64ED6 for ; Mon, 27 Feb 2023 17:58:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EF2528000B; Mon, 27 Feb 2023 12:58:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 077E4280001; Mon, 27 Feb 2023 12:58:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFE7B28000B; Mon, 27 Feb 2023 12:58:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B8717280001 for ; Mon, 27 Feb 2023 12:58:11 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3D8051A0A2C for ; Mon, 27 Feb 2023 17:58:11 +0000 (UTC) X-FDA: 80513830782.08.A2A51BB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 6F750160011 for ; Mon, 27 Feb 2023 17:58:09 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YZy5sGlb; 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=1677520689; 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=GeBhKEWLK25eomw3eGszIimIpcpbCe83zHF885nubCM=; b=4qSg4+IJDSQlqabNaupVZ7SFsxt+nlkhPQbqBkK2nu9FDEX5I8VeyOupe3MFV9msVhAakL YSNsrBVXFFAPLZ43EqD0bbrpBCpuotrynP649BQrO1zhxDTJBvJ/6rQeDo3OXx49ci4X54 cJ0M3WicfBToOhChapG/eM+z729A6Zk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YZy5sGlb; 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=1677520689; a=rsa-sha256; cv=none; b=mcvANv0iEEwwpU5xNaUkoU9kMGCAzpbBxLltjjDBBO6cqeUZAMsbmsihq51x+dcJmai4y9 oPY+CMhj1ZTGbO8lDxM/FgKzLenKS4VzVEt3YBPbCztfqTj7y/zcvouGbkxG04rcROoJjU 1x0+bG6IcSCvKCBL+Fi0L+g3vVYqrUQ= 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=GeBhKEWLK25eomw3eGszIimIpcpbCe83zHF885nubCM=; b=YZy5sGlbchptjVnsHDhmqDLamz iI/XWDhaNjL1I5o/wDXF8+Hd1sJ8vPb8lgaxzq+nWjdl3NuQAQAWPBwkuxjzRpRK/tw4ulnjkHFS6 E6c4iQOW8FeTvq5rEdi7YJVS+lyJD++uqIZpwqazTMsTM7CVIda9T43KVS9Ddtju01TmM3hnMwLiP 17eln+GkT115lhsgM6I+hrlbBLyLineK4pv86jVfPh/n0wci7kfdtFC9L2p6P/pZvJknIp3vZZ3Ie FOgcFZel3hHCfVxNRCENmCV1jTsYrw05DCKah8ESK/AWYCfPLoP8itHYwSCTm35eYY3OtZ75EQrEX RFTWrSVA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkx-000IZG-2e; Mon, 27 Feb 2023 17:57:47 +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 30/30] filemap: Batch PTE mappings Date: Mon, 27 Feb 2023 17:57:41 +0000 Message-Id: <20230227175741.71216-31-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: o8f159mj1rdi1q39ffuxugtbhi3r3g4y X-Rspamd-Queue-Id: 6F750160011 X-HE-Tag: 1677520689-165549 X-HE-Meta: U2FsdGVkX1/PJdVAXXbrZSLmGYMQjWEfXyFPVaHzEVbK1bn/kjvd6GFcdb4hWqpU+LNT5LBh8AR5P3WVKTnXW0wQ8vrdn5dEl5vNYxyTjYi+8TJPwNd2zLLbhcCCroQrlfWpJIJ6fgsGz3sffBNIZ7haDf1TxqEZRl8sQGNAXrVVWQtFLhZvPRKkUCctZ4Q8oywDSAsrkznRcEBdDRU+bFXF8V+FUxm5OqOnY8LupOkO6ha9LKrecpW8lzL4w+nBxDmNBLMs3d+R5A3kz849xu48lOdel7TdHEgjrW6cgdqCrzj+GoYHaT6In8vGJzeSD60IN1kGZGEvqoV7LZrkP+IKJvowscisu80FvTy3/Ek7OH27WxA1BX+Qe4gjvBChNR3P2uwiwhBKW1P3keYY82+Kvps4AcQMhO7Xal5K/oGQShojhj/CIDmdArjMKRddjXab3ocP4R7VU0Be861SXiMaryn/a3mRWEtnwbHsEwGc2KS09/ZvoU4pymLi1HIerYk7QpwN0Vc1nsO+xYyx3l3VIUXOk9FNYL+zS4oqQ/8WoO3VbZErFO+aZvD9bjvu5bHjGSA3JCbnRyZYitiBFa95Z6al/kOtGB3A1BfHyheOffmoRw1eUbHhu0jY1mCPpEKYuZK622fnkI4t4kVCSohGhXTbfAadKT1swhSPIRDeJmA0u9bZmDHI2s1ggkyKXx95suOMUAqx9iXdGlycRRDUB4U516UUa9jC1bqgfFRP+KqWGlIqPgME4aEUOqskj1Aw++6+pwcZfCI6YZ4cVad00ROVIUMnFj+j/mrXb/IH224TuNR/mFAJV06IboA9ETpQY0+awsuWVGyTR9KiSd7EwMYDPPBR3x7qM/paOQShIRPf6MdEp0/56puCJxbPa+NIxgwCxmiLbSnBvAIJWeEbnP+gZuBwoFuSOIdhHLw+VB7Vb2fL1xAdPfM73Ih7pZyl1UcFNBLU6HzaLwL XgmpVh4k yVeuhIirBDhgY2fNqNcBT4ZtOSojLbCdbBCuv5SCNi3f8VUbSzRgAFCBhp4XQDClyGqFTm1Eg8G75iKO+0rGs8N09IeqI47w6y+Y9hWjRGHkvtdMkWzQydQC1O+NFiFuOBb8rKi4ZyB2VTOprUI9m95UWx4UvzcupyWwpj+DnUopvC2lDkhhX4rP7sXQtRiQ5WjSGCZRaNEgOqoEr2iL2+kaWQFCLbl/GXs0rg82sp1SV+augOgyydvTG3g== 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 Call set_pte_range() once per contiguous range of the folio instead of once per page. This batches the updates to mm counters and the rmap. 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 15% performance gain on a 48C/96T Cascade Lake test box with 96 processes running against xfs. Perf data collected before/after the change: 18.73%--page_add_file_rmap | --11.60%--__mod_lruvec_page_state | |--7.40%--__mod_memcg_lruvec_state | | | --5.58%--cgroup_rstat_updated | --2.53%--__mod_lruvec_state | --1.48%--__mod_node_page_state 9.93%--page_add_file_rmap_range | --2.67%--__mod_lruvec_page_state | |--1.95%--__mod_memcg_lruvec_state | | | --1.57%--cgroup_rstat_updated | --0.61%--__mod_lruvec_state | --0.54%--__mod_node_page_state The running time of __mode_lruvec_page_state() is reduced about 9%. [1]: https://github.com/antonblanchard/will-it-scale/pull/37 Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 07ebd90967a3..40be33b5ee46 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3486,11 +3486,12 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, 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; + unsigned int count = 0; + pte_t *old_ptep = vmf->pte; do { - if (PageHWPoison(page)) - continue; + if (PageHWPoison(page + count)) + goto skip; if (mmap_miss > 0) mmap_miss--; @@ -3500,20 +3501,33 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, * handled in the specific fault path, and it'll prohibit the * fault-around logic. */ - if (!pte_none(*vmf->pte)) - continue; + if (!pte_none(vmf->pte[count])) + goto skip; if (vmf->address == addr) ret = VM_FAULT_NOPAGE; - ref_count++; - set_pte_range(vmf, folio, page, 1, addr); - } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < nr_pages); + count++; + continue; +skip: + if (count) { + set_pte_range(vmf, folio, page, count, addr); + folio_ref_add(folio, count); + } - /* Restore the vmf->pte */ - vmf->pte -= nr_pages; + count++; + page += count; + vmf->pte += count; + addr += count * PAGE_SIZE; + count = 0; + } while (--nr_pages > 0); + + if (count) { + set_pte_range(vmf, folio, page, count, addr); + folio_ref_add(folio, count); + } - folio_ref_add(folio, ref_count); + vmf->pte = old_ptep; WRITE_ONCE(file->f_ra.mmap_miss, mmap_miss); return ret; -- 2.39.1