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 F0ECEC001B0 for ; Fri, 14 Jul 2023 16:17:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 786DA900005; Fri, 14 Jul 2023 12:17:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 739028E000A; Fri, 14 Jul 2023 12:17:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FFA9900005; Fri, 14 Jul 2023 12:17:47 -0400 (EDT) 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 4EB2C8E000A for ; Fri, 14 Jul 2023 12:17:47 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1CEFCA02AD for ; Fri, 14 Jul 2023 16:17:47 +0000 (UTC) X-FDA: 81010723374.16.CDB6557 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 580DB1C0003 for ; Fri, 14 Jul 2023 16:17:45 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.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=1689351465; 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; bh=MtFe+SBpb58GfXPkNa/WZIUSJbi6BRi5IT0DzQBQLj0=; b=VIAjOpzshnGnsqAtrFweu8j/6ZvEq0aRlK5NDNxqIJ+Ux4WyIwRyAmIQ1+s0MY+m5yJOaP 5q8j1IJQ7cyFG3olf7tvuaCGJAB340KhbBuUElNj6ugC4EYm3b6Xy4AFqAUADXgtfXNwKI JnWf5IpIq6IdOd+ZFzFO5CdkFT7EgF8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.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=1689351465; a=rsa-sha256; cv=none; b=GoscbgQ1vx/Bl64VN/rJKyZwiPE5qzlaVaGPnaSAWlHppgsvolpoWFZ/p8MMlw+E4fLrfr wpUraNJRbbcEXW9O5VPDFhAOVjh0J01/Nku6Neit903NzYhKDHfQZ6hvEyRsSNteisaG/B vyTal5Wxy/SpG0TigtTOD7fjGQr9uBA= 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 56B861570; Fri, 14 Jul 2023 09:18:26 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 089E33F740; Fri, 14 Jul 2023 09:17:41 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , "Kirill A. Shutemov" , Yin Fengwei , David Hildenbrand , Yu Zhao , Catalin Marinas , Will Deacon , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 1/4] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Date: Fri, 14 Jul 2023 17:17:30 +0100 Message-Id: <20230714161733.4144503-1-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230714160407.4142030-1-ryan.roberts@arm.com> References: <20230714160407.4142030-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 580DB1C0003 X-Stat-Signature: 95pynny8c97qrjjeoxg39psakezdmkhd X-HE-Tag: 1689351465-412295 X-HE-Meta: U2FsdGVkX1+4s1iqRDX03VUB1YwzWgLhLHveUAjWjIzdHWnpOpfC0sar9/WP1BkpdKDfRv+Im7fVivv6lanaAxGqTrgyK2GtMB2hghDtb+g3Acmk9V0e3CTplqaJw5QFQVanjphi3dEjfseCjnqpFth83l1PiqAjhl06+04KD8SoXMlIAPSbLUr4Lq+Bk5tI8EY3FUsvN/xnXseqPAYWmMIAsvUzEmFAIGAhkpLNHbvAalaXULDHkTolrgno5othRCsMdBgFw03wU0Ro2Vqi1sMgjKEgibMABWyQmK6jcc8wbqlWM9SKwKsv/vfQg0WZ0kRr94srSoSw5e4JEMbhzU2LATTZ3fti8FNaMl7nXCtXG1aVB07w27QlquzVEA1Y5Qp2GJ1jzznf0PXXUKjbQDbTSgI3NdYWijIg5g45J4KzJUcPWhR/xV7ikCS6wDiVp7JJJPY28N/ERGepWV8Gbjcl/Hg/N5macO4RtGRyUc1yShp725IjgupLyRLRn7zKrzqkk0W9FIZdaTKjvO9KYPwdPrdmWDOyTHsWTRxQmXGyAu5nEgyKXvyErjrzK5j2PF/tH8b5kiyM6vSlWUsGgwufxAkBGlwY7rOavzwfapNJM+kxyPwOW/324RG7m/ZfN36K+qmqQmBJDFeR90xCDUFZp6pEMHest7xtD1Scb0TWXkYU7gCYM5GBEecDi+oUve6ImtsmBPWtpkVXISt0JU/2MCZjaNXRdgI3EBEtXlS0zNhxzwuiELiSVB7ezl9Owl1lbdHn/bGU96/6lyvWtPIhVDV5s7r1OKdR9jxiGRrCU3Ny4FxCiqgwSs/W8z8Nu9sUQIVcSfDiOopjcIhPTPFbewT3SB9hKdc+KuRhwSKBYiHGOz3bpz0wl2yNlkLJ0FT4BdrmIOyZyTO/NsH4RNWbpJ+6pvHWhHWFQfVqROa2EVZGJ/+0n4Fi6U2sHn4NYJMntFOm82Os8iq6PhX THBIIQIp dJ3a/0mYRHe+jRhxogUyu+AMUSErnJTP56DzMOMnVvfvbwHqVOksJFGY5mvWSSEyuzWku0F/aEPvMdHX5h+YipzHl1k94yiQ+i37uT4wjxdO65NV4yejlG28JLxSKNUqDY5yRJXB3M80p9bbhxcsAbJm3eBaJCArTIY3p6Skd/vBRpN1mQDZ8JeeLx9ajMiA83W1TpO4hAK53e8D+Fpb9l2CtduNQNCvhXN3Blryg6OotQyxuVKF/kbYRGQ== 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: In preparation for FLEXIBLE_THP support, improve folio_add_new_anon_rmap() to allow a non-pmd-mappable, large folio to be passed to it. In this case, all contained pages are accounted using the order-0 folio (or base page) scheme. Signed-off-by: Ryan Roberts Reviewed-by: Yu Zhao Reviewed-by: Yin Fengwei --- mm/rmap.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0c0d8857dfce..f293d072368a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1278,31 +1278,45 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, * This means the inc-and-test can be bypassed. * The folio does not have to be locked. * - * If the folio is large, it is accounted as a THP. As the folio + * If the folio is pmd-mappable, it is accounted as a THP. As the folio * is new, it's assumed to be mapped exclusively by a single process. */ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, unsigned long address) { - int nr; + int nr = folio_nr_pages(folio); - VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma); + VM_BUG_ON_VMA(address < vma->vm_start || + address + (nr << PAGE_SHIFT) > vma->vm_end, vma); __folio_set_swapbacked(folio); - if (likely(!folio_test_pmd_mappable(folio))) { + if (!folio_test_large(folio)) { /* increment count (starts at -1) */ atomic_set(&folio->_mapcount, 0); - nr = 1; + __page_set_anon_rmap(folio, &folio->page, vma, address, 1); + } else if (!folio_test_pmd_mappable(folio)) { + int i; + + for (i = 0; i < nr; i++) { + struct page *page = folio_page(folio, i); + + /* increment count (starts at -1) */ + atomic_set(&page->_mapcount, 0); + __page_set_anon_rmap(folio, page, vma, + address + (i << PAGE_SHIFT), 1); + } + + /* increment count (starts at 0) */ + atomic_set(&folio->_nr_pages_mapped, nr); } else { /* increment count (starts at -1) */ atomic_set(&folio->_entire_mapcount, 0); atomic_set(&folio->_nr_pages_mapped, COMPOUND_MAPPED); - nr = folio_nr_pages(folio); + __page_set_anon_rmap(folio, &folio->page, vma, address, 1); __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr); } __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - __page_set_anon_rmap(folio, &folio->page, vma, address, 1); } /** -- 2.25.1