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 7B658C6FA83 for ; Fri, 2 Sep 2022 19:47:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA23A80106; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49CA8800FA; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE19A800FD; Fri, 2 Sep 2022 15:47:02 -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 C7652800F5 for ; Fri, 2 Sep 2022 15:47:02 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A63A8A120F for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) X-FDA: 79868178684.02.F75B9D2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 48F4240044 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=V6IK8ZCbhUmsYP1wTpuNkrgSWvBm2omWzgtLiPmn7BE=; b=evk3E6SJkidq/2owDk2JrQmZ1v wVMcNRW+fG2Y7lyWSs7Fa5XplcWe5SkSfiZDjaI52mCY4284GlVLpVE868CJ4gAqPi2Py8H4RezMX pic2eU9GAamDr6Ucc1haAVMF6bao8gzceGhaN92uMhnLTz/WTwsg35fA69Rme8q8U9ErjryNsbXMJ lW/YKNJUQpQmA/DEC8l8/jpFxW7UM1uH/O+UrbPgHMZAGItGPAI1o3YznWYrd9rCAqooErPG75NGF ICnUPcsM0ZZ4Rd/t1XJzyiP11QGvR7fB3MviAqHRKYJAyIG7tfkSxHrt7oO33IGeCTywXYXRv9nj1 xs18ZJEA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd3-007IeK-3x; Fri, 02 Sep 2022 19:47:01 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 31/57] khugepaged: Call shmem_get_folio() Date: Fri, 2 Sep 2022 20:46:27 +0100 Message-Id: <20220902194653.1739778-32-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-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=V6IK8ZCbhUmsYP1wTpuNkrgSWvBm2omWzgtLiPmn7BE=; b=JGA2SwO4Gi+5eJuc1pgQXdhff9z69OoBXSMlL4fhPMC6a5OTTj3XVCZOtQYy8ShYE9LpyI qSHaKIZFh/lRD6WeTClroqGpaoIVyeOozhfHAu6dtORNBIhx47CDuYubQ/wlreYYHK3dOB kEW1aEOKaGfo3KHNFxGa+YzE055JMOw= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=evk3E6SJ; dmarc=none; spf=none (imf07.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=1662148022; a=rsa-sha256; cv=none; b=hO12CQBR/dUMvLBLfocLY9XAJJFB1KUwKqVGsLBMswOrnbSW19dubm3YaPBWet0X/A7QpO iXt1pVyoIyTrQLuDbKyq6uxdoaATF4N6JJGDjWP41hLNGngUuCMGXsQAFLTT0LodZOlKXc n+cRYuaucuPGx9wsOFjbfyg1aaL013w= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 48F4240044 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=evk3E6SJ; dmarc=none; spf=none (imf07.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: myzk1ugkfwhyxy3aywo4pompjhp38j6q X-HE-Tag: 1662148022-501854 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: shmem_getpage() is being removed, so call its replacement and find the precise page ourselves. Signed-off-by: Matthew Wilcox (Oracle) --- mm/khugepaged.c | 7 +++++-- mm/shmem.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 01f71786d530..6cf4bbd22fc9 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1682,13 +1682,16 @@ static void collapse_file(struct mm_struct *mm, } if (xa_is_value(page) || !PageUptodate(page)) { + struct folio *folio; + xas_unlock_irq(&xas); /* swap in or instantiate fallocated page */ - if (shmem_getpage(mapping->host, index, &page, - SGP_NOALLOC)) { + if (shmem_get_folio(mapping->host, index, + &folio, SGP_NOALLOC)) { result = SCAN_FAIL; goto xa_unlocked; } + page = folio_file_page(folio, index); } else if (trylock_page(page)) { get_page(page); xas_unlock_irq(&xas); diff --git a/mm/shmem.c b/mm/shmem.c index ab39753064f1..e89a11bf83f6 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3157,7 +3157,7 @@ static const char *shmem_get_link(struct dentry *dentry, folio = filemap_get_folio(inode->i_mapping, 0); if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(&folio->page) || + if (PageHWPoison(folio_page(folio, 0)) || !folio_test_uptodate(folio)) { folio_put(folio); return ERR_PTR(-ECHILD); @@ -3168,7 +3168,7 @@ static const char *shmem_get_link(struct dentry *dentry, return ERR_PTR(error); if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(&folio->page)) { + if (PageHWPoison(folio_page(folio, 0))) { folio_unlock(folio); folio_put(folio); return ERR_PTR(-ECHILD); -- 2.35.1