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 86F77ECAAD5 for ; Fri, 2 Sep 2022 19:47:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0EB2800FB; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC796800F8; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A210800F5; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 43805800F1 for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 20E06120B36 for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.09.B6D29D6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id CAC96100059 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=pI4aU5Niep/H4leC+h0AKItoqsaUlWZ93voTFp62Ql4=; b=MnuPhHFGfeVm8RGpUVPQtOCgYs EGtBYV61/vhHOBAuoS71So3Fc8dqa91OtxEFr7NV71tDPPdie6iNpn/Gt+W4SK+na80ei3YzLhUda TZkbmD6tqp9r2zm5F/CIyHcs+Insm7prZQLGoNRQm6rHDuqaq6FzCgocWZUgp4QbXHwJQOvqlftOr 3ES9BauA1gtRLiFAScqd0wEfjOuXgM2OVFmAMfXoT1bwlIukkEybPgMKHvd+LlvoYowu9FdPQHf1O GO8NaT/fKe98JwLA8QFVPlF2X/qFShvT5MhwRkH9Vo5CcOPHoXAIXohxPJwvX/uHQ0IKoEglYyK0Y NugeZJTA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd3-007Iel-Kc; 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 34/57] swapfile: Convert try_to_unuse() to use a folio Date: Fri, 2 Sep 2022 20:46:30 +0100 Message-Id: <20220902194653.1739778-35-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=Yg6x8ZTxjkxejgLdk9mvpTiPc7H91c8tMCYNJNDGqwg3/7xxfFwaBrt2FpmDSFNPLpNkqP KVQhBMfKjfti5X3+Nj/m+Fi+x7RConPOIUvyuyxdFT2dBFRUZ3WTMYVoRSpzbkhvhvKRwG 0aHV7L1Zrm7Lp0xXakgRWRE84JEbS2s= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=MnuPhHFG; dmarc=none; spf=none (imf05.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=pI4aU5Niep/H4leC+h0AKItoqsaUlWZ93voTFp62Ql4=; b=5AD+g3cOKugN/3hIg2VyKtVfXcvf5hlTjSMJDE2fjDpiARxxzKtR13SVGEGrC7jrKOiU7x 9eMG30gPrLvrxtwenOSCYeog2XMEXcqfPEBFfUVrqWfVk1cQd+YCx5Cqkmf49+ujA+VIhg ZEBMjfZzPU1khxB7Szlgkwtq2hiWEFQ= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CAC96100059 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=MnuPhHFG; dmarc=none; spf=none (imf05.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: umoagko3984yn87h33srkgfd7hkadqx7 X-HE-Tag: 1662148021-856323 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 186511a8ef4f..df85eb73f34e 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2026,7 +2026,7 @@ static int try_to_unuse(unsigned int type) struct list_head *p; int retval = 0; struct swap_info_struct *si = swap_info[type]; - struct page *page; + struct folio *folio; swp_entry_t entry; unsigned int i; @@ -2076,21 +2076,21 @@ static int try_to_unuse(unsigned int type) (i = find_next_to_unuse(si, i)) != 0) { entry = swp_entry(type, i); - page = find_get_page(swap_address_space(entry), i); - if (!page) + folio = filemap_get_folio(swap_address_space(entry), i); + if (!folio) continue; /* - * It is conceivable that a racing task removed this page from - * swap cache just before we acquired the page lock. The page + * It is conceivable that a racing task removed this folio from + * swap cache just before we acquired the page lock. The folio * might even be back in swap cache on another swap area. But - * that is okay, try_to_free_swap() only removes stale pages. + * that is okay, folio_free_swap() only removes stale folios. */ - lock_page(page); - wait_on_page_writeback(page); - try_to_free_swap(page); - unlock_page(page); - put_page(page); + folio_lock(folio); + folio_wait_writeback(folio); + folio_free_swap(folio); + folio_unlock(folio); + folio_put(folio); } /* -- 2.35.1