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 1D517C00140 for ; Mon, 8 Aug 2022 19:36:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9678294001B; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F00E94000C; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56BC294001B; Mon, 8 Aug 2022 15:36:04 -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 2D73894001D for ; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C06FB80333 for ; Mon, 8 Aug 2022 19:36:03 +0000 (UTC) X-FDA: 79777431006.04.B2A22DF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf31.hostedemail.com (Postfix) with ESMTP id 69F1D20161 for ; Mon, 8 Aug 2022 19:36:03 +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=dGsPDVUY60HMcu/Y+Ugm2T8cyn W6Yk4rvPB2B5nUTXEu3EXvnqViG+64qZ2P1U45ywHn2p8ZxlPig4Qxvi/mtSkx0JuBrSE+PllyyA3 UNbdEZp+RWDIb5GxFUJm9P7CF/lytzkZ4ZomW4H3YBEI5F/xNI1r2M6j9MeXzSmda+Qzu+MQcnvvZ lgD5akxNR0rQ5f0xwPF5sfaBxtYMmIsMywc+UPHXfyeWyK/L/5WZO94689Dk1JhIESI7SFf6uEnUX 7+qJ9wrMfdzOnzGIWXzBfiPReWh1rJyIkG5DSmmxEBbn+9qV2ADjrL6BUYnBYqcNdxus4djVwSlO8 fs2cizjg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XG-00EAzt-Qg; Mon, 08 Aug 2022 19:35:37 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 43/59] swap: Convert swap_writepage() to use a folio Date: Mon, 8 Aug 2022 20:34:11 +0100 Message-Id: <20220808193430.3378317-44-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dGsPDVUY; spf=none (imf31.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=1659987363; a=rsa-sha256; cv=none; b=V0nWrMWTwuR+JEzjuF9L/H18CDi2+UcEAXBqxdO0Vt+Y2TOOBhf5jMGCiDa+f530wHJWfu lLKgm0IrtA1cyxkbpvoSuthGLb9mHQY/Q6Oh0pcd2xjdt3gKpEOh9MzomZyrM3JU/7XQf9 xvUDxCHBn8M10wR1c0XE5K3vovGcTUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987363; 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=nw5VyLMQxttUyfEnJ1XmegADxciah5QYEvNjTtcKkmpywczYIGi5TdLYQwvMXNqE5CRZ1n avzjKo/mNK0Li4zTI1jMwvRN5sLragwB15RdNHgn79VVbl9btNF9VMuD/ihpPW/kkMXrhj rG1ZRIUIStGpgzs1NgvPU9Dtcp3t1dk= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 69F1D20161 X-Rspam-User: Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dGsPDVUY; spf=none (imf31.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: 5hdxwugg5u1a5r63gkhnm966dpjchw85 X-HE-Tag: 1659987363-995164 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