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 7E53EC25B08 for ; Mon, 8 Aug 2022 19:35:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 524128E0003; Mon, 8 Aug 2022 15:35:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40D89940018; Mon, 8 Aug 2022 15:35:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C2908E000C; Mon, 8 Aug 2022 15:35:33 -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 EF2E48E0003 for ; Mon, 8 Aug 2022 15:35:32 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CEEF9401EC for ; Mon, 8 Aug 2022 19:35:32 +0000 (UTC) X-FDA: 79777429704.17.B2EDC78 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 792B020178 for ; Mon, 8 Aug 2022 19:35:32 +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=YNJmY6dWypJzW3KXnsYA0Vz2JLUMi482l/ybv6oKdxY=; b=LUVQCCcZHeoMkW+/2WWOXAG1Hx 4PLsRsxqdLYJIHo+rW8gpJYqgY8IUxL2S/Ppqnh4mc5Fg0wjLJ+Hyy+MPFGfyysByLWWBGT9zq4ja oKOu0BRI/078eQDGpF1so+O+vxOLACVv0bc596tcG/0V8YJWrdD8YZD1BSKRgMdAGOya2cNiByJQw wuBoYgHGFOD9OBmlpDFJaM9SpH1JOA/uR71CXCSn/6Grf8Hv2yiDUGxeYGju502EgrOxdNvsIsuYL n45iLeZWtR56/gvkygvF0JQqci4WoX1kkOjtf101YnIlZfLQoFqgN75suCj8HChGtqb26axxLIqoh EexpcOrA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XC-00EAz8-Uz; Mon, 08 Aug 2022 19:35:31 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 38/59] swapfile: Convert __try_to_reclaim_swap() to use a folio Date: Mon, 8 Aug 2022 20:34:06 +0100 Message-Id: <20220808193430.3378317-39-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987332; a=rsa-sha256; cv=none; b=F/7i1MSg2mLN974W96JzcaX3CMzLOWk8t49Cyx3VR0sWlqEkd/BQ3QVO7tzhKVygJ4Fubo FBiW8kAgcd+w2KWPkLGGSr1kkOIThyBgB/CSSdvF6Dzft1zp5lm3yyZAUtw6Y6jEbw3CoZ FfzLPknXEu2q9RkSNrUhJjbk0ayzzX4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LUVQCCcZ; spf=none (imf13.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=1659987332; 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=YNJmY6dWypJzW3KXnsYA0Vz2JLUMi482l/ybv6oKdxY=; b=GLLpVs9PHaZ3+nyKj/6OHfyu9fs4tp7Ye6JMfktig891235XGtme0FfaiVbrNjVsiFNAdC L0Bc37HSLxwlBluIZ4dwhbm/YRHZq2hcHInCAGJEP+H7N3RcG6G2OGkBR1UhIt9e90Oo5j TzkCVMifU0VTw7S3862Iip78aVOLypc= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: rywwfhyy51c4h7hwz688ghh9q8uzd7xz X-Rspamd-Queue-Id: 792B020178 Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LUVQCCcZ; spf=none (imf13.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-HE-Tag: 1659987332-978735 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: Saves five calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/swapfile.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index df85eb73f34e..ce538c3f9161 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -128,27 +128,27 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset, unsigned long flags) { swp_entry_t entry = swp_entry(si->type, offset); - struct page *page; + struct folio *folio; int ret = 0; - page = find_get_page(swap_address_space(entry), offset); - if (!page) + folio = filemap_get_folio(swap_address_space(entry), offset); + if (!folio) return 0; /* * When this function is called from scan_swap_map_slots() and it's - * called by vmscan.c at reclaiming pages. So, we hold a lock on a page, + * called by vmscan.c at reclaiming folios. So we hold a folio lock * here. We have to use trylock for avoiding deadlock. This is a special - * case and you should use try_to_free_swap() with explicit lock_page() + * case and you should use folio_free_swap() with explicit folio_lock() * in usual operations. */ - if (trylock_page(page)) { + if (folio_trylock(folio)) { if ((flags & TTRS_ANYWAY) || - ((flags & TTRS_UNMAPPED) && !page_mapped(page)) || - ((flags & TTRS_FULL) && mem_cgroup_swap_full(page))) - ret = try_to_free_swap(page); - unlock_page(page); + ((flags & TTRS_UNMAPPED) && !folio_mapped(folio)) || + ((flags & TTRS_FULL) && mem_cgroup_swap_full(&folio->page))) + ret = folio_free_swap(folio); + folio_unlock(folio); } - put_page(page); + folio_put(folio); return ret; } -- 2.35.1