RDMA: Remove a few extra calls to ib_get_client_data()

Commit Message

Jason Gunthorpe April 7, 2020, 11:20 p.m. UTC

From: Jason Gunthorpe <[e-mail]>

These four places already have easy access to the client data, just use
that instead.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 drivers/infiniband/core/sa_query.c    | 15 ++++++---------
 drivers/infiniband/core/user_mad.c    |  3 +--
 drivers/infiniband/ulp/srpt/ib_srpt.c |  7 ++-----
 net/smc/smc_ib.c                      |  3 +--
 4 files changed, 10 insertions(+), 18 deletions(-)

Comments

Ursula Braun April 8, 2020, 7:17 a.m. UTC | #1

On 4/8/20 1:20 AM, Jason Gunthorpe wrote:
> From: Jason Gunthorpe <[e-mail]>
> 
> These four places already have easy access to the client data, just use
> that instead.
> 
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> ---
>  drivers/infiniband/core/sa_query.c    | 15 ++++++---------
>  drivers/infiniband/core/user_mad.c    |  3 +--
>  drivers/infiniband/ulp/srpt/ib_srpt.c |  7 ++-----
>  net/smc/smc_ib.c                      |  3 +--
>  4 files changed, 10 insertions(+), 18 deletions(-)
> 

For the net/smc part:
Acked-by: Ursula Braun <[e-mail]>

Jason Gunthorpe April 14, 2020, 7:31 p.m. UTC | #2

On Tue, Apr 07, 2020 at 08:20:09PM -0300, Jason Gunthorpe wrote:
> From: Jason Gunthorpe <[e-mail]>
> 
> These four places already have easy access to the client data, just use
> that instead.
> 
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> Acked-by: Ursula Braun <[e-mail]>
> ---
>  drivers/infiniband/core/sa_query.c    | 15 ++++++---------
>  drivers/infiniband/core/user_mad.c    |  3 +--
>  drivers/infiniband/ulp/srpt/ib_srpt.c |  7 ++-----
>  net/smc/smc_ib.c                      |  3 +--
>  4 files changed, 10 insertions(+), 18 deletions(-)

Applied to rdma for-next

Jason

Patch

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 74e0058fcf9e1d..2dd326f2beed0d 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -1412,17 +1412,13 @@  void ib_sa_pack_path(struct sa_path_rec *rec, void *attribute)
 EXPORT_SYMBOL(ib_sa_pack_path);
 
 static bool ib_sa_opa_pathrecord_support(struct ib_sa_client *client,
-					 struct ib_device *device,
+					 struct ib_sa_device *sa_dev,
 					 u8 port_num)
 {
-	struct ib_sa_device *sa_dev = ib_get_client_data(device, &sa_client);
 	struct ib_sa_port *port;
 	unsigned long flags;
 	bool ret = false;
 
-	if (!sa_dev)
-		return ret;
-
 	port = &sa_dev->port[port_num - sa_dev->start_port];
 	spin_lock_irqsave(&port->classport_lock, flags);
 	if (!port->classport_info.valid)
@@ -1450,8 +1446,8 @@  enum opa_pr_supported {
  * query is possible.
  */
 static int opa_pr_query_possible(struct ib_sa_client *client,
-				 struct ib_device *device,
-				 u8 port_num,
+				 struct ib_sa_device *sa_dev,
+				 struct ib_device *device, u8 port_num,
 				 struct sa_path_rec *rec)
 {
 	struct ib_port_attr port_attr;
@@ -1459,7 +1455,7 @@  static int opa_pr_query_possible(struct ib_sa_client *client,
 	if (ib_query_port(device, port_num, &port_attr))
 		return PR_NOT_SUPPORTED;
 
-	if (ib_sa_opa_pathrecord_support(client, device, port_num))
+	if (ib_sa_opa_pathrecord_support(client, sa_dev, port_num))
 		return PR_OPA_SUPPORTED;
 
 	if (port_attr.lid >= be16_to_cpu(IB_MULTICAST_LID_BASE))
@@ -1574,7 +1570,8 @@  int ib_sa_path_rec_get(struct ib_sa_client *client,
 
 	query->sa_query.port     = port;
 	if (rec->rec_type == SA_PATH_REC_TYPE_OPA) {
-		status = opa_pr_query_possible(client, device, port_num, rec);
+		status = opa_pr_query_possible(client, sa_dev, device, port_num,
+					       rec);
 		if (status == PR_NOT_SUPPORTED) {
 			ret = -EINVAL;
 			goto err1;
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 1235ffb2389b1c..7f1bd34c239c7f 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1154,8 +1154,7 @@  MODULE_ALIAS_RDMA_CLIENT("umad");
 static int ib_issm_get_nl_info(struct ib_device *ibdev, void *client_data,
 			       struct ib_client_nl_info *res)
 {
-	struct ib_umad_device *umad_dev =
-		ib_get_client_data(ibdev, &umad_client);
+	struct ib_umad_device *umad_dev = client_data;
 
 	if (!rdma_is_port_valid(ibdev, res->port))
 		return -EINVAL;
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 98552749d71cbd..9d02d8088f1c26 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -135,14 +135,11 @@  static bool srpt_set_ch_state(struct srpt_rdma_ch *ch, enum rdma_ch_state new)
 static void srpt_event_handler(struct ib_event_handler *handler,
 			       struct ib_event *event)
 {
-	struct srpt_device *sdev;
+	struct srpt_device *sdev =
+		container_of(handler, struct srpt_device, event_handler);
 	struct srpt_port *sport;
 	u8 port_num;
 
-	sdev = ib_get_client_data(event->device, &srpt_client);
-	if (!sdev || sdev->device != event->device)
-		return;
-
 	pr_debug("ASYNC event= %d on device= %s\n", event->event,
 		 dev_name(&sdev->device->dev));
 
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index d6ba186f67e2aa..995313e3f6ffed 100644
--- a/net/smc/smc_ib.c
+++ b/net/smc/smc_ib.c
@@ -570,9 +570,8 @@  static void smc_ib_add_dev(struct ib_device *ibdev)
 /* callback function for ib_unregister_client() */
 static void smc_ib_remove_dev(struct ib_device *ibdev, void *client_data)
 {
-	struct smc_ib_device *smcibdev;
+	struct smc_ib_device *smcibdev = client_data;
 
-	smcibdev = ib_get_client_data(ibdev, &smc_ib_client);
 	if (!smcibdev || smcibdev->ibdev != ibdev)
 		return;
 	ib_set_client_data(ibdev, &smc_ib_client, NULL);