xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/srpt: Introduce a reference count in struct srpt_device

Browse Source 
[ Upstream commit aa7dfbb41b5a60ab90e244d6f586b8cb5c791c3e ]

This will be used to keep struct srpt_device around as long as either the
RDMA port exists or a LIO target port is associated with the struct
srpt_device.

Link: https://lore.kernel.org/r/20220727193415.1583860-3-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bart Van Assche
2022-07-27 12:34:14 -07:00
committed by Greg Kroah-Hartman
parent 204a8486d7
commit d14a44cf29
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@@ -3101,6 +3101,18 @@ static int srpt_use_srq(struct srpt_device *sdev, bool use_srq)
return ret; return ret;
} }
static void srpt_free_sdev(struct kref *refcnt)
{
struct srpt_device *sdev = container_of(refcnt, typeof(*sdev), refcnt);
kfree(sdev);
}
static void srpt_sdev_put(struct srpt_device *sdev)
{
kref_put(&sdev->refcnt, srpt_free_sdev);
}
/** /**
* srpt_add_one - InfiniBand device addition callback function * srpt_add_one - InfiniBand device addition callback function
* @device: Describes a HCA. * @device: Describes a HCA.
@@ -3118,6 +3130,7 @@ static int srpt_add_one(struct ib_device *device)
if (!sdev) if (!sdev)
return -ENOMEM; return -ENOMEM;
kref_init(&sdev->refcnt);
sdev->device = device; sdev->device = device;
mutex_init(&sdev->sdev_mutex); mutex_init(&sdev->sdev_mutex);
@@ -3213,7 +3226,7 @@ err_ring:
srpt_free_srq(sdev); srpt_free_srq(sdev);
ib_dealloc_pd(sdev->pd); ib_dealloc_pd(sdev->pd);
free_dev: free_dev:
kfree(sdev); srpt_sdev_put(sdev);
pr_info("%s(%s) failed.\n", __func__, dev_name(&device->dev)); pr_info("%s(%s) failed.\n", __func__, dev_name(&device->dev));
return ret; return ret;
} }
@@ -3257,7 +3270,7 @@ static void srpt_remove_one(struct ib_device *device, void *client_data)
ib_dealloc_pd(sdev->pd); ib_dealloc_pd(sdev->pd);
kfree(sdev); srpt_sdev_put(sdev);
} }
static struct ib_client srpt_client = { static struct ib_client srpt_client = {

2
drivers/infiniband/ulp/srpt/ib_srpt.h
View File

@@ -434,6 +434,7 @@ struct srpt_port {
/** /**
* struct srpt_device - information associated by SRPT with a single HCA * struct srpt_device - information associated by SRPT with a single HCA
* @refcnt: Reference count for this device.
* @device: Backpointer to the struct ib_device managed by the IB core. * @device: Backpointer to the struct ib_device managed by the IB core.
* @pd: IB protection domain. * @pd: IB protection domain.
* @lkey: L_Key (local key) with write access to all local memory. * @lkey: L_Key (local key) with write access to all local memory.
@@ -449,6 +450,7 @@ struct srpt_port {
* @port: Information about the ports owned by this HCA. * @port: Information about the ports owned by this HCA.
*/ */
struct srpt_device { struct srpt_device {
struct kref refcnt;
struct ib_device *device; struct ib_device *device;
struct ib_pd *pd; struct ib_pd *pd;
u32 lkey; u32 lkey;