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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=unavailable 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 5D136C31E5E for ; Wed, 19 Jun 2019 17:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40261217F4 for ; Wed, 19 Jun 2019 17:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729188AbfFSRC7 (ORCPT ); Wed, 19 Jun 2019 13:02:59 -0400 Received: from mail.us.es ([193.147.175.20]:56462 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726091AbfFSRC7 (ORCPT ); Wed, 19 Jun 2019 13:02:59 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 1F578C1DED for ; Wed, 19 Jun 2019 19:02:57 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 1045EDA701 for ; Wed, 19 Jun 2019 19:02:57 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 04AABDA709; Wed, 19 Jun 2019 19:02:57 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E9381DA701; Wed, 19 Jun 2019 19:02:54 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Wed, 19 Jun 2019 19:02:54 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from us.es (sys.soleta.eu [212.170.55.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 1984lsi) by entrada.int (Postfix) with ESMTPSA id C2FDF4265A31; Wed, 19 Jun 2019 19:02:54 +0200 (CEST) Date: Wed, 19 Jun 2019 19:02:54 +0200 X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: wenxu@ucloud.cn Cc: fw@strlen.de, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH 1/2 nf-next] netfilter: nft_meta: add NFT_META_BRI_PVID support Message-ID: <20190619170254.an2aklx6abqh646l@salvia> References: <1560928585-18352-1-git-send-email-wenxu@ucloud.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1560928585-18352-1-git-send-email-wenxu@ucloud.cn> User-Agent: NeoMutt/20170113 (1.7.2) X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Jun 19, 2019 at 03:16:24PM +0800, wenxu@ucloud.cn wrote: > 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 get the pvid of bridge ports: "meta brpvid" Would you also post the patches for nftables for review? Would you post an example on how you use "meta brpvid" in your ruleset? I don't see this is used in the example above, More comments below. > Signed-off-by: wenxu > --- > include/uapi/linux/netfilter/nf_tables.h | 2 ++ > net/netfilter/nft_meta.c | 17 +++++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h > index 31a6b8f..4a16124 100644 > --- a/include/uapi/linux/netfilter/nf_tables.h > +++ b/include/uapi/linux/netfilter/nf_tables.h > @@ -793,6 +793,7 @@ enum nft_exthdr_attributes { > * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) > * @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 > */ > enum nft_meta_keys { > NFT_META_LEN, > @@ -823,6 +824,7 @@ enum nft_meta_keys { > NFT_META_SECPATH, > NFT_META_IIFKIND, > NFT_META_OIFKIND, > + NFT_META_BRI_PVID, > }; > > /** > diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c > index 987d2d6..1fdb565 100644 > --- a/net/netfilter/nft_meta.c > +++ b/net/netfilter/nft_meta.c > @@ -243,6 +243,18 @@ void nft_meta_get_eval(const struct nft_expr *expr, > goto err; > strncpy((char *)dest, p->br->dev->name, IFNAMSIZ); > return; > + case NFT_META_BRI_PVID: > + if (in == NULL || (p = br_port_get_rtnl_rcu(in)) == NULL) > + goto err; > + if (br_opt_get(p->br, BROPT_VLAN_ENABLED)) { > + u16 pvid = br_get_pvid(nbp_vlan_group_rcu(p)); > + > + if (pvid) { > + nft_reg_store16(dest, pvid); I think you should store pvid into dest if pvid is zero too, right? You cannot assume destination register is set to zero. > + return; > + } > + } > + goto err; > #endif > case NFT_META_IIFKIND: > if (in == NULL || in->rtnl_link_ops == NULL) > @@ -370,6 +382,11 @@ static int nft_meta_get_init(const struct nft_ctx *ctx, > return -EOPNOTSUPP; > len = IFNAMSIZ; > break; > + case NFT_META_BRI_PVID: > + if (ctx->family != NFPROTO_BRIDGE) > + return -EOPNOTSUPP; > + len = sizeof(u16); > + break; > #endif > default: > return -EOPNOTSUPP; > -- > 1.8.3.1 >