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

Commit 5fac5b1b authored by Kalesh AP's avatar Kalesh AP Committed by Doug Ledford
Browse files

RDMA/bnxt_re: Add vlan tag for untagged RoCE traffic when PFC is configured 



Current implementation does not program vlan header insertion
in RoCE packet if no vlan is configured. Firmware does not add
prority when there is no vlan tag in the packet. Modify the code
to insert vlan header when PFC is enabled on the interface.

Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e1267b01

drivers/infiniband/hw/bnxt_re/main.c

+47 −6
Original line number Diff line number Diff line
@@ -833,6 +833,42 @@ static void bnxt_re_dev_stop(struct bnxt_re_dev *rdev) 
	mutex_unlock(&rdev->qp_lock);

}



static int bnxt_re_update_gid(struct bnxt_re_dev *rdev)

{

	struct bnxt_qplib_sgid_tbl *sgid_tbl = &rdev->qplib_res.sgid_tbl;

	struct bnxt_qplib_gid gid;

	u16 gid_idx, index;

	int rc = 0;



	if (!test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))

		return 0;



	if (!sgid_tbl) {

		dev_err(rdev_to_dev(rdev), "QPLIB: SGID table not allocated");

		return -EINVAL;

	}



	for (index = 0; index < sgid_tbl->active; index++) {

		gid_idx = sgid_tbl->hw_id[index];



		if (!memcmp(&sgid_tbl->tbl[index], &bnxt_qplib_gid_zero,

			    sizeof(bnxt_qplib_gid_zero)))

			continue;

		/* need to modify the VLAN enable setting of non VLAN GID only

		 * as setting is done for VLAN GID while adding GID

		 */

		if (sgid_tbl->vlan[index])

			continue;



		memcpy(&gid, &sgid_tbl->tbl[index], sizeof(gid));



		rc = bnxt_qplib_update_sgid(sgid_tbl, &gid, gid_idx,

					    rdev->qplib_res.netdev->dev_addr);

	}



	return rc;

}



static u32 bnxt_re_get_priority_mask(struct bnxt_re_dev *rdev)

{

	u32 prio_map = 0, tmp_map = 0;
@@ -852,8 +888,6 @@ static u32 bnxt_re_get_priority_mask(struct bnxt_re_dev *rdev) 
	tmp_map = dcb_ieee_getapp_mask(netdev, &app);

	prio_map |= tmp_map;



	if (!prio_map)

		prio_map = -EFAULT;

	return prio_map;

}
@@ -879,10 +913,7 @@ static int bnxt_re_setup_qos(struct bnxt_re_dev *rdev) 
	int rc;



	/* Get priority for roce */

	rc = bnxt_re_get_priority_mask(rdev);

	if (rc < 0)

		return rc;

	prio_map = (u8)rc;

	prio_map = bnxt_re_get_priority_mask(rdev);



	if (prio_map == rdev->cur_prio_map)

		return 0;
@@ -904,6 +935,16 @@ static int bnxt_re_setup_qos(struct bnxt_re_dev *rdev) 
		return rc;

	}



	/* Actual priorities are not programmed as they are already

	 * done by L2 driver; just enable or disable priority vlan tagging

	 */

	if ((prio_map == 0 && rdev->qplib_res.prio) ||

	    (prio_map != 0 && !rdev->qplib_res.prio)) {

		rdev->qplib_res.prio = prio_map ? true : false;



		bnxt_re_update_gid(rdev);

	}



	return 0;

}

drivers/infiniband/hw/bnxt_re/qplib_res.c

