Skip to contentSkip to conversation

netfilter: bridge: add nf_afinfo to enable queuing to userspace

PATCH Superseded Stephane Bryant 3 participants 6 messages Feb 20, 2016 – Mar 5, 2016

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 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
index 7fcdd72..a78c4e2 100644
@@ -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
#1 lore raw

PATCH v3 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

---
 include/uapi/linux/netfilter/nfnetlink_queue.h |  7 ++++
 net/netfilter/nfnetlink_queue.c                | 53 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
include/uapi/linux/netfilter/nfnetlink_queue.h +7 -0
index b67a853..211fcdc 100644
@@ -30,6 +30,11 @@ struct nfqnl_msg_packet_timestamp {
 	__aligned_be64	usec;
 };
 
+struct nfqnl_msg_vlan {
+	__be16                  proto;
+	__u16                   tci;
+} __attribute__ ((packed));
+
 enum nfqnl_attr_type {
 	NFQA_UNSPEC,
 	NFQA_PACKET_HDR,
@@ -50,6 +55,8 @@ enum nfqnl_attr_type {
 	NFQA_UID,			/* __u32 sk uid */
 	NFQA_GID,			/* __u32 sk gid */
 	NFQA_SECCTX,			/* security context string */
+	NFQA_VLAN,                      /* packet vlan info */
+	NFQA_L2HDR,                     /* full L2 header */
 
 	__NFQA_MAX
 };
net/netfilter/nfnetlink_queue.c +53 -0

71 lines not on this page · raw message

Signature · 1 line
2.1.4
#2 lore raw

Re: [PATCH nf-next v3 2/3] netfilter: bridge: pass L2 header and VLAN as netlink attributes in queues to userspace

Quoted 16 lines · Stephane Bryant

From: stephane <[email protected]>

(quoted diff) +0 -2
-this creates 2 netlink attribute NLQA_VLAN and NLQA_L2HDR
-these are filled up for the PF_BRIDGE family on the way to userspace
---
 include/uapi/linux/netfilter/nfnetlink_queue.h |  7 ++++
 net/netfilter/nfnetlink_queue.c                | 53 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
include/uapi/linux/netfilter/nfnetlink_queue.h +0 -0
index b67a853..211fcdc 100644

include/uapi/linux/netfilter/nfnetlink_queue.h struct nfqnl_msg_packet_timestamp { · line 36

Quoted 7 lines
include/uapi/linux/netfilter/nfnetlink_queue.h +4 -0
@@ -30,6 +30,11 @@ struct nfqnl_msg_packet_timestamp {
 	__aligned_be64	usec;
 };
 
+struct nfqnl_msg_vlan {
+	__be16                  proto;
+	__u16                   tci;
+} __attribute__ ((packed));

Stephane, I'm very looking forward to having this update pushed mainstream.

However, this I think it would be good if you can translate this to use nested attributes.

See nla_nest_start() and nla_nest_end(). Then, add a new vlan attributes for this:

        enum nfqnl_vlan_attr {
                NFQA_VLAN_UNSPEC,
                NFQA_VLAN_PROTO,
                NFQA_VLAN_TCI,
                __NFQA_VLAN_MAX,
        };
        #define NFQA_VLAN_MAX   (__NFQA_VLAN_MAX + 1)

Using structure to encapsulate netlink data is highly discouraged. I know we're doing this already in old attribute but that we cannot change since it's part of the ABI. But I would like that we start doing this the right way for new attributes.

Let me know,
Thanks!

Quoted 13 lines
include/uapi/linux/netfilter/nfnetlink_queue.h +3 -0
+
 enum nfqnl_attr_type {
 	NFQA_UNSPEC,
 	NFQA_PACKET_HDR,
@@ -50,6 +55,8 @@ enum nfqnl_attr_type {
 	NFQA_UID,			/* __u32 sk uid */
 	NFQA_GID,			/* __u32 sk gid */
 	NFQA_SECCTX,			/* security context string */
+	NFQA_VLAN,                      /* packet vlan info */
+	NFQA_L2HDR,                     /* full L2 header */
 
 	__NFQA_MAX
 };
#3 lore raw

Re: [PATCH nf-next v3 2/3] netfilter: bridge: pass L2 header and VLAN as netlink attributes in queues to userspace

Quoted 19 lines

Stephane, I'm very looking forward to having this update pushed mainstream.

However, this I think it would be good if you can translate this to use nested attributes.

See nla_nest_start() and nla_nest_end(). Then, add a new vlan attributes for this:

        enum nfqnl_vlan_attr {
                NFQA_VLAN_UNSPEC,
                NFQA_VLAN_PROTO,
                NFQA_VLAN_TCI,
                __NFQA_VLAN_MAX,
        };
        #define NFQA_VLAN_MAX   (__NFQA_VLAN_MAX + 1)
Quoted 4 lines

Using structure to encapsulate netlink data is highly discouraged. I know we're doing this already in old attribute but that we cannot change since it's part of the ABI. But I would like that we start doing this the right way for new attributes.

Apologies for the delay -- i missed the email. I will try to get this done within 3 weeks.

#4 lore raw

PATCH v3 3/3 netfilter: bridge: nf queue verdict to use NFQA_VLAN and NFQA_L2HDR

In reply to Stephane Bryant

This makes nf queues use NFQA_VLAN and NFQA_L2HDR in verdict to modify the original skb

---
 net/netfilter/nfnetlink_queue.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
net/netfilter/nfnetlink_queue.c +19 -0
index b40cdb4..c6c365a 100644
@@ -1121,6 +1121,25 @@ 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 nfqnl_msg_vlan *pvlan = nla_data(nfqa[NFQA_VLAN]);
+
+		entry->skb->vlan_tci = pvlan->tci;
+		entry->skb->vlan_proto = pvlan->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
maintainer
#5 lore raw

Re: [PATCH nf-next v3 3/3] netfilter: bridge: nf queue verdict to use NFQA_VLAN and NFQA_L2HDR

Quoted 2 lines · Stephane Bryant

This makes nf queues use NFQA_VLAN and NFQA_L2HDR in verdict to modify the original skb

Looks good to me, thanks for addressing all my comments.