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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03CF6E71D38 for ; Fri, 29 Sep 2023 13:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UEeK8P7rKJyUz2y5G8fOmhElZGMNSkz/Z5XN2YoOd/4=; b=mnjJbIVGqyqRHo vEHov6gmqHci34mzbWfLj7so65gesbRgsP6Ha0trO3bJwLk2DbfVkr5L7zqUbE6g9W04999GcqIdq AxPu1j1DK9tQotLjHmbI3DPCiCC0QYQYM2jCngJwFg/26wsQHe3/+d/gCzvG2wXfrp2IOZ4iy0WGR baK+g31vn6bNlunh8gHEb60T25UOYdkNIYsBVowbgXeMRbfHdT84W6Fo4XGf7WaNUt0FMyFVmGbm6 0REyOJzhJC8XFZe/CPOjS6XY9xa63JfvXxPa4ZnkJncC0GU/H0brM3Nc7UfYNQOMP+o417nYnAa9Y kjLn1X8c6zo6pbzFlXTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qmDoL-007ziD-39; Fri, 29 Sep 2023 13:45:41 +0000 Received: from mgamail.intel.com ([192.55.52.115]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qmDoI-007zgl-1p for linux-arm-kernel@lists.infradead.org; Fri, 29 Sep 2023 13:45:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695995138; x=1727531138; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=g+gHobaCyDXuYUdTfzKXdvua62/hwJqag4HhUq9dqwI=; b=mt+XdMgqdc8RQ+r/v4fXjTzgJ1UpaARtjTqsR+aJHuxdvuqZRMTrn+Hj Kq95WNd+8jmRq9DFMYNr5J3l8da6xhNDXem7nKKj++fJ5feV0CFG9gxb9 wRrURhfA6GVPr1VCXq6tR47SVdcDn98xkcGyhlwfLfymAuCxZof4WuBRN HFmHqN7Q1f1bN9UdR5Lcqic6D1kA6Kg1HzlAbWkBIYzlYNlbWSSHVdOpJ TVVTr1SQRjdpmvq8Ch575I8mej2R+xLReD/I9+vIXPOsFKXSrutKaoLzX w8R3xXGSfWhTKzIJSGKWqcSBD3zKOWjUpvCydWXZhOGf34mPHyzHxHywr Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10848"; a="382206436" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="382206436" 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-Disposition: inline In-Reply-To: <20230929114421.3761121-3-ryan.roberts@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230929_064538_616162_C2F575A8 X-CRM114-Status: GOOD ( 26.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel