Skip to contentSkip to conversation

FAILED: patch "[PATCH] dax: Avoid losing wakeup in dax_lock_mapping_entry" failed to apply to 4.19-stable tree

PATCH In review [email protected] 4 participants 5 messages Nov 26, 2018 – Nov 29, 2018

Subsystems (4)
lore
Share & tools
lore
#1 lore raw
In reply to [email protected]
Quoted 5 lines · On Mon, Nov 26, 2018 at 11:40:20AM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The fix for 4.19 is rather more complex because we don't have the right information in the right places. Dan, does this look right to you?

fs/dax.c +13 -4
index 0fb270f0a0ef6..b8dd66f1951a6 100644
@@ -227,7 +227,9 @@ static inline void *unlock_slot(struct address_space *mapping, void **slot)
  * Must be called with the i_pages lock held.
  */
 static void *__get_unlocked_mapping_entry(struct address_space *mapping,
-		pgoff_t index, void ***slotp, bool (*wait_fn)(void))
+			pgoff_t index, void ***slotp,
+			bool (*wait_fn)(struct address_space *mapping,
+					pgoff_t index, void *entry))
 {
 	void *entry, **slot;
 	struct wait_exceptional_entry_queue ewait;
@@ -253,7 +255,7 @@ static void *__get_unlocked_mapping_entry(struct address_space *mapping,
 		prepare_to_wait_exclusive(wq, &ewait.wait,
 					  TASK_UNINTERRUPTIBLE);
 		xa_unlock_irq(&mapping->i_pages);
-		revalidate = wait_fn();
+		revalidate = wait_fn(mapping, index, entry);
 		finish_wait(wq, &ewait.wait);
 		xa_lock_irq(&mapping->i_pages);
 		if (revalidate)
@@ -261,7 +263,8 @@ static void *__get_unlocked_mapping_entry(struct address_space *mapping,
 	}
 }
 
-static bool entry_wait(void)
+static bool entry_wait(struct address_space *mapping, unsigned long index,
+			void *entry)
 {
 	schedule();
 	/*
@@ -393,12 +396,18 @@ static struct page *dax_busy_page(void *entry)
 	return NULL;
 }
 
-static bool entry_wait_revalidate(void)
+static bool entry_wait_revalidate(struct address_space *mapping,
+					unsigned long index, void *entry)
 {
 	rcu_read_unlock();
 	schedule();
 	rcu_read_lock();
 
+	/*
+	 * We're not going to do anything with this entry; wake the next
+	 * task in line
+	 */
+	put_unlocked_mapping_entry(mapping, index, entry);
 	/*
 	 * Tell __get_unlocked_mapping_entry() to take a break, we need
 	 * to revalidate page->mapping after dropping locks
Quoted 20 lines

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 25bbe21bf427a81b8e3ccd480ea0e1d940256156 Mon Sep 17 00:00:00 2001

From: Matthew Wilcox <[email protected]>
Date: Fri, 16 Nov 2018 15:50:02 -0500
Subject: [PATCH] dax: Avoid losing wakeup in dax_lock_mapping_entry

After calling get_unlocked_entry(), you have to call put_unlocked_entry() to avoid subsequent waiters losing wakeups.

Fixes c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
fs/dax.c +0 -0
index cf2394e2bf4b..9bcce89ea18e 100644

fs/dax.c bool dax_lock_mapping_entry(struct page *page) · line 397

Quoted 7 lines
fs/dax.c +1 -0
@@ -391,6 +391,7 @@ bool dax_lock_mapping_entry(struct page *page)
 			rcu_read_unlock();
 			entry = get_unlocked_entry(&xas);
 			xas_unlock_irq(&xas);
+			put_unlocked_entry(&xas, entry);
 			rcu_read_lock();
 			continue;
 		}

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#2 lore raw
Quoted 9 lines · Matthew Wilcox
Quoted 5 lines · On Mon, Nov 26, 2018 at 11:40:20AM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The fix for 4.19 is rather more complex because we don't have the right information in the right places. Dan, does this look right to you?

Wait, we can do it like this which should be simpler:

fs/dax.c +6 -1
index 0fb270f0a0ef6..b0cd1364c68fa 100644
@@ -217,6 +217,9 @@ static inline void *unlock_slot(struct address_space *mapping, void **slot)
 	return (void *)entry;
 }
 
+static void put_unlocked_mapping_entry(struct address_space *mapping,
+				       pgoff_t index, void *entry);
+
 /*
  * Lookup entry in radix tree, wait for it to become unlocked if it is
  * exceptional entry and return it. The caller must call
@@ -256,8 +259,10 @@ static void *__get_unlocked_mapping_entry(struct address_space *mapping,
 		revalidate = wait_fn();
 		finish_wait(wq, &ewait.wait);
 		xa_lock_irq(&mapping->i_pages);
-		if (revalidate)
+		if (revalidate) {
+			put_unlocked_mapping_entry(mapping, index, entry);
 			return ERR_PTR(-EAGAIN);
+		}
 	}
 }
 
Quoted 14 lines
Quoted 14 lines

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 25bbe21bf427a81b8e3ccd480ea0e1d940256156 Mon Sep 17 00:00:00 2001

From: Matthew Wilcox <[email protected]>
Date: Fri, 16 Nov 2018 15:50:02 -0500
Subject: [PATCH] dax: Avoid losing wakeup in dax_lock_mapping_entry

After calling get_unlocked_entry(), you have to call put_unlocked_entry() to avoid subsequent waiters losing wakeups.

Fixes c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
Quoted 13 lines

fs/dax.c bool dax_lock_mapping_entry(struct page *page) · line 397

Quoted 13 lines
fs/dax.c +1 -0
index cf2394e2bf4b..9bcce89ea18e 100644
@@ -391,6 +391,7 @@ bool dax_lock_mapping_entry(struct page *page)
 			rcu_read_unlock();
 			entry = get_unlocked_entry(&xas);
 			xas_unlock_irq(&xas);
+			put_unlocked_entry(&xas, entry);
 			rcu_read_lock();
 			continue;
 		}

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 25bbe21bf427a81b8e3ccd480ea0e1d940256156 Mon Sep 17 00:00:00 2001

From: Matthew Wilcox <[email protected]>
Date: Fri, 16 Nov 2018 15:50:02 -0500
Subject: [PATCH] dax: Avoid losing wakeup in dax_lock_mapping_entry

After calling get_unlocked_entry(), you have to call put_unlocked_entry() to avoid subsequent waiters losing wakeups.

Fixes c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
fs/dax.c +1 -0
index cf2394e2bf4b..9bcce89ea18e 100644
@@ -391,6 +391,7 @@ bool dax_lock_mapping_entry(struct page *page)
 			rcu_read_unlock();
 			entry = get_unlocked_entry(&xas);
 			xas_unlock_irq(&xas);
+			put_unlocked_entry(&xas, entry);
 			rcu_read_lock();
 			continue;
 		}
#3 lore raw

PATCH 1/1 dax: Avoid losing wakeup in dax_lock_mapping_entry

In reply to Matthew Wilcox

From: Matthew Wilcox <[email protected]>

commit 25bbe21bf427a81b8e3ccd480ea0e1d940256156 upstream.

After calling get_unlocked_entry(), you have to call put_unlocked_entry() to avoid subsequent waiters losing wakeups.

Fixes c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")

---
Passes the nvdimm unit test suite which exercises the lock path.

 fs/dax.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/dax.c +6 -1
index 0fb270f0a0ef..b0cd1364c68f 100644
@@ -217,6 +217,9 @@ static inline void *unlock_slot(struct address_space *mapping, void **slot)
 	return (void *)entry;
 }
 
+static void put_unlocked_mapping_entry(struct address_space *mapping,
+				       pgoff_t index, void *entry);
+
 /*
  * Lookup entry in radix tree, wait for it to become unlocked if it is
  * exceptional entry and return it. The caller must call
@@ -256,8 +259,10 @@ static void *__get_unlocked_mapping_entry(struct address_space *mapping,
 		revalidate = wait_fn();
 		finish_wait(wq, &ewait.wait);
 		xa_lock_irq(&mapping->i_pages);
-		if (revalidate)
+		if (revalidate) {
+			put_unlocked_mapping_entry(mapping, index, entry);
 			return ERR_PTR(-EAGAIN);
+		}
 	}
 }
 
#4 lore raw

Re: [4.19-stable PATCH] dax: Avoid losing wakeup in dax_lock_mapping_entry

Quoted 7 lines · Dan Williams

From: Matthew Wilcox <[email protected]>

commit 25bbe21bf427a81b8e3ccd480ea0e1d940256156 upstream.

After calling get_unlocked_entry(), you have to call put_unlocked_entry() to avoid subsequent waiters losing wakeups.

Quoted 6 lines
Fixes c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")

---
Passes the nvdimm unit test suite which exercises the lock path.

Now applied, thanks.

greg k-h