From patchwork Wed Aug 16 15:11:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13355398 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 D7BC9C001E0 for ; Wed, 16 Aug 2023 15:15:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7980C280027; Wed, 16 Aug 2023 11:15:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 747FD280021; Wed, 16 Aug 2023 11:15:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6387F280027; Wed, 16 Aug 2023 11:15:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 54914280021 for ; Wed, 16 Aug 2023 11:15:01 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BC39380EB6 for ; Wed, 16 Aug 2023 15:15:00 +0000 (UTC) X-FDA: 81130315560.19.89796DF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 7021E401D7 for ; Wed, 16 Aug 2023 15:12:14 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JPOMDJLW; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692198735; 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:dkim-signature; bh=uUh5RzdeUjxu8QH/NZha9zu8/cTsRUc2q74yTYqB5GQ=; b=leoL/h0Dd6L9aljG1VgVof7qGQWSa4e6p0fRUv5oeWmqujbs3Ffm1dXb+7nFgqWgtXK6dQ UXGLEkN4I0txn51VsFcs3wbVMQmncN4u7Z/YH1U14iVoupAoP9NGx/mq6g3Vy/zSkgw/w6 aCqy5hoGf+IWj8nB1J6k5rMz2cwV9Ls= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=JPOMDJLW; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692198735; a=rsa-sha256; cv=none; b=1sOe1HKvlY6IU9uNKg3rPsrgZsQklII3Iqu2udurZ0k1lUl/OfsKYMb7lXsDoQ/SVYfAIz K2r2tLRoAixInChywAKbIyQ5MuF8FySaiRC2uXMDyMjCO3MLF/n4v/4VTFwwK6TU65XD2W flBjTB1SdyEnTHGogAU/shOE+sBHfCo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=uUh5RzdeUjxu8QH/NZha9zu8/cTsRUc2q74yTYqB5GQ=; b=JPOMDJLWRR9qz7iWGg+vxMn6xJ YypX9IaF7FCfgzt54snUSOb0G0mYNTkZxZR1mHEDpsnoro/ulTpsXRYroXgEVz45EudlB/HYvkkL9 cYcalW2OLpHrCKILPx8d82zqIUSPE+eG3iJIqRIjWtzbYcfznWX5/XfJJLABj8G5jertDB7o/D7Al nyqt61Lqj5g06bI8l/Idf5H3U0lwPR9QvWC2uOhPxtcRfdADLPTVqa6JB72h5mXNKbAfA71gNR0QP y2Ab2a+In1ZiDl6nYWWoWo/A9hQt7mq6b/mnzVNetlu1+K0IdP28y8hTprxQFfm8VeESjFHju3T4y zktds10A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qWIBu-00FL8r-QS; Wed, 16 Aug 2023 15:12:10 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Jens Axboe , io-uring@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 11/13] mm: Remove folio_test_transhuge() Date: Wed, 16 Aug 2023 16:11:59 +0100 Message-Id: <20230816151201.3655946-12-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230816151201.3655946-1-willy@infradead.org> References: <20230816151201.3655946-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7021E401D7 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: b9qyi6iex8a3ckg9qsfjg3ttijfesdxx X-HE-Tag: 1692198734-10212 X-HE-Meta: U2FsdGVkX1/612G8ShQVqJEfaLUxXyeHnATJu3C6+12NWFwZ9SlFYrK+y15BbSSwwnYcVcXY2AGJlN1mTJE3s6r7sYlTGJS5ovcfqwo/cF2clVuZzrGo0OdINxQUUizILQtL2BT+ASzVoXRCg9hR/+PWCGlKwvgEEHARTAgJ+pCLrtoMXN960rtAIQwz2jchSEewiGX/2wUeU5YyG986M8x8i6YFg4Y6p79if7fnCQiHHnyjaOryeljQQ5TRG6X+LkndGlI8HmEf/sH4EGNiV8TV7Ls2RECLvue8H7lUV7EAMsBU0GUNCaqyrQFEKBSJomSqWI/YzfJW8pSrXBn+u6/C2OYa/kAGQz59Sd9934G1C4cumJ8N0joPo/xyPm04jcnYw558nWefPP4ymL8tXQVILYpE02MJAoXp269AxVc+NYlVk7Xu7SarCgX8XBnITSsExRlY+89mDNRxkm4aru7DR1XFrRMkneglAznVFtohFqkTNZyh6xrRjH8h0VUc+KAKKuKB4A4BmQEDmPR1oXvmkP9yYWYOUxUcfqNyD4q7PCa3e+0Mexxw6LHXk6KbGEJHAlk4lspEH2rnbqB6ZjIPmZfQj9VgJVtUQ4dPuW1NFotPf690YBGf1ikVXCWge2cEFyBo+9ImwULStq81OTuKk64DD3soe4zFy9fMcStCKSkUwI647keDT6uH12eahC4pYB+qajU1W7CzdzAyLJ8sch2nVcFufXhxpFUofidGw+H3EVVr9ZPjBtwy/wd2PTRr3+gmwZvj7Zi7V0UgUMdQPGHx2yMsk2iQj3HHjo15xVhye/moSZzflfPIHlf9f4El3Q3t6vFaSnaj8GLGb4+jzSqYj+5ci2pqDoh59BPHPxS0biydZUjbf5I49LB5GT10Y6yH6VjrVs58s3RPbLytOqwk056LrC6YI6dCQ3pKvV90/t8SoOFfe4V90CC8U/53pZWWYkTa/YCRWJR oo9XOJaB 941C7IyJWxhrn+JQGbKEun+2uzLDOBy2CBhUViEe4LchB5fIrscG5tXiP9dbnSKUVeEXBW4cw1AxBmNOCV/qMGyuH1sB8GDml/HFUI+iYZhKxeS53rW++DpsuAhvYv9ibsndh6bdq3bNzhDvOcdSDkyDq5Xg2BL4R7xC1TdZ+RHePv+mhDYnJe5zw1XkK+e1cNuP6cG0powREvWRw4Mdu5KOaDMoEWPqEbCom 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: This function is misleading; people think it means "Is this a THP", when all it actually does is check whether this is a large folio. Remove it; the one remaining user should have been checking to see whether the folio is PMD sized or not. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/page-flags.h | 5 ----- mm/memcontrol.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 5b466e619f71..e3ca17e95bbf 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -853,11 +853,6 @@ static inline int PageTransHuge(struct page *page) return PageHead(page); } -static inline bool folio_test_transhuge(struct folio *folio) -{ - return folio_test_head(folio); -} - /* * PageTransCompound returns true for both transparent huge pages * and hugetlbfs pages, so it should only be called when it's known diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 35d7e66ab032..67bda1ceedbe 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5765,7 +5765,7 @@ static int mem_cgroup_move_account(struct page *page, if (folio_mapped(folio)) { __mod_lruvec_state(from_vec, NR_ANON_MAPPED, -nr_pages); __mod_lruvec_state(to_vec, NR_ANON_MAPPED, nr_pages); - if (folio_test_transhuge(folio)) { + if (folio_test_pmd_mappable(folio)) { __mod_lruvec_state(from_vec, NR_ANON_THPS, -nr_pages); __mod_lruvec_state(to_vec, NR_ANON_THPS,