Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: bridge: introduce broute meta statement

nftables equivalent for ebtables -t broute.

Implement broute meta statement to set br_netfilter_broute flag
in skb to force a packet to be routed instead of being bridged.

Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Signed-off-by: Florian Westphal <fw@strlen.de>

authored by

Sriram Yagnaraman and committed by
Florian Westphal
4386b921 7d8c4891

+70 -3
+2
include/uapi/linux/netfilter/nf_tables.h
··· 931 931 * @NFT_META_TIME_HOUR: hour of day (in seconds) 932 932 * @NFT_META_SDIF: slave device interface index 933 933 * @NFT_META_SDIFNAME: slave device interface name 934 + * @NFT_META_BRI_BROUTE: packet br_netfilter_broute bit 934 935 */ 935 936 enum nft_meta_keys { 936 937 NFT_META_LEN, ··· 970 969 NFT_META_TIME_HOUR, 971 970 NFT_META_SDIF, 972 971 NFT_META_SDIFNAME, 972 + NFT_META_BRI_BROUTE, 973 973 __NFT_META_IIFTYPE, 974 974 }; 975 975
+68 -3
net/bridge/netfilter/nft_meta_bridge.c
··· 8 8 #include <net/netfilter/nf_tables.h> 9 9 #include <net/netfilter/nft_meta.h> 10 10 #include <linux/if_bridge.h> 11 + #include <uapi/linux/netfilter_bridge.h> /* NF_BR_PRE_ROUTING */ 12 + 13 + #include "../br_private.h" 11 14 12 15 static const struct net_device * 13 16 nft_meta_get_bridge(const struct net_device *dev) ··· 105 102 .reduce = nft_meta_get_reduce, 106 103 }; 107 104 105 + static void nft_meta_bridge_set_eval(const struct nft_expr *expr, 106 + struct nft_regs *regs, 107 + const struct nft_pktinfo *pkt) 108 + { 109 + const struct nft_meta *meta = nft_expr_priv(expr); 110 + u32 *sreg = &regs->data[meta->sreg]; 111 + struct sk_buff *skb = pkt->skb; 112 + u8 value8; 113 + 114 + switch (meta->key) { 115 + case NFT_META_BRI_BROUTE: 116 + value8 = nft_reg_load8(sreg); 117 + BR_INPUT_SKB_CB(skb)->br_netfilter_broute = !!value8; 118 + break; 119 + default: 120 + nft_meta_set_eval(expr, regs, pkt); 121 + } 122 + } 123 + 124 + static int nft_meta_bridge_set_init(const struct nft_ctx *ctx, 125 + const struct nft_expr *expr, 126 + const struct nlattr * const tb[]) 127 + { 128 + struct nft_meta *priv = nft_expr_priv(expr); 129 + unsigned int len; 130 + int err; 131 + 132 + priv->key = ntohl(nla_get_be32(tb[NFTA_META_KEY])); 133 + switch (priv->key) { 134 + case NFT_META_BRI_BROUTE: 135 + len = sizeof(u8); 136 + break; 137 + default: 138 + return nft_meta_set_init(ctx, expr, tb); 139 + } 140 + 141 + priv->len = len; 142 + err = nft_parse_register_load(tb[NFTA_META_SREG], &priv->sreg, len); 143 + if (err < 0) 144 + return err; 145 + 146 + return 0; 147 + } 148 + 108 149 static bool nft_meta_bridge_set_reduce(struct nft_regs_track *track, 109 150 const struct nft_expr *expr) 110 151 { ··· 167 120 return false; 168 121 } 169 122 123 + static int nft_meta_bridge_set_validate(const struct nft_ctx *ctx, 124 + const struct nft_expr *expr, 125 + const struct nft_data **data) 126 + { 127 + struct nft_meta *priv = nft_expr_priv(expr); 128 + unsigned int hooks; 129 + 130 + switch (priv->key) { 131 + case NFT_META_BRI_BROUTE: 132 + hooks = 1 << NF_BR_PRE_ROUTING; 133 + break; 134 + default: 135 + return nft_meta_set_validate(ctx, expr, data); 136 + } 137 + 138 + return nft_chain_validate_hooks(ctx->chain, hooks); 139 + } 140 + 170 141 static const struct nft_expr_ops nft_meta_bridge_set_ops = { 171 142 .type = &nft_meta_bridge_type, 172 143 .size = NFT_EXPR_SIZE(sizeof(struct nft_meta)), 173 - .eval = nft_meta_set_eval, 174 - .init = nft_meta_set_init, 144 + .eval = nft_meta_bridge_set_eval, 145 + .init = nft_meta_bridge_set_init, 175 146 .destroy = nft_meta_set_destroy, 176 147 .dump = nft_meta_set_dump, 177 148 .reduce = nft_meta_bridge_set_reduce, 178 - .validate = nft_meta_set_validate, 149 + .validate = nft_meta_bridge_set_validate, 179 150 }; 180 151 181 152 static const struct nft_expr_ops *