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

Commit 142afbc6 authored by Tom Herbert's avatar Tom Herbert Committed by Greg Kroah-Hartman
Browse files

netlink: add a start callback for starting a netlink dump 



commit fc9e50f5a5a4e1fa9ba2756f745a13e693cf6a06 upstream.

The start callback allows the caller to set up a context for the
dump callbacks. Presumably, the context can then be destroyed in
the done callback.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4251805

include/linux/netlink.h

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ netlink_skb_clone(struct sk_buff *skb, gfp_t gfp_mask) 
struct netlink_callback {

	struct sk_buff		*skb;

	const struct nlmsghdr	*nlh;

	int			(*start)(struct netlink_callback *);

	int			(*dump)(struct sk_buff * skb,

					struct netlink_callback *cb);

	int			(*done)(struct netlink_callback *cb);
@@ -142,6 +143,7 @@ struct nlmsghdr * 
__nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int flags);



struct netlink_dump_control {

	int (*start)(struct netlink_callback *);

	int (*dump)(struct sk_buff *skb, struct netlink_callback *);

	int (*done)(struct netlink_callback *);

	void *data;

include/net/genetlink.h

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net) 
 * @flags: flags

 * @policy: attribute validation policy

 * @doit: standard command callback

 * @start: start callback for dumps

 * @dumpit: callback for dumpers

 * @done: completion callback for dumps

 * @ops_list: operations list
@@ -114,6 +115,7 @@ struct genl_ops { 
	const struct nla_policy	*policy;

	int		       (*doit)(struct sk_buff *skb,

				       struct genl_info *info);

	int		       (*start)(struct netlink_callback *cb);

	int		       (*dumpit)(struct sk_buff *skb,

					 struct netlink_callback *cb);

	int		       (*done)(struct netlink_callback *cb);

net/netlink/af_netlink.c

+4 −0
Original line number Diff line number Diff line
@@ -2043,6 +2043,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb, 


	cb = &nlk->cb;

	memset(cb, 0, sizeof(*cb));

	cb->start = control->start;

	cb->dump = control->dump;

	cb->done = control->done;

	cb->nlh = nlh;
@@ -2056,6 +2057,9 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb, 


	mutex_unlock(nlk->cb_mutex);



	if (cb->start)

		cb->start(cb);



	ret = netlink_dump(sk);

	sock_put(sk);

net/netlink/genetlink.c

+16 −0
Original line number Diff line number Diff line
@@ -507,6 +507,20 @@ void *genlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, 
}

EXPORT_SYMBOL(genlmsg_put);



static int genl_lock_start(struct netlink_callback *cb)

{

	/* our ops are always const - netlink API doesn't propagate that */

	const struct genl_ops *ops = cb->data;

	int rc = 0;



	if (ops->start) {

		genl_lock();

		rc = ops->start(cb);

		genl_unlock();

	}

	return rc;

}



static int genl_lock_dumpit(struct sk_buff *skb, struct netlink_callback *cb)

{

	/* our ops are always const - netlink API doesn't propagate that */
@@ -571,6 +585,7 @@ static int genl_family_rcv_msg(struct genl_family *family, 
				.module = family->module,

				/* we have const, but the netlink API doesn't */

				.data = (void *)ops,

				.start = genl_lock_start,

				.dump = genl_lock_dumpit,

				.done = genl_lock_done,

			};
@@ -582,6 +597,7 @@ static int genl_family_rcv_msg(struct genl_family *family, 
		} else {

			struct netlink_dump_control c = {

				.module = family->module,

				.start = ops->start,

				.dump = ops->dumpit,

				.done = ops->done,

			};