From patchwork Thu Mar 7 02:30:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13584980 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 1E286C5475B for ; Thu, 7 Mar 2024 02:31:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70F8D6B00DE; Wed, 6 Mar 2024 21:31:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BEC36B00DF; Wed, 6 Mar 2024 21:31:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AD736B00E0; Wed, 6 Mar 2024 21:31: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 4C5C66B00DE for ; Wed, 6 Mar 2024 21:31:11 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2B3CE1C0B49 for ; Thu, 7 Mar 2024 02:31:11 +0000 (UTC) X-FDA: 81868665942.02.1ACAE06 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf14.hostedemail.com (Postfix) with ESMTP id 1299B100006 for ; Thu, 7 Mar 2024 02:31:07 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709778669; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=mSz4HojFJ/hBHz73kfPQ/j8nLH8CDdHhVHIXx1TjPj0=; b=AlZG+Q3JwoiW4JbvBsnaosKwFpch1SjIP6FDjOvvuRqTmqlBTlCOAjsDXbbR3nKd72nZTJ vjvEqjUZLqNjIwmFttJmXmYJpQ4fMvYIwpt4Nf9sc3xoKmKUnhAbKVYCetDlg6sxYURWt+ Fu8fVAg56GO/AyCU3KG6Nm7hiF6snlE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709778669; a=rsa-sha256; cv=none; b=vrj+QxzZK6q9ymVByvJMol98ycQFkEQv/09Z3sjZfTkDXy/IsaIy3zSbmgNkP6oe6CC5hZ UOG7iWXAuxJH6dWrZsJwcxHV5ehOhuORRwbgPVJ3aI31fm/aBXeazG+ZBQJgexvaHY4aQV Yh1/mBRpreZ0yd+FEn++Pjp2wsyX4Qo= Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4TqtY05dRNzNltK; Thu, 7 Mar 2024 10:29:24 +0800 (CST) Received: from kwepemm600020.china.huawei.com (unknown [7.193.23.147]) by mail.maildlp.com (Postfix) with ESMTPS id 950EA18006B; Thu, 7 Mar 2024 10:31:03 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 7 Mar 2024 10:31:02 +0800 From: Peng Zhang To: , CC: , , , , , , , , , , Subject: [PATCH v5] filemap: avoid unnecessary major faults in filemap_fault() Date: Thu, 7 Mar 2024 10:30:55 +0800 Message-ID: <20240307023055.782117-1-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600020.china.huawei.com (7.193.23.147) X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1299B100006 X-Stat-Signature: qaka5ir4ikjs98ajbcwq3otwhtmpqkb7 X-Rspam-User: X-HE-Tag: 1709778667-614652 X-HE-Meta: U2FsdGVkX181ujVgFBGOqyFc5urKJZYWSjn8GGfzhcR9JW31JzLNVClUvRyiMPy7ZQjXsZrxP2G955jw0XpToy7QnUh+brl2HO3/jFW2v2ytuu6eAEpio0cJX+1h+t3m1rFvUlazM9Q/WfQnauN5HUQphOBpyz9uSgDzwONxbEgoPhLQibrr5jgY+Ml5jz33somMFuRYaE7Frfd/42k08JRSVR7ncP51+Rg5C54Fhdf334dB2eJEcCVYBC/0m8hE1VYT+EbXFAV4CZjSUqPW3+gHYSNeMKJPxRy/EVkiWdOd/iLpUJRHpS2cU8FBt0SS6mhxXwCTtZg6tx4upywvmlXOiAobM3aaO79n2fuWSsq+4kukRCoWZAMPgd2U5YzVEtEQDmVCHwVldO9Si0TE4dyT0a7KppGiugOhfqOojcWQ4IKZ2XeTEh7bHuX2CBUd2D7URyyE8xzi63qAkSrWySXtr5FmL5oBPawkdzJbcbuM/hiMtd/0umvKsJSnZQJhyn0iOra8M6fa3kw3KyzftkmM+IsWNzw5yPEGijWNeCHXqW17z+bzqyUeKj346AsSGwqtoEamxpWRSOnN2pBuGSs5A1shRPxPNLEbKY/SdJJv6MhhGqx75EZ6SHQCPSuT2qmm51KzTBDloXqotv+QzF0efq+ZMvQ7cohCyccZigYBeclk/FsnhNczIZz5LbslaayMmv1sYNje7Bl8z2S63M29SmD6jK8dHy1Dj5kcd1VA65/Ldma9l/iAZnzqW8hWoWzSPWv8wD7JnA1q6n/pWYqrU5N+4fRnCoe+VDD34FbgJKP3LCcSeHG/bW5nHPGyWeheMHk8xlKUerNghqo1+aDXDpcyAcd2xJTk/o6xLZUgdkWgr2kyLQqnqiYMu8HN46WuQw+VxHcAh72rMDQf8Q== 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: List-Subscribe: List-Unsubscribe: From: ZhangPeng The major fault occurred when using mlockall(MCL_CURRENT | MCL_FUTURE) in application, which leading to an unexpected issue[1]. This caused by temporarily cleared PTE during a read+clear/modify/write update of the PTE, eg, do_numa_page()/change_pte_range(). For the data segment of the user-mode program, the global variable area is a private mapping. After the pagecache is loaded, the private anonymous page is generated after the COW is triggered. Mlockall can lock COW pages (anonymous pages), but the original file pages cannot be locked and may be reclaimed. If the global variable (private anon page) is accessed when vmf->pte is zeroed in numa fault, a file page fault will be triggered. At this time, the original private file page may have been reclaimed. If the page cache is not available at this time, a major fault will be triggered and the file will be read, causing additional overhead. This issue affects our traffic analysis service. The inbound traffic is heavy. If a major fault occurs, the I/O schedule is triggered and the original I/O is suspended. Generally, the I/O schedule is 0.7 ms. If other applications are operating disks, the system needs to wait for more than 10 ms. However, the inbound traffic is heavy and the NIC buffer is small. As a result, packet loss occurs. But the traffic analysis service can't tolerate packet loss. Fix this by holding PTL and rechecking the PTE in filemap_fault() before triggering a major fault. We do this check only if vma is VM_LOCKED to reduce the performance impact in common scenarios. In our product environment, there were 7 major faults every 12 hours. After the patch is applied, no major fault have been triggered. Testing file page read and write page fault performance in ext4 and ramdisk using will-it-scale[2] on a x86 physical machine. The data is the average change compared with the mainline after the patch is applied. The test results are within the range of fluctuation. We do this check only if vma is VM_LOCKED, therefore, no performance regressions is caused for most common cases. The test results are as follows: processes processes_idle threads threads_idle ext4 private file write: 0.22% 0.26% 1.21% -0.15% ext4 private file read: 0.03% 1.00% 1.39% 0.34% ext4 shared file write: -0.50% -0.02% -0.14% -0.02% ramdisk private file write: 0.07% 0.02% 0.53% 0.04% ramdisk private file read: 0.01% 1.60% -0.32% -0.02% [1] https://lore.kernel.org/linux-mm/9e62fd9a-bee0-52bf-50a7-498fa17434ee@huawei.com/ [2] https://github.com/antonblanchard/will-it-scale/ Suggested-by: "Huang, Ying" Suggested-by: David Hildenbrand Signed-off-by: ZhangPeng Signed-off-by: Kefeng Wang Reviewed-by: "Huang, Ying" Reviewed-by: David Hildenbrand --- v4->v5: - Replace pte_offset_map with pte_offset_map_nolock per David Hildenbrand - Collect Reviewed-bys v3->v4: - Update the performance data and commit message - Check PTE without lock firstly per Huang, Ying - Update comments for recheck function per David Hildenbrand - Simply return 0 to make it easier to read per David Hildenbrand - Check !FAULT_FLAG_ORIG_PTE_VALID instead of pmd_none() v2->v3: - Do this check only if vma is VM_LOCKED per David Hildenbrand - Hold PTL and recheck the PTE - Place the recheck code in a new function filemap_fault_recheck_pte() v1->v2: - Add more test results per Huang, Ying - Add more comments before check PTE per Huang, Ying, David Hildenbrand and Yin Fengwei - Change pte_offset_map_nolock to pte_offset_map as the PTL won't be used RFC->v1: - Add error handling when ptep == NULL per Huang, Ying and Matthew Wilcox - Check the PTE without acquiring PTL in filemap_fault(), suggested by Huang, Ying and Yin Fengwei - Add pmd_none() check before PTE map - Update commit message and add performance test information mm/filemap.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index b4858d89f1b1..222adac7c9c5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3181,6 +3181,49 @@ static struct file *do_async_mmap_readahead(struct vm_fault *vmf, return fpin; } +static vm_fault_t filemap_fault_recheck_pte_none(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + vm_fault_t ret = 0; + pte_t *ptep; + + /* + * We might have COW'ed a pagecache folio and might now have an mlocked + * anon folio mapped. The original pagecache folio is not mlocked and + * might have been evicted. During a read+clear/modify/write update of + * the PTE, such as done in do_numa_page()/change_pte_range(), we + * temporarily clear the PTE under PT lock and might detect it here as + * "none" when not holding the PT lock. + * + * Not rechecking the PTE under PT lock could result in an unexpected + * major fault in an mlock'ed region. Recheck only for this special + * scenario while holding the PT lock, to not degrade non-mlocked + * scenarios. Recheck the PTE without PT lock firstly, thereby reducing + * the number of times we hold PT lock. + */ + if (!(vma->vm_flags & VM_LOCKED)) + return 0; + + if (!(vmf->flags & FAULT_FLAG_ORIG_PTE_VALID)) + return 0; + + ptep = pte_offset_map_nolock(vma->vm_mm, vmf->pmd, vmf->address, + &vmf->ptl); + if (unlikely(!ptep)) + return VM_FAULT_NOPAGE; + + if (unlikely(!pte_none(ptep_get_lockless(ptep)))) { + ret = VM_FAULT_NOPAGE; + } else { + spin_lock(vmf->ptl); + if (unlikely(!pte_none(ptep_get(ptep)))) + ret = VM_FAULT_NOPAGE; + spin_unlock(vmf->ptl); + } + pte_unmap(ptep); + return ret; +} + /** * filemap_fault - read in file data for page fault handling * @vmf: struct vm_fault containing details of the fault @@ -3236,6 +3279,10 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) mapping_locked = true; } } else { + ret = filemap_fault_recheck_pte_none(vmf); + if (unlikely(ret)) + return ret; + /* No page in the page cache at all */ count_vm_event(PGMAJFAULT); count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT);