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

Commit 9ae28727 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: add extack arg to lwtunnel build state 



Pass extack arg down to lwtunnel_build_state and the build_state callbacks.
Add messages for failures in lwtunnel_build_state, and add the extarg to
nla_parse where possible in the build_state callbacks.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c255bd68

include/linux/netlink.h

+10 −0
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ struct netlink_ext_ack { 
		(extack)->bad_attr = (attr);		\

} while (0)



#define NL_SET_ERR_MSG_ATTR(extack, attr, msg) do {	\

	static const char __msg[] = (msg);		\

	struct netlink_ext_ack *__extack = (extack);	\

							\

	if (__extack) {					\

		__extack->_msg = __msg;			\

		__extack->bad_attr = (attr);		\

	}						\

} while (0)



extern void netlink_kernel_release(struct sock *sk);

extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);

extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);

include/net/lwtunnel.h

+6 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ struct lwtunnel_state { 
struct lwtunnel_encap_ops {

	int (*build_state)(struct nlattr *encap,

			   unsigned int family, const void *cfg,

			   struct lwtunnel_state **ts);

			   struct lwtunnel_state **ts,

			   struct netlink_ext_ack *extack);

	void (*destroy_state)(struct lwtunnel_state *lws);

	int (*output)(struct net *net, struct sock *sk, struct sk_buff *skb);

	int (*input)(struct sk_buff *skb);
@@ -114,7 +115,8 @@ int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len, 
int lwtunnel_build_state(u16 encap_type,

			 struct nlattr *encap,

			 unsigned int family, const void *cfg,

			 struct lwtunnel_state **lws);

			 struct lwtunnel_state **lws,

			 struct netlink_ext_ack *extack);

int lwtunnel_fill_encap(struct sk_buff *skb,

			struct lwtunnel_state *lwtstate);

int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate);
@@ -192,7 +194,8 @@ static inline int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len, 
static inline int lwtunnel_build_state(u16 encap_type,

				       struct nlattr *encap,

				       unsigned int family, const void *cfg,

				       struct lwtunnel_state **lws)

				       struct lwtunnel_state **lws,

				       struct netlink_ext_ack *extack)

{

	return -EOPNOTSUPP;

}

net/core/lwt_bpf.c

+3 −2
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ static const struct nla_policy bpf_nl_policy[LWT_BPF_MAX + 1] = { 


static int bpf_build_state(struct nlattr *nla,

			   unsigned int family, const void *cfg,

			   struct lwtunnel_state **ts)

			   struct lwtunnel_state **ts,

			   struct netlink_ext_ack *extack)

{

	struct nlattr *tb[LWT_BPF_MAX + 1];

	struct lwtunnel_state *newts;
@@ -250,7 +251,7 @@ static int bpf_build_state(struct nlattr *nla, 
	if (family != AF_INET && family != AF_INET6)

		return -EAFNOSUPPORT;



	ret = nla_parse_nested(tb, LWT_BPF_MAX, nla, bpf_nl_policy, NULL);

	ret = nla_parse_nested(tb, LWT_BPF_MAX, nla, bpf_nl_policy, extack);

	if (ret < 0)

		return ret;

net/core/lwtunnel.c

+17 −3
Original line number Diff line number Diff line
@@ -103,25 +103,39 @@ EXPORT_SYMBOL(lwtunnel_encap_del_ops); 


int lwtunnel_build_state(u16 encap_type,

			 struct nlattr *encap, unsigned int family,

			 const void *cfg, struct lwtunnel_state **lws)

			 const void *cfg, struct lwtunnel_state **lws,

			 struct netlink_ext_ack *extack)

{

	const struct lwtunnel_encap_ops *ops;

	bool found = false;

	int ret = -EINVAL;



	if (encap_type == LWTUNNEL_ENCAP_NONE ||

	    encap_type > LWTUNNEL_ENCAP_MAX)

	    encap_type > LWTUNNEL_ENCAP_MAX) {

		NL_SET_ERR_MSG_ATTR(extack, encap,

				    "Unknown LWT encapsulation type");

		return ret;

	}



	ret = -EOPNOTSUPP;

	rcu_read_lock();

	ops = rcu_dereference(lwtun_encaps[encap_type]);

	if (likely(ops && ops->build_state && try_module_get(ops->owner))) {

		ret = ops->build_state(encap, family, cfg, lws);

		found = true;

		ret = ops->build_state(encap, family, cfg, lws, extack);

		if (ret)

			module_put(ops->owner);

	}

	rcu_read_unlock();



	/* don't rely on -EOPNOTSUPP to detect match as build_state

	 * handlers could return it

	 */

	if (!found) {

		NL_SET_ERR_MSG_ATTR(extack, encap,

				    "LWT encapsulation type not supported");

	}



	return ret;

}

EXPORT_SYMBOL(lwtunnel_build_state);

net/ipv4/fib_lookup.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static inline void fib_alias_accessed(struct fib_alias *fa) 
void fib_release_info(struct fib_info *);

struct fib_info *fib_create_info(struct fib_config *cfg,

				 struct netlink_ext_ack *extack);

int fib_nh_match(struct fib_config *cfg, struct fib_info *fi);

int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,

		 struct netlink_ext_ack *extack);

int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, u32 tb_id,

		  u8 type, __be32 dst, int dst_len, u8 tos, struct fib_info *fi,

		  unsigned int);