From patchwork Fri Jan 13 17:10:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13101209 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 3C553C54EBD for ; Fri, 13 Jan 2023 17:12:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DC11900005; Fri, 13 Jan 2023 12:12:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 964688E0001; Fri, 13 Jan 2023 12:12:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7DE7B900005; Fri, 13 Jan 2023 12:12:49 -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 6B0478E0001 for ; Fri, 13 Jan 2023 12:12:49 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 43FDB16028E for ; Fri, 13 Jan 2023 17:12:49 +0000 (UTC) X-FDA: 80350420458.05.A75A69D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id B5FCD1C0002 for ; Fri, 13 Jan 2023 17:12:46 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FYP+AGy5; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1673629966; 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=Nb3/Kg+q8w8ft77T7rabV7x4+F6BGLijJ0EWAhVZvAg=; b=Q0lsFKqIfsqFnPO7BZkkL0DJHErRr3+kIeKHdHWZTM16gZ4Pe4VEPzslAMywVXbtIc9gSJ hbpaw5dcbszJGYKGhq7fu0eNrRIuDt9XnW7DRonWtGw1dIH7WC5f3wfwCjoP3Cz0kKQLVd /uGPf+ca8tVHdxR1YWuzjjUuZTNGf/Y= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FYP+AGy5; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1673629966; a=rsa-sha256; cv=none; b=hd6vUcU7AgXjur8MU5KL63iGFE48ymbE+sPjMxJ2ezvQZw+FTxzOoBOjXeXFhXJBOWMwg/ tMsddQ5GwKIC/nLeP+wV14fPImhyQk7dLL4XN1I9f/lklibA5qUGGMpAW8Qa2iw7L/H7RA yChZQ3hee1Y+8fo/FS/6VFFInaPvCwc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673629966; 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=Nb3/Kg+q8w8ft77T7rabV7x4+F6BGLijJ0EWAhVZvAg=; b=FYP+AGy59gSVp2/mgu2edSHQw29OEw11uPyvCVZ4CqT94iQQh2kNNfQwqKSG2e0Mnee9A8 bO9zM2OGhbMF9kU80Tssv1GcHnfRkdIQF9MhErssy5MqCjHI47pxTY4ALvJ3vlkJC5WOJV QeM9ce7J8Z7NgfR6XN548mnsgrXhf5U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-111-JtK01FPYOwaf9TktFHEmLQ-1; Fri, 13 Jan 2023 12:12:40 -0500 X-MC-Unique: JtK01FPYOwaf9TktFHEmLQ-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 9A68780D0EB; Fri, 13 Jan 2023 17:12:38 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.193.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDF5F40C2064; Fri, 13 Jan 2023 17:12:31 +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 , "James E.J. Bottomley" , Helge Deller Subject: [PATCH mm-unstable v1 16/26] parisc/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE Date: Fri, 13 Jan 2023 18:10:16 +0100 Message-Id: <20230113171026.582290-17-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: B5FCD1C0002 X-Rspam-User: X-Stat-Signature: 6ywswsrdm6ery1m51jgfhpaq4hbxa77z X-HE-Tag: 1673629966-447938 X-HE-Meta: U2FsdGVkX1+f1gX1uxCZVIR5+pZMe3WwMZ5zXSRxg6D40H4fLRTzqoBnV0z5kOctoahq+sszxJwjn4P9MlKzxY99JPqx3Hr7KM6ah59NSN5oREnZipVAEY5H7TmRE+wJ1CO3yUOu1/nMj39TgFFZX92hH6bCbIIW4MB82I7wkgs+mXKrfeFT1Yc6o9az9NBezqG2LToAEQH/VbbTbJmOk3XV4FKSf7u2VsqW6M9ge3tFt+Z2qYxWTVIyTFSly7wQm4watbzmL7zRMh5Lmv9tbkVpygSvE9/6iIxrW+aRsQLynr4VWHV7BiJWicEkEDXyJpRL6/Rbn6z5GWFeuFbBhtsFUh9vGro8piesg8kaFLqGOrddgkVAdEQuD9DY6pzzmhHjrrjxc3A9u4c1cyRo36IrlCpFiwamnzpOvjHzGTI8N90xwZIaG0JiRMo6frFMNABKT4jTWLfQ2jwVEFNvpj3ctmTEiZ4RTMXDrNYm7vMu97/Ty/EzqC7huimKdEOlTFOeWYbpNuQptn2JYBgySaiEzs/xtz2d/IOhNPTrCBXLNEGmtifkyDsB/FlFDsKvJQpw1J/47V/wxFx+n89ssPMjE+K4R2dBma6QoB5s6VUu1YEPkris5uVGu6F0nIgIFKXCZJ3okUGlvqmgXYSDKvD7fBnFyMQvBUnW0QaO+X0U6LSFqJkk0ZiE4lAqbNqM4CigOJeMNKfMX8egv5D13Jydw6+IFyMfezyPnsdz9KO0ACNGxu9A3uHB7o5mMBL9fdgKrBj1E+UmvuAzdeTsW8izLJ+RRbOg+dBtkWZwTyGH5TXJE/4menndANq4jRnfC5rtsK9I5dehNRNRWKlzUIHKYhB3pECFd8XS1xWWWis70ba7Pp5ZNPpMPTJ1YJhPzr145cb7b7npzlZM99FghfvAWBS7HxgvibLvtzhL6wjU/f0j5JGSmKvBwZaiQ+Mm8vijWlfg7+Ot0OuzAns n6E3td0e JuMx+ikMjAywZH3KPy3u7u+cp17AkC3Of+5AH 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: Let's support __HAVE_ARCH_PTE_SWP_EXCLUSIVE by using the yet-unused _PAGE_ACCESSED location in the swap PTE. Looking at pte_present() and pte_none() checks, there seems to be no actual reason why we cannot use it: we only have to make sure we're not using _PAGE_PRESENT. Reusing this bit avoids having to steal one bit from the swap offset. Cc: "James E.J. Bottomley" Cc: Helge Deller Signed-off-by: David Hildenbrand --- arch/parisc/include/asm/pgtable.h | 41 ++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index ea357430aafe..3033bb88df34 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -218,6 +218,9 @@ extern void __update_cache(pte_t pte); #define _PAGE_KERNEL_RWX (_PAGE_KERNEL_EXEC | _PAGE_WRITE) #define _PAGE_KERNEL (_PAGE_KERNEL_RO | _PAGE_WRITE) +/* We borrow bit 23 to store the exclusive marker in swap PTEs. */ +#define _PAGE_SWP_EXCLUSIVE _PAGE_ACCESSED + /* The pgd/pmd contains a ptr (in phys addr space); since all pgds/pmds * are page-aligned, we don't care about the PAGE_OFFSET bits, except * for a few meta-information bits, so we shift the address to be @@ -394,17 +397,49 @@ extern void paging_init (void); #define update_mmu_cache(vms,addr,ptep) __update_cache(*ptep) -/* Encode and de-code a swap entry */ - +/* + * Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that + * are !pte_none() && !pte_present(). + * + * Format of swap PTEs (32bit): + * + * 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 -----------------> P E < type -> + * + * E is the exclusive marker that is not stored in swap entries. + * _PAGE_PRESENT (P) must be 0. + * + * For the 64bit version, the offset is extended by 32bit. + */ #define __swp_type(x) ((x).val & 0x1f) #define __swp_offset(x) ( (((x).val >> 6) & 0x7) | \ (((x).val >> 8) & ~0x7) ) -#define __swp_entry(type, offset) ((swp_entry_t) { (type) | \ +#define __swp_entry(type, offset) ((swp_entry_t) { \ + ((type) & 0x1f) | \ ((offset & 0x7) << 6) | \ ((offset & ~0x7) << 8) }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) +#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) +{ + pte_val(pte) |= _PAGE_SWP_EXCLUSIVE; + return pte; +} + +static inline pte_t pte_swp_clear_exclusive(pte_t pte) +{ + pte_val(pte) &= ~_PAGE_SWP_EXCLUSIVE; + return pte; +} + static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { pte_t pte;