From patchwork Mon Dec 11 15:56:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487473 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 D7C45C4167B for ; Mon, 11 Dec 2023 15:58:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7DFEF6B0138; Mon, 11 Dec 2023 10:58:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 78AA76B013A; Mon, 11 Dec 2023 10:58:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62C376B013B; Mon, 11 Dec 2023 10:58:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4E80D6B0138 for ; Mon, 11 Dec 2023 10:58:30 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 19165806FD for ; Mon, 11 Dec 2023 15:58:30 +0000 (UTC) X-FDA: 81554994780.22.D1DBA50 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 5370FC0014 for ; Mon, 11 Dec 2023 15:58:28 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f+GzJMoz; spf=pass (imf22.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=1702310308; 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=nX1pXuuGCFSgne2iWx/veTQmI+PIa0/pNoky6wKmMd0=; b=kjgaIfh69HgUCAJzlLPuP8SIrCeoTeyvWWpYu00gBNBLRsREKvZnfQbbCq5Ea1pOVnvAqo ZaBNDFkpiU2RTQAl4PiTz8MmH62lQj3zNjd+TsvS2+iDBgJ8+bu00i5QP2OxDowfSb/nvC REfZ4mFBEf9wPXcu0ZJVW6CEs6+7f8Q= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f+GzJMoz; spf=pass (imf22.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=1702310308; a=rsa-sha256; cv=none; b=JUp/jr9Hba2ShdpofHHFF9kP5lSZ38K9/8cAAoi1etnOKbCWNb0Gd399YeQDh1v4osmhZo G+sKqtbd3adQvVuvlguK6khyNev8S7y/0JRtGVed9gNBT01QsrVZvzucISQnS1WUYtGkIP K3ERMhGtO7HQGAWXLhJUwmsc0l+W+UM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310307; 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=nX1pXuuGCFSgne2iWx/veTQmI+PIa0/pNoky6wKmMd0=; b=f+GzJMoze76emyCm2Mb/GDC6gnAbAKM5wQfdqmmqRCRj10IBYtW9qrnZzYDTRVuVz7jwC9 5F13jcT1JTaSN9W8tEnz1fbznjuOTk7dYGfDj40RWYyX4sfZAGEMi3wtr82SgcuaCvFYul FwgZu4f6xIu1JOb9E+UG/DFa9YgAeB0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-6fAsG4HZNcWrnusNEcf0NQ-1; Mon, 11 Dec 2023 10:58:21 -0500 X-MC-Unique: 6fAsG4HZNcWrnusNEcf0NQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5105985A589; Mon, 11 Dec 2023 15:58:20 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C4221121306; Mon, 11 Dec 2023 15:58:18 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v1 33/39] mm/rmap: convert page_dup_file_rmap() to folio_dup_file_rmap_[pte|ptes|pmd]() Date: Mon, 11 Dec 2023 16:56:46 +0100 Message-ID: <20231211155652.131054-34-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: 5370FC0014 X-Rspam-User: X-Stat-Signature: wzazcugyhago66d9w3ihnroxd1b37btu X-Rspamd-Server: rspam01 X-HE-Tag: 1702310308-203631 X-HE-Meta: U2FsdGVkX18ff8eTmbg+SK5e9DVbKN2zTehENObiH3S82rFHinoq1LdDsYZcVCd4IBLS1ttLOJOqo/Pe/Sj6oYmGjNILFuf4OmEQzUVu85o5TCgWm+aVPPieRdKN40w61Fc9Q+KVn/HRzZ1mdi93KpTLFbTJgrm/x6GUA5xxPBciT5O7HTAr03tCqFSsA2EDuSgfVowgOxFkaupCl1/BZ2fuhWpOgPCP/ZilthZrxK8bKcDr/HAhGYBdzTTKb1rH6slasJDF3n4VvxuWUzEwkRAow6oMA8xp9IqJu21fPY0Mon3uJL1e5/3bgq735kB2ydK1dRJAU2R5sItR0ADFaoNEAVkW+xNizFrenfLJYKgA8MzVYstxT2gJb/1WS0ovSIsJWCVJ25EW61GSoviGSE544nD+QqFh0DK7Mj0kvnNtNL9EEmfM5ECxs5FFTPNXRNRkubza8RbTUkLbIqNMo2aC6AlVcgAvSdlHCFgS6rkNIQr6yr0zpdnvwolWX9wrDeEMR4lbsTYhyjfDautPLx0LAUJnGa88rO7yJHb2tZLbXQi1gjZcJlYu2q3b9YLPuA41yOFfaY2arUJ23vN2w5X22nVjGxaOCLtAix7H55NkL561ii/0RjDPpIX9G63B+lJJFS0gCj4UwTU3JDvUQJzDLWOLwiOJWn8q0rbd+7KJ+EZqm7JvzaeE/kY1dFf8v6NhfN/nwV1OIC1uV4QCgpVyYDq3oPZUH2yZcaTD86zW6kTpJxb9ajISMINkHaeKWGPMnS+uNpwLTSghOzZPuWlcVAeE7SM2j+GXVQgJrhNG8DUFYDAMjNVR+h4WMuHzd1H2gXXpy45lzarBUF0G1kFKkms9pUuzF1fGElmAgjmAe/d1GrciRh2Mj1xbAW5ePDwP2hkxxyxGrpiHDQk5hF0qHqJdUquztXtHan+6GDWblBrhzehyyXnecwaSIiLzNZiNiF8TPw/qyExIUaJ sMgwkSn1 cNtw1UahNLVSmKvw8AN/qJCtbV9tV6VOoLwQbw9eIAunfgn8cH9IP7PtzEN1R8pdv+/JbS2TWBe1y9HuX0gfLtZWahTEr6K7GNOJiAgeLFGmsDLGslQiCd6EL2FXcgvFx3/3M43nYVk0aLegkF+sS3u79d+/TzCjWGV4DEK/285R1D60hZ15w+Rk9TKpx52tq2GZcqZ//rUA5yblPzfYuP3YwgxOpedeuzr/5 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: Let's convert page_dup_file_rmap() like the other rmap functions. As there is only a single caller, convert that single caller right away and remove page_dup_file_rmap(). Add folio_dup_file_rmap_ptes() right away, we want to perform rmap baching during fork() soon. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 59 ++++++++++++++++++++++++++++++++++++++++---- mm/memory.c | 2 +- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 0f4eecd03bdc..df60e44fecad 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -311,6 +311,60 @@ static inline void hugetlb_remove_rmap(struct folio *folio) atomic_dec(&folio->_entire_mapcount); } +static __always_inline void __folio_dup_file_rmap(struct folio *folio, + struct page *page, int nr_pages, enum rmap_mode mode) +{ + __folio_rmap_sanity_checks(folio, page, nr_pages, mode); + + switch (mode) { + case RMAP_MODE_PTE: + do { + atomic_inc(&page->_mapcount); + } while (page++, --nr_pages > 0); + break; + case RMAP_MODE_PMD: + atomic_inc(&folio->_entire_mapcount); + break; + } +} + +/** + * folio_dup_file_rmap_ptes - duplicate 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 + * + * The page range of the folio is defined by [page, page + nr_pages) + * + * The caller needs to hold the page table lock. + */ +static inline void folio_dup_file_rmap_ptes(struct folio *folio, + struct page *page, int nr_pages) +{ + __folio_dup_file_rmap(folio, page, nr_pages, RMAP_MODE_PTE); +} +#define folio_dup_file_rmap_pte(folio, page) \ + folio_dup_file_rmap_ptes(folio, page, 1) + +/** + * folio_dup_file_rmap_pmd - duplicate 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 + * + * The page range of the folio is defined by [page, page + HPAGE_PMD_NR) + * + * The caller needs to hold the page table lock. + */ +static inline void folio_dup_file_rmap_pmd(struct folio *folio, + struct page *page) +{ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + __folio_dup_file_rmap(folio, page, HPAGE_PMD_NR, RMAP_MODE_PTE); +#else + WARN_ON_ONCE(true); +#endif +} + static inline void __page_dup_rmap(struct page *page, bool compound) { VM_WARN_ON(folio_test_hugetlb(page_folio(page))); @@ -325,11 +379,6 @@ static inline void __page_dup_rmap(struct page *page, bool compound) } } -static inline void page_dup_file_rmap(struct page *page, bool compound) -{ - __page_dup_rmap(page, compound); -} - /** * page_try_dup_anon_rmap - try duplicating a mapping of an already mapped * anonymous page diff --git a/mm/memory.c b/mm/memory.c index 9a5724cf895f..42a0b7b41b86 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -965,7 +965,7 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, rss[MM_ANONPAGES]++; } else if (page) { folio_get(folio); - page_dup_file_rmap(page, false); + folio_dup_file_rmap_pte(folio, page); rss[mm_counter_file(page)]++; }