Commit 8fcb0972 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fib-rule-selftest' 



Roopa Prabhu says:

====================
fib rule selftest

This series adds a new test to test fib rules.
ip route get is used to test fib rule matches.
This series also extends ip route get to match on
sport and dport to test recent support of sport
and dport fib rule match.

v2 - address ido's commemt to make sport dport
ip route get to work correctly for input route
get. I don't support ip route get on ip-proto match yet.
ip route get creates a udp packet and i have left
it at that. We could extend ip route get to support
a few ip proto matches in followup patches.

v3 - Support ip_proto (only tcp and udp) match in getroute.
dropped printing of new match attrs in ip route get,
because ipv6 does not print it. And ipv6 currrently shares
the dump api with ipv6 notify and its better to not add them
to the notify api. dropped it to keep the api consistent between
ipv4 and ipv6 (though uid is already printed in the ipv4 case).
If we need it, both ipv4 and ipv6 can be enhanced to provide
a separate get api. Moved skb creation for ipv4 to a separate func.

v4 - drop separate skb for netlink and fix concerns around rcu and netlink
     reply (as pointed out by DaveM). I now try to reset the skb after the route
     lookup and before the netlink send (testing shows this is ok. More eyes and
     any feedback here will be helpful)

v5 - dropped RTA_TABLE ipv4_rtm_policy update from this series and posted
     it separately for net (feedback from Eric)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 273de02a 65b2b493

include/net/ip.h

+3 −0
Original line number Diff line number Diff line
@@ -664,4 +664,7 @@ extern int sysctl_icmp_msgs_burst; 
int ip_misc_proc_init(void);

#endif



int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto,

				struct netlink_ext_ack *extack);



#endif	/* _IP_H */

include/uapi/linux/rtnetlink.h

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ enum rtattr_type_t { 
	RTA_PAD,

	RTA_UID,

	RTA_TTL_PROPAGATE,

	RTA_IP_PROTO,

	RTA_SPORT,

	RTA_DPORT,

	__RTA_MAX

};

net/ipv4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-y := route.o inetpeer.o protocol.o \ 
	     udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \

	     fib_frontend.o fib_semantics.o fib_trie.o fib_notifier.o \

	     inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o \

	     metrics.o

	     metrics.o netlink.o



obj-$(CONFIG_BPFILTER) += bpfilter/

net/ipv4/fib_frontend.c

+3 −0
Original line number Diff line number Diff line
@@ -649,6 +649,9 @@ const struct nla_policy rtm_ipv4_policy[RTA_MAX + 1] = { 
	[RTA_ENCAP]		= { .type = NLA_NESTED },

	[RTA_UID]		= { .type = NLA_U32 },

	[RTA_MARK]		= { .type = NLA_U32 },

	[RTA_IP_PROTO]		= { .type = NLA_U8 },

	[RTA_SPORT]		= { .type = NLA_U16 },

	[RTA_DPORT]		= { .type = NLA_U16 },

};



static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,

net/ipv4/netlink.c

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#include <linux/netlink.h>

#include <linux/rtnetlink.h>

#include <linux/types.h>

#include <net/net_namespace.h>

#include <net/netlink.h>

#include <net/ip.h>



int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto,

				struct netlink_ext_ack *extack)

{

	*ip_proto = nla_get_u8(attr);



	switch (*ip_proto) {

	case IPPROTO_TCP:

	case IPPROTO_UDP:

	case IPPROTO_ICMP:

		return 0;

	default:

		NL_SET_ERR_MSG(extack, "Unsupported ip proto");

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL_GPL(rtm_getroute_parse_ip_proto);

CRA Git | Maintained and supported by SUSTech CRA and CCSE