From patchwork Wed Apr 17 08:23:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13632977 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 4EA39C4345F for ; Wed, 17 Apr 2024 08:24:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDF1E6B0089; Wed, 17 Apr 2024 04:24:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B68F16B008A; Wed, 17 Apr 2024 04:24:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2FCF6B008C; Wed, 17 Apr 2024 04:24:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 814DF6B0089 for ; Wed, 17 Apr 2024 04:24:20 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4D2D8140D8B for ; Wed, 17 Apr 2024 08:24:20 +0000 (UTC) X-FDA: 82018336680.21.63A0F0E Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf18.hostedemail.com (Postfix) with ESMTP id 6F6071C001B for ; Wed, 17 Apr 2024 08:24:17 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713342258; 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=h5RBv4K8cVdRCQ0M0oRMk3oEHZ7/KJVUKS/1iJWteOQ=; b=zEVBBj8snrTp+fEEZ58AXHcSV8/FmKXGXeKCp/SFFQ37QqCbYmp8WVYYUMRk3faUcFqAIr XwPcZumI2nqAz70J2S5HtKN3rRX7PYopmtWP8uxe+Bje0RkX10Qsz4jQMnXJsINUDkokN/ 7JWKitCCcsWEhe6HUxIiCgx6pT95Qk0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713342258; a=rsa-sha256; cv=none; b=u3FoDsj0YdWM6vyqlw14UrFnbyGZTiOS661O3kpRXI3gCRd8dgPXTHGl/sNVWh2qJz63PE o351/+7CN2Iyv4D4D/VfRCHaICmWlmRILOyU5ZRn9oChq+g7Ba/udDKzgP/fRQH5LxFZ8k 9ly4hFLCSsg3OnF+7VWbksucMCeYkSg= Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VKDSH6NlDzYdRJ; Wed, 17 Apr 2024 16:23:11 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 31878180080; Wed, 17 Apr 2024 16:24:13 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 17 Apr 2024 16:24:12 +0800 From: Kefeng Wang To: Andrew Morton CC: Peter Xu , , Kefeng Wang Subject: [PATCH] mm: memory: check userfaultfd_wp() in vmf_orig_pte_uffd_wp() Date: Wed, 17 Apr 2024 16:23:59 +0800 Message-ID: <20240417082359.3413259-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm100001.china.huawei.com (7.185.36.93) X-Stat-Signature: xqj8wg5473xhkpfa18ss5jcm7xs4cd4o X-Rspamd-Queue-Id: 6F6071C001B X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1713342257-659049 X-HE-Meta: U2FsdGVkX1+EATfAqMtTEjxvn5GHbIPVr9U5Lh+o5MsJ3CseSYXW+/nYreEbxmZprL4kLhYkEv/2w+O08Za6hmbQZsyaKImUx5OeKwMYj7WlyA3aJFkF9QwdrnQPHPbtk4eeWgH63ZS4ksLK5D1Ncv+5flLw7/uZMgNEtYstU7vPiT+A0ZwQX+Cks2YDIBa5mq+iEJivUmkjpi2ok/P9z5iBEg4AxtO/xBkeq5KANLuhwlb5MGX5AFUhrdmqNctHCriKm3GUfRbO/EGLExXKqNjCwz8TlZm8b5Sh8FLGOUZEiYE5/OoWk0rQ5PPQfrsUzmFNls5rCz7XrurqbyZUDtJCoO7ryotucti/B10a4i48Z7K/3zaw7+0bESrx8TwvbDNln5ru6usNTrWCnRySlkbcK8o3qsF9seV0r+z9vQK5is8Zbuzp1o5yWbxbnD5spX/CCLVyt2SmDx6nl8dFcza5ULa3Tn+JFJtmAq9TkLI5FmcBxlO0W1lMGyG7DBWTkj8yjNoc0R1JqVx/LvQqkNX4xNPvEyldw9rd2cSAqR+dYsB4sygU6K3ZookjSY7R54oP/guSnx3HphvX/ye8b6koCqnfiV47yw0MjbNBDTFhhN+9IEm3jsis82A7O3xHwSSvYIdU1V1qGjhpFqzqzCJ5taN7Cbt9FI8Aec4YEgT+8BfIoTD5lI50rmqEov41E6AvegRIY5NfMT94xs+0kJhDIc4rbOHbFNdrXHgNsV7/Fi5soYscyNDsxubaSYodlq+SLev1Lvc70cVHAIfXFejDbNlbS732iJKodvp4ZWE55N32Iuq0ggZ+/IegrrqEGCGoD3r8YXOVzoXTQLdOEmeF3EBbyWrB4zsxrF/Wo+4bd6IV/GWqGpRDK/WPcMU4aUG4GC5AgmG83Ujbv6IZZkpiVviLuW9/WNcR6ZgQT5S2TohX8tafSXWpCIZ3K66sBoQFqFvFKrz1/WgepWv m1bvSzeR CrRKk88Whw6HLsOUYCg8Yurn1VKcJUw6a5oJAoYv+yEpQ1fk0MN1KzBA5YXx41lyf640tsSqOAuMXNczS5nvd7HS2AyLGxhHDUi03gLkHYdWl6GKDaUuRyyInFXTn39tdWWAntSd6nXxF4rV/T6h99bUwV3S/HynEm6435DN2IyDiZh020MYqP/g+0vdMG7Hr48XD 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: Directly call vmf_orig_pte_uffd_wp() in do_anonymous_page() and set_pte_range() to save a uffd_wp and add userfaultfd_wp() check in vmf_orig_pte_uffd_wp() to avoid the unnecessary function calls in the most sense, lat_pagefault testcase does show improvement though very small(~1%). Signed-off-by: Kefeng Wang --- mm/memory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 5ae2409d3cb9..a6afc96001e6 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -117,6 +117,9 @@ static bool vmf_orig_pte_uffd_wp(struct vm_fault *vmf) if (!(vmf->flags & FAULT_FLAG_ORIG_PTE_VALID)) return false; + if (!userfaultfd_wp(vmf->vma)) + return false; + return pte_marker_uffd_wp(vmf->orig_pte); } @@ -4388,7 +4391,6 @@ static struct folio *alloc_anon_folio(struct vm_fault *vmf) */ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) { - bool uffd_wp = vmf_orig_pte_uffd_wp(vmf); struct vm_area_struct *vma = vmf->vma; unsigned long addr = vmf->address; struct folio *folio; @@ -4488,7 +4490,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) folio_add_new_anon_rmap(folio, vma, addr); folio_add_lru_vma(folio, vma); setpte: - if (uffd_wp) + if (vmf_orig_pte_uffd_wp(vmf)) entry = pte_mkuffd_wp(entry); set_ptes(vma->vm_mm, addr, vmf->pte, entry, nr_pages); @@ -4663,7 +4665,6 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, struct page *page, unsigned int nr, unsigned long addr) { struct vm_area_struct *vma = vmf->vma; - bool uffd_wp = vmf_orig_pte_uffd_wp(vmf); bool write = vmf->flags & FAULT_FLAG_WRITE; bool prefault = in_range(vmf->address, addr, nr * PAGE_SIZE); pte_t entry; @@ -4678,7 +4679,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, if (write) entry = maybe_mkwrite(pte_mkdirty(entry), vma); - if (unlikely(uffd_wp)) + if (unlikely(vmf_orig_pte_uffd_wp(vmf))) entry = pte_mkuffd_wp(entry); /* copy-on-write page */ if (write && !(vma->vm_flags & VM_SHARED)) {