From patchwork Mon Mar 3 16:30:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13999180 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 2CD27C282CD for ; Mon, 3 Mar 2025 16:30:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58DD5280009; Mon, 3 Mar 2025 11:30:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 53D6F280003; Mon, 3 Mar 2025 11:30:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38DD7280009; Mon, 3 Mar 2025 11:30:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 19216280003 for ; Mon, 3 Mar 2025 11:30:55 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BB2ADA4963 for ; Mon, 3 Mar 2025 16:30:54 +0000 (UTC) X-FDA: 83180778828.30.08E341F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 7EB371A0026 for ; Mon, 3 Mar 2025 16:30:52 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VOULsAUS; spf=pass (imf19.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1741019452; 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=6obLj5/+7cSJHkmjj4/LIEhJkcwhtMxgxzLmveILbME=; b=FMShOteff4G9YOY/OjFLhIv/Wn8BiUPlALsneUt6UTn4waAE3TNmPGArwKrjirCR3pSedj A4Ufxcl1GtzwjrNclZYGIisMj3M3sjqT/K8Wp+wo5n3Rc3dMNVIzFIyCNMBUmhlEj7+7qQ OfVliua/kUT/hGFd5AIWlBNbDUVtouM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VOULsAUS; spf=pass (imf19.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1741019452; a=rsa-sha256; cv=none; b=wCtsBmtwF0sYbTHBZjRN/V6nA92U00NUi3+xlMkh7TVeK2OSbZZlJtspkr3tiW1nSA5k4Z ywVaeAi0sYLx9QOBLNl9KoZUDDqugArf4ppCBcsLc1/jYnFXgYMd0qClRZROJcC92lgAIg hC5A1VcGCnqJdH3P+gZVI2u8VGq2TCE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741019451; 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=6obLj5/+7cSJHkmjj4/LIEhJkcwhtMxgxzLmveILbME=; b=VOULsAUSHXop6cq7IZQrZhOgluh5jvgKrIPIK4/hAZqdK+qG44KFH80/zNUBTFwP/aTZu/ fsVsQbGAOETHG0S3Ii5O7INw25gmMGdiIfTfNylu6gEsTbquiQSB2HX/mX4Cdh0lukZ2AT qsIcUg/+MlcJP8H7/eX/hPUUIOcoUK8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-FbkYBVvsOKG4GeWc29Ptfw-1; Mon, 03 Mar 2025 11:30:33 -0500 X-MC-Unique: FbkYBVvsOKG4GeWc29Ptfw-1 X-Mimecast-MFC-AGG-ID: FbkYBVvsOKG4GeWc29Ptfw_1741019433 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-39104223bb5so609668f8f.2 for ; Mon, 03 Mar 2025 08:30:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741019432; x=1741624232; 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=6obLj5/+7cSJHkmjj4/LIEhJkcwhtMxgxzLmveILbME=; b=ZO9hu/ZKRHl804sFPTlau0w2taYRC2fZjWsxlUdjKkw+b+W7EPrp04eW1p/+d0l3E4 GleZi1KRXU8cMyL3TNbDPi71Y0gBMwqczArc0x75Lld+4IhtL/Drx8KjMCJM0/jpyvFr btgJhXmN1JqjrcBs/QDIYM1ro61Gwh2UaJaw5IxRtfMAyEEy/LB85DMeWej456cvMBn0 aBGvUD4TxbIPI9leZeD1bTDNhV9wJat2gFEFPpKJePm1M7XUBwUYyQfSzBGRPH+8gEIA hjXk/arzK5d9ovptWnRMo2jxdZhDHSR+yRoWqQzTBnOUCKIaTSy3SVn5GiMjKdqsmSAn Ohjg== X-Forwarded-Encrypted: i=1; AJvYcCWiwtsxjNdEVl8tZj3bvFO61EAcaOIH7aZwdV3dwwEv2pSKQKRnmp6IZbfsivev8IFVtr+rrBZL8A==@kvack.org X-Gm-Message-State: AOJu0Yx5GcTR46nrKhKSSAF468DIamIZ+9eDMCjCaxdLGtJj1NqjNIjM 2t69vAlz+jNNtGKPo6fU8aEFJRLd/ZRW3NyiDdayvfiNSPR7ikqNz8yEKU79w09n/WNkZKCsPiy BmHVVz9IsbYmz5LTxmoTZLg+YI70892IriMr1uW/D0HCYIkUk X-Gm-Gg: ASbGncstfANPwR1lhRUQMjKPFFEM0Ne5R4A8o70hldG9mHVC4a7Qdy3dwevE9ujDpVN b1A8I13Y0aa17jmkjD/jtUcuElFNB9roNAfm8X8ciV9Af8+RzMFjRnG5OnRVmjiyQWXrJudgpdM r5kVc8vtRqHDiMIx9Ds0G3b5lTNvesaEjoyq9AuGgixL8XSevLOrTHQBRY418y5LfBulyM7yrvC hziy//bemJCIya63y7byrdrJXkFNourP29HAbQcyeslWkdoScaBRYvGwylRgLBDGDtGPFfEDnPL 5hEKoavVilsgWMndPjvE9bD/zqWh5U51LSShHNq9ztIFaQ0PjtCrMjC3Uxhj6ATrEh2R5ymmjT1 0 X-Received: by 2002:a05:6000:21c6:b0:390:fd23:c145 with SMTP id ffacd0b85a97d-390fd23c2c2mr4404031f8f.36.1741019432578; Mon, 03 Mar 2025 08:30:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8V3sUJRCUTqrZLWnaeVZz5cWv6qO720rAawUL8eI33aPl04j18jrwhTf4sp/MF8gqzp2DbA== X-Received: by 2002:a05:6000:21c6:b0:390:fd23:c145 with SMTP id ffacd0b85a97d-390fd23c2c2mr4403996f8f.36.1741019432210; Mon, 03 Mar 2025 08:30:32 -0800 (PST) Received: from localhost (p200300cbc7349600af274326a2162bfb.dip0.t-ipconnect.de. [2003:cb:c734:9600:af27:4326:a216:2bfb]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bbfece041sm38658125e9.1.2025.03.03.08.30.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Mar 2025 08:30:31 -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 v3 07/20] mm/rmap: pass dst_vma to folio_dup_file_rmap_pte() and friends Date: Mon, 3 Mar 2025 17:30:00 +0100 Message-ID: <20250303163014.1128035-8-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303163014.1128035-1-david@redhat.com> References: <20250303163014.1128035-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xvT2JL1BSX2mogQmer-hwl-IHdxmXhMxXakwepVH6I0_1741019433 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Stat-Signature: au98ytyzcuxiecqhsrbr4cpxrfa115c3 X-Rspamd-Queue-Id: 7EB371A0026 X-Rspamd-Server: rspam07 X-HE-Tag: 1741019452-681489 X-HE-Meta: U2FsdGVkX181Cy+HkLOF0vwV0ZAjMv/rnzLeYncSDn4Gsg+idb4Uw3kepAioWiaIMSszPF55dsHkyuBeFJ6a5Wmn7XFYDrv4SzeQ03a8Lv0l8GMx0vvZbn1eJI6vl/TeUnqJS4xXRadYD9F+o1j+7tmXhqd4n8d/iipJuYOxJXU2geAe1+Cxahhj9MO0JREAvKVrn5sSJpbzO4Dm0OAvfVkKRVYU2EeLggxXP8ptM3UTfdRwgs0L1BEv1LjSUsbxErOcqCehUI9GxZES666W96oUe9QuMDbl+oIlQVGmkkUcCas0oHJNbwhsDdYZ0HIBDtFWgZTxN/WukuXX9q43s1gvA5/wTueDUF5zcjlcoxytrOjt3Lfm9kAZEkrQ4gtCZJirOwC9uYZH6RWQcmzg0x6tX3U6YNOQO9PSo+9CsYIIiTXUazLk0z4NNOJ3qFGRX44X63IoK4pNOkrLxTUO9O9sb/5XlyVjJgCtTaUOszeX3QHgQR1RU8W4maVL4X7vkXS6NS//JXcVqezDI4x00GZ3Nv7K6OMT7EwxS7ywQv4j29/1fkfE/VBUrz3jePxU3xodEurNk3bJseRlcz/BaLWm/zfERo18wx/zhUYAmlMhgzx0tVuI5wx3/HTFOkU4jxmCY7DMf0Hgb7LispG50/DSafCw+G9AuikmiQfM1fyRVpl++IGNdrJ/xk7Me/WDZ+hesuxOADzv8L2dBHIPR0L3Coc6ni2PKzimVYiX1SRA5ZUXJOPJTc5ydVapfL1yP0WFyauOBR6o+US6UOxSXBl+QDWVckG1teVGtuGcGXO34KTb8klufvoW7obZMmkActA2PIWoQtK00NT9vseDmE9z/JJPk0ZHJb4DmWCXx4TIHTh+C/xVMRgJnC8vLZn2Hd3bxTWCkLfh8QAnesaciReBvwE79n7QAIJehp7uhwDwf5MOEo+zfMbgoyWDP/mgov0JA7nRuwoiGnemibC hnVciMVt OgP9x59LI6Gn8wYb1y2VP0Mt0fEbp4jCXrRwCyjLeUsltADu9RG2HblY22sAiFSKIy+5k3w7gpSiWZerM10rfQagYdPgo0rowof8WLdCem74eutqSM4v54x+TMxVgu+6nrrh6w4gEePcYN4iyk0HjkjaSYCLCxrkzQrdE4ETLCPOilj6TfyX7xtmq8jdg5V/KcjCrjqZJ80RySt0t+u5HmcZ5hV5wTw7aKAiMiWJRLRf8Bd8tjmjr5CJ4Xw8DNDUQiKi/W33vKDNsJQO9W6zFr+U34n+gwMOzWPNYUDR75QrUtp4+rechh0eM5pAYCYafqpX9L88GDJVq+sYNATui0QdnTQLR+Z3FU9e0CEI2zmNgWg5zzZ4Pj/IpAHQ/ZYK2PrcT2uKzdZyuA3ByN9uOEpTM+38Pn/pFg2eS4T6I4SQwVc7Zc9N6VpuQVFI5BF5Z2HAlASyATn/ZcJHpfKNpWcIUOKH6BspHQVP8YISTpoKHlkccBPAMaw76jYCOAv8B/ygbvmkznT+v2Xc/KZmP1aTvtg== 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 07d43ca6db1c6..8e8b07e8b12fe 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 1efc393e32b6d..73b783c7d7d51 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -866,7 +866,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 @@ -1020,14 +1020,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) @@ -1045,7 +1045,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, @@ -1055,7 +1055,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)]++; }