[PATCH v4] IB/umem: Release pid in error and ODP flow

[PATCH v4] IB/umem: Release pid in error and ODP flow

[Kenneth Lee]

1. Release pid before enter odp flow
2. Release pid when fail to allocate memory

Fixes: 87773dd56d54 ("IB: ib_umem_release() should decrement mm->pinned_vm from ib_umem_get")
Fixes: 8ada2c1c0c1d ("IB/core: Add support for on demand paging regions")
Signed-off-by: Kenneth Lee <liguozhu@hisilicon.com>
Reviewed-by: Haggai Eran <haggaie@mellanox.com>
---
Change from v1 to v2:
  Correcting the patch title and description  
Change from v2 to v3:
  Update the title and add "Fixes" fields in the description  
Change from v3 to v4:
  Keep the Fixes tag at the end of the description

 drivers/infiniband/core/umem.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 1e62a5f0cb28..4609b921f899 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -134,6 +134,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 		 IB_ACCESS_REMOTE_ATOMIC | IB_ACCESS_MW_BIND));
 
 	if (access & IB_ACCESS_ON_DEMAND) {
+		put_pid(umem->pid);
 		ret = ib_umem_odp_get(context, umem);
 		if (ret) {
 			kfree(umem);
@@ -149,6 +150,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 
 	page_list = (struct page **) __get_free_page(GFP_KERNEL);
 	if (!page_list) {
+		put_pid(umem->pid);
 		kfree(umem);
 		return ERR_PTR(-ENOMEM);
 	}
-- 
1.9.1

Re: [PATCH v4] IB/umem: Release pid in error and ODP flow

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 500 bytes --]

On Thu, Jan 05, 2017 at 03:00:05PM +0800, Kenneth Lee wrote:
> 1. Release pid before enter odp flow
> 2. Release pid when fail to allocate memory
>
> Fixes: 87773dd56d54 ("IB: ib_umem_release() should decrement mm->pinned_vm from ib_umem_get")
> Fixes: 8ada2c1c0c1d ("IB/core: Add support for on demand paging regions")
> Signed-off-by: Kenneth Lee <liguozhu@hisilicon.com>
> Reviewed-by: Haggai Eran <haggaie@mellanox.com>

Thanks a lot for resending.
Reviewed-by: Leon Romanovsky <leon@kernel.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v4] IB/umem: Release pid in error and ODP flow

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 897 bytes --]

On Thu, 2017-01-05 at 08:39 +0200, Leon Romanovsky wrote:
> On Thu, Jan 05, 2017 at 03:00:05PM +0800, Kenneth Lee wrote:
> > 
> > 1. Release pid before enter odp flow
> > 2. Release pid when fail to allocate memory
> > 
> > Fixes: 87773dd56d54 ("IB: ib_umem_release() should decrement mm-
> > >pinned_vm from ib_umem_get")
> > Fixes: 8ada2c1c0c1d ("IB/core: Add support for on demand paging
> > regions")
> > Signed-off-by: Kenneth Lee <liguozhu-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
> > Reviewed-by: Haggai Eran <haggaie-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> 
> Thanks a lot for resending.
> Reviewed-by: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Thanks, applied.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG KeyID: B826A3330E572FDD
   
Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]