From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 24/28] netfilter: nf_tables: skip set types that do not support for expressions
Date: Mon, 30 Mar 2020 21:21:32 +0200 [thread overview]
Message-ID: <20200330192136.230459-25-pablo@netfilter.org> (raw)
In-Reply-To: <20200330192136.230459-1-pablo@netfilter.org>
The bitmap set does not support for expressions, skip it from the
estimation step.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_tables.h | 2 ++
net/netfilter/nf_tables_api.c | 3 +++
net/netfilter/nft_set_bitmap.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 642bc3ef81aa..6eb627b3c99b 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -266,6 +266,7 @@ struct nft_set_iter {
* @size: number of set elements
* @field_len: length of each field in concatenation, bytes
* @field_count: number of concatenated fields in element
+ * @expr: set must support for expressions
*/
struct nft_set_desc {
unsigned int klen;
@@ -273,6 +274,7 @@ struct nft_set_desc {
unsigned int size;
u8 field_len[NFT_REG32_COUNT];
u8 field_count;
+ bool expr;
};
/**
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index c1e04ac21392..8a73adfab7ff 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -4032,6 +4032,9 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
return err;
}
+ if (nla[NFTA_SET_EXPR])
+ desc.expr = true;
+
table = nft_table_lookup(net, nla[NFTA_SET_TABLE], family, genmask);
if (IS_ERR(table)) {
NL_SET_BAD_ATTR(extack, nla[NFTA_SET_TABLE]);
diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
index 6829a497b4cc..32f0fc8be3a4 100644
--- a/net/netfilter/nft_set_bitmap.c
+++ b/net/netfilter/nft_set_bitmap.c
@@ -286,6 +286,8 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
/* Make sure bitmaps we don't get bitmaps larger than 16 Kbytes. */
if (desc->klen > 2)
return false;
+ else if (desc->expr)
+ return false;
est->size = nft_bitmap_total_size(desc->klen);
est->lookup = NFT_SET_CLASS_O_1;
--
2.11.0
next prev parent reply other threads:[~2020-03-30 19:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 19:21 [PATCH 00/28] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 01/28] netfilter: nf_tables: move nft_expr_clone() to nf_tables_api.c Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 02/28] netfilter: nf_tables: pass context to nft_set_destroy() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 03/28] netfilter: nf_tables: allow to specify stateful expression in set definition Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 04/28] netfilter: nf_tables: fix double-free on set expression from the error path Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 05/28] netfilter: nf_tables: add nft_set_elem_expr_destroy() and use it Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 06/28] netfilter: flowtable: fix NULL pointer dereference in tunnel offload support Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 07/28] netfilter: ctnetlink: Add missing annotation for ctnetlink_parse_nat_setup() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 08/28] netfilter: conntrack: Add missing annotations for nf_conntrack_all_lock() and nf_conntrack_all_unlock() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 09/28] ipvs: optimize tunnel dumps for icmp errors Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 10/28] netfilter: conntrack: export nf_ct_acct_update() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 11/28] netfilter: nf_tables: add enum nft_flowtable_flags to uapi Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 12/28] netfilter: flowtable: add counter support Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 13/28] netfilter: flowtable: Fix incorrect tc_setup_type type Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 14/28] netfilter: nf_tables: silence a RCU-list warning in nft_table_lookup() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 15/28] netfilter: flowtable: Use rw sem as flow block lock Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 16/28] netfilter: flowtable: Use work entry per offload command Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 17/28] netfilter: nf_queue: make nf_queue_entry_release_refs static Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 18/28] netfilter: nf_queue: place bridge physports into queue_entry struct Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 19/28] netfilter: nf_queue: do not release refcouts until nf_reinject is done Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 20/28] netfilter: nf_queue: prefer nf_queue_entry_free Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 21/28] netfilter: ctnetlink: be more strict when NF_CONNTRACK_MARK is not set Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 22/28] netfilter: nft_set_bitmap: initialize set element extension in lookups Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 23/28] netfilter: nft_dynset: validate set expression definition Pablo Neira Ayuso
2020-03-30 19:21 ` Pablo Neira Ayuso [this message]
2020-03-30 19:21 ` [PATCH 25/28] netfilter: conntrack: add nf_ct_acct_add() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 26/28] netfilter: flowtable: add counter support in HW offload Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 27/28] netfilter: nft_exthdr: fix endianness of tcp option cast Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 28/28] ipvs: fix uninitialized variable warning Pablo Neira Ayuso
2020-03-31 3:11 ` [PATCH 00/28] Netfilter/IPVS updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200330192136.230459-25-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).