netfilter: bridge: add nf_afinfo to enable queuing to userspace
Subsystems (3)
PATCH v5 1/3 netfilter: bridge: add nf_afinfo to enable queuing to userspace
From: stephane <[email protected]>
This just adds and registers a nf_afinfo for the ethernet bridge, which enables queuing to userspace for the AF_BRIDGE family. No checksum computation is done.
--- net/bridge/netfilter/nf_tables_bridge.c | 47 +++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-)
net/bridge/netfilter/nf_tables_bridge.c +45 -2
@@ -162,15 +162,57 @@ static const struct nf_chain_type filter_bridge = { (1 << NF_BR_POST_ROUTING), }; +static void nf_br_saveroute (const struct sk_buff *skb, +struct nf_queue_entry *entry) +{ +} + +static int nf_br_reroute (struct net *net,struct sk_buff *skb, +const struct nf_queue_entry *entry) +{ +return 0 ; +} + +static __sum16 nf_br_checksum (struct sk_buff *skb,unsigned int hook, +unsigned int dataoff,u_int8_t protocol) +{ +return 0 ; +} + +static __sum16 nf_br_checksum_partial (struct sk_buff *skb,unsigned int hook, +unsigned int dataoff,unsigned int len, +u_int8_t protocol) +{ +return 0 ; +} + +static int nf_br_route (struct net *net,struct dst_entry **dst, +struct flowi *fl,bool strict__always_unused ) +{ +return 0 ; +} + +static const struct nf_afinfo nf_br_afinfo = { + .family =AF_BRIDGE , + .checksum = nf_br_checksum, + .checksum_partial = nf_br_checksum_partial, + .route = nf_br_route, + .saveroute = nf_br_saveroute, + .reroute = nf_br_reroute, + .route_key_size =0 , +}; +static int __init nf_tables_bridge_init (void ) {int ret; +nf_register_afinfo (&nf_br_afinfo);nft_register_chain_type (&filter_bridge); ret =register_pernet_subsys (&nf_tables_bridge_net_ops); -if (ret <0 ) +if (ret <0 ) {nft_unregister_chain_type (&filter_bridge); - +nf_unregister_afinfo (&nf_br_afinfo); + }return ret; }
@@ -178,6 +220,7 @@ static void __exit nf_tables_bridge_exit(void) {unregister_pernet_subsys (&nf_tables_bridge_net_ops);nft_unregister_chain_type (&filter_bridge); +nf_unregister_afinfo (&nf_br_afinfo); }module_init (nf_tables_bridge_init);
Signature · 1 line
2.1.4
PATCH v5 2/3 netfilter: bridge: pass L2 header and VLAN as netlink attributes in queues to userspace
From: stephane <[email protected]>
-this creates 2 netlink attribute NLQA_VLAN and NLQA_L2HDR -these are filled up for the PF_BRIDGE family on the way to userspace -NFQA_VLAN is a nested attribute, with the NFQA_VLAN_PROTO and the
NFQA_VLAN_TCI carrying the corresponding vlan_proto and vlan_tci fields from the skb using big endian ordering (and using the CFI bit as the VLAN_TAG_PRESENT flag in vlan_tci as in the skb)
--- include/uapi/linux/netfilter/nfnetlink_queue.h | 10 +++++ net/netfilter/nfnetlink_queue.c | 60 ++++++++++++++++++++++++++ 2 files changed, 70 insertions(+)
include/uapi/linux/netfilter/nfnetlink_queue.h +10 -0
@@ -30,6 +30,14 @@ struct nfqnl_msg_packet_timestamp {__aligned_be64 usec; }; +enum nfqnl_vlan_attr { +NFQA_VLAN_UNSPEC , +NFQA_VLAN_PROTO ,/* __be16 skb vlan_proto */ +NFQA_VLAN_TCI ,/* __be16 skb htons(vlan_tci) */ + _NFQA_VLAN_MAX, +}; +#define NFQA_VLAN_MAX (_NFQA_VLAN_MAX + 1) +enum nfqnl_attr_type {NFQA_UNSPEC ,NFQA_PACKET_HDR ,
@@ -50,6 +58,8 @@ enum nfqnl_attr_type {NFQA_UID ,/* __u32 sk uid */ NFQA_GID ,/* __u32 sk gid */ NFQA_SECCTX ,/* security context string */ +NFQA_VLAN ,/* nested attribute: packet vlan info */ +NFQA_L2HDR ,/* full L2 header */ __NFQA_MAX };
net/netfilter/nfnetlink_queue.c +60 -0
78 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH v5 3/3 netfilter: bridge: nf queue verdict to use NFQA_VLAN and NFQA_L2HDR
In reply to Stephane BryantThis makes nf queues use NFQA_VLAN and NFQA_L2HDR in verdict to modify the original skb
--- net/netfilter/nfnetlink_queue.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
net/netfilter/nfnetlink_queue.c +25 -0
@@ -1126,6 +1126,31 @@ static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl, ct =nfqnl_ct_parse (nfnl_ct, nlh, nfqa, entry, &ctinfo); } +if (nfqa[NFQA_VLAN ]) { +struct nlattr *vlan_tci = +nla_find_nested (nfqa[NFQA_VLAN ],NFQA_VLAN_TCI ); +struct nlattr *vlan_proto = +nla_find_nested (nfqa[NFQA_VLAN ],NFQA_VLAN_PROTO ); + +if (vlan_tci) + entry->skb->vlan_tci =ntohs (nla_get_be16 (vlan_tci)); + +if (vlan_proto) + entry->skb->vlan_proto =nla_get_be16 (vlan_proto); + } + +if (nfqa[NFQA_L2HDR ]) { +int mac_header_len = entry->skb->network_header - + entry->skb->mac_header; + +if (mac_header_len !=nla_len (nfqa[NFQA_L2HDR ])) + verdict =NF_DROP ; +else if (mac_header_len >0 ) +memcpy (skb_mac_header (entry->skb), +nla_data (nfqa[NFQA_L2HDR ]), + mac_header_len); + } +if (nfqa[NFQA_PAYLOAD ]) {u16 payload_len =nla_len (nfqa[NFQA_PAYLOAD ]);int diff = payload_len - entry->skb->len;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerRe: [PATCH nf-next v5 3/3] netfilter: bridge: nf queue verdict to use NFQA_VLAN and NFQA_L2HDR
Hi Stephane,
We're almost there, a bit more changes for this please.
Quoted 18 lines · Stephane Bryant
This makes nf queues use
NFQA_VLANandNFQA_L2HDRin verdict to modify the original skbSigned-off-by Stephane Bryant <[email protected]>--- net/netfilter/nfnetlink_queue.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)net/netfilter/nfnetlink_queue.c +2
-0@@ -1126,6 +1126,31 @@ static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl, ct =nfqnl_ct_parse (nfnl_ct, nlh, nfqa, entry, &ctinfo); } +if (nfqa[NFQA_VLAN ]) { + struct nlattr *vlan_tci =
net/netfilter/nfnetlink_queue.c static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl, · line 1140
Quoted 10 lines
net/netfilter/nfnetlink_queue.c +10
-0+nla_find_nested (nfqa[NFQA_VLAN ],NFQA_VLAN_TCI ); +struct nlattr *vlan_proto = +nla_find_nested (nfqa[NFQA_VLAN ],NFQA_VLAN_PROTO ); + +if (vlan_tci) + entry->skb->vlan_tci =ntohs (nla_get_be16 (vlan_tci)); + +if (vlan_proto) + entry->skb->vlan_proto =nla_get_be16 (vlan_proto); + }
Could you replace this chunk above by something like...
if (entry->state.pf == PF_BRIDGE) {
err = nfqa_parse_bridge(nfqa);
if (err < 0)
return err;
}Then, this nfqa_parse_bridge() should look like;
if (nfqa[NFQA_VLAN]) {
struct nlattr *tb[NFQA_VLAN_MAX + 1];
err = nla_parse_nested(tb, NFQA_VLAN_MAX, nfqa[NFQA_VLAN],
nfqa_vlan_policy);
if (err < 0)
return err;
if (!tb[NFQA_VLAN_TCI] ||
!tb[NFTA_VLAN_PROTO])
return -EINVAL;
if (tb[NFQA_VLAN_TCI])
entry->skb->vlan_tci =
ntohs(nla_get_be16(tb[NFQA_VLAN_TCI]));
if (tb[NFAQ_VLAN_PROTO])
entry->skb->vlan_proto =
nla_get_be16(tb[NFQA_VLAN_PROTO]);
}
if (nfqa[NFQA_L2HDR]) {
...
}You will need the policy structure BTW:
static const struct nla_policy nfqa_verdict_policy[NFQA_VLAN_MAX + 1] = {
[NFQA_VLAN_TCI] = { .type = NLA_U16 },
[NFQA_VLAN_PROTO] = { .type = NLA_U16 },
};And don't forget to update nfqa_verdict_policy to add the NFQA_VLAN nested attribute there as:
.type = NLA_NESTED.
Thanks !