RDMA/IWPM: Support no port mapping requirements (b0bad9ad) · Commits · 戴 / test

drivers/infiniband/core/iwcm.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,8 @@ static struct rdma_nl_cbs iwcm_nl_cb_table[RDMA_NL_IWPM_NUM_OPS] = {
	[RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},		[RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},
	[RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},		[RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},
	[RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},		[RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},
	[RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb}		[RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb},
			[RDMA_NL_IWPM_HELLO] = {.dump = iwpm_hello_cb}
	};		};

	static struct workqueue_struct *iwcm_wq;		static struct workqueue_struct *iwcm_wq;
	@@ -525,6 +526,8 @@ static int iw_cm_map(struct iw_cm_id *cm_id, bool active)
	cm_id->mapped = true;		cm_id->mapped = true;
	pm_msg.loc_addr = cm_id->local_addr;		pm_msg.loc_addr = cm_id->local_addr;
	pm_msg.rem_addr = cm_id->remote_addr;		pm_msg.rem_addr = cm_id->remote_addr;
			pm_msg.flags = (cm_id->device->iwcm->driver_flags & IW_F_NO_PORT_MAP) ?
			IWPM_FLAGS_NO_PORT_MAP : 0;
	if (active)		if (active)
	status = iwpm_add_and_query_mapping(&pm_msg,		status = iwpm_add_and_query_mapping(&pm_msg,
	RDMA_NL_IWCM);		RDMA_NL_IWCM);
	@@ -543,7 +546,7 @@ static int iw_cm_map(struct iw_cm_id *cm_id, bool active)

	return iwpm_create_mapinfo(&cm_id->local_addr,		return iwpm_create_mapinfo(&cm_id->local_addr,
	&cm_id->m_local_addr,		&cm_id->m_local_addr,
	RDMA_NL_IWCM);		RDMA_NL_IWCM, pm_msg.flags);
	}		}

	/*		/*

drivers/infiniband/core/iwpm_msg.c

+77 −3

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@
	#include "iwpm_util.h"		#include "iwpm_util.h"

	static const char iwpm_ulib_name[IWPM_ULIBNAME_SIZE] = "iWarpPortMapperUser";		static const char iwpm_ulib_name[IWPM_ULIBNAME_SIZE] = "iWarpPortMapperUser";
	static int iwpm_ulib_version = 3;		u16 iwpm_ulib_version = IWPM_UABI_VERSION_MIN;
	static int iwpm_user_pid = IWPM_PID_UNDEFINED;		static int iwpm_user_pid = IWPM_PID_UNDEFINED;
	static atomic_t echo_nlmsg_seq;		static atomic_t echo_nlmsg_seq;

	@@ -130,6 +130,7 @@ pid_query_error:
	* nlmsg attributes:		* nlmsg attributes:
	* [IWPM_NLA_MANAGE_MAPPING_SEQ]		* [IWPM_NLA_MANAGE_MAPPING_SEQ]
	* [IWPM_NLA_MANAGE_ADDR]		* [IWPM_NLA_MANAGE_ADDR]
			* [IWPM_NLA_MANAGE_FLAGS]
	*/		*/
	int iwpm_add_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)		int iwpm_add_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	{		{
	@@ -173,6 +174,18 @@ int iwpm_add_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	if (ret)		if (ret)
	goto add_mapping_error;		goto add_mapping_error;

			/* If flags are required and we're not V4, then return a quiet error */
			if (pm_msg->flags && iwpm_ulib_version == IWPM_UABI_VERSION_MIN) {
			ret = -EINVAL;
			goto add_mapping_error_nowarn;
			}
			if (iwpm_ulib_version > IWPM_UABI_VERSION_MIN) {
			ret = ibnl_put_attr(skb, nlh, sizeof(u32), &pm_msg->flags,
			IWPM_NLA_MANAGE_FLAGS);
			if (ret)
			goto add_mapping_error;
			}

	nlmsg_end(skb, nlh);		nlmsg_end(skb, nlh);
	nlmsg_request->req_buffer = pm_msg;		nlmsg_request->req_buffer = pm_msg;

	@@ -187,6 +200,7 @@ int iwpm_add_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	return ret;		return ret;
	add_mapping_error:		add_mapping_error:
	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);		pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);
			add_mapping_error_nowarn:
	if (skb)		if (skb)
	dev_kfree_skb(skb);		dev_kfree_skb(skb);
	if (nlmsg_request)		if (nlmsg_request)
	@@ -201,6 +215,7 @@ add_mapping_error:
	* [IWPM_NLA_QUERY_MAPPING_SEQ]		* [IWPM_NLA_QUERY_MAPPING_SEQ]
	* [IWPM_NLA_QUERY_LOCAL_ADDR]		* [IWPM_NLA_QUERY_LOCAL_ADDR]
	* [IWPM_NLA_QUERY_REMOTE_ADDR]		* [IWPM_NLA_QUERY_REMOTE_ADDR]
			* [IWPM_NLA_QUERY_FLAGS]
	*/		*/
	int iwpm_add_and_query_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)		int iwpm_add_and_query_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	{		{
	@@ -251,6 +266,18 @@ int iwpm_add_and_query_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	if (ret)		if (ret)
	goto query_mapping_error;		goto query_mapping_error;

			/* If flags are required and we're not V4, then return a quite error */
			if (pm_msg->flags && iwpm_ulib_version == IWPM_UABI_VERSION_MIN) {
			ret = -EINVAL;
			goto query_mapping_error_nowarn;
			}
			if (iwpm_ulib_version > IWPM_UABI_VERSION_MIN) {
			ret = ibnl_put_attr(skb, nlh, sizeof(u32), &pm_msg->flags,
			IWPM_NLA_QUERY_FLAGS);
			if (ret)
			goto query_mapping_error;
			}

	nlmsg_end(skb, nlh);		nlmsg_end(skb, nlh);
	nlmsg_request->req_buffer = pm_msg;		nlmsg_request->req_buffer = pm_msg;

	@@ -264,6 +291,7 @@ int iwpm_add_and_query_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client)
	return ret;		return ret;
	query_mapping_error:		query_mapping_error:
	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);		pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);
			query_mapping_error_nowarn:
	if (skb)		if (skb)
	dev_kfree_skb(skb);		dev_kfree_skb(skb);
	if (nlmsg_request)		if (nlmsg_request)
	@@ -379,7 +407,7 @@ int iwpm_register_pid_cb(struct sk_buff skb, struct netlink_callback cb)
	/* check device name, ulib name and version */		/* check device name, ulib name and version */
	if (strcmp(pm_msg->dev_name, dev_name) \|\|		if (strcmp(pm_msg->dev_name, dev_name) \|\|
	strcmp(iwpm_ulib_name, iwpm_name) \|\|		strcmp(iwpm_ulib_name, iwpm_name) \|\|
	iwpm_version != iwpm_ulib_version) {		iwpm_version < IWPM_UABI_VERSION_MIN) {

	pr_info("%s: Incorrect info (dev = %s name = %s version = %d)\n",		pr_info("%s: Incorrect info (dev = %s name = %s version = %d)\n",
	__func__, dev_name, iwpm_name, iwpm_version);		__func__, dev_name, iwpm_name, iwpm_version);
	@@ -387,6 +415,10 @@ int iwpm_register_pid_cb(struct sk_buff skb, struct netlink_callback cb)
	goto register_pid_response_exit;		goto register_pid_response_exit;
	}		}
	iwpm_user_pid = cb->nlh->nlmsg_pid;		iwpm_user_pid = cb->nlh->nlmsg_pid;
			iwpm_ulib_version = iwpm_version;
			if (iwpm_ulib_version < IWPM_UABI_VERSION)
			pr_warn_once("%s: Down level iwpmd/pid %u. Continuing...",
			__func__, iwpm_user_pid);
	atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);		atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);
	pr_debug("%s: iWarp Port Mapper (pid = %d) is available!\n",		pr_debug("%s: iWarp Port Mapper (pid = %d) is available!\n",
	__func__, iwpm_user_pid);		__func__, iwpm_user_pid);
	@@ -661,7 +693,7 @@ int iwpm_mapping_info_cb(struct sk_buff skb, struct netlink_callback cb)
	iwpm_name = (char *)nla_data(nltb[IWPM_NLA_MAPINFO_ULIB_NAME]);		iwpm_name = (char *)nla_data(nltb[IWPM_NLA_MAPINFO_ULIB_NAME]);
	iwpm_version = nla_get_u16(nltb[IWPM_NLA_MAPINFO_ULIB_VER]);		iwpm_version = nla_get_u16(nltb[IWPM_NLA_MAPINFO_ULIB_VER]);
	if (strcmp(iwpm_ulib_name, iwpm_name) \|\|		if (strcmp(iwpm_ulib_name, iwpm_name) \|\|
	iwpm_version != iwpm_ulib_version) {		iwpm_version < IWPM_UABI_VERSION_MIN) {
	pr_info("%s: Invalid port mapper name = %s version = %d\n",		pr_info("%s: Invalid port mapper name = %s version = %d\n",
	__func__, iwpm_name, iwpm_version);		__func__, iwpm_name, iwpm_version);
	return ret;		return ret;
	@@ -675,6 +707,11 @@ int iwpm_mapping_info_cb(struct sk_buff skb, struct netlink_callback cb)
	iwpm_set_registration(nl_client, IWPM_REG_INCOMPL);		iwpm_set_registration(nl_client, IWPM_REG_INCOMPL);
	atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);		atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);
	iwpm_user_pid = cb->nlh->nlmsg_pid;		iwpm_user_pid = cb->nlh->nlmsg_pid;

			if (iwpm_ulib_version < IWPM_UABI_VERSION)
			pr_warn_once("%s: Down level iwpmd/pid %u. Continuing...",
			__func__, iwpm_user_pid);

	if (!iwpm_mapinfo_available())		if (!iwpm_mapinfo_available())
	return 0;		return 0;
	pr_debug("%s: iWarp Port Mapper (pid = %d) is available!\n",		pr_debug("%s: iWarp Port Mapper (pid = %d) is available!\n",
	@@ -754,3 +791,40 @@ int iwpm_mapping_error_cb(struct sk_buff skb, struct netlink_callback cb)
	up(&nlmsg_request->sem);		up(&nlmsg_request->sem);
	return 0;		return 0;
	}		}

			/* netlink attribute policy for the received hello request */
			static const struct nla_policy hello_policy[IWPM_NLA_HELLO_MAX] = {
			[IWPM_NLA_HELLO_ABI_VERSION] = { .type = NLA_U16 }
			};

			/*
			* iwpm_hello_cb - Process a port mapper hello request
			*/
			int iwpm_hello_cb(struct sk_buff skb, struct netlink_callback cb)
			{
			struct nlattr *nltb[IWPM_NLA_HELLO_MAX];
			const char *msg_type = "Hello request";
			u8 nl_client;
			u16 abi_version;
			int ret = -EINVAL;

			if (iwpm_parse_nlmsg(cb, IWPM_NLA_HELLO_MAX, hello_policy, nltb,
			msg_type)) {
			pr_info("%s: Unable to parse nlmsg\n", __func__);
			return ret;
			}
			abi_version = nla_get_u16(nltb[IWPM_NLA_HELLO_ABI_VERSION]);
			nl_client = RDMA_NL_GET_CLIENT(cb->nlh->nlmsg_type);
			if (!iwpm_valid_client(nl_client)) {
			pr_info("%s: Invalid port mapper client = %d\n",
			__func__, nl_client);
			return ret;
			}
			iwpm_set_registration(nl_client, IWPM_REG_INCOMPL);
			atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);
			iwpm_ulib_version = min_t(u16, IWPM_UABI_VERSION, abi_version);
			pr_debug("Using ABI version %u\n", iwpm_ulib_version);
			iwpm_user_pid = cb->nlh->nlmsg_pid;
			ret = iwpm_send_hello(nl_client, iwpm_user_pid, iwpm_ulib_version);
			return ret;
			}

