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 9AD5FC27C4F for ; Fri, 21 Jun 2024 16:57:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 179676B038B; Fri, 21 Jun 2024 12:57:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 129C46B038C; Fri, 21 Jun 2024 12:57:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F32B96B038D; Fri, 21 Jun 2024 12:57:44 -0400 (EDT) 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 D47876B038B for ; Fri, 21 Jun 2024 12:57:44 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7395B121098 for ; Fri, 21 Jun 2024 16:57:44 +0000 (UTC) X-FDA: 82255502448.14.463F5F2 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id E19C5C001F for ; Fri, 21 Jun 2024 16:57:41 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718989057; 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: in-reply-to:in-reply-to:references:references; bh=L6QMoChF9UUpgvgf/qeY+gfDnfm4HgAvap83rgt182U=; b=qxc4XIhTipeg0T2LRsffX1yf7o8nIoGxb5XVEZjNP8KVM3lzBeKbop80nuZlcz2TdeUont GFLTKytlKjhHcutY9JMEHRvYQnX7cVa/YyC1IGg1Z2TsVETc16WbSaEPOLLejiTCv3sG4z GE28hRPCsYYWRi9sL0vX1UeqYsxllkA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718989057; a=rsa-sha256; cv=none; b=ank/B3sNgc2E0ZS5kqvbQBHIwBr2LxG/A5rAgHuzZ6ZhFzBNqg7FAkIROMagTpBZ2251eh 0Zch8YZ767njc+C7FgT2aTXaah/OLn/1+qyq+0VRkWgyxFFxwJh84J+fg8OVD77N3z5xrx Tr3eVwnBMWh2xw8y89DYoCGfMjD7ET4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id EDEAD62789; Fri, 21 Jun 2024 16:57:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F90CC2BBFC; Fri, 21 Jun 2024 16:57:36 +0000 (UTC) Date: Fri, 21 Jun 2024 17:57:34 +0100 From: Catalin Marinas To: Joey Gouly Cc: linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v4 15/29] arm64: handle PKEY/POE faults Message-ID: References: <20240503130147.1154804-1-joey.gouly@arm.com> <20240503130147.1154804-16-joey.gouly@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240503130147.1154804-16-joey.gouly@arm.com> X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: E19C5C001F X-Stat-Signature: nt3s8dpgqu1gzmp6bw8b4xwsiqjtwbp5 X-HE-Tag: 1718989061-729859 X-HE-Meta: U2FsdGVkX1/rQOH4iGahwXjSnZHXn43UlDAnszj/siBrlfrL3is/hc5R8z+5Zkw9bpw0jQTGAn2rOT0ZapVlTLulabI0pZjGgpC/1AdB4HQLjlUiYNqWU05UdYloTSR9WoIH5NJ797L1zJMQmaj0Tg8wyq5OXLYYXdwzFMJJ6n9ZLKPG3NvfxLt7fuhSLp9eThfTpkX78Q0Ui+YO1GTAgeQwnzwYbuyyzNYiFfWj7rDSPOhexhyq64UibPwW90vpLgpgsdN6nGAcZnLPj0I6w/oyIPIB796oZ0EPdz/JcufmMdQ8yNj1KvKSUgX9dbQ+nrIwkR0d5qkrejp9mkcljVioKwaYIRjk2wMPXHEsfw7XiGHyasF9cAiArHvpYNz6IvZlt1hhLszyxKcoYGWnXOjhzP8vEv2rYtYZwzyargs+rLGceubktPfoZs/yoCLbgWMKCcYKQh0CSxb0WrtbBb0IbaSX261e4QZLaHfWbgJvLbrep/iOKr9ErdwI081DaY0ZzN+teMp6hQhRh+1LsHQUydQO0ircdXhiFk14tWa8VJcytbjwTxf4DlBhXpsslt5YgYpzy4zuscRDSGzKil1NTJNFkQV/AhMlVZ5p9F7UJQc3YitQCPCdPPovqHTMnLKVZSpSNARkquMvXSa7oxofny/6wRL2KrN6jDpK+DixirlT019NWKLqx4oVBWDzyKkFcEDcNNBJXTVh+YWQ1fBh5EERw02KLGJxiJyEpqffiq/YohIxObNJwSBLzLD081FHHtzxL7P2Vmm4GHZwaLmE4kXqNchkgXzCyGpDWz2FOLjMB93E7nXIMnLb8HxDne2EdeDmPtN5QmMPf3jx36QzCCoJkCgNKaoywqG1l4Nmxa74vQGkJkOGuuNvURVySFTmCQDzPOC/YpZE6bDgKH39kMy3mSr5NNeFMVY8ZGd2sjO3bi1pV1qQ7E1GUyfOdfNaQEKBvxo4knY0nX4 hW6qVp+Q aVX00irH4+YQGwaOsG0twgsegjzKp8keZdUMGkdsnXTcrpkiXIZZxzuDMMCGU3jyk3PbU/JtO+FvQM8atxw+kDI3crGixkjPefNg1SyzXbFjHnzeM7jXMaAO/1UIWDj33KMNZ5mHQZ6hIEMc8b61YaLaXtLgl8GvNGVgGrBT224CA6OlOFdo1kCcpiehzElwKvOhC3reav3W01ovzjHK+Bj+/t0Yk6dGQzgaSwyU5IeddhvbNWTlUKegfj6Md13QgvrMw05mk/GQBoJHFG9Nss5h3dSaK0e6ag1NvFBo3ePgRTUe3+JBq4Q0nj+VDC0sdtEJQMFJL27iZcacGucqDiQMIowpalvdehO6GXPqp5r9/Zg9DRxlAkxWHUn52ptP527RAn7k5OFOXL30UkEntxpJvnA== 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: On Fri, May 03, 2024 at 02:01:33PM +0100, Joey Gouly wrote: > @@ -529,6 +547,8 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, > unsigned int mm_flags = FAULT_FLAG_DEFAULT; > unsigned long addr = untagged_addr(far); > struct vm_area_struct *vma; > + bool pkey_fault = false; > + int pkey = -1; > > if (kprobe_page_fault(regs, esr)) > return 0; > @@ -590,6 +610,12 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, > vma_end_read(vma); > goto lock_mmap; > } > + > + if (fault_from_pkey(esr, vma, mm_flags)) { > + vma_end_read(vma); > + goto lock_mmap; > + } > + > fault = handle_mm_fault(vma, addr, mm_flags | FAULT_FLAG_VMA_LOCK, regs); > if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED))) > vma_end_read(vma); > @@ -617,6 +643,11 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, > goto done; > } > > + if (fault_from_pkey(esr, vma, mm_flags)) { > + pkey_fault = true; > + pkey = vma_pkey(vma); > + } I was wondering if we actually need to test this again. We know the fault was from a pkey already above but I guess it matches what we do with the vma->vm_flags check in case it races with some mprotect() call. > + > fault = __do_page_fault(mm, vma, addr, mm_flags, vm_flags, regs); You'll need to rebase this on 6.10-rcX since this function disappeared. Otherwise the patch looks fine. Reviewed-by: Catalin Marinas