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 05B6ECCA479 for ; Fri, 17 Jun 2022 17:50:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33E106B0099; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0C016B009D; Fri, 17 Jun 2022 13:50:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FC1F6B0092; Fri, 17 Jun 2022 13:50:28 -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 4BC7D6B0093 for ; Fri, 17 Jun 2022 13:50:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 24DD833E56 for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) X-FDA: 79588467294.03.576A881 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 7B43B12009C for ; Fri, 17 Jun 2022 17:50:26 +0000 (UTC) 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=HnScaMA3T//gvjf4Ksgc556q/IM6zYqswshVoQi1AJ8=; b=WOxpzvinpj4ZzjRlrg6cpegngB 8qo4Hb9QiYUGaPcgf/wjLJfiDZAj3qHzMQ3R6ySKF9L2Ug/+MExUBQgr9+Z38TGzNy9UCmIWeAkvX q8re0FhoIctx87WCT6Nt5mm55reeqAHJsYhR9NCXdmUeMFYDY+bcktpMV5+tpsoB5q6vSHiDVVn0A iE/LLliUcCMPKQBgiq1SphTdeFLC3pO0rwGH4Np2bPB36tWcTpUuQ6Ca1PhJXcD5FH9RT/kStXSeA qf2pz8+kWXqJYgExeQiVs797O5RreNuumE2c6EoOWKLs7d5Bk9E7+Xr0XLbyeY91oxCzzDg3UaC0Z a3jncBtw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2G6z-0030bN-Et; Fri, 17 Jun 2022 17:50:25 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 17/22] mm/swap: Convert __put_compound_page() to __folio_put_large() Date: Fri, 17 Jun 2022 18:50:15 +0100 Message-Id: <20220617175020.717127-18-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220617175020.717127-1-willy@infradead.org> References: <20220617175020.717127-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WOxpzvin; dmarc=none; spf=none (imf29.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=1655488226; 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=HnScaMA3T//gvjf4Ksgc556q/IM6zYqswshVoQi1AJ8=; b=BsqzKxpsQjS7vrnP/LDn4hpSDAAGLvUqH+VUGwNPG2NZ2QS0eDzbO/HSuJecjs/q48OCl6 ocyWgKBj3pQK35f2E0yMRU4zQRKrjFPxzwwxDLGN8MMJ52ewoBUqjrRmoZA69CBVUi8u6k WrSaCNyFjfAU9QW2X4wu43/vgVU8q+I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655488226; a=rsa-sha256; cv=none; b=0zYJ2QChkh7VE7gXoe78xn12lHgcLxHRFYgFeHuicyBkR2pyeJCZEd5atusWb06gckvyg8 Zxi+GCj6q0/EZPKw2ZWzkj/6LbwGhYiUiL0X+pmYcmGucXCsmCppeGX+1RbgJMPmYuP2s2 INMKAf1N3B0aTtChixJAppiSu1yYtOM= X-Rspam-User: X-Stat-Signature: xnpwo6kem7ahxs5xcepw4i8e9xi17jqr X-Rspamd-Queue-Id: 7B43B12009C Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WOxpzvin; dmarc=none; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam05 X-HE-Tag: 1655488226-231675 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: All the callers now have a folio, so pass it in. This doesn't save any text, but it does save a call to compound_head() as folio_test_hugetlb() does not contain a call like PageHuge() does. Signed-off-by: Matthew Wilcox (Oracle) --- mm/swap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index a7097eaceafb..2570d18e71a5 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -106,7 +106,7 @@ static void __folio_put_small(struct folio *folio) free_unref_page(&folio->page, 0); } -static void __put_compound_page(struct page *page) +static void __folio_put_large(struct folio *folio) { /* * __page_cache_release() is supposed to be called for thp, not for @@ -114,9 +114,9 @@ static void __put_compound_page(struct page *page) * (it's never listed to any LRU lists) and no memcg routines should * be called for hugetlb (it has a separate hugetlb_cgroup.) */ - if (!PageHuge(page)) - __page_cache_release(page); - destroy_compound_page(page); + if (!folio_test_hugetlb(folio)) + __page_cache_release(&folio->page); + destroy_compound_page(&folio->page); } void __folio_put(struct folio *folio) @@ -124,7 +124,7 @@ void __folio_put(struct folio *folio) if (unlikely(folio_is_zone_device(folio))) free_zone_device_page(&folio->page); else if (unlikely(folio_test_large(folio))) - __put_compound_page(&folio->page); + __folio_put_large(folio); else __folio_put_small(folio); } @@ -147,7 +147,7 @@ void put_pages_list(struct list_head *pages) } if (folio_test_large(folio)) { list_del(&folio->lru); - __put_compound_page(&folio->page); + __folio_put_large(folio); continue; } /* LRU flag must be clear because it's passed using the lru */ @@ -976,7 +976,7 @@ void release_pages(struct page **pages, int nr) unlock_page_lruvec_irqrestore(lruvec, flags); lruvec = NULL; } - __put_compound_page(&folio->page); + __folio_put_large(folio); continue; } -- 2.35.1