Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7db20ecd authored by Hiatt, Don's avatar Hiatt, Don Committed by Doug Ledford
Browse files

IB/core: Change wc.slid from 16 to 32 bits 



slid field in struct ib_wc is increased to 32 bits.
This enables core components to use larger LIDs if needed.
The user ABI is unchanged and return 16 bit values when queried.

Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent db58540b

drivers/infiniband/core/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc) 
{

	if (!cm_req_get_primary_subnet_local(req_msg)) {

		if (req_msg->primary_local_lid == IB_LID_PERMISSIVE) {

			req_msg->primary_local_lid = cpu_to_be16(wc->slid);

			req_msg->primary_local_lid = ib_slid_be16(wc->slid);

			cm_req_set_primary_sl(req_msg, wc->sl);

		}
@@ -1713,7 +1713,7 @@ static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc) 


	if (!cm_req_get_alt_subnet_local(req_msg)) {

		if (req_msg->alt_local_lid == IB_LID_PERMISSIVE) {

			req_msg->alt_local_lid = cpu_to_be16(wc->slid);

			req_msg->alt_local_lid = ib_slid_be16(wc->slid);

			cm_req_set_alt_sl(req_msg, wc->sl);

		}

drivers/infiniband/core/user_mad.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void recv_handler(struct ib_mad_agent *agent, 
	packet->mad.hdr.status	   = 0;

	packet->mad.hdr.length	   = hdr_size(file) + mad_recv_wc->mad_len;

	packet->mad.hdr.qpn	   = cpu_to_be32(mad_recv_wc->wc->src_qp);

	packet->mad.hdr.lid	   = cpu_to_be16(mad_recv_wc->wc->slid);

	packet->mad.hdr.lid	   = ib_slid_be16(mad_recv_wc->wc->slid);

	packet->mad.hdr.sl	   = mad_recv_wc->wc->sl;

	packet->mad.hdr.path_bits  = mad_recv_wc->wc->dlid_path_bits;

	packet->mad.hdr.pkey_index = mad_recv_wc->wc->pkey_index;

drivers/infiniband/core/uverbs_cmd.c

+7 −3
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file, 
	return ret ? ret : in_len;

}



static int copy_wc_to_user(void __user *dest, struct ib_wc *wc)

static int copy_wc_to_user(struct ib_device *ib_dev, void __user *dest,

			   struct ib_wc *wc)

{

	struct ib_uverbs_wc tmp;
@@ -1204,7 +1205,10 @@ static int copy_wc_to_user(void __user *dest, struct ib_wc *wc) 
	tmp.src_qp		= wc->src_qp;

	tmp.wc_flags		= wc->wc_flags;

	tmp.pkey_index		= wc->pkey_index;

	tmp.slid		= wc->slid;

	if (rdma_cap_opa_ah(ib_dev, wc->port_num))

		tmp.slid  = OPA_TO_IB_UCAST_LID(wc->slid);

	else

		tmp.slid  = ib_slid_cpu16(wc->slid);

	tmp.sl			= wc->sl;

	tmp.dlid_path_bits	= wc->dlid_path_bits;

	tmp.port_num		= wc->port_num;
@@ -1248,7 +1252,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file, 
		if (!ret)

			break;



		ret = copy_wc_to_user(data_ptr, &wc);

		ret = copy_wc_to_user(ib_dev, data_ptr, &wc);

		if (ret)

			goto out_put;

drivers/infiniband/hw/hfi1/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -3958,7 +3958,7 @@ static int opa_local_smp_check(struct hfi1_ibport *ibp, 
			       const struct ib_wc *in_wc)

{

	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

	u16 slid = in_wc->slid;

	u16 slid = ib_slid_cpu16(in_wc->slid);

	u16 pkey;



	if (in_wc->pkey_index >= ARRAY_SIZE(ppd->pkeys))

drivers/infiniband/hw/mlx4/mad.c

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int mad_ifc_flags, 


		op_modifier |= 0x4;



		in_modifier |= in_wc->slid << 16;

		in_modifier |= ib_slid_cpu16(in_wc->slid) << 16;

	}



	err = mlx4_cmd_box(dev->dev, inmailbox->dma, outmailbox->dma, in_modifier,
@@ -625,7 +625,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port, 
		memcpy((char *)&tun_mad->hdr.slid_mac_47_32, &(wc->smac[4]), 2);

	} else {

		tun_mad->hdr.sl_vid = cpu_to_be16(((u16)(wc->sl)) << 12);

		tun_mad->hdr.slid_mac_47_32 = cpu_to_be16(wc->slid);

		tun_mad->hdr.slid_mac_47_32 = ib_slid_be16(wc->slid);

	}



	ib_dma_sync_single_for_device(&dev->ib_dev,
@@ -826,7 +826,7 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
		}

	}



	slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);

	slid = in_wc ? ib_slid_cpu16(in_wc->slid) : be16_to_cpu(IB_LID_PERMISSIVE);



	if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP && slid == 0) {

		forward_trap(to_mdev(ibdev), port_num, in_mad);