+10 −0
Original line number Diff line number Diff line
@@ -468,9 +468,11 @@ static void bnxt_qplib_free_sgid_tbl(struct bnxt_qplib_res *res, 
	kfree(sgid_tbl->tbl);

	kfree(sgid_tbl->hw_id);

	kfree(sgid_tbl->ctx);

	kfree(sgid_tbl->vlan);

	sgid_tbl->tbl = NULL;

	sgid_tbl->hw_id = NULL;

	sgid_tbl->ctx = NULL;

	sgid_tbl->vlan = NULL;

	sgid_tbl->max = 0;

	sgid_tbl->active = 0;

}
@@ -491,8 +493,15 @@ static int bnxt_qplib_alloc_sgid_tbl(struct bnxt_qplib_res *res, 
	if (!sgid_tbl->ctx)

		goto out_free2;



	sgid_tbl->vlan = kcalloc(max, sizeof(u8), GFP_KERNEL);

	if (!sgid_tbl->vlan)

		goto out_free3;



	sgid_tbl->max = max;

	return 0;

out_free3:

	kfree(sgid_tbl->ctx);

	sgid_tbl->ctx = NULL;

out_free2:

	kfree(sgid_tbl->hw_id);

	sgid_tbl->hw_id = NULL;
@@ -514,6 +523,7 @@ static void bnxt_qplib_cleanup_sgid_tbl(struct bnxt_qplib_res *res, 
	}

	memset(sgid_tbl->tbl, 0, sizeof(struct bnxt_qplib_gid) * sgid_tbl->max);

	memset(sgid_tbl->hw_id, -1, sizeof(u16) * sgid_tbl->max);

	memset(sgid_tbl->vlan, 0, sizeof(u8) * sgid_tbl->max);

	sgid_tbl->active = 0;

}

drivers/infiniband/hw/bnxt_re/qplib_res.h

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ struct bnxt_qplib_sgid_tbl { 
	u16				max;

	u16				active;

	void				*ctx;

	u8				*vlan;

};



struct bnxt_qplib_pkey_tbl {
@@ -188,6 +189,7 @@ struct bnxt_qplib_res { 
	struct bnxt_qplib_sgid_tbl	sgid_tbl;

	struct bnxt_qplib_pkey_tbl	pkey_tbl;

	struct bnxt_qplib_dpi_tbl	dpi_tbl;

	bool				prio;

};



#define to_bnxt_qplib(ptr, type, member)	\

drivers/infiniband/hw/bnxt_re/qplib_sp.c

+61 −16
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ int bnxt_qplib_del_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, 
	}

	memcpy(&sgid_tbl->tbl[index], &bnxt_qplib_gid_zero,

	       sizeof(bnxt_qplib_gid_zero));

	sgid_tbl->vlan[index] = 0;

	sgid_tbl->active--;

	dev_dbg(&res->pdev->dev,

		"QPLIB: SGID deleted hw_id[0x%x] = 0x%x active = 0x%x",
@@ -265,28 +266,32 @@ int bnxt_qplib_add_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, 
		struct cmdq_add_gid req;

		struct creq_add_gid_resp resp;

		u16 cmd_flags = 0;

		u32 temp32[4];

		u16 temp16[3];

		int rc;



		RCFW_CMD_PREP(req, ADD_GID, cmd_flags);



		memcpy(temp32, gid->data, sizeof(struct bnxt_qplib_gid));

		req.gid[0] = cpu_to_be32(temp32[3]);

		req.gid[1] = cpu_to_be32(temp32[2]);

		req.gid[2] = cpu_to_be32(temp32[1]);

		req.gid[3] = cpu_to_be32(temp32[0]);

		req.gid[0] = cpu_to_be32(((u32 *)gid->data)[3]);

		req.gid[1] = cpu_to_be32(((u32 *)gid->data)[2]);

		req.gid[2] = cpu_to_be32(((u32 *)gid->data)[1]);

		req.gid[3] = cpu_to_be32(((u32 *)gid->data)[0]);

		/*

		 * driver should ensure that all RoCE traffic is always VLAN

		 * tagged if RoCE traffic is running on non-zero VLAN ID or

		 * RoCE traffic is running on non-zero Priority.

		 */

		if ((vlan_id != 0xFFFF) || res->prio) {

			if (vlan_id != 0xFFFF)

			req.vlan = cpu_to_le16((vlan_id &

					CMDQ_ADD_GID_VLAN_VLAN_ID_MASK) |

					CMDQ_ADD_GID_VLAN_TPID_TPID_8100 |

				req.vlan = cpu_to_le16

				(vlan_id & CMDQ_ADD_GID_VLAN_VLAN_ID_MASK);

			req.vlan |= cpu_to_le16

					(CMDQ_ADD_GID_VLAN_TPID_TPID_8100 |

					 CMDQ_ADD_GID_VLAN_VLAN_EN);

		}



		/* MAC in network format */

		memcpy(temp16, smac, 6);

		req.src_mac[0] = cpu_to_be16(temp16[0]);

		req.src_mac[1] = cpu_to_be16(temp16[1]);

		req.src_mac[2] = cpu_to_be16(temp16[2]);

		req.src_mac[0] = cpu_to_be16(((u16 *)smac)[0]);

		req.src_mac[1] = cpu_to_be16(((u16 *)smac)[1]);

		req.src_mac[2] = cpu_to_be16(((u16 *)smac)[2]);



		rc = bnxt_qplib_rcfw_send_message(rcfw, (void *)&req,

						  (void *)&resp, NULL, 0);
@@ -297,6 +302,9 @@ int bnxt_qplib_add_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, 
	/* Add GID to the sgid_tbl */

	memcpy(&sgid_tbl->tbl[free_idx], gid, sizeof(*gid));

	sgid_tbl->active++;

	if (vlan_id != 0xFFFF)

		sgid_tbl->vlan[free_idx] = 1;



	dev_dbg(&res->pdev->dev,

		"QPLIB: SGID added hw_id[0x%x] = 0x%x active = 0x%x",

		 free_idx, sgid_tbl->hw_id[free_idx], sgid_tbl->active);
@@ -306,6 +314,43 @@ int bnxt_qplib_add_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, 
	return 0;

}



int bnxt_qplib_update_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl,

			   struct bnxt_qplib_gid *gid, u16 gid_idx,

			   u8 *smac)

