Commit 3cea7b4a authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Jason Gunthorpe
Browse files

RDMA/core: Fix incorrect print format specifier 

There are some '%u' for 'int' and '%d' for 'unsigend int', they should be
fixed.

Link: https://lore.kernel.org/r/1623325232-30900-1-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 57dba89a

drivers/infiniband/core/cache.c

+5 −5
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void free_gid_entry_locked(struct ib_gid_table_entry *entry) 
	u32 port_num = entry->attr.port_num;

	struct ib_gid_table *table = rdma_gid_table(device, port_num);



	dev_dbg(&device->dev, "%s port=%u index=%d gid %pI6\n", __func__,

	dev_dbg(&device->dev, "%s port=%u index=%u gid %pI6\n", __func__,

		port_num, entry->attr.index, entry->attr.gid.raw);



	write_lock_irq(&table->rwlock);
@@ -323,7 +323,7 @@ static void store_gid_entry(struct ib_gid_table *table, 
{

	entry->state = GID_TABLE_ENTRY_VALID;



	dev_dbg(&entry->attr.device->dev, "%s port=%d index=%d gid %pI6\n",

	dev_dbg(&entry->attr.device->dev, "%s port=%u index=%u gid %pI6\n",

		__func__, entry->attr.port_num, entry->attr.index,

		entry->attr.gid.raw);
@@ -354,7 +354,7 @@ static int add_roce_gid(struct ib_gid_table_entry *entry) 
	int ret;



	if (!attr->ndev) {

		dev_err(&attr->device->dev, "%s NULL netdev port=%d index=%d\n",

		dev_err(&attr->device->dev, "%s NULL netdev port=%u index=%u\n",

			__func__, attr->port_num, attr->index);

		return -EINVAL;

	}
@@ -362,7 +362,7 @@ static int add_roce_gid(struct ib_gid_table_entry *entry) 
		ret = attr->device->ops.add_gid(attr, &entry->context);

		if (ret) {

			dev_err(&attr->device->dev,

				"%s GID add failed port=%d index=%d\n",

				"%s GID add failed port=%u index=%u\n",

				__func__, attr->port_num, attr->index);

			return ret;

		}
@@ -805,7 +805,7 @@ static void release_gid_table(struct ib_device *device, 
			continue;

		if (kref_read(&table->data_vec[i]->kref) > 1) {

			dev_err(&device->dev,

				"GID entry ref leak for index %d ref=%d\n", i,

				"GID entry ref leak for index %d ref=%u\n", i,

				kref_read(&table->data_vec[i]->kref));

			leak = true;

		}

drivers/infiniband/core/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ static u16 cm_get_bth_pkey(struct cm_work *work) 


	ret = ib_get_cached_pkey(ib_dev, port_num, pkey_index, &pkey);

	if (ret) {

		dev_warn_ratelimited(&ib_dev->dev, "ib_cm: Couldn't retrieve pkey for incoming request (port %d, pkey index %d). %d\n",

		dev_warn_ratelimited(&ib_dev->dev, "ib_cm: Couldn't retrieve pkey for incoming request (port %u, pkey index %u). %d\n",

				     port_num, pkey_index, ret);

		return 0;

	}

drivers/infiniband/core/iwpm_msg.c

+11 −11
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int iwpm_register_pid(struct iwpm_dev_data *pm_msg, u8 nl_client) 
	ret = iwpm_wait_complete_req(nlmsg_request);

	return ret;

pid_query_error:

	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);

	pr_info("%s: %s (client = %u)\n", __func__, err_str, nl_client);

	dev_kfree_skb(skb);

	if (nlmsg_request)

		iwpm_free_nlmsg_request(&nlmsg_request->kref);
@@ -211,7 +211,7 @@ int iwpm_add_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client) 
	ret = iwpm_wait_complete_req(nlmsg_request);

	return ret;

add_mapping_error:

	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);

	pr_info("%s: %s (client = %u)\n", __func__, err_str, nl_client);

add_mapping_error_nowarn:

	dev_kfree_skb(skb);

	if (nlmsg_request)
@@ -304,7 +304,7 @@ int iwpm_add_and_query_mapping(struct iwpm_sa_data *pm_msg, u8 nl_client) 
	ret = iwpm_wait_complete_req(nlmsg_request);

	return ret;

query_mapping_error:

	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);

	pr_info("%s: %s (client = %u)\n", __func__, err_str, nl_client);

query_mapping_error_nowarn:

	dev_kfree_skb(skb);

	if (nlmsg_request)
@@ -372,7 +372,7 @@ int iwpm_remove_mapping(struct sockaddr_storage *local_addr, u8 nl_client) 
			"remove_mapping: Local sockaddr:");

	return 0;

remove_mapping_error:

	pr_info("%s: %s (client = %d)\n", __func__, err_str, nl_client);

	pr_info("%s: %s (client = %u)\n", __func__, err_str, nl_client);

	if (skb)

		dev_kfree_skb_any(skb);

	return ret;
@@ -431,7 +431,7 @@ int iwpm_register_pid_cb(struct sk_buff *skb, struct netlink_callback *cb) 
			strcmp(iwpm_ulib_name, iwpm_name) ||

			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 = %u)\n",

				__func__, dev_name, iwpm_name, iwpm_version);

		nlmsg_request->err_code = IWPM_USER_LIB_INFO_ERR;

		goto register_pid_response_exit;
