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 4F46DC25B08 for ; Mon, 8 Aug 2022 19:35:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E86178E0001; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFAA28E0003; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACB9B8E0001; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3DF7A8E000A for ; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1DC5C120114 for ; Mon, 8 Aug 2022 19:35:30 +0000 (UTC) X-FDA: 79777429620.05.8F29661 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id B94CC14002C for ; Mon, 8 Aug 2022 19:35:29 +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=UPtozOF/DITQ9DrzcZ6fY1WTW9Teyt71UWkDor+71lg=; b=R4wxYc9KR/ACDSPjUfAHWRGAAb YWC01rWjmBgQigS9cu/s+iCQ+/WtUPCAXDslEUenIMtlV5YzMUascowVtKfT2mkOmX4evQPEAksQ4 R44lr3gq2RiNGhMxn+gOuZ4LjfOYglwZNqSe15CWmJQsHZ1lkWUhWVKBZUlaoA5czVZWoh5NWHuHm NpsijOO9Bm81WIv26sULpEYHFZ/ITDpPAwVO/Roel4UDMJSBIouBu2VSiAKTu6vG/jk53b9Ia5QE8 IlNyyfFoD2FygSOellJeZeQgOeJVmnZsMvbCoI00VrCRJfEMDug80+kHSEVXNfgExuF0OTENK7+s0 vTAKDKTw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XA-00EAyX-A3; Mon, 08 Aug 2022 19:35:28 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 34/59] khugepaged: Call shmem_get_folio() Date: Mon, 8 Aug 2022 20:34:02 +0100 Message-Id: <20220808193430.3378317-35-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987329; a=rsa-sha256; cv=none; b=1AsANufYT161BsiWMgmBdV8KAwqjboEPBVZYYYRPDhYU4KaKNOWieXtClGLIcYg7chy0k0 nrQsqlLYl5FDLLSOx6OAWbYPphS1TFCbpUMPOqDax1sTBFfWA2fvrfuG9l9c4I0ygbyE7N snU8h8WOwi0BqI7EYvUVg40ZPiv0ftc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=R4wxYc9K; dmarc=none; spf=none (imf26.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=1659987329; 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=UPtozOF/DITQ9DrzcZ6fY1WTW9Teyt71UWkDor+71lg=; b=fN+crzuJUflrHjH3C5qFUHQVbHDz11b3lfIIITHGA5c2Nz9eSYyTwPsuOVFqn78l+cTmGo gaqQksBAn4iWUMlrzjMIDqIAkidAJ+9chH4piHZ0NoYu3g7aUKHYnpJn0GXlw1bU5vNUKk xGYbsEX2+RjVZdGTbE1JX41/RXci7xY= X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B94CC14002C Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=R4wxYc9K; dmarc=none; spf=none (imf26.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: qpm95k3tyhcrg84n94zzo85tyhywnkek X-HE-Tag: 1659987329-477025 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 128970a74aa2..da7ce4039430 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3141,7 +3141,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); @@ -3152,7 +3152,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