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 774B7C6FA83 for ; Fri, 2 Sep 2022 19:48:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F6588011C; Fri, 2 Sep 2022 15:47:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97DFA80119; Fri, 2 Sep 2022 15:47:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81F1C8011C; Fri, 2 Sep 2022 15:47:14 -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 72A0080119 for ; Fri, 2 Sep 2022 15:47:14 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 56929ABC2A for ; Fri, 2 Sep 2022 19:47:14 +0000 (UTC) X-FDA: 79868179188.01.C4966C2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 069021C0046 for ; Fri, 2 Sep 2022 19:47:13 +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=cjV56JpqqZJHrrCZTL+O7ueYNmp07ZGgA4+6twm12Es=; b=BGY7J/QVC8EYkIPskfhbhK3phw b/LO145th5zFJ2uMPmxcNcRDoo+NP7MyLhhULqlXEplbEbSRswlRoOB70UGTcQJjKv3KfRJ7OiYcb TVybpZ0uHWq0gHOhzUQYLFLtlunYMMjwM9EeVLgW74UHNHupBwbuWcoFG5nIg7JfCddy2dWTqwBoI GlgyhuAutUwic8Zr2AxJKSxhU9i6JSuVn2DwuZwRCASw3YHL1UUQT9WTvVt9qIFfLdvrZA4vM87sd J2mgAir+c0YeLei9Fh9g/VD+wx4DqyWnlNuSLRarykUK/yPLU4t9U45QxI8WjjOEckwfeUWgnvpeg vMa3Y7ew==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd0-007Ic1-Tj; Fri, 02 Sep 2022 19:46:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 13/57] mm/swap: Convert put_swap_page() to put_swap_folio() Date: Fri, 2 Sep 2022 20:46:09 +0100 Message-Id: <20220902194653.1739778-14-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=1662148034; a=rsa-sha256; cv=none; b=54NEaejP7vaXRV5+sp0zMBVqtuUwg+CR4aidhAysMZDCpLbRPS+k7D3Kr6GSYyq3WdDFrc qMGX7J7W98JTV+ZTVmhh6RDLeclTCYpbUXeKcZfcR4eDexRsTs86ZjnB35glwT0QWCLaqI NqMG0CoKOzHlM0QwfrE7YWRwlQ1tCMc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="BGY7J/QV"; spf=none (imf18.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=1662148034; 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=cjV56JpqqZJHrrCZTL+O7ueYNmp07ZGgA4+6twm12Es=; b=ePxQ/EJKi6/z7Xg2Oua6IL9+zeZWmaUfwN+imPO7I6MHJnC7ZD8EKBeJIV1seb7/9uh/9h j5da4yGja80a1p+p43xs3WUSxm0vwZgmgmi7MOCKKRz7vG3YUV3SJnqoaTLGVX+gegkzRD 2NAb4g/YvZEzq6pZn0QUZPsfjRAJS7s= Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="BGY7J/QV"; spf=none (imf18.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-Rspam-User: X-Stat-Signature: pp77phqe8iewjkecutfpf6hmkh6iq9e5 X-Rspamd-Queue-Id: 069021C0046 X-Rspamd-Server: rspam11 X-HE-Tag: 1662148033-219497 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: With all callers now using a folio, we can convert this function. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/swap.h | 4 ++-- mm/shmem.c | 2 +- mm/swap_slots.c | 2 +- mm/swap_state.c | 6 +++--- mm/swapfile.c | 4 ++-- mm/vmscan.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 4595cbc1cb02..f16c9af6bf32 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -487,7 +487,7 @@ static inline long get_nr_swap_pages(void) extern void si_swapinfo(struct sysinfo *); swp_entry_t folio_alloc_swap(struct folio *folio); bool folio_free_swap(struct folio *folio); -extern void put_swap_page(struct page *page, swp_entry_t entry); +void put_swap_folio(struct folio *folio, swp_entry_t entry); extern swp_entry_t get_swap_page_of_type(int); extern int get_swap_pages(int n, swp_entry_t swp_entries[], int entry_size); extern int add_swap_count_continuation(swp_entry_t, gfp_t); @@ -572,7 +572,7 @@ static inline void swap_free(swp_entry_t swp) { } -static inline void put_swap_page(struct page *page, swp_entry_t swp) +static inline void put_swap_folio(struct folio *folio, swp_entry_t swp) { } diff --git a/mm/shmem.c b/mm/shmem.c index ced76c229b96..56cabf9bb947 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1424,7 +1424,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) } mutex_unlock(&shmem_swaplist_mutex); - put_swap_page(&folio->page, swap); + put_swap_folio(folio, swap); redirty: folio_mark_dirty(folio); if (wbc->for_reclaim) diff --git a/mm/swap_slots.c b/mm/swap_slots.c index 10b94d64cc25..0bec1f705f8e 100644 --- a/mm/swap_slots.c +++ b/mm/swap_slots.c @@ -343,7 +343,7 @@ swp_entry_t folio_alloc_swap(struct folio *folio) get_swap_pages(1, &entry, 1); out: if (mem_cgroup_try_charge_swap(folio, entry)) { - put_swap_page(&folio->page, entry); + put_swap_folio(folio, entry); entry.val = 0; } return entry; diff --git a/mm/swap_state.c b/mm/swap_state.c index ecf1accc2fb1..ea354efd3735 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -218,7 +218,7 @@ bool add_to_swap(struct folio *folio) return true; fail: - put_swap_page(&folio->page, entry); + put_swap_folio(folio, entry); return false; } @@ -237,7 +237,7 @@ void delete_from_swap_cache(struct folio *folio) __delete_from_swap_cache(folio, entry, NULL); xa_unlock_irq(&address_space->i_pages); - put_swap_page(&folio->page, entry); + put_swap_folio(folio, entry); folio_ref_sub(folio, folio_nr_pages(folio)); } @@ -498,7 +498,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, return &folio->page; fail_unlock: - put_swap_page(&folio->page, entry); + put_swap_folio(folio, entry); folio_unlock(folio); folio_put(folio); return NULL; diff --git a/mm/swapfile.c b/mm/swapfile.c index 880871f4c6d4..186511a8ef4f 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1328,7 +1328,7 @@ void swap_free(swp_entry_t entry) /* * Called after dropping swapcache to decrease refcnt to swap entries. */ -void put_swap_page(struct page *page, swp_entry_t entry) +void put_swap_folio(struct folio *folio, swp_entry_t entry) { unsigned long offset = swp_offset(entry); unsigned long idx = offset / SWAPFILE_CLUSTER; @@ -1337,7 +1337,7 @@ void put_swap_page(struct page *page, swp_entry_t entry) unsigned char *map; unsigned int i, free_entries = 0; unsigned char val; - int size = swap_entry_size(thp_nr_pages(page)); + int size = swap_entry_size(folio_nr_pages(folio)); si = _swap_info_get(entry); if (!si) diff --git a/mm/vmscan.c b/mm/vmscan.c index d3e26712dbc1..ac7f6f77e28a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1339,7 +1339,7 @@ static int __remove_mapping(struct address_space *mapping, struct folio *folio, shadow = workingset_eviction(folio, target_memcg); __delete_from_swap_cache(folio, swap, shadow); xa_unlock_irq(&mapping->i_pages); - put_swap_page(&folio->page, swap); + put_swap_folio(folio, swap); } else { void (*free_folio)(struct folio *); -- 2.35.1