Commit bd2a40cc authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/core Remove uverbs_ex_cmd_mask 

No driver sets it, and the core code sets a maximum mask, simply remove
it.

Disabled operations are now handled either by having a NULL ops pointer,
or by having the common driver callbacks check for unsupported extended
attributes.

Link: https://lore.kernel.org/r/9-v1-caa70ba3d1ab+1436e-ucmd_mask_jgg@nvidia.com


Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 1f11a761

drivers/infiniband/core/device.c

+0 −15
Original line number Diff line number Diff line
@@ -630,21 +630,6 @@ struct ib_device *_ib_alloc_device(size_t size) 
		BIT_ULL(IB_USER_VERBS_CMD_REG_MR) |

		BIT_ULL(IB_USER_VERBS_CMD_REREG_MR) |

		BIT_ULL(IB_USER_VERBS_CMD_RESIZE_CQ);



	device->uverbs_ex_cmd_mask =

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_CQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_FLOW) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_QP) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_WQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_DESTROY_FLOW) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_DESTROY_WQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_CQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_QP) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_WQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_QUERY_DEVICE);



	return device;

}

EXPORT_SYMBOL(_ib_alloc_device);

drivers/infiniband/core/uverbs_uapi.c

+1 −4
Original line number Diff line number Diff line
@@ -79,10 +79,7 @@ static int uapi_create_write(struct uverbs_api *uapi, 


	method_elm->is_ex = def->write.is_ex;

	method_elm->handler = def->func_write;

	if (def->write.is_ex)

		method_elm->disabled = !(ibdev->uverbs_ex_cmd_mask &

					 BIT_ULL(def->write.command_num));

	else

	if (!def->write.is_ex)

		method_elm->disabled = !(ibdev->uverbs_cmd_mask &

					 BIT_ULL(def->write.command_num));

include/rdma/ib_verbs.h

+0 −1
Original line number Diff line number Diff line
@@ -2667,7 +2667,6 @@ struct ib_device { 
	const struct attribute_group	*groups[3];



	u64			     uverbs_cmd_mask;

	u64			     uverbs_ex_cmd_mask;



	char			     node_desc[IB_DEVICE_NODE_DESC_MAX];

	__be64			     node_guid;