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 A8745CE7AB8 for ; Fri, 22 Sep 2023 19:46:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 284656B030A; Fri, 22 Sep 2023 15:46:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 235006B030B; Fri, 22 Sep 2023 15:46:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FD026B030C; Fri, 22 Sep 2023 15:46:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F04156B030A for ; Fri, 22 Sep 2023 15:46:45 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C4BEA1410EC for ; Fri, 22 Sep 2023 19:46:45 +0000 (UTC) X-FDA: 81265265970.21.7FF66EA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 347FA80012 for ; Fri, 22 Sep 2023 19:46:43 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="K/3YMhch"; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695412004; 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=LJk+VfAgLq5Er8DOIN0yMWb5IfchGAilz48qexBmR74=; b=zkC7UqKWpswmA2dlPDi9CN/ksB7H3OCBGp1f34R8gz1JHv1RY7FMw6m1pi4IGDLwqzo3cB Yx+VJt4+mBDIiUlbdktZBlOd2p1ZgLbzk4jpPpqlfyYhUjhdUxc0GrRI3DUx4XCwQtAhog fYcqZRcfw3iDyGsU6qdoqIwngf2Cx+Q= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="K/3YMhch"; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695412004; a=rsa-sha256; cv=none; b=ixSMp+9oTd21lTk4Um9tzUQPuSVrIu8GsU/PxpCIpM0ENqRvKD7OsWFsoEaJHfqnZM8cfM CiEXcjiiT6RH1QY/U3dHX1h4kcMmCNjpSFRAh5OaHWhFuL4wMwGuSOjHoTrkNFRvGtnzF6 zCnkeUNYmfoskaJomcRs2bUb/hmlb00= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=LJk+VfAgLq5Er8DOIN0yMWb5IfchGAilz48qexBmR74=; b=K/3YMhchXqHO+PC6JetrqrN8ga +1Ip2PdNgTvMh4vRTvOz/jcZF4UkmJ3nqzdu2lBGY5dDDo6beX0B7cOTr0La91OEUWpg5f5IjhGgA +lrgBf4LrnHAS5AeDT0VnyzHmSY6QeT34oX56mTws+3TT2cZpopOLBAmyug89SfytUfiSs66HjfF9 EcOWUidfivMBdWkPKfxMHcK/e8pzV0REuSsOw+O46BKEYbasgkc3/B7xodPeLJ3mDvZdTQdgUUP65 vs4hTgRRHWXEtxj1egkgHVPWGvjoXjTrOe5RfhxNVcA7Guv2qsd/RreW0BTTxHsPbbpb3r76hI0sK 5BldWxEg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qjm6q-002WPC-Vq; Fri, 22 Sep 2023 19:46:41 +0000 Date: Fri, 22 Sep 2023 20:46:40 +0100 From: Matthew Wilcox To: "Vishal Moola (Oracle)" Cc: linux-mm@kvack.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH 1/2] mm/khugepaged: Convert __collapse_huge_page_isolate() to use folios Message-ID: References: <20230922193639.10158-1-vishal.moola@gmail.com> <20230922193639.10158-2-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230922193639.10158-2-vishal.moola@gmail.com> X-Rspamd-Queue-Id: 347FA80012 X-Rspam-User: X-Stat-Signature: 6woifmc1j6ktw9614prdd3b8ticeia8o X-Rspamd-Server: rspam01 X-HE-Tag: 1695412003-746273 X-HE-Meta: U2FsdGVkX194c5FoOY8LbBKWXVSkGkQrn10bV5DsgA8Sztvh6z/K4XDsbCiA3joBb4zlSmSDjkrikVn1TD08v8knXX1nNysozuskmoJuwb7F+yqr/6szOulGUGsX1vxgoZB02oLQBQO8JdRmZi7VEAUwGqoKXTZX5BZNvZ7OrizBNVYrvaFfUUHnMUdP40mxGH8o+YvaeHv4eWeLX2uVaT0e8CLsY6jJ7GVdYkNMN1f6snS/iTBetNbHHBqAxZmayQLd/X+4u6VsfLyDEUMmwRPogpkyOeVEgn2AdVtHH2BijP55IXrWX2DZQDNwXNUTghQD8IT2GddJWRVEunTAkJ7txkz43xdDiXUB2LMC0JAkiEDyy8Nq1meeF4Id00pOuirvQalEwpeldmVYFnA1qUtcJ7kRHBaL9wfoi6aK72Rn9OAGwXmLVhIedpe1v5B0UjQOen/349f/fkhAS7xrcN7idzOSwlzH8XvtBi0HhY7EZEYDKOfkkxCELA4EAn151I2jjzq1PtiDbF6qpb/Q05ZTf05vMt+yz/MsUEJK/d0v05NK8TzzfpsIBOFhfiE9VOurz5Iw7XB76R3OAxmBr0ZV4+9OkY3+ZazpiL7J9BG5AzD51l7qJW9tB2Hl0RIqpHtMrUx47XQhDLUOHb9lAHc24yTWcb88fQ5mJCrWzYVTr/Kx5h7hdUAajbbDlnbxzBlFGx2Cst3YT9DaMLEr56SdWFyXdQAQWodebA/154hBfxgtRGz6YKdyREYqUvDsV+SZ46SC1oWjK6gpCAGOIr9yS9yFpJksszjOjQ9nhnjp6RRxoQ9fUfIyvCnB+d+XcQ89YyP8sqmxaZGoIdLXIUbXNR8EyyLeFp7D3f2P9MA9EKnuRhkPoaw4uZdbL0GAF65s4mVD9bpo8AZ3kYDFnKD4tCTsNXxnGuLrs+hzIwLLSMV9+fFDCFlrU0d8vp9FBtmEf3OWxp/gY02dHiR 9es/WZug BKS2rds0Jzgkpl432wfwipM4Oxn07vhjVNR0EFMdDPSBFA0/P6c3vPuyo23QM7UEQKVuqKsEA7oQihyDlJyJT8xiwGhqQsqJYCGBnCwOfxQP4yHaISxHa21zLp2evF/rL1eeJ1Rcx1VQ7VVuW49aa+d5fGNL+hzSC7NNM7XdDTNVTIziBm49lidin4RQlUtt7W2GD4PjkudxyZvKVIKcQyaUAYnhjefupF/zH2Xei++TUcCyPvJOXkDUKftVoxMp634Z41yPt+ioIpFQORarB6m5u9w== 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 22, 2023 at 12:36:38PM -0700, Vishal Moola (Oracle) wrote: > This is in preparation for the removal of the khugepaged compound_pagelist. > > Replaces 11 calls to compound_head() with 1, and removes 499 bytes of > kernel text. Looks good to me. > @@ -634,32 +633,33 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, > * Isolate the page to avoid collapsing an hugepage > * currently in use by the VM. > */ > - if (!isolate_lru_page(page)) { > - unlock_page(page); > + if (!folio_isolate_lru(folio)) { > + folio_unlock(folio); > result = SCAN_DEL_PAGE_LRU; > goto out; > } > - mod_node_page_state(page_pgdat(page), > - NR_ISOLATED_ANON + page_is_file_lru(page), > - compound_nr(page)); > - VM_BUG_ON_PAGE(!PageLocked(page), page); > - VM_BUG_ON_PAGE(PageLRU(page), page); > + node_stat_mod_folio(folio, > + NR_ISOLATED_ANON + folio_is_file_lru(folio), > + folio_nr_pages(folio)); > + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); > + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); > > - if (PageCompound(page)) > - list_add_tail(&page->lru, compound_pagelist); > + if (folio_test_large(folio)) > + list_add_tail(&folio->lru, compound_pagelist); > next: > /* > * If collapse was initiated by khugepaged, check that there is > * enough young pte to justify collapsing the page > */ > if (cc->is_khugepaged && > - (pte_young(pteval) || page_is_young(page) || > - PageReferenced(page) || mmu_notifier_test_young(vma->vm_mm, > + (pte_young(pteval) || folio_test_young(folio) || > + folio_test_referenced(folio) || mmu_notifier_test_young(vma->vm_mm, > address))) > referenced++; > > if (pte_write(pteval)) > writable = true; > + Spurious change here. Other than that, Reviewed-by: Matthew Wilcox (Oracle)