Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 969a60f9 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/srp: Remove use of cached P_Key/GID queries 



The SRP initiator is currently using ib_find_cached_pkey() and
ib_get_cached_gid() in situations where the uncached ib_find_pkey()
and ib_query_gid() functions serve just as well: sleeping is allowed
and performance is not an issue.  Since we want to eliminate the
cached operations in the long term, convert SRP to use the uncached
variants.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 50515af2

drivers/infiniband/ulp/srp/ib_srp.c

+5 −8
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
#include <scsi/srp.h>

#include <scsi/scsi_transport_srp.h>



#include <rdma/ib_cache.h>



#include "ib_srp.h"



#define DRV_NAME	"ib_srp"
@@ -183,7 +181,7 @@ static int srp_init_qp(struct srp_target_port *target, 
	if (!attr)

		return -ENOMEM;



	ret = ib_find_cached_pkey(target->srp_host->srp_dev->dev,

	ret = ib_find_pkey(target->srp_host->srp_dev->dev,

			   target->srp_host->port,

			   be16_to_cpu(target->path.pkey),

			   &attr->pkey_index);
@@ -1883,8 +1881,7 @@ static ssize_t srp_create_target(struct device *dev, 
	if (ret)

		goto err;



	ib_get_cached_gid(host->srp_dev->dev, host->port, 0,

			  &target->path.sgid);

	ib_query_gid(host->srp_dev->dev, host->port, 0, &target->path.sgid);



	shost_printk(KERN_DEBUG, target->scsi_host, PFX

		     "new target: id_ext %016llx ioc_guid %016llx pkey %04x "