On Thu, Oct 20, 2016 at 02:03:49PM +1100, Alexey Kardashevskiy wrote: > In some situations the userspace memory context may live longer than > the userspace process itself so if we need to do proper memory context > cleanup, we better cache @mm and use it later when the process is gone > (@current or @current->mm is NULL). > > This references mm and stores the pointer in the container; this is done > when a container is just created so checking for !current->mm in other > places becomes pointless. > > This replaces current->mm with container->mm everywhere except debug > prints. > > This adds a check that current->mm is the same as the one stored in > the container to prevent userspace from registering memory in other > processes. > > Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> > --- > drivers/vfio/vfio_iommu_spapr_tce.c | 127 > ++++++++++++++++++++---------------- > 1 file changed, 71 insertions(+), 56 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c > b/drivers/vfio/vfio_iommu_spapr_tce.c > index d0c38b2..6b0b121 100644 > --- a/drivers/vfio/vfio_iommu_spapr_tce.c > +++ b/drivers/vfio/vfio_iommu_spapr_tce.c > @@ -31,49 +31,46 @@ > static void tce_iommu_detach_group(void *iommu_data, > struct iommu_group *iommu_group); > > -static long try_increment_locked_vm(long npages) > +static long try_increment_locked_vm(struct mm_struct *mm, long npages) > { > long ret = 0, locked, lock_limit; > > - if (!current || !current->mm) > - return -ESRCH; /* process exited */ > - > if (!npages) > return 0; > > - down_write(¤t->mm->mmap_sem); > - locked = current->mm->locked_vm + npages; > + down_write(&mm->mmap_sem); > + locked = mm->locked_vm + npages; > lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT; > if (locked > lock_limit && !capable(CAP_IPC_LOCK)) > ret = -ENOMEM; > else > - current->mm->locked_vm += npages; > + mm->locked_vm += npages; > > pr_debug("[%d] RLIMIT_MEMLOCK +%ld %ld/%ld%s\n", current->pid, > npages << PAGE_SHIFT, > - current->mm->locked_vm << PAGE_SHIFT, > + mm->locked_vm << PAGE_SHIFT, > rlimit(RLIMIT_MEMLOCK), > ret ? " - exceeded" : ""); > > - up_write(¤t->mm->mmap_sem); > + up_write(&mm->mmap_sem); > > return ret; > } > > -static void decrement_locked_vm(long npages) > +static void decrement_locked_vm(struct mm_struct *mm, long npages) > { > - if (!current || !current->mm || !npages) > + if (!mm || !npages) > return; /* process exited */ > > - down_write(¤t->mm->mmap_sem); > - if (WARN_ON_ONCE(npages > current->mm->locked_vm)) > - npages = current->mm->locked_vm; > - current->mm->locked_vm -= npages; > + down_write(&mm->mmap_sem); > + if (WARN_ON_ONCE(npages > mm->locked_vm)) > + npages = mm->locked_vm; > + mm->locked_vm -= npages; > pr_debug("[%d] RLIMIT_MEMLOCK -%ld %ld/%ld\n", current->pid, > npages << PAGE_SHIFT, > - current->mm->locked_vm << PAGE_SHIFT, > + mm->locked_vm << PAGE_SHIFT, > rlimit(RLIMIT_MEMLOCK)); > - up_write(¤t->mm->mmap_sem); > + up_write(&mm->mmap_sem); > } > > /* > @@ -98,6 +95,7 @@ struct tce_container { > bool enabled; > bool v2; > unsigned long locked_pages; > + struct mm_struct *mm; > struct iommu_table *tables[IOMMU_TABLE_GROUP_MAX_TABLES]; > struct list_head group_list; > }; > @@ -113,11 +111,11 @@ static long tce_iommu_unregister_pages(struct > tce_container *container, > if ((vaddr & ~PAGE_MASK) || (size & ~PAGE_MASK)) > return -EINVAL; > > - mem = mm_iommu_find(current->mm, vaddr, size >> PAGE_SHIFT); > + mem = mm_iommu_find(container->mm, vaddr, size >> PAGE_SHIFT); > if (!mem) > return -ENOENT; > > - return mm_iommu_put(current->mm, mem); > + return mm_iommu_put(container->mm, mem); > } > > static long tce_iommu_register_pages(struct tce_container *container, > @@ -134,7 +132,7 @@ static long tce_iommu_register_pages(struct tce_container > *container, > ((vaddr + size) < vaddr)) > return -EINVAL; > > - ret = mm_iommu_get(current->mm, vaddr, entries, &mem); > + ret = mm_iommu_get(container->mm, vaddr, entries, &mem); > if (ret) > return ret; > > @@ -143,7 +141,8 @@ static long tce_iommu_register_pages(struct tce_container > *container, > return 0; > } > > -static long tce_iommu_userspace_view_alloc(struct iommu_table *tbl) > +static long tce_iommu_userspace_view_alloc(struct iommu_table *tbl, > + struct mm_struct *mm) > { > unsigned long cb = _ALIGN_UP(sizeof(tbl->it_userspace[0]) * > tbl->it_size, PAGE_SIZE); > @@ -152,13 +151,13 @@ static long tce_iommu_userspace_view_alloc(struct > iommu_table *tbl) > > BUG_ON(tbl->it_userspace); > > - ret = try_increment_locked_vm(cb >> PAGE_SHIFT); > + ret = try_increment_locked_vm(mm, cb >> PAGE_SHIFT); > if (ret) > return ret; > > uas = vzalloc(cb); > if (!uas) { > - decrement_locked_vm(cb >> PAGE_SHIFT); > + decrement_locked_vm(mm, cb >> PAGE_SHIFT); > return -ENOMEM; > } > tbl->it_userspace = uas; > @@ -166,7 +165,8 @@ static long tce_iommu_userspace_view_alloc(struct > iommu_table *tbl) > return 0; > } > > -static void tce_iommu_userspace_view_free(struct iommu_table *tbl) > +static void tce_iommu_userspace_view_free(struct iommu_table *tbl, > + struct mm_struct *mm) > { > unsigned long cb = _ALIGN_UP(sizeof(tbl->it_userspace[0]) * > tbl->it_size, PAGE_SIZE); > @@ -176,7 +176,7 @@ static void tce_iommu_userspace_view_free(struct > iommu_table *tbl) > > vfree(tbl->it_userspace); > tbl->it_userspace = NULL; > - decrement_locked_vm(cb >> PAGE_SHIFT); > + decrement_locked_vm(mm, cb >> PAGE_SHIFT); > } > > static bool tce_page_is_contained(struct page *page, unsigned page_shift) > @@ -236,9 +236,6 @@ static int tce_iommu_enable(struct tce_container > *container) > struct iommu_table_group *table_group; > struct tce_iommu_group *tcegrp; > > - if (!current->mm) > - return -ESRCH; /* process exited */ > - > if (container->enabled) > return -EBUSY; > > @@ -284,7 +281,7 @@ static int tce_iommu_enable(struct tce_container > *container) > return -EPERM; > > locked = table_group->tce32_size >> PAGE_SHIFT; > - ret = try_increment_locked_vm(locked); > + ret = try_increment_locked_vm(container->mm, locked); > if (ret) > return ret; > > @@ -302,10 +299,7 @@ static void tce_iommu_disable(struct tce_container > *container) > > container->enabled = false; > > - if (!current->mm) > - return; > - > - decrement_locked_vm(container->locked_pages); > + decrement_locked_vm(container->mm, container->locked_pages); > } > > static void *tce_iommu_open(unsigned long arg) > @@ -317,6 +311,9 @@ static void *tce_iommu_open(unsigned long arg) > return ERR_PTR(-EINVAL); > } > > + if (!current->mm) > + return ERR_PTR(-ESRCH); /* process exited */ > + > container = kzalloc(sizeof(*container), GFP_KERNEL); > if (!container) > return ERR_PTR(-ENOMEM); > @@ -326,13 +323,17 @@ static void *tce_iommu_open(unsigned long arg) > > container->v2 = arg == VFIO_SPAPR_TCE_v2_IOMMU; > > + container->mm = current->mm; > + atomic_inc(&container->mm->mm_count); > + > return container; > } > > static int tce_iommu_clear(struct tce_container *container, > struct iommu_table *tbl, > unsigned long entry, unsigned long pages); > -static void tce_iommu_free_table(struct iommu_table *tbl); > +static void tce_iommu_free_table(struct tce_container *container, > + struct iommu_table *tbl); > > static void tce_iommu_release(void *iommu_data) > { > @@ -357,10 +358,19 @@ static void tce_iommu_release(void *iommu_data) > continue; > > tce_iommu_clear(container, tbl, tbl->it_offset, tbl->it_size); > - tce_iommu_free_table(tbl); > + tce_iommu_free_table(container, tbl); > + } > + > + while (!list_empty(&container->prereg_list)) {
Uuh.. I think this breaks bisection. The container->prereg_list is only added in the next patch. > + struct tce_iommu_prereg *tcemem; > + > + tcemem = list_first_entry(&container->prereg_list, > + struct tce_iommu_prereg, next); > + tce_iommu_prereg_free(container, tcemem); > } > > tce_iommu_disable(container); > + mmdrop(container->mm); > mutex_destroy(&container->lock); > > kfree(container); > @@ -375,13 +385,14 @@ static void tce_iommu_unuse_page(struct tce_container > *container, > put_page(page); > } > > -static int tce_iommu_prereg_ua_to_hpa(unsigned long tce, unsigned long size, > +static int tce_iommu_prereg_ua_to_hpa(struct tce_container *container, > + unsigned long tce, unsigned long size, > unsigned long *phpa, struct mm_iommu_table_group_mem_t **pmem) > { > long ret = 0; > struct mm_iommu_table_group_mem_t *mem; > > - mem = mm_iommu_lookup(current->mm, tce, size); > + mem = mm_iommu_lookup(container->mm, tce, size); > if (!mem) > return -EINVAL; > > @@ -394,18 +405,18 @@ static int tce_iommu_prereg_ua_to_hpa(unsigned long > tce, unsigned long size, > return 0; > } > > -static void tce_iommu_unuse_page_v2(struct iommu_table *tbl, > - unsigned long entry) > +static void tce_iommu_unuse_page_v2(struct tce_container *container, > + struct iommu_table *tbl, unsigned long entry) > { > struct mm_iommu_table_group_mem_t *mem = NULL; > int ret; > unsigned long hpa = 0; > unsigned long *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl, entry); > > - if (!pua || !current || !current->mm) > + if (!pua) > return; > > - ret = tce_iommu_prereg_ua_to_hpa(*pua, IOMMU_PAGE_SIZE(tbl), > + ret = tce_iommu_prereg_ua_to_hpa(container, *pua, IOMMU_PAGE_SIZE(tbl), > &hpa, &mem); > if (ret) > pr_debug("%s: tce %lx at #%lx was not cached, ret=%d\n", > @@ -435,7 +446,7 @@ static int tce_iommu_clear(struct tce_container > *container, > continue; > > if (container->v2) { > - tce_iommu_unuse_page_v2(tbl, entry); > + tce_iommu_unuse_page_v2(container, tbl, entry); > continue; > } > > @@ -515,13 +526,16 @@ static long tce_iommu_build_v2(struct tce_container > *container, > unsigned long hpa; > enum dma_data_direction dirtmp; > > + if (container->mm != current->mm) > + return -ESRCH; > + > for (i = 0; i < pages; ++i) { > struct mm_iommu_table_group_mem_t *mem = NULL; > unsigned long *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl, > entry + i); > > - ret = tce_iommu_prereg_ua_to_hpa(tce, IOMMU_PAGE_SIZE(tbl), > - &hpa, &mem); > + ret = tce_iommu_prereg_ua_to_hpa(container, > + tce, IOMMU_PAGE_SIZE(tbl), &hpa, &mem); > if (ret) > break; > > @@ -542,7 +556,7 @@ static long tce_iommu_build_v2(struct tce_container > *container, > ret = iommu_tce_xchg(tbl, entry + i, &hpa, &dirtmp); > if (ret) { > /* dirtmp cannot be DMA_NONE here */ > - tce_iommu_unuse_page_v2(tbl, entry + i); > + tce_iommu_unuse_page_v2(container, tbl, entry + i); > pr_err("iommu_tce: %s failed ioba=%lx, tce=%lx, > ret=%ld\n", > __func__, entry << tbl->it_page_shift, > tce, ret); > @@ -550,7 +564,7 @@ static long tce_iommu_build_v2(struct tce_container > *container, > } > > if (dirtmp != DMA_NONE) > - tce_iommu_unuse_page_v2(tbl, entry + i); > + tce_iommu_unuse_page_v2(container, tbl, entry + i); > > *pua = tce; > > @@ -578,7 +592,7 @@ static long tce_iommu_create_table(struct tce_container > *container, > if (!table_size) > return -EINVAL; > > - ret = try_increment_locked_vm(table_size >> PAGE_SHIFT); > + ret = try_increment_locked_vm(container->mm, table_size >> PAGE_SHIFT); > if (ret) > return ret; > > @@ -589,24 +603,25 @@ static long tce_iommu_create_table(struct tce_container > *container, > WARN_ON(!ret && ((*ptbl)->it_allocated_size != table_size)); > > if (!ret && container->v2) { > - ret = tce_iommu_userspace_view_alloc(*ptbl); > + ret = tce_iommu_userspace_view_alloc(*ptbl, container->mm); > if (ret) > (*ptbl)->it_ops->free(*ptbl); > } > > if (ret) > - decrement_locked_vm(table_size >> PAGE_SHIFT); > + decrement_locked_vm(container->mm, table_size >> PAGE_SHIFT); > > return ret; > } > > -static void tce_iommu_free_table(struct iommu_table *tbl) > +static void tce_iommu_free_table(struct tce_container *container, > + struct iommu_table *tbl) > { > unsigned long pages = tbl->it_allocated_size >> PAGE_SHIFT; > > - tce_iommu_userspace_view_free(tbl); > + tce_iommu_userspace_view_free(tbl, container->mm); > tbl->it_ops->free(tbl); > - decrement_locked_vm(pages); > + decrement_locked_vm(container->mm, pages); > } > > static long tce_iommu_create_window(struct tce_container *container, > @@ -669,7 +684,7 @@ static long tce_iommu_create_window(struct tce_container > *container, > table_group = iommu_group_get_iommudata(tcegrp->grp); > table_group->ops->unset_window(table_group, num); > } > - tce_iommu_free_table(tbl); > + tce_iommu_free_table(container, tbl); > > return ret; > } > @@ -707,7 +722,7 @@ static long tce_iommu_remove_window(struct tce_container > *container, > > /* Free table */ > tce_iommu_clear(container, tbl, tbl->it_offset, tbl->it_size); > - tce_iommu_free_table(tbl); > + tce_iommu_free_table(container, tbl); > container->tables[num] = NULL; > > return 0; > @@ -1049,7 +1064,7 @@ static void tce_iommu_release_ownership(struct > tce_container *container, > continue; > > tce_iommu_clear(container, tbl, tbl->it_offset, tbl->it_size); > - tce_iommu_userspace_view_free(tbl); > + tce_iommu_userspace_view_free(tbl, container->mm); > if (tbl->it_map) > iommu_release_ownership(tbl); > > @@ -1068,7 +1083,7 @@ static int tce_iommu_take_ownership(struct > tce_container *container, > if (!tbl || !tbl->it_map) > continue; > > - rc = tce_iommu_userspace_view_alloc(tbl); > + rc = tce_iommu_userspace_view_alloc(tbl, container->mm); > if (!rc) > rc = iommu_take_ownership(tbl); > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature