Commit 83ee4121 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull infiniband/rdma fixes from Doug Ledford:
 "This should hopefully be the last request for 4.1-rc for the RDMA
  stack.  It contains some late ocrdma fixes that I'm including because
  they are small and self contained.  It also contains two bug fixes
  that are simple and easily verified.

  Summary:

   - a number of small, well contained bug fixes for ocrdma driver

   - a simple fix for the connection negotiation sequence on IB

   - fix for broken AF_IB address on UD queue pair support"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/cma: Fix broken AF_IB UD support
  ib/cm: Change reject message type when destroying cm_id
  RDMA/ocrdma: Update ocrdma version number
  RDMA/ocrdma: Fail connection for MTU lesser than 512
  RDMA/ocrdma: Fix dmac resolution for link local address
  RDMA/ocrdma: Prevent allocation of DPP PDs if FW doesnt support it
  RDMA/ocrdma: Fix the request length for RDMA_QUERY_QP mailbox command to FW.
  RDMA/ocrdma: Use VID 0 if PFC is enabled and vlan is not configured
  RDMA/ocrdma: Fix QP state transition in destroy_qp
  RDMA/ocrdma: Report EQ full fatal error
  RDMA/ocrdma: Fix EQ destroy failure during driver unload
parents 97793a81 c07678bb

drivers/infiniband/core/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ retest: 
		cm_reject_sidr_req(cm_id_priv, IB_SIDR_REJECT);

		break;

	case IB_CM_REQ_SENT:

	case IB_CM_MRA_REQ_RCVD:

		ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);

		spin_unlock_irq(&cm_id_priv->lock);

		ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
@@ -879,7 +880,6 @@ retest: 
				       NULL, 0, NULL, 0);

		}

		break;

	case IB_CM_MRA_REQ_RCVD:

	case IB_CM_REP_SENT:

	case IB_CM_MRA_REP_RCVD:

		ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);

drivers/infiniband/core/cma.c

+21 −11
Original line number Diff line number Diff line
@@ -845,19 +845,27 @@ static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id 
	listen_ib = (struct sockaddr_ib *) &listen_id->route.addr.src_addr;

	ib = (struct sockaddr_ib *) &id->route.addr.src_addr;

	ib->sib_family = listen_ib->sib_family;

	if (path) {

		ib->sib_pkey = path->pkey;

		ib->sib_flowinfo = path->flow_label;

		memcpy(&ib->sib_addr, &path->sgid, 16);

	} else {

		ib->sib_pkey = listen_ib->sib_pkey;

		ib->sib_flowinfo = listen_ib->sib_flowinfo;

		ib->sib_addr = listen_ib->sib_addr;

	}

	ib->sib_sid = listen_ib->sib_sid;

	ib->sib_sid_mask = cpu_to_be64(0xffffffffffffffffULL);

	ib->sib_scope_id = listen_ib->sib_scope_id;



	if (path) {

		ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;

		ib->sib_family = listen_ib->sib_family;

		ib->sib_pkey = path->pkey;

		ib->sib_flowinfo = path->flow_label;

		memcpy(&ib->sib_addr, &path->dgid, 16);

	}

}



static __be16 ss_get_port(const struct sockaddr_storage *ss)

