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 X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F13ABC433E2 for ; Fri, 10 Jul 2020 20:26:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AB0272078B for ; Fri, 10 Jul 2020 20:26:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="FOHFgHEq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB0272078B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7A7F16B000A; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B5F46B0007; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 581FA8D0001; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0041.hostedemail.com [216.40.44.41]) by kanga.kvack.org (Postfix) with ESMTP id 3CF266B0005 for ; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 039812C79 for ; Fri, 10 Jul 2020 20:26:48 +0000 (UTC) X-FDA: 77023299696.11.woman76_1f0e54926ed1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id C00AD180F8B8B for ; Fri, 10 Jul 2020 20:26:47 +0000 (UTC) X-HE-Tag: woman76_1f0e54926ed1 X-Filterd-Recvd-Size: 3148 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Fri, 10 Jul 2020 20:26:47 +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=9TR+4ssU5IIDRZ1Pd/Hw+TWuwsKi3eawINXNGQphfhY=; b=FOHFgHEqeoviXzcM81OQ5RFSbS h9nasY3nKg1Lj7J2QbEYwHmTfKLvjCL9HJ6CNbVl05k3OUfceLIYG0sCtw8mlwLuQTRMVGq/NkNS5 5mpTusB+ESs+T7HIIwc3ZsrqO1CO0ftfNERYkIyC3z1ltqQDUwwpucJ1Wxwz5TUZBXKm4m1fwIPCa QtwW1u8DFOXWTB2Ea1smrTMjyLfy3xSL49GU7aw5v1f07Z2IDZyZySi+0XwUxfEnT6LRZ1YOLjBvT dpPCHKxFH8drdBGNkFc8PF8SGnIvUKIvk3jhQ3afntfFwkQt527nG2q8htKdwom+hPAeURYfZsr+v kL7yTRZQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtzbY-0005gU-8N; Fri, 10 Jul 2020 20:26:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 2/4] mm: Use find_get_swap_page in memcontrol Date: Fri, 10 Jul 2020 21:26:40 +0100 Message-Id: <20200710202642.21794-3-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200710202642.21794-1-willy@infradead.org> References: <20200710202642.21794-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: C00AD180F8B8B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable 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: The current code does not protect against swapoff of the underlying swap device, so this is a bug fix as well as a worthwhile reduction in code complexity. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memcontrol.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 19622328e4b5..8b88a1d150c4 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5315,35 +5315,14 @@ static struct page *mc_handle_swap_pte(struct vm_= area_struct *vma, static struct page *mc_handle_file_pte(struct vm_area_struct *vma, unsigned long addr, pte_t ptent, swp_entry_t *entry) { - struct page *page =3D NULL; - struct address_space *mapping; - pgoff_t pgoff; - if (!vma->vm_file) /* anonymous vma */ return NULL; if (!(mc.flags & MOVE_FILE)) return NULL; =20 - mapping =3D vma->vm_file->f_mapping; - pgoff =3D linear_page_index(vma, addr); - /* page is moved even if it's not RSS of this task(page-faulted). */ -#ifdef CONFIG_SWAP - /* shmem/tmpfs may report page out on swap: account for that too. */ - if (shmem_mapping(mapping)) { - page =3D find_get_entry(mapping, pgoff); - if (xa_is_value(page)) { - swp_entry_t swp =3D radix_to_swp_entry(page); - *entry =3D swp; - page =3D find_get_page(swap_address_space(swp), - swp_offset(swp)); - } - } else - page =3D find_get_page(mapping, pgoff); -#else - page =3D find_get_page(mapping, pgoff); -#endif - return page; + return find_get_swap_page(vma->vm_file->f_mapping, + linear_page_index(vma, addr)); } =20 /** --=20 2.27.0