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 D33D1C0015E for ; Mon, 3 Jul 2023 13:53:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EC858E00BA; Mon, 3 Jul 2023 09:53:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 576CC90000B; Mon, 3 Jul 2023 09:53:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C7A38E00C2; Mon, 3 Jul 2023 09:53:48 -0400 (EDT) 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 12BF58E00BA for ; Mon, 3 Jul 2023 09:53:48 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C7BA8408BB for ; Mon, 3 Jul 2023 13:53:47 +0000 (UTC) X-FDA: 80970443694.20.FFEE7CB Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 0D0D820028 for ; Mon, 3 Jul 2023 13:53:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.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=1688392426; 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=oKmEDpPRks/ilB7GL5ZE6RM4bSXQ4CYbCYmtoGtRwVc=; b=d6oeWahn2D1DmT1B8Dg4hCcbkN81yzzBV8yemHt8zY8J+FT4ynVl/PkjNgZYfKKWlXa2tQ ysAYwy4Pk0ICm6oY1gIbB7uCPnybXk02TTS6pMPTWm2W2GMXWs1C78D2xKZOx9R3O1FB1E wCbde6Vi6JVvjZuhe/YhXI05wGl/aaw= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.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=1688392426; a=rsa-sha256; cv=none; b=ozjZZa7/fH6A8CeOyaS/VFYk9WOwnvzqnNpU5kGGLMwXspU5CRTQtNszT3FMIQGm6WYmuX XAeGKlX2WQN+2ZIEskF1fhWzlcm7NAGWqjy3C2k0OM9gZYYGg+eyCrqgPwrLaZL7DWuIC5 1/Ku0YXxBxYcXy4eAOtAJEE0axlBgBk= 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 71661C14; Mon, 3 Jul 2023 06:54:27 -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 EDAF83F73F; Mon, 3 Jul 2023 06:53:42 -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 Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 1/5] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Date: Mon, 3 Jul 2023 14:53:26 +0100 Message-Id: <20230703135330.1865927-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230703135330.1865927-1-ryan.roberts@arm.com> References: <20230703135330.1865927-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D0D820028 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 7txs33h4nhi6pifed1z8p5dxasxx7uw4 X-HE-Tag: 1688392425-698102 X-HE-Meta: U2FsdGVkX1+ehkYH3XE48vRW1xr08nJhRT9fw8GTmjrz8qazoW8Ui85BPhEIFp/mEjXHpBib3Cp+gqFPQHAUsTClZTf50X+9XGLInHb2Ya3sdz6qNjKc1TQJY8/uxuLdg6QnmvimLfk1FAx6+cgX62ScUgdYsouAwBGM+4CHvOMKdzSJ2G6LusB2LC0aZbM9sJzXaOTNzxPu76YT5jKizoMqp2Lg0oGGtBjV9gSs7g3Yag5E2vOtKpGWzFaAAujphGb89iY6mXhvilAy/KgnDucQpx8dIXLqEDE2CUzTXlGUBodUph6LnAxeVMJXcxraPTerL9zZ763PMROYYR22uScHRuHoNTvQJ+p+iPGHhlBXtmi279avckMfsPhN5GJTLf8rpJ9k+enMFhSRKptVCoxzgfTu61A+RZ1R5CNwim226gpGtud8I5Ewh/H25PZzu9oCCiopb+z2oYPUI5SX87652cvQTwW1jt6kGzJkMHe4+OxTf/KYmqkXJOsvdQi9MAB8IC5tT7B3j5xuuHFwlkzf5/X9PCT1wVsllDgFEOI70bT4DggWkjmxj/1MfIyYLgnVj43PEKlSCvkJsVNXA14lQn2Gj5OvmCyhVev+SFm+jb1ZYH245XdNBxkJcvh4g3VdJerdK81XMx1BhNyvzDa/a9iXOfAEGvRn07/luh+0ECF/pC96ZMKOOBs5JOGrZRqc3myVfCdpE5nKw02nxsBKJgRV0ZziR1Vr3TTbeWWrsE6+M25yEn0y5KPekjE1MU6xtfirubmxRM0DOJidWcestZS1yAUYf8Ro3qw07e+fRQZdMOVwhJ1Ur10QYXWMeInOWOCacCaFK26LzGGMx8YyrCTi5OazVVKHVHhjcpXKajvWc+Xl3ib/FouUfC617jU5ldBK5/dQEXX2tJkxcc8vkLI+grlLVwDBcFJWSblhAKKLzR4QxJAB7RJmgqrjnBSPlj/aAFMyhyjoIny nux3z7C4 CTRaJsP/d4q8ASmFvMy+c1eFQ8zkzVSs1vTl51pCEZu58y24YNskmq4R+A3PkxskASKc8ofh3jtwcDv4s2DM+iXPIox9Uf3sfr3x7wTXtE4g6VXmWB81COE0GWuBljSq5JW4/GbeWxsybcf+tKk03QVmx4w+QeCJE1gEZjw+WCSPJFXvyCHsuX3iOmeIry69ICmNjWqGVp+lvJSs= 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 "small" pages scheme. Signed-off-by: Ryan Roberts --- mm/rmap.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 1d8369549424..82ef5ba363d1 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1278,31 +1278,43 @@ 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); + int i; + struct page *page; - 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)) { + /* increment count (starts at 0) */ + atomic_set(&folio->_nr_pages_mapped, nr); + + page = &folio->page; + for (i = 0; i < nr; i++, page++, address += PAGE_SIZE) { + /* increment count (starts at -1) */ + atomic_set(&page->_mapcount, 0); + __page_set_anon_rmap(folio, page, vma, address, 1); + } } 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); __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr); + __page_set_anon_rmap(folio, &folio->page, vma, address, 1); } __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - __page_set_anon_rmap(folio, &folio->page, vma, address, 1); } /** -- 2.25.1