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 588CFC197A0 for ; Thu, 16 Nov 2023 10:26:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9F5F6B044F; Thu, 16 Nov 2023 05:26:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C4E156B0451; Thu, 16 Nov 2023 05:26:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B17176B0452; Thu, 16 Nov 2023 05:26:45 -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 9E4386B044F for ; Thu, 16 Nov 2023 05:26:45 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 722D1140C2A for ; Thu, 16 Nov 2023 10:26:45 +0000 (UTC) X-FDA: 81463438770.02.999E015 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf08.hostedemail.com (Postfix) with ESMTP id 77A8D160004 for ; Thu, 16 Nov 2023 10:26:43 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf08.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700130403; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vT4gt85geZkwMlK2ePX3bGk+fMOV3urHN7s9kVWvPoA=; b=rurvFj6hLuWV0QOMT50WzDRDLgdxPItjPa2BaILjmK7gpWv5jYOABIPSgqjP4Kkh2etPiz Xm2VOvNUKACQp0k1G1BPI6e9mdvcAu3rT+7+i+0jBm3trqzZDmhdU2Fh58Wfd5eT7AEtog NfhmDOoWfhHeWIzFcPR3iRz8iLde++A= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf08.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700130403; a=rsa-sha256; cv=none; b=zrkmEWS48GEyTI5dTK8PHwzF1D7KdtsgZuVtdif7lA6QFIN0463pEcVKKDW9ug7vtHWJvT ZmRE0w1OEdglI+Y3nuVFkG4TF78s2F0vHv/FVOSX0K5Ili0psZl5RcaKN79AhQMXmII9oB voqB5Q41HI6O7IItni3XiEJy5uncL14= 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 A6E571595; Thu, 16 Nov 2023 02:27:28 -0800 (PST) Received: from [10.1.35.163] (XHFQ2J9959.cambridge.arm.com [10.1.35.163]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9F0F43F6C4; Thu, 16 Nov 2023 02:26:39 -0800 (PST) Message-ID: Date: Thu, 16 Nov 2023 10:26:33 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 01/14] mm: Batch-copy PTE ranges during fork() Content-Language: en-GB To: David Hildenbrand , Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Anshuman Khandual , Matthew Wilcox , Yu Zhao , Mark Rutland , Kefeng Wang , John Hubbard , Zi Yan Cc: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20231115163018.1303287-1-ryan.roberts@arm.com> <20231115163018.1303287-2-ryan.roberts@arm.com> <271f1e98-6217-4b40-bae0-0ac9fe5851cb@redhat.com> From: Ryan Roberts In-Reply-To: <271f1e98-6217-4b40-bae0-0ac9fe5851cb@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 77A8D160004 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: imk9qrxfeus8i8x4co93atdrbrc5qrdm X-HE-Tag: 1700130403-105827 X-HE-Meta: U2FsdGVkX182ewTG9HHB81SQQDiCIsb4Qp9uBIKiC6f8L/KmJJoUZOgeSPfkRMetW6XEQpvRBUPn9O9l+t3wdAeHcJO7aasSAHCpSmjlXrUisCXEBZ03JeebH7Wo2obuEN/e819I61JRnL8NV9GVLXxyRFIqrtxraWxog1c2zM9mSMz6YklK1Ws3rlOTZQfs0KZZZAXKwD2rQ/nn6WMD0t9L7oxSxu44rG0T7UBUK/WOV1Z7BTEKiMd3tC8hTTVFjDvBvk/IyDJDXgH3ijkbaNGKyC264it4aS42pffx+GvZ5ugXUlVQAUgYAiFC6UeZBTUbxGL0SbMzWeZToOs93Oqp258MUZj9+v6LNFfUHDChc88rcWvy5/D0pjm41zCcGvt6K2mYvGhS274LNe1n9+fu0JVuGymeILuV41E8gPHsFg1mRK4pqlia0NgI16l4T0gV6LHgQwt5l/hKPL1taGaBS22uX30hlXbzrIvNv4msZpw7eR7njUoHOfYQqhYEVH6KvOTbEdXFElbsDYTobc3RLQdjGSol7zhfYcSO1p47wOe2/cPrTBAedjn2JUpIaPYDP5WOlaL5n3+Gxdm6faMqXQgS4TE/Jsb+3MAK3rEVDQ1NcV1XFt5T5pyPYiM5coGdU/FOGYtJfVtwFUP7UGbkRZuthZ352G6t5YyU6QjnSAIykGbicJJu/ZSA38YYTAGBP6ZC57gAydYXU4s5rtt7gfuLfUedjC2fIA+jdrwTrL/EPRm9isTnmsYYeA1eQ8TUmB5pt5jEkWdZi9hzborB4Wd9n+YakNqUYoV3cnXh0zVy0Q8HjuqZhLXodsOLEMKqoRSwRXgkoNKjJLPyjjyMOjYCZRTIc0EuBDw+QngcFezbtzt0yh7tz/yeIJuufNhTMrm7bWTWn0fZTmOv73rBbGq/iHm5sj3I53BhHbMjlEkswS1EyH8KOUlQPFBBQ8s6v6t7otk/8ZCWEEX i6vqMySS YZnAeEXTQCF/dJXq717jzjiZqULUdHX71Knz0x1TNLbHp429scfRJiSLK1SCJtE4wLIajKDzPSMZHZYUxKrVdimxeYXJ81by91U+nlsV/dEGTw7RPMB3D9jhpudtRi22CiQIUOV9ChA+ZxYvJThfqbZ6OzDkyymhnWBdigqyuCzmQyEziaIZsWbGl6Ke8u4y1tIsnM8dVOcnU5JTDr59kEM4571f/QjHhHxXFhgok1FER7L6vEOIjMK19RW+J+Ags6WaVg1R5NbaSek6gEf7xaWoQqA== 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 16/11/2023 10:03, David Hildenbrand wrote: > On 15.11.23 17:30, Ryan Roberts wrote: >> Convert copy_pte_range() to copy a set of ptes in a batch. A given batch >> maps a physically contiguous block of memory, all belonging to the same >> folio, with the same permissions, and for shared mappings, the same >> dirty state. This will likely improve performance by a tiny amount due >> to batching the folio reference count management and calling set_ptes() >> rather than making individual calls to set_pte_at(). >> >> However, the primary motivation for this change is to reduce the number >> of tlb maintenance operations that the arm64 backend has to perform >> during fork, as it is about to add transparent support for the >> "contiguous bit" in its ptes. By write-protecting the parent using the >> new ptep_set_wrprotects() (note the 's' at the end) function, the >> backend can avoid having to unfold contig ranges of PTEs, which is >> expensive, when all ptes in the range are being write-protected. >> Similarly, by using set_ptes() rather than set_pte_at() to set up ptes >> in the child, the backend does not need to fold a contiguous range once >> they are all populated - they can be initially populated as a contiguous >> range in the first place. >> >> This change addresses the core-mm refactoring only, and introduces >> ptep_set_wrprotects() with a default implementation that calls >> ptep_set_wrprotect() for each pte in the range. A separate change will >> implement ptep_set_wrprotects() in the arm64 backend to realize the >> performance improvement as part of the work to enable contpte mappings. >> >> Signed-off-by: Ryan Roberts >> --- >>   include/linux/pgtable.h |  13 +++ >>   mm/memory.c             | 175 +++++++++++++++++++++++++++++++--------- >>   2 files changed, 150 insertions(+), 38 deletions(-) >> >> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h >> index af7639c3b0a3..1c50f8a0fdde 100644 >> --- a/include/linux/pgtable.h >> +++ b/include/linux/pgtable.h >> @@ -622,6 +622,19 @@ static inline void ptep_set_wrprotect(struct mm_struct >> *mm, unsigned long addres >>   } >>   #endif >>   +#ifndef ptep_set_wrprotects >> +struct mm_struct; >> +static inline void ptep_set_wrprotects(struct mm_struct *mm, >> +                unsigned long address, pte_t *ptep, >> +                unsigned int nr) >> +{ >> +    unsigned int i; >> + >> +    for (i = 0; i < nr; i++, address += PAGE_SIZE, ptep++) >> +        ptep_set_wrprotect(mm, address, ptep); >> +} >> +#endif >> + >>   /* >>    * On some architectures hardware does not set page access bit when accessing >>    * memory page, it is responsibility of software setting this bit. It brings >> diff --git a/mm/memory.c b/mm/memory.c >> index 1f18ed4a5497..b7c8228883cf 100644 >> --- a/mm/memory.c >> +++ b/mm/memory.c >> @@ -921,46 +921,129 @@ copy_present_page(struct vm_area_struct *dst_vma, >> struct vm_area_struct *src_vma >>           /* Uffd-wp needs to be delivered to dest pte as well */ >>           pte = pte_mkuffd_wp(pte); >>       set_pte_at(dst_vma->vm_mm, addr, dst_pte, pte); >> -    return 0; >> +    return 1; >> +} >> + >> +static inline unsigned long page_cont_mapped_vaddr(struct page *page, >> +                struct page *anchor, unsigned long anchor_vaddr) >> +{ >> +    unsigned long offset; >> +    unsigned long vaddr; >> + >> +    offset = (page_to_pfn(page) - page_to_pfn(anchor)) << PAGE_SHIFT; >> +    vaddr = anchor_vaddr + offset; >> + >> +    if (anchor > page) { >> +        if (vaddr > anchor_vaddr) >> +            return 0; >> +    } else { >> +        if (vaddr < anchor_vaddr) >> +            return ULONG_MAX; >> +    } >> + >> +    return vaddr; >> +} >> + >> +static int folio_nr_pages_cont_mapped(struct folio *folio, >> +                      struct page *page, pte_t *pte, >> +                      unsigned long addr, unsigned long end, >> +                      pte_t ptent, bool *any_dirty) >> +{ >> +    int floops; >> +    int i; >> +    unsigned long pfn; >> +    pgprot_t prot; >> +    struct page *folio_end; >> + >> +    if (!folio_test_large(folio)) >> +        return 1; >> + >> +    folio_end = &folio->page + folio_nr_pages(folio); >> +    end = min(page_cont_mapped_vaddr(folio_end, page, addr), end); >> +    floops = (end - addr) >> PAGE_SHIFT; >> +    pfn = page_to_pfn(page); >> +    prot = pte_pgprot(pte_mkold(pte_mkclean(ptent))); >> + >> +    *any_dirty = pte_dirty(ptent); >> + >> +    pfn++; >> +    pte++; >> + >> +    for (i = 1; i < floops; i++) { >> +        ptent = ptep_get(pte); >> +        ptent = pte_mkold(pte_mkclean(ptent)); >> + >> +        if (!pte_present(ptent) || pte_pfn(ptent) != pfn || >> +            pgprot_val(pte_pgprot(ptent)) != pgprot_val(prot)) >> +            break; >> + >> +        if (pte_dirty(ptent)) >> +            *any_dirty = true; >> + >> +        pfn++; >> +        pte++; >> +    } >> + >> +    return i; >>   } >>     /* >> - * Copy one pte.  Returns 0 if succeeded, or -EAGAIN if one preallocated page >> - * is required to copy this pte. >> + * Copy set of contiguous ptes.  Returns number of ptes copied if succeeded >> + * (always gte 1), or -EAGAIN if one preallocated page is required to copy the >> + * first pte. >>    */ >>   static inline int >> -copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, >> -         pte_t *dst_pte, pte_t *src_pte, unsigned long addr, int *rss, >> -         struct folio **prealloc) >> +copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct >> *src_vma, >> +          pte_t *dst_pte, pte_t *src_pte, >> +          unsigned long addr, unsigned long end, >> +          int *rss, struct folio **prealloc) >>   { >>       struct mm_struct *src_mm = src_vma->vm_mm; >>       unsigned long vm_flags = src_vma->vm_flags; >>       pte_t pte = ptep_get(src_pte); >>       struct page *page; >>       struct folio *folio; >> +    int nr = 1; >> +    bool anon; >> +    bool any_dirty = pte_dirty(pte); >> +    int i; >>         page = vm_normal_page(src_vma, addr, pte); >> -    if (page) >> +    if (page) { >>           folio = page_folio(page); >> -    if (page && folio_test_anon(folio)) { >> -        /* >> -         * If this page may have been pinned by the parent process, >> -         * copy the page immediately for the child so that we'll always >> -         * guarantee the pinned page won't be randomly replaced in the >> -         * future. >> -         */ >> -        folio_get(folio); >> -        if (unlikely(page_try_dup_anon_rmap(page, false, src_vma))) { >> -            /* Page may be pinned, we have to copy. */ >> -            folio_put(folio); >> -            return copy_present_page(dst_vma, src_vma, dst_pte, src_pte, >> -                         addr, rss, prealloc, page); >> +        anon = folio_test_anon(folio); >> +        nr = folio_nr_pages_cont_mapped(folio, page, src_pte, addr, >> +                        end, pte, &any_dirty); >> + >> +        for (i = 0; i < nr; i++, page++) { >> +            if (anon) { >> +                /* >> +                 * If this page may have been pinned by the >> +                 * parent process, copy the page immediately for >> +                 * the child so that we'll always guarantee the >> +                 * pinned page won't be randomly replaced in the >> +                 * future. >> +                 */ >> +                if (unlikely(page_try_dup_anon_rmap( >> +                        page, false, src_vma))) { >> +                    if (i != 0) >> +                        break; >> +                    /* Page may be pinned, we have to copy. */ >> +                    return copy_present_page( >> +                        dst_vma, src_vma, dst_pte, >> +                        src_pte, addr, rss, prealloc, >> +                        page); >> +                } >> +                rss[MM_ANONPAGES]++; >> +                VM_BUG_ON(PageAnonExclusive(page)); >> +            } else { >> +                page_dup_file_rmap(page, false); >> +                rss[mm_counter_file(page)]++; >> +            } >>           } >> -        rss[MM_ANONPAGES]++; >> -    } else if (page) { >> -        folio_get(folio); >> -        page_dup_file_rmap(page, false); >> -        rss[mm_counter_file(page)]++; >> + >> +        nr = i; >> +        folio_ref_add(folio, nr); > > You're changing the order of mapcount vs. refcount increment. Don't. Make sure > your refcount >= mapcount. Ouch - good spot. > > You can do that easily by doing the folio_ref_add(folio, nr) first and then > decrementing in case of error accordingly. Errors due to pinned pages are the > corner case. Yep, propose this for v3: diff --git a/mm/memory.c b/mm/memory.c index b7c8228883cf..98373349806e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1014,6 +1014,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma anon = folio_test_anon(folio); nr = folio_nr_pages_cont_mapped(folio, page, src_pte, addr, end, pte, &any_dirty); + folio_ref_add(folio, nr); for (i = 0; i < nr; i++, page++) { if (anon) { @@ -1029,6 +1030,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma if (i != 0) break; /* Page may be pinned, we have to copy. */ + folio_ref_sub(folio, nr); return copy_present_page( dst_vma, src_vma, dst_pte, src_pte, addr, rss, prealloc, @@ -1042,8 +1044,10 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma } } - nr = i; - folio_ref_add(folio, nr); + if (i < nr) { + folio_ref_sub(folio, nr - i); + nr = i; + } } > > I'll note that it will make a lot of sense to have batch variants of > page_try_dup_anon_rmap() and page_dup_file_rmap(). > > Especially, the batch variant of page_try_dup_anon_rmap() would only check once > if the folio maybe pinned, and in that case, you can simply drop all references > again. So you either have all or no ptes to process, which makes that code easier. > > But that can be added on top, and I'll happily do that. That's very kind - thanks for the offer! I'll leave it to you then.