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 79809C48260 for ; Tue, 13 Feb 2024 17:44:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0A0E8D0011; Tue, 13 Feb 2024 12:44:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB7C38D0001; Tue, 13 Feb 2024 12:44:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C58B18D0011; Tue, 13 Feb 2024 12:44:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B5B8D8D0001 for ; Tue, 13 Feb 2024 12:44:37 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7A67480CBF for ; Tue, 13 Feb 2024 17:44:37 +0000 (UTC) X-FDA: 81787505394.14.EC8E7E0 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 9F8D320010 for ; Tue, 13 Feb 2024 17:44:35 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of mark.rutland@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=mark.rutland@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707846275; 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=dNmjcHlI1DNg5S3vsnp2sGZcQX/0VJ0qgk/r7UeOPX0=; b=bc/DnS4kecsXrgUDkpexSogvoikWjXkho1GI1VCuU2iMYLlUIYrlU7iUD7oIJaXKsJZXHS W8SY+6gq3dYE4dq4iAyMTXYmSuRVzErRX3Q/iWtBsL/qMo+KnMJ1ilp28e4cTJ1+m8HT8+ QeN5TgXloNOugCFKcVOHH9Icnw5A5E0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707846275; a=rsa-sha256; cv=none; b=Bd8/wQEs3pw/BFEBKe+ZrjovCi+HwwTsoEOZoxUlBbF40iKBTaWnMXrM3dOXw0k+uNSoDR xF0DEQg2GDWyU3SIK9HPL9mEd1pP8sGP5sksO4o3kNl/rRNcWwWRF2TkZf7RNgCrlD1Wf6 +JpYAQE6Fojt86Jx2sW8aqJo2xr1YuE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of mark.rutland@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=mark.rutland@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0BA6B1FB; Tue, 13 Feb 2024 09:45:16 -0800 (PST) Received: from FVFF77S0Q05N.cambridge.arm.com (FVFF77S0Q05N.cambridge.arm.com [10.1.36.130]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B29C13F5A1; Tue, 13 Feb 2024 09:44:30 -0800 (PST) Date: Tue, 13 Feb 2024 17:44:23 +0000 From: Mark Rutland To: Ryan Roberts Cc: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 25/25] arm64/mm: Automatically fold contpte mappings Message-ID: References: <20240202080756.1453939-1-ryan.roberts@arm.com> <20240202080756.1453939-26-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240202080756.1453939-26-ryan.roberts@arm.com> X-Rspamd-Queue-Id: 9F8D320010 X-Rspam-User: X-Stat-Signature: 9tp18qnfhxomcchse8hg5b9d3poxpzh9 X-Rspamd-Server: rspam03 X-HE-Tag: 1707846275-141317 X-HE-Meta: U2FsdGVkX1+rGai59eB+WXOTTu9ozgvFlMojlwUmt305ybZwbQz9nMrEwOMxjzv2J2Zg5vyUXvti97N03z5rmth9DJ282lw8d4vAIwIah5/ucX1Yc0KHIs2rcoC9dCF00IPRV2AXP0ZKeGwgdPPson0Ly5ywKqKSFwzfwLCdULgQdFFyoRBT6W/ZWXBejkUVIUGm+obWEeYwgQ1DFT5NAZ/LCLsDSRu8URkiNae4pez+cueAUD6btXDhF4aVB9f11DS3RRr+dkkwEkGxi+ORMFf+z5PSlin3qxFjzwxEMOKPIrI1DXSTccDtQmfsZgDniMNSJ73Irjfg2MARUpeXfGSAQIwxYFAvOmTIPL9a3n3K/hBFgXXaDOLqmUrZJhalLWJuHQHxuX3LM2bLCjEaex3FnD6NudPD3viZsIN87ogGqMiQ3MzD57iVvyJk4CF2tw8PJCPNIB4JeJG6dA7tTn5Wk0GGkfbEnoyYNOZ1Fpcgsi8gJO0lwQqC3HbIFostFquW6fwkwQQK7sbXmLtn9QABGI1qjarnM16XaqRZb8IJ7C52rE9f68/UJ5QSArgp1p+Y2YW11bZFAdfF6seoqNm/vrg3QwXhpbFsBA+Q1COAAymhI6avZ4RoOhA2bGzKG6Z5ShBQtWdM8F7GcMpsgTGEt4vR9Y9rWN4FoLg2FNUXtVQ1IMQEGRNoEFqt8vCSimSp3WRoaNnwYy+777UMTFil4kvJO7WmUdyU/57f2Qo8jdSpezmnE29Qp3zpxbwVYnvEmDFxdZI5zhPORlqAGDAnLIkdH6qNQm1jmVwSvTntL8NHg7r6Ed8RDx6OoWjaMcbw25UyW476M+6pzErCgJ9dC3R843lJsX9lzxk8wJ9vui+8f/4wsMT6VfzvI+f1n/eCc8LD09FvvpGZqT+dWcHxbS3HkvjBcNKu4qkgjLpdKZYoZGSfLR/9WpGtl9RscZBzaUX8GpukoJELaqe fuShuFBD 8PaGAxvpPSQ0BKOltl7D9l+pCKfitseCkAuRF8A7g62AjxW3edOOkOYCSaLHhrncftmAkT7BrQfItjUFx1UHFFTI8FlwQcXNZOglNGDkrQ5x/Oos56spJCNHoHvvVfkqzozIalYji8Lr7aGdZQcFMAC0rPEgmvNzUYOed3N2mFwE3Iauddz7x/W6PCBVuZHbN583c4sLIoiCRy8wVVSO80bD38A6PzQQcnPIMkhw9LVckCSB6/UQJd46JayVGdwLNpeBN+P616Nu/26bO2Kc5oDCF1fcRJTKhRxu9Uw6etH/Dl5AUnP0BRqy/Be6GUnCIzJI+QZ4pQmoaOOI= 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, Feb 02, 2024 at 08:07:56AM +0000, Ryan Roberts wrote: > There are situations where a change to a single PTE could cause the > contpte block in which it resides to become foldable (i.e. could be > repainted with the contiguous bit). Such situations arise, for example, > when user space temporarily changes protections, via mprotect, for > individual pages, such can be the case for certain garbage collectors. > > We would like to detect when such a PTE change occurs. However this can > be expensive due to the amount of checking required. Therefore only > perform the checks when an indiviual PTE is modified via mprotect > (ptep_modify_prot_commit() -> set_pte_at() -> set_ptes(nr=1)) and only > when we are setting the final PTE in a contpte-aligned block. > > Signed-off-by: Ryan Roberts > --- > arch/arm64/include/asm/pgtable.h | 26 +++++++++++++ > arch/arm64/mm/contpte.c | 64 ++++++++++++++++++++++++++++++++ > 2 files changed, 90 insertions(+) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index cdc310880a3b..d3357fe4eb89 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -1192,6 +1192,8 @@ void vmemmap_update_pte(unsigned long addr, pte_t *ptep, pte_t pte); > * where it is possible and makes sense to do so. The PTE_CONT bit is considered > * a private implementation detail of the public ptep API (see below). > */ > +extern void __contpte_try_fold(struct mm_struct *mm, unsigned long addr, > + pte_t *ptep, pte_t pte); > extern void __contpte_try_unfold(struct mm_struct *mm, unsigned long addr, > pte_t *ptep, pte_t pte); > extern pte_t contpte_ptep_get(pte_t *ptep, pte_t orig_pte); > @@ -1213,6 +1215,29 @@ extern int contpte_ptep_set_access_flags(struct vm_area_struct *vma, > unsigned long addr, pte_t *ptep, > pte_t entry, int dirty); > > +static __always_inline void contpte_try_fold(struct mm_struct *mm, > + unsigned long addr, pte_t *ptep, pte_t pte) > +{ > + /* > + * Only bother trying if both the virtual and physical addresses are > + * aligned and correspond to the last entry in a contig range. The core > + * code mostly modifies ranges from low to high, so this is the likely > + * the last modification in the contig range, so a good time to fold. > + * We can't fold special mappings, because there is no associated folio. > + */ > + > + const unsigned long contmask = CONT_PTES - 1; > + bool valign = ((addr >> PAGE_SHIFT) & contmask) == contmask; > + > + if (unlikely(valign)) { > + bool palign = (pte_pfn(pte) & contmask) == contmask; > + > + if (unlikely(palign && > + pte_valid(pte) && !pte_cont(pte) && !pte_special(pte))) > + __contpte_try_fold(mm, addr, ptep, pte); > + } > +} > + > static __always_inline void contpte_try_unfold(struct mm_struct *mm, > unsigned long addr, pte_t *ptep, pte_t pte) > { > @@ -1287,6 +1312,7 @@ static __always_inline void set_ptes(struct mm_struct *mm, unsigned long addr, > if (likely(nr == 1)) { > contpte_try_unfold(mm, addr, ptep, __ptep_get(ptep)); > __set_ptes(mm, addr, ptep, pte, 1); > + contpte_try_fold(mm, addr, ptep, pte); > } else { > contpte_set_ptes(mm, addr, ptep, pte, nr); > } > diff --git a/arch/arm64/mm/contpte.c b/arch/arm64/mm/contpte.c > index 80346108450b..2c7dafd0552a 100644 > --- a/arch/arm64/mm/contpte.c > +++ b/arch/arm64/mm/contpte.c > @@ -67,6 +67,70 @@ static void contpte_convert(struct mm_struct *mm, unsigned long addr, > __set_ptes(mm, start_addr, start_ptep, pte, CONT_PTES); > } > > +void __contpte_try_fold(struct mm_struct *mm, unsigned long addr, > + pte_t *ptep, pte_t pte) > +{ > + /* > + * We have already checked that the virtual and pysical addresses are > + * correctly aligned for a contpte mapping in contpte_try_fold() so the > + * remaining checks are to ensure that the contpte range is fully > + * covered by a single folio, and ensure that all the ptes are valid > + * with contiguous PFNs and matching prots. We ignore the state of the > + * access and dirty bits for the purpose of deciding if its a contiguous > + * range; the folding process will generate a single contpte entry which > + * has a single access and dirty bit. Those 2 bits are the logical OR of > + * their respective bits in the constituent pte entries. In order to > + * ensure the contpte range is covered by a single folio, we must > + * recover the folio from the pfn, but special mappings don't have a > + * folio backing them. Fortunately contpte_try_fold() already checked > + * that the pte is not special - we never try to fold special mappings. > + * Note we can't use vm_normal_page() for this since we don't have the > + * vma. > + */ > + > + unsigned long folio_saddr, folio_eaddr; > + unsigned long cont_saddr, cont_eaddr; > + pte_t expected_pte, subpte; > + struct folio *folio; > + struct page *page; > + unsigned long pfn; > + pte_t *orig_ptep; > + pgprot_t prot; > + > + int i; > + > + if (!mm_is_user(mm)) > + return; > + > + page = pte_page(pte); > + folio = page_folio(page); > + folio_saddr = addr - (page - &folio->page) * PAGE_SIZE; > + folio_eaddr = folio_saddr + folio_nr_pages(folio) * PAGE_SIZE; > + cont_saddr = ALIGN_DOWN(addr, CONT_PTE_SIZE); > + cont_eaddr = cont_saddr + CONT_PTE_SIZE; I assume that the 's' in *_sddar is for "start", and the 'e' in *_eaddr is for "end". Could we use "start" and "end" directly, e.g. folio_start, folio_end? > + > + if (folio_saddr > cont_saddr || folio_eaddr < cont_eaddr) > + return; > + > + pfn = pte_pfn(pte) - ((addr - cont_saddr) >> PAGE_SHIFT); IIUC this should be the same as: pfn = ALIGN_DOWN(pte_pfn(pte), NR_CONT_PTES); ... which would align with the way we generate 'cont_saddr' above. Otherwise, this looks good to me. Mark. > + prot = pte_pgprot(pte_mkold(pte_mkclean(pte))); > + expected_pte = pfn_pte(pfn, prot); > + orig_ptep = ptep; > + ptep = contpte_align_down(ptep); > + > + for (i = 0; i < CONT_PTES; i++) { > + subpte = pte_mkold(pte_mkclean(__ptep_get(ptep))); > + if (!pte_same(subpte, expected_pte)) > + return; > + expected_pte = pte_advance_pfn(expected_pte, 1); > + ptep++; > + } > + > + pte = pte_mkcont(pte); > + contpte_convert(mm, addr, orig_ptep, pte); > +} > +EXPORT_SYMBOL(__contpte_try_fold); > + > void __contpte_try_unfold(struct mm_struct *mm, unsigned long addr, > pte_t *ptep, pte_t pte) > { > -- > 2.25.1 >