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 46D7EECAAD5 for ; Fri, 2 Sep 2022 19:47:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 021FA80100; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 736A4800FC; 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 22B07800F4; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CFECB800F6 for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B37951607F7 for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.29.A6F273D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 682EB100059 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=6A6aPUSwkycrtSCt4V834moUq4uc1T4cliZhXfXil0c=; b=UkXmzrIoTuM0mbaCiqDp693GfM Fz8en0GmWP1YWqjBwToWD5AsIf+8sEt6PaNfVHUw2k3nSzQ7a/BawiiI7oKJy1YZa0NiyyxkRIjbk ira7N6gnAKdP0PjDzZY+cjN8JZGpASqBeIs7JfUriCCPFUy5PdS4mSoIXtmzNzd37W/YvegLMvbwD hw9zDnBPa/0RYx2FnAzoe/i3QcYQF/GvQOackiAecxa+O/kD3m6pQR30jdYXwylG8H8XrR6BgfnpB wDYhlkvZjwiL9KngwQouL+SBF+cJrXo/+RCrnbTuUm0m6Z3ILDOQLQLJAQgTnL6SOvM1ecV9DHbBe HnXgoY7w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd4-007IfO-Al; 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 39/57] swap_state: Convert free_swap_cache() to use a folio Date: Fri, 2 Sep 2022 20:46:35 +0100 Message-Id: <20220902194653.1739778-40-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=75mqMfUURPf2qzZofmHea+ddayG8pAKFM/VLlvu+zJlle8xafEAGkPm2FJtCxTIciGu8k7 +sqMHfSD1X17dLIhM+vIYZhxczF6rE00gcvpTbs6fUoHqCvQuyoAmu+l+1UGU4W8gfWVC1 AzzAt0Rg98a2dDSk+6CaUOZpmCfS9d0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UkXmzrIo; 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=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=6A6aPUSwkycrtSCt4V834moUq4uc1T4cliZhXfXil0c=; b=yYulD9t3XQt90MbjJaoaViP9Yil84r8YHEi8yG5oitGTAUHRzU9DpQFT64VElKcvzX4JqR dPBex2fuojqQ4qysWBA2ttfl/seM2SBfUHcH/fRw59VzWHiOwgOnVhuoXVyKA5RrgtdNtZ kZRfFPmw/bMYsXcdcXTFgbaj4N/DOH0= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 682EB100059 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UkXmzrIo; 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: 4te7kcc1tgmh8y3yr5z8p4w44hhwu7c9 X-HE-Tag: 1662148022-130294 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 several calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/swap_state.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 4af135a7b53c..438d0676c5be 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -272,16 +272,19 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, /* * If we are the only user, then try to free up the swap cache. * - * Its ok to check for PageSwapCache without the page lock + * Its ok to check the swapcache flag without the folio lock * here because we are going to recheck again inside - * try_to_free_swap() _with_ the lock. + * folio_free_swap() _with_ the lock. * - Marcelo */ void free_swap_cache(struct page *page) { - if (PageSwapCache(page) && !page_mapped(page) && trylock_page(page)) { - try_to_free_swap(page); - unlock_page(page); + struct folio *folio = page_folio(page); + + if (folio_test_swapcache(folio) && !folio_mapped(folio) && + folio_trylock(folio)) { + folio_free_swap(folio); + folio_unlock(folio); } } -- 2.35.1