mm/hmm: HMM should have a callback before MM is destroyed

[linux-block.git] / mm / hmm.c

diff --git a/mm/hmm.c b/mm/hmm.c
index 320545b98ff55997029476f32e09dbf5d4f5f009..8116727766f7cb5a061267a47e1d69406e9ecd5d 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -160,6 +160,32 @@ static void hmm_invalidate_range(struct hmm *hmm,
        up_read(&hmm->mirrors_sem);
 }
 
+static void hmm_release(struct mmu_notifier *mn, struct mm_struct *mm)
+{
+       struct hmm_mirror *mirror;
+       struct hmm *hmm = mm->hmm;
+
+       down_write(&hmm->mirrors_sem);
+       mirror = list_first_entry_or_null(&hmm->mirrors, struct hmm_mirror,
+                                         list);
+       while (mirror) {
+               list_del_init(&mirror->list);
+               if (mirror->ops->release) {
+                       /*
+                        * Drop mirrors_sem so callback can wait on any pending
+                        * work that might itself trigger mmu_notifier callback
+                        * and thus would deadlock with us.
+                        */
+                       up_write(&hmm->mirrors_sem);
+                       mirror->ops->release(mirror);
+                       down_write(&hmm->mirrors_sem);
+               }
+               mirror = list_first_entry_or_null(&hmm->mirrors,
+                                                 struct hmm_mirror, list);
+       }
+       up_write(&hmm->mirrors_sem);
+}
+
 static void hmm_invalidate_range_start(struct mmu_notifier *mn,
                                       struct mm_struct *mm,
                                       unsigned long start,
@@ -185,6 +211,7 @@ static void hmm_invalidate_range_end(struct mmu_notifier *mn,
 }
 
 static const struct mmu_notifier_ops hmm_mmu_notifier_ops = {
+       .release                = hmm_release,
        .invalidate_range_start = hmm_invalidate_range_start,
        .invalidate_range_end   = hmm_invalidate_range_end,
 };
@@ -230,7 +257,7 @@ void hmm_mirror_unregister(struct hmm_mirror *mirror)
        struct hmm *hmm = mirror->hmm;
 
        down_write(&hmm->mirrors_sem);
-       list_del(&mirror->list);
+       list_del_init(&mirror->list);
        up_write(&hmm->mirrors_sem);
 }
 EXPORT_SYMBOL(hmm_mirror_unregister);