From patchwork Wed Nov 22 14:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13464963 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 512AFC61D97 for ; Wed, 22 Nov 2023 14:19:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCAAC6B0561; Wed, 22 Nov 2023 09:19:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D7A9A6B0563; Wed, 22 Nov 2023 09:19:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1BA06B0565; Wed, 22 Nov 2023 09:19:23 -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 ADEF66B0561 for ; Wed, 22 Nov 2023 09:19:23 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7F1C7B5D5B for ; Wed, 22 Nov 2023 14:19:23 +0000 (UTC) X-FDA: 81485797806.10.EC8FC8E Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf21.hostedemail.com (Postfix) with ESMTP id 4304B1C0002 for ; Wed, 22 Nov 2023 14:19:18 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700662760; 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=Tp526J2GfHF/H7T8XW5iTZkjhj2WEgtuBqGjWL0y+FQ=; b=Zh1/U2zLrunW7drFVlag0VbTzDhFfyawO7aTKtsXDg2tOb9Np0XgBhj+eBpuPn7WE78aDe oLRTHOcCL5QNiXNIik1j+jJEYvtmCxfJUB35NJLrVfIEVjXqioU4DyjoWC3ilsOSRQP9eW 5XqcuH/B6Rq2xk2mmZ3ZFWmN/6Fj8RY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700662760; a=rsa-sha256; cv=none; b=XfKNbTtkkbOLGCSa3H5Q7cLF/iZ5hvEdfk57bemMJgMw6GBzn42+3JOazKDGwxe6VzeZNe WHvc5WmPKfh9Dkl0pZ30OTIHDbOzYMfIkK6t+ceMNFmrMt+CLkeZKQXzzWaSAC0EA9OIDS RYGRK88WpW/1cOjM4+Ld1AcN4HuEX08= Received: from kwepemm000020.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Sb2pS07YNzMnLj; Wed, 22 Nov 2023 21:56:15 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm000020.china.huawei.com (7.193.23.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 22 Nov 2023 22:00:58 +0800 From: Peng Zhang To: , CC: , , , , , , , , , , ZhangPeng Subject: [RFC PATCH] mm: filemap: avoid unnecessary major faults in filemap_fault() Date: Wed, 22 Nov 2023 22:00:52 +0800 Message-ID: <20231122140052.4092083-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: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm000020.china.huawei.com (7.193.23.93) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 4304B1C0002 X-Rspam-User: X-Stat-Signature: ebsjpiwpaiitj3cwsauf69tep91ob174 X-Rspamd-Server: rspam01 X-HE-Tag: 1700662758-126555 X-HE-Meta: U2FsdGVkX1/jHfW0z9cs2IFC3hLnMSWn+4nsV5r657CxAoqIFCv6ZPmD+oUMjD6u1uG7i/hECT8MuFGxwLzItseY7Zzwjw5ME90pkU427WiNEfRhpDw/JQq+6i794bkyVBJR4SnbMoDVHNRd2/C7JZZAiGTkGv/hVpqchnxRzAO1fHEtpVOGMTvXd/bZiHLYiJNu12JLuHn6AxOujU7Ha8KxBo1gKyWx086CXwokCIN7om/+4Zd8JlySG3TZEHvkFEEmxwzviLUxybT3yjNGo10qq71VAE2yzqOUvOzg8qn86k+YCBQ8Wmjy627WBwrDBUoZ8nFF8WH6IdwIJEPclXnGg6WpMi4jY8uvohaqNpf/ocUoGYrrGQXmYQKIf2eG60tt/2wR+2iExpLPSD+XQc5WMvVbwTF4APpAQteoP3BgERAuC4X0gBqXRMHDxqGF2WEoM2qf+fJNKCJGupn0YHrKZSsL5k9YPS45ReAJ7CAFKxAAAkM6KeHwUD974XXM33z3sq0p9jf9Gxl5MzulZqaEz3fwuon6pIFGdx/2MvU/a5k1a/ukAK4DPaJgy2DBuSE4ALGJ0orYdYZJ653mVtxXEycKK7P2mEU80ZMy51/MaSTNDsRsYrTFlOVNf+/ZgujPBxCTkZG1HU9hChTxcrnw+KhJ87lcXPzwRuD9MiA0p2NqUz244XYdKnSVn03FJMeTAQSLLWlS94P3ymSrL7V1TMkwhmLDK+F/Aw+Y0gvH26dAUjLvmJmKNB22eFj/TsCVsVFAYnJUKNXsgOQHK+63x0CK3MhExpnhAdimYV93MTdm1+yAjkMZ6zc3NEHmmxMq8oXGUZhef2MXKLL+rcAorfJEL35xtugT8zBELDgF3m/b/zyzLKqhqtOIO4Q/AU5CtmBEbQTh4z/lwTJpUoCcum5CAhfGDhalu9m5Go2NuRwwtHPtHoy49E2mv6iX21lDQTOORT9atL2mIZn iwXD4g1e lPR51ERu0jdqdgDMBzL/mUuSTA29NQfi1KPaAkAi/FfvRRTR0IndYDMOow68cnDFPs9ZSHprHCxAb8te+I5HBCtXFhoiZbpHlNg2u/iPt2kBD4Py2VMM4P8+97MndpmfFng0umsaHotiNBxVoqshynSXJC+olJOJmSs1eUKrZNHVsTLKttJ2ZtxTWViCD0dHpKJAIIXQ6Zwc+0nR+nTKfzPvhohZkUdtoXt4LORveqWlrtSo99di31iIVS9ffWAo/q5M+ 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 performance issue[1]. This caused by temporarily cleared pte during a read/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. Fix this by rechecking the pte by holding ptl in filemap_fault() before triggering a major fault. [1] https://lore.kernel.org/linux-mm/9e62fd9a-bee0-52bf-50a7-498fa17434ee@huawei.com/ Signed-off-by: ZhangPeng Signed-off-by: Kefeng Wang Reviewed-by: Yin Fengwei --- mm/filemap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index 71f00539ac00..bb5e6a2790dc 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3226,6 +3226,20 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) mapping_locked = true; } } else { + pte_t *ptep = pte_offset_map_lock(vmf->vma->vm_mm, vmf->pmd, + vmf->address, &vmf->ptl); + if (ptep) { + /* + * Recheck pte with ptl locked as the pte can be cleared + * temporarily during a read/modify/write update. + */ + if (unlikely(!pte_none(ptep_get(ptep)))) + ret = VM_FAULT_NOPAGE; + pte_unmap_unlock(ptep, vmf->ptl); + 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);