@@ -439,7 +439,7 @@ int iwpm_register_pid_cb(struct sk_buff *skb, struct netlink_callback *cb) 
	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...",

		pr_warn_once("%s: Down level iwpmd/pid %d.  Continuing...",

			__func__, iwpm_user_pid);

	atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);

	pr_debug("%s: iWarp Port Mapper (pid = %d) is available!\n",
@@ -650,7 +650,7 @@ int iwpm_remote_info_cb(struct sk_buff *skb, struct netlink_callback *cb) 


	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",

		pr_info("%s: Invalid port mapper client = %u\n",

				__func__, nl_client);

		return ret;

	}
@@ -731,13 +731,13 @@ int iwpm_mapping_info_cb(struct sk_buff *skb, struct netlink_callback *cb) 
	iwpm_version = nla_get_u16(nltb[IWPM_NLA_MAPINFO_ULIB_VER]);

	if (strcmp(iwpm_ulib_name, iwpm_name) ||

			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 = %u\n",

				__func__, iwpm_name, iwpm_version);

		return ret;

	}

	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",

		pr_info("%s: Invalid port mapper client = %u\n",

				__func__, nl_client);

		return ret;

	}
@@ -746,7 +746,7 @@ int iwpm_mapping_info_cb(struct sk_buff *skb, struct netlink_callback *cb) 
	iwpm_user_pid = cb->nlh->nlmsg_pid;



	if (iwpm_ulib_version < IWPM_UABI_VERSION)

		pr_warn_once("%s: Down level iwpmd/pid %u.  Continuing...",

		pr_warn_once("%s: Down level iwpmd/pid %d.  Continuing...",

			__func__, iwpm_user_pid);



	if (!iwpm_mapinfo_available())
@@ -864,7 +864,7 @@ int iwpm_hello_cb(struct sk_buff *skb, struct netlink_callback *cb) 
	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",

		pr_info("%s: Invalid port mapper client = %u\n",

				__func__, nl_client);

		return ret;

	}

drivers/infiniband/core/iwpm_util.c

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int iwpm_get_remote_info(struct sockaddr_storage *mapped_loc_addr, 
	int ret = -EINVAL;



	if (!iwpm_valid_client(nl_client)) {

		pr_info("%s: Invalid client = %d\n", __func__, nl_client);

		pr_info("%s: Invalid client = %u\n", __func__, nl_client);

		return ret;

	}

	spin_lock_irqsave(&iwpm_reminfo_lock, flags);
@@ -655,7 +655,7 @@ static int send_mapinfo_num(u32 mapping_num, u8 nl_client, int iwpm_pid) 
		err_str = "Unable to send a nlmsg";

		goto mapinfo_num_error;

	}

	pr_debug("%s: Sent mapping number = %d\n", __func__, mapping_num);

	pr_debug("%s: Sent mapping number = %u\n", __func__, mapping_num);

	return 0;

mapinfo_num_error:

	pr_info("%s: %s\n", __func__, err_str);

drivers/infiniband/core/mad.c

+5 −5
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
	/* Validate device and port */

	port_priv = ib_get_mad_port(device, port_num);

	if (!port_priv) {

		dev_dbg_ratelimited(&device->dev, "%s: Invalid port %d\n",

		dev_dbg_ratelimited(&device->dev, "%s: Invalid port %u\n",

				    __func__, port_num);

		ret = ERR_PTR(-ENODEV);

		goto error1;
@@ -1626,7 +1626,7 @@ static int validate_mad(const struct ib_mad_hdr *mad_hdr, 
	/* Make sure MAD base version is understood */

	if (mad_hdr->base_version != IB_MGMT_BASE_VERSION &&

	    (!opa || mad_hdr->base_version != OPA_MGMT_BASE_VERSION)) {

		pr_err("MAD received with unsupported base version %d %s\n",

		pr_err("MAD received with unsupported base version %u %s\n",

		       mad_hdr->base_version, opa ? "(opa)" : "");

		goto out;

	}
@@ -2867,7 +2867,7 @@ static void qp_event_handler(struct ib_event *event, void *qp_context) 


	/* It's worse than that! He's dead, Jim! */

	dev_err(&qp_info->port_priv->device->dev,

		"Fatal error (%d) on MAD QP (%d)\n",

		"Fatal error (%d) on MAD QP (%u)\n",

		event->event, qp_info->qp->qp_num);

}
@@ -3125,9 +3125,9 @@ static void ib_mad_remove_device(struct ib_device *device, void *client_data) 


		if (ib_agent_port_close(device, i))

			dev_err(&device->dev,

				"Couldn't close port %d for agents\n", i);

				"Couldn't close port %u for agents\n", i);

		if (ib_mad_port_close(device, i))

			dev_err(&device->dev, "Couldn't close port %d\n", i);

			dev_err(&device->dev, "Couldn't close port %u\n", i);

	}

}