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 714B2C6FA82 for ; Fri, 2 Sep 2022 19:47:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CCAF800F9; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DBAF800FF; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1C79800F4; Fri, 2 Sep 2022 15:47:02 -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 5FC63800F4 for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3C2F71607F7 for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.01.44B5E02 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id EB9BB4005B for ; Fri, 2 Sep 2022 19:47:01 +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=Zl3Qvatp+5zZG3ZJhwBRrDLIOc HaiYjYW6uQrDP/AnMnZtE1WR3Ys+n1xLx7YJW5nOweKo1fYVVmTTW2yB9eVKh0Kc+BHQAeVkbbezV jGbTWi1g19JYqoes1f4ffBF0eEPBhYomdOPzgouq94KsyoJGiQbWSAE03TdKhzDchZgG+KRLYW3e4 q0UYQOlsAbXKNiNrEtuYUnZVVQhf+cYZBT2rEb6M9tQvZ/LX3/9qM6iqZsOnOjCHRH/dvDt0/0hwk DFwMfSw4UrV1sa4fNgIAGxP0ix3vWja6k+jdBi9GYxgfeL0RY9Zq0qhVMYBt4WisgxDhK/G81PDae ZHd3ODlA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd3-007Iev-P3; Fri, 02 Sep 2022 19:47:01 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 35/57] swapfile: Convert __try_to_reclaim_swap() to use a folio Date: Fri, 2 Sep 2022 20:46:31 +0100 Message-Id: <20220902194653.1739778-36-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=1662148021; a=rsa-sha256; cv=none; b=qYMOSxoP8PEaj53aUAZSu/4Us8VBmZTP4VDesszApwNOAOUZFtggq5FTi6wOTEgPVFT6+u wK0faiDwoCVj/dT92+jEP/CuKd7POOQ0WDIpPSj+CFukzdKz65KTof20fffBonQrjWCo7z 3au60/ntzVSCwly01PrlJq15TthZ3d0= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zl3Qvatp; dmarc=none; spf=none (imf04.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=1662148021; 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=AaED36cIcL5XwtIm6gVKgl3+vioVAvEnqPwkF0aJ4OzMw9/h4avfWvU/wkLj3Oqwcf9z/v 1ZJx0NGXkmRNXoIJHbeibm6PhrEk+2iqR4Dahx5c7gl/j9IIw4WNbc0EjOXqJTUuYuYd0S 3oOsvMcNNWo6O/XZALaKLIEIlBer3WI= X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EB9BB4005B Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zl3Qvatp; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: tacf9g1zyhxtcsuu5j9nmwf5jrat7m9o X-HE-Tag: 1662148021-903387 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