From patchwork Fri Apr 21 21:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13220714 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 C2D0DC7618E for ; Fri, 21 Apr 2023 21:44:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31C216B007D; Fri, 21 Apr 2023 17:44:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2569B6B0081; Fri, 21 Apr 2023 17:44:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFFE76B0083; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D5ABA6B007D for ; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9FC97A061A for ; Fri, 21 Apr 2023 21:44:21 +0000 (UTC) X-FDA: 80706727122.14.C78AAB9 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf13.hostedemail.com (Postfix) with ESMTP id 0762D20007 for ; Fri, 21 Apr 2023 21:44:19 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=l1UKRS+6; spf=none (imf13.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682113460; h=from:from:sender: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=Pwtny366FbTbrb7vPgMXDOxfQYz6bsR4vwvBIbUUYzg=; b=5OMpZwr6G6SSkXLVyZ2Dfy8sixszVEgwSPWOF4nHmP75RuSCAH9KP5XtTLiFl6gMwaFDH+ up7op0iDhpK3m7U9EbcC8koYk5CRc5u0XTMfjcAp8VN3kEwT5LkPbX4BvdaF9NfT4CZ2oG +XEBbDjD2ITTqQh5OaqXoJrkLRORWw4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=l1UKRS+6; spf=none (imf13.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682113460; a=rsa-sha256; cv=none; b=MzhdqglAD8UpjFhlco1Z0IYyytxhh58K/4eD5/NVanrBIEtv0y2I+z3y/V/J+iZLcnUoHq vGBDWsD/7iTiYdS2NmE2pVlzRM6mgYYWyAFF7SI4ASXEAuap3caUq3QIDuut8Zg7s5Bcpb Um2TsIXv9eguvoUVKM0J9hktE8+M/BE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=Pwtny366FbTbrb7vPgMXDOxfQYz6bsR4vwvBIbUUYzg=; b=l1UKRS+6uYC4EXAjJgBrQTAp5j xsYvwCnnNonL+zWZMEy71A3Ta6km8F6dSzKQvEcpRo5TV7XBXl9OERI0fsz5C845ifOI1VFCEHRc1 Zre0qUD7V89WFxot/x0Dllx9YnFxYQ7Yz7zDqe598RN0r0tdnLI/4pmF0Tvd/CygY81NUfyF7TcfO R1q/JTspIPOKlYq6NoZibJ4hLTLlDqaLHYjGQRhRwv9u7o7cGbziZ6ambxSZLU25fgMv7Z5We7Z9g 4m2TriUxFygO3OJdPvzDe0pBPp5xw1iklrlut7//xUpzOnTPbemmyDvmuxTGhDtulG3XxP+CyxfK9 9RMFdwJQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1ppyY1-00Btok-1t; Fri, 21 Apr 2023 21:44:05 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, djwong@kernel.org Cc: p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, hare@suse.de, kbusch@kernel.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC 2/8] shmem: convert to use folio_test_hwpoison() Date: Fri, 21 Apr 2023 14:43:54 -0700 Message-Id: <20230421214400.2836131-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230421214400.2836131-1-mcgrof@kernel.org> References: <20230421214400.2836131-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Stat-Signature: gwh8g3yfamteiwsp163dio48cppf6o6c X-Rspam-User: X-Rspamd-Queue-Id: 0762D20007 X-Rspamd-Server: rspam06 X-HE-Tag: 1682113459-238465 X-HE-Meta: U2FsdGVkX1+5hGgtqwcsvSleHQEMpgu1jk4Yhny0zo+TbDaMrb2m1vScqRGtBssryH4xhzxIoMBGmJyMHNQmFQEQuIWC5dUxujBK7c/G91G31TMZ3xoYvrDhcUUPeidXL3MrYxyuFel1sNswGhT99x53I8NcE0tiiy2iO9Uic93tCa7UguxQqvKDYohgh/qKUh+Ryg+sFWBr591y5h1UeqnsF1J4yqRL0hNQ61Zf+qb575sZhLTyO19oZ5JOyuj+mHRBngthrCxLvb3A5EG2fWrz9eSOep230kJ4V5/ByS0VTHomah58iV9uQWSl5LDIqn48ZZ1+zurOyoBR4iaJWbdGtw9FWiDZLgMw+NzXUzfrLxu5uyt6R7TSQlZMPTzAol7i4UX52CH3jNxc/xikHax9qxqIMeEx80IhuzFZNXnGta/xSBnL6IC1v0UH8Na8e4cGgnQ9qwGyxRAMGjxYeriEpXJvuPK/lLFo075tL8jwJx0NaaWRip8PcmREquPwtq5FliaTEw6XMM0SQJFk9Z6WtDz04bpP0RJzaVMmAwBO3aojB/4sMQkV+t7ulzXXplmXu6AI76PPNYCNShmixP3NbP6ZLbPCpLdPC0oYiP8OpAEsyyAxfUY79dJzX2wizZ7AzqLMN/OQnoGCDDHYvubL8aKz5zgbc+g1JyMLbrgIY1U9xwARA+Oa+E/t8cla+XM40m/kcqaA0xlx6rKPyZ6UKVyiD3iFbg1zfGrLakCgSmE70IgYQLj5NqZOqiD+IxKghS90QIHjS7SC9j/LfGpp+n2oVWAOC3QLm958mBhaLFNJkyjVyKyysQUtv37YoQyRyK7qnnD2luqMfKSSaiGU6/x5GrVZbqM8FzeD9t7T1PxKJQMpXJt4oS+lQ+vgUEqPZoZuZRnHdl/56xvT1kN1L6iG87zSX4rNE1zXLgFjevOyR/cBwQOcMUIEvPwzuzXq6CSN6Bht05dWi6e WI2nNGJn 4zA04zW7AKmJaefgB82q3XViduTyb/OCQhjZ/c4upuLd+qwZPApa5Pg6hFPiKBn47PdnkNApMit2vfCpAaNhZ/fzZL4epurddyD1TxLDbR1SLnjTaEEWEho/hew86uE+rb8JyhJMvIbSN3OFhK5WRiTamC5oKgFsSpR6nLX0FHqXV0VBn6G1XikSi7MQmqD8L7H2hRcCn9dYVVY1Psc80lJw+pNDSeYYel1yn6LS3krswBDJekBlhjScnRuNu/v3UNxSyCB0tkrMfsl97ndRltX0iUlddrF0yaKje0k1t3ljDMFH0mFrJorQX3Ma68Auk1S31wt/MpY2GkgG39dclv/0eOD3RAaQdU6+SAQwdeGUUmwZ1NWwu1LhAxa9ar5DmtcNxQHpUFi//qruBlbCtuwaW7d2SfMKjLCGwjHIvPX/yK+ETrcT4+Iz/Yr7SRVMdXunS X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The PageHWPoison() call can be converted over to the respective folio call folio_test_hwpoison(). This introduces no functional changes. Signed-off-by: Luis Chamberlain --- mm/shmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 5bf92d571092..6f117c3cbe89 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3483,7 +3483,7 @@ static const char *shmem_get_link(struct dentry *dentry, folio = filemap_get_folio(inode->i_mapping, 0); if (IS_ERR(folio)) return ERR_PTR(-ECHILD); - if (PageHWPoison(folio_page(folio, 0)) || + if (folio_test_hwpoison(folio) || !folio_test_uptodate(folio)) { folio_put(folio); return ERR_PTR(-ECHILD); @@ -3494,7 +3494,7 @@ static const char *shmem_get_link(struct dentry *dentry, return ERR_PTR(error); if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(folio_page(folio, 0))) { + if (folio_test_hwpoison(folio)) { folio_unlock(folio); folio_put(folio); return ERR_PTR(-ECHILD); @@ -4672,7 +4672,7 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, return &folio->page; page = folio_file_page(folio, index); - if (PageHWPoison(page)) { + if (folio_test_hwpoison(folio)) { folio_put(folio); return ERR_PTR(-EIO); }