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 D4FB1CCA479 for ; Fri, 17 Jun 2022 17:50:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 529B36B009B; Fri, 17 Jun 2022 13:50:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B6E746B00A0; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7ED116B0098; Fri, 17 Jun 2022 13:50:29 -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 680EB6B0098 for ; Fri, 17 Jun 2022 13:50:27 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 434281206A6 for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) X-FDA: 79588467294.08.12731E4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP id C912940093 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=JbVWDaoANXZ7UMXqjn3YWr+IxfHpITY2OCkly9PLMCU=; b=ipI8z1vDqBylMZzsYTSAA5cwnh dLqkOLPx8HaY76rvb7Aj85Te2J+I1ORaQtStx/0KG5qCoAAgiT/XLw2BM2zgYJ4M3706RnxJzvXPO xpLZjOczMl/2rhHK9TxHjP3Y9TMLfEuPKnsmnmPNEUPvRDw6JdefaDqGJVLVukuGKB2Ojugo5qbZI OkmzMFpOQ78H0Ci7r45cCJBn6S7uN37CL3NXN7Fio2tAEMzhH8aWzkCStfrIwtl+S0H3okq/dJ8ok fZv0tCP8Jk6pRQffIDlsUiGJYJLUjkvfDRnJ9bTH/JMVczbsE1P6MFH92jaaZ+Xj1f3ul5vjo2z2Y kHR5+GWg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2G6y-0030ai-Lx; Fri, 17 Jun 2022 17:50:24 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 12/22] mm/swap: Convert try_to_free_swap to use a folio Date: Fri, 17 Jun 2022 18:50:10 +0100 Message-Id: <20220617175020.717127-13-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655488226; a=rsa-sha256; cv=none; b=QnvjNVeNLxf7zQcpFLF5nxJITQUQo7V0GTeNLDLZWg7mlylhhN65nIGxgLiHwoB1GEk6My DJXoAHLcaTXp2wlTSjjcTmdrpfkan+oXkvBC/qQFDKdPzK+miiLOU0f/M3k2+IqO/20Ja/ x5pE2cy1Kehm0TQRE2LGAD1donWcNMw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ipI8z1vD; spf=none (imf17.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=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=JbVWDaoANXZ7UMXqjn3YWr+IxfHpITY2OCkly9PLMCU=; b=zF+3beC2MS/I+EgFiINw9hKEGrSbt8SFSxIUa07tOOz9gHqxZ4QGXG1gtYl2zkCAIcxyyT jwSDg4W6w+ddgPjHfsvT3ZRW3Hh//ZEEQXDp7YPdx/xVBq4yqnnbrqdL1W0aKampKdUdva QSsvHLGXKkpgpkRRJzO8ieScWu4eGkA= X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C912940093 X-Stat-Signature: pcgednkzdf6pf9wwb4kz8dhwbcicoarm Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ipI8z1vD; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspam-User: X-HE-Tag: 1655488226-194637 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: Save a few calls to compound_head by converting the passed page to a folio. Reduces kernel text size by 74 bytes. Signed-off-by: Matthew Wilcox (Oracle) --- mm/swapfile.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 3fa26f6971e9..4ac6a6c876d6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1568,16 +1568,15 @@ static bool swap_page_trans_huge_swapped(struct swap_info_struct *si, return ret; } -static bool page_swapped(struct page *page) +static bool folio_swapped(struct folio *folio) { swp_entry_t entry; struct swap_info_struct *si; - if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!PageTransCompound(page))) - return page_swapcount(page) != 0; + if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio))) + return page_swapcount(&folio->page) != 0; - page = compound_head(page); - entry.val = page_private(page); + entry = folio_swap_entry(folio); si = _swap_info_get(entry); if (si) return swap_page_trans_huge_swapped(si, entry); @@ -1590,13 +1589,14 @@ static bool page_swapped(struct page *page) */ int try_to_free_swap(struct page *page) { - VM_BUG_ON_PAGE(!PageLocked(page), page); + struct folio *folio = page_folio(page); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); - if (!PageSwapCache(page)) + if (!folio_test_swapcache(folio)) return 0; - if (PageWriteback(page)) + if (folio_test_writeback(folio)) return 0; - if (page_swapped(page)) + if (folio_swapped(folio)) return 0; /* @@ -1617,9 +1617,8 @@ int try_to_free_swap(struct page *page) if (pm_suspended_storage()) return 0; - page = compound_head(page); - delete_from_swap_cache(page); - SetPageDirty(page); + delete_from_swap_cache(&folio->page); + folio_set_dirty(folio); return 1; } -- 2.35.1