{
@@ -905,9 +913,11 @@ static int cma_save_net_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id 
{

	struct cma_hdr *hdr;



	if ((listen_id->route.addr.src_addr.ss_family == AF_IB) &&

	    (ib_event->event == IB_CM_REQ_RECEIVED)) {

	if (listen_id->route.addr.src_addr.ss_family == AF_IB) {

		if (ib_event->event == IB_CM_REQ_RECEIVED)

			cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);

		else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED)

			cma_save_ib_info(id, listen_id, NULL);

		return 0;

	}

drivers/infiniband/hw/ocrdma/ocrdma.h

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <be_roce.h>

#include "ocrdma_sli.h"



#define OCRDMA_ROCE_DRV_VERSION "10.4.205.0u"

#define OCRDMA_ROCE_DRV_VERSION "10.6.0.0"



#define OCRDMA_ROCE_DRV_DESC "Emulex OneConnect RoCE Driver"

#define OCRDMA_NODE_DESC "Emulex OneConnect RoCE HCA"
@@ -515,6 +515,8 @@ static inline int ocrdma_resolve_dmac(struct ocrdma_dev *dev, 
	memcpy(&in6, ah_attr->grh.dgid.raw, sizeof(in6));

	if (rdma_is_multicast_addr(&in6))

		rdma_get_mcast_mac(&in6, mac_addr);

	else if (rdma_link_local_addr(&in6))

		rdma_get_ll_mac(&in6, mac_addr);

	else

		memcpy(mac_addr, ah_attr->dmac, ETH_ALEN);

	return 0;

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+10 −2
Original line number Diff line number Diff line
@@ -56,7 +56,13 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, 
	vlan_tag = attr->vlan_id;

	if (!vlan_tag || (vlan_tag > 0xFFF))

		vlan_tag = dev->pvid;

	if (vlan_tag && (vlan_tag < 0x1000)) {

	if (vlan_tag || dev->pfc_state) {

		if (!vlan_tag) {

			pr_err("ocrdma%d:Using VLAN with PFC is recommended\n",

				dev->id);

			pr_err("ocrdma%d:Using VLAN 0 for this connection\n",

				dev->id);

		}

		eth.eth_type = cpu_to_be16(0x8100);

		eth.roce_eth_type = cpu_to_be16(OCRDMA_ROCE_ETH_TYPE);

		vlan_tag |= (dev->sl & 0x07) << OCRDMA_VID_PCP_SHIFT;
@@ -121,7 +127,9 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr) 
		goto av_conf_err;

	}



	if (pd->uctx) {

	if ((pd->uctx) &&

	    (!rdma_is_multicast_addr((struct in6_addr *)attr->grh.dgid.raw)) &&

	    (!rdma_link_local_addr((struct in6_addr *)attr->grh.dgid.raw))) {

		status = rdma_addr_find_dmac_by_grh(&sgid, &attr->grh.dgid,

                                        attr->dmac, &attr->vlan_id);

		if (status) {

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+50 −33
Original line number Diff line number Diff line
@@ -933,12 +933,18 @@ static irqreturn_t ocrdma_irq_handler(int irq, void *handle) 
	struct ocrdma_eqe eqe;

	struct ocrdma_eqe *ptr;

	u16 cq_id;

	u8 mcode;

	int budget = eq->cq_cnt;



	do {

		ptr = ocrdma_get_eqe(eq);

		eqe = *ptr;

		ocrdma_le32_to_cpu(&eqe, sizeof(eqe));

		mcode = (eqe.id_valid & OCRDMA_EQE_MAJOR_CODE_MASK)

				>> OCRDMA_EQE_MAJOR_CODE_SHIFT;

		if (mcode == OCRDMA_MAJOR_CODE_SENTINAL)

			pr_err("EQ full on eqid = 0x%x, eqe = 0x%x\n",

			       eq->q.id, eqe.id_valid);

		if ((eqe.id_valid & OCRDMA_EQE_VALID_MASK) == 0)

			break;
@@ -1434,27 +1440,30 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev) 
	struct ocrdma_alloc_pd_range_rsp *rsp;



	/* Pre allocate the DPP PDs */

	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_ALLOC_PD_RANGE, sizeof(*cmd));

	if (dev->attr.max_dpp_pds) {

		cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_ALLOC_PD_RANGE,

					  sizeof(*cmd));

		if (!cmd)

			return -ENOMEM;

		cmd->pd_count = dev->attr.max_dpp_pds;

		cmd->enable_dpp_rsvd |= OCRDMA_ALLOC_PD_ENABLE_DPP;

		status = ocrdma_mbx_cmd(dev, (struct ocrdma_mqe *)cmd);

	if (status)

		goto mbx_err;

		rsp = (struct ocrdma_alloc_pd_range_rsp *)cmd;



	if ((rsp->dpp_page_pdid & OCRDMA_ALLOC_PD_RSP_DPP) && rsp->pd_count) {

		if (!status && (rsp->dpp_page_pdid & OCRDMA_ALLOC_PD_RSP_DPP) &&

		    rsp->pd_count) {

			dev->pd_mgr->dpp_page_index = rsp->dpp_page_pdid >>

					OCRDMA_ALLOC_PD_RSP_DPP_PAGE_SHIFT;

			dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &

					OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;

			dev->pd_mgr->max_dpp_pd = rsp->pd_count;

		pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);

			pd_bitmap_size =

				BITS_TO_LONGS(rsp->pd_count) * sizeof(long);

			dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,

							     GFP_KERNEL);

		}

		kfree(cmd);

	}



	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_ALLOC_PD_RANGE, sizeof(*cmd));

	if (!cmd)
@@ -1462,10 +1471,8 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev) 


	cmd->pd_count = dev->attr.max_pd - dev->attr.max_dpp_pds;

	status = ocrdma_mbx_cmd(dev, (struct ocrdma_mqe *)cmd);

	if (status)

		goto mbx_err;

	rsp = (struct ocrdma_alloc_pd_range_rsp *)cmd;

	if (rsp->pd_count) {

	if (!status && rsp->pd_count) {

		dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &

					OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;

		dev->pd_mgr->max_normal_pd = rsp->pd_count;
@@ -1473,15 +1480,13 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev) 
		dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,

						      GFP_KERNEL);

	}

	kfree(cmd);



	if (dev->pd_mgr->pd_norm_bitmap || dev->pd_mgr->pd_dpp_bitmap) {

		/* Enable PD resource manager */

		dev->pd_mgr->pd_prealloc_valid = true;

	} else {

		return -ENOMEM;

		return 0;

	}

