From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from iad-out-003.esa.us-east-1.outbound.mail-perimeter.amazon.com (iad-out-003.esa.us-east-1.outbound.mail-perimeter.amazon.com [13.216.7.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AFC73DA7CF for ; Fri, 10 Apr 2026 15:18:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.216.7.111 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775834305; cv=none; b=cmOzmVtRehR1X40b9fZGHwoUZ+44giJL/NeGwR0pW2m8rg99rWjfGL/LcWGrlJB1SNTQydZb5vYxdmWxvfylTn8uqwWVkcQ7moWrDVicX9c6ISxcR431+VzC8wlwm04BDTDFoOtL2KtMAIAm5ExOuwoF+mDVIk8Lfm3Jcql2uqw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775834305; c=relaxed/simple; bh=8DjXIMBWBLOAn+CXSrJbYeOgxkkXIgdkJo0CROITJ0E=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=tuUd0KfqzDVWQTGUIEFg4YnrVYZTTHPX/fp1zW6YqvI0Mi5EjzEq10/4XAS2+i5BtYXfFiVydbNo6A8bVueq9wtRrmKcnQeV1x4ZFQpDOcru5umNhJul5pliohQ9xCWi+Vabnmikv1ZTyJyr6qv6F/ZGdKjR+ZpWCDX8wUf+o+Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b=oNCpC9TO; arc=none smtp.client-ip=13.216.7.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b="oNCpC9TO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1775834304; x=1807370304; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=SXUxXoRrWTOvyOc+uAqr+1ZCvKnUa6yiTRH8yoXeRFw=; b=oNCpC9TOdyWbkmgYJ9RKx5DoTIOFKsTyXY3VPgGRghVl4UtYijLeBORa gjqOwbuhMxDFDesMfAEv4xjRntUTb+SACU4XHBJJQwhbINc80D70Swbsq Lk9+eZUmfNIwcRxKnOxvs6QNlRHn2rfnOZYaLp4DmK8QyI4gYCiPW+oE7 pdmz20kqnC5Zzspcn4ihNevL8Pxvk+pNofMgnKk8nuz+lrquRa/Dex5hC 4yHgd2CjaGMnqL6tdRBoeYGfNiIFK/Y64M0ukY0/RZq/7PMCu+dg4I32U FzJ42JY9EjOoKona2UkhBZySwdzJX2kbkQzf5cqlOrrc88JU+pxg2LEng A==; X-CSE-ConnectionGUID: FgTNPH/qSsmwo8qu/XZjYg== X-CSE-MsgGUID: cffpT4XNSW6EYhThQ/RwJg== X-IronPort-AV: E=Sophos;i="6.23,171,1770595200"; d="scan'208";a="15811217" Received: from ip-10-4-7-229.ec2.internal (HELO smtpout.naws.us-east-1.prod.farcaster.email.amazon.dev) ([10.4.7.229]) by internal-iad-out-003.esa.us-east-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2026 15:18:21 +0000 Received: from EX19MTAUEA002.ant.amazon.com [52.94.133.129:4854] by smtpin.naws.us-east-1.prod.farcaster.email.amazon.dev [10.0.3.180:2525] with esmtp (Farcaster) id db35949c-0491-47e6-ad7e-70a4dbf7c21d; Fri, 10 Apr 2026 15:18:21 +0000 (UTC) X-Farcaster-Flow-ID: db35949c-0491-47e6-ad7e-70a4dbf7c21d Received: from EX19D027UEC001.ant.amazon.com (10.252.137.156) by EX19MTAUEA002.ant.amazon.com (10.252.134.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:18:20 +0000 Received: from EX19D027UEC003.ant.amazon.com (10.252.137.250) by EX19D027UEC001.ant.amazon.com (10.252.137.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:18:20 +0000 Received: from EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d]) by EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d%3]) with mapi id 15.02.2562.037; Fri, 10 Apr 2026 15:18:20 +0000 From: "Kalyazin, Nikita" To: "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@vger.kernel.org" , "kernel@xen0n.name" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-pm@vger.kernel.org" CC: "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oupton@kernel.org" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "seanjc@google.com" , "tglx@kernel.org" , "mingo@redhat.com" , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "hpa@zytor.com" , "luto@kernel.org" , "peterz@infradead.org" , "willy@infradead.org" , "akpm@linux-foundation.org" , "david@kernel.org" , "lorenzo.stoakes@oracle.com" , "vbabka@kernel.org" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "song@kernel.org" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jolsa@kernel.org" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "skhan@linuxfoundation.org" , "riel@surriel.com" , "ryan.roberts@arm.com" , "jgross@suse.com" , "yu-cheng.yu@intel.com" , "kas@kernel.org" , "coxu@redhat.com" , "ackerleytng@google.com" , "yosry@kernel.org" , "ajones@ventanamicro.com" , "maobibo@loongson.cn" , "tabba@google.com" , "prsampat@amd.com" , "wu.fei9@sanechips.com.cn" , "mlevitsk@redhat.com" , "jmattson@google.com" , "jthoughton@google.com" , "agordeev@linux.ibm.com" , "alex@ghiti.fr" , "aou@eecs.berkeley.edu" , "borntraeger@linux.ibm.com" , "chenhuacai@kernel.org" , "baolu.lu@linux.intel.com" , "dev.jain@arm.com" , "gor@linux.ibm.com" , "hca@linux.ibm.com" , "palmer@dabbelt.com" , "pjw@kernel.org" , "shijie@os.amperecomputing.com" , "svens@linux.ibm.com" , "thuth@redhat.com" , "yang@os.amperecomputing.com" , "Liam.Howlett@oracle.com" , "urezki@gmail.com" , "zhengqi.arch@bytedance.com" , "gerald.schaefer@linux.ibm.com" , "jiayuan.chen@shopee.com" , "lenb@kernel.org" , "pavel@kernel.org" , "rafael@kernel.org" , "yangyicong@hisilicon.com" , "vannapurve@google.com" , "jackmanb@google.com" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Kalyazin, Nikita" Subject: [PATCH v12 03/16] mm/secretmem: make use of folio_{zap,restore}_direct_map Thread-Topic: [PATCH v12 03/16] mm/secretmem: make use of folio_{zap,restore}_direct_map Thread-Index: AQHcyP1DBItR5zMXtEmj13bg9CfDRw== Date: Fri, 10 Apr 2026 15:18:19 +0000 Message-ID: <20260410151746.61150-4-kalyazin@amazon.com> References: <20260410151746.61150-1-kalyazin@amazon.com> In-Reply-To: <20260410151746.61150-1-kalyazin@amazon.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Nikita Kalyazin =0A= =0A= Replace set_direct_map_*_noflush with newly available=0A= folio_zap_direct_map calls that take folio's address internally. A side=0A= effect is even if filemap_add_folio fails, the TLB is still flushed,=0A= which is not expected to be on the hot path.=0A= =0A= Acked-by: David Hildenbrand (Arm) =0A= Reviewed-by: Ackerley Tng =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= mm/secretmem.c | 8 ++------=0A= 1 file changed, 2 insertions(+), 6 deletions(-)=0A= =0A= diff --git a/mm/secretmem.c b/mm/secretmem.c=0A= index fd29b33c6764..27b176af8fc4 100644=0A= --- a/mm/secretmem.c=0A= +++ b/mm/secretmem.c=0A= @@ -53,7 +53,6 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= struct inode *inode =3D file_inode(vmf->vma->vm_file);=0A= pgoff_t offset =3D vmf->pgoff;=0A= gfp_t gfp =3D vmf->gfp_mask;=0A= - unsigned long addr;=0A= struct folio *folio;=0A= vm_fault_t ret;=0A= int err;=0A= @@ -72,7 +71,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= goto out;=0A= }=0A= =0A= - err =3D set_direct_map_invalid_noflush(folio_address(folio));=0A= + err =3D folio_zap_direct_map(folio);=0A= if (err) {=0A= folio_put(folio);=0A= ret =3D vmf_error(err);=0A= @@ -87,7 +86,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= * already happened when we marked the page invalid=0A= * which guarantees that this call won't fail=0A= */=0A= - set_direct_map_default_noflush(folio_address(folio));=0A= + folio_restore_direct_map(folio);=0A= folio_put(folio);=0A= if (err =3D=3D -EEXIST)=0A= goto retry;=0A= @@ -95,9 +94,6 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= ret =3D vmf_error(err);=0A= goto out;=0A= }=0A= -=0A= - addr =3D (unsigned long)folio_address(folio);=0A= - flush_tlb_kernel_range(addr, addr + PAGE_SIZE);=0A= }=0A= =0A= vmf->page =3D folio_file_page(folio, vmf->pgoff);=0A= -- =0A= 2.50.1=0A= =0A=