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 D7E97C001DC for ; Sat, 15 Jul 2023 04:23:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75C1C6B0072; Sat, 15 Jul 2023 00:23:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E4E86B0074; Sat, 15 Jul 2023 00:23:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AD766B0075; Sat, 15 Jul 2023 00:23:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4D54E6B0072 for ; Sat, 15 Jul 2023 00:23:55 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 316881C7659 for ; Sat, 15 Jul 2023 04:23:55 +0000 (UTC) X-FDA: 81012553230.28.08EFE04 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 8DE7F40013 for ; Sat, 15 Jul 2023 04:23:53 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KdxGJ59O; dmarc=none; spf=none (imf12.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=1689395033; 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=fL+qL8EnlaO5FW8JSNM7sOc38PnS7TUvxqQRKH9FEK4=; b=4VWDmsvUklpYrBWO1ARJKd1SSvWDwH+gjMZO9iqbUumWvOpBR0czhrtTOheiMf2Azr8mrQ OI4BCTsaBXMz91adx6UIVmVfhp+7B2LiKZbDLm5EQ518u8TnKbK3EH+O2ss2ZGM5+2g5iW tcMi/n8an06uE5PeoLq1EladqIxWmmc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KdxGJ59O; dmarc=none; spf=none (imf12.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=1689395033; a=rsa-sha256; cv=none; b=dU3vgov4liHk83dA7iec6AEDJaSExsJ1z6D5ISstJKTiGLQMjBPY57r6YwjvcUVZRP0TQg 1oA7n/G8QaJ+cJalzjlk9l2iVuYpy94HQqElUdbdvczwkL+tkpzQCm2pDEiMWysxqsI8mO l6REUMuAmUpowBO0lYB0DppnDLY9Oqg= 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=fL+qL8EnlaO5FW8JSNM7sOc38PnS7TUvxqQRKH9FEK4=; b=KdxGJ59ODR0MgZlSXyaTqvQyF4 7ewg/KBwST6gTXXAsH7ACpre9ad3A+U7bgyBk0hqzsfD3VHiM0rxdlQ0W2ZFd8YXWw754UwlITjQh BtNGe0HFIwa1zZp4FyAYu4hp9pIetp7C8cpc06hqhkZFKpFVOK4AOjJow3Fi6Xg+ZJmHmVyX4fjfq 3bjbYTtej6eqoovTtbe2+nVLe/BpyCB0xFZZfrASsxtvYEykZ1yA6j9Jy0MXdsa+4RTJDJ8ADJll7 qv65m2Ja06vW2zHDiMkywAX9xLFCa+dtKnaZXFpi5Ah+Gq5Wrx0qfdn7vJqjgDCGgsflhigwNPXMc 3owfFJdg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3w-LO; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 5/5] zswap: Make zswap_load() take a folio Date: Sat, 15 Jul 2023 05:23:43 +0100 Message-Id: <20230715042343.434588-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8DE7F40013 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: hsxccsr7nadi8of8ea4otg9ki4e6t9hs X-HE-Tag: 1689395033-908930 X-HE-Meta: U2FsdGVkX1+nohcV8ZKg/hl6pnUxpbShh+4hDnXTBO3u+pVT0EkyR5jRK0pfPvqYw4+ytqV8Om6RpT2F9tU3eqwyp1JAojRy6xY+p43eYX95FzHa7fhW1MjpGw8QJ/7EoK8jTwIsURTE4SEgciYujsg8JOPDwQOac+/UoOfINgOscukWv0PBxVYpm3FQI+rT2uujUx3s0bPlTqTGJETY+SJBnRIIP3CAjnXpkz7etgwCIdJSsu4W1K5+FSdB8gFqyThdmxsZcuaFl8uae/VF+FBzpSmsHEOFUjHpMy05+bc5fspu2w9Dq6FppR86lGdRm40cxLCLvvExYa2zL7YH0klBq4rvpHSXaKH6QbHse1f85hfnkcR6RtVZzBZSSdXI0h1OCb/HxJWGdI/vh+bqJI/bWevP6Pyakuue9fB/sbVRZIiFCKsf2cTGhiN/jj26efcJi+apO2bRE7tLnxKNCLzsm0jVrZCUzj/ABedqWWW0tMPbYEXPLMfR8bGYBaIkZ0OXfpWIBTzh9f1VTGtljXw7RuGFW5tQPRUUtRniPjzbs+mXlC9HgdBwpjTdy9WrUOg7IoM9UVyMftUqEyoFIVlscfAo608OkfTXD7UR3vfRsOpfxmSk/8F9M6ucKXnn/BcAK9CtKDAk3SQsMAHZ8iHZcCzYve40nfSCbyHK7g4ONRbyP5BZVYJqGjhSqEZcQjZLIYgAWXmAeJxM2+mrTnT78bJflLcj1koiikVWkGPMGz8Zhwa2d4MBn90V97WUyOBH8UyLtPAK7Z5I/sbvUbjg3c/Ew5rL1EbKj/BJ+UXAXnfcWgkzTIEpVIHcv3Lg6RV36MQKs9A6S3jWpJP6LrKkmYnm74Y9YqzHhf2u2yryLkr2Wr2F9Fs+EJt2VoCTA8H2FYWqu5fu3ljjmOGJW1LY2X4HuKG0boOpJZ/H+cksuc8AK75VH7oqzadBJlqEZ8qcORj0OzIzf+IMGem iS3+m3ry sOZ2pEJwz2ZKwF0fSb2UWH4YrRUApi4IOaGoh04Svofzeqy+f1g0fq0leUC2/fd8/yKSZCyF29HyGAgwue2ogaqJwcER9YqHjXnjEAc7lnUOYmP9rC25DHRZj7xvz8cZHVLqumZT+0MXm3eSRR/1+NnlJul1pSpQuAeYXSMglF9zWyCo5m1KqOMio5u1ueO1ecG7gy2eZAJUwcbJXrwDBXb07n1KFef7BFnuP 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: Only convert a few easy parts of this function to use the folio passed in; convert back to struct page for the majority of it. Removes three hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/zswap.h | 4 ++-- mm/page_io.c | 2 +- mm/zswap.c | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 9f318c8bc367..2a60ce39cfde 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -11,7 +11,7 @@ extern atomic_t zswap_stored_pages; #ifdef CONFIG_ZSWAP bool zswap_store(struct folio *folio); -bool zswap_load(struct page *page); +bool zswap_load(struct folio *folio); void zswap_invalidate(int type, pgoff_t offset); void zswap_swapon(int type); void zswap_swapoff(int type); @@ -23,7 +23,7 @@ static inline bool zswap_store(struct folio *folio) return false; } -static inline bool zswap_load(struct page *page) +static inline bool zswap_load(struct folio *folio) { return false; } diff --git a/mm/page_io.c b/mm/page_io.c index e5b6f1402506..8741d3a0d48a 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -516,7 +516,7 @@ void swap_readpage(struct page *page, bool synchronous, struct swap_iocb **plug) } delayacct_swapin_start(); - if (zswap_load(page)) { + if (zswap_load(folio)) { folio_mark_uptodate(folio); folio_unlock(folio); } else if (data_race(sis->flags & SWP_FS_OPS)) { diff --git a/mm/zswap.c b/mm/zswap.c index 69d097d14255..4287f8551841 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1381,11 +1381,12 @@ bool zswap_store(struct folio *folio) goto reject; } -bool zswap_load(struct page *page) +bool zswap_load(struct folio *folio) { - swp_entry_t swp = { .val = page_private(page), }; + swp_entry_t swp = folio_swap_entry(folio); int type = swp_type(swp); pgoff_t offset = swp_offset(swp); + struct page *page = &folio->page; struct zswap_tree *tree = zswap_trees[type]; struct zswap_entry *entry; struct scatterlist input, output; @@ -1394,8 +1395,8 @@ bool zswap_load(struct page *page) unsigned int dlen; bool ret; - VM_WARN_ON_ONCE(!PageLocked(page)); - VM_WARN_ON_ONCE(!PageSwapCache(page)); + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); /* find */ spin_lock(&tree->lock); @@ -1457,7 +1458,7 @@ bool zswap_load(struct page *page) spin_lock(&tree->lock); if (ret && zswap_exclusive_loads_enabled) { zswap_invalidate_entry(tree, entry); - SetPageDirty(page); + folio_mark_dirty(folio); } else if (entry->length) { spin_lock(&entry->pool->lru_lock); list_move(&entry->lru, &entry->pool->lru); -- 2.39.2