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 72583C25B08 for ; Mon, 8 Aug 2022 19:36:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C32C940026; Mon, 8 Aug 2022 15:35:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FA6F940025; Mon, 8 Aug 2022 15:35:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06613940026; Mon, 8 Aug 2022 15:35:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D6EF4940023 for ; Mon, 8 Aug 2022 15:35:54 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B6794120A27 for ; Mon, 8 Aug 2022 19:35:54 +0000 (UTC) X-FDA: 79777430628.27.2CA6DDC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 4DA4E100168 for ; Mon, 8 Aug 2022 19:35:54 +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=G5e4Fs2y2NAeyNJ3BltO4rVtKhFKBhR+x5bxL9J9noc=; b=Qx9lhni4ZwF5wwGzxh0ge9aUxQ SJDLyA8wPmxPcFyTpFrJa+LOaBPTH7rBX0uyV+9qsO8RqqWEwklSnBIXLCnb0sHPJXUTHgrexVYca m3ZaxBCQthq39B0xWZnas2YZufVWCaAudqPCx/ATWhOxflch1WwEipLR45S07UnZIAM9MhEdADU5J +b2nk0hvFgqHSCEH+1fhBZ3krd0VVpd35W0NtF2crW9Jj5jk8fYZEGV55uAzpFlcENtwrD7X64L4s /fjKbcdrsSgsa0ZSHjCn/jkHnDr+ueWxxD8OdbSp7UL+6P+3U/ZGe90bXHOsTMzQ87qsDVqq5KP6Q GdRBzetA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Wz-00EAwk-Qs; Mon, 08 Aug 2022 19:35:20 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 23/59] shmem: Eliminate struct page from shmem_swapin_folio() Date: Mon, 8 Aug 2022 20:33:51 +0100 Message-Id: <20220808193430.3378317-24-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 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987354; 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=G5e4Fs2y2NAeyNJ3BltO4rVtKhFKBhR+x5bxL9J9noc=; b=Cd70iaSKPKM5cBAXQYRE+Vk3OcLgyrPAFkTWDN0WZjZ57bZoruHQNkrTDMnxOGINvA6hmh u4rZiEqA5e42KyMi8uc96Ru5sDGBR2oDtawIN9xG3XX2rtN8ILhQNZQtA4W4hJALJBuvPn 7G2n9ivqG/kr1UGyZkqZsPTVHUx31BI= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Qx9lhni4; 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987354; a=rsa-sha256; cv=none; b=EdC7magHvQj9837gAIV9plB47xPsPP4Ync2Bncrz5ZaTmkkey47PEZKAGUiYtlNWbfCWJi J6a6Yn9FBj+3x2TsC/0sO35LSRECr0wSWS4NlAyprtlpKMF0NHyfiEMNxzQEVrw74lN+T3 sV2eeUrdkUgP7kC3g7m0/Hy9lhW/hpg= X-Rspamd-Queue-Id: 4DA4E100168 X-Rspamd-Server: rspam03 X-Rspam-User: Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Qx9lhni4; 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-Stat-Signature: supawkjcmoxm4rmyhj8hoao9bekrn947 X-HE-Tag: 1659987354-220022 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: Convert shmem_swapin() to return a folio and use swap_cache_get_folio(), removing all uses of struct page in this function. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index ac2b2ebfc9c9..a83b49a6e1d8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1486,7 +1486,7 @@ static void shmem_pseudo_vma_destroy(struct vm_area_struct *vma) mpol_cond_put(vma->vm_policy); } -static struct page *shmem_swapin(swp_entry_t swap, gfp_t gfp, +static struct folio *shmem_swapin(swp_entry_t swap, gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct vm_area_struct pvma; @@ -1499,7 +1499,9 @@ static struct page *shmem_swapin(swp_entry_t swap, gfp_t gfp, page = swap_cluster_readahead(swap, gfp, &vmf); shmem_pseudo_vma_destroy(&pvma); - return page; + if (!page) + return NULL; + return page_folio(page); } /* @@ -1719,7 +1721,6 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); struct mm_struct *charge_mm = vma ? vma->vm_mm : NULL; - struct page *page; struct folio *folio = NULL; swp_entry_t swap; int error; @@ -1732,8 +1733,8 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, return -EIO; /* Look it up and read it in.. */ - page = lookup_swap_cache(swap, NULL, 0); - if (!page) { + folio = swap_cache_get_folio(swap, NULL, 0); + if (!folio) { /* Or update major stats only when swapin succeeds?? */ if (fault_type) { *fault_type |= VM_FAULT_MAJOR; @@ -1741,13 +1742,12 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, count_memcg_event_mm(charge_mm, PGMAJFAULT); } /* Here we actually start the io */ - page = shmem_swapin(swap, gfp, info, index); - if (!page) { + folio = shmem_swapin(swap, gfp, info, index); + if (!folio) { error = -ENOMEM; goto failed; } } - folio = page_folio(page); /* We have to do this with folio locked to prevent races */ folio_lock(folio); -- 2.35.1