From: Ralph Campbell <rcampbell@xxxxxxxxxx> The last reference to struct hmm may be released long after the mm_struct is destroyed because the struct hmm_mirror memory may be part of a device driver open file private data pointer. The file descriptor close is usually after the mm_struct is destroyed in do_exit(). This is a good reason for making struct hmm a kref_t object [1] since its lifetime spans the life time of mm_struct and struct hmm_mirror. The fix is to not use hmm->mm in hmm_free() and to clear mm->hmm and hmm->mm pointers in hmm_destroy() when the mm_struct is destroyed. By clearing the pointers at the very last moment, it eliminates the need for additional locking since the mmu notifier code already handles quiescing notifier callbacks and unregistering the hmm notifiers. Also, by making mm_struct hold a reference to struct hmm, there is no need to check for a zero hmm reference count in mm_get_hmm(). [1] https://marc.info/?l=linux-mm&m=155432001406049&w=2 ("mm/hmm: use reference counting for HMM struct v3") Signed-off-by: Ralph Campbell <rcampbell@xxxxxxxxxx> Cc: John Hubbard <jhubbard@xxxxxxxxxx> Cc: Ira Weiny <ira.weiny@xxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Balbir Singh <bsingharora@xxxxxxxxx> Cc: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/hmm.h | 10 +---- mm/hmm.c | 100 ++++++++++++++++---------------------------- 2 files changed, 37 insertions(+), 73 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index fa0671d67269..538867c76906 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -488,15 +488,7 @@ void hmm_mirror_unregister(struct hmm_mirror *mirror); */ static inline bool hmm_mirror_mm_is_alive(struct hmm_mirror *mirror) { - struct mm_struct *mm; - - if (!mirror || !mirror->hmm) - return false; - mm = READ_ONCE(mirror->hmm->mm); - if (mirror->hmm->dead || !mm) - return false; - - return true; + return mirror && mirror->hmm && !mirror->hmm->dead; } /* diff --git a/mm/hmm.c b/mm/hmm.c index 2aa75dbed04a..4e42c282d334 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -43,8 +43,10 @@ static inline struct hmm *mm_get_hmm(struct mm_struct *mm) { struct hmm *hmm = READ_ONCE(mm->hmm); - if (hmm && kref_get_unless_zero(&hmm->kref)) + if (hmm && !hmm->dead) { + kref_get(&hmm->kref); return hmm; + } return NULL; } @@ -53,25 +55,28 @@ static inline struct hmm *mm_get_hmm(struct mm_struct *mm) * hmm_get_or_create - register HMM against an mm (HMM internal) * * @mm: mm struct to attach to - * Returns: returns an HMM object, either by referencing the existing - * (per-process) object, or by creating a new one. + * Return: an HMM object reference, either by referencing the existing + * (per-process) object, or by creating a new one. * - * This is not intended to be used directly by device drivers. If mm already - * has an HMM struct then it get a reference on it and returns it. Otherwise - * it allocates an HMM struct, initializes it, associate it with the mm and - * returns it. + * If the mm already has an HMM struct then return a new reference to it. + * Otherwise, allocate an HMM struct, initialize it, associate it with the mm, + * and return a new reference to it. If the return value is not NULL, + * the caller is responsible for calling hmm_put(). */ static struct hmm *hmm_get_or_create(struct mm_struct *mm) { - struct hmm *hmm = mm_get_hmm(mm); - bool cleanup = false; + struct hmm *hmm = mm->hmm; - if (hmm) - return hmm; + if (hmm) { + if (hmm->dead) + goto error; + goto out; + } hmm = kmalloc(sizeof(*hmm), GFP_KERNEL); if (!hmm) - return NULL; + goto error; + init_waitqueue_head(&hmm->wq); INIT_LIST_HEAD(&hmm->mirrors); init_rwsem(&hmm->mirrors_sem); @@ -83,47 +88,32 @@ static struct hmm *hmm_get_or_create(struct mm_struct *mm) hmm->dead = false; hmm->mm = mm; - spin_lock(&mm->page_table_lock); - if (!mm->hmm) - mm->hmm = hmm; - else - cleanup = true; - spin_unlock(&mm->page_table_lock); - - if (cleanup) - goto error; - /* - * We should only get here if hold the mmap_sem in write mode ie on - * registration of first mirror through hmm_mirror_register() + * The mmap_sem should be held for write so no additional locking + * is needed. Note that struct_mm holds a reference to hmm. + * It is cleared in hmm_release(). */ + mm->hmm = hmm; + hmm->mmu_notifier.ops = &hmm_mmu_notifier_ops; if (__mmu_notifier_register(&hmm->mmu_notifier, mm)) goto error_mm; +out: + /* Return a separate hmm reference for the caller. */ + kref_get(&hmm->kref); return hmm; error_mm: - spin_lock(&mm->page_table_lock); - if (mm->hmm == hmm) - mm->hmm = NULL; - spin_unlock(&mm->page_table_lock); -error: + mm->hmm = NULL; kfree(hmm); +error: return NULL; } static void hmm_free(struct kref *kref) { struct hmm *hmm = container_of(kref, struct hmm, kref); - struct mm_struct *mm = hmm->mm; - - mmu_notifier_unregister_no_release(&hmm->mmu_notifier, mm); - - spin_lock(&mm->page_table_lock); - if (mm->hmm == hmm) - mm->hmm = NULL; - spin_unlock(&mm->page_table_lock); kfree(hmm); } @@ -135,25 +125,18 @@ static inline void hmm_put(struct hmm *hmm) void hmm_mm_destroy(struct mm_struct *mm) { - struct hmm *hmm; + struct hmm *hmm = mm->hmm; - spin_lock(&mm->page_table_lock); - hmm = mm_get_hmm(mm); - mm->hmm = NULL; if (hmm) { + mm->hmm = NULL; hmm->mm = NULL; - hmm->dead = true; - spin_unlock(&mm->page_table_lock); hmm_put(hmm); - return; } - - spin_unlock(&mm->page_table_lock); } static void hmm_release(struct mmu_notifier *mn, struct mm_struct *mm) { - struct hmm *hmm = mm_get_hmm(mm); + struct hmm *hmm = mm->hmm; struct hmm_mirror *mirror; struct hmm_range *range; @@ -187,14 +170,12 @@ static void hmm_release(struct mmu_notifier *mn, struct mm_struct *mm) struct hmm_mirror, list); } up_write(&hmm->mirrors_sem); - - hmm_put(hmm); } static int hmm_invalidate_range_start(struct mmu_notifier *mn, const struct mmu_notifier_range *nrange) { - struct hmm *hmm = mm_get_hmm(nrange->mm); + struct hmm *hmm = nrange->mm->hmm; struct hmm_mirror *mirror; struct hmm_update update; struct hmm_range *range; @@ -238,14 +219,13 @@ static int hmm_invalidate_range_start(struct mmu_notifier *mn, up_read(&hmm->mirrors_sem); out: - hmm_put(hmm); return ret; } static void hmm_invalidate_range_end(struct mmu_notifier *mn, const struct mmu_notifier_range *nrange) { - struct hmm *hmm = mm_get_hmm(nrange->mm); + struct hmm *hmm = nrange->mm->hmm; VM_BUG_ON(!hmm); @@ -262,8 +242,6 @@ static void hmm_invalidate_range_end(struct mmu_notifier *mn, wake_up_all(&hmm->wq); } mutex_unlock(&hmm->lock); - - hmm_put(hmm); } static const struct mmu_notifier_ops hmm_mmu_notifier_ops = { @@ -931,20 +909,14 @@ int hmm_range_register(struct hmm_range *range, return -EINVAL; if (start >= end) return -EINVAL; + hmm = mm_get_hmm(mm); + if (!hmm) + return -EFAULT; range->page_shift = page_shift; range->start = start; range->end = end; - - range->hmm = mm_get_hmm(mm); - if (!range->hmm) - return -EFAULT; - - /* Check if hmm_mm_destroy() was call. */ - if (range->hmm->mm == NULL || range->hmm->dead) { - hmm_put(range->hmm); - return -EFAULT; - } + range->hmm = hmm; /* Initialize range to track CPU page table updates. */ mutex_lock(&range->hmm->lock); -- 2.20.1
