From patchwork Fri Jan 13 17:10:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13101210 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 8C0ACC54EBE for ; Fri, 13 Jan 2023 17:12:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBDDF8E0002; Fri, 13 Jan 2023 12:12:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E461D8E0001; Fri, 13 Jan 2023 12:12:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC00B8E0002; Fri, 13 Jan 2023 12:12:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B71E18E0001 for ; Fri, 13 Jan 2023 12:12:55 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 809D980251 for ; Fri, 13 Jan 2023 17:12:55 +0000 (UTC) X-FDA: 80350420710.24.192729A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id E9167180013 for ; Fri, 13 Jan 2023 17:12:52 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KKawl9rE; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673629973; 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=l/pOewF7neptUo6af+r5FxFOsv+W3FPHbMBwYM5K1LM=; b=7erv0efzFtV4RNyblEQ0U/zn4/MZJW4O3fc+2tTyWgGBBVmNlozgzo+YRnJQLLO+vijmjO QaarmcI4H5sWvkKq7vnBqyH41rTAaWrg3pvLR0cacA51qSjB/nfB3/kqz8sXbpZY4vrB0s zBXrGo3cjmTpoVhIJoEcKnlQjXzxVQ4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KKawl9rE; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673629973; a=rsa-sha256; cv=none; b=fGhy1UfJvJDiSrsHDZv+G+TdG5MSyqbVKN/8E/gAAndVQfsgHTtWfBZ4I1+Un6whgNBhak rY77ebxljNgIuW3UPHEvL8x9h6ME4C6BusP6aQKXTw2m7dnLeTTu/hLtCOFeRqjrOG+S6R 4rUhtlvUFf9/7BtUFchD/DW0kb1B+rY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673629972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l/pOewF7neptUo6af+r5FxFOsv+W3FPHbMBwYM5K1LM=; b=KKawl9rEjuhfHLi3p8OAWIyck0M2qEQl71q9wU7vT30spBrvvF814tDt5+ipm6Am/oJdXH P8r+ib/F25xVDzuFG44DI5HmcPl3oDTMepScCgPmRWqjcdyxyyrrc4lHHe40rhIUJEOvI3 nvsy0/+og0jIrOdsULmMQblQ+h486CQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-524-EGasiiu4MBSUSDxxLJu0-g-1; Fri, 13 Jan 2023 12:12:47 -0500 X-MC-Unique: EGasiiu4MBSUSDxxLJu0-g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF64E3C0254D; Fri, 13 Jan 2023 17:12:46 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.193.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 068BC40C2064; Fri, 13 Jan 2023 17:12:38 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Hugh Dickins , John Hubbard , Jason Gunthorpe , Mike Rapoport , Yang Shi , Vlastimil Babka , Nadav Amit , Andrea Arcangeli , Peter Xu , linux-mm@kvack.org, x86@kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, David Hildenbrand , Michael Ellerman , Nicholas Piggin , Christophe Leroy Subject: [PATCH mm-unstable v1 17/26] powerpc/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE on 32bit book3s Date: Fri, 13 Jan 2023 18:10:17 +0100 Message-Id: <20230113171026.582290-18-david@redhat.com> In-Reply-To: <20230113171026.582290-1-david@redhat.com> References: <20230113171026.582290-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E9167180013 X-Rspam-User: X-Stat-Signature: 76614k44ywqxq777d85ur73f1pfudtc8 X-HE-Tag: 1673629972-788066 X-HE-Meta: U2FsdGVkX196UQHd9ESnXVUdQj2gtca3/ef7QgPu3nlS4RrspasJ5ZqUwrgvV+KtA8Hzad/qPiO00gaCKDIcvQkU4AkB7hux8zPCublxwk06+12JX9KF6m6EVEVx8d7aGfxAocWwNpKtjA7lC0FdTKq29yKueDD9tPC0PLhOzmWCF18SIDkLzhuN5yviIKAriyROvrLqFE4YtkpU/afJ38eGrSd2qGxaAl3h1BzgafusurXjR4qS7gjLiq5XOBExfIogZ3KKvLcFIhJXyQLcTRnOhOtRYlqZAzD474VzTMl/qyyKLlzaz4v4M+GA7DSfaEUcJ7s2OQFj+p3dP/8Y1oesbLu64Ia9AaiPe6g45/CSwaEFmy+g1zqL7fz2x5a0HXtW9GriAgyPUdfVoyGnlqRBrxEqEccLyDfYQXLeFSrQ1seRgt+ptIqecXHMTxQmhynETEtn+SFpIAqg6NPeCcfA/ipPaOue62iPjLu03ScKHXv/QPx/iiUvi5r4s7PfUU889DLrbPHX5EjuVmmS/8sbc9kibJ/+IqSDBp2lJ9NrMljMqbPKCXRIgyRGRDoCQGWv3t5c1ZG96/y+MWjfKxS1/QSG4o9tkWA35VuUNKR8UhH+/a2BPwnc7QdxQqmotRU9NSCTEjjdMhQN0cs1m+ahHCM76WosdB1ccuzQUN56+2AJefIimsiHTVU8FKIOcp9QgKtB4XvLRO9I7kZ3p+nmyNmV6KvhvyNc0GytpSKpYNAg8FE7hunCgtaVnlUfZ3D4BWZyed0H61nqzRoQT0tuErg917++bgiKXOerPbklR4WfdZIX6hqcA2Lbao8Xa+WMukmtiP2GJvCjySdkt5t6/7Fq872FapELD3/ZNAHf05DTcpSiJfkQ9kZJK30UCiV1Nf3jS2zuCfH26+U+ozH4flPcz+A65+Hm7gDB9L1lTIijKpikvmqJYWDy8f6XuzEEIg5ozOZxIziX8kK zPsCexfh gwvLOMKaweuRTP92wK7TTkwpPFvVYYD80Q9v5 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: 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 Acked-by: Michael Ellerman (powerpc) --- 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..0ecb3a58f23f 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 + * <----------------- offset --------------------> < type -> E H P + * + * E is the exclusive marker that is not stored in swap entries. + * _PAGE_PRESENT (P) and __PAGE_HASHPTE (H) must be 0. + * + * For 64bit PTEs, the offset is extended by 32bit. */ #define __swp_type(entry) ((entry).val & 0x1f) #define __swp_offset(entry) ((entry).val >> 5) -#define __swp_entry(type, offset) ((swp_entry_t) { (type) | ((offset) << 5) }) +#define __swp_entry(type, offset) ((swp_entry_t) { ((type) & 0x1f) | ((offset) << 5) }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >> 3 }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val << 3 }) +#define __HAVE_ARCH_PTE_SWP_EXCLUSIVE +static inline int pte_swp_exclusive(pte_t pte) +{ + return pte_val(pte) & _PAGE_SWP_EXCLUSIVE; +} + +static inline pte_t pte_swp_mkexclusive(pte_t pte) +{ + return __pte(pte_val(pte) | _PAGE_SWP_EXCLUSIVE); +} + +static inline pte_t pte_swp_clear_exclusive(pte_t pte) +{ + return __pte(pte_val(pte) & ~_PAGE_SWP_EXCLUSIVE); +} + /* Generic accessors to PTE bits */ static inline int pte_write(pte_t pte) { return !!(pte_val(pte) & _PAGE_RW);} static inline int pte_read(pte_t pte) { return 1; }