* merge struct ib_device_attr into struct ib_device V2
@ 2015-10-12 6:57 Christoph Hellwig
[not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-12 6:57 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb
This patch gets rid of struct ib_device_attr and cleans up drivers nicely.
It goes on top of my send_wr cleanups and the memory registration udpates
from Sagi.
Changes since V1:
- rebased on top of the Sagi's latest reg_api.6 branch
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH] IB: merge struct ib_device_attr into struct ib_device
[not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
@ 2015-10-12 6:57 ` Christoph Hellwig
2015-10-12 9:26 ` merge struct ib_device_attr into struct ib_device V2 Sagi Grimberg
2015-10-27 13:40 ` Sagi Grimberg
2 siblings, 0 replies; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-12 6:57 UTC (permalink / raw)
To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb
Avoid the need to query for device attributes and store them in a
separate structure by merging struct ib_device_attr into struct
ib_device. This matches how the device structures are used in most
Linux subsystems.
Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
drivers/infiniband/core/cm.c | 12 +-
drivers/infiniband/core/cma.c | 8 -
drivers/infiniband/core/device.c | 20 ---
drivers/infiniband/core/fmr_pool.c | 20 +--
drivers/infiniband/core/sysfs.c | 14 +-
drivers/infiniband/core/uverbs_cmd.c | 128 +++++++---------
drivers/infiniband/core/verbs.c | 8 +-
drivers/infiniband/hw/cxgb3/iwch_provider.c | 60 +++-----
drivers/infiniband/hw/cxgb4/provider.c | 64 +++-----
drivers/infiniband/hw/mlx4/main.c | 169 ++++++++++++---------
drivers/infiniband/hw/mlx5/main.c | 116 ++++++--------
drivers/infiniband/hw/mthca/mthca_provider.c | 77 +++++-----
drivers/infiniband/hw/nes/nes_verbs.c | 94 +++++-------
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 40 ++++-
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 49 ------
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 -
drivers/infiniband/hw/qib/qib_verbs.c | 86 +++++------
drivers/infiniband/hw/usnic/usnic_ib_main.c | 3 +-
drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 50 ++----
drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 4 +-
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 19 +--
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 14 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 21 +--
drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +-
drivers/infiniband/ulp/iser/iscsi_iser.h | 2 -
drivers/infiniband/ulp/iser/iser_memory.c | 9 +-
drivers/infiniband/ulp/iser/iser_verbs.c | 38 ++---
drivers/infiniband/ulp/isert/ib_isert.c | 43 ++----
drivers/infiniband/ulp/isert/ib_isert.h | 1 -
drivers/infiniband/ulp/srp/ib_srp.c | 32 ++--
drivers/infiniband/ulp/srpt/ib_srpt.c | 15 +-
drivers/infiniband/ulp/srpt/ib_srpt.h | 3 -
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 21 +--
drivers/staging/rdma/amso1100/c2.h | 3 -
drivers/staging/rdma/amso1100/c2_pd.c | 6 +-
drivers/staging/rdma/amso1100/c2_provider.c | 23 +--
drivers/staging/rdma/amso1100/c2_rnic.c | 63 +++-----
drivers/staging/rdma/ehca/ehca_hca.c | 78 +++++-----
drivers/staging/rdma/ehca/ehca_iverbs.h | 3 +-
drivers/staging/rdma/ehca/ehca_main.c | 3 +-
drivers/staging/rdma/hfi1/verbs.c | 89 +++++------
drivers/staging/rdma/ipath/ipath_verbs.c | 90 +++++------
include/rdma/ib_verbs.h | 98 ++++++------
net/rds/ib.c | 28 +---
net/rds/iw.c | 23 +--
net/sunrpc/xprtrdma/frwr_ops.c | 7 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 48 +++---
net/sunrpc/xprtrdma/verbs.c | 24 +--
net/sunrpc/xprtrdma/xprt_rdma.h | 1 -
49 files changed, 725 insertions(+), 1108 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index ea4db9c..56c7a70 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3749,16 +3749,6 @@ int ib_cm_init_qp_attr(struct ib_cm_id *cm_id,
}
EXPORT_SYMBOL(ib_cm_init_qp_attr);
-static void cm_get_ack_delay(struct cm_device *cm_dev)
-{
- struct ib_device_attr attr;
-
- if (ib_query_device(cm_dev->ib_device, &attr))
- cm_dev->ack_delay = 0; /* acks will rely on packet life time */
- else
- cm_dev->ack_delay = attr.local_ca_ack_delay;
-}
-
static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
char *buf)
{
@@ -3870,7 +3860,7 @@ static void cm_add_one(struct ib_device *ib_device)
return;
cm_dev->ib_device = ib_device;
- cm_get_ack_delay(cm_dev);
+ cm_dev->ack_delay = ib_device->local_ca_ack_delay;
cm_dev->going_down = 0;
cm_dev->device = device_create(&cm_class, &ib_device->dev,
MKDEV(0, 0), NULL,
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index b1ab13f..077c4e2 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1847,7 +1847,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
struct rdma_id_private *listen_id, *conn_id;
struct rdma_cm_event event;
int ret;
- struct ib_device_attr attr;
struct sockaddr *laddr = (struct sockaddr *)&iw_event->local_addr;
struct sockaddr *raddr = (struct sockaddr *)&iw_event->remote_addr;
@@ -1888,13 +1887,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
memcpy(cma_src_addr(conn_id), laddr, rdma_addr_size(laddr));
memcpy(cma_dst_addr(conn_id), raddr, rdma_addr_size(raddr));
- ret = ib_query_device(conn_id->id.device, &attr);
- if (ret) {
- mutex_unlock(&conn_id->handler_mutex);
- rdma_destroy_id(new_cm_id);
- goto out;
- }
-
memset(&event, 0, sizeof event);
event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
event.param.conn.private_data = iw_event->private_data;
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 1763911..cca2c70 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -89,7 +89,6 @@ static int ib_device_check_mandatory(struct ib_device *device)
size_t offset;
char *name;
} mandatory_table[] = {
- IB_MANDATORY_FUNC(query_device),
IB_MANDATORY_FUNC(query_port),
IB_MANDATORY_FUNC(query_pkey),
IB_MANDATORY_FUNC(query_gid),
@@ -628,25 +627,6 @@ void ib_dispatch_event(struct ib_event *event)
EXPORT_SYMBOL(ib_dispatch_event);
/**
- * ib_query_device - Query IB device attributes
- * @device:Device to query
- * @device_attr:Device attributes
- *
- * ib_query_device() returns the attributes of a device through the
- * @device_attr pointer.
- */
-int ib_query_device(struct ib_device *device,
- struct ib_device_attr *device_attr)
-{
- struct ib_udata uhw = {.outlen = 0, .inlen = 0};
-
- memset(device_attr, 0, sizeof(*device_attr));
-
- return device->query_device(device, device_attr, &uhw);
-}
-EXPORT_SYMBOL(ib_query_device);
-
-/**
* ib_query_port - Query IB port attributes
* @device:Device to query
* @port_num:Port number to query
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 9f5ad7c..b5b48c0 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -212,7 +212,6 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
{
struct ib_device *device;
struct ib_fmr_pool *pool;
- struct ib_device_attr *attr;
int i;
int ret;
int max_remaps;
@@ -228,25 +227,10 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
return ERR_PTR(-ENOSYS);
}
- attr = kmalloc(sizeof *attr, GFP_KERNEL);
- if (!attr) {
- printk(KERN_WARNING PFX "couldn't allocate device attr struct\n");
- return ERR_PTR(-ENOMEM);
- }
-
- ret = ib_query_device(device, attr);
- if (ret) {
- printk(KERN_WARNING PFX "couldn't query device: %d\n", ret);
- kfree(attr);
- return ERR_PTR(ret);
- }
-
- if (!attr->max_map_per_fmr)
+ if (!device->max_map_per_fmr)
max_remaps = IB_FMR_MAX_REMAPS;
else
- max_remaps = attr->max_map_per_fmr;
-
- kfree(attr);
+ max_remaps = device->max_map_per_fmr;
pool = kmalloc(sizeof *pool, GFP_KERNEL);
if (!pool) {
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 34cdd74..373a1a6 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -614,18 +614,12 @@ static ssize_t show_sys_image_guid(struct device *device,
struct device_attribute *dev_attr, char *buf)
{
struct ib_device *dev = container_of(device, struct ib_device, dev);
- struct ib_device_attr attr;
- ssize_t ret;
-
- ret = ib_query_device(dev, &attr);
- if (ret)
- return ret;
return sprintf(buf, "%04x:%04x:%04x:%04x\n",
- be16_to_cpu(((__be16 *) &attr.sys_image_guid)[0]),
- be16_to_cpu(((__be16 *) &attr.sys_image_guid)[1]),
- be16_to_cpu(((__be16 *) &attr.sys_image_guid)[2]),
- be16_to_cpu(((__be16 *) &attr.sys_image_guid)[3]));
+ be16_to_cpu(((__be16 *) &dev->sys_image_guid)[0]),
+ be16_to_cpu(((__be16 *) &dev->sys_image_guid)[1]),
+ be16_to_cpu(((__be16 *) &dev->sys_image_guid)[2]),
+ be16_to_cpu(((__be16 *) &dev->sys_image_guid)[3]));
}
static ssize_t show_node_guid(struct device *device,
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 8adb71f..5be062f 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -289,9 +289,6 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
struct ib_uverbs_get_context cmd;
struct ib_uverbs_get_context_resp resp;
struct ib_udata udata;
-#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
- struct ib_device_attr dev_attr;
-#endif
struct ib_ucontext *ucontext;
struct file *filp;
int ret;
@@ -340,10 +337,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
ucontext->odp_mrs_count = 0;
INIT_LIST_HEAD(&ucontext->no_private_counters);
- ret = ib_query_device(ib_dev, &dev_attr);
- if (ret)
- goto err_free;
- if (!(dev_attr.device_cap_flags & IB_DEVICE_ON_DEMAND_PAGING))
+ if (!(ib_dev->device_cap_flags & IB_DEVICE_ON_DEMAND_PAGING))
ucontext->invalidate_range = NULL;
#endif
@@ -393,48 +387,47 @@ err:
static void copy_query_dev_fields(struct ib_uverbs_file *file,
struct ib_device *ib_dev,
- struct ib_uverbs_query_device_resp *resp,
- struct ib_device_attr *attr)
+ struct ib_uverbs_query_device_resp *resp)
{
- resp->fw_ver = attr->fw_ver;
+ resp->fw_ver = ib_dev->fw_ver;
resp->node_guid = ib_dev->node_guid;
- resp->sys_image_guid = attr->sys_image_guid;
- resp->max_mr_size = attr->max_mr_size;
- resp->page_size_cap = attr->page_size_cap;
- resp->vendor_id = attr->vendor_id;
- resp->vendor_part_id = attr->vendor_part_id;
- resp->hw_ver = attr->hw_ver;
- resp->max_qp = attr->max_qp;
- resp->max_qp_wr = attr->max_qp_wr;
- resp->device_cap_flags = attr->device_cap_flags;
- resp->max_sge = attr->max_sge;
- resp->max_sge_rd = attr->max_sge_rd;
- resp->max_cq = attr->max_cq;
- resp->max_cqe = attr->max_cqe;
- resp->max_mr = attr->max_mr;
- resp->max_pd = attr->max_pd;
- resp->max_qp_rd_atom = attr->max_qp_rd_atom;
- resp->max_ee_rd_atom = attr->max_ee_rd_atom;
- resp->max_res_rd_atom = attr->max_res_rd_atom;
- resp->max_qp_init_rd_atom = attr->max_qp_init_rd_atom;
- resp->max_ee_init_rd_atom = attr->max_ee_init_rd_atom;
- resp->atomic_cap = attr->atomic_cap;
- resp->max_ee = attr->max_ee;
- resp->max_rdd = attr->max_rdd;
- resp->max_mw = attr->max_mw;
- resp->max_raw_ipv6_qp = attr->max_raw_ipv6_qp;
- resp->max_raw_ethy_qp = attr->max_raw_ethy_qp;
- resp->max_mcast_grp = attr->max_mcast_grp;
- resp->max_mcast_qp_attach = attr->max_mcast_qp_attach;
- resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
- resp->max_ah = attr->max_ah;
- resp->max_fmr = attr->max_fmr;
- resp->max_map_per_fmr = attr->max_map_per_fmr;
- resp->max_srq = attr->max_srq;
- resp->max_srq_wr = attr->max_srq_wr;
- resp->max_srq_sge = attr->max_srq_sge;
- resp->max_pkeys = attr->max_pkeys;
- resp->local_ca_ack_delay = attr->local_ca_ack_delay;
+ resp->sys_image_guid = ib_dev->sys_image_guid;
+ resp->max_mr_size = ib_dev->max_mr_size;
+ resp->page_size_cap = ib_dev->page_size_cap;
+ resp->vendor_id = ib_dev->vendor_id;
+ resp->vendor_part_id = ib_dev->vendor_part_id;
+ resp->hw_ver = ib_dev->hw_ver;
+ resp->max_qp = ib_dev->max_qp;
+ resp->max_qp_wr = ib_dev->max_qp_wr;
+ resp->device_cap_flags = ib_dev->device_cap_flags;
+ resp->max_sge = ib_dev->max_sge;
+ resp->max_sge_rd = ib_dev->max_sge_rd;
+ resp->max_cq = ib_dev->max_cq;
+ resp->max_cqe = ib_dev->max_cqe;
+ resp->max_mr = ib_dev->max_mr;
+ resp->max_pd = ib_dev->max_pd;
+ resp->max_qp_rd_atom = ib_dev->max_qp_rd_atom;
+ resp->max_ee_rd_atom = ib_dev->max_ee_rd_atom;
+ resp->max_res_rd_atom = ib_dev->max_res_rd_atom;
+ resp->max_qp_init_rd_atom = ib_dev->max_qp_init_rd_atom;
+ resp->max_ee_init_rd_atom = ib_dev->max_ee_init_rd_atom;
+ resp->atomic_cap = ib_dev->atomic_cap;
+ resp->max_ee = ib_dev->max_ee;
+ resp->max_rdd = ib_dev->max_rdd;
+ resp->max_mw = ib_dev->max_mw;
+ resp->max_raw_ipv6_qp = ib_dev->max_raw_ipv6_qp;
+ resp->max_raw_ethy_qp = ib_dev->max_raw_ethy_qp;
+ resp->max_mcast_grp = ib_dev->max_mcast_grp;
+ resp->max_mcast_qp_attach = ib_dev->max_mcast_qp_attach;
+ resp->max_total_mcast_qp_attach = ib_dev->max_total_mcast_qp_attach;
+ resp->max_ah = ib_dev->max_ah;
+ resp->max_fmr = ib_dev->max_fmr;
+ resp->max_map_per_fmr = ib_dev->max_map_per_fmr;
+ resp->max_srq = ib_dev->max_srq;
+ resp->max_srq_wr = ib_dev->max_srq_wr;
+ resp->max_srq_sge = ib_dev->max_srq_sge;
+ resp->max_pkeys = ib_dev->max_pkeys;
+ resp->local_ca_ack_delay = ib_dev->local_ca_ack_delay;
resp->phys_port_cnt = ib_dev->phys_port_cnt;
}
@@ -445,8 +438,6 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file,
{
struct ib_uverbs_query_device cmd;
struct ib_uverbs_query_device_resp resp;
- struct ib_device_attr attr;
- int ret;
if (out_len < sizeof resp)
return -ENOSPC;
@@ -454,12 +445,8 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file,
if (copy_from_user(&cmd, buf, sizeof cmd))
return -EFAULT;
- ret = ib_query_device(ib_dev, &attr);
- if (ret)
- return ret;
-
memset(&resp, 0, sizeof resp);
- copy_query_dev_fields(file, ib_dev, &resp, &attr);
+ copy_query_dev_fields(file, ib_dev, &resp);
if (copy_to_user((void __user *) (unsigned long) cmd.response,
&resp, sizeof resp))
@@ -984,10 +971,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
}
if (cmd.access_flags & IB_ACCESS_ON_DEMAND) {
- struct ib_device_attr attr;
-
- ret = ib_query_device(pd->device, &attr);
- if (ret || !(attr.device_cap_flags &
+ if (!(pd->device->device_cap_flags &
IB_DEVICE_ON_DEMAND_PAGING)) {
pr_debug("ODP support not available\n");
ret = -EINVAL;
@@ -3473,7 +3457,6 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
{
struct ib_uverbs_ex_query_device_resp resp;
struct ib_uverbs_ex_query_device cmd;
- struct ib_device_attr attr;
int err;
if (ucore->inlen < sizeof(cmd))
@@ -3494,26 +3477,29 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
if (ucore->outlen < resp.response_length)
return -ENOSPC;
- memset(&attr, 0, sizeof(attr));
-
- err = ib_dev->query_device(ib_dev, &attr, uhw);
- if (err)
- return err;
+ if (ib_dev->query_device) {
+ int err = ib_dev->query_device(ib_dev, uhw);
+ if (err)
+ return err;
+ } else {
+ if (uhw->inlen || uhw->outlen)
+ return -EINVAL;
+ }
- copy_query_dev_fields(file, ib_dev, &resp.base, &attr);
+ copy_query_dev_fields(file, ib_dev, &resp.base);
resp.comp_mask = 0;
if (ucore->outlen < resp.response_length + sizeof(resp.odp_caps))
goto end;
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
- resp.odp_caps.general_caps = attr.odp_caps.general_caps;
+ resp.odp_caps.general_caps = ib_dev->odp_caps.general_caps;
resp.odp_caps.per_transport_caps.rc_odp_caps =
- attr.odp_caps.per_transport_caps.rc_odp_caps;
+ ib_dev->odp_caps.per_transport_caps.rc_odp_caps;
resp.odp_caps.per_transport_caps.uc_odp_caps =
- attr.odp_caps.per_transport_caps.uc_odp_caps;
+ ib_dev->odp_caps.per_transport_caps.uc_odp_caps;
resp.odp_caps.per_transport_caps.ud_odp_caps =
- attr.odp_caps.per_transport_caps.ud_odp_caps;
+ ib_dev->odp_caps.per_transport_caps.ud_odp_caps;
resp.odp_caps.reserved = 0;
#else
memset(&resp.odp_caps, 0, sizeof(resp.odp_caps));
@@ -3523,13 +3509,13 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,
if (ucore->outlen < resp.response_length + sizeof(resp.timestamp_mask))
goto end;
- resp.timestamp_mask = attr.timestamp_mask;
+ resp.timestamp_mask = ib_dev->timestamp_mask;
resp.response_length += sizeof(resp.timestamp_mask);
if (ucore->outlen < resp.response_length + sizeof(resp.hca_core_clock))
goto end;
- resp.hca_core_clock = attr.hca_core_clock;
+ resp.hca_core_clock = ib_dev->hca_core_clock;
resp.response_length += sizeof(resp.hca_core_clock);
end:
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index ddfdd02..84f5f8e 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -226,12 +226,6 @@ EXPORT_SYMBOL(rdma_port_get_link_layer);
struct ib_pd *ib_alloc_pd(struct ib_device *device)
{
struct ib_pd *pd;
- struct ib_device_attr devattr;
- int rc;
-
- rc = ib_query_device(device, &devattr);
- if (rc)
- return ERR_PTR(rc);
pd = device->alloc_pd(device, NULL, NULL);
if (IS_ERR(pd))
@@ -242,7 +236,7 @@ struct ib_pd *ib_alloc_pd(struct ib_device *device)
pd->local_mr = NULL;
atomic_set(&pd->usecnt, 0);
- if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)
+ if (device->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)
pd->local_dma_lkey = device->local_dma_lkey;
else {
struct ib_mr *mr;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 99ae2ab..db4c08c 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -1174,43 +1174,6 @@ static u64 fw_vers_string_to_u64(struct iwch_dev *iwch_dev)
(fw_mic & 0xffff);
}
-static int iwch_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
-
- struct iwch_dev *dev;
-
- PDBG("%s ibdev %p\n", __func__, ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- dev = to_iwch_dev(ibdev);
- memset(props, 0, sizeof *props);
- memcpy(&props->sys_image_guid, dev->rdev.t3cdev_p->lldev->dev_addr, 6);
- props->hw_ver = dev->rdev.t3cdev_p->type;
- props->fw_ver = fw_vers_string_to_u64(dev);
- props->device_cap_flags = dev->device_cap_flags;
- props->page_size_cap = dev->attr.mem_pgsizes_bitmask;
- props->vendor_id = (u32)dev->rdev.rnic_info.pdev->vendor;
- props->vendor_part_id = (u32)dev->rdev.rnic_info.pdev->device;
- props->max_mr_size = dev->attr.max_mr_size;
- props->max_qp = dev->attr.max_qps;
- props->max_qp_wr = dev->attr.max_wrs;
- props->max_sge = dev->attr.max_sge_per_wr;
- props->max_sge_rd = 1;
- props->max_qp_rd_atom = dev->attr.max_rdma_reads_per_qp;
- props->max_qp_init_rd_atom = dev->attr.max_rdma_reads_per_qp;
- props->max_cq = dev->attr.max_cqs;
- props->max_cqe = dev->attr.max_cqes_per_cq;
- props->max_mr = dev->attr.max_mem_regs;
- props->max_pd = dev->attr.max_pds;
- props->local_ca_ack_delay = 0;
- props->max_fast_reg_page_list_len = T3_MAX_FASTREG_DEPTH;
-
- return 0;
-}
-
static int iwch_query_port(struct ib_device *ibdev,
u8 port, struct ib_port_attr *props)
{
@@ -1433,7 +1396,6 @@ int iwch_register_device(struct iwch_dev *dev)
dev->ibdev.phys_port_cnt = dev->rdev.port_info.nports;
dev->ibdev.num_comp_vectors = 1;
dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);
- dev->ibdev.query_device = iwch_query_device;
dev->ibdev.query_port = iwch_query_port;
dev->ibdev.query_pkey = iwch_query_pkey;
dev->ibdev.query_gid = iwch_query_gid;
@@ -1484,6 +1446,28 @@ int iwch_register_device(struct iwch_dev *dev)
dev->ibdev.iwcm->rem_ref = iwch_qp_rem_ref;
dev->ibdev.iwcm->get_qp = iwch_get_qp;
+ memcpy(&dev->ibdev.sys_image_guid,
+ dev->rdev.t3cdev_p->lldev->dev_addr, 6);
+ dev->ibdev.hw_ver = dev->rdev.t3cdev_p->type;
+ dev->ibdev.fw_ver = fw_vers_string_to_u64(dev);
+ dev->ibdev.device_cap_flags = dev->device_cap_flags;
+ dev->ibdev.page_size_cap = dev->attr.mem_pgsizes_bitmask;
+ dev->ibdev.vendor_id = (u32)dev->rdev.rnic_info.pdev->vendor;
+ dev->ibdev.vendor_part_id = (u32)dev->rdev.rnic_info.pdev->device;
+ dev->ibdev.max_mr_size = dev->attr.max_mr_size;
+ dev->ibdev.max_qp = dev->attr.max_qps;
+ dev->ibdev.max_qp_wr = dev->attr.max_wrs;
+ dev->ibdev.max_sge = dev->attr.max_sge_per_wr;
+ dev->ibdev.max_sge_rd = 1;
+ dev->ibdev.max_qp_rd_atom = dev->attr.max_rdma_reads_per_qp;
+ dev->ibdev.max_qp_init_rd_atom = dev->attr.max_rdma_reads_per_qp;
+ dev->ibdev.max_cq = dev->attr.max_cqs;
+ dev->ibdev.max_cqe = dev->attr.max_cqes_per_cq;
+ dev->ibdev.max_mr = dev->attr.max_mem_regs;
+ dev->ibdev.max_pd = dev->attr.max_pds;
+ dev->ibdev.local_ca_ack_delay = 0;
+ dev->ibdev.max_fast_reg_page_list_len = T3_MAX_FASTREG_DEPTH;
+
ret = ib_register_device(&dev->ibdev, NULL);
if (ret)
goto bail1;
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index 8f115b4..84e9b5d 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -305,45 +305,6 @@ static int c4iw_query_gid(struct ib_device *ibdev, u8 port, int index,
return 0;
}
-static int c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
-
- struct c4iw_dev *dev;
-
- PDBG("%s ibdev %p\n", __func__, ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- dev = to_c4iw_dev(ibdev);
- memset(props, 0, sizeof *props);
- memcpy(&props->sys_image_guid, dev->rdev.lldi.ports[0]->dev_addr, 6);
- props->hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);
- props->fw_ver = dev->rdev.lldi.fw_vers;
- props->device_cap_flags = dev->device_cap_flags;
- props->page_size_cap = T4_PAGESIZE_MASK;
- props->vendor_id = (u32)dev->rdev.lldi.pdev->vendor;
- props->vendor_part_id = (u32)dev->rdev.lldi.pdev->device;
- props->max_mr_size = T4_MAX_MR_SIZE;
- props->max_qp = dev->rdev.lldi.vr->qp.size / 2;
- props->max_qp_wr = dev->rdev.hw_queue.t4_max_qp_depth;
- props->max_sge = T4_MAX_RECV_SGE;
- props->max_sge_rd = 1;
- props->max_res_rd_atom = dev->rdev.lldi.max_ird_adapter;
- props->max_qp_rd_atom = min(dev->rdev.lldi.max_ordird_qp,
- c4iw_max_read_depth);
- props->max_qp_init_rd_atom = props->max_qp_rd_atom;
- props->max_cq = dev->rdev.lldi.vr->qp.size;
- props->max_cqe = dev->rdev.hw_queue.t4_max_cq_depth;
- props->max_mr = c4iw_num_stags(&dev->rdev);
- props->max_pd = T4_MAX_NUM_PD;
- props->local_ca_ack_delay = 0;
- props->max_fast_reg_page_list_len = t4_max_fr_depth(use_dsgl);
-
- return 0;
-}
-
static int c4iw_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props)
{
@@ -529,7 +490,6 @@ int c4iw_register_device(struct c4iw_dev *dev)
dev->ibdev.phys_port_cnt = dev->rdev.lldi.nports;
dev->ibdev.num_comp_vectors = dev->rdev.lldi.nciq;
dev->ibdev.dma_device = &(dev->rdev.lldi.pdev->dev);
- dev->ibdev.query_device = c4iw_query_device;
dev->ibdev.query_port = c4iw_query_port;
dev->ibdev.query_pkey = c4iw_query_pkey;
dev->ibdev.query_gid = c4iw_query_gid;
@@ -581,6 +541,30 @@ int c4iw_register_device(struct c4iw_dev *dev)
dev->ibdev.iwcm->rem_ref = c4iw_qp_rem_ref;
dev->ibdev.iwcm->get_qp = c4iw_get_qp;
+ memcpy(&dev->ibdev.sys_image_guid,
+ dev->rdev.lldi.ports[0]->dev_addr, 6);
+ dev->ibdev.hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);
+ dev->ibdev.fw_ver = dev->rdev.lldi.fw_vers;
+ dev->ibdev.device_cap_flags = dev->device_cap_flags;
+ dev->ibdev.page_size_cap = T4_PAGESIZE_MASK;
+ dev->ibdev.vendor_id = (u32)dev->rdev.lldi.pdev->vendor;
+ dev->ibdev.vendor_part_id = (u32)dev->rdev.lldi.pdev->device;
+ dev->ibdev.max_mr_size = T4_MAX_MR_SIZE;
+ dev->ibdev.max_qp = dev->rdev.lldi.vr->qp.size / 2;
+ dev->ibdev.max_qp_wr = dev->rdev.hw_queue.t4_max_qp_depth;
+ dev->ibdev.max_sge = T4_MAX_RECV_SGE;
+ dev->ibdev.max_sge_rd = 1;
+ dev->ibdev.max_res_rd_atom = dev->rdev.lldi.max_ird_adapter;
+ dev->ibdev.max_qp_rd_atom = min(dev->rdev.lldi.max_ordird_qp,
+ c4iw_max_read_depth);
+ dev->ibdev.max_qp_init_rd_atom = dev->ibdev.max_qp_rd_atom;
+ dev->ibdev.max_cq = dev->rdev.lldi.vr->qp.size;
+ dev->ibdev.max_cqe = dev->rdev.hw_queue.t4_max_cq_depth;
+ dev->ibdev.max_mr = c4iw_num_stags(&dev->rdev);
+ dev->ibdev.max_pd = T4_MAX_NUM_PD;
+ dev->ibdev.local_ca_ack_delay = 0;
+ dev->ibdev.max_fast_reg_page_list_len = t4_max_fr_depth(use_dsgl);
+
ret = ib_register_device(&dev->ibdev, NULL);
if (ret)
goto bail1;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 0d7698e..3889723 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -356,15 +356,12 @@ int mlx4_ib_gid_index_to_real_index(struct mlx4_ib_dev *ibdev,
return real_index;
}
-static int mlx4_ib_query_device(struct ib_device *ibdev,
- struct ib_device_attr *props,
- struct ib_udata *uhw)
+static int mlx4_ib_query_device(struct ib_device *ibdev, struct ib_udata *uhw)
{
struct mlx4_ib_dev *dev = to_mdev(ibdev);
struct ib_smp *in_mad = NULL;
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
- int have_ib_ports;
struct mlx4_uverbs_ex_query_device cmd;
struct mlx4_uverbs_ex_query_device_resp resp = {.comp_mask = 0};
struct mlx4_clock_params clock_params;
@@ -399,104 +396,137 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
if (err)
goto out;
- memset(props, 0, sizeof *props);
+ if (!mlx4_is_slave(dev->dev))
+ err = mlx4_get_internal_clock_params(dev->dev, &clock_params);
+
+ if (uhw->outlen >= resp.response_length + sizeof(resp.hca_core_clock_offset)) {
+ resp.response_length += sizeof(resp.hca_core_clock_offset);
+ if (!err && !mlx4_is_slave(dev->dev)) {
+ resp.comp_mask |= QUERY_DEVICE_RESP_MASK_TIMESTAMP;
+ resp.hca_core_clock_offset = clock_params.offset % PAGE_SIZE;
+ }
+ }
+
+ if (uhw->outlen) {
+ err = ib_copy_to_udata(uhw, &resp, resp.response_length);
+ if (err)
+ goto out;
+ }
+out:
+ kfree(in_mad);
+ kfree(out_mad);
+
+ return err;
+}
+
+static int mlx4_ib_init_device_flags(struct ib_device *ibdev)
+{
+ struct mlx4_ib_dev *dev = to_mdev(ibdev);
+ struct ib_smp *in_mad = NULL;
+ struct ib_smp *out_mad = NULL;
+ int err = -ENOMEM;
+ int have_ib_ports;
+ struct mlx4_uverbs_ex_query_device_resp resp = {.comp_mask = 0};
+ struct mlx4_clock_params clock_params;
+
+ resp.response_length = offsetof(typeof(resp), response_length) +
+ sizeof(resp.response_length);
+ in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
+ out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+ if (!in_mad || !out_mad)
+ goto out;
+
+ init_query_mad(in_mad);
+ in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;
+
+ err = mlx4_MAD_IFC(to_mdev(ibdev), MLX4_MAD_IFC_IGNORE_KEYS,
+ 1, NULL, NULL, in_mad, out_mad);
+ if (err)
+ goto out;
have_ib_ports = num_ib_ports(dev->dev);
- props->fw_ver = dev->dev->caps.fw_ver;
- props->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT |
+ ibdev->fw_ver = dev->dev->caps.fw_ver;
+ ibdev->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT |
IB_DEVICE_PORT_ACTIVE_EVENT |
IB_DEVICE_SYS_IMAGE_GUID |
IB_DEVICE_RC_RNR_NAK_GEN |
IB_DEVICE_BLOCK_MULTICAST_LOOPBACK;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR)
- props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
+ ibdev->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR)
- props->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
+ ibdev->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_APM && have_ib_ports)
- props->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
+ ibdev->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UD_AV_PORT)
- props->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;
+ ibdev->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_IPOIB_CSUM)
- props->device_cap_flags |= IB_DEVICE_UD_IP_CSUM;
+ ibdev->device_cap_flags |= IB_DEVICE_UD_IP_CSUM;
if (dev->dev->caps.max_gso_sz &&
(dev->dev->rev_id != MLX4_IB_CARD_REV_A0) &&
(dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BLH))
- props->device_cap_flags |= IB_DEVICE_UD_TSO;
+ ibdev->device_cap_flags |= IB_DEVICE_UD_TSO;
if (dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_RESERVED_LKEY)
- props->device_cap_flags |= IB_DEVICE_LOCAL_DMA_LKEY;
+ ibdev->device_cap_flags |= IB_DEVICE_LOCAL_DMA_LKEY;
if ((dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_LOCAL_INV) &&
(dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_REMOTE_INV) &&
(dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_FAST_REG_WR))
- props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
+ ibdev->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC)
- props->device_cap_flags |= IB_DEVICE_XRC;
+ ibdev->device_cap_flags |= IB_DEVICE_XRC;
if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_MEM_WINDOW)
- props->device_cap_flags |= IB_DEVICE_MEM_WINDOW;
+ ibdev->device_cap_flags |= IB_DEVICE_MEM_WINDOW;
if (dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_TYPE_2_WIN) {
if (dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_WIN_TYPE_2B)
- props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2B;
+ ibdev->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2B;
else
- props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2A;
- if (dev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED)
- props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;
+ ibdev->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2A;
+ if (dev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED)
+ ibdev->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;
}
- props->device_cap_flags |= IB_DEVICE_RAW_IP_CSUM;
+ ibdev->device_cap_flags |= IB_DEVICE_RAW_IP_CSUM;
- props->vendor_id = be32_to_cpup((__be32 *) (out_mad->data + 36)) &
+ ibdev->vendor_id = be32_to_cpup((__be32 *) (out_mad->data + 36)) &
0xffffff;
- props->vendor_part_id = dev->dev->persist->pdev->device;
- props->hw_ver = be32_to_cpup((__be32 *) (out_mad->data + 32));
- memcpy(&props->sys_image_guid, out_mad->data + 4, 8);
-
- props->max_mr_size = ~0ull;
- props->page_size_cap = dev->dev->caps.page_size_cap;
- props->max_qp = dev->dev->quotas.qp;
- props->max_qp_wr = dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE;
- props->max_sge = min(dev->dev->caps.max_sq_sg,
+ ibdev->vendor_part_id = dev->dev->persist->pdev->device;
+ ibdev->hw_ver = be32_to_cpup((__be32 *) (out_mad->data + 32));
+ memcpy(&ibdev->sys_image_guid, out_mad->data + 4, 8);
+
+ ibdev->max_mr_size = ~0ull;
+ ibdev->page_size_cap = dev->dev->caps.page_size_cap;
+ ibdev->max_qp = dev->dev->quotas.qp;
+ ibdev->max_qp_wr = dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE;
+ ibdev->max_sge = min(dev->dev->caps.max_sq_sg,
dev->dev->caps.max_rq_sg);
- props->max_sge_rd = props->max_sge;
- props->max_cq = dev->dev->quotas.cq;
- props->max_cqe = dev->dev->caps.max_cqes;
- props->max_mr = dev->dev->quotas.mpt;
- props->max_pd = dev->dev->caps.num_pds - dev->dev->caps.reserved_pds;
- props->max_qp_rd_atom = dev->dev->caps.max_qp_dest_rdma;
- props->max_qp_init_rd_atom = dev->dev->caps.max_qp_init_rdma;
- props->max_res_rd_atom = props->max_qp_rd_atom * props->max_qp;
- props->max_srq = dev->dev->quotas.srq;
- props->max_srq_wr = dev->dev->caps.max_srq_wqes - 1;
- props->max_srq_sge = dev->dev->caps.max_srq_sge;
- props->max_fast_reg_page_list_len = MLX4_MAX_FAST_REG_PAGES;
- props->local_ca_ack_delay = dev->dev->caps.local_ca_ack_delay;
- props->atomic_cap = dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_ATOMIC ?
+ ibdev->max_sge_rd = ibdev->max_sge;
+ ibdev->max_cq = dev->dev->quotas.cq;
+ ibdev->max_cqe = dev->dev->caps.max_cqes;
+ ibdev->max_mr = dev->dev->quotas.mpt;
+ ibdev->max_pd = dev->dev->caps.num_pds - dev->dev->caps.reserved_pds;
+ ibdev->max_qp_rd_atom = dev->dev->caps.max_qp_dest_rdma;
+ ibdev->max_qp_init_rd_atom = dev->dev->caps.max_qp_init_rdma;
+ ibdev->max_res_rd_atom = ibdev->max_qp_rd_atom * ibdev->max_qp;
+ ibdev->max_srq = dev->dev->quotas.srq;
+ ibdev->max_srq_wr = dev->dev->caps.max_srq_wqes - 1;
+ ibdev->max_srq_sge = dev->dev->caps.max_srq_sge;
+ ibdev->max_fast_reg_page_list_len = MLX4_MAX_FAST_REG_PAGES;
+ ibdev->local_ca_ack_delay = dev->dev->caps.local_ca_ack_delay;
+ ibdev->atomic_cap = dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_ATOMIC ?
IB_ATOMIC_HCA : IB_ATOMIC_NONE;
- props->masked_atomic_cap = props->atomic_cap;
- props->max_pkeys = dev->dev->caps.pkey_table_len[1];
- props->max_mcast_grp = dev->dev->caps.num_mgms + dev->dev->caps.num_amgms;
- props->max_mcast_qp_attach = dev->dev->caps.num_qp_per_mgm;
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
- props->max_map_per_fmr = dev->dev->caps.max_fmr_maps;
- props->hca_core_clock = dev->dev->caps.hca_core_clock * 1000UL;
- props->timestamp_mask = 0xFFFFFFFFFFFFULL;
+ ibdev->masked_atomic_cap = ibdev->atomic_cap;
+ ibdev->max_pkeys = dev->dev->caps.pkey_table_len[1];
+ ibdev->max_mcast_grp = dev->dev->caps.num_mgms + dev->dev->caps.num_amgms;
+ ibdev->max_mcast_qp_attach = dev->dev->caps.num_qp_per_mgm;
+ ibdev->max_total_mcast_qp_attach = ibdev->max_mcast_qp_attach *
+ ibdev->max_mcast_grp;
+ ibdev->max_map_per_fmr = dev->dev->caps.max_fmr_maps;
+ ibdev->hca_core_clock = dev->dev->caps.hca_core_clock * 1000UL;
+ ibdev->timestamp_mask = 0xFFFFFFFFFFFFULL;
if (!mlx4_is_slave(dev->dev))
err = mlx4_get_internal_clock_params(dev->dev, &clock_params);
- if (uhw->outlen >= resp.response_length + sizeof(resp.hca_core_clock_offset)) {
- resp.response_length += sizeof(resp.hca_core_clock_offset);
- if (!err && !mlx4_is_slave(dev->dev)) {
- resp.comp_mask |= QUERY_DEVICE_RESP_MASK_TIMESTAMP;
- resp.hca_core_clock_offset = clock_params.offset % PAGE_SIZE;
- }
- }
-
- if (uhw->outlen) {
- err = ib_copy_to_udata(uhw, &resp, resp.response_length);
- if (err)
- goto out;
- }
out:
kfree(in_mad);
kfree(out_mad);
@@ -2300,6 +2330,9 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
spin_lock_init(&iboe->lock);
+ if (mlx4_ib_init_device_flags(&ibdev->ib_dev))
+ goto err_map;
+
if (init_node_data(ibdev))
goto err_map;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index bdd60a6..67b979f 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -203,9 +203,7 @@ static int mlx5_query_node_desc(struct mlx5_ib_dev *dev, char *node_desc)
MLX5_REG_NODE_DESC, 0, 0);
}
-static int mlx5_ib_query_device(struct ib_device *ibdev,
- struct ib_device_attr *props,
- struct ib_udata *uhw)
+static int mlx5_ib_init_device_flags(struct ib_device *ibdev)
{
struct mlx5_ib_dev *dev = to_mdev(ibdev);
struct mlx5_core_dev *mdev = dev->mdev;
@@ -214,90 +212,86 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
int max_sq_sg;
u64 min_page_size = 1ull << MLX5_CAP_GEN(mdev, log_pg_sz);
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- memset(props, 0, sizeof(*props));
err = mlx5_query_system_image_guid(ibdev,
- &props->sys_image_guid);
+ &ibdev->sys_image_guid);
if (err)
return err;
- err = mlx5_query_max_pkeys(ibdev, &props->max_pkeys);
+ err = mlx5_query_max_pkeys(ibdev, &ibdev->max_pkeys);
if (err)
return err;
- err = mlx5_query_vendor_id(ibdev, &props->vendor_id);
+ err = mlx5_query_vendor_id(ibdev, &ibdev->vendor_id);
if (err)
return err;
- props->fw_ver = ((u64)fw_rev_maj(dev->mdev) << 32) |
+ ibdev->fw_ver = ((u64)fw_rev_maj(dev->mdev) << 32) |
(fw_rev_min(dev->mdev) << 16) |
fw_rev_sub(dev->mdev);
- props->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT |
+ ibdev->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT |
IB_DEVICE_PORT_ACTIVE_EVENT |
IB_DEVICE_SYS_IMAGE_GUID |
IB_DEVICE_RC_RNR_NAK_GEN;
if (MLX5_CAP_GEN(mdev, pkv))
- props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
+ ibdev->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
if (MLX5_CAP_GEN(mdev, qkv))
- props->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
+ ibdev->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
if (MLX5_CAP_GEN(mdev, apm))
- props->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
+ ibdev->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
if (MLX5_CAP_GEN(mdev, xrc))
- props->device_cap_flags |= IB_DEVICE_XRC;
- props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
+ ibdev->device_cap_flags |= IB_DEVICE_XRC;
+ ibdev->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
if (MLX5_CAP_GEN(mdev, sho)) {
- props->device_cap_flags |= IB_DEVICE_SIGNATURE_HANDOVER;
+ ibdev->device_cap_flags |= IB_DEVICE_SIGNATURE_HANDOVER;
/* At this stage no support for signature handover */
- props->sig_prot_cap = IB_PROT_T10DIF_TYPE_1 |
+ ibdev->sig_prot_cap = IB_PROT_T10DIF_TYPE_1 |
IB_PROT_T10DIF_TYPE_2 |
IB_PROT_T10DIF_TYPE_3;
- props->sig_guard_cap = IB_GUARD_T10DIF_CRC |
+ ibdev->sig_guard_cap = IB_GUARD_T10DIF_CRC |
IB_GUARD_T10DIF_CSUM;
}
if (MLX5_CAP_GEN(mdev, block_lb_mc))
- props->device_cap_flags |= IB_DEVICE_BLOCK_MULTICAST_LOOPBACK;
+ ibdev->device_cap_flags |= IB_DEVICE_BLOCK_MULTICAST_LOOPBACK;
- props->vendor_part_id = mdev->pdev->device;
- props->hw_ver = mdev->pdev->revision;
+ ibdev->vendor_part_id = mdev->pdev->device;
+ ibdev->hw_ver = mdev->pdev->revision;
- props->max_mr_size = ~0ull;
- props->page_size_cap = ~(min_page_size - 1);
- props->max_qp = 1 << MLX5_CAP_GEN(mdev, log_max_qp);
- props->max_qp_wr = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
+ ibdev->max_mr_size = ~0ull;
+ ibdev->page_size_cap = ~(min_page_size - 1);
+ ibdev->max_qp = 1 << MLX5_CAP_GEN(mdev, log_max_qp);
+ ibdev->max_qp_wr = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
max_rq_sg = MLX5_CAP_GEN(mdev, max_wqe_sz_rq) /
sizeof(struct mlx5_wqe_data_seg);
max_sq_sg = (MLX5_CAP_GEN(mdev, max_wqe_sz_sq) -
sizeof(struct mlx5_wqe_ctrl_seg)) /
sizeof(struct mlx5_wqe_data_seg);
- props->max_sge = min(max_rq_sg, max_sq_sg);
- props->max_sge_rd = props->max_sge;
- props->max_cq = 1 << MLX5_CAP_GEN(mdev, log_max_cq);
- props->max_cqe = (1 << MLX5_CAP_GEN(mdev, log_max_eq_sz)) - 1;
- props->max_mr = 1 << MLX5_CAP_GEN(mdev, log_max_mkey);
- props->max_pd = 1 << MLX5_CAP_GEN(mdev, log_max_pd);
- props->max_qp_rd_atom = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_qp);
- props->max_qp_init_rd_atom = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_qp);
- props->max_srq = 1 << MLX5_CAP_GEN(mdev, log_max_srq);
- props->max_srq_wr = (1 << MLX5_CAP_GEN(mdev, log_max_srq_sz)) - 1;
- props->local_ca_ack_delay = MLX5_CAP_GEN(mdev, local_ca_ack_delay);
- props->max_res_rd_atom = props->max_qp_rd_atom * props->max_qp;
- props->max_srq_sge = max_rq_sg - 1;
- props->max_fast_reg_page_list_len = (unsigned int)-1;
- props->atomic_cap = IB_ATOMIC_NONE;
- props->masked_atomic_cap = IB_ATOMIC_NONE;
- props->max_mcast_grp = 1 << MLX5_CAP_GEN(mdev, log_max_mcg);
- props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg);
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
- props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
+ ibdev->max_sge = min(max_rq_sg, max_sq_sg);
+ ibdev->max_sge_rd = ibdev->max_sge;
+ ibdev->max_cq = 1 << MLX5_CAP_GEN(mdev, log_max_cq);
+ ibdev->max_cqe = (1 << MLX5_CAP_GEN(mdev, log_max_eq_sz)) - 1;
+ ibdev->max_mr = 1 << MLX5_CAP_GEN(mdev, log_max_mkey);
+ ibdev->max_pd = 1 << MLX5_CAP_GEN(mdev, log_max_pd);
+ ibdev->max_qp_rd_atom = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_qp);
+ ibdev->max_qp_init_rd_atom = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_qp);
+ ibdev->max_srq = 1 << MLX5_CAP_GEN(mdev, log_max_srq);
+ ibdev->max_srq_wr = (1 << MLX5_CAP_GEN(mdev, log_max_srq_sz)) - 1;
+ ibdev->local_ca_ack_delay = MLX5_CAP_GEN(mdev, local_ca_ack_delay);
+ ibdev->max_res_rd_atom = ibdev->max_qp_rd_atom * ibdev->max_qp;
+ ibdev->max_srq_sge = max_rq_sg - 1;
+ ibdev->max_fast_reg_page_list_len = (unsigned int)-1;
+ ibdev->atomic_cap = IB_ATOMIC_NONE;
+ ibdev->masked_atomic_cap = IB_ATOMIC_NONE;
+ ibdev->max_mcast_grp = 1 << MLX5_CAP_GEN(mdev, log_max_mcg);
+ ibdev->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg);
+ ibdev->max_total_mcast_qp_attach = ibdev->max_mcast_qp_attach *
+ ibdev->max_mcast_grp;
+ ibdev->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
if (MLX5_CAP_GEN(mdev, pg))
- props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;
- props->odp_caps = dev->odp_caps;
+ ibdev->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;
+ ibdev->odp_caps = dev->odp_caps;
#endif
return 0;
@@ -1013,26 +1007,14 @@ static void get_ext_port_caps(struct mlx5_ib_dev *dev)
static int get_port_caps(struct mlx5_ib_dev *dev)
{
- struct ib_device_attr *dprops = NULL;
struct ib_port_attr *pprops = NULL;
int err = -ENOMEM;
int port;
- struct ib_udata uhw = {.inlen = 0, .outlen = 0};
pprops = kmalloc(sizeof(*pprops), GFP_KERNEL);
if (!pprops)
goto out;
- dprops = kmalloc(sizeof(*dprops), GFP_KERNEL);
- if (!dprops)
- goto out;
-
- err = mlx5_ib_query_device(&dev->ib_dev, dprops, &uhw);
- if (err) {
- mlx5_ib_warn(dev, "query_device failed %d\n", err);
- goto out;
- }
-
for (port = 1; port <= MLX5_CAP_GEN(dev->mdev, num_ports); port++) {
err = mlx5_ib_query_port(&dev->ib_dev, port, pprops);
if (err) {
@@ -1041,16 +1023,15 @@ static int get_port_caps(struct mlx5_ib_dev *dev)
break;
}
dev->mdev->port_caps[port - 1].pkey_table_len =
- dprops->max_pkeys;
+ dev->ib_dev.max_pkeys;
dev->mdev->port_caps[port - 1].gid_table_len =
pprops->gid_tbl_len;
mlx5_ib_dbg(dev, "pkey_table_len %d, gid_table_len %d\n",
- dprops->max_pkeys, pprops->gid_tbl_len);
+ dev->ib_dev.max_pkeys, pprops->gid_tbl_len);
}
out:
kfree(pprops);
- kfree(dprops);
return err;
}
@@ -1387,7 +1368,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
dev->ib_dev.uverbs_ex_cmd_mask =
(1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE);
- dev->ib_dev.query_device = mlx5_ib_query_device;
dev->ib_dev.query_port = mlx5_ib_query_port;
dev->ib_dev.query_gid = mlx5_ib_query_gid;
dev->ib_dev.query_pkey = mlx5_ib_query_pkey;
@@ -1453,6 +1433,10 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
if (err)
goto err_rsrc;
+ err = mlx5_ib_init_device_flags(&dev->ib_dev);
+ if (err)
+ goto err_rsrc;
+
err = ib_register_device(&dev->ib_dev, NULL);
if (err)
goto err_odp;
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index dc2d48c..28d7a8b 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -57,25 +57,19 @@ static void init_query_mad(struct ib_smp *mad)
mad->method = IB_MGMT_METHOD_GET;
}
-static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
+static int mthca_init_device_flags(struct ib_device *ibdev)
{
struct ib_smp *in_mad = NULL;
struct ib_smp *out_mad = NULL;
int err = -ENOMEM;
struct mthca_dev *mdev = to_mdev(ibdev);
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
in_mad = kzalloc(sizeof *in_mad, GFP_KERNEL);
out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
if (!in_mad || !out_mad)
goto out;
- memset(props, 0, sizeof *props);
-
- props->fw_ver = mdev->fw_ver;
+ ibdev->fw_ver = mdev->fw_ver;
init_query_mad(in_mad);
in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;
@@ -85,46 +79,46 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
if (err)
goto out;
- props->device_cap_flags = mdev->device_cap_flags;
- props->vendor_id = be32_to_cpup((__be32 *) (out_mad->data + 36)) &
+ ibdev->device_cap_flags = mdev->device_cap_flags;
+ ibdev->vendor_id = be32_to_cpup((__be32 *) (out_mad->data + 36)) &
0xffffff;
- props->vendor_part_id = be16_to_cpup((__be16 *) (out_mad->data + 30));
- props->hw_ver = be32_to_cpup((__be32 *) (out_mad->data + 32));
- memcpy(&props->sys_image_guid, out_mad->data + 4, 8);
-
- props->max_mr_size = ~0ull;
- props->page_size_cap = mdev->limits.page_size_cap;
- props->max_qp = mdev->limits.num_qps - mdev->limits.reserved_qps;
- props->max_qp_wr = mdev->limits.max_wqes;
- props->max_sge = mdev->limits.max_sg;
- props->max_sge_rd = props->max_sge;
- props->max_cq = mdev->limits.num_cqs - mdev->limits.reserved_cqs;
- props->max_cqe = mdev->limits.max_cqes;
- props->max_mr = mdev->limits.num_mpts - mdev->limits.reserved_mrws;
- props->max_pd = mdev->limits.num_pds - mdev->limits.reserved_pds;
- props->max_qp_rd_atom = 1 << mdev->qp_table.rdb_shift;
- props->max_qp_init_rd_atom = mdev->limits.max_qp_init_rdma;
- props->max_res_rd_atom = props->max_qp_rd_atom * props->max_qp;
- props->max_srq = mdev->limits.num_srqs - mdev->limits.reserved_srqs;
- props->max_srq_wr = mdev->limits.max_srq_wqes;
- props->max_srq_sge = mdev->limits.max_srq_sge;
- props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay;
- props->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ?
+ ibdev->vendor_part_id = be16_to_cpup((__be16 *) (out_mad->data + 30));
+ ibdev->hw_ver = be32_to_cpup((__be32 *) (out_mad->data + 32));
+ memcpy(&ibdev->sys_image_guid, out_mad->data + 4, 8);
+
+ ibdev->max_mr_size = ~0ull;
+ ibdev->page_size_cap = mdev->limits.page_size_cap;
+ ibdev->max_qp = mdev->limits.num_qps - mdev->limits.reserved_qps;
+ ibdev->max_qp_wr = mdev->limits.max_wqes;
+ ibdev->max_sge = mdev->limits.max_sg;
+ ibdev->max_sge_rd = ibdev->max_sge;
+ ibdev->max_cq = mdev->limits.num_cqs - mdev->limits.reserved_cqs;
+ ibdev->max_cqe = mdev->limits.max_cqes;
+ ibdev->max_mr = mdev->limits.num_mpts - mdev->limits.reserved_mrws;
+ ibdev->max_pd = mdev->limits.num_pds - mdev->limits.reserved_pds;
+ ibdev->max_qp_rd_atom = 1 << mdev->qp_table.rdb_shift;
+ ibdev->max_qp_init_rd_atom = mdev->limits.max_qp_init_rdma;
+ ibdev->max_res_rd_atom = ibdev->max_qp_rd_atom * ibdev->max_qp;
+ ibdev->max_srq = mdev->limits.num_srqs - mdev->limits.reserved_srqs;
+ ibdev->max_srq_wr = mdev->limits.max_srq_wqes;
+ ibdev->max_srq_sge = mdev->limits.max_srq_sge;
+ ibdev->local_ca_ack_delay = mdev->limits.local_ca_ack_delay;
+ ibdev->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ?
IB_ATOMIC_HCA : IB_ATOMIC_NONE;
- props->max_pkeys = mdev->limits.pkey_table_len;
- props->max_mcast_grp = mdev->limits.num_mgms + mdev->limits.num_amgms;
- props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
+ ibdev->max_pkeys = mdev->limits.pkey_table_len;
+ ibdev->max_mcast_grp = mdev->limits.num_mgms + mdev->limits.num_amgms;
+ ibdev->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
+ ibdev->max_total_mcast_qp_attach = ibdev->max_mcast_qp_attach *
+ ibdev->max_mcast_grp;
/*
* If Sinai memory key optimization is being used, then only
* the 8-bit key portion will change. For other HCAs, the
* unused index bits will also be used for FMR remapping.
*/
if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT)
- props->max_map_per_fmr = 255;
+ ibdev->max_map_per_fmr = 255;
else
- props->max_map_per_fmr =
+ ibdev->max_map_per_fmr =
(1 << (32 - ilog2(mdev->limits.num_mpts))) - 1;
err = 0;
@@ -1305,7 +1299,6 @@ int mthca_register_device(struct mthca_dev *dev)
dev->ib_dev.phys_port_cnt = dev->limits.num_ports;
dev->ib_dev.num_comp_vectors = 1;
dev->ib_dev.dma_device = &dev->pdev->dev;
- dev->ib_dev.query_device = mthca_query_device;
dev->ib_dev.query_port = mthca_query_port;
dev->ib_dev.modify_device = mthca_modify_device;
dev->ib_dev.modify_port = mthca_modify_port;
@@ -1377,6 +1370,10 @@ int mthca_register_device(struct mthca_dev *dev)
mutex_init(&dev->cap_mask_mutex);
+ ret = mthca_init_device_flags(&dev->ib_dev);
+ if (ret)
+ return ret;
+
ret = ib_register_device(&dev->ib_dev, NULL);
if (ret)
return ret;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index c58091a..2ef9119 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -487,61 +487,6 @@ static int nes_map_mr_sg(struct ib_mr *ibmr,
}
/**
- * nes_query_device
- */
-static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
- struct nes_vnic *nesvnic = to_nesvnic(ibdev);
- struct nes_device *nesdev = nesvnic->nesdev;
- struct nes_ib_device *nesibdev = nesvnic->nesibdev;
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- memset(props, 0, sizeof(*props));
- memcpy(&props->sys_image_guid, nesvnic->netdev->dev_addr, 6);
-
- props->fw_ver = nesdev->nesadapter->firmware_version;
- props->device_cap_flags = nesdev->nesadapter->device_cap_flags;
- props->vendor_id = nesdev->nesadapter->vendor_id;
- props->vendor_part_id = nesdev->nesadapter->vendor_part_id;
- props->hw_ver = nesdev->nesadapter->hw_rev;
- props->max_mr_size = 0x80000000;
- props->max_qp = nesibdev->max_qp;
- props->max_qp_wr = nesdev->nesadapter->max_qp_wr - 2;
- props->max_sge = nesdev->nesadapter->max_sge;
- props->max_cq = nesibdev->max_cq;
- props->max_cqe = nesdev->nesadapter->max_cqe;
- props->max_mr = nesibdev->max_mr;
- props->max_mw = nesibdev->max_mr;
- props->max_pd = nesibdev->max_pd;
- props->max_sge_rd = 1;
- switch (nesdev->nesadapter->max_irrq_wr) {
- case 0:
- props->max_qp_rd_atom = 2;
- break;
- case 1:
- props->max_qp_rd_atom = 8;
- break;
- case 2:
- props->max_qp_rd_atom = 32;
- break;
- case 3:
- props->max_qp_rd_atom = 64;
- break;
- default:
- props->max_qp_rd_atom = 0;
- }
- props->max_qp_init_rd_atom = props->max_qp_rd_atom;
- props->atomic_cap = IB_ATOMIC_NONE;
- props->max_map_per_fmr = 1;
-
- return 0;
-}
-
-
-/**
* nes_query_port
*/
static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *props)
@@ -3869,7 +3814,6 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
nesibdev->ibdev.num_comp_vectors = 1;
nesibdev->ibdev.dma_device = &nesdev->pcidev->dev;
nesibdev->ibdev.dev.parent = &nesdev->pcidev->dev;
- nesibdev->ibdev.query_device = nes_query_device;
nesibdev->ibdev.query_port = nes_query_port;
nesibdev->ibdev.query_pkey = nes_query_pkey;
nesibdev->ibdev.query_gid = nes_query_gid;
@@ -3906,6 +3850,44 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
nesibdev->ibdev.post_send = nes_post_send;
nesibdev->ibdev.post_recv = nes_post_recv;
+ memcpy(&nesibdev->ibdev.sys_image_guid,
+ nesvnic->netdev->dev_addr, 6);
+
+ nesibdev->ibdev.fw_ver = nesdev->nesadapter->firmware_version;
+ nesibdev->ibdev.device_cap_flags = nesdev->nesadapter->device_cap_flags;
+ nesibdev->ibdev.vendor_id = nesdev->nesadapter->vendor_id;
+ nesibdev->ibdev.vendor_part_id = nesdev->nesadapter->vendor_part_id;
+ nesibdev->ibdev.hw_ver = nesdev->nesadapter->hw_rev;
+ nesibdev->ibdev.max_mr_size = 0x80000000;
+ nesibdev->ibdev.max_qp = nesibdev->max_qp;
+ nesibdev->ibdev.max_qp_wr = nesdev->nesadapter->max_qp_wr - 2;
+ nesibdev->ibdev.max_sge = nesdev->nesadapter->max_sge;
+ nesibdev->ibdev.max_cq = nesibdev->max_cq;
+ nesibdev->ibdev.max_cqe = nesdev->nesadapter->max_cqe;
+ nesibdev->ibdev.max_mr = nesibdev->max_mr;
+ nesibdev->ibdev.max_mw = nesibdev->max_mr;
+ nesibdev->ibdev.max_pd = nesibdev->max_pd;
+ nesibdev->ibdev.max_sge_rd = 1;
+ switch (nesdev->nesadapter->max_irrq_wr) {
+ case 0:
+ nesibdev->ibdev.max_qp_rd_atom = 2;
+ break;
+ case 1:
+ nesibdev->ibdev.max_qp_rd_atom = 8;
+ break;
+ case 2:
+ nesibdev->ibdev.max_qp_rd_atom = 32;
+ break;
+ case 3:
+ nesibdev->ibdev.max_qp_rd_atom = 64;
+ break;
+ default:
+ nesibdev->ibdev.max_qp_rd_atom = 0;
+ }
+ nesibdev->ibdev.max_qp_init_rd_atom = nesibdev->ibdev.max_qp_rd_atom;
+ nesibdev->ibdev.atomic_cap = IB_ATOMIC_NONE;
+ nesibdev->ibdev.max_map_per_fmr = 1;
+
nesibdev->ibdev.iwcm = kzalloc(sizeof(*nesibdev->ibdev.iwcm), GFP_KERNEL);
if (nesibdev->ibdev.iwcm == NULL) {
ib_dealloc_device(&nesibdev->ibdev);
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 9bf430e..00ddcf9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -145,7 +145,6 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
dev->ibdev.num_comp_vectors = dev->eq_cnt;
/* mandatory verbs. */
- dev->ibdev.query_device = ocrdma_query_device;
dev->ibdev.query_port = ocrdma_query_port;
dev->ibdev.modify_port = ocrdma_modify_port;
dev->ibdev.query_gid = ocrdma_query_gid;
@@ -207,6 +206,45 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
dev->ibdev.destroy_srq = ocrdma_destroy_srq;
dev->ibdev.post_srq_recv = ocrdma_post_srq_recv;
}
+
+ memcpy(&dev->ibdev.fw_ver, &dev->attr.fw_ver[0],
+ min(sizeof(dev->attr.fw_ver), sizeof(dev->ibdev.fw_ver)));
+ ocrdma_get_guid(dev, (u8 *)&dev->ibdev.sys_image_guid);
+ dev->ibdev.max_mr_size = dev->attr.max_mr_size;
+ dev->ibdev.page_size_cap = 0xffff000;
+ dev->ibdev.vendor_id = dev->nic_info.pdev->vendor;
+ dev->ibdev.vendor_part_id = dev->nic_info.pdev->device;
+ dev->ibdev.hw_ver = dev->asic_id;
+ dev->ibdev.max_qp = dev->attr.max_qp;
+ dev->ibdev.max_ah = OCRDMA_MAX_AH;
+ dev->ibdev.max_qp_wr = dev->attr.max_wqe;
+
+ dev->ibdev.device_cap_flags = IB_DEVICE_CURR_QP_STATE_MOD |
+ IB_DEVICE_RC_RNR_NAK_GEN |
+ IB_DEVICE_SHUTDOWN_PORT |
+ IB_DEVICE_SYS_IMAGE_GUID |
+ IB_DEVICE_LOCAL_DMA_LKEY |
+ IB_DEVICE_MEM_MGT_EXTENSIONS;
+ dev->ibdev.max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge);
+ dev->ibdev.max_sge_rd = 0;
+ dev->ibdev.max_cq = dev->attr.max_cq;
+ dev->ibdev.max_cqe = dev->attr.max_cqe;
+ dev->ibdev.max_mr = dev->attr.max_mr;
+ dev->ibdev.max_mw = dev->attr.max_mw;
+ dev->ibdev.max_pd = dev->attr.max_pd;
+ dev->ibdev.atomic_cap = 0;
+ dev->ibdev.max_fmr = 0;
+ dev->ibdev.max_map_per_fmr = 0;
+ dev->ibdev.max_qp_rd_atom =
+ min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
+ dev->ibdev.max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
+ dev->ibdev.max_srq = dev->attr.max_srq;
+ dev->ibdev.max_srq_sge = dev->attr.max_srq_sge;
+ dev->ibdev.max_srq_wr = dev->attr.max_rqe;
+ dev->ibdev.local_ca_ack_delay = dev->attr.local_ca_ack_delay;
+ dev->ibdev.max_fast_reg_page_list_len = dev->attr.max_pages_per_frmr;
+ dev->ibdev.max_pkeys = 1;
+
return ib_register_device(&dev->ibdev, NULL);
}
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 0b8598c..64538a4 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -98,55 +98,6 @@ int ocrdma_del_gid(struct ib_device *device,
return 0;
}
-int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
- struct ib_udata *uhw)
-{
- struct ocrdma_dev *dev = get_ocrdma_dev(ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- memset(attr, 0, sizeof *attr);
- memcpy(&attr->fw_ver, &dev->attr.fw_ver[0],
- min(sizeof(dev->attr.fw_ver), sizeof(attr->fw_ver)));
- ocrdma_get_guid(dev, (u8 *)&attr->sys_image_guid);
- attr->max_mr_size = dev->attr.max_mr_size;
- attr->page_size_cap = 0xffff000;
- attr->vendor_id = dev->nic_info.pdev->vendor;
- attr->vendor_part_id = dev->nic_info.pdev->device;
- attr->hw_ver = dev->asic_id;
- attr->max_qp = dev->attr.max_qp;
- attr->max_ah = OCRDMA_MAX_AH;
- attr->max_qp_wr = dev->attr.max_wqe;
-
- attr->device_cap_flags = IB_DEVICE_CURR_QP_STATE_MOD |
- IB_DEVICE_RC_RNR_NAK_GEN |
- IB_DEVICE_SHUTDOWN_PORT |
- IB_DEVICE_SYS_IMAGE_GUID |
- IB_DEVICE_LOCAL_DMA_LKEY |
- IB_DEVICE_MEM_MGT_EXTENSIONS;
- attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge);
- attr->max_sge_rd = 0;
- attr->max_cq = dev->attr.max_cq;
- attr->max_cqe = dev->attr.max_cqe;
- attr->max_mr = dev->attr.max_mr;
- attr->max_mw = dev->attr.max_mw;
- attr->max_pd = dev->attr.max_pd;
- attr->atomic_cap = 0;
- attr->max_fmr = 0;
- attr->max_map_per_fmr = 0;
- attr->max_qp_rd_atom =
- min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
- attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
- attr->max_srq = dev->attr.max_srq;
- attr->max_srq_sge = dev->attr.max_srq_sge;
- attr->max_srq_wr = dev->attr.max_rqe;
- attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay;
- attr->max_fast_reg_page_list_len = dev->attr.max_pages_per_frmr;
- attr->max_pkeys = 1;
- return 0;
-}
-
struct net_device *ocrdma_get_netdev(struct ib_device *ibdev, u8 port_num)
{
struct ocrdma_dev *dev;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
index 62d6608..64a8258 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
@@ -51,8 +51,6 @@ int ocrdma_post_recv(struct ib_qp *, struct ib_recv_wr *,
int ocrdma_poll_cq(struct ib_cq *, int num_entries, struct ib_wc *wc);
int ocrdma_arm_cq(struct ib_cq *, enum ib_cq_notify_flags flags);
-int ocrdma_query_device(struct ib_device *, struct ib_device_attr *props,
- struct ib_udata *uhw);
int ocrdma_query_port(struct ib_device *, u8 port, struct ib_port_attr *props);
int ocrdma_modify_port(struct ib_device *, u8 port, int mask,
struct ib_port_modify *props);
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index de6cb6f..9e1af0b 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1567,55 +1567,6 @@ full:
}
}
-static int qib_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
- struct qib_devdata *dd = dd_from_ibdev(ibdev);
- struct qib_ibdev *dev = to_idev(ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
- memset(props, 0, sizeof(*props));
-
- props->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
- IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
- IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
- IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
- props->page_size_cap = PAGE_SIZE;
- props->vendor_id =
- QIB_SRC_OUI_1 << 16 | QIB_SRC_OUI_2 << 8 | QIB_SRC_OUI_3;
- props->vendor_part_id = dd->deviceid;
- props->hw_ver = dd->minrev;
- props->sys_image_guid = ib_qib_sys_image_guid;
- props->max_mr_size = ~0ULL;
- props->max_qp = ib_qib_max_qps;
- props->max_qp_wr = ib_qib_max_qp_wrs;
- props->max_sge = ib_qib_max_sges;
- props->max_sge_rd = ib_qib_max_sges;
- props->max_cq = ib_qib_max_cqs;
- props->max_ah = ib_qib_max_ahs;
- props->max_cqe = ib_qib_max_cqes;
- props->max_mr = dev->lk_table.max;
- props->max_fmr = dev->lk_table.max;
- props->max_map_per_fmr = 32767;
- props->max_pd = ib_qib_max_pds;
- props->max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
- props->max_qp_init_rd_atom = 255;
- /* props->max_res_rd_atom */
- props->max_srq = ib_qib_max_srqs;
- props->max_srq_wr = ib_qib_max_srq_wrs;
- props->max_srq_sge = ib_qib_max_srq_sges;
- /* props->local_ca_ack_delay */
- props->atomic_cap = IB_ATOMIC_GLOB;
- props->max_pkeys = qib_get_npkeys(dd);
- props->max_mcast_grp = ib_qib_max_mcast_grps;
- props->max_mcast_qp_attach = ib_qib_max_mcast_qp_attached;
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
-
- return 0;
-}
-
static int qib_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props)
{
@@ -2225,7 +2176,6 @@ int qib_register_ib_device(struct qib_devdata *dd)
ibdev->phys_port_cnt = dd->num_pports;
ibdev->num_comp_vectors = 1;
ibdev->dma_device = &dd->pcidev->dev;
- ibdev->query_device = qib_query_device;
ibdev->modify_device = qib_modify_device;
ibdev->query_port = qib_query_port;
ibdev->modify_port = qib_modify_port;
@@ -2272,6 +2222,42 @@ int qib_register_ib_device(struct qib_devdata *dd)
ibdev->dma_ops = &qib_dma_mapping_ops;
ibdev->get_port_immutable = qib_port_immutable;
+ ibdev->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
+ IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
+ IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
+ IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
+ ibdev->page_size_cap = PAGE_SIZE;
+ ibdev->vendor_id =
+ QIB_SRC_OUI_1 << 16 | QIB_SRC_OUI_2 << 8 | QIB_SRC_OUI_3;
+ ibdev->vendor_part_id = dd->deviceid;
+ ibdev->hw_ver = dd->minrev;
+ ibdev->sys_image_guid = ib_qib_sys_image_guid;
+ ibdev->max_mr_size = ~0ULL;
+ ibdev->max_qp = ib_qib_max_qps;
+ ibdev->max_qp_wr = ib_qib_max_qp_wrs;
+ ibdev->max_sge = ib_qib_max_sges;
+ ibdev->max_sge_rd = ib_qib_max_sges;
+ ibdev->max_cq = ib_qib_max_cqs;
+ ibdev->max_ah = ib_qib_max_ahs;
+ ibdev->max_cqe = ib_qib_max_cqes;
+ ibdev->max_mr = dev->lk_table.max;
+ ibdev->max_fmr = dev->lk_table.max;
+ ibdev->max_map_per_fmr = 32767;
+ ibdev->max_pd = ib_qib_max_pds;
+ ibdev->max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
+ ibdev->max_qp_init_rd_atom = 255;
+ /* props->max_res_rd_atom */
+ ibdev->max_srq = ib_qib_max_srqs;
+ ibdev->max_srq_wr = ib_qib_max_srq_wrs;
+ ibdev->max_srq_sge = ib_qib_max_srq_sges;
+ /* props->local_ca_ack_delay */
+ ibdev->atomic_cap = IB_ATOMIC_GLOB;
+ ibdev->max_pkeys = qib_get_npkeys(dd);
+ ibdev->max_mcast_grp = ib_qib_max_mcast_grps;
+ ibdev->max_mcast_qp_attach = ib_qib_max_mcast_qp_attached;
+ ibdev->max_total_mcast_qp_attach = ibdev->max_mcast_qp_attach *
+ ibdev->max_mcast_grp;
+
snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),
"Intel Infiniband HCA %s", init_utsname()->nodename);
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 34c49b8..459bd34 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -374,7 +374,6 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
(1ull << IB_USER_VERBS_CMD_DETACH_MCAST) |
(1ull << IB_USER_VERBS_CMD_OPEN_QP);
- us_ibdev->ib_dev.query_device = usnic_ib_query_device;
us_ibdev->ib_dev.query_port = usnic_ib_query_port;
us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
@@ -401,6 +400,8 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
us_ibdev->ib_dev.get_dma_mr = usnic_ib_get_dma_mr;
us_ibdev->ib_dev.get_port_immutable = usnic_port_immutable;
+ if (usnic_ib_init_device_flags(&us_ibdev->ib_dev))
+ goto err_fwd_dealloc;
if (ib_register_device(&us_ibdev->ib_dev, NULL))
goto err_fwd_dealloc;
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 7df4382..c343ff9 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -247,9 +247,7 @@ enum rdma_link_layer usnic_ib_port_link_layer(struct ib_device *device,
return IB_LINK_LAYER_ETHERNET;
}
-int usnic_ib_query_device(struct ib_device *ibdev,
- struct ib_device_attr *props,
- struct ib_udata *uhw)
+int usnic_ib_init_device_flags(struct ib_device *ibdev)
{
struct usnic_ib_dev *us_ibdev = to_usdev(ibdev);
union ib_gid gid;
@@ -257,49 +255,31 @@ int usnic_ib_query_device(struct ib_device *ibdev,
struct ethtool_cmd cmd;
int qp_per_vf;
- usnic_dbg("\n");
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
mutex_lock(&us_ibdev->usdev_lock);
us_ibdev->netdev->ethtool_ops->get_drvinfo(us_ibdev->netdev, &info);
us_ibdev->netdev->ethtool_ops->get_settings(us_ibdev->netdev, &cmd);
- memset(props, 0, sizeof(*props));
usnic_mac_ip_to_gid(us_ibdev->ufdev->mac, us_ibdev->ufdev->inaddr,
&gid.raw[0]);
- memcpy(&props->sys_image_guid, &gid.global.interface_id,
+ memcpy(&ibdev->sys_image_guid, &gid.global.interface_id,
sizeof(gid.global.interface_id));
- usnic_ib_fw_string_to_u64(&info.fw_version[0], &props->fw_ver);
- props->max_mr_size = USNIC_UIOM_MAX_MR_SIZE;
- props->page_size_cap = USNIC_UIOM_PAGE_SIZE;
- props->vendor_id = PCI_VENDOR_ID_CISCO;
- props->vendor_part_id = PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC;
- props->hw_ver = us_ibdev->pdev->subsystem_device;
+ usnic_ib_fw_string_to_u64(&info.fw_version[0], &ibdev->fw_ver);
+ ibdev->max_mr_size = USNIC_UIOM_MAX_MR_SIZE;
+ ibdev->page_size_cap = USNIC_UIOM_PAGE_SIZE;
+ ibdev->vendor_id = PCI_VENDOR_ID_CISCO;
+ ibdev->vendor_part_id = PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC;
+ ibdev->hw_ver = us_ibdev->pdev->subsystem_device;
qp_per_vf = max(us_ibdev->vf_res_cnt[USNIC_VNIC_RES_TYPE_WQ],
us_ibdev->vf_res_cnt[USNIC_VNIC_RES_TYPE_RQ]);
- props->max_qp = qp_per_vf *
+ ibdev->max_qp = qp_per_vf *
atomic_read(&us_ibdev->vf_cnt.refcount);
- props->device_cap_flags = IB_DEVICE_PORT_ACTIVE_EVENT |
+ ibdev->device_cap_flags = IB_DEVICE_PORT_ACTIVE_EVENT |
IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_BLOCK_MULTICAST_LOOPBACK;
- props->max_cq = us_ibdev->vf_res_cnt[USNIC_VNIC_RES_TYPE_CQ] *
+ ibdev->max_cq = us_ibdev->vf_res_cnt[USNIC_VNIC_RES_TYPE_CQ] *
atomic_read(&us_ibdev->vf_cnt.refcount);
- props->max_pd = USNIC_UIOM_MAX_PD_CNT;
- props->max_mr = USNIC_UIOM_MAX_MR_CNT;
- props->local_ca_ack_delay = 0;
- props->max_pkeys = 0;
- props->atomic_cap = IB_ATOMIC_NONE;
- props->masked_atomic_cap = props->atomic_cap;
- props->max_qp_rd_atom = 0;
- props->max_qp_init_rd_atom = 0;
- props->max_res_rd_atom = 0;
- props->max_srq = 0;
- props->max_srq_wr = 0;
- props->max_srq_sge = 0;
- props->max_fast_reg_page_list_len = 0;
- props->max_mcast_grp = 0;
- props->max_mcast_qp_attach = 0;
- props->max_total_mcast_qp_attach = 0;
- props->max_map_per_fmr = 0;
+ ibdev->max_pd = USNIC_UIOM_MAX_PD_CNT;
+ ibdev->max_mr = USNIC_UIOM_MAX_MR_CNT;
+ ibdev->atomic_cap = IB_ATOMIC_NONE;
+ ibdev->masked_atomic_cap = ibdev->atomic_cap;
/* Owned by Userspace
* max_qp_wr, max_sge, max_sge_rd, max_cqe */
mutex_unlock(&us_ibdev->usdev_lock);
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
index 0bd04ef..5737688 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.h
@@ -23,9 +23,7 @@
enum rdma_link_layer usnic_ib_port_link_layer(struct ib_device *device,
u8 port_num);
-int usnic_ib_query_device(struct ib_device *ibdev,
- struct ib_device_attr *props,
- struct ib_udata *uhw);
+int usnic_ib_init_device_flags(struct ib_device *ibdev);
int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props);
enum rdma_protocol_type
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 3ae9726..737d273 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -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->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->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 {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index 078cadd..3db380d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -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);
+
+ snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+ "%d.%d.%d", (int)(priv->ca->fw_ver >> 32),
+ (int)(priv->ca->fw_ver >> 16) & 0xffff,
+ (int)priv->ca->fw_ver & 0xffff);
strlcpy(drvinfo->bus_info, dev_name(priv->ca->dma_device),
sizeof(drvinfo->bus_info));
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 65d916c..85baf2f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1775,26 +1775,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->device_cap_flags;
if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
priv->dev->hw_features = NETIF_F_SG |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 8017f3a..75f3f94 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -648,7 +648,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->sig_prot_cap;
scsi_host_set_prot(shost, iser_dif_prot_caps(sig_caps));
scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP |
@@ -660,7 +660,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->max_fast_reg_page_list_len);
shost->max_sectors = min_t(unsigned int,
1024, (shost->sg_tablesize * PAGE_SIZE) >> 9);
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 271aa71..72c6ed9 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -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;
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index ea765fb..81ad5e9 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -69,15 +69,14 @@ static struct iser_reg_ops fmr_ops = {
int iser_assign_reg_ops(struct iser_device *device)
{
- struct ib_device_attr *dev_attr = &device->dev_attr;
+ struct ib_device *ib_dev = device->ib_device;
/* Assign function handles - based on FMR support */
- if (device->ib_device->alloc_fmr && device->ib_device->dealloc_fmr &&
- device->ib_device->map_phys_fmr && device->ib_device->unmap_fmr) {
+ if (ib_dev->alloc_fmr && ib_dev->dealloc_fmr &&
+ ib_dev->map_phys_fmr && ib_dev->unmap_fmr) {
iser_info("FMR supported, using FMR for registration\n");
device->reg_ops = &fmr_ops;
- } else
- if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
+ } else if (ib_dev->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
iser_info("FastReg supported, using FastReg for registration\n");
device->reg_ops = &fastreg_ops;
} else {
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index a66b9de..aff0df9 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -78,34 +78,28 @@ static void iser_event_handler(struct ib_event_handler *handler,
*/
static int iser_create_device_ib_res(struct iser_device *device)
{
- struct ib_device_attr *dev_attr = &device->dev_attr;
+ struct ib_device *ib_dev = device->ib_device;
int ret, i, max_cqe;
- ret = ib_query_device(device->ib_device, dev_attr);
- if (ret) {
- pr_warn("Query device failed for %s\n", device->ib_device->name);
- return ret;
- }
-
ret = iser_assign_reg_ops(device);
if (ret)
return ret;
device->comps_used = min_t(int, num_online_cpus(),
- device->ib_device->num_comp_vectors);
+ ib_dev->num_comp_vectors);
device->comps = kcalloc(device->comps_used, sizeof(*device->comps),
GFP_KERNEL);
if (!device->comps)
goto comps_err;
- max_cqe = min(ISER_MAX_CQ_LEN, dev_attr->max_cqe);
+ max_cqe = min(ISER_MAX_CQ_LEN, ib_dev->max_cqe);
iser_info("using %d CQs, device %s supports %d vectors max_cqe %d\n",
- device->comps_used, device->ib_device->name,
- device->ib_device->num_comp_vectors, max_cqe);
+ device->comps_used, ib_dev->name,
+ ib_dev->num_comp_vectors, max_cqe);
- device->pd = ib_alloc_pd(device->ib_device);
+ device->pd = ib_alloc_pd(ib_dev);
if (IS_ERR(device->pd))
goto pd_err;
@@ -116,7 +110,7 @@ static int iser_create_device_ib_res(struct iser_device *device)
comp->device = device;
cq_attr.cqe = max_cqe;
cq_attr.comp_vector = i;
- comp->cq = ib_create_cq(device->ib_device,
+ comp->cq = ib_create_cq(ib_dev,
iser_cq_callback,
iser_cq_event_callback,
(void *)comp,
@@ -464,7 +458,7 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
struct iser_conn *iser_conn = container_of(ib_conn, struct iser_conn,
ib_conn);
struct iser_device *device;
- struct ib_device_attr *dev_attr;
+ struct ib_device *ib_dev;
struct ib_qp_init_attr init_attr;
int ret = -ENOMEM;
int index, min_index = 0;
@@ -472,7 +466,7 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
BUG_ON(ib_conn->device == NULL);
device = ib_conn->device;
- dev_attr = &device->dev_attr;
+ ib_dev = device->ib_device;
memset(&init_attr, 0, sizeof init_attr);
@@ -503,16 +497,16 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
iser_conn->max_cmds =
ISER_GET_MAX_XMIT_CMDS(ISER_QP_SIG_MAX_REQ_DTOS);
} else {
- if (dev_attr->max_qp_wr > ISER_QP_MAX_REQ_DTOS) {
+ if (ib_dev->max_qp_wr > ISER_QP_MAX_REQ_DTOS) {
init_attr.cap.max_send_wr = ISER_QP_MAX_REQ_DTOS + 1;
iser_conn->max_cmds =
ISER_GET_MAX_XMIT_CMDS(ISER_QP_MAX_REQ_DTOS);
} else {
- init_attr.cap.max_send_wr = dev_attr->max_qp_wr;
+ init_attr.cap.max_send_wr = ib_dev->max_qp_wr;
iser_conn->max_cmds =
- ISER_GET_MAX_XMIT_CMDS(dev_attr->max_qp_wr);
+ ISER_GET_MAX_XMIT_CMDS(ib_dev->max_qp_wr);
iser_dbg("device %s supports max_send_wr %d\n",
- device->ib_device->name, dev_attr->max_qp_wr);
+ device->ib_device->name, ib_dev->max_qp_wr);
}
}
@@ -756,7 +750,7 @@ iser_calc_scsi_params(struct iser_conn *iser_conn,
sg_tablesize = DIV_ROUND_UP(max_sectors * 512, SIZE_4K);
sup_sg_tablesize = min_t(unsigned, ISCSI_ISER_MAX_SG_TABLESIZE,
- device->dev_attr.max_fast_reg_page_list_len);
+ device->ib_device->max_fast_reg_page_list_len);
if (sg_tablesize > sup_sg_tablesize) {
sg_tablesize = sup_sg_tablesize;
@@ -799,7 +793,7 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id)
/* connection T10-PI support */
if (iser_pi_enable) {
- if (!(device->dev_attr.device_cap_flags &
+ if (!(device->ib_device->device_cap_flags &
IB_DEVICE_SIGNATURE_HANDOVER)) {
iser_warn("T10-PI requested but not supported on %s, "
"continue without T10-PI\n",
@@ -841,7 +835,7 @@ static void iser_route_handler(struct rdma_cm_id *cma_id)
goto failure;
memset(&conn_param, 0, sizeof conn_param);
- conn_param.responder_resources = device->dev_attr.max_qp_rd_atom;
+ conn_param.responder_resources = device->ib_device->max_qp_rd_atom;
conn_param.initiator_depth = 1;
conn_param.retry_count = 7;
conn_param.rnr_retry_count = 6;
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 7dbae56..96336a9 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -95,22 +95,6 @@ isert_qp_event_callback(struct ib_event *e, void *context)
}
}
-static int
-isert_query_device(struct ib_device *ib_dev, struct ib_device_attr *devattr)
-{
- int ret;
-
- ret = ib_query_device(ib_dev, devattr);
- if (ret) {
- isert_err("ib_query_device() failed: %d\n", ret);
- return ret;
- }
- isert_dbg("devattr->max_sge: %d\n", devattr->max_sge);
- isert_dbg("devattr->max_sge_rd: %d\n", devattr->max_sge_rd);
-
- return 0;
-}
-
static struct isert_comp *
isert_comp_get(struct isert_conn *isert_conn)
{
@@ -164,7 +148,7 @@ isert_create_qp(struct isert_conn *isert_conn,
* Also, still make sure to have at least two SGEs for
* outgoing control PDU responses.
*/
- attr.cap.max_send_sge = max(2, device->dev_attr.max_sge - 2);
+ attr.cap.max_send_sge = max(2, device->ib_device->max_sge - 2);
isert_conn->max_sge = attr.cap.max_send_sge;
attr.cap.max_recv_sge = 1;
@@ -294,8 +278,7 @@ isert_free_comps(struct isert_device *device)
}
static int
-isert_alloc_comps(struct isert_device *device,
- struct ib_device_attr *attr)
+isert_alloc_comps(struct isert_device *device)
{
int i, max_cqe, ret = 0;
@@ -315,7 +298,7 @@ isert_alloc_comps(struct isert_device *device,
return -ENOMEM;
}
- max_cqe = min(ISER_MAX_CQ_LEN, attr->max_cqe);
+ max_cqe = min(ISER_MAX_CQ_LEN, device->ib_device->max_cqe);
for (i = 0; i < device->comps_used; i++) {
struct ib_cq_init_attr cq_attr = {};
@@ -351,17 +334,15 @@ out_cq:
static int
isert_create_device_ib_res(struct isert_device *device)
{
- struct ib_device_attr *dev_attr;
+ struct ib_device *ib_dev = device->ib_device;
int ret;
- dev_attr = &device->dev_attr;
- ret = isert_query_device(device->ib_device, dev_attr);
- if (ret)
- return ret;
+ isert_dbg("devattr->max_sge: %d\n", ib_dev->max_sge);
+ isert_dbg("devattr->max_sge_rd: %d\n", ib_dev->max_sge_rd);
/* asign function handlers */
- if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS &&
- dev_attr->device_cap_flags & IB_DEVICE_SIGNATURE_HANDOVER) {
+ if (ib_dev->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS &&
+ ib_dev->device_cap_flags & IB_DEVICE_SIGNATURE_HANDOVER) {
device->use_fastreg = 1;
device->reg_rdma_mem = isert_reg_rdma;
device->unreg_rdma_mem = isert_unreg_rdma;
@@ -371,11 +352,11 @@ isert_create_device_ib_res(struct isert_device *device)
device->unreg_rdma_mem = isert_unmap_cmd;
}
- ret = isert_alloc_comps(device, dev_attr);
+ ret = isert_alloc_comps(device);
if (ret)
return ret;
- device->pd = ib_alloc_pd(device->ib_device);
+ device->pd = ib_alloc_pd(ib_dev);
if (IS_ERR(device->pd)) {
ret = PTR_ERR(device->pd);
isert_err("failed to allocate pd, device %p, ret=%d\n",
@@ -384,7 +365,7 @@ isert_create_device_ib_res(struct isert_device *device)
}
/* Check signature cap */
- device->pi_capable = dev_attr->device_cap_flags &
+ device->pi_capable = ib_dev->device_cap_flags &
IB_DEVICE_SIGNATURE_HANDOVER ? true : false;
return 0;
@@ -721,7 +702,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
/* Set max inflight RDMA READ requests */
isert_conn->initiator_depth = min_t(u8,
event->param.conn.initiator_depth,
- device->dev_attr.max_qp_init_rd_atom);
+ device->ib_device->max_qp_init_rd_atom);
isert_dbg("Using initiator_depth: %u\n", isert_conn->initiator_depth);
ret = isert_conn_setup_qp(isert_conn, cma_id);
diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index 3d7fbc4..b41f15a 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -207,7 +207,6 @@ struct isert_device {
struct isert_comp *comps;
int comps_used;
struct list_head dev_node;
- struct ib_device_attr dev_attr;
int (*reg_rdma_mem)(struct iscsi_conn *conn,
struct iscsi_cmd *cmd,
struct isert_rdma_wr *wr);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index d00f819..c1a1fc7 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3440,27 +3440,17 @@ free_host:
static void srp_add_one(struct ib_device *device)
{
struct srp_device *srp_dev;
- struct ib_device_attr *dev_attr;
struct srp_host *host;
int mr_page_shift, p;
u64 max_pages_per_mr;
- dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);
- if (!dev_attr)
- return;
-
- if (ib_query_device(device, dev_attr)) {
- pr_warn("Query device failed for %s\n", device->name);
- goto free_attr;
- }
-
srp_dev = kmalloc(sizeof *srp_dev, GFP_KERNEL);
if (!srp_dev)
- goto free_attr;
+ return;
srp_dev->has_fmr = (device->alloc_fmr && device->dealloc_fmr &&
device->map_phys_fmr && device->unmap_fmr);
- srp_dev->has_fr = (dev_attr->device_cap_flags &
+ srp_dev->has_fr = (device->device_cap_flags &
IB_DEVICE_MEM_MGT_EXTENSIONS);
if (!srp_dev->has_fmr && !srp_dev->has_fr)
dev_warn(&device->dev, "neither FMR nor FR is supported\n");
@@ -3474,23 +3464,23 @@ static void srp_add_one(struct ib_device *device)
* minimum of 4096 bytes. We're unlikely to build large sglists
* out of smaller entries.
*/
- mr_page_shift = max(12, ffs(dev_attr->page_size_cap) - 1);
+ mr_page_shift = max(12, ffs(device->page_size_cap) - 1);
srp_dev->mr_page_size = 1 << mr_page_shift;
srp_dev->mr_page_mask = ~((u64) srp_dev->mr_page_size - 1);
- max_pages_per_mr = dev_attr->max_mr_size;
+ max_pages_per_mr = device->max_mr_size;
do_div(max_pages_per_mr, srp_dev->mr_page_size);
srp_dev->max_pages_per_mr = min_t(u64, SRP_MAX_PAGES_PER_MR,
max_pages_per_mr);
if (srp_dev->use_fast_reg) {
srp_dev->max_pages_per_mr =
min_t(u32, srp_dev->max_pages_per_mr,
- dev_attr->max_fast_reg_page_list_len);
+ device->max_fast_reg_page_list_len);
}
srp_dev->mr_max_size = srp_dev->mr_page_size *
srp_dev->max_pages_per_mr;
- pr_debug("%s: mr_page_shift = %d, dev_attr->max_mr_size = %#llx, dev_attr->max_fast_reg_page_list_len = %u, max_pages_per_mr = %d, mr_max_size = %#x\n",
- device->name, mr_page_shift, dev_attr->max_mr_size,
- dev_attr->max_fast_reg_page_list_len,
+ pr_debug("%s: mr_page_shift = %d, device->max_mr_size = %#llx, device->max_fast_reg_page_list_len = %u, max_pages_per_mr = %d, mr_max_size = %#x\n",
+ device->name, mr_page_shift, device->max_mr_size,
+ device->max_fast_reg_page_list_len,
srp_dev->max_pages_per_mr, srp_dev->mr_max_size);
INIT_LIST_HEAD(&srp_dev->dev_list);
@@ -3518,17 +3508,13 @@ static void srp_add_one(struct ib_device *device)
}
ib_set_client_data(device, &srp_client, srp_dev);
-
- goto free_attr;
+ return;
err_pd:
ib_dealloc_pd(srp_dev->pd);
free_dev:
kfree(srp_dev);
-
-free_attr:
- kfree(dev_attr);
}
static void srp_remove_one(struct ib_device *device, void *client_data)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index d65533e..7e086ea 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -343,10 +343,10 @@ static void srpt_get_ioc(struct srpt_port *sport, u32 slot,
memset(iocp, 0, sizeof *iocp);
strcpy(iocp->id_string, SRPT_ID_STRING);
iocp->guid = cpu_to_be64(srpt_service_guid);
- iocp->vendor_id = cpu_to_be32(sdev->dev_attr.vendor_id);
- iocp->device_id = cpu_to_be32(sdev->dev_attr.vendor_part_id);
- iocp->device_version = cpu_to_be16(sdev->dev_attr.hw_ver);
- iocp->subsys_vendor_id = cpu_to_be32(sdev->dev_attr.vendor_id);
+ iocp->vendor_id = cpu_to_be32(sdev->device->vendor_id);
+ iocp->device_id = cpu_to_be32(sdev->device->vendor_part_id);
+ iocp->device_version = cpu_to_be16(sdev->device->hw_ver);
+ iocp->subsys_vendor_id = cpu_to_be32(sdev->device->vendor_id);
iocp->subsys_device_id = 0x0;
iocp->io_class = cpu_to_be16(SRP_REV16A_IB_IO_CLASS);
iocp->io_subclass = cpu_to_be16(SRP_IO_SUBCLASS);
@@ -3204,14 +3204,11 @@ static void srpt_add_one(struct ib_device *device)
init_waitqueue_head(&sdev->ch_releaseQ);
spin_lock_init(&sdev->spinlock);
- if (ib_query_device(device, &sdev->dev_attr))
- goto free_dev;
-
sdev->pd = ib_alloc_pd(device);
if (IS_ERR(sdev->pd))
goto free_dev;
- sdev->srq_size = min(srpt_srq_size, sdev->dev_attr.max_srq_wr);
+ sdev->srq_size = min(srpt_srq_size, sdev->device->max_srq_wr);
srq_attr.event_handler = srpt_srq_event;
srq_attr.srq_context = (void *)sdev;
@@ -3225,7 +3222,7 @@ static void srpt_add_one(struct ib_device *device)
goto err_pd;
pr_debug("%s: create SRQ #wr= %d max_allow=%d dev= %s\n",
- __func__, sdev->srq_size, sdev->dev_attr.max_srq_wr,
+ __func__, sdev->srq_size, sdev->device->max_srq_wr,
device->name);
if (!srpt_service_guid)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index 5faad8ac..0df7d61 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -379,8 +379,6 @@ struct srpt_port {
* @mr: L_Key (local key) with write access to all local memory.
* @srq: Per-HCA SRQ (shared receive queue).
* @cm_id: Connection identifier.
- * @dev_attr: Attributes of the InfiniBand device as obtained during the
- * ib_client.add() callback.
* @srq_size: SRQ size.
* @ioctx_ring: Per-HCA SRQ.
* @rch_list: Per-device channel list -- see also srpt_rdma_ch.list.
@@ -395,7 +393,6 @@ struct srpt_device {
struct ib_pd *pd;
struct ib_srq *srq;
struct ib_cm_id *cm_id;
- struct ib_device_attr dev_attr;
int srq_size;
struct srpt_recv_ioctx **ioctx_ring;
struct list_head rch_list;
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index c29d2ce..2701a39 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2070,32 +2070,13 @@ static int kiblnd_net_init_pools(kib_net_t *net, __u32 *cpts, int ncpts)
static int kiblnd_hdev_get_attr(kib_hca_dev_t *hdev)
{
- struct ib_device_attr *attr;
- int rc;
-
/* It's safe to assume a HCA can handle a page size
* matching that of the native system */
hdev->ibh_page_shift = PAGE_SHIFT;
hdev->ibh_page_size = 1 << PAGE_SHIFT;
hdev->ibh_page_mask = ~((__u64)hdev->ibh_page_size - 1);
- LIBCFS_ALLOC(attr, sizeof(*attr));
- if (attr == NULL) {
- CERROR("Out of memory\n");
- return -ENOMEM;
- }
-
- rc = ib_query_device(hdev->ibh_ibdev, attr);
- if (rc == 0)
- hdev->ibh_mr_size = attr->max_mr_size;
-
- LIBCFS_FREE(attr, sizeof(*attr));
-
- if (rc != 0) {
- CERROR("Failed to query IB device: %d\n", rc);
- return rc;
- }
-
+ hdev->ibh_mr_size = hdev->ibh_ibdev->max_mr_size;
if (hdev->ibh_mr_size == ~0ULL) {
hdev->ibh_mr_shift = 64;
return 0;
diff --git a/drivers/staging/rdma/amso1100/c2.h b/drivers/staging/rdma/amso1100/c2.h
index d619d73..dda3a5e 100644
--- a/drivers/staging/rdma/amso1100/c2.h
+++ b/drivers/staging/rdma/amso1100/c2.h
@@ -306,9 +306,6 @@ struct c2_dev {
struct list_head eh_wakeup_list; /* event wakeup list */
wait_queue_head_t req_vq_wo;
- /* Cached RNIC properties */
- struct ib_device_attr props;
-
struct c2_pd_table pd_table;
struct c2_qp_table qp_table;
int ports; /* num of GigE ports */
diff --git a/drivers/staging/rdma/amso1100/c2_pd.c b/drivers/staging/rdma/amso1100/c2_pd.c
index f3e81dc..ef99b41 100644
--- a/drivers/staging/rdma/amso1100/c2_pd.c
+++ b/drivers/staging/rdma/amso1100/c2_pd.c
@@ -74,13 +74,13 @@ int c2_init_pd_table(struct c2_dev *c2dev)
{
c2dev->pd_table.last = 0;
- c2dev->pd_table.max = c2dev->props.max_pd;
+ c2dev->pd_table.max = c2dev->ibdev.max_pd;
spin_lock_init(&c2dev->pd_table.lock);
- c2dev->pd_table.table = kmalloc(BITS_TO_LONGS(c2dev->props.max_pd) *
+ c2dev->pd_table.table = kmalloc(BITS_TO_LONGS(c2dev->ibdev.max_pd) *
sizeof(long), GFP_KERNEL);
if (!c2dev->pd_table.table)
return -ENOMEM;
- bitmap_zero(c2dev->pd_table.table, c2dev->props.max_pd);
+ bitmap_zero(c2dev->pd_table.table, c2dev->ibdev.max_pd);
return 0;
}
diff --git a/drivers/staging/rdma/amso1100/c2_provider.c b/drivers/staging/rdma/amso1100/c2_provider.c
index 25c3f00..92d91a8 100644
--- a/drivers/staging/rdma/amso1100/c2_provider.c
+++ b/drivers/staging/rdma/amso1100/c2_provider.c
@@ -63,20 +63,6 @@
#include "c2_provider.h"
#include "c2_user.h"
-static int c2_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
- struct c2_dev *c2dev = to_c2dev(ibdev);
-
- pr_debug("%s:%u\n", __func__, __LINE__);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- *props = c2dev->props;
- return 0;
-}
-
static int c2_query_port(struct ib_device *ibdev,
u8 port, struct ib_port_attr *props)
{
@@ -523,7 +509,7 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
{
struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev);
pr_debug("%s:%u\n", __func__, __LINE__);
- return sprintf(buf, "%x\n", c2dev->props.hw_ver);
+ return sprintf(buf, "%x\n", c2dev->ibdev.hw_ver);
}
static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr,
@@ -532,9 +518,9 @@ static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr,
struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev);
pr_debug("%s:%u\n", __func__, __LINE__);
return sprintf(buf, "%x.%x.%x\n",
- (int) (c2dev->props.fw_ver >> 32),
- (int) (c2dev->props.fw_ver >> 16) & 0xffff,
- (int) (c2dev->props.fw_ver & 0xffff));
+ (int) (c2dev->ibdev.fw_ver >> 32),
+ (int) (c2dev->ibdev.fw_ver >> 16) & 0xffff,
+ (int) (c2dev->ibdev.fw_ver & 0xffff));
}
static ssize_t show_hca(struct device *dev, struct device_attribute *attr,
@@ -828,7 +814,6 @@ int c2_register_device(struct c2_dev *dev)
dev->ibdev.phys_port_cnt = 1;
dev->ibdev.num_comp_vectors = 1;
dev->ibdev.dma_device = &dev->pcidev->dev;
- dev->ibdev.query_device = c2_query_device;
dev->ibdev.query_port = c2_query_port;
dev->ibdev.query_pkey = c2_query_pkey;
dev->ibdev.query_gid = c2_query_gid;
diff --git a/drivers/staging/rdma/amso1100/c2_rnic.c b/drivers/staging/rdma/amso1100/c2_rnic.c
index d2a6d96..2173e5b 100644
--- a/drivers/staging/rdma/amso1100/c2_rnic.c
+++ b/drivers/staging/rdma/amso1100/c2_rnic.c
@@ -120,7 +120,7 @@ static void c2_adapter_term(struct c2_dev *c2dev)
/*
* Query the adapter
*/
-static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
+static int c2_rnic_query(struct c2_dev *c2dev)
{
struct c2_vq_req *vq_req;
struct c2wr_rnic_query_req wr;
@@ -156,47 +156,30 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
if (err)
goto bail2;
- props->fw_ver =
+ c2dev->ibdev.fw_ver =
((u64)be32_to_cpu(reply->fw_ver_major) << 32) |
((be32_to_cpu(reply->fw_ver_minor) & 0xFFFF) << 16) |
(be32_to_cpu(reply->fw_ver_patch) & 0xFFFF);
- memcpy(&props->sys_image_guid, c2dev->netdev->dev_addr, 6);
- props->max_mr_size = 0xFFFFFFFF;
- props->page_size_cap = ~(C2_MIN_PAGESIZE-1);
- props->vendor_id = be32_to_cpu(reply->vendor_id);
- props->vendor_part_id = be32_to_cpu(reply->part_number);
- props->hw_ver = be32_to_cpu(reply->hw_version);
- props->max_qp = be32_to_cpu(reply->max_qps);
- props->max_qp_wr = be32_to_cpu(reply->max_qp_depth);
- props->device_cap_flags = c2dev->device_cap_flags;
- props->max_sge = C2_MAX_SGES;
- props->max_sge_rd = C2_MAX_SGE_RD;
- props->max_cq = be32_to_cpu(reply->max_cqs);
- props->max_cqe = be32_to_cpu(reply->max_cq_depth);
- props->max_mr = be32_to_cpu(reply->max_mrs);
- props->max_pd = be32_to_cpu(reply->max_pds);
- props->max_qp_rd_atom = be32_to_cpu(reply->max_qp_ird);
- props->max_ee_rd_atom = 0;
- props->max_res_rd_atom = be32_to_cpu(reply->max_global_ird);
- props->max_qp_init_rd_atom = be32_to_cpu(reply->max_qp_ord);
- props->max_ee_init_rd_atom = 0;
- props->atomic_cap = IB_ATOMIC_NONE;
- props->max_ee = 0;
- props->max_rdd = 0;
- props->max_mw = be32_to_cpu(reply->max_mws);
- props->max_raw_ipv6_qp = 0;
- props->max_raw_ethy_qp = 0;
- props->max_mcast_grp = 0;
- props->max_mcast_qp_attach = 0;
- props->max_total_mcast_qp_attach = 0;
- props->max_ah = 0;
- props->max_fmr = 0;
- props->max_map_per_fmr = 0;
- props->max_srq = 0;
- props->max_srq_wr = 0;
- props->max_srq_sge = 0;
- props->max_pkeys = 0;
- props->local_ca_ack_delay = 0;
+ memcpy(&c2dev->ibdev.sys_image_guid, c2dev->netdev->dev_addr, 6);
+ c2dev->ibdev.max_mr_size = 0xFFFFFFFF;
+ c2dev->ibdev.page_size_cap = ~(C2_MIN_PAGESIZE-1);
+ c2dev->ibdev.vendor_id = be32_to_cpu(reply->vendor_id);
+ c2dev->ibdev.vendor_part_id = be32_to_cpu(reply->part_number);
+ c2dev->ibdev.hw_ver = be32_to_cpu(reply->hw_version);
+ c2dev->ibdev.max_qp = be32_to_cpu(reply->max_qps);
+ c2dev->ibdev.max_qp_wr = be32_to_cpu(reply->max_qp_depth);
+ c2dev->ibdev.device_cap_flags = c2dev->device_cap_flags;
+ c2dev->ibdev.max_sge = C2_MAX_SGES;
+ c2dev->ibdev.max_sge_rd = C2_MAX_SGE_RD;
+ c2dev->ibdev.max_cq = be32_to_cpu(reply->max_cqs);
+ c2dev->ibdev.max_cqe = be32_to_cpu(reply->max_cq_depth);
+ c2dev->ibdev.max_mr = be32_to_cpu(reply->max_mrs);
+ c2dev->ibdev.max_pd = be32_to_cpu(reply->max_pds);
+ c2dev->ibdev.max_qp_rd_atom = be32_to_cpu(reply->max_qp_ird);
+ c2dev->ibdev.max_res_rd_atom = be32_to_cpu(reply->max_global_ird);
+ c2dev->ibdev.max_qp_init_rd_atom = be32_to_cpu(reply->max_qp_ord);
+ c2dev->ibdev.atomic_cap = IB_ATOMIC_NONE;
+ c2dev->ibdev.max_mw = be32_to_cpu(reply->max_mws);
bail2:
vq_repbuf_free(c2dev, reply);
@@ -576,7 +559,7 @@ int c2_rnic_init(struct c2_dev *c2dev)
goto bail4;
/* Initialize cached the adapter limits */
- err = c2_rnic_query(c2dev, &c2dev->props);
+ err = c2_rnic_query(c2dev);
if (err)
goto bail5;
diff --git a/drivers/staging/rdma/ehca/ehca_hca.c b/drivers/staging/rdma/ehca/ehca_hca.c
index e8b1bb6..aa0828a 100644
--- a/drivers/staging/rdma/ehca/ehca_hca.c
+++ b/drivers/staging/rdma/ehca/ehca_hca.c
@@ -50,8 +50,7 @@ static unsigned int limit_uint(unsigned int value)
return min_t(unsigned int, value, INT_MAX);
}
-int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
+int ehca_init_device_limits(struct ib_device *ibdev)
{
int i, ret = 0;
struct ehca_shca *shca = container_of(ibdev, struct ehca_shca,
@@ -72,8 +71,6 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
IB_DEVICE_PORT_ACTIVE_EVENT, HCA_CAP_PORT_ACTIVE_EVENT,
};
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);
if (!rblock) {
@@ -87,55 +84,54 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
goto query_device1;
}
- memset(props, 0, sizeof(struct ib_device_attr));
- props->page_size_cap = shca->hca_cap_mr_pgsize;
- props->fw_ver = rblock->hw_ver;
- props->max_mr_size = rblock->max_mr_size;
- props->vendor_id = rblock->vendor_id >> 8;
- props->vendor_part_id = rblock->vendor_part_id >> 16;
- props->hw_ver = rblock->hw_ver;
- props->max_qp = limit_uint(rblock->max_qp);
- props->max_qp_wr = limit_uint(rblock->max_wqes_wq);
- props->max_sge = limit_uint(rblock->max_sge);
- props->max_sge_rd = limit_uint(rblock->max_sge_rd);
- props->max_cq = limit_uint(rblock->max_cq);
- props->max_cqe = limit_uint(rblock->max_cqe);
- props->max_mr = limit_uint(rblock->max_mr);
- props->max_mw = limit_uint(rblock->max_mw);
- props->max_pd = limit_uint(rblock->max_pd);
- props->max_ah = limit_uint(rblock->max_ah);
- props->max_ee = limit_uint(rblock->max_rd_ee_context);
- props->max_rdd = limit_uint(rblock->max_rd_domain);
- props->max_fmr = limit_uint(rblock->max_mr);
- props->max_qp_rd_atom = limit_uint(rblock->max_rr_qp);
- props->max_ee_rd_atom = limit_uint(rblock->max_rr_ee_context);
- props->max_res_rd_atom = limit_uint(rblock->max_rr_hca);
- props->max_qp_init_rd_atom = limit_uint(rblock->max_act_wqs_qp);
- props->max_ee_init_rd_atom = limit_uint(rblock->max_act_wqs_ee_context);
+ ibdev->page_size_cap = shca->hca_cap_mr_pgsize;
+ ibdev->fw_ver = rblock->hw_ver;
+ ibdev->max_mr_size = rblock->max_mr_size;
+ ibdev->vendor_id = rblock->vendor_id >> 8;
+ ibdev->vendor_part_id = rblock->vendor_part_id >> 16;
+ ibdev->hw_ver = rblock->hw_ver;
+ ibdev->max_qp = limit_uint(rblock->max_qp);
+ ibdev->max_qp_wr = limit_uint(rblock->max_wqes_wq);
+ ibdev->max_sge = limit_uint(rblock->max_sge);
+ ibdev->max_sge_rd = limit_uint(rblock->max_sge_rd);
+ ibdev->max_cq = limit_uint(rblock->max_cq);
+ ibdev->max_cqe = limit_uint(rblock->max_cqe);
+ ibdev->max_mr = limit_uint(rblock->max_mr);
+ ibdev->max_mw = limit_uint(rblock->max_mw);
+ ibdev->max_pd = limit_uint(rblock->max_pd);
+ ibdev->max_ah = limit_uint(rblock->max_ah);
+ ibdev->max_ee = limit_uint(rblock->max_rd_ee_context);
+ ibdev->max_rdd = limit_uint(rblock->max_rd_domain);
+ ibdev->max_fmr = limit_uint(rblock->max_mr);
+ ibdev->max_qp_rd_atom = limit_uint(rblock->max_rr_qp);
+ ibdev->max_ee_rd_atom = limit_uint(rblock->max_rr_ee_context);
+ ibdev->max_res_rd_atom = limit_uint(rblock->max_rr_hca);
+ ibdev->max_qp_init_rd_atom = limit_uint(rblock->max_act_wqs_qp);
+ ibdev->max_ee_init_rd_atom = limit_uint(rblock->max_act_wqs_ee_context);
if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) {
- props->max_srq = limit_uint(props->max_qp);
- props->max_srq_wr = limit_uint(props->max_qp_wr);
- props->max_srq_sge = 3;
+ ibdev->max_srq = limit_uint(ibdev->max_qp);
+ ibdev->max_srq_wr = limit_uint(ibdev->max_qp_wr);
+ ibdev->max_srq_sge = 3;
}
- props->max_pkeys = 16;
+ ibdev->max_pkeys = 16;
/* Some FW versions say 0 here; insert sensible value in that case */
- props->local_ca_ack_delay = rblock->local_ca_ack_delay ?
+ ibdev->local_ca_ack_delay = rblock->local_ca_ack_delay ?
min_t(u8, rblock->local_ca_ack_delay, 255) : 12;
- props->max_raw_ipv6_qp = limit_uint(rblock->max_raw_ipv6_qp);
- props->max_raw_ethy_qp = limit_uint(rblock->max_raw_ethy_qp);
- props->max_mcast_grp = limit_uint(rblock->max_mcast_grp);
- props->max_mcast_qp_attach = limit_uint(rblock->max_mcast_qp_attach);
- props->max_total_mcast_qp_attach
+ ibdev->max_raw_ipv6_qp = limit_uint(rblock->max_raw_ipv6_qp);
+ ibdev->max_raw_ethy_qp = limit_uint(rblock->max_raw_ethy_qp);
+ ibdev->max_mcast_grp = limit_uint(rblock->max_mcast_grp);
+ ibdev->max_mcast_qp_attach = limit_uint(rblock->max_mcast_qp_attach);
+ ibdev->max_total_mcast_qp_attach
= limit_uint(rblock->max_total_mcast_qp_attach);
/* translate device capabilities */
- props->device_cap_flags = IB_DEVICE_SYS_IMAGE_GUID |
+ ibdev->device_cap_flags = IB_DEVICE_SYS_IMAGE_GUID |
IB_DEVICE_RC_RNR_NAK_GEN | IB_DEVICE_N_NOTIFY_CQ;
for (i = 0; i < ARRAY_SIZE(cap_mapping); i += 2)
if (rblock->hca_cap_indicators & cap_mapping[i + 1])
- props->device_cap_flags |= cap_mapping[i];
+ ibdev->device_cap_flags |= cap_mapping[i];
query_device1:
ehca_free_fw_ctrlblock(rblock);
diff --git a/drivers/staging/rdma/ehca/ehca_iverbs.h b/drivers/staging/rdma/ehca/ehca_iverbs.h
index 80e6a3d..75c9876 100644
--- a/drivers/staging/rdma/ehca/ehca_iverbs.h
+++ b/drivers/staging/rdma/ehca/ehca_iverbs.h
@@ -44,8 +44,7 @@
#include "ehca_classes.h"
-int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw);
+int ehca_init_device_limits(struct ib_device *ibdev);
int ehca_query_port(struct ib_device *ibdev, u8 port,
struct ib_port_attr *props);
diff --git a/drivers/staging/rdma/ehca/ehca_main.c b/drivers/staging/rdma/ehca/ehca_main.c
index 8246418..285e560 100644
--- a/drivers/staging/rdma/ehca/ehca_main.c
+++ b/drivers/staging/rdma/ehca/ehca_main.c
@@ -484,7 +484,6 @@ static int ehca_init_device(struct ehca_shca *shca)
shca->ib_device.phys_port_cnt = shca->num_ports;
shca->ib_device.num_comp_vectors = 1;
shca->ib_device.dma_device = &shca->ofdev->dev;
- shca->ib_device.query_device = ehca_query_device;
shca->ib_device.query_port = ehca_query_port;
shca->ib_device.query_gid = ehca_query_gid;
shca->ib_device.query_pkey = ehca_query_pkey;
@@ -545,7 +544,7 @@ static int ehca_init_device(struct ehca_shca *shca)
shca->ib_device.post_srq_recv = ehca_post_srq_recv;
}
- return ret;
+ return ehca_init_device_limits(&shca->ib_device);
}
static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c
index 41bb59e..c3fe71d 100644
--- a/drivers/staging/rdma/hfi1/verbs.c
+++ b/drivers/staging/rdma/hfi1/verbs.c
@@ -1355,57 +1355,6 @@ int hfi1_verbs_send(struct hfi1_qp *qp, struct ahg_ib_header *ahdr,
return ret;
}
-static int query_device(struct ib_device *ibdev,
- struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
- struct hfi1_devdata *dd = dd_from_ibdev(ibdev);
- struct hfi1_ibdev *dev = to_idev(ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
- memset(props, 0, sizeof(*props));
-
- props->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
- IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
- IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
- IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
-
- props->page_size_cap = PAGE_SIZE;
- props->vendor_id =
- dd->oui1 << 16 | dd->oui2 << 8 | dd->oui3;
- props->vendor_part_id = dd->pcidev->device;
- props->hw_ver = dd->minrev;
- props->sys_image_guid = ib_hfi1_sys_image_guid;
- props->max_mr_size = ~0ULL;
- props->max_qp = hfi1_max_qps;
- props->max_qp_wr = hfi1_max_qp_wrs;
- props->max_sge = hfi1_max_sges;
- props->max_sge_rd = hfi1_max_sges;
- props->max_cq = hfi1_max_cqs;
- props->max_ah = hfi1_max_ahs;
- props->max_cqe = hfi1_max_cqes;
- props->max_mr = dev->lk_table.max;
- props->max_fmr = dev->lk_table.max;
- props->max_map_per_fmr = 32767;
- props->max_pd = hfi1_max_pds;
- props->max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
- props->max_qp_init_rd_atom = 255;
- /* props->max_res_rd_atom */
- props->max_srq = hfi1_max_srqs;
- props->max_srq_wr = hfi1_max_srq_wrs;
- props->max_srq_sge = hfi1_max_srq_sges;
- /* props->local_ca_ack_delay */
- props->atomic_cap = IB_ATOMIC_GLOB;
- props->max_pkeys = hfi1_get_npkeys(dd);
- props->max_mcast_grp = hfi1_max_mcast_grps;
- props->max_mcast_qp_attach = hfi1_max_mcast_qp_attached;
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
-
- return 0;
-}
-
static inline u16 opa_speed_to_ib(u16 in)
{
u16 out = 0;
@@ -2013,7 +1962,6 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
ibdev->phys_port_cnt = dd->num_pports;
ibdev->num_comp_vectors = 1;
ibdev->dma_device = &dd->pcidev->dev;
- ibdev->query_device = query_device;
ibdev->modify_device = modify_device;
ibdev->query_port = query_port;
ibdev->modify_port = modify_port;
@@ -2061,6 +2009,43 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
ibdev->dma_ops = &hfi1_dma_mapping_ops;
ibdev->get_port_immutable = port_immutable;
+ ibdev->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
+ IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
+ IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
+ IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
+
+ ibdev->page_size_cap = PAGE_SIZE;
+ ibdev->vendor_id =
+ dd->oui1 << 16 | dd->oui2 << 8 | dd->oui3;
+ ibdev->vendor_part_id = dd->pcidev->device;
+ ibdev->hw_ver = dd->minrev;
+ ibdev->sys_image_guid = ib_hfi1_sys_image_guid;
+ ibdev->max_mr_size = ~0ULL;
+ ibdev->max_qp = hfi1_max_qps;
+ ibdev->max_qp_wr = hfi1_max_qp_wrs;
+ ibdev->max_sge = hfi1_max_sges;
+ ibdev->max_sge_rd = hfi1_max_sges;
+ ibdev->max_cq = hfi1_max_cqs;
+ ibdev->max_ah = hfi1_max_ahs;
+ ibdev->max_cqe = hfi1_max_cqes;
+ ibdev->max_mr = dev->lk_table.max;
+ ibdev->max_fmr = dev->lk_table.max;
+ ibdev->max_map_per_fmr = 32767;
+ ibdev->max_pd = hfi1_max_pds;
+ ibdev->max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
+ ibdev->max_qp_init_rd_atom = 255;
+ /* ibdev->max_res_rd_atom */
+ ibdev->max_srq = hfi1_max_srqs;
+ ibdev->max_srq_wr = hfi1_max_srq_wrs;
+ ibdev->max_srq_sge = hfi1_max_srq_sges;
+ /* ibdev->local_ca_ack_delay */
+ ibdev->atomic_cap = IB_ATOMIC_GLOB;
+ ibdev->max_pkeys = hfi1_get_npkeys(dd);
+ ibdev->max_mcast_grp = hfi1_max_mcast_grps;
+ ibdev->max_mcast_qp_attach = hfi1_max_mcast_qp_attached;
+ ibdev->max_total_mcast_qp_attach = ibdev->max_mcast_qp_attach *
+ ibdev->max_mcast_grp;
+
strncpy(ibdev->node_desc, init_utsname()->nodename,
sizeof(ibdev->node_desc));
diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c
index 15633ec..16f4cea 100644
--- a/drivers/staging/rdma/ipath/ipath_verbs.c
+++ b/drivers/staging/rdma/ipath/ipath_verbs.c
@@ -1511,57 +1511,6 @@ bail:
return 0;
}
-static int ipath_query_device(struct ib_device *ibdev, struct ib_device_attr *props,
- struct ib_udata *uhw)
-{
- struct ipath_ibdev *dev = to_idev(ibdev);
-
- if (uhw->inlen || uhw->outlen)
- return -EINVAL;
-
- memset(props, 0, sizeof(*props));
-
- props->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
- IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
- IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
- IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
- props->page_size_cap = PAGE_SIZE;
- props->vendor_id =
- IPATH_SRC_OUI_1 << 16 | IPATH_SRC_OUI_2 << 8 | IPATH_SRC_OUI_3;
- props->vendor_part_id = dev->dd->ipath_deviceid;
- props->hw_ver = dev->dd->ipath_pcirev;
-
- props->sys_image_guid = dev->sys_image_guid;
-
- props->max_mr_size = ~0ull;
- props->max_qp = ib_ipath_max_qps;
- props->max_qp_wr = ib_ipath_max_qp_wrs;
- props->max_sge = ib_ipath_max_sges;
- props->max_sge_rd = ib_ipath_max_sges;
- props->max_cq = ib_ipath_max_cqs;
- props->max_ah = ib_ipath_max_ahs;
- props->max_cqe = ib_ipath_max_cqes;
- props->max_mr = dev->lk_table.max;
- props->max_fmr = dev->lk_table.max;
- props->max_map_per_fmr = 32767;
- props->max_pd = ib_ipath_max_pds;
- props->max_qp_rd_atom = IPATH_MAX_RDMA_ATOMIC;
- props->max_qp_init_rd_atom = 255;
- /* props->max_res_rd_atom */
- props->max_srq = ib_ipath_max_srqs;
- props->max_srq_wr = ib_ipath_max_srq_wrs;
- props->max_srq_sge = ib_ipath_max_srq_sges;
- /* props->local_ca_ack_delay */
- props->atomic_cap = IB_ATOMIC_GLOB;
- props->max_pkeys = ipath_get_npkeys(dev->dd);
- props->max_mcast_grp = ib_ipath_max_mcast_grps;
- props->max_mcast_qp_attach = ib_ipath_max_mcast_qp_attached;
- props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
- props->max_mcast_grp;
-
- return 0;
-}
-
const u8 ipath_cvt_physportstate[32] = {
[INFINIPATH_IBCS_LT_STATE_DISABLED] = IB_PHYSPORTSTATE_DISABLED,
[INFINIPATH_IBCS_LT_STATE_LINKUP] = IB_PHYSPORTSTATE_LINKUP,
@@ -2175,7 +2124,6 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
dev->phys_port_cnt = 1;
dev->num_comp_vectors = 1;
dev->dma_device = &dd->pcidev->dev;
- dev->query_device = ipath_query_device;
dev->modify_device = ipath_modify_device;
dev->query_port = ipath_query_port;
dev->modify_port = ipath_modify_port;
@@ -2219,6 +2167,44 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
dev->dma_ops = &ipath_dma_mapping_ops;
dev->get_port_immutable = ipath_port_immutable;
+ dev->device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |
+ IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |
+ IB_DEVICE_SYS_IMAGE_GUID | IB_DEVICE_RC_RNR_NAK_GEN |
+ IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SRQ_RESIZE;
+ dev->page_size_cap = PAGE_SIZE;
+ dev->vendor_id =
+ IPATH_SRC_OUI_1 << 16 | IPATH_SRC_OUI_2 << 8 | IPATH_SRC_OUI_3;
+ dev->vendor_part_id = idev->dd->ipath_deviceid;
+ dev->hw_ver = idev->dd->ipath_pcirev;
+
+ dev->sys_image_guid = idev->sys_image_guid;
+
+ dev->max_mr_size = ~0ull;
+ dev->max_qp = ib_ipath_max_qps;
+ dev->max_qp_wr = ib_ipath_max_qp_wrs;
+ dev->max_sge = ib_ipath_max_sges;
+ dev->max_sge_rd = ib_ipath_max_sges;
+ dev->max_cq = ib_ipath_max_cqs;
+ dev->max_ah = ib_ipath_max_ahs;
+ dev->max_cqe = ib_ipath_max_cqes;
+ dev->max_mr = idev->lk_table.max;
+ dev->max_fmr = idev->lk_table.max;
+ dev->max_map_per_fmr = 32767;
+ dev->max_pd = ib_ipath_max_pds;
+ dev->max_qp_rd_atom = IPATH_MAX_RDMA_ATOMIC;
+ dev->max_qp_init_rd_atom = 255;
+ /* dev->max_res_rd_atom */
+ dev->max_srq = ib_ipath_max_srqs;
+ dev->max_srq_wr = ib_ipath_max_srq_wrs;
+ dev->max_srq_sge = ib_ipath_max_srq_sges;
+ /* dev->local_ca_ack_delay */
+ dev->atomic_cap = IB_ATOMIC_GLOB;
+ dev->max_pkeys = ipath_get_npkeys(idev->dd);
+ dev->max_mcast_grp = ib_ipath_max_mcast_grps;
+ dev->max_mcast_qp_attach = ib_ipath_max_mcast_qp_attached;
+ dev->max_total_mcast_qp_attach = dev->max_mcast_qp_attach *
+ dev->max_mcast_grp;
+
snprintf(dev->node_desc, sizeof(dev->node_desc),
IPATH_IDSTR " %s", init_utsname()->nodename);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index f5d706e..9e28f15 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -192,54 +192,6 @@ struct ib_cq_init_attr {
u32 flags;
};
-struct ib_device_attr {
- u64 fw_ver;
- __be64 sys_image_guid;
- u64 max_mr_size;
- u64 page_size_cap;
- u32 vendor_id;
- u32 vendor_part_id;
- u32 hw_ver;
- int max_qp;
- int max_qp_wr;
- int device_cap_flags;
- int max_sge;
- int max_sge_rd;
- int max_cq;
- int max_cqe;
- int max_mr;
- int max_pd;
- int max_qp_rd_atom;
- int max_ee_rd_atom;
- int max_res_rd_atom;
- int max_qp_init_rd_atom;
- int max_ee_init_rd_atom;
- enum ib_atomic_cap atomic_cap;
- enum ib_atomic_cap masked_atomic_cap;
- int max_ee;
- int max_rdd;
- int max_mw;
- int max_raw_ipv6_qp;
- int max_raw_ethy_qp;
- int max_mcast_grp;
- int max_mcast_qp_attach;
- int max_total_mcast_qp_attach;
- int max_ah;
- int max_fmr;
- int max_map_per_fmr;
- int max_srq;
- int max_srq_wr;
- int max_srq_sge;
- unsigned int max_fast_reg_page_list_len;
- u16 max_pkeys;
- u8 local_ca_ack_delay;
- int sig_prot_cap;
- int sig_guard_cap;
- struct ib_odp_caps odp_caps;
- uint64_t timestamp_mask;
- uint64_t hca_core_clock; /* in KHZ */
-};
-
enum ib_mtu {
IB_MTU_256 = 1,
IB_MTU_512 = 2,
@@ -1608,7 +1560,6 @@ struct ib_device {
int (*get_protocol_stats)(struct ib_device *device,
union rdma_protocol_stats *stats);
int (*query_device)(struct ib_device *device,
- struct ib_device_attr *device_attr,
struct ib_udata *udata);
int (*query_port)(struct ib_device *device,
u8 port_num,
@@ -1829,6 +1780,52 @@ struct ib_device {
u8 node_type;
u8 phys_port_cnt;
+ u64 fw_ver;
+ __be64 sys_image_guid;
+ u64 max_mr_size;
+ u64 page_size_cap;
+ u32 vendor_id;
+ u32 vendor_part_id;
+ u32 hw_ver;
+ int max_qp;
+ int max_qp_wr;
+ int device_cap_flags;
+ int max_sge;
+ int max_sge_rd;
+ int max_cq;
+ int max_cqe;
+ int max_mr;
+ int max_pd;
+ int max_qp_rd_atom;
+ int max_ee_rd_atom;
+ int max_res_rd_atom;
+ int max_qp_init_rd_atom;
+ int max_ee_init_rd_atom;
+ enum ib_atomic_cap atomic_cap;
+ enum ib_atomic_cap masked_atomic_cap;
+ int max_ee;
+ int max_rdd;
+ int max_mw;
+ int max_raw_ipv6_qp;
+ int max_raw_ethy_qp;
+ int max_mcast_grp;
+ int max_mcast_qp_attach;
+ int max_total_mcast_qp_attach;
+ int max_ah;
+ int max_fmr;
+ int max_map_per_fmr;
+ int max_srq;
+ int max_srq_wr;
+ int max_srq_sge;
+ unsigned int max_fast_reg_page_list_len;
+ u16 max_pkeys;
+ u8 local_ca_ack_delay;
+ int sig_prot_cap;
+ int sig_guard_cap;
+ struct ib_odp_caps odp_caps;
+ uint64_t timestamp_mask;
+ uint64_t hca_core_clock; /* in KHZ */
+
/**
* The following mandatory functions are used only at device
* registration. Keep functions such as these at the end of this
@@ -1917,9 +1914,6 @@ int ib_register_event_handler (struct ib_event_handler *event_handler);
int ib_unregister_event_handler(struct ib_event_handler *event_handler);
void ib_dispatch_event(struct ib_event *event);
-int ib_query_device(struct ib_device *device,
- struct ib_device_attr *device_attr);
-
int ib_query_port(struct ib_device *device,
u8 port_num, struct ib_port_attr *port_attr);
diff --git a/net/rds/ib.c b/net/rds/ib.c
index 2d3f2ab..9ec4f39 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -120,40 +120,30 @@ void rds_ib_dev_put(struct rds_ib_device *rds_ibdev)
static void rds_ib_add_one(struct ib_device *device)
{
struct rds_ib_device *rds_ibdev;
- struct ib_device_attr *dev_attr;
/* Only handle IB (no iWARP) devices */
if (device->node_type != RDMA_NODE_IB_CA)
return;
- dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);
- if (!dev_attr)
- return;
-
- if (ib_query_device(device, dev_attr)) {
- rdsdebug("Query device failed for %s\n", device->name);
- goto free_attr;
- }
-
rds_ibdev = kzalloc_node(sizeof(struct rds_ib_device), GFP_KERNEL,
ibdev_to_node(device));
if (!rds_ibdev)
- goto free_attr;
+ return;
spin_lock_init(&rds_ibdev->spinlock);
atomic_set(&rds_ibdev->refcount, 1);
INIT_WORK(&rds_ibdev->free_work, rds_ib_dev_free);
- rds_ibdev->max_wrs = dev_attr->max_qp_wr;
- rds_ibdev->max_sge = min(dev_attr->max_sge, RDS_IB_MAX_SGE);
+ rds_ibdev->max_wrs = device->max_qp_wr;
+ rds_ibdev->max_sge = min(device->max_sge, RDS_IB_MAX_SGE);
- rds_ibdev->fmr_max_remaps = dev_attr->max_map_per_fmr?: 32;
- rds_ibdev->max_fmrs = dev_attr->max_fmr ?
- min_t(unsigned int, dev_attr->max_fmr, fmr_pool_size) :
+ rds_ibdev->fmr_max_remaps = device->max_map_per_fmr?: 32;
+ rds_ibdev->max_fmrs = device->max_fmr ?
+ min_t(unsigned int, device->max_fmr, fmr_pool_size) :
fmr_pool_size;
- rds_ibdev->max_initiator_depth = dev_attr->max_qp_init_rd_atom;
- rds_ibdev->max_responder_resources = dev_attr->max_qp_rd_atom;
+ rds_ibdev->max_initiator_depth = device->max_qp_init_rd_atom;
+ rds_ibdev->max_responder_resources = device->max_qp_rd_atom;
rds_ibdev->dev = device;
rds_ibdev->pd = ib_alloc_pd(device);
@@ -183,8 +173,6 @@ static void rds_ib_add_one(struct ib_device *device)
put_dev:
rds_ib_dev_put(rds_ibdev);
-free_attr:
- kfree(dev_attr);
}
/*
diff --git a/net/rds/iw.c b/net/rds/iw.c
index 3df0295..32be82a 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -60,30 +60,20 @@ LIST_HEAD(iw_nodev_conns);
static void rds_iw_add_one(struct ib_device *device)
{
struct rds_iw_device *rds_iwdev;
- struct ib_device_attr *dev_attr;
/* Only handle iwarp devices */
if (device->node_type != RDMA_NODE_RNIC)
return;
- dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);
- if (!dev_attr)
- return;
-
- if (ib_query_device(device, dev_attr)) {
- rdsdebug("Query device failed for %s\n", device->name);
- goto free_attr;
- }
-
rds_iwdev = kmalloc(sizeof *rds_iwdev, GFP_KERNEL);
if (!rds_iwdev)
- goto free_attr;
+ return;
spin_lock_init(&rds_iwdev->spinlock);
- rds_iwdev->dma_local_lkey = !!(dev_attr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY);
- rds_iwdev->max_wrs = dev_attr->max_qp_wr;
- rds_iwdev->max_sge = min(dev_attr->max_sge, RDS_IW_MAX_SGE);
+ rds_iwdev->dma_local_lkey = !!(device->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY);
+ rds_iwdev->max_wrs = device->max_qp_wr;
+ rds_iwdev->max_sge = min(device->max_sge, RDS_IW_MAX_SGE);
rds_iwdev->dev = device;
rds_iwdev->pd = ib_alloc_pd(device);
@@ -111,8 +101,7 @@ static void rds_iw_add_one(struct ib_device *device)
list_add_tail(&rds_iwdev->list, &rds_iw_devices);
ib_set_client_data(device, &rds_iw_client, rds_iwdev);
-
- goto free_attr;
+ return;
err_mr:
if (rds_iwdev->mr)
@@ -121,8 +110,6 @@ err_pd:
ib_dealloc_pd(rds_iwdev->pd);
free_dev:
kfree(rds_iwdev);
-free_attr:
- kfree(dev_attr);
}
static void rds_iw_remove_one(struct ib_device *device, void *client_data)
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 43bc30d..8d67699 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -190,12 +190,11 @@ static int
frwr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,
struct rpcrdma_create_data_internal *cdata)
{
- struct ib_device_attr *devattr = &ia->ri_devattr;
int depth, delta;
ia->ri_max_frmr_depth =
min_t(unsigned int, RPCRDMA_MAX_DATA_SEGS,
- devattr->max_fast_reg_page_list_len);
+ ia->ri_device->max_fast_reg_page_list_len);
dprintk("RPC: %s: device's max FR page list len = %u\n",
__func__, ia->ri_max_frmr_depth);
@@ -222,8 +221,8 @@ frwr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,
}
ep->rep_attr.cap.max_send_wr *= depth;
- if (ep->rep_attr.cap.max_send_wr > devattr->max_qp_wr) {
- cdata->max_requests = devattr->max_qp_wr / depth;
+ if (ep->rep_attr.cap.max_send_wr > ia->ri_device->max_qp_wr) {
+ cdata->max_requests = ia->ri_device->max_qp_wr / depth;
if (!cdata->max_requests)
return -EINVAL;
ep->rep_attr.cap.max_send_wr = cdata->max_requests *
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 6ee928f..e782f10 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -828,10 +828,10 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
struct rdma_conn_param conn_param;
struct ib_cq_init_attr cq_attr = {};
struct ib_qp_init_attr qp_attr;
- struct ib_device_attr devattr;
+ struct ib_device *dev;
int uninitialized_var(dma_mr_acc);
int need_dma_mr = 0;
- int ret;
+ int ret = 0;
int i;
listen_rdma = container_of(xprt, struct svcxprt_rdma, sc_xprt);
@@ -852,20 +852,15 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
dprintk("svcrdma: newxprt from accept queue = %p, cm_id=%p\n",
newxprt, newxprt->sc_cm_id);
- ret = ib_query_device(newxprt->sc_cm_id->device, &devattr);
- if (ret) {
- dprintk("svcrdma: could not query device attributes on "
- "device %p, rc=%d\n", newxprt->sc_cm_id->device, ret);
- goto errout;
- }
+ dev = newxprt->sc_cm_id->device;
/* Qualify the transport resource defaults with the
* capabilities of this particular device */
- newxprt->sc_max_sge = min((size_t)devattr.max_sge,
+ newxprt->sc_max_sge = min((size_t)dev->max_sge,
(size_t)RPCSVC_MAXPAGES);
- newxprt->sc_max_sge_rd = min_t(size_t, devattr.max_sge_rd,
+ newxprt->sc_max_sge_rd = min_t(size_t, dev->max_sge_rd,
RPCSVC_MAXPAGES);
- newxprt->sc_max_requests = min((size_t)devattr.max_qp_wr,
+ newxprt->sc_max_requests = min((size_t)dev->max_qp_wr,
(size_t)svcrdma_max_requests);
newxprt->sc_sq_depth = RPCRDMA_SQ_DEPTH_MULT * newxprt->sc_max_requests;
@@ -873,16 +868,16 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
* Limit ORD based on client limit, local device limit, and
* configured svcrdma limit.
*/
- newxprt->sc_ord = min_t(size_t, devattr.max_qp_rd_atom, newxprt->sc_ord);
+ newxprt->sc_ord = min_t(size_t, dev->max_qp_rd_atom, newxprt->sc_ord);
newxprt->sc_ord = min_t(size_t, svcrdma_ord, newxprt->sc_ord);
- newxprt->sc_pd = ib_alloc_pd(newxprt->sc_cm_id->device);
+ newxprt->sc_pd = ib_alloc_pd(dev);
if (IS_ERR(newxprt->sc_pd)) {
dprintk("svcrdma: error creating PD for connect request\n");
goto errout;
}
cq_attr.cqe = newxprt->sc_sq_depth;
- newxprt->sc_sq_cq = ib_create_cq(newxprt->sc_cm_id->device,
+ newxprt->sc_sq_cq = ib_create_cq(dev,
sq_comp_handler,
cq_event_handler,
newxprt,
@@ -892,7 +887,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
goto errout;
}
cq_attr.cqe = newxprt->sc_max_requests;
- newxprt->sc_rq_cq = ib_create_cq(newxprt->sc_cm_id->device,
+ newxprt->sc_rq_cq = ib_create_cq(dev,
rq_comp_handler,
cq_event_handler,
newxprt,
@@ -920,7 +915,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
" cap.max_send_sge = %d\n"
" cap.max_recv_sge = %d\n",
newxprt->sc_cm_id, newxprt->sc_pd,
- newxprt->sc_cm_id->device, newxprt->sc_pd->device,
+ dev, newxprt->sc_pd->device,
qp_attr.cap.max_send_wr,
qp_attr.cap.max_recv_wr,
qp_attr.cap.max_send_sge,
@@ -956,9 +951,9 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
* of an RDMA_READ. IB does not.
*/
newxprt->sc_reader = rdma_read_chunk_lcl;
- if (devattr.device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
+ if (dev->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
newxprt->sc_frmr_pg_list_len =
- devattr.max_fast_reg_page_list_len;
+ dev->max_fast_reg_page_list_len;
newxprt->sc_dev_caps |= SVCRDMA_DEVCAP_FAST_REG;
newxprt->sc_reader = rdma_read_chunk_frmr;
}
@@ -966,24 +961,20 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
/*
* Determine if a DMA MR is required and if so, what privs are required
*/
- if (!rdma_protocol_iwarp(newxprt->sc_cm_id->device,
- newxprt->sc_cm_id->port_num) &&
- !rdma_ib_or_roce(newxprt->sc_cm_id->device,
- newxprt->sc_cm_id->port_num))
+ if (!rdma_protocol_iwarp(dev, newxprt->sc_cm_id->port_num) &&
+ !rdma_ib_or_roce(dev, newxprt->sc_cm_id->port_num))
goto errout;
if (!(newxprt->sc_dev_caps & SVCRDMA_DEVCAP_FAST_REG) ||
- !(devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)) {
+ !(dev->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)) {
need_dma_mr = 1;
dma_mr_acc = IB_ACCESS_LOCAL_WRITE;
- if (rdma_protocol_iwarp(newxprt->sc_cm_id->device,
- newxprt->sc_cm_id->port_num) &&
+ if (rdma_protocol_iwarp(dev, newxprt->sc_cm_id->port_num) &&
!(newxprt->sc_dev_caps & SVCRDMA_DEVCAP_FAST_REG))
dma_mr_acc |= IB_ACCESS_REMOTE_WRITE;
}
- if (rdma_protocol_iwarp(newxprt->sc_cm_id->device,
- newxprt->sc_cm_id->port_num))
+ if (rdma_protocol_iwarp(dev, newxprt->sc_cm_id->port_num))
newxprt->sc_dev_caps |= SVCRDMA_DEVCAP_READ_W_INV;
/* Create the DMA MR if needed, otherwise, use the DMA LKEY */
@@ -998,8 +989,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
}
newxprt->sc_dma_lkey = newxprt->sc_phys_mr->lkey;
} else
- newxprt->sc_dma_lkey =
- newxprt->sc_cm_id->device->local_dma_lkey;
+ newxprt->sc_dma_lkey = dev->local_dma_lkey;
/* Post receive buffers */
for (i = 0; i < newxprt->sc_max_requests; i++) {
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 81e8d31..235db97 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -515,7 +515,6 @@ int
rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
{
struct rpcrdma_ia *ia = &xprt->rx_ia;
- struct ib_device_attr *devattr = &ia->ri_devattr;
int rc;
ia->ri_dma_mr = NULL;
@@ -535,16 +534,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
goto out2;
}
- rc = ib_query_device(ia->ri_device, devattr);
- if (rc) {
- dprintk("RPC: %s: ib_query_device failed %d\n",
- __func__, rc);
- goto out3;
- }
-
if (memreg == RPCRDMA_FRMR) {
- if (!(devattr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) ||
- (devattr->max_fast_reg_page_list_len == 0)) {
+ if (!(ia->ri_device->device_cap_flags &
+ IB_DEVICE_MEM_MGT_EXTENSIONS) ||
+ (ia->ri_device->max_fast_reg_page_list_len == 0)) {
dprintk("RPC: %s: FRMR registration "
"not supported by HCA\n", __func__);
memreg = RPCRDMA_MTHCAFMR;
@@ -619,20 +612,19 @@ int
rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
struct rpcrdma_create_data_internal *cdata)
{
- struct ib_device_attr *devattr = &ia->ri_devattr;
struct ib_cq *sendcq, *recvcq;
struct ib_cq_init_attr cq_attr = {};
int rc, err;
- if (devattr->max_sge < RPCRDMA_MAX_IOVS) {
+ if (ia->ri_device->max_sge < RPCRDMA_MAX_IOVS) {
dprintk("RPC: %s: insufficient sge's available\n",
__func__);
return -ENOMEM;
}
/* check provider's send/recv wr limits */
- if (cdata->max_requests > devattr->max_qp_wr)
- cdata->max_requests = devattr->max_qp_wr;
+ if (cdata->max_requests > ia->ri_device->max_qp_wr)
+ cdata->max_requests = ia->ri_device->max_qp_wr;
ep->rep_attr.event_handler = rpcrdma_qp_async_error_upcall;
ep->rep_attr.qp_context = ep;
@@ -713,11 +705,11 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
/* Client offers RDMA Read but does not initiate */
ep->rep_remote_cma.initiator_depth = 0;
- if (devattr->max_qp_rd_atom > 32) /* arbitrary but <= 255 */
+ if (ia->ri_device->max_qp_rd_atom > 32) /* arbitrary but <= 255 */
ep->rep_remote_cma.responder_resources = 32;
else
ep->rep_remote_cma.responder_resources =
- devattr->max_qp_rd_atom;
+ ia->ri_device->max_qp_rd_atom;
ep->rep_remote_cma.retry_count = 7;
ep->rep_remote_cma.flow_control = 0;
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 426a910..bcb7060 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -68,7 +68,6 @@ struct rpcrdma_ia {
struct completion ri_done;
int ri_async_rc;
unsigned int ri_max_frmr_depth;
- struct ib_device_attr ri_devattr;
struct ib_qp_attr ri_qp_attr;
struct ib_qp_init_attr ri_qp_init_attr;
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-10-12 6:57 ` [PATCH] IB: merge struct ib_device_attr into struct ib_device Christoph Hellwig
@ 2015-10-12 9:26 ` Sagi Grimberg
[not found] ` <561B7CAE.3040505-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-27 13:40 ` Sagi Grimberg
2 siblings, 1 reply; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-12 9:26 UTC (permalink / raw)
To: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/12/2015 9:57 AM, Christoph Hellwig wrote:
> This patch gets rid of struct ib_device_attr and cleans up drivers nicely.
>
> It goes on top of my send_wr cleanups and the memory registration udpates
> from Sagi.
>
> Changes since V1:
> - rebased on top of the Sagi's latest reg_api.6 branch
>
Christoph,
First go with this looks OK for mlx4. mlx5 needs the below incremental
patch to be folded in.
we need dev->ib_dev.max_pkeys set when get_port_caps() is called.
--
diff --git a/drivers/infiniband/hw/mlx5/main.c
b/drivers/infiniband/hw/mlx5/main.c
index 67b979f..5b73322 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1321,6 +1321,10 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
dev->mdev = mdev;
+ err = mlx5_ib_init_device_flags(&dev->ib_dev);
+ if (err)
+ goto err_dealloc;
+
err = get_port_caps(dev);
if (err)
goto err_dealloc;
@@ -1433,10 +1437,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
if (err)
goto err_rsrc;
- err = mlx5_ib_init_device_flags(&dev->ib_dev);
- if (err)
- goto err_rsrc;
-
err = ib_register_device(&dev->ib_dev, NULL);
if (err)
goto err_odp;
--
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <561B7CAE.3040505-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2015-10-12 14:42 ` Christoph Hellwig
[not found] ` <20151012144212.GB24770-jcswGhMUV9g@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-12 14:42 UTC (permalink / raw)
To: Sagi Grimberg; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Mon, Oct 12, 2015 at 12:26:06PM +0300, Sagi Grimberg wrote:
> First go with this looks OK for mlx4. mlx5 needs the below incremental
> patch to be folded in.
>
> we need dev->ib_dev.max_pkeys set when get_port_caps() is called.
Thanks, I've folded your patch and force pushed out the updated tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151012144212.GB24770-jcswGhMUV9g@public.gmane.org>
@ 2015-10-20 12:00 ` Sagi Grimberg
[not found] ` <56262CF9.1040509-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-20 12:00 UTC (permalink / raw)
To: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
So this patch seems to work well for me. I've ran some kernel
applications (ipoib, iser, srp, nfs) and a user-space application
(ibsrpdm) over mlx4/mlx5 and didn't spot any issues.
I think this is very useful to have and I'd love having it in 4.4,
does anyone have any other comments on this patch?
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56262CF9.1040509-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2015-10-20 12:53 ` Or Gerlitz
[not found] ` <CAJ3xEMhEE=Qp=LcYQYJB3rjfhdgd28QG_ZXbpFUCUubGD2uAGQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-20 12:53 UTC (permalink / raw)
To: Sagi Grimberg; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 3:00 PM, Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
> So this patch seems to work well for me. I've ran some kernel
> applications (ipoib, iser, srp, nfs) and a user-space application
> (ibsrpdm) over mlx4/mlx5 and didn't spot any issues.
>
> I think this is very useful to have and I'd love having it in 4.4,
> does anyone have any other comments on this patch?
Were we ever presented with performance gains achieved using the patch?
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <CAJ3xEMhEE=Qp=LcYQYJB3rjfhdgd28QG_ZXbpFUCUubGD2uAGQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-10-20 13:08 ` Sagi Grimberg
[not found] ` <56263CE6.5010005-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-20 13:08 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
>> I think this is very useful to have and I'd love having it in 4.4,
>> does anyone have any other comments on this patch?
>
> Were we ever presented with performance gains achieved using the patch?
Hi Or,
Can you explain what you mean by performance gains? My understanding is
that this patch is not performance critical. It just replaces each and
every ULP device attributes caching.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56263CE6.5010005-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2015-10-20 13:22 ` Christoph Hellwig
2015-10-20 14:08 ` Or Gerlitz
1 sibling, 0 replies; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-20 13:22 UTC (permalink / raw)
To: Sagi Grimberg
Cc: Or Gerlitz, Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 04:08:54PM +0300, Sagi Grimberg wrote:
> Can you explain what you mean by performance gains? My understanding is
> that this patch is not performance critical. It just replaces each and
> every ULP device attributes caching.
Exactly. The only 'performance' we care about is that of ULD writers :)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56263CE6.5010005-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 13:22 ` Christoph Hellwig
@ 2015-10-20 14:08 ` Or Gerlitz
[not found] ` <CAJ3xEMjmfNmiTiNctobN=BKvwB-oaMZtBxdqL5zVyvvG_M1KiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
1 sibling, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-20 14:08 UTC (permalink / raw)
To: Sagi Grimberg; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 4:08 PM, Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>>> I think this is very useful to have and I'd love having it in 4.4,
>>> does anyone have any other comments on this patch?
>> Were we ever presented with performance gains achieved using the patch?
> Can you explain what you mean by performance gains? My understanding is
> that this patch is not performance critical. It just replaces each and
> every ULP device attributes caching.
oops, sorry, I was referring to the patch that deals with
re-structuring of struct ib_wc, so...
(1) did we even got performance gains achieved using **that** patch?
(2) re this one, as I wrote in the past, I am in favor of simple
caching of struct
ib_device_attr on struct ib_device (best with pointer) and not adding
333 fields
to struct ib_device, I don't see the benefit from this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <CAJ3xEMjmfNmiTiNctobN=BKvwB-oaMZtBxdqL5zVyvvG_M1KiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-10-20 15:00 ` Sagi Grimberg
[not found] ` <56265702.1030209-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-20 15:00 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/20/2015 5:08 PM, Or Gerlitz wrote:
> On Tue, Oct 20, 2015 at 4:08 PM, Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>>>> I think this is very useful to have and I'd love having it in 4.4,
>>>> does anyone have any other comments on this patch?
>
>>> Were we ever presented with performance gains achieved using the patch?
>
>> Can you explain what you mean by performance gains? My understanding is
>> that this patch is not performance critical. It just replaces each and
>> every ULP device attributes caching.
>
> oops, sorry, I was referring to the patch that deals with
> re-structuring of struct ib_wc, so...
>
> (1) did we even got performance gains achieved using **that** patch?
I don't know if we'd see noticeable performance gains from **that**
patch either.. The benefit is mostly stack relief as usually ULPs keep
the work request structure on the stack.
>
> (2) re this one, as I wrote in the past, I am in favor of simple
> caching of struct
> ib_device_attr on struct ib_device (best with pointer) and not adding
> 333 fields
> to struct ib_device, I don't see the benefit from this patch.
>
Christoph commented on that:
"I'm strongly against this. As the reviews show the move is highly
confusing. The attributes don't change and there is no need to 'cache'
or 'query' them. Just merge them into the device, follow years of
experience with how every other Linux subsystem does it and be done
with it."
If the attributes are automatically a part of the ib_device then it
does seem a bit redundant keeping the structure around...
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56265702.1030209-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2015-10-20 15:07 ` Or Gerlitz
[not found] ` <CAJ3xEMh12RjU9ws3r5djigHdkMGnT35+uouRAMzGxj2jhmgKFA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-20 15:07 UTC (permalink / raw)
To: Sagi Grimberg; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 6:00 PM, Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>> (2) re this one, as I wrote in the past, I am in favor of simple
>> caching of struct ib_device_attr on struct ib_device (best with pointer) and not adding
>> 333 fields to struct ib_device, I don't see the benefit from this patch.
> Christoph commented on that:
>
> "I'm strongly against this. As the reviews show the move is highly
> confusing. The attributes don't change and there is no need to 'cache'
> or 'query' them. Just merge them into the device, follow years of
> experience with how every other Linux subsystem does it and be done
> with it."
>
> If the attributes are automatically a part of the ib_device then it
> does seem a bit redundant keeping the structure around...
But this makes struct ib_device much much bigger, and this structure
is used in **fast** path,
e.g the ULP traverses through a pointer from struct ib_device to
post_send/recv, poll_cq and friends.
The networking community will let you work for 10y before they add a
field to struct net_device exactly b/c
of the reason I brought. Why here we can come out of the blue and add
tens if not hundreds of fields to our device structure?
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <CAJ3xEMh12RjU9ws3r5djigHdkMGnT35+uouRAMzGxj2jhmgKFA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-10-20 15:13 ` Sagi Grimberg
[not found] ` <56265A1F.6090204-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-21 6:38 ` Christoph Hellwig
1 sibling, 1 reply; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-20 15:13 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
> But this makes struct ib_device much much bigger, and this structure
> is used in **fast** path,
> e.g the ULP traverses through a pointer from struct ib_device to
> post_send/recv, poll_cq and friends.
Umm, all the caps are appended to the end of the ib_device structure so
I don't see how it will affect the fast path - am I missing something?
>
> The networking community will let you work for 10y before they add a
> field to struct net_device exactly b/c
> of the reason I brought. Why here we can come out of the blue and add
> tens if not hundreds of fields to our device structure?
Keeping struct ib_device_attr embedded at the end of struct ib_device is
exactly the same isn't it?
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56265A1F.6090204-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2015-10-20 15:39 ` Or Gerlitz
2015-10-21 6:40 ` Christoph Hellwig
1 sibling, 0 replies; 28+ messages in thread
From: Or Gerlitz @ 2015-10-20 15:39 UTC (permalink / raw)
To: Sagi Grimberg; +Cc: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 6:13 PM, Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>> The networking community will let you work for 10y before they add a
>> field to struct net_device exactly b/c
>> of the reason I brought. Why here we can come out of the blue and add
>> tens if not hundreds of fields to our device structure?
> Keeping struct ib_device_attr embedded at the end of struct ib_device is
> exactly the same isn't it?
I said " (best with pointer)"
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <CAJ3xEMh12RjU9ws3r5djigHdkMGnT35+uouRAMzGxj2jhmgKFA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 15:13 ` Sagi Grimberg
@ 2015-10-21 6:38 ` Christoph Hellwig
[not found] ` <20151021063830.GA19027-jcswGhMUV9g@public.gmane.org>
1 sibling, 1 reply; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-21 6:38 UTC (permalink / raw)
To: Or Gerlitz
Cc: Sagi Grimberg, Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 06:07:31PM +0300, Or Gerlitz wrote:
> But this makes struct ib_device much much bigger, and this structure
> is used in **fast** path,
> e.g the ULP traverses through a pointer from struct ib_device to
> post_send/recv, poll_cq and friends.
But it doesn't get near the end of the structure. Maybe it's time for a
little cache line 101 primer?
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56265A1F.6090204-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 15:39 ` Or Gerlitz
@ 2015-10-21 6:40 ` Christoph Hellwig
1 sibling, 0 replies; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-21 6:40 UTC (permalink / raw)
To: Sagi Grimberg
Cc: Or Gerlitz, Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, Oct 20, 2015 at 06:13:35PM +0300, Sagi Grimberg wrote:
>> The networking community will let you work for 10y before they add a
>> field to struct net_device exactly b/c
>> of the reason I brought. Why here we can come out of the blue and add
>> tens if not hundreds of fields to our device structure?
>
> Keeping struct ib_device_attr embedded at the end of struct ib_device is
> exactly the same isn't it?
In terms of layout it is, in terms of usability it's worse. Just to take
the networking example Or seems to like so much there is no struct netdev_attr
to which fields of struct netdev are moved out to, which you then need to
query and cache anyway in your private device structure. This design simply
was a idiotic idea to start with and I don't understand why anyone would
han onto it. I do understand Chuck's concern about churn, but I'd rather
fix the infiniband subsystem up before we're growing even more users.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151021063830.GA19027-jcswGhMUV9g@public.gmane.org>
@ 2015-10-21 6:44 ` Or Gerlitz
[not found] ` <56273459.6050007-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-21 6:44 UTC (permalink / raw)
To: Christoph Hellwig, Or Gerlitz
Cc: Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/21/2015 9:38 AM, Christoph Hellwig wrote:
> On Tue, Oct 20, 2015 at 06:07:31PM +0300, Or Gerlitz wrote:
>> >But this makes struct ib_device much much bigger, and this structure
>> >is used in **fast** path,
>> >e.g the ULP traverses through a pointer from struct ib_device to
>> >post_send/recv, poll_cq and friends.
> But it doesn't get near the end of the structure. Maybe it's time for a
> little cache line 101 primer?
Oh, not that I am fully qualified on that front, but I understand the
end-of-structure argument.
Fact is that for struct net_device you will not add 333 new fields over
night in the coming 33 years, for sure.
This makes much sense to me, as a guideline. I don't think we should
have a device structure with the current
100 fields and another few hundreds without any notable benefit and
against the common practice in the networking
subsystem.
We have a UAPI that requires us to keep the device query verb for ever,
and hence the returned device attr struct,
it would be a much smaller and noisy patch to cache an device attr
pointer on the device structure.
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56273459.6050007-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
@ 2015-10-21 6:51 ` Christoph Hellwig
[not found] ` <20151021065134.GA19210-jcswGhMUV9g@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-21 6:51 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Or Gerlitz, Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 09:44:41AM +0300, Or Gerlitz wrote:
> Fact is that for struct net_device you will not add 333 new fields over
> night in the coming 33 years, for sure.
That's because they never had this split and added fields to struct netdev
as required. One interesting difference in netdev is that it move all
the function pointers out to a different structure so it could be kept
const. This introduces one more level of pointer chasing but has other
advantages.
> This makes much sense to me, as a guideline. I don't think we should have a
> device structure with the current
> 100 fields and another few hundreds without any notable benefit and against
> the common practice in the networking
> subsystem.
Please understand the networking subsystem (or SCSI, or NVMe, or ...) before
making such incorrect comments. We're moving towards how all other
subsystems work.
> We have a UAPI that requires us to keep the device query verb for ever, and
> hence the returned device attr struct,
> it would be a much smaller and noisy patch to cache an device attr pointer
> on the device structure.
Take a look at the code. The only time we ever call into ->query_device is
for the userspace only timestamping extensions only implemented for mlx4.
With all the stuff we have on the plate the kernel API will look substatially
different from the arkane 'Verbs' implementation in userspace, and they will
use less and less common code. Libuvers and the ABIs it uses are something
we can't change unfortunately, but we can make the kernel API much much
better by learining lessons from other kernel subsystems. That's work
that Jason Sagi and me have been doing for a while.
I'd also suggest you update your Linux knowledge before trying to
micromanage patch submissions.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151021065134.GA19210-jcswGhMUV9g@public.gmane.org>
@ 2015-10-21 7:11 ` Or Gerlitz
[not found] ` <56273AA1.6060607-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-21 7:11 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Or Gerlitz, Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/21/2015 9:51 AM, Christoph Hellwig wrote:
>> We have a UAPI that requires us to keep the device query verb for ever, and
>> hence the returned device attr struct, it would be a much smaller and noisy patch pointer
>> to cache an device attr on the device structure.
> Take a look at the code. The only time we ever call into ->query_device is
> for the userspace only timestamping extensions only implemented for mlx4.
We will have many more device query extensions, but the point I tried to
make here is a bit different --
we do need to keep the user/kernel device attr struct as part of the
UAPI, and don't see any reason to
avoid it in the kernel, just because some other subsystems do that,
according to your view. As I said, you
would have to work real (real) hard to convince the networking ppl to
add fields to struct net_device sk_buff
and friends... the nature of rdma/offloading is such that new attr come
often and I don't think we need
to touch our device struct every release.
> With all the stuff we have on the plate the kernel API will look substatially
> different from the arkane 'Verbs' implementation in userspace, and they will
> use less and less common code. Libuvers and the ABIs it uses are something
> we can't change unfortunately, but we can make the kernel API much much
> better by learining lessons from other kernel subsystems. That's work
> that Jason Sagi and me have been doing for a while.
>
> I'd also suggest you update your Linux knowledge before trying to
> micromanage patch submissions.
not trying to micro-manage @ all, I went over the archives and haven't
found any review or ack
to your giant patch that touches the whole subsystem (drivers, core and
ULPs) expect from Sagi's
-- lets hear more opinions. Re my education -- can you make the argument
more precise: what are we
making much much better in the kernel API by thins house moving exercise?
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56273AA1.6060607-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
@ 2015-10-21 7:33 ` Christoph Hellwig
[not found] ` <20151021073338.GA19626-jcswGhMUV9g@public.gmane.org>
2015-10-21 15:48 ` Bart Van Assche
1 sibling, 1 reply; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-21 7:33 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 10:11:29AM +0300, Or Gerlitz wrote:
>
> We will have many more device query extensions,
None of which use struct ib_device_attr I hope!
> but the point I tried to
> make here is a bit different --
> we do need to keep the user/kernel device attr struct as part of the UAPI,
It's an entirely separate ib_uverbs_query_device_resp structure.
> and don't see any reason to
> avoid it in the kernel, just because some other subsystems do that,
> according to your view. As I said, you
> would have to work real (real) hard to convince the networking ppl to add
> fields to struct net_device sk_buff
Or, please stop these bullshit strawman arguments. Yes, adding fields to
struct sk_buff will be hard, but that's not the right comparism. struct
sk_buff is a structured allocated for the data buffers in great quantities and
not the net_device structure allocated once per device. I'm going to
finish this email, but if you don't even try to get your facts right I'll stop
responding ro you because it's futile.
> and friends... the nature of rdma/offloading is such that new attr come
> often and I don't think we need
> to touch our device struct every release.
For anything you want to add you need to touch _a_ struct. It's not any
difference in efforts if it's ib_device_attr or ib_device.
You're not even saving much memory if at all as every driver caches at
least some fields of it in their own device structure, and iser, isert,
srpt and nfs cache the full structure, so if you use one of those you're
already having one of them per device. If you use two of them you
have multiple copies plus individual fields caches by other ULDs and core
code.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151021073338.GA19626-jcswGhMUV9g@public.gmane.org>
@ 2015-10-21 7:41 ` Or Gerlitz
[not found] ` <56274199.1030800-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-21 7:41 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/21/2015 10:33 AM, Christoph Hellwig wrote:
> For anything you want to add you need to touch_a_ struct. It's not any
> difference in efforts if it's ib_device_attr or ib_device.
>
> You're not even saving much memory if at all as every driver caches at
> least some fields of it in their own device structure, and iser, isert,
> srpt and nfs cache the full structure,
I know, but a patch that adds caching an attr pointer on the device will
remove these local caches,
we actually had that/similar patch posted here and it was dropped/forgotten.
> so if you use one of those you're
> already having one of them per device. If you use two of them you
> have multiple copies plus individual fields caches by other ULDs and core
> code.
again, the method I propose does remove these duplications all together.
I am still waiting to hear what is the precise argument for having this
change.
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56274199.1030800-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
@ 2015-10-21 7:43 ` Christoph Hellwig
0 siblings, 0 replies; 28+ messages in thread
From: Christoph Hellwig @ 2015-10-21 7:43 UTC (permalink / raw)
To: Or Gerlitz; +Cc: Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 10:41:13AM +0300, Or Gerlitz wrote:
> I know, but a patch that adds caching an attr pointer on the device will
> remove these local caches,
> we actually had that/similar patch posted here and it was dropped/forgotten.
>
>> so if you use one of those you're
>> already having one of them per device. If you use two of them you
>> have multiple copies plus individual fields caches by other ULDs and core
>> code.
>
> again, the method I propose does remove these duplications all together.
>
> I am still waiting to hear what is the precise argument for having this
> change.
It does everything the pointer does, but in addition saves memory (no
rounding up of the slab size), reduces pointer chasing and makes and API
that's easier to use and more similar to how all other major Linux subsystems
work.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <56273AA1.6060607-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21 7:33 ` Christoph Hellwig
@ 2015-10-21 15:48 ` Bart Van Assche
[not found] ` <5627B3BA.7060700-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
1 sibling, 1 reply; 28+ messages in thread
From: Bart Van Assche @ 2015-10-21 15:48 UTC (permalink / raw)
To: Or Gerlitz, Christoph Hellwig
Cc: Or Gerlitz, Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/21/2015 12:11 AM, Or Gerlitz wrote:
> haven't found any review or ack to your giant patch that touches the
> whole subsystem (drivers, core and ULPs) expect from Sagi's -- lets
> hear more opinions.
Although I have not yet had the time to review the entire patch,
removing ib_query_device() seems a great idea to me and an idea that I
welcome very much. The ib_device_attr structure is too large to be
allocated on the stack. This means that with Christoph's patch it is no
longer needed to call kmalloc() + ib_query_device() + kfree() when a
device attribute is needed from kernel code.
Bart.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <5627B3BA.7060700-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
@ 2015-10-21 16:43 ` Jason Gunthorpe
[not found] ` <20151021164356.GA17666-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-10-21 18:08 ` Or Gerlitz
1 sibling, 1 reply; 28+ messages in thread
From: Jason Gunthorpe @ 2015-10-21 16:43 UTC (permalink / raw)
To: Bart Van Assche
Cc: Or Gerlitz, Christoph Hellwig, Or Gerlitz, Sagi Grimberg,
linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 08:48:10AM -0700, Bart Van Assche wrote:
> On 10/21/2015 12:11 AM, Or Gerlitz wrote:
> >haven't found any review or ack to your giant patch that touches the
> > whole subsystem (drivers, core and ULPs) expect from Sagi's -- lets
> > hear more opinions.
>
> Although I have not yet had the time to review the entire patch, removing
> ib_query_device() seems a great idea to me and an idea that I welcome very
> much. The ib_device_attr structure is too large to be allocated on the
> stack. This means that with Christoph's patch it is no longer needed to call
> kmalloc() + ib_query_device() + kfree() when a device attribute is needed
> from kernel code.
I agree, this is absolutely the right way to go.
The bikeshedding is not important, nobody has come up with a reason
why we need to maintain the attr structure as-is and Christoph already
has a patch - I say go with it.
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151021164356.GA17666-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
@ 2015-10-21 17:21 ` Steve Wise
0 siblings, 0 replies; 28+ messages in thread
From: Steve Wise @ 2015-10-21 17:21 UTC (permalink / raw)
To: Jason Gunthorpe, Bart Van Assche
Cc: Or Gerlitz, Christoph Hellwig, Or Gerlitz, Sagi Grimberg,
linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10/21/2015 11:43 AM, Jason Gunthorpe wrote:
> On Wed, Oct 21, 2015 at 08:48:10AM -0700, Bart Van Assche wrote:
>> On 10/21/2015 12:11 AM, Or Gerlitz wrote:
>>> haven't found any review or ack to your giant patch that touches the
>>> whole subsystem (drivers, core and ULPs) expect from Sagi's -- lets
>>> hear more opinions.
>> Although I have not yet had the time to review the entire patch, removing
>> ib_query_device() seems a great idea to me and an idea that I welcome very
>> much. The ib_device_attr structure is too large to be allocated on the
>> stack. This means that with Christoph's patch it is no longer needed to call
>> kmalloc() + ib_query_device() + kfree() when a device attribute is needed
>> from kernel code.
> I agree, this is absolutely the right way to go.
>
> The bikeshedding is not important, nobody has come up with a reason
> why we need to maintain the attr structure as-is and Christoph already
> has a patch - I say go with it.
>
> Jason
>
While I don't really like the uber patch review-wise, I'm all for nuking
ib_query_device() and the attr struct.
Steve.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <5627B3BA.7060700-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2015-10-21 16:43 ` Jason Gunthorpe
@ 2015-10-21 18:08 ` Or Gerlitz
[not found] ` <CAJ3xEMh3pE61sNaZKBr8k47Lb52cUc=n4JToXvvKyrTTu3WW2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
1 sibling, 1 reply; 28+ messages in thread
From: Or Gerlitz @ 2015-10-21 18:08 UTC (permalink / raw)
To: Bart Van Assche, Steve Wise, Jason Gunthorpe
Cc: Or Gerlitz, Christoph Hellwig, Sagi Grimberg,
linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 6:48 PM, Bart Van Assche
<bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org> wrote:
> On 10/21/2015 12:11 AM, Or Gerlitz wrote:
>>
>> haven't found any review or ack to your giant patch that touches the
>
>> whole subsystem (drivers, core and ULPs) expect from Sagi's -- lets
>> hear more opinions.
>
> Although I have not yet had the time to review the entire patch, removing
> ib_query_device() seems a great idea to me and an idea that I welcome very
> much. The ib_device_attr structure is too large to be allocated on the
> stack. This means that with Christoph's patch it is no longer needed to call
> kmalloc() + ib_query_device() + kfree() when a device attribute is needed
> from kernel code.
Bart, Jason, Steve,
The alternative approach to address this which was also running here
in the form of a patch from Ira following a reviewer comment from me,
is the have struct ib_device to contain a struct ib_device_attr member
(potentially a pointer) which is filled by the device driver before
they register themselves with the IB core.
This way there's no need for kmalloc() + ib_query_device() + kfree()
when a device attribute is needed and we don't introduce tens/hundreds
new fields for struct ib_device.
Thoughts?
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <CAJ3xEMh3pE61sNaZKBr8k47Lb52cUc=n4JToXvvKyrTTu3WW2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-10-21 18:20 ` Jason Gunthorpe
[not found] ` <20151021182019.GB15771-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
0 siblings, 1 reply; 28+ messages in thread
From: Jason Gunthorpe @ 2015-10-21 18:20 UTC (permalink / raw)
To: Or Gerlitz
Cc: Bart Van Assche, Steve Wise, Or Gerlitz, Christoph Hellwig,
Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 09:08:31PM +0300, Or Gerlitz wrote:
> The alternative approach to address this which was also running here
> in the form of a patch from Ira following a reviewer comment from me,
> is the have struct ib_device to contain a struct ib_device_attr member
> (potentially a pointer) which is filled by the device driver before
> they register themselves with the IB core.
No to the pointer idea.
> This way there's no need for kmalloc() + ib_query_device() + kfree()
> when a device attribute is needed and we don't introduce tens/hundreds
> new fields for struct ib_device.
I care very little if the name is ibdev->attr.foo or ibdev->foo, that is
just bikeshedding.
I have a slight preference toward ibdev->foo to match other subsystems.
I have no idea why you care so much about something so trivial.
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <20151021182019.GB15771-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
@ 2015-10-21 18:50 ` Or Gerlitz
0 siblings, 0 replies; 28+ messages in thread
From: Or Gerlitz @ 2015-10-21 18:50 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Bart Van Assche, Steve Wise, Or Gerlitz, Christoph Hellwig,
Sagi Grimberg, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Wed, Oct 21, 2015 at 9:20 PM, Jason Gunthorpe
<jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> wrote:
> No to the pointer idea.
can you spare few words why?
And if you have a valid argument, as Christoph said they teach in
cache 101 course which he's pretty sure I skipped as twenty other
courses taken by kernel developers, put the no pointer member @ the
end
> I have a slight preference toward ibdev->foo to match other subsystems.
I have a slight preference to keep the struct ib_device_attr notion to
match other portions of the RDMA stack such as the UAPI and the user
space API to applications.
> I have no idea why you care so much about something so trivial.
I don't care so much, I have the small right to speak without getting
so much mud on my head.
Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: merge struct ib_device_attr into struct ib_device V2
[not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-10-12 6:57 ` [PATCH] IB: merge struct ib_device_attr into struct ib_device Christoph Hellwig
2015-10-12 9:26 ` merge struct ib_device_attr into struct ib_device V2 Sagi Grimberg
@ 2015-10-27 13:40 ` Sagi Grimberg
2 siblings, 0 replies; 28+ messages in thread
From: Sagi Grimberg @ 2015-10-27 13:40 UTC (permalink / raw)
To: Christoph Hellwig, linux-rdma-u79uwXL29TY76Z2rM5mHXA
Did we converge on this?
Just a heads up to Doug, this conflicts with
[PATCH v4 11/16] xprtrdma: Pre-allocate Work Requests for backchannel
but it's trivial to sort out...
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2015-10-27 13:40 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 6:57 merge struct ib_device_attr into struct ib_device V2 Christoph Hellwig
[not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-10-12 6:57 ` [PATCH] IB: merge struct ib_device_attr into struct ib_device Christoph Hellwig
2015-10-12 9:26 ` merge struct ib_device_attr into struct ib_device V2 Sagi Grimberg
[not found] ` <561B7CAE.3040505-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-12 14:42 ` Christoph Hellwig
[not found] ` <20151012144212.GB24770-jcswGhMUV9g@public.gmane.org>
2015-10-20 12:00 ` Sagi Grimberg
[not found] ` <56262CF9.1040509-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 12:53 ` Or Gerlitz
[not found] ` <CAJ3xEMhEE=Qp=LcYQYJB3rjfhdgd28QG_ZXbpFUCUubGD2uAGQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 13:08 ` Sagi Grimberg
[not found] ` <56263CE6.5010005-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 13:22 ` Christoph Hellwig
2015-10-20 14:08 ` Or Gerlitz
[not found] ` <CAJ3xEMjmfNmiTiNctobN=BKvwB-oaMZtBxdqL5zVyvvG_M1KiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 15:00 ` Sagi Grimberg
[not found] ` <56265702.1030209-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 15:07 ` Or Gerlitz
[not found] ` <CAJ3xEMh12RjU9ws3r5djigHdkMGnT35+uouRAMzGxj2jhmgKFA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 15:13 ` Sagi Grimberg
[not found] ` <56265A1F.6090204-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 15:39 ` Or Gerlitz
2015-10-21 6:40 ` Christoph Hellwig
2015-10-21 6:38 ` Christoph Hellwig
[not found] ` <20151021063830.GA19027-jcswGhMUV9g@public.gmane.org>
2015-10-21 6:44 ` Or Gerlitz
[not found] ` <56273459.6050007-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21 6:51 ` Christoph Hellwig
[not found] ` <20151021065134.GA19210-jcswGhMUV9g@public.gmane.org>
2015-10-21 7:11 ` Or Gerlitz
[not found] ` <56273AA1.6060607-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21 7:33 ` Christoph Hellwig
[not found] ` <20151021073338.GA19626-jcswGhMUV9g@public.gmane.org>
2015-10-21 7:41 ` Or Gerlitz
[not found] ` <56274199.1030800-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21 7:43 ` Christoph Hellwig
2015-10-21 15:48 ` Bart Van Assche
[not found] ` <5627B3BA.7060700-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2015-10-21 16:43 ` Jason Gunthorpe
[not found] ` <20151021164356.GA17666-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-10-21 17:21 ` Steve Wise
2015-10-21 18:08 ` Or Gerlitz
[not found] ` <CAJ3xEMh3pE61sNaZKBr8k47Lb52cUc=n4JToXvvKyrTTu3WW2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-21 18:20 ` Jason Gunthorpe
[not found] ` <20151021182019.GB15771-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-10-21 18:50 ` Or Gerlitz
2015-10-27 13:40 ` Sagi Grimberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.