On Fri, Sep 09, 2016 at 06:30:47PM +0800, Salil Mehta wrote: > From: Lijun Ou <[email protected]> > > The mtu should be validated when modify qp,so we check it. > > Signed-off-by: Lijun Ou <[email protected]> > Signed-off-by: Peter Chen <[email protected]> > Reviewed-by: Wei Hu (Xavier) <[email protected]> > Signed-off-by: Salil Mehta <[email protected]> > --- > drivers/infiniband/hw/hns/hns_roce_qp.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c > b/drivers/infiniband/hw/hns/hns_roce_qp.c > index 51fefbf..1c5be59 100644 > --- a/drivers/infiniband/hw/hns/hns_roce_qp.c > +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c > @@ -32,6 +32,7 @@ > */ > > #include <linux/platform_device.h> > +#include <rdma/ib_addr.h> > #include <rdma/ib_umem.h> > #include "hns_roce_common.h" > #include "hns_roce_device.h" > @@ -658,6 +659,7 @@ int hns_roce_modify_qp(struct ib_qp *ibqp, struct > ib_qp_attr *attr, > struct device *dev = &hr_dev->pdev->dev; > int ret = -EINVAL; > int p; > + u32 active_mtu = 0;
There is no need to assign value to a variable which will be overwritten.
>
> mutex_lock(&hr_qp->mutex);
>
> @@ -688,6 +690,19 @@ int hns_roce_modify_qp(struct ib_qp *ibqp, struct
> ib_qp_attr *attr,
> }
> }
>
> + if (attr_mask & IB_QP_PATH_MTU) {
> + p = attr_mask & IB_QP_PORT ? (attr->port_num - 1) : hr_qp->port;
> + active_mtu = iboe_get_mtu(hr_dev->iboe.netdevs[p]->mtu);
ib_mtu iboe_get_mtu returns "enum ib_mtu" and not u32.
> +
> + if (attr->path_mtu > IB_MTU_2048 ||
> + attr->path_mtu < IB_MTU_256 ||
> + attr->path_mtu > active_mtu) {
> + dev_err(dev, "attr path_mtu(%d)invalid while modify qp",
> + attr->path_mtu);
> + goto out;
> + }
> + }
> +
> if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
> attr->max_rd_atomic > hr_dev->caps.max_qp_init_rdma) {
> dev_err(dev, "attr max_rd_atomic
> invalid.attr->max_rd_atomic=%d\n",
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
signature.asc
Description: PGP signature
