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

Commit 647c75ac authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/netlink: Convert LS to doit callback 



RDMA_NL_LS protocol is actually does not dump anything,
but sets data and it should be handled by doit callback.

This patch actually converts RDMA_NL_LS to doit callback, while
preserving IWCM and RDMA_CM flows through netlink_dump_start().

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
parent c729943a

drivers/infiniband/core/addr.c

+2 −3
Original line number Diff line number Diff line
@@ -129,10 +129,9 @@ static void ib_nl_process_good_ip_rsep(const struct nlmsghdr *nlh) 
}



int ib_nl_handle_ip_res_resp(struct sk_buff *skb,

			     struct netlink_callback *cb)

			     struct nlmsghdr *nlh,

			     struct netlink_ext_ack *extack)

{

	const struct nlmsghdr *nlh = (struct nlmsghdr *)cb->nlh;



	if ((nlh->nlmsg_flags & NLM_F_REQUEST) ||

	    !(NETLINK_CB(skb).sk))

		return -EPERM;

drivers/infiniband/core/core_priv.h

+6 −3
Original line number Diff line number Diff line
@@ -198,11 +198,14 @@ void rdma_nl_exit(void); 
int ibnl_chk_listeners(unsigned int group);



int ib_nl_handle_resolve_resp(struct sk_buff *skb,

			      struct netlink_callback *cb);

			      struct nlmsghdr *nlh,

			      struct netlink_ext_ack *extack);

int ib_nl_handle_set_timeout(struct sk_buff *skb,

			     struct netlink_callback *cb);

			     struct nlmsghdr *nlh,

			     struct netlink_ext_ack *extack);

int ib_nl_handle_ip_res_resp(struct sk_buff *skb,

			     struct netlink_callback *cb);

			     struct nlmsghdr *nlh,

			     struct netlink_ext_ack *extack);



int ib_get_cached_subnet_prefix(struct ib_device *device,

				u8                port_num,

drivers/infiniband/core/device.c

+3 −3
Original line number Diff line number Diff line
@@ -1148,15 +1148,15 @@ EXPORT_SYMBOL(ib_get_net_dev_by_params); 


static const struct rdma_nl_cbs ibnl_ls_cb_table[] = {

	[RDMA_NL_LS_OP_RESOLVE] = {

		.dump = ib_nl_handle_resolve_resp,

		.doit = ib_nl_handle_resolve_resp,

		.flags = RDMA_NL_ADMIN_PERM,

	},

	[RDMA_NL_LS_OP_SET_TIMEOUT] = {

		.dump = ib_nl_handle_set_timeout,

		.doit = ib_nl_handle_set_timeout,

		.flags = RDMA_NL_ADMIN_PERM,

	},

	[RDMA_NL_LS_OP_IP_RESOLVE] = {

		.dump = ib_nl_handle_ip_res_resp,

		.doit = ib_nl_handle_ip_res_resp,

		.flags = RDMA_NL_ADMIN_PERM,

	},

};

drivers/infiniband/core/netlink.c

+10 −18
Original line number Diff line number Diff line
@@ -153,38 +153,30 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	int type = nlh->nlmsg_type;

	unsigned int index = RDMA_NL_GET_CLIENT(type);

	unsigned int op = RDMA_NL_GET_OP(type);

	struct netlink_callback cb = {};

	struct netlink_dump_control c = {};

	const struct rdma_nl_cbs *cb_table;

	int ret;



	if (!is_nl_valid(index, op))

		return -EINVAL;



	cb_table = rdma_nl_types[type].cb_table;

	cb_table = rdma_nl_types[index].cb_table;



	if ((cb_table[op].flags & RDMA_NL_ADMIN_PERM) &&

	    !netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	/*

	 * For response or local service set_timeout request,

	 * there is no need to use netlink_dump_start.

	 */

	if (!(nlh->nlmsg_flags & NLM_F_REQUEST) ||

	    (index == RDMA_NL_LS && op == RDMA_NL_LS_OP_SET_TIMEOUT)) {

		cb.skb = skb;

		cb.nlh = nlh;

		cb.dump = cb_table[op].dump;

		return cb.dump(skb, &cb);

	} else {

		c.dump = cb_table[op].dump;

	/* FIXME: Convert IWCM to properly handle doit callbacks */

	if ((nlh->nlmsg_flags & NLM_F_DUMP) || index == RDMA_NL_RDMA_CM ||

	    index == RDMA_NL_IWCM) {

		struct netlink_dump_control c = {

			.dump = cb_table[op].dump,

		};

		return netlink_dump_start(nls, skb, nlh, &c);

	}



	if (cb_table[op].doit)

		ret = cb_table[op].doit(skb, nlh, extack);

	return ret;

		return cb_table[op].doit(skb, nlh, extack);



	return 0;

}



/*

drivers/infiniband/core/sa_query.c

+4 −4
Original line number Diff line number Diff line
@@ -1021,9 +1021,9 @@ static void ib_nl_request_timeout(struct work_struct *work) 
}



int ib_nl_handle_set_timeout(struct sk_buff *skb,

			     struct netlink_callback *cb)

			     struct nlmsghdr *nlh,

			     struct netlink_ext_ack *extack)

{

	const struct nlmsghdr *nlh = (struct nlmsghdr *)cb->nlh;

	int timeout, delta, abs_delta;

	const struct nlattr *attr;

	unsigned long flags;
@@ -1097,9 +1097,9 @@ static inline int ib_nl_is_good_resolve_resp(const struct nlmsghdr *nlh) 
}



int ib_nl_handle_resolve_resp(struct sk_buff *skb,

			      struct netlink_callback *cb)

			      struct nlmsghdr *nlh,

			      struct netlink_ext_ack *extack)

{

	const struct nlmsghdr *nlh = (struct nlmsghdr *)cb->nlh;

	unsigned long flags;

	struct ib_sa_query *query;

	struct ib_mad_send_buf *send_buf;