drivers/infiniband/core/iwpm_util.c

+47 −1

Original line number	Original line	Diff line number	Diff line
	@@ -114,7 +114,7 @@ static struct hlist_head get_mapinfo_hash_bucket(struct sockaddr_storage ,

	int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,		int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
	struct sockaddr_storage *mapped_sockaddr,		struct sockaddr_storage *mapped_sockaddr,
	u8 nl_client)		u8 nl_client, u32 map_flags)
	{		{
	struct hlist_head *hash_bucket_head = NULL;		struct hlist_head *hash_bucket_head = NULL;
	struct iwpm_mapping_info *map_info;		struct iwpm_mapping_info *map_info;
	@@ -132,6 +132,7 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
	memcpy(&map_info->mapped_sockaddr, mapped_sockaddr,		memcpy(&map_info->mapped_sockaddr, mapped_sockaddr,
	sizeof(struct sockaddr_storage));		sizeof(struct sockaddr_storage));
	map_info->nl_client = nl_client;		map_info->nl_client = nl_client;
			map_info->map_flags = map_flags;

	spin_lock_irqsave(&iwpm_mapinfo_lock, flags);		spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
	if (iwpm_hash_bucket) {		if (iwpm_hash_bucket) {
	@@ -686,6 +687,14 @@ int iwpm_send_mapinfo(u8 nl_client, int iwpm_pid)
	if (ret)		if (ret)
	goto send_mapping_info_unlock;		goto send_mapping_info_unlock;

			if (iwpm_ulib_version > IWPM_UABI_VERSION_MIN) {
			ret = ibnl_put_attr(skb, nlh, sizeof(u32),
			&map_info->map_flags,
			IWPM_NLA_MAPINFO_FLAGS);
			if (ret)
			goto send_mapping_info_unlock;
			}

	nlmsg_end(skb, nlh);		nlmsg_end(skb, nlh);

	iwpm_print_sockaddr(&map_info->local_sockaddr,		iwpm_print_sockaddr(&map_info->local_sockaddr,
	@@ -754,3 +763,40 @@ int iwpm_mapinfo_available(void)
	spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);		spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
	return full_bucket;		return full_bucket;
	}		}

			int iwpm_send_hello(u8 nl_client, int iwpm_pid, u16 abi_version)
			{
			struct sk_buff *skb = NULL;
			struct nlmsghdr *nlh;
			u32 msg_seq;
			const char *err_str = "";
			int ret = -EINVAL;

			skb = iwpm_create_nlmsg(RDMA_NL_IWPM_HELLO, &nlh, nl_client);
			if (!skb) {
			err_str = "Unable to create a nlmsg";
			goto hello_num_error;
			}
			nlh->nlmsg_seq = iwpm_get_nlmsg_seq();
			msg_seq = 0;
			err_str = "Unable to put attribute of abi_version into nlmsg";
			ret = ibnl_put_attr(skb, nlh, sizeof(u16), &abi_version,
			IWPM_NLA_HELLO_ABI_VERSION);
			if (ret)
			goto hello_num_error;
			nlmsg_end(skb, nlh);

			ret = rdma_nl_unicast(skb, iwpm_pid);
			if (ret) {
			skb = NULL;
			err_str = "Unable to send a nlmsg";
			goto hello_num_error;
			}
			pr_debug("%s: Sent hello abi_version = %u\n", __func__, abi_version);
			return 0;
			hello_num_error:
			pr_info("%s: %s\n", __func__, err_str);
			if (skb)
			dev_kfree_skb(skb);
			return ret;
			}

drivers/infiniband/core/iwpm_util.h

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,7 @@ struct iwpm_mapping_info {
	struct sockaddr_storage local_sockaddr;		struct sockaddr_storage local_sockaddr;
	struct sockaddr_storage mapped_sockaddr;		struct sockaddr_storage mapped_sockaddr;
	u8 nl_client;		u8 nl_client;
			u32 map_flags;
	};		};

	struct iwpm_remote_info {		struct iwpm_remote_info {
	@@ -266,4 +267,15 @@ int iwpm_parse_nlmsg(struct netlink_callback *cb, int policy_max,
	* @msg: Message to print		* @msg: Message to print
	*/		*/
	void iwpm_print_sockaddr(struct sockaddr_storage sockaddr, char msg);		void iwpm_print_sockaddr(struct sockaddr_storage sockaddr, char msg);

			/**
			* iwpm_send_hello - Send hello response to iwpmd
			*
			* @nl_client: The index of the netlink client
			* @abi_version: The kernel's abi_version
			*
			* Returns 0 on success or a negative error code
			*/
			int iwpm_send_hello(u8 nl_client, int iwpm_pid, u16 abi_version);
			extern u16 iwpm_ulib_version;
	#endif		#endif

include/rdma/iw_cm.h

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105,6 +105,18 @@ struct iw_cm_conn_param {
	u32 qpn;		u32 qpn;
	};		};

			enum iw_flags {

			/*
			* This flag allows the iwcm and iwpmd to still advertise
			* mappings but the real and mapped port numbers are the
			* same. Further, iwpmd will not bind any user socket to
			* reserve the port. This is required for soft iwarp
			* to play in the port mapped iwarp space.
			*/
			IW_F_NO_PORT_MAP = (1 << 0),
			};

	struct iw_cm_verbs {		struct iw_cm_verbs {
	void (add_ref)(struct ib_qp qp);		void (add_ref)(struct ib_qp qp);

	@@ -127,6 +139,7 @@ struct iw_cm_verbs {

	int (destroy_listen)(struct iw_cm_id cm_id);		int (destroy_listen)(struct iw_cm_id cm_id);
	char ifname[IFNAMSIZ];		char ifname[IFNAMSIZ];
			enum iw_flags driver_flags;
	};		};

	/**		/**

Admin message