From patchwork Mon Feb 24 16:55:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13988500 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 2577EC021A4 for ; Mon, 24 Feb 2025 16:56:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1283A6B0099; Mon, 24 Feb 2025 11:56:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D5AA6B009A; Mon, 24 Feb 2025 11:56:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCF3B6B009B; Mon, 24 Feb 2025 11:56:27 -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 BB57E6B0099 for ; Mon, 24 Feb 2025 11:56:27 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7C10B1C8EE7 for ; Mon, 24 Feb 2025 16:56:27 +0000 (UTC) X-FDA: 83155441614.07.DBBD945 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 6AE861C000B for ; Mon, 24 Feb 2025 16:56:23 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTs+TEzu; spf=pass (imf18.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@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=1740416183; 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:dkim-signature; bh=evcOi+TBEtbvV15MXszgYeJTQO+N+ZLjDDY2W9tEmL0=; b=V0pzbbtrTmMwwFgIL8qX4bjk16MUhXEvZ8Xm0ybgDz6VDfjhE1myvZbeY4IwR/OVFIwS3a gtm9JINHTmfgdRGCdEBqCKuiisRgIlG2zmP1Uz/6vaL8Cyy6ub9fPpoetkKKG/QdDs6CdO 6k13jZILajKvVO6T+jtZVM3vIXwKTSY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTs+TEzu; spf=pass (imf18.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740416183; a=rsa-sha256; cv=none; b=ikydH+qDuZKpNKMc1bF+V8pgva/7GC1Ct+/uGB7XX+QQqvk3mCSdEGHxsKaISGonnsZs3y 45AhCcAwHVphcn7wOO7VdcKhO23d/r0aF5y2CUOE9mB/6ZMd1GoJcKRyUV6J0hqS6WdM85 2GgKVig79wfwummuLGyGSvO7GvRcOKA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416182; h=from:from: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=evcOi+TBEtbvV15MXszgYeJTQO+N+ZLjDDY2W9tEmL0=; b=TTs+TEzucdHJxmBQQfKqN3jIL2eIET4m3/Yz8+NBm+U4UTDcZmSX1SPUOay1HfPuCCKUL1 falqoU7XEMhDSao2+T1aHWley9qnhWm4n3P72HkLwEDA1O08pZuupfCEvRTu2fNpvMlD5w 8Jd+F2kMhTkT0K93Yy4YnYu81YEWfK4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-48-CHp1k-JeOuuqdQbgvVrOpA-1; Mon, 24 Feb 2025 11:56:21 -0500 X-MC-Unique: CHp1k-JeOuuqdQbgvVrOpA-1 X-Mimecast-MFC-AGG-ID: CHp1k-JeOuuqdQbgvVrOpA_1740416180 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38f27acb979so4601720f8f.0 for ; Mon, 24 Feb 2025 08:56:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416180; x=1741020980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=evcOi+TBEtbvV15MXszgYeJTQO+N+ZLjDDY2W9tEmL0=; b=G45Efj7WnKc7evBVRDY9/aGY7LGjoBFbbhvH5tYPzyub88lyMatDEhVJ4tX92lpmvn SN96qv6l+O6C4kHF5WiZkvI+SlxU2C+c1kIZkqoxGlOBBZSK96IAazJUOwuDMBaZYPFZ Mwnj2wTsp2bFTN7vsVa+cqSXPrPSfhu4uSvGDwXL0/Yq1yH2IbS9iwbw9FNbIuShOUNP /h4puyzam3euZc1TaLY7N76Z+NpiIHgTTdrMwpZysWZhMcM4rASdwyu9Q+CJOcsSmbEo l8z/qysYrGtyoSuc/GbpvnC0PWLmLhoL+MXCcx+X558zkigizdtcU58OWRhzzc/QL6AO CMIw== X-Forwarded-Encrypted: i=1; AJvYcCWctZIVswfBvmlnnoN0jd6XiuN3AA8r4JyrZ/yoprvNJxNYYHk5p+dvJDVjqB8lSJBq8TjSECyzSw==@kvack.org X-Gm-Message-State: AOJu0YxzcVhiLZonnkTqh8h38YuLbhLAY5Rf7O28EXj8s1voSsIwSb5V GWBz4zjpHHtEhBQhjmIapwDJrc/aXvm1mzVzrvs+oy2gSIjTaMGH9kPNHUMz2JSMTlINA/q/Ml8 jJmX3vQL2ymeBgvBqxszWvLXqG5VG4ve2RgSMAkP3+eXO06q1 X-Gm-Gg: ASbGncsHl/lnI9q48TzRj5j9pKaW83BkM+12hgNJiyzGfgSessUVlGO1z+kwQDj01tu x/e1/7PJO0A1amaAdqTZhinrV1OQ9Rfmjc6JuRSRIbtCbRPz2P47dzqKinCjk4olOVeSO4iZMX+ iAwWgK9Y78HwTPIesWzQH9SUTNpRHaVlsWYI4/GvAvXkpnVPP+BsJnB/Ys+KflRUkqACcqT6/iu nTTBi9KZozf25YUe7C3GGMLYxdUb51r++cfsO6ywA22Lg2SMqYEx2kkxDxW7+tF/SimIB2cxO+O IaS1wTG2QEUY7yNeMdiCdx4Tx2Xb13p7ML7BM+beMQ== X-Received: by 2002:a05:6000:18a2:b0:38f:50bd:ad11 with SMTP id ffacd0b85a97d-38f707840afmr10692069f8f.5.1740416180203; Mon, 24 Feb 2025 08:56:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJ0CTZOs7oip6JQ6V5mLo1AyAa7BC2bCEfy4T3EJKtPxndTNVUXGmx+vtnsEhrmmF+DjMIVg== X-Received: by 2002:a05:6000:18a2:b0:38f:50bd:ad11 with SMTP id ffacd0b85a97d-38f707840afmr10692042f8f.5.1740416179763; Mon, 24 Feb 2025 08:56:19 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-439b02e489esm111463335e9.21.2025.02.24.08.56.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:19 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn Subject: [PATCH v2 07/20] mm/rmap: pass dst_vma to folio_dup_file_rmap_pte() and friends Date: Mon, 24 Feb 2025 17:55:49 +0100 Message-ID: <20250224165603.1434404-8-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pp9QWuLkXezdC1zd0cus60JEivZP77XVA8Hwfm3WUzE_1740416180 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6AE861C000B X-Stat-Signature: qspezmxsz9xr47hqpbu6zeu8gu5pnobu X-HE-Tag: 1740416183-72418 X-HE-Meta: U2FsdGVkX1+7/XH0UIuaA/KR2kqIDgIP/2GsYzopjLMrvulRwGr+kzpq5y5drmQfEP0i3YLB/mrngCXYRWV6rKlsuoAdlRshlbOjFdkCUTP35BQ+Qiizajc6Ogr1a5P6MoaQFLXC5dsL8JeqrnW2tFs2OguMwFkRBReHPm3tmcLXzG+8H2XJ48/ulzRoogwVqfMCgm/hKF2pGfPq00agrS/hKU9eG5tk06wihe1CRUSbj0EODllxhsAibcOW3mM4snwxFnP/cRa036zkBMkAFj+KPJ//bm0rTqR6Y3VKLKaLOyQGJnTC7giFHXE+KJRwXFfuTd0rjZYj2eZMHmd/QqWfzd3FOBIo0kJ5urtJH8yOEzP3H3k+LPAUj4ziCRStR07LnAa1leveWUVq5DdobOV19ze09s98wcRPJfXaVsvDDp1EythlM2k6VKo6oasWrbuVlqgsJRGk2DXZq59/dMIjZAkL/tlhTYa78TdlUXkAbVRqJohUCgK2klSG/a9vx/5Hi/BnTn8Vo2MdV0t4NI5JKy7uXBuUfv0X90B7iW+/fW0ySrrIHIyxf3gTP1nn1H26r7Ch0gPYuHPLTQvEAc7aUPgr+s6Sf378r1lIJfGrpw1RvLW7g1T71RiuCt0ncK2sNZ7Ih4MFubcz6pkfCu7yJZbIcTnpekYHBguMc7yjnc09Yf6RpCGTQbmwnGukAGrqQbvWnUfLRzDBy+/TFq5GwkeV0jdFGdXLgF0TylchvBekH7ypkLydC1zFAH8/thqCQtzMNtvkTrwgX6emuV9cML/IODx7pErDeyFxFyWBIZogrpmXFE4MpITedILlke/y6oC9qZ53UxyNiTBkUzebblsUOhi8natYm2TfSPwhcaoPYK/oUMlRdJ8YnWb5Qg7b32YMJ5zW65aGNNqeIL9lGz20PFmGVsutCBDw4H1+jZeLmqsv4Nv2wHCAqaOyroK29nwYlM/YJ8ZGb3Y 4Kxegzyi NTOXHfhjVMxc5czZtjSggVh7lE2oNZISsb6Jk+p24Sr5FP02gNpqR7hZZy4hPOQ8QObQrYX7/VHufxVxydqrAzA76aROLE1s95NpLeyr1hzSjft1mc0aZrzMky4PP1te9FKDnyDIczxOHruOFambAQUCwlWqoAUCNvT9aDneKm/exSBy7soeTaKKLIID7ooD856kThlIToKpe072y2oA74sXEssjh2wJOEjjjgPQgIft+IKyvT96/p+q8SucqT0iCft2MLvPQDxxx/zfh/oHPL0hOCxQ3wnwmbxfeWRZSArcaYx8oL38Rn2DmMemC3vqF/E0PjcXd4ZLvhJux16k3bLddOT+gaABho4foVYNtqo48jbphIOtaW4Q8EYWuLdyABHh6cY3HZn2y0Ro255eGhx5QPz3Qe3ew59guh6lcbumW06H30JnSu0Jw7GqDJrY0KdUa5zyxNp6NLKtu1ufVFXM2akeu97tiRvZb7QeqXFA6hPbYuPXgNmXNNHWjitYBbCtHVzOW/w+ZMRPKQGchCUy6iPTcKf8HFEdtTFXkhs0WXVA= 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: We'll need access to the destination MM when modifying the large mapcount of a non-hugetlb large folios next. So pass in the destination VMA. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 42 +++++++++++++++++++++++++----------------- mm/huge_memory.c | 2 +- mm/memory.c | 10 +++++----- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 6abf7960077aa..e795610bade80 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -335,7 +335,8 @@ static inline void hugetlb_remove_rmap(struct folio *folio) } static __always_inline void __folio_dup_file_rmap(struct folio *folio, - struct page *page, int nr_pages, enum rmap_level level) + struct page *page, int nr_pages, struct vm_area_struct *dst_vma, + enum rmap_level level) { const int orig_nr_pages = nr_pages; @@ -366,45 +367,47 @@ static __always_inline void __folio_dup_file_rmap(struct folio *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 + * @dst_vma: The destination vm area * * 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) + struct page *page, int nr_pages, struct vm_area_struct *dst_vma) { - __folio_dup_file_rmap(folio, page, nr_pages, RMAP_LEVEL_PTE); + __folio_dup_file_rmap(folio, page, nr_pages, dst_vma, RMAP_LEVEL_PTE); } static __always_inline void folio_dup_file_rmap_pte(struct folio *folio, - struct page *page) + struct page *page, struct vm_area_struct *dst_vma) { - __folio_dup_file_rmap(folio, page, 1, RMAP_LEVEL_PTE); + __folio_dup_file_rmap(folio, page, 1, dst_vma, RMAP_LEVEL_PTE); } /** * 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 + * @dst_vma: The destination vm area * * 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) + struct page *page, struct vm_area_struct *dst_vma) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - __folio_dup_file_rmap(folio, page, HPAGE_PMD_NR, RMAP_LEVEL_PTE); + __folio_dup_file_rmap(folio, page, HPAGE_PMD_NR, dst_vma, RMAP_LEVEL_PTE); #else WARN_ON_ONCE(true); #endif } static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio, - struct page *page, int nr_pages, struct vm_area_struct *src_vma, - enum rmap_level level) + struct page *page, int nr_pages, struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma, enum rmap_level level) { const int orig_nr_pages = nr_pages; bool maybe_pinned; @@ -470,6 +473,7 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *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 + * @dst_vma: The destination vm area * @src_vma: The vm area from which the mappings are duplicated * * The page range of the folio is defined by [page, page + nr_pages) @@ -488,16 +492,18 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio, * 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, int nr_pages, struct vm_area_struct *src_vma) + struct page *page, int nr_pages, struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma) { - return __folio_try_dup_anon_rmap(folio, page, nr_pages, src_vma, - RMAP_LEVEL_PTE); + return __folio_try_dup_anon_rmap(folio, page, nr_pages, dst_vma, + src_vma, RMAP_LEVEL_PTE); } static __always_inline int folio_try_dup_anon_rmap_pte(struct folio *folio, - struct page *page, struct vm_area_struct *src_vma) + struct page *page, struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma) { - return __folio_try_dup_anon_rmap(folio, page, 1, src_vma, + return __folio_try_dup_anon_rmap(folio, page, 1, dst_vma, src_vma, RMAP_LEVEL_PTE); } @@ -506,6 +512,7 @@ static __always_inline int folio_try_dup_anon_rmap_pte(struct folio *folio, * of a folio * @folio: The folio to duplicate the mapping of * @page: The first page to duplicate the mapping of + * @dst_vma: The destination vm area * @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) @@ -524,11 +531,12 @@ static __always_inline int folio_try_dup_anon_rmap_pte(struct folio *folio, * 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) + struct page *page, struct vm_area_struct *dst_vma, + struct vm_area_struct *src_vma) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - return __folio_try_dup_anon_rmap(folio, page, HPAGE_PMD_NR, src_vma, - RMAP_LEVEL_PMD); + return __folio_try_dup_anon_rmap(folio, page, HPAGE_PMD_NR, dst_vma, + src_vma, RMAP_LEVEL_PMD); #else WARN_ON_ONCE(true); return -EBUSY; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 13152313e77ce..a3264d88d4b49 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1782,7 +1782,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, src_folio = page_folio(src_page); folio_get(src_folio); - if (unlikely(folio_try_dup_anon_rmap_pmd(src_folio, src_page, src_vma))) { + if (unlikely(folio_try_dup_anon_rmap_pmd(src_folio, src_page, dst_vma, src_vma))) { /* Page maybe pinned: split and retry the fault on PTEs. */ folio_put(src_folio); pte_free(dst_mm, pgtable); diff --git a/mm/memory.c b/mm/memory.c index cacf6d53bdf32..ef74c4f009f84 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -845,7 +845,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, folio_get(folio); rss[mm_counter(folio)]++; /* Cannot fail as these pages cannot get pinned. */ - folio_try_dup_anon_rmap_pte(folio, page, src_vma); + folio_try_dup_anon_rmap_pte(folio, page, dst_vma, src_vma); /* * We do not preserve soft-dirty information, because so @@ -999,14 +999,14 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, - nr, src_vma))) { + nr, dst_vma, src_vma))) { folio_ref_sub(folio, nr); return -EAGAIN; } rss[MM_ANONPAGES] += nr; VM_WARN_ON_FOLIO(PageAnonExclusive(page), folio); } else { - folio_dup_file_rmap_ptes(folio, page, nr); + folio_dup_file_rmap_ptes(folio, page, nr, dst_vma); rss[mm_counter_file(folio)] += nr; } if (any_writable) @@ -1024,7 +1024,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma * guarantee the pinned page won't be randomly replaced in the * future. */ - if (unlikely(folio_try_dup_anon_rmap_pte(folio, page, src_vma))) { + if (unlikely(folio_try_dup_anon_rmap_pte(folio, page, dst_vma, src_vma))) { /* Page may be pinned, we have to copy. */ folio_put(folio); err = copy_present_page(dst_vma, src_vma, dst_pte, src_pte, @@ -1034,7 +1034,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma rss[MM_ANONPAGES]++; VM_WARN_ON_FOLIO(PageAnonExclusive(page), folio); } else { - folio_dup_file_rmap_pte(folio, page); + folio_dup_file_rmap_pte(folio, page, dst_vma); rss[mm_counter_file(folio)]++; }