bridge: broute: make broute a real ebtables table (223fd0ad) · Commits · 戴 / test

include/linux/if_bridge.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -56,9 +56,6 @@ struct br_ip_list {

		extern void brioctl_set(int (ioctl_hook)(struct net , unsigned int, void __user *));

		typedef int br_should_route_hook_t(struct sk_buff *skb);
		extern br_should_route_hook_t __rcu *br_should_route_hook;

		#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)
		int br_multicast_list_adjacent(struct net_device *dev,
		struct list_head *br_ip_list);

net/bridge/br_input.c

+4 −14

Original line number	Diff line number	Diff line
		@@ -24,10 +24,6 @@
		#include "br_private.h"
		#include "br_private_tunnel.h"

		/* Hook for brouter */
		br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;
		EXPORT_SYMBOL(br_should_route_hook);

		static int
		br_netif_receive_skb(struct net net, struct sock sk, struct sk_buff *skb)
		{
		@@ -234,6 +230,10 @@ static int nf_hook_bridge_pre(struct sk_buff skb, struct sk_buff *pskb)
		verdict = nf_hook_entry_hookfn(&e->hooks[i], skb, &state);
		switch (verdict & NF_VERDICT_MASK) {
		case NF_ACCEPT:
		if (BR_INPUT_SKB_CB(skb)->br_netfilter_broute) {
		*pskb = skb;
		return RX_HANDLER_PASS;
		}
		break;
		case NF_DROP:
		kfree_skb(skb);
		@@ -265,7 +265,6 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
		struct net_bridge_port *p;
		struct sk_buff skb = pskb;
		const unsigned char *dest = eth_hdr(skb)->h_dest;
		br_should_route_hook_t *rhook;

		if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
		return RX_HANDLER_PASS;
		@@ -341,15 +340,6 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
		forward:
		switch (p->state) {
		case BR_STATE_FORWARDING:
		rhook = rcu_dereference(br_should_route_hook);
		if (rhook) {
		if ((*rhook)(skb)) {
		*pskb = skb;
		return RX_HANDLER_PASS;
		}
		dest = eth_hdr(skb)->h_dest;
		}
		/* fall through */
		case BR_STATE_LEARNING:
		if (ether_addr_equal(p->br->dev->dev_addr, dest))
		skb->pkt_type = PACKET_HOST;

net/bridge/br_private.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,9 @@ struct br_input_skb_cb {
		#ifdef CONFIG_BRIDGE_VLAN_FILTERING
		u8 vlan_filtered:1;
		#endif
		#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
		u8 br_netfilter_broute:1;
		#endif

		#ifdef CONFIG_NET_SWITCHDEV
		int offload_fwd_mark;

net/bridge/netfilter/ebtable_broute.c

+44 −19

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		#include <linux/module.h>
		#include <linux/if_bridge.h>

		#include "../br_private.h"

		/* EBT_ACCEPT means the frame will be bridged
		* EBT_DROP means the frame will be routed
		*/
		@@ -48,30 +50,63 @@ static const struct ebt_table broute_table = {
		.me = THIS_MODULE,
		};

		static int ebt_broute(struct sk_buff *skb)
		static unsigned int ebt_broute(void priv, struct sk_buff skb,
		const struct nf_hook_state *s)
		{
		struct net_bridge_port *p = br_port_get_rcu(skb->dev);
		struct nf_hook_state state;
		unsigned char *dest;
		int ret;

		if (!p \|\| p->state != BR_STATE_FORWARDING)
		return NF_ACCEPT;

		nf_hook_state_init(&state, NF_BR_BROUTING,
		NFPROTO_BRIDGE, skb->dev, NULL, NULL,
		dev_net(skb->dev), NULL);
		NFPROTO_BRIDGE, s->in, NULL, NULL,
		s->net, NULL);

		ret = ebt_do_table(skb, &state, state.net->xt.broute_table);
		if (ret == NF_DROP)
		return 1; /* route it */
		return 0; /* bridge it */

		if (ret != NF_DROP)
		return ret;

		/* DROP in ebtables -t broute means that the
		* skb should be routed, not bridged.
		* This is awkward, but can't be changed for compatibility
		* reasons.
		*
		* We map DROP to ACCEPT and set the ->br_netfilter_broute flag.
		*/
		BR_INPUT_SKB_CB(skb)->br_netfilter_broute = 1;

		/* undo PACKET_HOST mangling done in br_input in case the dst
		* address matches the logical bridge but not the port.
		*/
		dest = eth_hdr(skb)->h_dest;
		if (skb->pkt_type == PACKET_HOST &&
		!ether_addr_equal(skb->dev->dev_addr, dest) &&
		ether_addr_equal(p->br->dev->dev_addr, dest))
		skb->pkt_type = PACKET_OTHERHOST;

		return NF_ACCEPT;
		}

		static const struct nf_hook_ops ebt_ops_broute = {
		.hook = ebt_broute,
		.pf = NFPROTO_BRIDGE,
		.hooknum = NF_BR_PRE_ROUTING,
		.priority = NF_BR_PRI_FIRST,
		};

		static int __net_init broute_net_init(struct net *net)
		{
		return ebt_register_table(net, &broute_table, NULL,
		return ebt_register_table(net, &broute_table, &ebt_ops_broute,
		&net->xt.broute_table);
		}

		static void __net_exit broute_net_exit(struct net *net)
		{
		ebt_unregister_table(net, net->xt.broute_table, NULL);
		ebt_unregister_table(net, net->xt.broute_table, &ebt_ops_broute);
		}

		static struct pernet_operations broute_net_ops = {
		@@ -81,21 +116,11 @@ static struct pernet_operations broute_net_ops = {

		static int __init ebtable_broute_init(void)
		{
		int ret;

		ret = register_pernet_subsys(&broute_net_ops);
		if (ret < 0)
		return ret;
		/* see br_input.c */
		RCU_INIT_POINTER(br_should_route_hook,
		(br_should_route_hook_t *)ebt_broute);
		return 0;
		return register_pernet_subsys(&broute_net_ops);
		}

		static void __exit ebtable_broute_fini(void)
		{
		RCU_INIT_POINTER(br_should_route_hook, NULL);
		synchronize_net();
		unregister_pernet_subsys(&broute_net_ops);
		}

net/bridge/netfilter/ebtables.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -1221,10 +1221,6 @@ int ebt_register_table(struct net net, const struct ebt_table input_table,
		mutex_unlock(&ebt_mutex);

		WRITE_ONCE(*res, table);

		if (!ops)
		return 0;

		ret = nf_register_net_hooks(net, ops, hweight32(table->valid_hooks));
		if (ret) {
		__ebt_unregister_table(net, table);
		@@ -1248,7 +1244,6 @@ out:
		void ebt_unregister_table(struct net net, struct ebt_table table,
		const struct nf_hook_ops *ops)
		{
		if (ops)
		nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
		__ebt_unregister_table(net, table);
		}

Admin message