{

	struct bnxt_qplib_res *res = to_bnxt_qplib(sgid_tbl,

						   struct bnxt_qplib_res,

						   sgid_tbl);

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct creq_modify_gid_resp resp;

	struct cmdq_modify_gid req;

	int rc;

	u16 cmd_flags = 0;



	RCFW_CMD_PREP(req, MODIFY_GID, cmd_flags);



	req.gid[0] = cpu_to_be32(((u32 *)gid->data)[3]);

	req.gid[1] = cpu_to_be32(((u32 *)gid->data)[2]);

	req.gid[2] = cpu_to_be32(((u32 *)gid->data)[1]);

	req.gid[3] = cpu_to_be32(((u32 *)gid->data)[0]);

	if (res->prio) {

		req.vlan |= cpu_to_le16

			(CMDQ_ADD_GID_VLAN_TPID_TPID_8100 |

			 CMDQ_ADD_GID_VLAN_VLAN_EN);

	}



	/* MAC in network format */

	req.src_mac[0] = cpu_to_be16(((u16 *)smac)[0]);

	req.src_mac[1] = cpu_to_be16(((u16 *)smac)[1]);

	req.src_mac[2] = cpu_to_be16(((u16 *)smac)[2]);



	req.gid_index = cpu_to_le16(gid_idx);



	rc = bnxt_qplib_rcfw_send_message(rcfw, (void *)&req,

					  (void *)&resp, NULL, 0);

	return rc;

}



/* pkeys */

int bnxt_qplib_get_pkey(struct bnxt_qplib_res *res,

			struct bnxt_qplib_pkey_tbl *pkey_tbl, u16 index,

drivers/infiniband/hw/bnxt_re/qplib_sp.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ int bnxt_qplib_del_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, 
int bnxt_qplib_add_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl,

			struct bnxt_qplib_gid *gid, u8 *mac, u16 vlan_id,

			bool update, u32 *index);

int bnxt_qplib_update_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl,

			   struct bnxt_qplib_gid *gid, u16 gid_idx, u8 *smac);

int bnxt_qplib_get_pkey(struct bnxt_qplib_res *res,

			struct bnxt_qplib_pkey_tbl *pkey_tbl, u16 index,

			u16 *pkey);