From: David Hildenbrand Subject: Re: [PATCH mm-unstable RFC 17/26] powerpc/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE on 32bit book3s Date: Thu, 8 Dec 2022 09:52:57 +0100 Message-ID: <0b5b1303-8bcb-c19d-5f63-0e4a3517fea5@redhat.com> References: <20221206144730.163732-1-david@redhat.com> <20221206144730.163732-18-david@redhat.com> <8be167b6-3836-25c3-9f69-b8b3916ee5b4@csgroup.eu> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670489582; h=from:from: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:in-reply-to:references:references; bh=WtVANh0eBS7cuUnAJkHyLAHfwCxkRrG12+slAtG+/Kc=; b=OLICTvYRAWvZClShRUAIwD9mWbKVNaKMOB8J9S+fnVKvTFPyAa8mca61v0jvrn2pNrgplw esCvIowYvc4M7IljieXbhfyoYPG0fxXHUWHmOSSvNGmbG8YL1adq+9tzuEJbcudSURHbnV lVWjNrKKcKHlaIIMUGRrq/NaSERw2FE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670489582; h=from:from: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:in-reply-to:references:references; bh=WtVANh0eBS7cuUnAJkHyLAHfwCxkRrG12+slAtG+/Kc=; b=OLICTvYRAWvZClShRUAIwD9mWbKVNaKMOB8J9S+fnVKvTFPyAa8mca61v0jvrn2pNrgplw esCvIowYvc4M7IljieXbhfyoYPG0fxXHUWHmOSSvNGmbG8YL1adq+9tzuEJbcudSURHbnV lVWjNrKKcKHlaIIMUGRrq/NaSERw2FE= In-Reply-To: <8be167b6-3836-25c3-9f69-b8b3916ee5b4@csgroup.eu> Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane-mx.org@lists.ozlabs.org Sender: "Linuxppc-dev" Content-Type: text/plain; charset="utf-8"; format="flowed" To: Christophe Leroy , "linux-kernel@vger.kernel.org" Cc: "linux-ia64@vger.kernel.org" , "linux-sh@vger.kernel.org" , Yang Shi , Peter Xu , "linux-mm@kvack.org" , Nadav Amit , "sparclinux@vger.kernel.org" , "linux-riscv@lists.infradead.org" , Andrea Arcangeli , "linux-s390@vger.kernel.org" , "linux-hexagon@vger.kernel.org" , "x86@kernel.org" , Hugh Dickins , "linux-csky@vger.kernel.org" , Mike Rapoport , Vlastimil Babka , Jason Gunthorpe , "linux-snps-arc@lists.i nfradead.org" , "linux-xtensa@linux-xtensa.org" <> On 07.12.22 14:55, Christophe Leroy wrote: > > > Le 06/12/2022 à 15:47, David Hildenbrand a écrit : >> We already implemented support for 64bit book3s in commit bff9beaa2e80 >> ("powerpc/pgtable: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE for book3s") >> >> Let's support __HAVE_ARCH_PTE_SWP_EXCLUSIVE also in 32bit by reusing yet >> unused LSB 2 / MSB 29. There seems to be no real reason why that bit cannot >> be used, and reusing it avoids having to steal one bit from the swap >> offset. >> >> While at it, mask the type in __swp_entry(). >> >> Cc: Michael Ellerman >> Cc: Nicholas Piggin >> Cc: Christophe Leroy >> Signed-off-by: David Hildenbrand >> --- >> arch/powerpc/include/asm/book3s/32/pgtable.h | 38 +++++++++++++++++--- >> 1 file changed, 33 insertions(+), 5 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h >> index 75823f39e042..8107835b38c1 100644 >> --- a/arch/powerpc/include/asm/book3s/32/pgtable.h >> +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h >> @@ -42,6 +42,9 @@ >> #define _PMD_PRESENT_MASK (PAGE_MASK) >> #define _PMD_BAD (~PAGE_MASK) >> >> +/* We borrow the _PAGE_USER bit to store the exclusive marker in swap PTEs. */ >> +#define _PAGE_SWP_EXCLUSIVE _PAGE_USER >> + >> /* And here we include common definitions */ >> >> #define _PAGE_KERNEL_RO 0 >> @@ -363,17 +366,42 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, >> #define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd)) >> >> /* >> - * Encode and decode a swap entry. >> - * Note that the bits we use in a PTE for representing a swap entry >> - * must not include the _PAGE_PRESENT bit or the _PAGE_HASHPTE bit (if used). >> - * -- paulus >> + * Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that >> + * are !pte_none() && !pte_present(). >> + * >> + * Format of swap PTEs (32bit PTEs): >> + * >> + * 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 >> + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 >> + * E H P <- type --> <----------------- offset ------------------> > > That's in reversed order. _PAGE_HASHPTE is bit 30 and should be on the > right hand side. Etc ... Ugh, messed it up while converting back and forth between LSB 0 and MSB 0. /* * Format of swap PTEs (32bit PTEs): * * 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 * <----------------- offset ------------------> <- type --> E H P Now the patch description ("unused LSB 2 / MSB 29") makes sense. Thanks! Any feedback if the bit could be problematic? -- Thanks, David / dhildenb