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 6B061C4167B for ; Mon, 4 Dec 2023 10:21:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 086EC6B0279; Mon, 4 Dec 2023 05:21:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 010836B027B; Mon, 4 Dec 2023 05:21:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E196C6B027C; Mon, 4 Dec 2023 05:21:00 -0500 (EST) 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 CF1156B0279 for ; Mon, 4 Dec 2023 05:21:00 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id ABFEA40176 for ; Mon, 4 Dec 2023 10:21:00 +0000 (UTC) X-FDA: 81528742680.08.2B1C289 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id 8F0FB40018 for ; Mon, 4 Dec 2023 10:20:58 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701685258; 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=lEh+h/UHM+bpclHxgReEooIkib+nW114bbcJPGvowVg=; b=8CLz2b9lbq9yO+Lmk8ccBCSjGEDYB8YOmkKb5R+35xpUvLHyk9P0sUyY3BiQFxpQu8zrDs j4ZQ0FORytVjyTvp5Dsx88fJcEJTw1+EmU71Ot7jk9YLAYHRHw2Stv0Fv4ASeaRQR5g22K eZ17gYXweFQGzk2Tax8ThtYRlWQBYxI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701685258; a=rsa-sha256; cv=none; b=4ji0gZvs5vCaiwbqbq0orMeULsxHDnGnePrix8nfuDDgTJQgVDBnY+jqnNmJ2gLmIDjcEM Delmnye+DJKkqCNmEH8cL2Wreggw2pqQcx3qyV8/7otSB87C8kYut3/j4kfpX7ErFYHnv6 w9YW9t77gAc6nFfp4CrfNO8aQT5aXH0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 F1939169C; Mon, 4 Dec 2023 02:21:44 -0800 (PST) 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 DA2B53F6C4; Mon, 4 Dec 2023 02:20:54 -0800 (PST) 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" , John Hubbard , David Rientjes , Vlastimil Babka , Hugh Dickins , Kefeng Wang , Barry Song <21cnbao@gmail.com>, Alistair Popple Cc: Ryan Roberts , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 02/10] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Date: Mon, 4 Dec 2023 10:20:19 +0000 Message-Id: <20231204102027.57185-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231204102027.57185-1-ryan.roberts@arm.com> References: <20231204102027.57185-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 76635rhkmw185mmpt1ruoijeiokc7d1e X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8F0FB40018 X-Rspam-User: X-HE-Tag: 1701685258-243992 X-HE-Meta: U2FsdGVkX1+T3bQQ/ttZOuRqsTJCPF/+tYWtcRexc7R57KLaf+aO5s3qJFKkDIe/U7n/DJmAbmiQLs49hsiz64hTC/Ad4fPibJdGq0LOh5PUYe+EOsNAuUATnvKJH/3628kyUpWsm98NDuTFLD+iogN3EQINzwKQSCqk28H8JIojZsaHzg906pDKq78Z43ibV8CTs2yFUU08ZK7ecmlNh5NFMLyg8CNMpoUlZdEbcP4aHOlpNKjQbu0695Zbg4004fBCgkrgUqml+/yG0bzmSoBIimKacZf7pyXosRz/79N788N9JAkpl8bOORW/KkF5iWoB5dH5KoUzH1v0DtOi3OkjDub6EN1+Mlp+3y/W55adY9H9trsATHAHV4CNJRaf1rpD0DsEZu1HzjsEAKdNteR2Ve6teAgAzr7pDW0qT2R4Wvmv28X1ijq/TIQY27ljOM6bHyCtB7TqJHPiIxZO+YlIo73qh6c9jRJFOmTsn3Ub8hi0782FdFk+DvZjG9PelyyZO9NXe2TTq9ELGwtjKz9yHC6Ys5LuFrS1wlNUx5GZkUyJp/0R+Eu+JIYzZHHZTSE7oYJnMYlQNV36WOFazD8UyNmVk/O98vnvICyRITYS4Dk1ovwwYnvkuQ8/RhfMxAFVtlVd/mwFIIWp7hJTijzOceSSOX1j2Xbq4xuakh3hVaCUkx7f3f+2Cntqy5Kxxpcw1UB5rnuh+1CN9mKphWlLf5b3jhReyImVV32Y/CebSge6ODDHv90I5Ir9dZr5JlA1vpUvc5gwSLAsizvBTrs/r4UyN1RoeMl0wCgDMx1zTm9UoRtfUBrG+nAmgbaWhsy+0+paOiQxx986Y26wm316oogsp6+1V43xfnA/7+rdVs2SKbrKYCQxAmp0T5dXDsPseGILPaWqMV1coAElbEJ3mlItftKuuD39c57hEOkVepxgdhrMvKAxGC5M1m0CQDK5Y8Ps08AzNgoap+t Sko6cdbd 8P9b7bB4LgFT0IHIRW9GNJ4O35incaiz0ccW69PhKqRc4eV8atBuDVPB/yGkmtcMbdAe/8NK7txM3l8Eb4QDK+S7Ao7tGVcaxG5do7mJ+BmyphuPG6U6pxm+KFQMmIziXspt4p4gj8aojQq8da5tg2qR3SJuy1MKqSQ/bomE7qjkXsPRlJgCdgvsK1cZq0SU3jpoMi3qQGN6Hl5HS93O/tuFwwPs+MTvE65GP7i9PIcBsYEfBeaTRuXFh7Wi7YRkKXcZjCRAb5i/dnVha6k4lOEF/o78uxDlRp0TD5+pQrisFQeJ4f17CzJZs5dt9ow1hKEoQnNug48FsOCAsE96U7xfTrg== 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: In preparation for supporting anonymous multi-size THP, 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 Reviewed-by: David Hildenbrand Signed-off-by: Ryan Roberts --- mm/rmap.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 2a1e45e6419f..846fc79f3ca9 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1335,32 +1335,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); + __folio_set_anon(folio, vma, address, true); - 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; + SetPageAnonExclusive(&folio->page); + } 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); + SetPageAnonExclusive(page); + } + + 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); + SetPageAnonExclusive(&folio->page); __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr); } __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - __folio_set_anon(folio, vma, address, true); - SetPageAnonExclusive(&folio->page); } /** -- 2.25.1