From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E522C31E49 for ; Wed, 19 Jun 2019 07:16:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CACB21479 for ; Wed, 19 Jun 2019 07:16:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731072AbfFSHQd (ORCPT ); Wed, 19 Jun 2019 03:16:33 -0400 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:28122 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725946AbfFSHQd (ORCPT ); Wed, 19 Jun 2019 03:16:33 -0400 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id 17DB741AB0; Wed, 19 Jun 2019 15:16:26 +0800 (CST) From: wenxu@ucloud.cn To: pablo@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/2 nf-next] netfilter: nft_meta: Add NFT_META_BRI_VLAN support Date: Wed, 19 Jun 2019 15:16:25 +0800 Message-Id: <1560928585-18352-2-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1560928585-18352-1-git-send-email-wenxu@ucloud.cn> References: <1560928585-18352-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVklVS0NJS0tLS0pMSk1NSk9ZV1koWU FJQjdXWS1ZQUlXWQkOFx4IWUFZNTQpNjo3JCkuNz5ZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Ky46Aio6Kjg6TRBNQx0TDgk3 GC4wFC9VSlVKTk1LQklDTkNNSk5MVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUhMSUI3Bg++ X-HM-Tid: 0a6b6e9809852086kuqy17db741ab0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: wenxu nft add table bridge firewall nft add chain bridge firewall zones { type filter hook prerouting priority - 300 \; } nft add rule bridge firewall zones counter ct zone set vlan id map { 100 : 1, 200 : 2 } As above set the bridge port with pvid, the received packet don't contain the vlan tag which means the packet should belong to vlan 200 through pvid. With this pacth user can set the pvid in the prerouting hook before set zone id and conntrack: "meta brvlan set meta brpvid" Signed-off-by: wenxu --- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_meta.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 4a16124..7be0307 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -794,6 +794,7 @@ enum nft_exthdr_attributes { * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_BRI_PVID: packet input bridge port pvid + * @NFT_META_BRI_VLAN: set vlan tag on packet */ enum nft_meta_keys { NFT_META_LEN, @@ -825,6 +826,7 @@ enum nft_meta_keys { NFT_META_IIFKIND, NFT_META_OIFKIND, NFT_META_BRI_PVID, + NFT_META_BRI_VLAN, }; /** diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 1fdb565..5c3817b 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -282,8 +282,13 @@ static void nft_meta_set_eval(const struct nft_expr *expr, { const struct nft_meta *meta = nft_expr_priv(expr); struct sk_buff *skb = pkt->skb; + const struct net_device *in = nft_in(pkt); u32 *sreg = ®s->data[meta->sreg]; +#ifdef CONFIG_NF_TABLES_BRIDGE + const struct net_bridge_port *p; +#endif u32 value = *sreg; + u16 value16; u8 value8; switch (meta->key) { @@ -306,6 +311,14 @@ static void nft_meta_set_eval(const struct nft_expr *expr, skb->nf_trace = !!value8; break; +#ifdef CONFIG_NF_TABLES_BRIDGE + case NFT_META_BRI_VLAN: + value16 = nft_reg_load16(sreg); + if (in && (p = br_port_get_rtnl_rcu(in)) && + !skb_vlan_tag_present(skb)) + __vlan_hwaccel_put_tag(skb, p->br->vlan_proto, value16); + break; +#endif #ifdef CONFIG_NETWORK_SECMARK case NFT_META_SECMARK: skb->secmark = value; @@ -481,6 +494,13 @@ static int nft_meta_set_init(const struct nft_ctx *ctx, case NFT_META_PKTTYPE: len = sizeof(u8); break; +#ifdef CONFIG_NF_TABLES_BRIDGE + case NFT_META_BRI_VLAN: + if (ctx->family != NFPROTO_BRIDGE) + return -EOPNOTSUPP; + len = sizeof(u16); + break; +#endif default: return -EOPNOTSUPP; } -- 1.8.3.1