On Wed, 2015-02-04 at 18:29 -0500, ira.weiny@xxxxxxxxx wrote:
> From: Ira Weiny <ira.weiny@xxxxxxxxx>
>
> Change all IB drivers to report the max MAD size.
> Add check to verify that all devices support at least IB_MGMT_MAD_SIZE
>
> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
>
> ---
>
> Changes from V3:
> Fix ehca compile found with 0-day build
>
> drivers/infiniband/core/mad.c | 6 ++++++
> drivers/infiniband/hw/amso1100/c2_rnic.c | 1 +
> drivers/infiniband/hw/cxgb3/iwch_provider.c | 1 +
> drivers/infiniband/hw/cxgb4/provider.c | 1 +
> drivers/infiniband/hw/ehca/ehca_hca.c | 3 +++
> drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
> drivers/infiniband/hw/mlx4/main.c | 1 +
> drivers/infiniband/hw/mlx5/main.c | 1 +
> drivers/infiniband/hw/mthca/mthca_provider.c | 2 ++
> drivers/infiniband/hw/nes/nes_verbs.c | 1 +
> drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 +
> drivers/infiniband/hw/qib/qib_verbs.c | 1 +
> drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 ++
> include/rdma/ib_mad.h | 1 +
> include/rdma/ib_verbs.h | 1 +
> 15 files changed, 24 insertions(+)
>
> diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
> index 819b794..a6a33cf 100644
> --- a/drivers/infiniband/core/mad.c
> +++ b/drivers/infiniband/core/mad.c
> @@ -2924,6 +2924,12 @@ static int ib_mad_port_open(struct ib_device *device,
> char name[sizeof "ib_mad123"];
> int has_smi;
>
> + if (device->cached_dev_attrs.max_mad_size < IB_MGMT_MAD_SIZE) {
> + dev_err(&device->dev, "Min MAD size for device is %u\n",
> + IB_MGMT_MAD_SIZE);
> + return -EFAULT;
> + }
> +
The printk message here is not very informative and it qualifies as an
error. Someone reading that for the first time in the dmesg output and
wondering why their device isn't working will be confused if they don't
know about the mad size changes you are making here. Something like
"max supported MAD size (%u) < min required by ib_mad (%u), ignoring dev
\n"
> /* Create new device info */
> port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
> if (!port_priv) {
> diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
> index d2a6d96..63322c0 100644
> --- a/drivers/infiniband/hw/amso1100/c2_rnic.c
> +++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
> @@ -197,6 +197,7 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
> props->max_srq_sge = 0;
> props->max_pkeys = 0;
> props->local_ca_ack_delay = 0;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> bail2:
> vq_repbuf_free(c2dev, reply);
> diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> index 811b24a..b8a80aa0 100644
> --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
> +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> @@ -1174,6 +1174,7 @@ static int iwch_query_device(struct ib_device *ibdev,
> props->max_pd = dev->attr.max_pds;
> props->local_ca_ack_delay = 0;
> props->max_fast_reg_page_list_len = T3_MAX_FASTREG_DEPTH;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> return 0;
> }
> diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
> index 66bd6a2..299c70c 100644
> --- a/drivers/infiniband/hw/cxgb4/provider.c
> +++ b/drivers/infiniband/hw/cxgb4/provider.c
> @@ -332,6 +332,7 @@ static int c4iw_query_device(struct ib_device *ibdev,
> 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);
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> return 0;
> }
> diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
> index 9ed4d25..6166146 100644
> --- a/drivers/infiniband/hw/ehca/ehca_hca.c
> +++ b/drivers/infiniband/hw/ehca/ehca_hca.c
> @@ -40,6 +40,7 @@
> */
>
> #include <linux/gfp.h>
> +#include <rdma/ib_mad.h>
>
> #include "ehca_tools.h"
> #include "ehca_iverbs.h"
> @@ -133,6 +134,8 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
> if (rblock->hca_cap_indicators & cap_mapping[i + 1])
> props->device_cap_flags |= cap_mapping[i];
>
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
> +
> query_device1:
> ehca_free_fw_ctrlblock(rblock);
>
> diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
> index 44ea939..4c6474c 100644
> --- a/drivers/infiniband/hw/ipath/ipath_verbs.c
> +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
> @@ -1538,6 +1538,7 @@ static int ipath_query_device(struct ib_device *ibdev,
> 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;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> return 0;
> }
> diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
> index 57ecc5b..88326a7 100644
> --- a/drivers/infiniband/hw/mlx4/main.c
> +++ b/drivers/infiniband/hw/mlx4/main.c
> @@ -229,6 +229,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
> 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->max_mad_size = IB_MGMT_MAD_SIZE;
>
> out:
> kfree(in_mad);
> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
> index 8a87404..24a0a54 100644
> --- a/drivers/infiniband/hw/mlx5/main.c
> +++ b/drivers/infiniband/hw/mlx5/main.c
> @@ -243,6 +243,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
> 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 */
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
> if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
> diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
> index 415f8e1..236c0df 100644
> --- a/drivers/infiniband/hw/mthca/mthca_provider.c
> +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
> @@ -123,6 +123,8 @@ static int mthca_query_device(struct ib_device *ibdev,
> props->max_map_per_fmr =
> (1 << (32 - ilog2(mdev->limits.num_mpts))) - 1;
>
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
> +
> err = 0;
> out:
> kfree(in_mad);
> diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
> index c0d0296..93e67e2 100644
> --- a/drivers/infiniband/hw/nes/nes_verbs.c
> +++ b/drivers/infiniband/hw/nes/nes_verbs.c
> @@ -555,6 +555,7 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop
> props->max_qp_init_rd_atom = props->max_qp_rd_atom;
> props->atomic_cap = IB_ATOMIC_NONE;
> props->max_map_per_fmr = 1;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> return 0;
> }
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index fb8d8c4..7ae0a22 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -103,6 +103,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
> 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;
> + attr->max_mad_size = IB_MGMT_MAD_SIZE;
> return 0;
> }
>
> diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
> index 9bcfbd8..5d6447b 100644
> --- a/drivers/infiniband/hw/qib/qib_verbs.c
> +++ b/drivers/infiniband/hw/qib/qib_verbs.c
> @@ -1591,6 +1591,7 @@ static int qib_query_device(struct ib_device *ibdev,
> 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;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
>
> return 0;
> }
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> index 53bd6a2..b72ad7f 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
> @@ -22,6 +22,7 @@
>
> #include <rdma/ib_user_verbs.h>
> #include <rdma/ib_addr.h>
> +#include <rdma/ib_mad.h>
>
> #include "usnic_abi.h"
> #include "usnic_ib.h"
> @@ -296,6 +297,7 @@ int usnic_ib_query_device(struct ib_device *ibdev,
> props->max_mcast_qp_attach = 0;
> props->max_total_mcast_qp_attach = 0;
> props->max_map_per_fmr = 0;
> + props->max_mad_size = IB_MGMT_MAD_SIZE;
> /* Owned by Userspace
> * max_qp_wr, max_sge, max_sge_rd, max_cqe */
> mutex_unlock(&us_ibdev->usdev_lock);
> diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
> index 9c89939..5823016 100644
> --- a/include/rdma/ib_mad.h
> +++ b/include/rdma/ib_mad.h
> @@ -135,6 +135,7 @@ enum {
> IB_MGMT_SA_DATA = 200,
> IB_MGMT_DEVICE_HDR = 64,
> IB_MGMT_DEVICE_DATA = 192,
> + IB_MGMT_MAD_SIZE = IB_MGMT_MAD_HDR + IB_MGMT_MAD_DATA,
> };
>
> struct ib_mad_hdr {
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index 0116e4b..64d3479 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -210,6 +210,7 @@ struct ib_device_attr {
> int sig_prot_cap;
> int sig_guard_cap;
> struct ib_odp_caps odp_caps;
> + u32 max_mad_size;
> };
>
> enum ib_mtu {
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: This is a digitally signed message part