mbx_err:

	kfree(cmd);

	return status;

}
@@ -2406,7 +2411,7 @@ int ocrdma_mbx_query_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp, 
	struct ocrdma_query_qp *cmd;

	struct ocrdma_query_qp_rsp *rsp;



	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_QUERY_QP, sizeof(*cmd));

	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_QUERY_QP, sizeof(*rsp));

	if (!cmd)

		return status;

	cmd->qp_id = qp->id;
@@ -2428,7 +2433,7 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 
	int status;

	struct ib_ah_attr *ah_attr = &attrs->ah_attr;

	union ib_gid sgid, zgid;

	u32 vlan_id;

	u32 vlan_id = 0xFFFF;

	u8 mac_addr[6];

	struct ocrdma_dev *dev = get_ocrdma_dev(qp->ibqp.device);
@@ -2468,12 +2473,22 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 
	cmd->params.vlan_dmac_b4_to_b5 = mac_addr[4] | (mac_addr[5] << 8);

	if (attr_mask & IB_QP_VID) {

		vlan_id = attrs->vlan_id;

	} else if (dev->pfc_state) {

		vlan_id = 0;

		pr_err("ocrdma%d:Using VLAN with PFC is recommended\n",

			dev->id);

		pr_err("ocrdma%d:Using VLAN 0 for this connection\n",

			dev->id);

	}



	if (vlan_id < 0x1000) {

		cmd->params.vlan_dmac_b4_to_b5 |=

		    vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;

		cmd->flags |= OCRDMA_QP_PARA_VLAN_EN_VALID;

		cmd->params.rnt_rc_sl_fl |=

			(dev->sl & 0x07) << OCRDMA_QP_PARAMS_SL_SHIFT;

	}



	return 0;

}
@@ -2519,8 +2534,10 @@ static int ocrdma_set_qp_params(struct ocrdma_qp *qp, 
		cmd->flags |= OCRDMA_QP_PARA_DST_QPN_VALID;

	}

	if (attr_mask & IB_QP_PATH_MTU) {

		if (attrs->path_mtu < IB_MTU_256 ||

		if (attrs->path_mtu < IB_MTU_512 ||

		    attrs->path_mtu > IB_MTU_4096) {

			pr_err("ocrdma%d: IB MTU %d is not supported\n",

			       dev->id, ib_mtu_enum_to_int(attrs->path_mtu));

			status = -EINVAL;

			goto pmtu_err;

		}
@@ -3147,9 +3164,9 @@ void ocrdma_cleanup_hw(struct ocrdma_dev *dev) 
	ocrdma_free_pd_pool(dev);

	ocrdma_mbx_delete_ah_tbl(dev);



	/* cleanup the eqs */

	ocrdma_destroy_eqs(dev);



	/* cleanup the control path */

	ocrdma_destroy_mq(dev);



	/* cleanup the eqs */

	ocrdma_destroy_eqs(dev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE