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 A1736ECAAD5 for ; Fri, 2 Sep 2022 19:47:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3A73800F5; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D17F800FC; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D799C80109; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2CBA7800F8 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 04C61140866 for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.10.B3D0221 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id B2B9C140058 for ; Fri, 2 Sep 2022 19:47:02 +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=rTpYsQFP2H5ZjV6RoJPpO4sBbPRbz8lr5sbkwA+Wh7o=; b=g6k2kScRm9qwjFJ3F6qn+6SxM3 Zp+IRVOoMvuWhqxDD/03gHDI19Zw5wyHy94BGsfvhB5aWAt5muZRl/bfEHYLasydiA8bvb2/IHi8O RMYz6LC5VeW569BABzBrUeNiqs4tv2yMDwtpOHYZBF5TsxJNyzlQhj24BrKH901CtPOQ+c1NwFwjD vOyladBkHQaVkeQDt+7fE6nsHg4a+pqHlczcPFZYDZwqBp5k0VhZ6gygds3XGKghfmr2kAnwQYjZb W8zKM5AZAEj1EM9nS+MaGZM1Vvh/8QEVZK6VYmLm4tlocaPV080NpdZ/whZMkpJuKrbLba6eQtxHZ Clj8cViA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd4-007IfV-Es; Fri, 02 Sep 2022 19:47:02 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 40/57] swap: Convert swap_writepage() to use a folio Date: Fri, 2 Sep 2022 20:46:36 +0100 Message-Id: <20220902194653.1739778-41-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148022; a=rsa-sha256; cv=none; b=Jzg61I2bfibmLREDwPpzN4bBDdr4ZlHXsvXtngfGBDim3X8Kj++XoduY0HpTnfpnvS3RYE mZRI2JVlsfrR/Z7KC48WesuuU4yycIpuhQEZP93KNd2A9EqVon4nSESRvl9wiNTWECVjUu th/E+bcV6Mu+onJTfsIQc5/fIc4DL2k= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=g6k2kScR; spf=none (imf26.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=1662148022; 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=rTpYsQFP2H5ZjV6RoJPpO4sBbPRbz8lr5sbkwA+Wh7o=; b=zItU7onxzvZWNFFPv6bW8Cx/tWLrtkbo3VqMT419bJ8HxMAcOhH1YMugc5tVwTnbsZAJi2 5MyTcc7qwiCpR0pB4hs72ubcN601/QvHvwKaFfJx3bGCDHrit/KUPdk/69DDtRI9ZYCwqG 1XC31nfF4E4NeJBFCyiTa5v0eckWFxc= Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=g6k2kScR; spf=none (imf26.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-Stat-Signature: hw3rbhaq97en6igf8n5oggqxh38rk585 X-Rspamd-Queue-Id: B2B9C140058 X-Rspamd-Server: rspam04 X-Rspam-User: X-HE-Tag: 1662148022-310074 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: Removes many calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_io.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 68318134dc92..2a3e3e0a6497 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -180,29 +180,30 @@ int generic_swapfile_activate(struct swap_info_struct *sis, */ int swap_writepage(struct page *page, struct writeback_control *wbc) { + struct folio *folio = page_folio(page); int ret = 0; - if (try_to_free_swap(page)) { - unlock_page(page); + if (folio_free_swap(folio)) { + folio_unlock(folio); goto out; } /* * Arch code may have to preserve more data than just the page * contents, e.g. memory tags. */ - ret = arch_prepare_to_swap(page); + ret = arch_prepare_to_swap(&folio->page); if (ret) { - set_page_dirty(page); - unlock_page(page); + folio_mark_dirty(folio); + folio_unlock(folio); goto out; } - if (frontswap_store(page) == 0) { - set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); + if (frontswap_store(&folio->page) == 0) { + folio_start_writeback(folio); + folio_unlock(folio); + folio_end_writeback(folio); goto out; } - ret = __swap_writepage(page, wbc, end_swap_bio_write); + ret = __swap_writepage(&folio->page, wbc, end_swap_bio_write); out: return ret; } -- 2.35.1