expr: meta: Add cpu support for meta expresion

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 98144cdd8986038d9cc2f427aff71b310ad18e7e..c9b6f00a3fb753c479a160f06f1ec6db00918da8 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -572,6 +572,7 @@ enum nft_exthdr_attributes {
  * @NFT_META_BRI_IIFNAME: packet input bridge interface name
  * @NFT_META_BRI_OIFNAME: packet output bridge interface name
  * @NFT_META_PKTTYPE: packet type (skb->pkt_type), special handling for loopback
+ * @NFT_META_CPU: cpu id through smp_processor_id()
  */
 enum nft_meta_keys {
        NFT_META_LEN,
@@ -594,6 +595,7 @@ enum nft_meta_keys {
        NFT_META_BRI_IIFNAME,
        NFT_META_BRI_OIFNAME,
        NFT_META_PKTTYPE,
+       NFT_META_CPU,
 };
 
 /**

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 35ca1770c1cb7cd45cc4bd6daa41ba0f7453ad57..9e884d6651255939f7e4118b65803ac4708d07e4 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -23,7 +23,7 @@
 #include "expr_ops.h"
 
 #ifndef NFT_META_MAX
-#define NFT_META_MAX (NFT_META_PKTTYPE + 1)
+#define NFT_META_MAX (NFT_META_CPU + 1)
 #endif
 
 struct nft_expr_meta {
@@ -153,7 +153,8 @@ static const char *meta_key2str_array[NFT_META_MAX] = {
        [NFT_META_SECMARK]      = "secmark",
        [NFT_META_BRI_IIFNAME]  = "bri_iifname",
        [NFT_META_BRI_OIFNAME]  = "bri_oifname",
-       [NFT_META_PKTTYPE]      = "pkttype"
+       [NFT_META_PKTTYPE]      = "pkttype",
+       [NFT_META_CPU]          = "cpu",
 };
 
 static const char *meta_key2str(uint8_t key)