From mboxrd@z Thu Jan 1 00:00:00 1970 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 Content-Transfer-Encoding: 8bit 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) -- 2.30.2