Commit 4a061b28 authored by Or Gerlitz's avatar Or Gerlitz Committed by Doug Ledford
Browse files

IB/ulps: Avoid calling ib_query_device 



Instead, use the cached copy of the attributes present on the device.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 86bee4c9

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+6 −13
Original line number Diff line number Diff line
@@ -1522,8 +1522,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge) 
int ipoib_cm_dev_init(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	int i, ret;

	struct ib_device_attr attr;

	int max_srq_sge, i;



	INIT_LIST_HEAD(&priv->cm.passive_ids);

	INIT_LIST_HEAD(&priv->cm.reap_list);
@@ -1540,19 +1539,13 @@ int ipoib_cm_dev_init(struct net_device *dev) 


	skb_queue_head_init(&priv->cm.skb_queue);



	ret = ib_query_device(priv->ca, &attr);

	if (ret) {

		printk(KERN_WARNING "ib_query_device() failed with %d\n", ret);

		return ret;

	}



	ipoib_dbg(priv, "max_srq_sge=%d\n", attr.max_srq_sge);

	ipoib_dbg(priv, "max_srq_sge=%d\n", priv->ca->attrs.max_srq_sge);



	attr.max_srq_sge = min_t(int, IPOIB_CM_RX_SG, attr.max_srq_sge);

	ipoib_cm_create_srq(dev, attr.max_srq_sge);

	max_srq_sge = min_t(int, IPOIB_CM_RX_SG, priv->ca->attrs.max_srq_sge);

	ipoib_cm_create_srq(dev, max_srq_sge);

	if (ipoib_cm_has_srq(dev)) {

		priv->cm.max_cm_mtu = attr.max_srq_sge * PAGE_SIZE - 0x10;

		priv->cm.num_frags  = attr.max_srq_sge;

		priv->cm.max_cm_mtu = max_srq_sge * PAGE_SIZE - 0x10;

		priv->cm.num_frags  = max_srq_sge;

		ipoib_dbg(priv, "max_cm_mtu = 0x%x, num_frags=%d\n",

			  priv->cm.max_cm_mtu, priv->cm.num_frags);

	} else {

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+5 −9
Original line number Diff line number Diff line
@@ -40,15 +40,11 @@ static void ipoib_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *drvinfo)

{

	struct ipoib_dev_priv *priv = netdev_priv(netdev);

	struct ib_device_attr *attr;



	attr = kmalloc(sizeof(*attr), GFP_KERNEL);

	if (attr && !ib_query_device(priv->ca, attr))

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

			 "%d.%d.%d", (int)(attr->fw_ver >> 32),

			 (int)(attr->fw_ver >> 16) & 0xffff,

			 (int)attr->fw_ver & 0xffff);

	kfree(attr);

		 "%d.%d.%d", (int)(priv->ca->attrs.fw_ver >> 32),

		 (int)(priv->ca->attrs.fw_ver >> 16) & 0xffff,

		 (int)priv->ca->attrs.fw_ver & 0xffff);



	strlcpy(drvinfo->bus_info, dev_name(priv->ca->dma_device),

		sizeof(drvinfo->bus_info));

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −20
Original line number Diff line number Diff line
@@ -1777,26 +1777,7 @@ int ipoib_add_pkey_attr(struct net_device *dev) 


int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)

{

	struct ib_device_attr *device_attr;

	int result = -ENOMEM;



	device_attr = kmalloc(sizeof *device_attr, GFP_KERNEL);

	if (!device_attr) {

		printk(KERN_WARNING "%s: allocation of %zu bytes failed\n",

		       hca->name, sizeof *device_attr);

		return result;

	}



	result = ib_query_device(hca, device_attr);

	if (result) {

		printk(KERN_WARNING "%s: ib_query_device failed (ret = %d)\n",

		       hca->name, result);

		kfree(device_attr);

		return result;

	}

	priv->hca_caps = device_attr->device_cap_flags;



	kfree(device_attr);

	priv->hca_caps = hca->attrs.device_cap_flags;



	if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {

		priv->dev->hw_features = NETIF_F_SG |

drivers/infiniband/ulp/iser/iscsi_iser.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 


		ib_conn = &iser_conn->ib_conn;

		if (ib_conn->pi_support) {

			u32 sig_caps = ib_conn->device->dev_attr.sig_prot_cap;

			u32 sig_caps = ib_conn->device->ib_device->attrs.sig_prot_cap;



			scsi_host_set_prot(shost, iser_dif_prot_caps(sig_caps));

			scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP |
@@ -656,7 +656,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 
		 * max fastreg page list length.

		 */

		shost->sg_tablesize = min_t(unsigned short, shost->sg_tablesize,

			ib_conn->device->dev_attr.max_fast_reg_page_list_len);

			ib_conn->device->ib_device->attrs.max_fast_reg_page_list_len);

		shost->max_sectors = min_t(unsigned int,

			1024, (shost->sg_tablesize * PAGE_SIZE) >> 9);

drivers/infiniband/ulp/iser/iscsi_iser.h

+0 −2
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ struct iser_reg_ops { 
 *

 * @ib_device:     RDMA device

 * @pd:            Protection Domain for this device

 * @dev_attr:      Device attributes container

 * @mr:            Global DMA memory region

 * @event_handler: IB events handle routine

 * @ig_list:	   entry in devices list
@@ -393,7 +392,6 @@ struct iser_reg_ops { 
struct iser_device {

	struct ib_device             *ib_device;

	struct ib_pd	             *pd;

	struct ib_device_attr	     dev_attr;

	struct ib_mr	             *mr;

	struct ib_event_handler      event_handler;

	struct list_head             ig_list;

CRA Git | Maintained and supported by SUSTech CRA and CCSE