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 8AE3BE71D38 for ; Fri, 29 Sep 2023 13:45:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87BF58D002C; Fri, 29 Sep 2023 09:45:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 829B68D0023; Fri, 29 Sep 2023 09:45:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A4A68D002C; Fri, 29 Sep 2023 09:45:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 55DB18D0023 for ; Fri, 29 Sep 2023 09:45:37 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 138B41404CB for ; Fri, 29 Sep 2023 13:45:37 +0000 (UTC) X-FDA: 81289757514.02.9FE48B0 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by imf27.hostedemail.com (Postfix) with ESMTP id DD69F40036 for ; Fri, 29 Sep 2023 13:45:33 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=B7yI+NaA; spf=none (imf27.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.115) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695995134; a=rsa-sha256; cv=none; b=6KqKpGXPSsC4EWiSY790VBdgsnm8FMGIdlBwi9Zrscxcamia/KHFV1VLfQ4jnfQuIX0uee YN/ARtf9/CxSubCg0d2e3a57dlfaek5fLthUMNKXKYhis5CH8NvEMn4wX6P5rhgURqiX35 gK7YVZUGfO9TFX/fWpsRdhwz7ZpAdA0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=B7yI+NaA; spf=none (imf27.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.115) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695995134; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=53zS0Dm+Y24f0pY+y8ab9KkCyrweRer5/VpTxifVF6w=; b=D1RdF8tQqUb1Eep3fP1uL8iYtgq5MEFka2MaoF2Fvs8Ea841pjWBBi0maUENwu3ctOemVQ 3qWfjSMbZeU7bJMHpeu4DiaqDVZXwe7lp2kS06BWhUuUDtgseBkR6dgkjPj5G7x0pLSmbC eiaEhHk9AWPe4Bj+OvjlpeLERCOM8Xo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695995133; x=1727531133; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=g+gHobaCyDXuYUdTfzKXdvua62/hwJqag4HhUq9dqwI=; b=B7yI+NaA+D6U6zBTWxhsDl6NDP1ZXfbA4Xga4QDvklGr4RmAIJilH2zL eytb6FybsWIF7zJgRr4GsctDeEwNfF++5YVHLmVduTfndw7fPaW2T7A7X vSyC4lzSe5eRnN9Y7Pv7ujJJ84GaerYv7WbRWQYgLVgGybzCwoQuiRBRi JXFK13lf4aMEdgPHKDdIgQxgbWU2nT4rkZsQIye8SdSM39F77hthkp17A iU1SJBucxw3RL2B/1emHTCn8zV6vQ6aGEgmOTbVb3sYVg6DA3ag7y1vCV 3DwwIKil/W9tnc6zMfoSYeDNOuoeN2bDeFr80n/A5rgyP4CF9m1i3G3pm A==; X-IronPort-AV: E=McAfee;i="6600,9927,10848"; a="382206433" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="382206433" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 06:45:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10848"; a="996934729" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="996934729" Received: from mziotti-mobl4.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.34.13]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 06:45:27 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id A61F81095FB; Fri, 29 Sep 2023 16:45:24 +0300 (+03) Date: Fri, 29 Sep 2023 16:45:24 +0300 From: "Kirill A. Shutemov" To: Ryan Roberts Cc: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Catalin Marinas , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain , Itaru Kitayama , John Hubbard , David Rientjes , Vlastimil Babka , Hugh Dickins , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 2/9] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Message-ID: <20230929134524.wwyykrxfikhle54k@box.shutemov.name> References: <20230929114421.3761121-1-ryan.roberts@arm.com> <20230929114421.3761121-3-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230929114421.3761121-3-ryan.roberts@arm.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DD69F40036 X-Stat-Signature: n766j8boaeou4oto1ij6bareukfpu9nu X-Rspam-User: X-HE-Tag: 1695995133-257340 X-HE-Meta: U2FsdGVkX19qPXS7UhVjIl76OrhLAl+bkh4oH2IKa6VkukMJelVxHDLbAunvQCuPH5Fq/diQpdPtzdf39dXS1dudJ43WwyrBQL12d/go9GWekUBPgZWx1DO2lDGS/N39qFPyTN6d4Mb/LYQSb1G/Cr+/BMDJxRgW2eADC9v4UTqKKSgpXBz3R3gSu6REvWdMBCO8cUJXsgJdeS2b87Os4F70T6FDUxu09YcgHZaeYEFfhWT0bg/0Rf50E8Rdwovna5BYWnh0osuCpctzW59FxHyQDH1u6dWq/+TO77n7HI/E8R1NXZArFQwQ6SSGP8AtLvyS8kGhJfBj1OgdV4a/i1YO8cGlJWwrxDy3hB7RG4XP6W7y4c7lBn1j1xxWMRgwPvHsIAzxJ+n2tQSpkHwWb2kL2NcTWvmpgkQdwkeIJZa+BzkWBYJbufuJMU9D8iF/kyhDknOWwTeKDxr/+NPp3A0EWqokFifGxNEJ4+1pP0aRI+UKQUYZhbM62nY8hnwD400TPU9UVQlEPvGmSKcy6yJ6NBCQrUUOVmZ3B6aDiJ80Cdh9+J/HTOJAD3PfBuXjFkSOfp10Q43/oSllm5w3wb6+XuUZoS0OaQ0SPHes8ClK1dW+2oZ17cqM4HpTNRMf8wRLjROMT8bsQGoU+p4N1AUsjs/0Jv9Ylvob15t/xEpSGFImWe3OQSdiWhi1JtkCIS11uQCl9T/3p0M60VuqJllRIH877+p1nSAuS1Eh/Qt5QSFp16RuRkTBW/QL/TVwDa1O78qRrwwR7BQk0z2pjP3gc/o2sM7Tx1vPkCLFOpgv4Ye7KskDYlc7Oz+7LYdOBgiWjlZagqFt58zAnriHwlJOy0o9AyOPPDzUczQDxzf15M5uthjSJFlrHY2UD2lEzGydbI6Gp4cEQhdno53WXWDxClD6JB8DuoaHmOc1S6xQ4BXIZe4I2WAi4f/L/qy5YUZXlysWDnAOrtYRRVA p9R8dgwE FASRu8u5wBpBWAX83f8iNXGDm8Bdvtaz5pr0fb0jmmdWZSohkpG3UfLuQbdd1QyPWCwjMTPytElI05OjKAQxl2VBIwsaWAZRY3HjuI7KL2R/CNcIgXLI3LIdoC+MPNAgmvcJQUNFiLhWA1B/vxeQ++He9KxX9m2vVp25C81lgTeKMxsRayghwUv+QOjwqgOb78JIfJff5WXdlI3vHEdhBeJiY9r3dSpzPnl5JHCvsN5cyrPkztkvwdlhXjgolphchDGUotTtE8mDno2llq/TTKwN8wl4DEKJU4Vl8D1MGbzIJYZVY8+bFzk5qFMfr3xW7q1C8+wZNpjjwl7iR8v/8HsaG8Q== 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: On Fri, Sep 29, 2023 at 12:44:13PM +0100, Ryan Roberts wrote: > In preparation for anonymous large 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 8600bd029acf..106149690366 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); This code should work for !folio_test_large() case too, no? > } 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 > -- Kiryl Shutsemau / Kirill A. Shutemov