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 A0B11C04E69 for ; Thu, 10 Aug 2023 14:30:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30FB56B0075; Thu, 10 Aug 2023 10:30:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 249AF6B0078; Thu, 10 Aug 2023 10:30:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 137FC6B007B; Thu, 10 Aug 2023 10:30:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 035226B0075 for ; Thu, 10 Aug 2023 10:30:01 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D831C1A0233 for ; Thu, 10 Aug 2023 14:30:00 +0000 (UTC) X-FDA: 81108429360.02.3E07832 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 1328CC000D for ; Thu, 10 Aug 2023 14:29:58 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1691677799; 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=hZn/3SZrqk4Mk6iz6WOdEWWcv8iCLvWmnIBLw6ALzj4=; b=45DchmIHzRzMlnPQelSoM8CmOHxU+UXvSZYhYkc5g9lpROUO4DzMvG7+ELy1m5GPUut1eW IdbY55fiFA9pX7Xn5/SrFL45kvrUikQLC1be3flXm896Vx0lPKpwC1DwOKR11SK1WZ85cX IFNI4R9SZwq/jdjrpKF6Rl4Yq5w+A1Q= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1691677799; a=rsa-sha256; cv=none; b=SI5kMkdaXHYjul+jbWlnQD8+/tADeCNbsY4nNrylR32b1JJpJ1s7s1EheAXIuynnrreYLs UNueive01tFfmS3GW5v/cu8YIBTpkWhk1OuQiyZnMGTaIDtsgQeH4AkGj7a+SX8Mr6aW+N 3nYd5gigF3hJlFyBIsmp8eQ8UJ1s9Co= 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 72BCB139F; Thu, 10 Aug 2023 07:30:40 -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 B5B913F64C; Thu, 10 Aug 2023 07:29:55 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Catalin Marinas , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain , Itaru Kitayama , "Kirill A. Shutemov" Cc: Ryan Roberts , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 2/5] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Date: Thu, 10 Aug 2023 15:29:39 +0100 Message-Id: <20230810142942.3169679-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810142942.3169679-1-ryan.roberts@arm.com> References: <20230810142942.3169679-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1328CC000D X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: r31o8976hz4u8oicbjyrro48pwfjoico X-HE-Tag: 1691677798-238511 X-HE-Meta: U2FsdGVkX18f+Ak3tSAa/sO9BsD7T7QQaVgkerfIiHXBvOGtBVAi/hLf5rRiOh431oi82sYS5U4jqGZ9oKGZg+pvmjsO3yBYtJJ2gDYW2v4BHNOmKVUB27MdBCgI3WhG7L7XCx5D6Y5wzQzevXA/zifBP1wxHZ0yxbDBvn5/po96/lDQZQfi1qjVWOh+Is3PmP9cwE57ecYrjjymc6yn1sf1RKBiAOSI80ZW/H3w6FA1TLIxcZBuQxDYLp3ldoHAvbn+tkdk4j8hCGITWzmM0z8gECqL3NIOT0F7s9zLu21+5s4oR81btyTJVj65fq650b5Yky+PDBuKTvLUDjcQvRB2NR5b8Hr8HqkipJL1HEHmK6/UUk1gprN2nNKGxGF+uWDvyzAAck21amCXfcv7wkKk4K2u26FrtcueUGELz7uO2+QIzjmzHMIm8TJMyjacvd8PbNDdiCyBym9aLwJylTpuNfh/88+yCB1cNT6nvbyYL/QBVN8KXgUimipT93u5q3l2cCZyl+8Rp+cj9k5ANgTVxNsLd/est+9U3lkg88yDnfipfUyybOmQjgaDzgeVIqkdIBYIIlKoBfahlUPesu/xrzlxl5LqeAONpabzDCu9Vih6ET7w7SgVN5NdEAVsrOWCd0VW2GUKjVay75zQe2mGBFQh/Ldo1G0Jzd9VdTdnqaTdBZehLmUIWlZU4dCCS5i8l6FMb9OHRlq444FS6aOnGuP8QWOO83SsG65UjdnISS0Giwcd376ey0StV6HYq1oKMIKgx08ejZCLUl3kfp6txd/e3mvxD7kqBSr/a8YHGgh05YhVBfed847b4JUPM7r8pMSdgHFZSHWvUcg4wgYGbj7WKKO0hQLSfifAXIqfpJv1Iz7W8coekHqzY5QoLLhlaHTaqmxUaY6b1d1NmM6s9ORIJYEVvphLmV63AbEiMecaT1bGnaFYsFTZWMDH9QuZwCnXXpcuOrFLbfA DJibGIln K7fcdOVfeRFwnyXO3XpaVmBBuRjGHgWgVC0QIZnDG38lJVylmQe66bddvh7E5yZwtWKqAhhPukW2I4s2VLknFUAoDVubjRCRBXTWgO/b1VZ6TiNMIV0bjeINYRKrfNbEpe3bvwsCIDowql5+0s6SgP/nHu7lCnFoUUVK+ZyGRDk2cUgxKcLB9qsOXe93z4pggQt2JNf7V/WfYHlkB2mHTl4Rtr1i9daklfl4D3Vvp/jqXk+NvQnjcYk/9TZyKmHMw8m4KH1NYeYNUI8rgxU0NbrQgeIwpG0J6kaDayFki1HS3ywhZgAJ4qBPKJioqFpMWvqlm 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 LARGE_ANON_FOLIO 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. Reviewed-by: Yu Zhao Reviewed-by: Yin Fengwei Signed-off-by: Ryan Roberts --- mm/rmap.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 769fcabc6c56..d1ff92b4bf6b 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1266,31 +1266,44 @@ 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 (likely(!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); + } + + 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