From patchwork Mon Feb 27 17:57:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 62082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2563967wrd; Mon, 27 Feb 2023 10:04:05 -0800 (PST) X-Google-Smtp-Source: AK7set8ua1+VXhUbZN28bQHebgG+9OCp84DKDNnJ/L4tE4xAdCMezCpJEipMeFUjuZ8BPfQO4lDv X-Received: by 2002:a05:6a20:6a03:b0:bf:58d1:cea0 with SMTP id p3-20020a056a206a0300b000bf58d1cea0mr7174978pzk.31.1677521045408; Mon, 27 Feb 2023 10:04:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677521045; cv=none; d=google.com; s=arc-20160816; b=oCKlhot1qTU9Hp77+iqHjsMgIJamutq+bYQ4NeOtZ4wtrozrlWRdYgwlMUsWCYf0Rw fK/Rsh5hTGGKqRojhdr0t71MUMhhiC0cqfhEmN5/EXRobOZR/L508tSZqIE9mAH+yTg3 YHMdpXrn8arorUQsC+d/9WJo28IQcEB2KTCJ4Sqla+6Zh5GTiXVQkQqOyoTPG4nr3c09 Txfe+wqxL6r0tkS3/9A2wkWVUEfjRROTtbwSRcKzsa4K0uBKnSlEIjI3b4+O5y4148J/ OYNiiwiE7jnRbmBswE2iGx7eicJTv276ilulLjXDvAKCPXRs4Q6mSNswGgvjBMGrIPsG jAvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GeBhKEWLK25eomw3eGszIimIpcpbCe83zHF885nubCM=; b=IgWfLvHQKexeMHfpI6ss7Petal28/6XgGVp4MaR8RbN5ATrl9PHGC24jtZzo7UHpLd F/pFliuBmrdcOSUvH3h5T7SFXyzgDQ8ZsLeghgYbA5ELwRc6kjRV74eeryWx1QlBOpJu 1mCHAx0Kw/ZBZR4LzOnhLrHRjbIBNdy7Gge28ZLTtPcbiBH3ejEOrcU/wq2uN/juoz0E wrrHRin6/v3+wYTN5pFNsOq99CzqYr5V/jnRs0FPAbVkB9+cCj0PfM7ARhQnUcgh1NFQ SInZ4mL+2fBYs+VEJx3iZKSTRRwaAlydp6QCDEG2Cw06NtC5PIlC9aoVgq4juqZg2myB AQUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=YZy5sGlb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x14-20020a63f70e000000b00502f1395a67si7713846pgh.190.2023.02.27.10.03.23; Mon, 27 Feb 2023 10:04:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=YZy5sGlb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230521AbjB0R7U (ORCPT + 99 others); Mon, 27 Feb 2023 12:59:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbjB0R6W (ORCPT ); Mon, 27 Feb 2023 12:58:22 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAEFA6A56; Mon, 27 Feb 2023 09:57:55 -0800 (PST) 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759008307288258115?= X-GMAIL-MSGID: =?utf-8?q?1759008307288258115?= 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;