netfilter: nf_tables: nft_meta module get/set ops
Subsystems (2)
PATCH v3 1/1 netfilter: nf_tables: nft_meta module get/set ops
This patch adds kernel support for the meta expression in get/set flavour. The set operation indicates that a given packet has to be set with a property, currently one of mark, priority, nftrace or secmark.
The get op is what was currently working: evaluate the given packet property.
In case of nftrace, the value is always 1. Such behaviour is copied from net/netfilter/xt_TRACE.c
In case of secmark, the intention is to make the translation between the security_ctx and security_id in userspace.
Otherwise, a string is needed to be passed from the userpsace to kernel as part of the attribute set, breaking the KEY,VALUE pair approach. This is different from net/netfilter/xt_SECMARK.c. There, the context is translated in kernel side.
NFTA_META_DREG and NFTA_META_VALUE attributes are mutually exclusives.
---
v1: initial release of the patch.
v2: address comments by Tomasz and Pablo; meta in nft_meta.c with select_ops
v3: address comments by Tomasz: replace match/target keywords with set/get.
Also, respect previous enum values.
include/uapi/linux/netfilter/nf_tables.h | 2 net/netfilter/nft_meta.c | 156 +++++++++++++++++++++++++----- 2 files changed, 132 insertions(+), 26 deletions(-)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -553,11 +553,13 @@ enum nft_meta_keys {* * @NFTA_META_DREG: destination register (NLA_U32) * @NFTA_META_KEY: meta data item to load (NLA_U32: nft_meta_keys) +* @NFTA_META_VALUE: data to be set (NLA_U32) */ enum nft_meta_attributes {NFTA_META_UNSPEC ,NFTA_META_DREG ,NFTA_META_KEY , +NFTA_META_VALUE , __NFTA_META_MAX };#define NFTA_META_MAX (__NFTA_META_MAX - 1)
net/netfilter/nft_meta.c +130 -26
208 lines not on this page · raw message
Pablo Neira Ayuso
maintainerHi Arturo,
Quoted 33 lines · Arturo Borrero Gonzalez
This patch adds kernel support for the meta expression in get/set flavour. The set operation indicates that a given packet has to be set with a property, currently one of mark, priority, nftrace or secmark.
The get op is what was currently working: evaluate the given packet property.In case of nftrace, the value is always 1. Such behaviour is copied from
net/netfilter/xt_TRACE.cIn case of secmark, the intention is to make the translation between the
security_ctxandsecurity_idin userspace.
Otherwise, a string is needed to be passed from the userpsace to kernel as part of the attribute set, breaking the KEY,VALUE pair approach. This is different fromnet/netfilter/xt_SECMARK.c. There, the context is translated in kernel side.
NFTA_META_DREGandNFTA_META_VALUEattributes are mutually exclusives.Signed-off-by Arturo Borrero Gonzalez <[email protected]>---
v1: initial release of the patch.
v2: address comments by Tomasz and Pablo; meta innft_meta.cwithselect_ops
v3: address comments by Tomasz: replace match/target keywords with set/get.
Also, respect previous enum values.include/uapi/linux/netfilter/nf_tables.h | 2 net/netfilter/nft_meta.c | 156 +++++++++++++++++++++++++----- 2 files changed, 132 insertions(+), 26 deletions(-)include/uapi/linux/netfilter/nf_tables.h +0
-0
include/uapi/linux/netfilter/nf_tables.h enum nft_meta_keys { · line 556
Quoted 4 lines
include/uapi/linux/netfilter/nf_tables.h +1
-0@@ -553,11 +553,13 @@ enum nft_meta_keys {* * @NFTA_META_DREG: destination register (NLA_U32) * @NFTA_META_KEY: meta data item to load (NLA_U32: nft_meta_keys) +* @NFTA_META_VALUE: data to be set (NLA_U32)
I know we already discussed to use this inlined value, but I noticed that we need to replace this to NFTA_META_SREG here, so we can combine it with the immediate expression and obtain things like:
add rule ip filter OUTPUT meta mark set tcp dport map { \
22 => 1, \
23 => 2, \
}This basically allows conditional mark setting based in any selector.
Quoted 37 lines
index 8c28220..541e0cc 100644
net/netfilter/nft_meta.c +17
-4@@ -21,12 +21,15 @@struct nft_meta {enum nft_meta_keys key:8 ; -enum nft_registers dreg:8 ; +union { +enum nft_registers dreg:8 ; +u32 value; + }; }; -static void nft_meta_eval (const struct nft_expr *expr, -struct nft_data data[NFT_REG_MAX +1 ], -const struct nft_pktinfo *pkt) +static void nft_meta_get_eval (const struct nft_expr *expr, +struct nft_data data[NFT_REG_MAX +1 ], +const struct nft_pktinfo *pkt) {const struct nft_meta *priv =nft_expr_priv (expr);const struct sk_buff *skb = pkt->skb;@@ -132,23 +135,57 @@ err: data[NFT_REG_VERDICT ].verdict =NFT_BREAK ; } +static void nft_meta_set_eval (const struct nft_expr *expr, +struct nft_data data[NFT_REG_MAX +1 ], +const struct nft_pktinfo *pkt) +{ +const struct nft_meta *meta =nft_expr_priv (expr); +struct sk_buff *skb = pkt->skb; + +switch (meta->key) { +case NFT_META_MARK : + skb->mark = meta->value;
net/netfilter/nft_meta.c err: · line 157
Quoted 10 lines
net/netfilter/nft_meta.c +10
-0+break ; +case NFT_META_PRIORITY : + skb->priority = meta->value; +break ; +case NFT_META_NFTRACE : + skb->nf_trace =1 ; +break ; +#ifdef CONFIG_NETWORK_SECMARK +case NFT_META_SECMARK : + skb->secmark = meta->value;
Please, remove secmark. AFAIK, the secmark is an internal value, we have to use the secctx name, similarly to xt_SECMARK.c.