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

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

Merge branch 'route-add-support-and-selftests-for-directed-broadcast-forwarding' 



Xin Long says:

====================
route: add support and selftests for directed broadcast forwarding

Patch 1/2 is the feature and 2/2 is the selftest. Check the changelog
on each of them to know the details.

v1->v2:
  - fix a typo in changelog.
  - fix an uapi break that Davide noticed.
  - flush route cache when bc_forwarding is changed.
  - add the selftest for this patch as Ido's suggestion.

v2->v3:
  - fix an incorrect 'if check' in devinet_conf_proc as David Ahern
    noticed.
  - extend the selftest after one David Ahern fix for vrf.

v3->v4:
  - improve the output log in the selftest as David Ahern suggested.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d0c1f011 40f98b9a

include/linux/inetdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) 


#define IN_DEV_FORWARD(in_dev)		IN_DEV_CONF_GET((in_dev), FORWARDING)

#define IN_DEV_MFORWARD(in_dev)		IN_DEV_ANDCONF((in_dev), MC_FORWARDING)

#define IN_DEV_BFORWARD(in_dev)		IN_DEV_ANDCONF((in_dev), BC_FORWARDING)

#define IN_DEV_RPFILTER(in_dev)		IN_DEV_MAXCONF((in_dev), RP_FILTER)

#define IN_DEV_SRC_VMARK(in_dev)    	IN_DEV_ORCONF((in_dev), SRC_VMARK)

#define IN_DEV_SOURCE_ROUTE(in_dev)	IN_DEV_ANDCONF((in_dev), \

include/uapi/linux/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ enum 
	IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,

	IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,

	IPV4_DEVCONF_DROP_GRATUITOUS_ARP,

	IPV4_DEVCONF_BC_FORWARDING,

	__IPV4_DEVCONF_MAX

};

include/uapi/linux/netconf.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum { 
	NETCONFA_PROXY_NEIGH,

	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,

	NETCONFA_INPUT,

	NETCONFA_BC_FORWARDING,

	__NETCONFA_MAX

};

#define NETCONFA_MAX	(__NETCONFA_MAX - 1)

net/ipv4/devinet.c

+11 −0
Original line number Diff line number Diff line
@@ -1827,6 +1827,8 @@ static int inet_netconf_msgsize_devconf(int type) 
		size += nla_total_size(4);

	if (all || type == NETCONFA_MC_FORWARDING)

		size += nla_total_size(4);

	if (all || type == NETCONFA_BC_FORWARDING)

		size += nla_total_size(4);

	if (all || type == NETCONFA_PROXY_NEIGH)

		size += nla_total_size(4);

	if (all || type == NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN)
@@ -1873,6 +1875,10 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex, 
	    nla_put_s32(skb, NETCONFA_MC_FORWARDING,

			IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0)

		goto nla_put_failure;

	if ((all || type == NETCONFA_BC_FORWARDING) &&

	    nla_put_s32(skb, NETCONFA_BC_FORWARDING,

			IPV4_DEVCONF(*devconf, BC_FORWARDING)) < 0)

		goto nla_put_failure;

	if ((all || type == NETCONFA_PROXY_NEIGH) &&

	    nla_put_s32(skb, NETCONFA_PROXY_NEIGH,

			IPV4_DEVCONF(*devconf, PROXY_ARP)) < 0)
@@ -2143,6 +2149,10 @@ static int devinet_conf_proc(struct ctl_table *ctl, int write, 
			if ((new_value == 0) && (old_value != 0))

				rt_cache_flush(net);



		if (i == IPV4_DEVCONF_BC_FORWARDING - 1 &&

		    new_value != old_value)

			rt_cache_flush(net);



		if (i == IPV4_DEVCONF_RP_FILTER - 1 &&

		    new_value != old_value) {

			ifindex = devinet_conf_ifindex(net, cnf);
@@ -2259,6 +2269,7 @@ static struct devinet_sysctl_table { 
		DEVINET_SYSCTL_COMPLEX_ENTRY(FORWARDING, "forwarding",

					     devinet_sysctl_forward),

		DEVINET_SYSCTL_RO_ENTRY(MC_FORWARDING, "mc_forwarding"),

		DEVINET_SYSCTL_RW_ENTRY(BC_FORWARDING, "bc_forwarding"),



		DEVINET_SYSCTL_RW_ENTRY(ACCEPT_REDIRECTS, "accept_redirects"),

		DEVINET_SYSCTL_RW_ENTRY(SECURE_REDIRECTS, "secure_redirects"),

net/ipv4/route.c

+5 −1
Original line number Diff line number Diff line
@@ -1996,8 +1996,11 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
		goto no_route;

	}



	if (res->type == RTN_BROADCAST)

	if (res->type == RTN_BROADCAST) {

		if (IN_DEV_BFORWARD(in_dev))

			goto make_route;

		goto brd_input;

	}



	if (res->type == RTN_LOCAL) {

		err = fib_validate_source(skb, saddr, daddr, tos,
@@ -2014,6 +2017,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	if (res->type != RTN_UNICAST)

		goto martian_destination;



make_route:

	err = ip_mkroute_input(skb, res, in_dev, daddr, saddr, tos, flkeys);

out:	return err;