Skip to contentSkip to conversation

erofs: fix missing xas_retry() in fscache mode

PATCH New Jingbo Xu 1 participant 1 message Nov 14, 2022 EROFS file system

lore
Share & tools
lore

Jingbo Xu

author
#0 lore raw

PATCH v2 1/1 erofs: fix missing xas_retry() in fscache mode

The xarray iteration only holds the RCU read lock and thus may encounter XA_RETRY_ENTRY if there's process modifying the xarray concurrently. This will cause oops when referring to the invalid entry.

Fix this by adding the missing xas_retry(), which will make the iteration wind back to the root node if XA_RETRY_ENTRY is encountered.

Fixes d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")

---
v2:
- update the commit message suggested by David
- add "Suggested-by" tag, as this patch actually fixes the same issue as that fixed by David's patch [1]. Sorry I forgot in v1 ;-\
- add "Reviewed-by" tags

[1] https://lore.kernel.org/lkml/[email protected]/T/#m036d0221dacde491a1bcf2f4428e8b1450179df9

---
 fs/erofs/fscache.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
fs/erofs/fscache.c +7 -3
index fe05bc51f9f2..458c1c70ef30 100644
@@ -75,11 +75,15 @@ static void erofs_fscache_rreq_unlock_folios(struct netfs_io_request *rreq)
 
 	rcu_read_lock();
 	xas_for_each(&xas, folio, last_page) {
-		unsigned int pgpos =
-			(folio_index(folio) - start_page) * PAGE_SIZE;
-		unsigned int pgend = pgpos + folio_size(folio);
+		unsigned int pgpos, pgend;
 		bool pg_failed = false;
 
+		if (xas_retry(&xas, folio))
+			continue;
+
+		pgpos = (folio_index(folio) - start_page) * PAGE_SIZE;
+		pgend = pgpos + folio_size(folio);
+
 		for (;;) {
 			if (!subreq) {
 				pg_failed = true;
Signature · 1 line
2.19.1.6.gb485710b