Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp271097rdb; Tue, 5 Dec 2023 05:13:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQ4I4AP+J7M6qxVAXfZevaxjGC+P9/LJlE+xfu7631BdH+0hc0fGcEQvi6RZKyVRWPmshz X-Received: by 2002:a17:90b:4d88:b0:27c:f48e:e245 with SMTP id oj8-20020a17090b4d8800b0027cf48ee245mr1239390pjb.24.1701781997200; Tue, 05 Dec 2023 05:13:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701781997; cv=none; d=google.com; s=arc-20160816; b=ILGxpDVeRhgh127ClkhOGteeNPFz8ZCUOqSapRiRb6jVM3OM7uzDbFF3WzwqFx4HOJ xanN/mtNkOrQ/k8+Jn96Zigx4h4q1rJ5DArEsN3uuWnaoz5vMWKcpCwGX6N4cUEYkZC2 hr3cVgr/B9lPB7Zh10xGB48NYresXAj7jqbhQN1VRC32A2R13jTJZcMmohhLOnwg3hAW mDOXQFUm6NQ2P27MJ+j1Am3l3LLyx+W9Z/mZogYJUWEpRtzFJnJtoB5FDG8V5YTHeMiI mLHEh+8RyUcpJSqQm6jgTMChV0kEknv7VWxlYsKQKvuAHDUX1KG00eegaTSkr3pSIzYa PAwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=HznDrp0DTHAI0i3W3IvBFeR/diazMAfaLUibUqFOx8U=; fh=GlLzLBhqF07GE0FJUf82nnkBDPyXS9iIZ0BDzvPX32s=; b=Ozhb9zeOEEJBtvy/dBe6UHNRwQmgfzvAxCjgwkU7EaP6KWGc/1eaJrD5AnXImlMF1Q vv85HQcOL2AcADJMm54d1I+uWTsl6lrnbWwRAO9rZ1I54cyNABHeSPXMyWdWiPifbkZo h5cccOa2YU8mldkFVv3q6I0cykWONTzoEoJhk+aOMhior/n0DNdRtplVrYAbNbK1l5gc bBKj3QgyuqAgQ1u8ebvMXBo0i6nXN8yDXonLdFRrPeWgJG0ShFwh4UWDZ3ZI+G5iPJeX egs/8Ej3w16JqCqPOASVRmQDu8sg/Eo0wqw1Bm3LgskQ52pKx5jAAVBxp7Xkol0BPSLJ ZYeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id on5-20020a17090b1d0500b0027749a1fe74si9895228pjb.182.2023.12.05.05.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 05:13:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E2A1480B64F4; Tue, 5 Dec 2023 05:13:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbjLENM5 (ORCPT + 99 others); Tue, 5 Dec 2023 08:12:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232076AbjLENMy (ORCPT ); Tue, 5 Dec 2023 08:12:54 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2EE2D197 for ; Tue, 5 Dec 2023 05:13:00 -0800 (PST) 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 7DD77139F; Tue, 5 Dec 2023 05:13:46 -0800 (PST) Received: from [10.57.73.130] (unknown [10.57.73.130]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 73CD43F5A1; Tue, 5 Dec 2023 05:12:58 -0800 (PST) Message-ID: Date: Tue, 5 Dec 2023 13:12:56 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC 34/39] mm/rmap: introduce folio_try_dup_anon_rmap_[pte|ptes|pmd]() Content-Language: en-GB To: David Hildenbrand , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu References: <20231204142146.91437-1-david@redhat.com> <20231204142146.91437-35-david@redhat.com> From: Ryan Roberts In-Reply-To: <20231204142146.91437-35-david@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 05 Dec 2023 05:13:14 -0800 (PST) On 04/12/2023 14:21, David Hildenbrand wrote: > The last user of page_needs_cow_for_dma() and __page_dup_rmap() are gone, > remove them. > > Add folio_try_dup_anon_rmap_ptes() right away, we want to perform rmap > baching during fork() soon. > > Signed-off-by: David Hildenbrand > --- > include/linux/mm.h | 6 -- > include/linux/rmap.h | 145 +++++++++++++++++++++++++++++-------------- > 2 files changed, 100 insertions(+), 51 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 24c1c7c5a99c0..f7565b35ae931 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1964,12 +1964,6 @@ static inline bool folio_needs_cow_for_dma(struct vm_area_struct *vma, > return folio_maybe_dma_pinned(folio); > } > > -static inline bool page_needs_cow_for_dma(struct vm_area_struct *vma, > - struct page *page) > -{ > - return folio_needs_cow_for_dma(vma, page_folio(page)); > -} > - > /** > * is_zero_page - Query if a page is a zero page > * @page: The page to query > diff --git a/include/linux/rmap.h b/include/linux/rmap.h > index 21d72cc602adc..84439f7720c62 100644 > --- a/include/linux/rmap.h > +++ b/include/linux/rmap.h > @@ -354,68 +354,123 @@ static inline void folio_dup_file_rmap_pmd(struct folio *folio, > #endif > } > > -static inline void __page_dup_rmap(struct page *page, bool compound) > +static inline int __folio_try_dup_anon_rmap(struct folio *folio, __always_inline? > + struct page *page, unsigned int nr_pages, > + struct vm_area_struct *src_vma, enum rmap_mode mode) > { > - VM_WARN_ON(folio_test_hugetlb(page_folio(page))); > + int i; > > - if (compound) { > - struct folio *folio = (struct folio *)page; > + VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); > > - VM_BUG_ON_PAGE(compound && !PageHead(page), page); > - atomic_inc(&folio->_entire_mapcount); > - } else { > - atomic_inc(&page->_mapcount); > + /* > + * No need to check+clear for already shared PTEs/PMDs of the folio. > + * This includes PTE mappings of (order-0) KSM folios. > + */ > + if (likely(mode == RMAP_MODE_PTE)) { Presumbly if __always_inline then the compiler will remove this if/else and just keep the part indicated by mode? In which case "likely" is pretty useless? Same for all similar sites in the other patches. > + for (i = 0; i < nr_pages; i++) { > + if (PageAnonExclusive(page + i)) > + goto clear; > + } > + } else if (mode == RMAP_MODE_PMD) { > + if (PageAnonExclusive(page)) > + goto clear; > } > + goto dup; > + > +clear: > + /* > + * If this folio may have been pinned by the parent process, > + * don't allow to duplicate the mappings but instead require to e.g., > + * copy the subpage immediately for the child so that we'll always > + * guarantee the pinned folio won't be randomly replaced in the > + * future on write faults. > + */ > + if (likely(!folio_is_device_private(folio) && > + unlikely(folio_needs_cow_for_dma(src_vma, folio)))) > + return -EBUSY; > + > + if (likely(mode == RMAP_MODE_PTE)) { > + for (i = 0; i < nr_pages; i++) Do you really need to reset i=0 here? You have already checked that lower pages are shared in the above loop, so can't you just start from the first exclusive page here? > + ClearPageAnonExclusive(page + i); > + } else if (mode == RMAP_MODE_PMD) { > + ClearPageAnonExclusive(page); > + } > + > +dup: > + __folio_dup_rmap(folio, page, nr_pages, mode); > + return 0; > } > > /** > - * page_try_dup_anon_rmap - try duplicating a mapping of an already mapped > - * anonymous page > - * @page: the page to duplicate the mapping for > - * @compound: the page is mapped as compound or as a small page > - * @vma: the source vma > + * folio_try_dup_anon_rmap_ptes - try duplicating PTE mappings of a page range > + * of a folio > + * @folio: The folio to duplicate the mappings of > + * @page: The first page to duplicate the mappings of > + * @nr_pages: The number of pages of which the mapping will be duplicated > + * @src_vma: The vm area from which the mappings are duplicated > * > - * The caller needs to hold the PT lock and the vma->vma_mm->write_protect_seq. > + * The page range of the folio is defined by [page, page + nr_pages) > * > - * Duplicating the mapping can only fail if the page may be pinned; device > - * private pages cannot get pinned and consequently this function cannot fail. > + * The caller needs to hold the page table lock and the > + * vma->vma_mm->write_protect_seq. > + * > + * Duplicating the mappings can only fail if the folio may be pinned; device > + * private folios cannot get pinned and consequently this function cannot fail. > + * > + * If duplicating the mappings succeeded, the duplicated PTEs have to be R/O in > + * the parent and the child. They must *not* be writable after this call. > + * > + * Returns 0 if duplicating the mappings succeeded. Returns -EBUSY otherwise. > + */ > +static inline int folio_try_dup_anon_rmap_ptes(struct folio *folio, > + struct page *page, unsigned int nr_pages, > + struct vm_area_struct *src_vma) > +{ > + return __folio_try_dup_anon_rmap(folio, page, nr_pages, src_vma, > + RMAP_MODE_PTE); > +} > +#define folio_try_dup_anon_rmap_pte(folio, page, vma) \ > + folio_try_dup_anon_rmap_ptes(folio, page, 1, vma) > + > +/** > + * folio_try_dup_anon_rmap_pmd - try duplicating a PMD mapping of a page range > + * of a folio > + * @folio: The folio to duplicate the mapping of > + * @page: The first page to duplicate the mapping of > + * @src_vma: The vm area from which the mapping is duplicated > + * > + * The page range of the folio is defined by [page, page + HPAGE_PMD_NR) > + * > + * The caller needs to hold the page table lock and the > + * vma->vma_mm->write_protect_seq. > * > - * If duplicating the mapping succeeds, the page has to be mapped R/O into > - * the parent and the child. It must *not* get mapped writable after this call. > + * Duplicating the mapping can only fail if the folio may be pinned; device > + * private folios cannot get pinned and consequently this function cannot fail. > + * > + * If duplicating the mapping succeeds, the duplicated PMD has to be R/O in > + * the parent and the child. They must *not* be writable after this call. > * > * Returns 0 if duplicating the mapping succeeded. Returns -EBUSY otherwise. > */ > +static inline int folio_try_dup_anon_rmap_pmd(struct folio *folio, > + struct page *page, struct vm_area_struct *src_vma) > +{ > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > + return __folio_try_dup_anon_rmap(folio, page, HPAGE_PMD_NR, src_vma, > + RMAP_MODE_PMD); > +#else > + WARN_ON_ONCE(true); > +#endif > +} > + > static inline int page_try_dup_anon_rmap(struct page *page, bool compound, > struct vm_area_struct *vma) > { > - VM_BUG_ON_PAGE(!PageAnon(page), page); > - > - /* > - * No need to check+clear for already shared pages, including KSM > - * pages. > - */ > - if (!PageAnonExclusive(page)) > - goto dup; > - > - /* > - * If this page may have been pinned by the parent process, > - * don't allow to duplicate the mapping but instead require to e.g., > - * copy the page immediately for the child so that we'll always > - * guarantee the pinned page won't be randomly replaced in the > - * future on write faults. > - */ > - if (likely(!is_device_private_page(page) && > - unlikely(page_needs_cow_for_dma(vma, page)))) > - return -EBUSY; > + struct folio *folio = page_folio(page); > > - ClearPageAnonExclusive(page); > - /* > - * It's okay to share the anon page between both processes, mapping > - * the page R/O into both processes. > - */ > -dup: > - __page_dup_rmap(page, compound); > - return 0; > + if (likely(!compound)) > + return folio_try_dup_anon_rmap_pte(folio, page, vma); > + return folio_try_dup_anon_rmap_pmd(folio, page, vma); > } > > /**