linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Chandan Babu R <chandan.babu@oracle.com>,
	"Darrick J. Wong" <djwong@kernel.org>,
	Hugh Dickins <hughd@google.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: linux-xfs@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 16/21] xfs: improve detection of lost xfile contents
Date: Fri, 26 Jan 2024 14:28:58 +0100	[thread overview]
Message-ID: <20240126132903.2700077-17-hch@lst.de> (raw)
In-Reply-To: <20240126132903.2700077-1-hch@lst.de>

From: "Darrick J. Wong" <djwong@kernel.org>

shmem files are weird animals with respect to figuring out if we've lost
any data.  The memory failure code can set HWPoison on a page, but it
also sets writeback errors on the file mapping.  Replace the twisty
multi-line if logic with a single helper that looks in all the places
that I know of where memory errors can show up.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/scrub/xfile.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c
index 077f9ce6e81409..2d802c20a8ddfe 100644
--- a/fs/xfs/scrub/xfile.c
+++ b/fs/xfs/scrub/xfile.c
@@ -99,6 +99,31 @@ xfile_destroy(
 	kfree(xf);
 }
 
+/* Has this file lost any of the data stored in it? */
+static inline bool
+xfile_has_lost_data(
+	struct inode		*inode,
+	struct folio		*folio)
+{
+	struct address_space	*mapping = inode->i_mapping;
+
+	/* This folio itself has been poisoned. */
+	if (folio_test_hwpoison(folio))
+		return true;
+
+	/* A base page under this large folio has been poisoned. */
+	if (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))
+		return true;
+
+	/* Data loss has occurred anywhere in this shmem file. */
+	if (test_bit(AS_EIO, &mapping->flags))
+		return true;
+	if (filemap_check_wb_err(mapping, 0))
+		return true;
+
+	return false;
+}
+
 /*
  * Load an object.  Since we're treating this file as "memory", any error or
  * short IO is treated as a failure to allocate memory.
@@ -138,9 +163,7 @@ xfile_load(
 				PAGE_SIZE - offset_in_page(pos));
 			memset(buf, 0, len);
 		} else {
-			if (folio_test_hwpoison(folio) ||
-			    (folio_test_large(folio) &&
-			     folio_test_has_hwpoisoned(folio))) {
+			if (xfile_has_lost_data(inode, folio)) {
 				folio_unlock(folio);
 				folio_put(folio);
 				break;
@@ -201,9 +224,7 @@ xfile_store(
 		if (shmem_get_folio(inode, pos >> PAGE_SHIFT, &folio,
 				SGP_CACHE) < 0)
 			break;
-		if (folio_test_hwpoison(folio) ||
-		    (folio_test_large(folio) &&
-		     folio_test_has_hwpoisoned(folio))) {
+		if (xfile_has_lost_data(inode, folio)) {
 			folio_unlock(folio);
 			folio_put(folio);
 			break;
-- 
2.39.2



  parent reply	other threads:[~2024-01-26 13:30 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-26 13:28 put the xfs xfile abstraction on a diet v2 Christoph Hellwig
2024-01-26 13:28 ` [PATCH 01/21] mm: move mapping_set_update out of <linux/swap.h> Christoph Hellwig
2024-01-26 14:39   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 02/21] shmem: move shmem_mapping out of line Christoph Hellwig
2024-01-26 14:40   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 03/21] shmem: set a_ops earlier in shmem_symlink Christoph Hellwig
2024-01-26 14:41   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 04/21] shmem: move the shmem_mapping assert into shmem_get_folio_gfp Christoph Hellwig
2024-01-26 15:09   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 05/21] shmem: export shmem_get_folio Christoph Hellwig
2024-01-26 15:15   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 06/21] shmem: export shmem_kernel_file_setup Christoph Hellwig
2024-01-26 15:45   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 07/21] shmem: document how to "persist" data when using shmem_*file_setup Christoph Hellwig
2024-01-26 15:49   ` Matthew Wilcox
2024-01-28 16:54     ` Christoph Hellwig
2024-01-29 15:56       ` Matthew Wilcox
2024-01-29 16:04         ` Christoph Hellwig
2024-01-26 13:28 ` [PATCH 08/21] xfs: remove xfile_stat Christoph Hellwig
2024-01-26 13:28 ` [PATCH 09/21] xfs: remove the xfile_pread/pwrite APIs Christoph Hellwig
2024-01-26 16:21   ` Matthew Wilcox
2024-01-26 16:48     ` Darrick J. Wong
2024-01-26 13:28 ` [PATCH 10/21] xfs: don't try to handle non-update pages in xfile_obj_load Christoph Hellwig
2024-01-26 13:28 ` [PATCH 11/21] xfs: shmem_file_setup can't return NULL Christoph Hellwig
2024-01-26 13:28 ` [PATCH 12/21] xfs: don't modify file and inode flags for shmem files Christoph Hellwig
2024-01-26 13:28 ` [PATCH 13/21] xfs: don't allow highmem pages in xfile mappings Christoph Hellwig
2024-01-26 16:26   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 14/21] xfs: use shmem_get_folio in xfile_obj_store Christoph Hellwig
2024-01-26 16:29   ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 15/21] xfs: use shmem_get_folio in in xfile_load Christoph Hellwig
2024-01-26 13:28 ` Christoph Hellwig [this message]
2024-01-26 16:33   ` [PATCH 16/21] xfs: improve detection of lost xfile contents Matthew Wilcox
2024-01-26 16:50     ` Darrick J. Wong
2024-01-28 16:55     ` Christoph Hellwig
2024-01-28 20:33       ` Matthew Wilcox
2024-01-26 13:28 ` [PATCH 17/21] xfs: add file_{get,put}_folio Christoph Hellwig
2024-01-26 16:40   ` Matthew Wilcox
2024-01-26 16:55     ` Darrick J. Wong
2024-01-27  1:26   ` Kent Overstreet
2024-01-27  1:32     ` Darrick J. Wong
2024-01-26 13:29 ` [PATCH 18/21] xfs: remove xfarray_sortinfo.page_kaddr Christoph Hellwig
2024-01-26 13:29 ` [PATCH 19/21] xfs: fix a comment in xfarray.c Christoph Hellwig
2024-01-26 13:29 ` [PATCH 20/21] xfs: convert xfarray_pagesort to deal with large folios Christoph Hellwig
2024-01-27  1:09   ` Kent Overstreet
2024-01-26 13:29 ` [PATCH 21/21] xfs: remove xfile_{get,put}_page Christoph Hellwig
2024-01-26 14:15 ` put the xfs xfile abstraction on a diet v2 Matthew Wilcox
2024-01-26 14:18   ` Christoph Hellwig
2024-01-26 16:47 ` Matthew Wilcox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240126132903.2700077-17-hch@lst.de \
    --to=hch@lst.de \
    --cc=akpm@linux-foundation.org \
    --cc=chandan.babu@oracle.com \
    --cc=djwong@kernel.org \
    --cc=hughd@google.com \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox