Skip to content

Commit 6370740

Browse files
committed
fs/dax: Fix pmd vs pte conflict detection
Users reported a v5.3 performance regression and inability to establish huge page mappings. A revised version of the ndctl "dax.sh" huge page unit test identifies commit 23c84eb "dax: Fix missed wakeup with PMD faults" as the source. Update get_unlocked_entry() to check for NULL entries before checking the entry order, otherwise NULL is misinterpreted as a present pte conflict. The 'order' check needs to happen before the locked check as an unlocked entry at the wrong order must fallback to lookup the correct order. Reported-by: Jeff Smits <[email protected]> Reported-by: Doug Nelson <[email protected]> Cc: <[email protected]> Fixes: 23c84eb ("dax: Fix missed wakeup with PMD faults") Reviewed-by: Jan Kara <[email protected]> Cc: Jeff Moyer <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Link: https://lore.kernel.org/r/157167532455.3945484.11971474077040503994.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <[email protected]>
1 parent 4f5cafb commit 6370740

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/dax.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,11 @@ static void *get_unlocked_entry(struct xa_state *xas, unsigned int order)
220220

221221
for (;;) {
222222
entry = xas_find_conflict(xas);
223+
if (!entry || WARN_ON_ONCE(!xa_is_value(entry)))
224+
return entry;
223225
if (dax_entry_order(entry) < order)
224226
return XA_RETRY_ENTRY;
225-
if (!entry || WARN_ON_ONCE(!xa_is_value(entry)) ||
226-
!dax_is_locked(entry))
227+
if (!dax_is_locked(entry))
227228
return entry;
228229

229230
wq = dax_entry_waitqueue(xas, entry, &ewait.key);

0 commit comments

Comments
 (0)