Commit 1c15b4f2 authored by Avihai Horon's avatar Avihai Horon Committed by Jason Gunthorpe
Browse files

RDMA/core: Modify enum ib_gid_type and enum rdma_network_type 

Separate IB_GID_TYPE_IB and IB_GID_TYPE_ROCE to two different values, so
enum ib_gid_type will match the gid types of the new query GID table API
which will be introduced in the following patches.

This change in enum ib_gid_type requires to change also enum
rdma_network_type by separating RDMA_NETWORK_IB and RDMA_NETWORK_ROCE_V1
values.

Link: https://lore.kernel.org/r/20200923165015.2491894-3-leon@kernel.org


Signed-off-by: default avatarAvihai Horon <avihaih@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 3ff4de8f

drivers/infiniband/core/cache.c

+4 −0
Original line number Diff line number Diff line
@@ -133,7 +133,11 @@ static void dispatch_gid_change_event(struct ib_device *ib_dev, u8 port) 
}



static const char * const gid_type_str[] = {

	/* IB/RoCE v1 value is set for IB_GID_TYPE_IB and IB_GID_TYPE_ROCE for

	 * user space compatibility reasons.

	 */

	[IB_GID_TYPE_IB]	= "IB/RoCE v1",

	[IB_GID_TYPE_ROCE]	= "IB/RoCE v1",

	[IB_GID_TYPE_ROCE_UDP_ENCAP]	= "RoCE v2",

};

drivers/infiniband/core/cma.c

+4 −0
Original line number Diff line number Diff line
@@ -304,6 +304,10 @@ int cma_set_default_gid_type(struct cma_device *cma_dev, 
	if (!rdma_is_port_valid(cma_dev->device, port))

		return -EINVAL;



	if (default_gid_type == IB_GID_TYPE_IB &&

	    rdma_protocol_roce_eth_encap(cma_dev->device, port))

		default_gid_type = IB_GID_TYPE_ROCE;



	supported_gids = roce_gid_type_mask_support(cma_dev->device, port);



	if (!(supported_gids & 1 << default_gid_type))

drivers/infiniband/core/cma_configfs.c

+5 −4
Original line number Diff line number Diff line
@@ -123,16 +123,17 @@ static ssize_t default_roce_mode_store(struct config_item *item, 
{

	struct cma_device *cma_dev;

	struct cma_dev_port_group *group;

	int gid_type = ib_cache_gid_parse_type_str(buf);

	int gid_type;

	ssize_t ret;



	if (gid_type < 0)

		return -EINVAL;



	ret = cma_configfs_params_get(item, &cma_dev, &group);

	if (ret)

		return ret;



	gid_type = ib_cache_gid_parse_type_str(buf);

	if (gid_type < 0)

		return -EINVAL;



	ret = cma_set_default_gid_type(cma_dev, group->port_num, gid_type);



	cma_configfs_params_put(cma_dev);

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ int ib_get_gids_from_rdma_hdr(const union rdma_network_hdr *hdr, 
				       (struct in6_addr *)dgid);

		return 0;

	} else if (net_type == RDMA_NETWORK_IPV6 ||

		   net_type == RDMA_NETWORK_IB) {

		   net_type == RDMA_NETWORK_IB || RDMA_NETWORK_ROCE_V1) {

		*dgid = hdr->ibgrh.dgid;

		*sgid = hdr->ibgrh.sgid;

		return 0;

drivers/infiniband/hw/mlx5/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe, 


	switch (roce_packet_type) {

	case MLX5_CQE_ROCE_L3_HEADER_TYPE_GRH:

		wc->network_hdr_type = RDMA_NETWORK_IB;

		wc->network_hdr_type = RDMA_NETWORK_ROCE_V1;

		break;

	case MLX5_CQE_ROCE_L3_HEADER_TYPE_IPV6:

		wc->network_hdr_type = RDMA_NETWORK_IPV6;

CRA Git | Maintained and supported by SUSTech CRA and CCSE