From patchwork Mon Aug 8 19:33:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12939048 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 14E36C25B0C for ; Mon, 8 Aug 2022 19:35:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65A2C94000A; Mon, 8 Aug 2022 15:35:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54652940008; Mon, 8 Aug 2022 15:35:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32453940009; Mon, 8 Aug 2022 15:35:00 -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 0D8D1940007 for ; Mon, 8 Aug 2022 15:35:00 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DF72CA0856 for ; Mon, 8 Aug 2022 19:34:59 +0000 (UTC) X-FDA: 79777428318.14.E3051E1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 94E7F4018B for ; Mon, 8 Aug 2022 19:34:59 +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=rZ9tiYok3CmkdoKC4u5YlyBJYtd4IGvFvqCkTZC9NJA=; b=BvEe5ydiWzp+RgzNiYuOUZc6yY uzSuDXLkGRrkzmWlOx1FU+DpJfpTt8MkHHA8+FUVtwUJyfkIiTZJj6o9kW4uEorHyZ8ZazVlFlbM0 HQa4ac/GeNbXXkJLVKt9nPTUjKAtans4XomqDgolxbGi1Ku+iUzmR5MoeC1vbwrjd2c5OrDEdlFA9 i/Fc9bWHyBvhf2ASkrEj5Y88kYKuucqk3ydyREtodqWSqLBw92V0w9sT0XwxHbbXwLIVySW5BQjxd Di3kYAEy4oyNWM42Sf8BddztG99dyckmtTct+jZugi188GAxj2djv2MtNkgQlPni4oha8SACUWIvy KrDf57lA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Wd-00EAtQ-Eu; Mon, 08 Aug 2022 19:34:58 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 12/59] mm/swapfile: Remove page_swapcount() Date: Mon, 8 Aug 2022 20:33:40 +0100 Message-Id: <20220808193430.3378317-13-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987299; 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=rZ9tiYok3CmkdoKC4u5YlyBJYtd4IGvFvqCkTZC9NJA=; b=aLlPXoJXR3y11DB6v0jHeiwMITW+juHuakR/yCw4djxyP6YcoXkABv+ebBuMVvmAx4IdnG Z3M33W5h35gEP9teiikIsC4tNzOItUcc3y7B0xHK+uSwawaRJ58j4CWHSR/j+iquwWwvfw epip63LI1Q8PfBQGDrwNZjTZBDt39Wc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BvEe5ydi; dmarc=none; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987299; a=rsa-sha256; cv=none; b=h1yyjq7JbjXJvDjQ+Vxo+hp5OAzJJE8+cnjGSsP2IgvjPDwwoNTwCmqS/G6JIG4IRA0UUZ 6ke2OrOeXQMQOjQDCfC3KO0j0gx1SNWoq7YsfegdupChMLOLzL5/bjcWcGRDAwo6WM8uKF mBbAs/7qprDS7fyC7+HcTfi4O3NlnDY= X-Rspamd-Queue-Id: 94E7F4018B Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BvEe5ydi; dmarc=none; spf=none (imf11.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-Rspamd-Server: rspam07 X-Stat-Signature: yjgo1iuckc9xpmogqogp3cg5gmgnttoa X-HE-Tag: 1659987299-757892 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: By restructuring folio_swapped(), it can use swap_swapcount() instead of page_swapcount(). It's even a little more efficient. Signed-off-by: Matthew Wilcox (Oracle) --- mm/swapfile.c | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 1fdccd2f1422..c042fd71de02 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1427,30 +1427,6 @@ void swapcache_free_entries(swp_entry_t *entries, int n) spin_unlock(&p->lock); } -/* - * How many references to page are currently swapped out? - * This does not give an exact answer when swap count is continued, - * but does include the high COUNT_CONTINUED flag to allow for that. - */ -static int page_swapcount(struct page *page) -{ - int count = 0; - struct swap_info_struct *p; - struct swap_cluster_info *ci; - swp_entry_t entry; - unsigned long offset; - - entry.val = page_private(page); - p = _swap_info_get(entry); - if (p) { - offset = swp_offset(entry); - ci = lock_cluster_or_swap_info(p, offset); - count = swap_count(p->swap_map[offset]); - unlock_cluster_or_swap_info(p, ci); - } - return count; -} - int __swap_count(swp_entry_t entry) { struct swap_info_struct *si; @@ -1465,11 +1441,16 @@ int __swap_count(swp_entry_t entry) return count; } +/* + * How many references to @entry are currently swapped out? + * This does not give an exact answer when swap count is continued, + * but does include the high COUNT_CONTINUED flag to allow for that. + */ static int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) { - int count = 0; pgoff_t offset = swp_offset(entry); struct swap_cluster_info *ci; + int count; ci = lock_cluster_or_swap_info(si, offset); count = swap_count(si->swap_map[offset]); @@ -1570,17 +1551,16 @@ static bool swap_page_trans_huge_swapped(struct swap_info_struct *si, static bool folio_swapped(struct folio *folio) { - swp_entry_t entry; - struct swap_info_struct *si; + swp_entry_t entry = folio_swap_entry(folio); + struct swap_info_struct *si = _swap_info_get(entry); + + if (!si) + return false; if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio))) - return page_swapcount(&folio->page) != 0; + return swap_swapcount(si, entry) != 0; - entry = folio_swap_entry(folio); - si = _swap_info_get(entry); - if (si) - return swap_page_trans_huge_swapped(si, entry); - return false; + return swap_page_trans_huge_swapped(si, entry); } /*