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 60AB6C6FA82 for ; Fri, 2 Sep 2022 19:47:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22FB88010F; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75C75800FE; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0119F800FA; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 340B8800FE for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0B3A7801EA for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.14.637A1EF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id B13B61C005E 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=pKrWJop16v+8v5/5KOWLWY4vzs1AU2fWJKOYcokBVuY=; b=TVm2RvvSb+J+BZx//mMrfjxZHp kXiOPsLEhNQ3zmNm8Y9bmL9/6PqM8bg+YajBT5VJNXnxrStmvVYb5BwLt1wJ9ii/kMiuvOufRBMuf +LX+HceA0klTEXvQtrwdsphoo0a9BWxzUfacf8qiH9i6Kq4E5Zhufl74GueRNTFhRNQhch9B1z0FZ 8gXafICLiUw8gb/CIUA5rRIzpfSDWq1pZMbFAOacHyd8kfADVpy4nTxsY+PXvuPpSnxxfiK2Od9MT bAWroP3RR5xVYAZ6noBTD5WkALmXyXSXgVdIQt42OzqrXQcKfDbk9YsPWldGoZ9SIaT8C5atUDPSS iKUcve4w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd4-007If7-0l; 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 37/57] mm: Convert do_swap_page() to use swap_cache_get_folio() Date: Fri, 2 Sep 2022 20:46:33 +0100 Message-Id: <20220902194653.1739778-38-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=13C2LMDkjz7sTMg/JPK+5TITZd8aDye4PQJKghR2ouDAJdatok1iZ8zuc3uQjlpOWYy+nc y9yIfsLLLhPQ0dsUEplBF96RpLQVJE8H79ybTUTY2Acv505nOn9E/tDCAnJbMsfdiPG1OO NoTkM5Ox7E7eDkBahCu5olKYdsCbbtw= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TVm2RvvS; dmarc=none; spf=none (imf20.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=pKrWJop16v+8v5/5KOWLWY4vzs1AU2fWJKOYcokBVuY=; b=z0huPrcfMfNPiHNMc7rXzc/1JJwSTgpREX7YaXlXNtjN7cU6V/pGROWqO+4ux5pfy2Qpm5 gK1qwZSNnP2rSAAY29I5U44dc8slcip1aouvOZJEfzaIZDAboM+/txGpCKUu1qm6wu9GMh DypP7l5jTSnG29Fd+j3xSft3hvDp5pc= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B13B61C005E Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TVm2RvvS; dmarc=none; spf=none (imf20.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: zip48imx8dhurxgfwujsqij6gj9o9oty X-HE-Tag: 1662148022-557376 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 a folio->page->folio conversion. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 8fefb24567da..10834effb32d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3761,9 +3761,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (unlikely(!si)) goto out; - page = lookup_swap_cache(entry, vma, vmf->address); - if (page) - folio = page_folio(page); + folio = swap_cache_get_folio(entry, vma, vmf->address); + if (folio) + page = folio_file_page(folio, swp_offset(entry)); swapcache = folio; if (!folio) { -- 2.35.1