erofs: fix missing xas_retry() in fscache mode
PATCH 1/1 erofs: fix missing xas_retry() in fscache mode
The xarray iteration only holds RCU 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.
--- fs/erofs/fscache.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/erofs/fscache.c +7 -3
@@ -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
Quoted 9 lines · Jingbo Xu
The xarray iteration only holds RCU and thus may encounter
XA_RETRY_ENTRYif 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 ifXA_RETRY_ENTRYis encountered.Fixes d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")Signed-off-by Jingbo Xu <[email protected]>
Thanks,
Gao Xiang
Quoted 29 lines
--- fs/erofs/fscache.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)fs/erofs/fscache.c +7
-3@@ -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
Quoted 9 lines · Jingbo Xu
The xarray iteration only holds RCU and thus may encounter
XA_RETRY_ENTRYif 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 ifXA_RETRY_ENTRYis encountered.Fixes d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")Signed-off-by Jingbo Xu <[email protected]>
Quoted 27 lines
--- fs/erofs/fscache.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)fs/erofs/fscache.c +7
-3@@ -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;
Quoted 1 line · Jingbo Xu
The xarray iteration only holds RCU
I would say "the RCU read lock".
Also, I think you've copied the code to which my dodgy-maths fix applies:
https://lore.kernel.org/linux-fsdevel/166757988611.950645.7626959069846893164.stgit@warthog.procyon.org.uk/
David
Hi David,
Thanks for the comment.
Quoted 5 lines · David Howells
Quoted 1 line · Jingbo Xu
The xarray iteration only holds RCU
I would say "the RCU read lock".
Yeah, this looks clearer. I will update the commit message in v2 later.
Quoted 5 lines
Also, I think you've copied the code to which my dodgy-maths fix applies:
https://lore.kernel.org/linux-fsdevel/166757988611.950645.7626959069846893164.stgit@warthog.procyon.org.uk/
Thanks for the kindly reminder. Yeah this code was ever copied from libnetfs. In the scenario of erofs, currently req->start is always aligned with folio size and erofs doesn't support large folio yet. Thus req->start won't be inside the folio so far, and I think the current code works well in the scenario of erofs, though the issue indeed exist mathematically.
Actually I'm working on the support for large folio now, and the completion routine of erofs in fscache mode will be refactored quite a lot. I think this issue will be fixed along with the refactoring.
Thanks again for the suggestion :)
Signature · 2 lines
Thanks, Jingbo