From patchwork Mon Jan 30 12:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yin, Fengwei" X-Patchwork-Id: 13121035 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 25582C54EAA for ; Mon, 30 Jan 2023 12:53:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87D3B6B0073; Mon, 30 Jan 2023 07:53:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 82B5B6B0074; Mon, 30 Jan 2023 07:53:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CC8B6B0075; Mon, 30 Jan 2023 07:53:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5FCBA6B0073 for ; Mon, 30 Jan 2023 07:53:24 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1F6E7AAD42 for ; Mon, 30 Jan 2023 12:53:24 +0000 (UTC) X-FDA: 80411456328.20.A798BD9 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf11.hostedemail.com (Postfix) with ESMTP id D8F2C40011 for ; Mon, 30 Jan 2023 12:53:21 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="IU0n/jIq"; spf=pass (imf11.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083202; 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=tmSYIfIxBmtdEEjX7ZAl3Ou8e95aLNQEJhN5IyTdPTo=; b=jY3Fsg8SS/bO8xjmDQjJZGcuXYnSI7bTWcbfGhd3PxP9dMQ3rwRgf5eeCiArKwQ5VFolih mr2tjQ6MojwkbpSxGqELBPBtZI1ZcuYh5DcUEF8sLFhJvligyXJWjqa/41fbf5lkeNIWsY 1YHmFTSBRRIdO1QNfnfCY53bqnN2m9s= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="IU0n/jIq"; spf=pass (imf11.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083202; a=rsa-sha256; cv=none; b=JjX5ssBRs7Mk5d4uCKdUPfSgTdXG8/4+TZPQpWrFW2E53JXjCrZo2Wzxcmi5E3Ww4D/n7i wHPAB69wpiJ9nlNQ2alcD0JGkD6I9eEi5aITh93n6pSJ69nEBLHC1toS/uAv4LT2dNs2Jg PtSZTGbMU0ZAQjgR+sy6XZTmIp55ry4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083202; x=1706619202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9YgTrscbNX5LAdfQjXqbAWnEA2G3jXjwx4fj1H6fE2I=; b=IU0n/jIqWYz/w5CeTDlSYXIRZCkyK/b5+5FEl7UkP+j3sy5OGoiuF6S5 t7EZj9ssvSSzhkIvp6Z/hoD6WbA7ZB0Xj2ay8PYfEZBFMrJkFMH5iFwHa vyts1Bj7OMyQPy37F0op2MHDODitsC6J3ICOYdkngpiWxfqN6/S+JwTIG xVfAJxCq8PP5PxmXJ5Y9Lx7KQfBo3lCDm6VJG+ZBdPQPl4tjMPMWhyNnQ 3ZJjoZCaJ60tw0nz6UkU+xjrxbrJb2YMea+etBPVNntiJ0tMnX4RuJayB yYbp37xqqIQasdbgIsxI4yQZ976wMLzzDQVeLCf3iB078T8TYULJc66O8 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823625" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823625" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614014987" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614014987" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:17 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 1/5] mm: Enable fault around for shared file page fault Date: Mon, 30 Jan 2023 20:55:00 +0800 Message-Id: <20230130125504.2509710-2-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: D8F2C40011 X-Stat-Signature: 4hy6313p6wwymdk67fqz74afdcfuj7qk X-Rspam-User: X-HE-Tag: 1675083201-104327 X-HE-Meta: U2FsdGVkX1+C8tVVgOWu0pfoM39mGlfiFWApMtLhmY2eoP85Fkf9l18cC8iV1p1II+Ys1reKb0pQRccY7aswo7BOqFozqOEBKHJ9Lmfyud/urKMswUyEwbq0DqNOkNhRpyVr6jy+r1oTdntMOFsA/Bqe+6lGlPHjvmiPDycd4E4raLnMT1SFV0whMivRsKW360CMtIiIBMFgmhG7j44nz4Yy359Pnd3HzaALcDXVSyTmvMTsAz6G3TLWaUPktPZgVcp2wooo5aBuWuoQf8hTACBt7WVpanP6HxwGfEYu2h+26c3x3ssF1mtPT84V7LqfmdT+NVCJD0UDMAqMEfSaw0GOItxN9n2p/6qthWsabcqpHRpEMdqVJFlJAXefOl4qShxuczdPY1QrqTTRFGx4Do3IsefjsqNWxf41EmP7Jz2iw7dkpa/ZMUQShLbfKj3oPtXHkZ4kS6hdeBFNSdF4jRoi8h7FhSvpi23lucv7r2bH18wIjz52C2kZ+N0DeBIYZcahHSrgpn0Ij9/xEOeiu2VDXdLx018r386BSz5lryl2aGa81KQTQhefmwIHpmmraR74Cqhqp4CgiumnrMtyhjWt+LlIU4LMX/KlowdVxC+KEeeLACFqvcE+HB3GVdX5l80nuZAomhqRvM8JyK6FH09uoqv4OvhpTDVZ+UP2Jof0CsgjUud8pe5z4323tvP+iWJADI13TrHj6pqyC7IEqM5NjMMJolRTAz9/OqJMIW5z1ABPT+Xx5lKRO2fvsblYZm8axQ/wAspImZwa6C0GovHcl844kIPTj+c+zHyVFmtvoZwqoIB8mgYsP9570g1DgQYg3anVB88clrty23cLyDTjhRoXWyd3jrewkgcosFrfaRMXVMjAqeO+B4yR37pJL06wZheJfsEmC69rJtqA+rXhAtORxM+f3srN32UClWwue7N9/Q0B5nnikR/11Ac49ar7VvsyJDhP7bFJOI3 AgStNEgU /DWuEGRpByL3KbY7lF2879jq9UeoDYENm8scZmaqp8KVcpidfL7TEpywdnpO1HSHd+2m2KXNIGpagnkeky3uBWCJv0VliHsMVsjD698/TOdsPgHeLHRNyeAhOYs1MpJZyg0d0imhGUIDXgk3g2wsABYhW6HxilMPRJxVvuxPolh0OPvo= 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: Allow the batched page table population added to fault around handler and benefit both file read and shared fault. Signed-off-by: Yin Fengwei Reviewed-by: Matthew Wilcox (Oracle) --- mm/memory.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index ec833a2e0601..61ccd2d7e6a6 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4545,6 +4545,17 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf) struct vm_area_struct *vma = vmf->vma; vm_fault_t ret, tmp; + /* + * Let's call ->map_pages() first and use ->fault() as fallback + * if page by the offset is not ready to be mapped (cold cache or + * something). + */ + if (should_fault_around(vmf)) { + ret = do_fault_around(vmf); + if (ret) + return ret; + } + ret = __do_fault(vmf); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY))) return ret; From patchwork Mon Jan 30 12:55:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yin, Fengwei" X-Patchwork-Id: 13121036 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 6B231C61DA4 for ; Mon, 30 Jan 2023 12:53:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC4B36B0074; Mon, 30 Jan 2023 07:53:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A75576B0075; Mon, 30 Jan 2023 07:53:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93D3C6B0078; Mon, 30 Jan 2023 07:53:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8752A6B0074 for ; Mon, 30 Jan 2023 07:53:34 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4ED5A160A44 for ; Mon, 30 Jan 2023 12:53:34 +0000 (UTC) X-FDA: 80411456748.18.4409E8B Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf23.hostedemail.com (Postfix) with ESMTP id 399EB140015 for ; Mon, 30 Jan 2023 12:53:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=MSBFOPKU; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083212; 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=mTJmSjZ+7gn5S8kEU+BvOEVTeQw3rq/jH7wAHhnOJqs=; b=rxieJvkU1H39vHdCBqjdJoykbQbG1ZUFOPLVauIQm82H21erYEsTGQWstcvNOYLxG2uJfu B9jJRME+TobFWeJfUQQmUMcNanC1xlcg1WY1pE44Ty4MeIw5gZGHai/dKyJqeXp/fbxqV6 k4vhEslAS0OB9hJX09KlPIVJh7W+Gmk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=MSBFOPKU; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083212; a=rsa-sha256; cv=none; b=C96wY32cCKWMDAlff+riy1IBuc2crIrFky3mzITY6iTGx+HrXe3YwlBtlL/4yDPtCA9gvj Aqtzm9Y19S2pLy15gB2scBm7WSsnjLRGiU6bwDLa6e3EBOFCsXHvEpBicUVk99jtVpbyDB /1pmBOCdyyCFZI9tBWuvIPXj0YUqwdc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083212; x=1706619212; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kXn7UAz+1IVs/Rr4mbkvdX6G6cuSg/lPsM7U+xkLJeg=; b=MSBFOPKUgDoNOu/eKAEAB5Ro23wuAlqaeYLOMNHpexcrnhgRECIup7Wv SZdfcdRaqKPPYEiIxJdPic88oB0nQk5gh4HxqzXjt7PXy9wWojr3hntVi 2a/G6D48rbtajzUvru6QK32UfH9Wjr6DbWlz3TPez2fKUsx9cLUWSihv6 QIheBRiq7G/j5MzlMa2659eOXr8TD9POgO0xfxk1HaKeI/90F3DkwAEJa ftwikrlJCT3KeGIhgCF3aOxCA0TARhFVyKwDeBTXRXUI85RZec1AM7OuY Y4tlLNsVDkXQGgl2r95Ay4h+fSXlBOHDlu6owDPYSKtm9hZrJ+JPxipE6 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823667" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823667" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614014992" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614014992" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:19 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 2/5] filemap: do file page mapping with folio granularity Date: Mon, 30 Jan 2023 20:55:01 +0800 Message-Id: <20230130125504.2509710-3-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: fktbth4btqoywtbwpnrkcox411sd51fd X-Rspamd-Queue-Id: 399EB140015 X-HE-Tag: 1675083211-256953 X-HE-Meta: U2FsdGVkX18Q/7wtC6Ct53l0arjDD8vDExcqILZ4vwEBDi9PSppQuN3AcEPUR0eu8XeZHBbpjEa5j6CUsxyyVpMXotdxEsEtu49jTH+wxxB9XwJwESiJJS0n970AwUdmKXpQvbmsFWq0CNQ9pRBwxtFV2jFFhCrjiqDTdbgNvD2AOVmWh2wb/RCHioXHwQOSXlNnJR1jH+AVjse2/f58AvLm4aWoW9IlYxOkbpOGGMcRI56NAtEGdGrjuOk0AQfxrzPUpcOCJ2ivbchifwhNyPMjIWYk7TXbwy3qc0JQS9NRtVsbXgOoWv98Lh2tzE+YqC9m+iUJueXbr/XTxyLLa/lKA78+RB66Gp/XzytNa6aPjk4u/mnVQ8U/Ly/btDAa9/djjjSEDQzoARaLzx6yRDyBuh/Y+/xhLKXRWrlda/nFKPJQj2PglRobg1ArknKM6a//pDq9+HmySTN245gswbApTtfsOFurLa/UhhDHt4Sko5BafwFqt0Ipm+cpzIRjaEjgfyZ3CQDiYHyGK6Nv+ZG+eY/hNGPlu3hYv4Q/ZkyByO9Cuq9SI0JawCuZCkByHD3ygRqFx+1DOsTpGdLBOqvWy1Y3dTT9Wuq/kzBUOWuNZQfC63m/iAOk4DvzPSKqb4zP6TfxXW0gcxT9MUWXsW790+T0u+Zqi7Stn+v17NBhQlCX8TKsbnSiI57UhiT20nDNB6JLBXOs6CynbrG5KrP17MfYZaOaXmCtg7/CjGGtZYm7LpqGlVHqUUk6msdbZ3lhI1wolh+2R82CXtnXbBREgUW2q3rO+ts5hZmZTv6fR+r77EutGRrkKoC7Sq4r+yu3h7IeSdV4IXDyPs56A00L62hC9pnO3qhdQ4OTOmzs6tPfWEhiPzHHQfhh1+ddFNQEZCqjYhd1Mf8pEYuSjX9WdVcf0o3AMPyPq7gTDVykDXtWONqJVfUe7+fGkJD7IRL0oblc/2ErAmZZEzb 4LRbUGe4 i099dDF3hJbGKibh67l2pbMc+nntiMvUnPK3sO1z43Wi1FcrBzIG1yEKizXDmh2sCh3hb67OGSY3/PPJ94ye/AUh90Xgf43+5+Fj5pF578M4xSGX1Oy9mozfegDPJbhXbI74ib93rg2ONfQk/nCu+L+ApGqJU9mtF1j2Xk6WIW8SRXVU= 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: Add function to do file page mapping based on folio and update filemap_map_pages() to use new function. So the filemap page mapping will deal with folio granularity instead of page granularity. This allow batched folio refcount update. Signed-off-by: Yin Fengwei --- mm/filemap.c | 82 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f0..fe0c226c8b1e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3351,6 +3351,43 @@ static inline struct folio *next_map_page(struct address_space *mapping, mapping, xas, end_pgoff); } + +static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, + struct folio *folio, struct page *page, unsigned long addr, + int len) +{ + vm_fault_t ret = 0; + struct vm_area_struct *vma = vmf->vma; + struct file *file = vma->vm_file; + unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); + int ref_count = 0, count = 0; + + do { + if (PageHWPoison(page)) + continue; + + if (mmap_miss > 0) + mmap_miss--; + + 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 < len); + + 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 len = 0; rcu_read_lock(); folio = first_map_page(mapping, &xas, end_pgoff); @@ -3378,45 +3415,22 @@ 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--; + struct page *page; + unsigned long end; + page = folio_file_page(folio, xas.xa_index); addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; - vmf->pte += xas.xa_index - last_pgoff; + vmf->pte += xas.xa_index - last_pgoff - len; last_pgoff = xas.xa_index; + end = folio->index + folio_nr_pages(folio) - 1; + len = 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) + if (VM_FAULT_NOPAGE == + filemap_map_folio_range(vmf, folio, page, addr, len)) 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; - } + xas.xa_index = end; + folio_unlock(folio); folio_put(folio); } while ((folio = next_map_page(mapping, &xas, end_pgoff)) != NULL); From patchwork Mon Jan 30 12:55:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yin, Fengwei" X-Patchwork-Id: 13121037 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 1DAD4C54EED for ; Mon, 30 Jan 2023 12:53:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B7AE6B0075; Mon, 30 Jan 2023 07:53:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 768896B0078; Mon, 30 Jan 2023 07:53:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 630896B007B; Mon, 30 Jan 2023 07:53:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 53F686B0075 for ; Mon, 30 Jan 2023 07:53:37 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F1A94AAA28 for ; Mon, 30 Jan 2023 12:53:36 +0000 (UTC) X-FDA: 80411456832.29.83299A6 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf23.hostedemail.com (Postfix) with ESMTP id 99B5014001C for ; Mon, 30 Jan 2023 12:53:34 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="U2Z1/gaj"; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083215; 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=4WRcDdNgpYDV/LC6/nL1u74puVQasX2vgeOtMR/D/Ug=; b=ZC4sWOhwI7XwH4HFsgbDjh/VsjKcvdSyPyuAqgG6JipcG+NtesgEHG9+cP3AsC6BBdpXMA 4SWQ91Ghmt6bgVob03729jlnG8rb5DJ2BbGpcg5I9O9Btzah+r1c1GWuIAE4alC/BCBBt9 H3xOEilVoWmhOCRl4W7FBrlTpFKuA4o= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="U2Z1/gaj"; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083215; a=rsa-sha256; cv=none; b=pptBMXcBUMCLd4JmiIerexxl0rIcSPgTxMcOrHOcXgqv00MkYSzontpCimv40uh+ShTCGu AZ6mnMbKx/PeRLK4gGAEwVetQeOU33q2LoyDYXUO3XiSs0sKbj9488aQsUZtSG6iAjI9pT z5rPp4jRqFvAUQh3wZCtM4DkSIyPyG4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083215; x=1706619215; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ueNrgpVcUcxsqqen652gJ61fvtMnDOWPrp2ZsZCpvic=; b=U2Z1/gajSDyUx3Pqm8TMj8y+ZOEI4CjXxLV2fonXIomgI7fF82yYmHPj PMRADkqXbTZZh5VmMB9TKUJvEqgY/6yHZX6xIdycjmct8PTSkElCM1UIx 165WNwW7kUdaff25m3F6iZYR+H9Vm3g3MHlzZ4ry7U6d4lLeRfWwFNvI8 EpSLfcC8ZA1UapSywHqwk9DPJ7wVSW+qThGy1cVcX1s7J41MwvlkAvnzg DyBZgLLuHXWwIr7ngaUum1chYfP29S6uYvAg3CV1iQC45sL2A/9C1HynR jTs5V7L1OYTm5YHIJLqB7CG5Ng8VyIvK9gygSvkxrmkM2bppIsVxNnYwE Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823687" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823687" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614014996" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614014996" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:22 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 3/5] rmap: add page_add_file_rmap_range() Date: Mon, 30 Jan 2023 20:55:02 +0800 Message-Id: <20230130125504.2509710-4-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: sq8mffp31boh7y7pnh9kbrpfmu7qjn7p X-Rspamd-Queue-Id: 99B5014001C X-HE-Tag: 1675083214-285528 X-HE-Meta: U2FsdGVkX1+Jl8zEATRw89E8+ZKQR4bhdeG6SX90DUQsv9goQuYJOnE0XsyezmDPGsBb+lSAcGzqaLfZFkz8dHdaqDSZifsNP1OQSJJ5bPipZcM3TVPwhyowyL0XmQeiK9OmCynJwDU8oyC+qG4E8hK3ma+hnAA2vULnf7J2lHBzmR5vhbFU1RP+Nz1TOuZ1tMM3a4TPxXGHOvhbCsEU7lC4oo4AtIKuJW2iMJs7z7nrHK4l3LmRLAh564udkOai0pln/v1hoSw0muBglJekEA5MOmcP1nFeQk1t/TSjBEW49EfGDSHvDujMAqto/BrtZlkRcVpIn0ojKdFkS3XpgfzmScjR8jjS3qQMGImvwKc8MyjFIdR2xZxTgJRASpmf7ePMGnUdGZm63NJJJXk3oAsS6FqERs0db3JgIH1hAlSOqVn2CDs4TfKSGvtHAMWcHeu4T6OwyrHzo4k2hgzFFsUMQsVwv2RIgYwF4CYxZPhQYYeuXRVb+3ZghqTlJaRNazJIo9cl0B9JQOJZEkoT24KJ1mx06XoGtXW4kvQmalAxD4SwiApP1YJlwd9reAm8QUpgJYuk3IzJyUES2PVzfuU/78YqfcaNYfAswv00Ab8s0Q0VEz+wvWoiAieMZdHA1H3ltpySP0c+iqZHUe9VpIO0ogPyrR2OQ5lfXQYLbqEjYbBtIKOKj0ZiISLpacLEAeyC6mS9YOCBdIQ9/xoqjEetIh1p+2dPo02lJ4T0da8sG2WzZR2sx8FIrmSL/EOniDK60RvtItSomcKzYKXS3ZBcS+Fc/AjEX6A4ClIG96XVPW6ppZajx2F0GzerB27KayOPnGV84XxwZeLxloBbC2nOzOv6AZI9yizIpF+jrCWjF2Xbh+2VWBfmqy62t1cGd/04JHiZNXS5Fp4LYYZBSEgk9quD4WvjUPMuNArWTY3u4IJ5j6ZBXsdJHPNCsCgg5tdRPiarl318blZ2syW 7ksG5Cfh go8v5Oq7HosPxGLReFIx3VndFX9aDarZOdYfybpI6/a69JXkgzuLR8im6SzjCkhUdlfOwRrhl6mMmjRyelrFESWrlbqcii+qkXMEyUejWYDaYECLVEbJ2Qg9naCLRc9SKvYDOBmYCzUw3U5FTbjLj0TWGqSkVW8inz2pVTtRfcdbEGCDd3uoAZ8bmndw5fbQ5udsY/z7+4zdi7TGgxl19iIvt0cZGUgUHkOjo 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: page_add_file_rmap_range() allows to add specific range of large folio rmap. Signed-off-by: Yin Fengwei --- include/linux/rmap.h | 2 ++ mm/rmap.c | 70 ++++++++++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index a6bd1f0a183d..063e0addcbf8 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -198,6 +198,8 @@ void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); void page_add_file_rmap(struct page *, struct vm_area_struct *, bool compound); +void page_add_file_rmap_range(struct folio *, struct page *, int len, + struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); diff --git a/mm/rmap.c b/mm/rmap.c index 948ca17a96ad..cc7fe3010330 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1301,40 +1301,19 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, __page_set_anon_rmap(folio, &folio->page, vma, address, 1); } -/** - * page_add_file_rmap - add pte mapping to a file page - * @page: the page to add the mapping to - * @vma: the vm area in which the mapping is added - * @compound: charge the page as compound or small page - * - * The caller needs to hold the pte lock. - */ -void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, - bool compound) +void page_add_file_rmap_range(struct folio *folio, struct page *page, int len, + struct vm_area_struct *vma, bool compound) { - struct folio *folio = page_folio(page); atomic_t *mapped = &folio->_nr_pages_mapped; - int nr = 0, nr_pmdmapped = 0; + int nr = 0, nr_pmdmapped = 0, nr_pages = folio_nr_pages(folio); bool first; - VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); - - /* Is page being mapped by PTE? Is this its first map to be added? */ - if (likely(!compound)) { - first = atomic_inc_and_test(&page->_mapcount); - nr = first; - if (first && folio_test_large(folio)) { - nr = atomic_inc_return_relaxed(mapped); - nr = (nr < COMPOUND_MAPPED); - } - } else if (folio_test_pmd_mappable(folio)) { - /* That test is redundant: it's for safety or to optimize out */ - + if (compound) { first = atomic_inc_and_test(&folio->_entire_mapcount); if (first) { nr = atomic_add_return_relaxed(COMPOUND_MAPPED, mapped); if (likely(nr < COMPOUND_MAPPED + COMPOUND_MAPPED)) { - nr_pmdmapped = folio_nr_pages(folio); + nr_pmdmapped = nr_pages; nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) @@ -1344,6 +1323,20 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, nr = 0; } } + } else { + int i = 0, new_mapped = 0, count; + + count = min_t(int, len, nr_pages - folio_page_idx(folio, page)); + do { + first = atomic_inc_and_test(&page->_mapcount); + new_mapped = first; + if (first && folio_test_large(folio)) { + new_mapped = atomic_inc_return_relaxed(mapped); + new_mapped = (new_mapped < COMPOUND_MAPPED); + } + if (new_mapped) + nr++; + } while (page++, ++i < len); } if (nr_pmdmapped) @@ -1355,6 +1348,31 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, mlock_vma_folio(folio, vma, compound); } +/** + * page_add_file_rmap - add pte mapping to a file page + * @page: the page to add the mapping to + * @vma: the vm area in which the mapping is added + * @compound: charge the page as compound or small page + * + * The caller needs to hold the pte lock. + */ +void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) +{ + struct folio *folio = page_folio(page); + int nr_pages; + + VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); + + if (likely(!compound)) + nr_pages = 1; + else + nr_pages = folio_nr_pages(folio); + + page_add_file_rmap_range(folio, page, nr_pages, vma, compound); +} + /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from -- 2.30.2 From patchwork Mon Jan 30 12:55:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yin, Fengwei" X-Patchwork-Id: 13121038 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 26CF5C54EED for ; Mon, 30 Jan 2023 12:53:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3A066B0078; Mon, 30 Jan 2023 07:53:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AEA566B007B; Mon, 30 Jan 2023 07:53:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B2126B007D; Mon, 30 Jan 2023 07:53:48 -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 8F17A6B0078 for ; Mon, 30 Jan 2023 07:53:48 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 697FBC09E5 for ; Mon, 30 Jan 2023 12:53:48 +0000 (UTC) X-FDA: 80411457336.28.E7D39D5 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf28.hostedemail.com (Postfix) with ESMTP id 4426BC0014 for ; Mon, 30 Jan 2023 12:53:46 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Ytj0Nryd; spf=pass (imf28.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083226; 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=UDXmrbegYLTuXHgDD2SmYvzAqdCMWe1cCahq9C1iby0=; b=UmR+X+sLaNOqsusQoUJvtJigRyRYfKKKi+xwDfYohesOxaPvurUvq2tc/pTtAvtU+5b7HL u+NDmf8Cuwt3uuMv6eVsl0JbvaFUx/0f94I3q8Te7u86Od6hyeYqYgZpWcDyy6kUDTGVBO G9RxM5lvi8QSOR0lk2W41IrjXx36i1M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Ytj0Nryd; spf=pass (imf28.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083226; a=rsa-sha256; cv=none; b=Wb6+RDOX0DNyXbZtCTFsMQ5AbZwWYbfpgsor+pSOqy5OpjUwmjdFrw5ihF6Nc3crCmYmVN pbINeUJexC/HBVY6IUeBVdZszrH253m6hXFuuMgIDln+r7KsPXPc6GX67Y+4+mX3jP0tfU 7hCEDmesAPAWEqH5pSuvebXV/R7KgXQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083226; x=1706619226; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4PkbmkiBM6ZMwzhdipAAaEzKOOa0X6HR9rJlX2+3lb4=; b=Ytj0NrydSNzH1Cd7RIurDMiEC2XKeT7WAzT9ODVz4SlDO2Z6SMtgrjq7 VHVdCqqzYzZM6HMJ+RSa5Lb3pTGSSeRs88ahf9nIy3OvOau3mOHobb1E3 xkbFQ0RWDEkYdq7L0bn67Fl0Hy8gi0pnVtQ5ilx6PF5HA6JBQS5phP+pq 4qyTpW/yHgLxH9ya/NlYHyRq2AgiALh6vqOudazeQF6tZHjjhcLpQayyn EqL6T2eyzymBuetZSRTkPdOOMzvs6JSwf6dT/6iXFL+02GjU5mUnWGBaX V9z/7/uezsLIMfRIuVEmLdpfcKrNaz+DU7MlR9cwMicNh6jG2YKaeq4+D A==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823776" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823776" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614015000" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614015000" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:24 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 4/5] mm: add do_set_pte_entry() Date: Mon, 30 Jan 2023 20:55:03 +0800 Message-Id: <20230130125504.2509710-5-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4426BC0014 X-Rspam-User: X-Stat-Signature: ojp1geft7xdf3rx6ut88tmrktsxfwjf3 X-HE-Tag: 1675083225-896396 X-HE-Meta: U2FsdGVkX1+jSSHR/fUqsXY54L4PqyjD/dDzijl5d/A+3fSQQcr9gDo+arSF4jWutF6ATWAOcpxTIAw2yNIhUEPEyasDORp+SWIJpX43i5zZOdFUAnlvd46RGe48xV4VQf0MeCjOAdVJg96SWHR6WlQ8rQ90SIICfPhBy4pVhSJBm3Nf6fPaDPkadVgUPGo2gdKo9aaOf2ElYvhvWVIk9PB3+9QWE546J2viJzaBPGmuvzH1YXNIU7fzlrVcdIubNUnW7hF7I0nNSNF4LwquJCHMFkKJlAexEVInAtbBQO+hQB7Z4GbYnP6XG3Hlp+7wm87b87UiwnhEVlwNCH8ALdfohQbQxFW9aZHHtDjVHSyJgK/aszbTxbqQGwdiEBEWdLG9c2CRPg8mMMzCNCJNAjjxgF85dsWKgTv7XCkmhbWrmQ4HxlQlG5GgISwzXK0Fu8CQ3JD+CtG40kNlOVIJdobAKybIg5G2ei7hLTu8C3slhbl5qV1Fx4EiMUHZBhSI0Rz0m0ASKPxfDjhRRtKZYrvbM4raZ0jJ8xdSO7pwdhBfiyizgJNfidki+VVa833uUGMahDNd/JkQ8BA9FULO8rZAysLk5GcKfQ3uOqdEUb0gQ0NZPaRaIwxpKWykV98JefEkFOEu3gSdEr8VcDyyQLnrMTh3ZbFq4D1Z12iv3bhd/GZnGarTEts7zYM35zvaHUjKxM0qbeFPG5IiqGlkpMK1PY2OCZrcvWHzjYZYrBeNSeBYo/ygW7guvUMbnX+bZUlwij4DAlK8E6jjs9jxl6ZcMsldabZkbvrzMeTAQC/4oMiGWFq5nbchxNKjSRLQAc5FH4C8Bu9lWK4mG4UpyVG6pdXJZzJ69C1TSH3gl1luuZBmwEm7I1lah2JZ27sNkvbfVxJlKdkfmptBj3x7fnvphwloswaXwxSeRgC1NDNh9l5iAHfGCLNsk5N+IUcxH3GLDZfDES7L1pb4DVg tkrTrLHd WApL7AKzG90iAIW3mwZHDjBWzuXP4LIW8iu40sGEewqFr4bo+zA/v8dg0f8hmZHHY1OcorKaDpDNtVkK5TakhKRDPeaVmAF/o+5FGr1LIrpYDygOpeO0rL4E2aSlsZ7GFMFDnu2woCSpD/FdbMU+q1KhiEiyhk1MaWXgpMqQgP/LESjUXJDmFhbrG1o0JM/Uc6PzaY3ik4mVtPktOu5IYV0wRJw== 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: do_set_pte_entry() does same as do_set_pte() but doesn't update mm_counter or add file rmap. It allows batched mm_counter and rmap operations later. Signed-off-by: Yin Fengwei --- include/linux/mm.h | 2 ++ mm/memory.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 63c0e645f37c..f31426a40e05 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1061,6 +1061,8 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page); void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr); +void do_set_pte_entry(struct vm_fault *vmf, struct page *page, + unsigned long addr); vm_fault_t finish_fault(struct vm_fault *vmf); vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf); diff --git a/mm/memory.c b/mm/memory.c index 61ccd2d7e6a6..d0c27e11fab4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4256,7 +4256,8 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) } #endif -void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) +void do_set_pte_entry(struct vm_fault *vmf, struct page *page, + unsigned long addr) { struct vm_area_struct *vma = vmf->vma; bool uffd_wp = pte_marker_uffd_wp(vmf->orig_pte); @@ -4276,6 +4277,16 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) entry = maybe_mkwrite(pte_mkdirty(entry), vma); if (unlikely(uffd_wp)) entry = pte_mkuffd_wp(entry); + set_pte_at(vma->vm_mm, addr, vmf->pte, entry); +} + +void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) +{ + struct vm_area_struct *vma = vmf->vma; + bool write = vmf->flags & FAULT_FLAG_WRITE; + + do_set_pte_entry(vmf, page, addr); + /* copy-on-write page */ if (write && !(vma->vm_flags & VM_SHARED)) { inc_mm_counter(vma->vm_mm, MM_ANONPAGES); @@ -4285,7 +4296,6 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) inc_mm_counter(vma->vm_mm, mm_counter_file(page)); page_add_file_rmap(page, vma, false); } - set_pte_at(vma->vm_mm, addr, vmf->pte, entry); } static bool vmf_pte_changed(struct vm_fault *vmf) From patchwork Mon Jan 30 12:55:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yin, Fengwei" X-Patchwork-Id: 13121039 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 8B739C54EED for ; Mon, 30 Jan 2023 12:53:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 238D16B007B; Mon, 30 Jan 2023 07:53:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E9206B007D; Mon, 30 Jan 2023 07:53:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B1446B007E; Mon, 30 Jan 2023 07:53:56 -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 F0A326B007B for ; Mon, 30 Jan 2023 07:53:55 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BF4881609EB for ; Mon, 30 Jan 2023 12:53:55 +0000 (UTC) X-FDA: 80411457630.20.B255C16 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf28.hostedemail.com (Postfix) with ESMTP id 8E755C0013 for ; Mon, 30 Jan 2023 12:53:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=i+DKUVyL; spf=pass (imf28.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083233; 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=j0c9aamflhnbyccq2FhzqL4mmTM9eg1G9IkMY9G7LYg=; b=6BzclNTh9Dbk6DuXBzbJGQ9pzXESxVcIebVeGnpZmvF1T+T146mSk82HYAQUsSqsjF/IBT rUqfTIJeV5fGMRRHcYeiol22ajvnTvW+L3DfSNr2C7FhaKexEcP43c08aTgS8Y1mJfcHZ+ C+hVIzvJ4f37fq8muNL3k9klQ4jQ1xs= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=i+DKUVyL; spf=pass (imf28.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083233; a=rsa-sha256; cv=none; b=PhQ+J7ZZT6YHI8GYwtMnSERxP1hPGANbTkuuOMAFAnPa8P3vxYFzDDRhsn644J5BzbA2nB NjfwOigRQkkalMlJUGpJr2H+IvrHzQu/o5qgaGgiHtOKUt79S2cKSxJ9g5exNLhDAwbnOD Fni9ZJvtvKQwZYkeUBOZQzdyS6NJhbI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083233; x=1706619233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BV7otbFxbnZltGO0oVLmlb9tBgsYOULHL9VhspoIUTo=; b=i+DKUVyLI1ynPqiPeXZRpbSzNyXYI8oN2w2/p92Gi75YjHZ1/taV2QI2 sV5WIlUS97/NwkCmKM8GD0VnKxYA0WuUqTw7N4JFNZNc40Sg5pYWFsihj xiuMcvZOCcAnA0LXsT6uJEJHsK6j5gTkbCXygn4rNeBp5rb0xtd29FVyo VA9Zv2RraCwINGC4EKEPpsXvAVWkdMUyh/cjOTkJiAssbGELLV5j+zYdo o8/7bnlYAZOHv5Qv2hFufOrHl5NvNv0MdAw4HQSWZ6+HOBfHA1ExgXEOn m+43FeEb9Ktve5gNbQGqW5E6J7+PZfTIxYoRY3d0YZ0yOb+0q/mrOHFBJ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823824" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823824" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614015004" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614015004" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:27 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 5/5] filemap: batched update mm counter,rmap when map file folio Date: Mon, 30 Jan 2023 20:55:04 +0800 Message-Id: <20230130125504.2509710-6-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8E755C0013 X-Rspam-User: X-Stat-Signature: ewcihaikspi4bgsjd4i845sza53j7dog X-HE-Tag: 1675083233-686954 X-HE-Meta: U2FsdGVkX19Vb/4fCi8t4Fs2jYaz2iYcyn9HjyMc88dsQ3LdpfMwHAk34xVArNZ0tQWjwkQS81UVrhOBSGp5NfRSetHz0S7LGnN8M7zTcgzUv1jk/roweNw+WQcbz5SMSCFhTmgnILzT7JA4T9JKBrzceWLqqxD3XK8DslXzNrtgePtJwmeFZvhhMiVunKpht+Yut5kqi+gqw7nLt6OFwVU1Zm+QQJzcuOOZzemK/GK2GMd2G+ESIgeqlYdmmQI98DC6sdHnaY3pzVU5il4VigozzA4Ht17PaP9qWOCbFE7MUJ7q/sKcMIKU2HypqsW1f7nUMsvwu7Rf/aw96sJvFmtwp1eqS64Sz/Vf8GkeRuWKxmZPGDwzoSkIZb2h2mKdcZAcNK6YQKQYGsv7dLlM39qgmTM7BOVKia+mV/UNRXH8YVBgt4y+JV1tqOn5YxJDIxbDJJPOGPbULrIVPPTXUhgTOoSDmZWFDnOCjorT8Lb3IuF78OTEWLN7vvMp/OllfQrhKhsnvZ7ZoPQou2OvOKgYr1ycKX89Ez1yyyNHxTuGQgkYm9y0s2P03Xy3xefMnCnwTulWcWUZdEUtnul2pJMoHWZH8zJZR+hL2uj5Jo/so2wg79Gi1HiYSjtSa7yc5ACaV0MsKhb9w81KmFbmrKodwSzWJ04eAxgmueC0iCNJQNp0YYQUOtAFTeAvApOJj5m13sfsMJGYMdIHCyurKsxSceYDaaQU8lrnqtrGaKwmkIdB38jJjI8TBwFphiD6RYpTZ/O0rMyxmxC1orcfE296jVmtd5C7cvYvCME/jXVc11DXse+vbM09IOlFSmpENId4u1VkRne195uPdGqMU2q3GFiMODhYW2+7HqL4GWLa1tKzAUXhEML1ejoZPiIBWBXK7gK9WMSxOUdifa1EIylZ4UFxp4b4HA+ntCLQOdPBR/dyu60BaYwSghj0WHMDs5kaDWjFp6PsiWcLiia x/qGNRW6 QvTmaMtJnta8tOpT2a//SvCc8w/24d26lwufmXxbPql1esGTibKtj8ok9RzAx59Q+pvmj3KDLpm9g+eemmtuNBFbcR0qjBGtaX+R1Rmj+MqcZ0czDHtBmZRLBlXGI/cIdEnay8wREIP/g4RPUnMnm+NdqTH4pXhnAj8CVdrvVsprqWILgOAJ2hGK+rWZvRF9iKD+l95qlfKQk/D4KTrY/Hx6M7g== 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: Instead of update mm counter, rmap one by one, batched update brings some level performance gain. Signed-off-by: Yin Fengwei --- mm/filemap.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index fe0c226c8b1e..6d9438490025 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3360,28 +3360,52 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, struct vm_area_struct *vma = vmf->vma; struct file *file = vma->vm_file; unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); - int ref_count = 0, count = 0; + int ref_count = 0, count = 0, maplen = 0; + struct page *pg = page; do { - if (PageHWPoison(page)) + if (PageHWPoison(page)) { + if (maplen) { + page_add_file_rmap_range(folio, pg, maplen, + vma, false); + add_mm_counter(vma->vm_mm, + mm_counter_file(pg), maplen); + } + pg = page + 1; + maplen = 0; continue; + } if (mmap_miss > 0) mmap_miss--; - if (!pte_none(*vmf->pte)) + if (!pte_none(*vmf->pte)) { + if (maplen) { + page_add_file_rmap_range(folio, pg, maplen, + vma, false); + add_mm_counter(vma->vm_mm, + mm_counter_file(pg), maplen); + } + pg = page + 1; + maplen = 0; continue; + } if (vmf->address == addr) ret = VM_FAULT_NOPAGE; ref_count++; + maplen++; - do_set_pte(vmf, page, addr); + do_set_pte_entry(vmf, page, addr); update_mmu_cache(vma, addr, vmf->pte); } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < len); + if (maplen) { + page_add_file_rmap_range(folio, pg, maplen, vma, false); + add_mm_counter(vma->vm_mm, mm_counter_file(pg), maplen); + } folio_ref_add(folio, ref_count); WRITE_ONCE(file->f_ra.mmap_miss, mmap_miss);