nft: Sorted chain listing et al.
Phil Sutter
reviewerv2 cover nft: Sorted chain listing et al.
This is a respin of my original series after getting rid of a few initial ("fallout") patches. It implements structs nft_chain and nft_chain_list to avoid changes to libnftnl as requested. Obviously this introduces some code duplication as some bits from libnftnl have to be replicated within iptables now.
Phil Sutter (10):
nft: Fix selective chain compatibility checks
nft: Implement nft_chain_foreach()
nft: cache: Introduce nft_cache_add_chain()
nft: Eliminate nft_chain_list_get()
nft: cache: Move nft_chain_find() over
nft: Introduce struct nft_chain
nft: Introduce a dedicated base chain array
nft: cache: Sort custom chains by name
tests: shell: Drop any dump sorting in place
nft: Avoid pointless table/chain creation
iptables/Makefile.am | 2 +- iptables/nft-cache.c | 165 +++++--- iptables/nft-cache.h | 11 +- iptables/nft-chain.c | 59 +++ iptables/nft-chain.h | 87 ++++ iptables/nft.c | 382 ++++++++++-------- iptables/nft.h | 10 +- .../ebtables/0002-ebtables-save-restore_0 | 2 +- .../firewalld-restore/0001-firewalld_0 | 17 +- .../ipt-restore/0007-flush-noflush_0 | 4 +- .../ipt-restore/0014-verbose-restore_0 | 2 +- iptables/xtables-save.c | 8 +- 12 files changed, 494 insertions(+), 255 deletions(-) create mode 100644 iptables/nft-chain.c create mode 100644 iptables/nft-chain.h
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH v2 1/10 nft: Fix selective chain compatibility checks
Since commit 80251bc2a56ed ("nft: remove cache build calls"), 'chain' parameter passed to nft_chain_list_get() is no longer effective. To still support running nft_is_chain_compatible() on specific chains only, add a short path to nft_is_table_compatible().
Follow-up patches will kill nft_chain_list_get(), so don't bother dropping the unused parameter from its signature.
--- iptables/nft.c | 6 ++++++ 1 file changed, 6 insertions(+)
iptables/nft.c +6 -0
@@ -3453,6 +3453,12 @@ bool nft_is_table_compatible(struct nft_handle *h, {struct nftnl_chain_list *clist; +if (chain) { +struct nftnl_chain *c =nft_chain_find (h, table, chain); + +return c && !nft_is_chain_compatible (c, h); + } + clist =nft_chain_list_get (h, table, chain);if (clist ==NULL )return false;
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [iptables PATCH v2 01/10] nft: Fix selective chain compatibility checks
Quoted 7 lines · Phil Sutter
Since commit
80251bc2a56ed("nft: remove cache build calls"), 'chain' parameter passed tonft_chain_list_get()is no longer effective. To still support runningnft_is_chain_compatible()on specific chains only, add a short path tonft_is_table_compatible().Follow-up patches will kill
nft_chain_list_get(), so don't bother dropping the unused parameter from its signature.
This has a Fixes: tag.
What is precisely the problem? How does show from the iptables and iptables-restore interface?
Not sure I understand the problem.
Quoted 26 lines
Fixes 80251bc2a56ed ("nft: remove cache build calls")Signed-off-by Phil Sutter <[email protected]>--- iptables/nft.c | 6 ++++++ 1 file changed, 6 insertions(+)iptables/nft.c +6
-0@@ -3453,6 +3453,12 @@ bool nft_is_table_compatible(struct nft_handle *h, {struct nftnl_chain_list *clist; +if (chain) { +struct nftnl_chain *c =nft_chain_find (h, table, chain); + +return c && !nft_is_chain_compatible (c, h); + } + clist =nft_chain_list_get (h, table, chain);if (clist ==NULL )return false;Signature · 1 line
2.28.0
Phil Sutter
reviewerRe: [iptables PATCH v2 01/10] nft: Fix selective chain compatibility checks
Hi Pablo,
Quoted 9 lines · Pablo Neira Ayuso
Quoted 7 lines · Phil Sutter
Since commit
80251bc2a56ed("nft: remove cache build calls"), 'chain' parameter passed tonft_chain_list_get()is no longer effective. To still support runningnft_is_chain_compatible()on specific chains only, add a short path tonft_is_table_compatible().Follow-up patches will kill
nft_chain_list_get(), so don't bother dropping the unused parameter from its signature.
Quoted 6 lines
This has a Fixes: tag.
What is precisely the problem? How does show from the iptables and iptables-restore interface?
Not sure I understand the problem.
Before the big caching rework, nft_chain_list_get() could cause a cache-fetch to populate table's chain list. If a chain name was passed to it, that cache-fetch would retrieve only the specified chain (if not in cache already).
In the current code, nft_is_table_compatible() happens in the second stage where cache is present already and nft_chain_list_get() really just returns the table's chain list again. This means that the compatibility check happens for all chains in cache which belong to that table and the original optimization (to check only the interesting chain) is not effective anymore.
The "short path" (actually: short-cut) introduced in this patch allows to limit compat check to a specific chain again. The impact is not as big anymore as nft_chain_list_get() does no longer populate the cache, but still there's no point in checking unintereresting chains' compatibility.
Above all else though, this is fallout from the preparations to drop nft_chain_list_get() and given the above, I found it makes sense to push it as a separate commit.
Cheers, Phil
Phil Sutter
reviewerPATCH v2 2/10 nft: Implement nft_chain_foreach()
In reply to Phil SutterThis is just a fancy wrapper around nftnl_chain_list_foreach() with the added benefit of detecting invalid table names or uninitialized chain lists. This in turn allows to drop the checks in flush_rule_cache() and ignore the return code of nft_chain_foreach() as it fails only if the dropped checks had failed, too.
---
Changes since v1:
- Extend commit message.
- Drop pointless code from flush_rule_cache().
- Use nft_chain_foreach() in flush_cache() and nft_is_table_compatible() also.
--- iptables/nft-cache.c | 29 +++++---------- iptables/nft.c | 80 +++++++++++++++-------------------------- iptables/nft.h | 3 ++ iptables/xtables-save.c | 7 +--- 4 files changed, 41 insertions(+), 78 deletions(-)
iptables/nft-cache.c +9 -20
@@ -455,21 +455,16 @@ static int fetch_rule_cache(struct nft_handle *h, {int i; -if (t) { -struct nftnl_chain_list *list = - h->cache->table[t->type].chains; - -return nftnl_chain_list_foreach (list, nft_rule_list_update, h); - } +if (t) +return nft_chain_foreach (h, t->name, nft_rule_list_update, h);for (i =0 ; i <NFT_TABLE_MAX ; i++) { -enum nft_table_type type = h->tables[i].type;if (!h->tables[i].name)continue ; -if (nftnl_chain_list_foreach (h->cache->table[type].chains, - nft_rule_list_update, h)) +if (nft_chain_foreach (h, h->tables[i].name, + nft_rule_list_update, h))return -1 ; }return 0 ;
@@ -543,17 +538,11 @@ static int __flush_rule_cache(struct nftnl_chain *c, void *data)int flush_rule_cache (struct nft_handle *h,const char *table,struct nftnl_chain *c) { -const struct builtin_table *t; -if (c)return __flush_rule_cache (c,NULL ); - t =nft_table_builtin_find (h, table); -if (!t || !h->cache->table[t->type].chains) -return 0 ; - -return nftnl_chain_list_foreach (h->cache->table[t->type].chains, - __flush_rule_cache,NULL ); +nft_chain_foreach (h, table, __flush_rule_cache,NULL ); +return 0 ; }static int __flush_chain_cache (struct nftnl_chain *c,void *data)
@@ -582,9 +571,9 @@ static int flush_cache(struct nft_handle *h, struct nft_cache *c, table =nft_table_builtin_find (h, tablename);if (!table)return 0 ; -if (c->table[table->type].chains) -nftnl_chain_list_foreach (c->table[table->type].chains, - __flush_chain_cache,NULL ); + +nft_chain_foreach (h, tablename, __flush_chain_cache,NULL ); +if (c->table[table->type].sets)nftnl_set_list_foreach (c->table[table->type].sets, __flush_set_cache,NULL );
iptables/nft.c +28 -52
197 lines not on this page · raw message
iptables/nft.h +3 -0
@@ -151,6 +151,9 @@ const struct builtin_chain *nft_chain_builtin_find(const struct builtin_table *tbool nft_chain_exists (struct nft_handle *h,const char *table,const char *chain);void nft_bridge_chain_postprocess (struct nft_handle *h,struct nftnl_chain *c); +int nft_chain_foreach (struct nft_handle *h,const char *table, +int (*cb)(struct nftnl_chain *c,void *data), +void *data);/*
iptables/xtables-save.c +1 -6
@@ -68,7 +68,6 @@ struct do_output_data {static int __do_output (struct nft_handle *h,const char *tablename,void *data) { -struct nftnl_chain_list *chain_list;struct do_output_data *d = data;time_t now;
@@ -81,10 +80,6 @@ __do_output(struct nft_handle *h, const char *tablename, void *data)return 0 ; } - chain_list =nft_chain_list_get (h, tablename,NULL ); -if (!chain_list) -return 0 ; - now =time (NULL );printf ("# Generated by %s v%s on %s" , prog_name, prog_vers,ctime (&now));
@@ -92,7 +87,7 @@ __do_output(struct nft_handle *h, const char *tablename, void *data)printf ("*%s\n" , tablename);/* Dump out chain names first, * thereby preventing dependency conflicts */ -nftnl_chain_list_foreach (chain_list, nft_chain_save, h); +nft_chain_foreach (h, tablename, nft_chain_save, h);nft_rule_save (h, tablename, d->format);if (d->commit)printf ("COMMIT\n" );
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [iptables PATCH v2 02/10] nft: Implement nft_chain_foreach()
Quoted 5 lines · Phil Sutter
This is just a fancy wrapper around
nftnl_chain_list_foreach()with the added benefit of detecting invalid table names or uninitialized chain lists. This in turn allows to drop the checks inflush_rule_cache()and ignore the return code ofnft_chain_foreach()as it fails only if the dropped checks had failed, too.
At quick glance, this is reducing the LoC.
However, I'm not sure this is better, before this code:
1) You fetch the list
2) You use it from several spots in the function
with this patch you might look up for the chain list several times in the same function.
+int nft_chain_foreach(struct nft_handle *h, const char *table,
+ int (*cb)(struct nftnl_chain *c, void *data),
+ void *data)
+{
+ const struct builtin_table *t;
+
+ t = nft_table_builtin_find(h, table);
+ if (!t)
+ return -1;
+
+ if (!h->cache->table[t->type].chains)
+ return -1;
+
+ return nftnl_chain_list_foreach(h->cache->table[t->type].chains,
+ cb, data);
+}
I can also see calls to:
nft_chain_find(h, table, chain);
and
nft_chain_foreach(...)
from the same function.
This patch also updates paths in very different ways, there is no common idiom being replaced.
Phil Sutter
reviewerRe: [iptables PATCH v2 02/10] nft: Implement nft_chain_foreach()
Hi,
Quoted 9 lines · Pablo Neira Ayuso
Quoted 5 lines · Phil Sutter
This is just a fancy wrapper around
nftnl_chain_list_foreach()with the added benefit of detecting invalid table names or uninitialized chain lists. This in turn allows to drop the checks inflush_rule_cache()and ignore the return code ofnft_chain_foreach()as it fails only if the dropped checks had failed, too.At quick glance, this is reducing the LoC.
Quoted 7 lines
However, I'm not sure this is better, before this code:
1) You fetch the list
2) You use it from several spots in the functionwith this patch you might look up for the chain list several times in the same function.
Hmm. There might be exceptions, but typically we should have a function that takes an optional chain name and the body roughly looks like this:
| if (chain) {
| return do_something(nft_chain_find(..., chain));
| }
| return nft_chain_foreach(..., do_something);[...]
Quoted 4 lines
I can also see calls to:
nft_chain_find(h, table, chain);
Quoted 8 lines
and
nft_chain_foreach(...)from the same function.
This patch also updates paths in very different ways, there is no common idiom being replaced.
Which in particular are those?
The overall agenda is that looking up a chain won't be a trivial nftnl_chain_list lookup anymore. And iterating over a table's chains won't be a matter of iterating over a list, because I split base-chains from user-defined ones:
* Base-chains sit in an array of size NF_INET_NUMHOOKS.
* User-defined chains sit in an (open-coded) list ordered by name.
So the old nft_chain_list_get() is not possible anymore, therefore I replace everything by either nft_chain_find() or nft_chain_foreach(). Functions should not use both in the same code-path, so if you spot that I should have a close look again.
Cheers, Phil
Phil Sutter
reviewerPATCH v2 3/10 nft: cache: Introduce nft_cache_add_chain()
In reply to Phil SutterThis is a convenience function for adding a chain to cache, for now just a simple wrapper around nftnl_chain_list_add_tail().
---
Changes since v1:
- Use the function in nft_chain_builtin_add() as well.
--- iptables/nft-cache.c | 12 +++++++++--- iptables/nft-cache.h | 3 +++ iptables/nft.c | 16 +++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-)
iptables/nft-cache.c +9 -3
@@ -165,6 +165,13 @@ static int fetch_table_cache(struct nft_handle *h)return 1 ; } +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c) +{ +nftnl_chain_list_add_tail (c, h->cache->table[t->type].chains); +return 0 ; +} +struct nftnl_chain_list_cb_data {struct nft_handle *h;const struct builtin_table *t;
@@ -174,7 +181,6 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) {struct nftnl_chain_list_cb_data *d = data;const struct builtin_table *t = d->t; -struct nftnl_chain_list *list;struct nft_handle *h = d->h;struct nftnl_chain *c;const char *tname;
@@ -196,8 +202,8 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) goto out; } - list = h->cache->table[t->type].chains; -nftnl_chain_list_add_tail (c, list); +if (nft_cache_add_chain (h, t, c)) + goto out;return MNL_CB_OK ; out:
iptables/nft-cache.h +3 -0
@@ -3,6 +3,7 @@struct nft_handle ;struct nft_cmd ; +struct builtin_table ;void nft_cache_level_set (struct nft_handle *h,int level,const struct nft_cmd *cmd);
@@ -12,6 +13,8 @@ void flush_chain_cache(struct nft_handle *h, const char *tablename);int flush_rule_cache (struct nft_handle *h,const char *table,struct nftnl_chain *c);void nft_cache_build (struct nft_handle *h); +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c);struct nftnl_chain_list *nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain);
iptables/nft.c +7 -9
@@ -695,7 +695,7 @@ static void nft_chain_builtin_add(struct nft_handle *h,return ;batch_chain_add (h,NFT_COMPAT_CHAIN_ADD , c); -nftnl_chain_list_add_tail (c, h->cache->table[table->type].chains); +nft_cache_add_chain (h, table, c); }/* find if built-in table already exists */
@@ -1696,7 +1696,7 @@ int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table,int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table) { -struct nftnl_chain_list *list; +const struct builtin_table *t;struct nftnl_chain *c;int ret;
@@ -1720,9 +1720,8 @@ int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl ret =batch_chain_add (h,NFT_COMPAT_CHAIN_USER_ADD , c); - list =nft_chain_list_get (h, table, chain); -if (list) -nftnl_chain_list_add (c, list); + t =nft_table_builtin_find (h, table); +nft_cache_add_chain (h, t, c);/* the core expects 1 for success and 0 for error */ return ret ==0 ?1 :0 ;
@@ -1730,7 +1729,7 @@ int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tablint nft_chain_restore (struct nft_handle *h,const char *chain,const char *table) { -struct nftnl_chain_list *list; +const struct builtin_table *t;struct nftnl_chain *c;bool created = false;int ret;
@@ -1762,9 +1761,8 @@ int nft_chain_restore(struct nft_handle *h, const char *chain, const char *table ret =batch_chain_add (h,NFT_COMPAT_CHAIN_USER_ADD , c); - list =nft_chain_list_get (h, table, chain); -if (list) -nftnl_chain_list_add (c, list); + t =nft_table_builtin_find (h, table); +nft_cache_add_chain (h, t, c);/* the core expects 1 for success and 0 for error */ return ret ==0 ?1 :0 ;
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [iptables PATCH v2 03/10] nft: cache: Introduce nft_cache_add_chain()
Quoted 18 lines · Phil Sutter
This is a convenience function for adding a chain to cache, for now just a simple wrapper around
nftnl_chain_list_add_tail().Signed-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Use the function innft_chain_builtin_add()as well.--- iptables/nft-cache.c | 12 +++++++++--- iptables/nft-cache.h | 3 +++ iptables/nft.c | 16 +++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-)iptables/nft-cache.c +0
-0
iptables/nft-cache.c static int fetch_table_cache(struct nft_handle *h) · line 173
Quoted 9 lines
iptables/nft-cache.c +6
-0@@ -165,6 +165,13 @@ static int fetch_table_cache(struct nft_handle *h)return 1 ; } +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c) +{ +nftnl_chain_list_add_tail (c, h->cache->table[t->type].chains); +return 0 ; +}
This wrapper LGTM.
Quoted 66 lines
iptables/nft-cache.c +2
-3struct nftnl_chain_list_cb_data {struct nft_handle *h;const struct builtin_table *t;@@ -174,7 +181,6 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) {struct nftnl_chain_list_cb_data *d = data;const struct builtin_table *t = d->t; -struct nftnl_chain_list *list;struct nft_handle *h = d->h;struct nftnl_chain *c;const char *tname;@@ -196,8 +202,8 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) goto out; } - list = h->cache->table[t->type].chains; -nftnl_chain_list_add_tail (c, list); +if (nft_cache_add_chain (h, t, c)) + goto out;return MNL_CB_OK ; out:iptables/nft-cache.h +3
-0@@ -3,6 +3,7 @@struct nft_handle ;struct nft_cmd ; +struct builtin_table ;void nft_cache_level_set (struct nft_handle *h,int level,const struct nft_cmd *cmd);@@ -12,6 +13,8 @@ void flush_chain_cache(struct nft_handle *h, const char *tablename);int flush_rule_cache (struct nft_handle *h,const char *table,struct nftnl_chain *c);void nft_cache_build (struct nft_handle *h); +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c);struct nftnl_chain_list *nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain);iptables/nft.c +2
-2@@ -695,7 +695,7 @@ static void nft_chain_builtin_add(struct nft_handle *h,return ;batch_chain_add (h,NFT_COMPAT_CHAIN_ADD , c); -nftnl_chain_list_add_tail (c, h->cache->table[table->type].chains); +nft_cache_add_chain (h, table, c); }/* find if built-in table already exists */ @@ -1696,7 +1696,7 @@ int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table,int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table) { -struct nftnl_chain_list *list; +const struct builtin_table *t;struct nftnl_chain *c;int ret;
iptables/nft.c int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl · line 1723
Quoted 7 lines
iptables/nft.c +1
-3@@ -1720,9 +1720,8 @@ int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl ret =batch_chain_add (h,NFT_COMPAT_CHAIN_USER_ADD , c); - list =nft_chain_list_get (h, table, chain); -if (list) -nftnl_chain_list_add (c, list); + t =nft_table_builtin_find (h, table);
I'd add here:
assert(t);
just in case this is ever crashing here, let's make it nice.
Phil Sutter
reviewerRe: [iptables PATCH v2 03/10] nft: cache: Introduce nft_cache_add_chain()
Quoted 107 lines · Pablo Neira Ayuso
Quoted 18 lines · Phil Sutter
This is a convenience function for adding a chain to cache, for now just a simple wrapper around
nftnl_chain_list_add_tail().Signed-off-by Phil Sutter <[email protected]>---
Changes since v1:
- Use the function innft_chain_builtin_add()as well.--- iptables/nft-cache.c | 12 +++++++++--- iptables/nft-cache.h | 3 +++ iptables/nft.c | 16 +++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-)iptables/nft-cache.c +0
-0iptables/nft-cache.c static int fetch_table_cache(struct nft_handle *h) · line 173
Quoted 9 lines
iptables/nft-cache.c +6
-0@@ -165,6 +165,13 @@ static int fetch_table_cache(struct nft_handle *h)return 1 ; } +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c) +{ +nftnl_chain_list_add_tail (c, h->cache->table[t->type].chains); +return 0 ; +}This wrapper LGTM.
Quoted 66 lines
iptables/nft-cache.c +2
-3struct nftnl_chain_list_cb_data {struct nft_handle *h;const struct builtin_table *t;@@ -174,7 +181,6 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) {struct nftnl_chain_list_cb_data *d = data;const struct builtin_table *t = d->t; -struct nftnl_chain_list *list;struct nft_handle *h = d->h;struct nftnl_chain *c;const char *tname;@@ -196,8 +202,8 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data) goto out; } - list = h->cache->table[t->type].chains; -nftnl_chain_list_add_tail (c, list); +if (nft_cache_add_chain (h, t, c)) + goto out;return MNL_CB_OK ; out:iptables/nft-cache.h +3
-0@@ -3,6 +3,7 @@struct nft_handle ;struct nft_cmd ; +struct builtin_table ;void nft_cache_level_set (struct nft_handle *h,int level,const struct nft_cmd *cmd);@@ -12,6 +13,8 @@ void flush_chain_cache(struct nft_handle *h, const char *tablename);int flush_rule_cache (struct nft_handle *h,const char *table,struct nftnl_chain *c);void nft_cache_build (struct nft_handle *h); +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t, +struct nftnl_chain *c);struct nftnl_chain_list *nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain);iptables/nft.c +2
-2@@ -695,7 +695,7 @@ static void nft_chain_builtin_add(struct nft_handle *h,return ;batch_chain_add (h,NFT_COMPAT_CHAIN_ADD , c); -nftnl_chain_list_add_tail (c, h->cache->table[table->type].chains); +nft_cache_add_chain (h, table, c); }/* find if built-in table already exists */ @@ -1696,7 +1696,7 @@ int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table,int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table) { -struct nftnl_chain_list *list; +const struct builtin_table *t;struct nftnl_chain *c;int ret;iptables/nft.c int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl · line 1723
Quoted 7 lines
iptables/nft.c +1
-3@@ -1720,9 +1720,8 @@ int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl ret =batch_chain_add (h,NFT_COMPAT_CHAIN_USER_ADD , c); - list =nft_chain_list_get (h, table, chain); -if (list) -nftnl_chain_list_add (c, list); + t =nft_table_builtin_find (h, table);I'd add here:
Quoted 3 lines
assert(t);just in case this is ever crashing here, let's make it nice.
It is not needed: In nft_chain_user_add(), there is a call to nft_chain_exists() earlier which implicitly checks that nft_table_builtin_find() succeeds with given table name.
The other two places the wrapper is used are fine, too:
In nft_chain_builtin_add(), the builtin_table pointer was passed via parameters from nft_xt_builtin_init() which itself does a NULL-pointer check.
In nft_chain_restore(), the table's name is passed from state->curtable pointer in xtables_restore_parse_line() which in turn was acquired via nft_table_builtin_find(). (I actually plan to pass this builtin_table pointer around instead of the table name at some point.)
Cheers, Phil
Phil Sutter
reviewerPATCH v2 4/10 nft: Eliminate nft_chain_list_get()
In reply to Phil SutterSince introduction of nft_cache_add_chain(), there is merely a single user of nft_chain_list_get() left. Hence fold the function into its caller.
--- iptables/nft-cache.c | 13 ------------- iptables/nft-cache.h | 2 -- iptables/nft.c | 8 +++++--- 3 files changed, 5 insertions(+), 18 deletions(-)
iptables/nft-cache.c +0 -13
@@ -684,16 +684,3 @@ nft_set_list_get(struct nft_handle *h, const char *table, const char *set)return h->cache->table[t->type].sets; } - -struct nftnl_chain_list * -nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain) -{ -const struct builtin_table *t; - - t =nft_table_builtin_find (h, table); -if (!t) -return NULL ; - -return h->cache->table[t->type].chains; -} -
iptables/nft-cache.h +0 -2
@@ -16,8 +16,6 @@ void nft_cache_build(struct nft_handle *h);int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t,struct nftnl_chain *c); -struct nftnl_chain_list * -nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain);struct nftnl_set_list *nft_set_list_get (struct nft_handle *h,const char *table,const char *set);
iptables/nft.c +5 -3
@@ -1837,13 +1837,15 @@ out:static struct nftnl_chain *nft_chain_find (struct nft_handle *h,const char *table,const char *chain) { +const struct builtin_table *t;struct nftnl_chain_list *list; - list =nft_chain_list_get (h, table, chain); -if (list ==NULL ) + t =nft_table_builtin_find (h, table); +if (!t)return NULL ; -return nftnl_chain_list_lookup_byname (list, chain); + list = h->cache->table[t->type].chains; +return list ?nftnl_chain_list_lookup_byname (list, chain) :NULL ; } bool nft_chain_exists(struct nft_handle *h,
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [iptables PATCH v2 04/10] nft: Eliminate nft_chain_list_get()
Quoted 3 lines · Phil Sutter
Since introduction of
nft_cache_add_chain(), there is merely a single user ofnft_chain_list_get()left. Hence fold the function into its caller.
Why this last update regarding nft_chain_list_get() and not in 02/10 ?
Quoted 67 lines
Signed-off-by Phil Sutter <[email protected]>--- iptables/nft-cache.c | 13 ------------- iptables/nft-cache.h | 2 -- iptables/nft.c | 8 +++++--- 3 files changed, 5 insertions(+), 18 deletions(-)iptables/nft-cache.c +0
-13@@ -684,16 +684,3 @@ nft_set_list_get(struct nft_handle *h, const char *table, const char *set)return h->cache->table[t->type].sets; } - -struct nftnl_chain_list * -nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain) -{ -const struct builtin_table *t; - - t =nft_table_builtin_find (h, table); -if (!t) -return NULL ; - -return h->cache->table[t->type].chains; -} -iptables/nft-cache.h +0
-2@@ -16,8 +16,6 @@ void nft_cache_build(struct nft_handle *h);int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t,struct nftnl_chain *c); -struct nftnl_chain_list * -nft_chain_list_get (struct nft_handle *h,const char *table,const char *chain);struct nftnl_set_list *nft_set_list_get (struct nft_handle *h,const char *table,const char *set);iptables/nft.c +5
-3@@ -1837,13 +1837,15 @@ out:static struct nftnl_chain *nft_chain_find (struct nft_handle *h,const char *table,const char *chain) { +const struct builtin_table *t;struct nftnl_chain_list *list; - list =nft_chain_list_get (h, table, chain); -if (list ==NULL ) + t =nft_table_builtin_find (h, table); +if (!t)return NULL ; -return nftnl_chain_list_lookup_byname (list, chain); + list = h->cache->table[t->type].chains; +return list ?nftnl_chain_list_lookup_byname (list, chain) :NULL ; } bool nft_chain_exists(struct nft_handle *h,Signature · 1 line
2.28.0
Phil Sutter
reviewerRe: [iptables PATCH v2 04/10] nft: Eliminate nft_chain_list_get()
Quoted 6 lines · Pablo Neira Ayuso
Quoted 3 lines · Phil Sutter
Since introduction of
nft_cache_add_chain(), there is merely a single user ofnft_chain_list_get()left. Hence fold the function into its caller.Why this last update regarding
nft_chain_list_get()and not in 02/10 ?
Ah yes, I could have reordered the patches a bit. In patch 3/10, there are some nft_chain_list_get() removals, too. So I couldn't remove the function in 2/10 already. I should move 3/10 to before 2/10 and then combine that with 4/10. ACK?
Thanks, Phil
Phil Sutter
reviewerPATCH v2 5/10 nft: cache: Move nft_chain_find() over
In reply to Phil SutterIt is basically just a cache lookup, hence fits better in here.
--- iptables/nft-cache.c | 14 ++++++++++++++ iptables/nft-cache.h | 3 +++ iptables/nft.c | 17 ----------------- 3 files changed, 17 insertions(+), 17 deletions(-)
iptables/nft-cache.c +14 -0
@@ -165,6 +165,20 @@ static int fetch_table_cache(struct nft_handle *h)return 1 ; } +struct nftnl_chain * +nft_chain_find (struct nft_handle *h,const char *table,const char *chain) +{ +const struct builtin_table *t; +struct nftnl_chain_list *list; + + t =nft_table_builtin_find (h, table); +if (!t) +return NULL ; + + list = h->cache->table[t->type].chains; +return list ?nftnl_chain_list_lookup_byname (list, chain) :NULL ; +} +int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t,struct nftnl_chain *c) {
iptables/nft-cache.h +3 -0
@@ -16,6 +16,9 @@ void nft_cache_build(struct nft_handle *h);int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t,struct nftnl_chain *c); +struct nftnl_chain * +nft_chain_find (struct nft_handle *h,const char *table,const char *chain); +struct nftnl_set_list *nft_set_list_get (struct nft_handle *h,const char *table,const char *set);
iptables/nft.c +0 -17
@@ -736,9 +736,6 @@ nft_chain_builtin_find(const struct builtin_table *t, const char *chain)return found ? &t->chains[i] :NULL ; } -static struct nftnl_chain * -nft_chain_find (struct nft_handle *h,const char *table,const char *chain); -static void nft_chain_builtin_init (struct nft_handle *h,const struct builtin_table *table) {
@@ -1834,20 +1831,6 @@ out:return ret ==0 ?1 :0 ; } -static struct nftnl_chain * -nft_chain_find (struct nft_handle *h,const char *table,const char *chain) -{ -const struct builtin_table *t; -struct nftnl_chain_list *list; - - t =nft_table_builtin_find (h, table); -if (!t) -return NULL ; - - list = h->cache->table[t->type].chains; -return list ?nftnl_chain_list_lookup_byname (list, chain) :NULL ; -} -bool nft_chain_exists (struct nft_handle *h,const char *table,const char *chain) {
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH v2 6/10 nft: Introduce struct nft_chain
In reply to Phil SutterPreparing for ordered output of user-defined chains, introduce a local datatype wrapping nftnl_chain. In order to maintain the chain name hash table, introduce nft_chain_list as well and use it instead of nftnl_chain_list.
Put everything into a dedicated source file and provide a bunch of getters for attributes of the embedded libnftnl_chain object.
--- iptables/Makefile.am | 2 +- iptables/nft-cache.c | 65 +++++++++++----- iptables/nft-cache.h | 5 +- iptables/nft-chain.c | 59 ++++++++++++++ iptables/nft-chain.h | 87 +++++++++++++++++++++ iptables/nft.c | 179 +++++++++++++++++++++---------------------- iptables/nft.h | 7 +- 7 files changed, 287 insertions(+), 117 deletions(-) create mode 100644 iptables/nft-chain.c create mode 100644 iptables/nft-chain.h
iptables/Makefile.am +1 -1
@@ -38,7 +38,7 @@ xtables_nft_multi_SOURCES += xtables-save.c xtables-restore.c \ nft-shared.c nft-ipv4.c nft-ipv6.c nft-arp.c \ xtables-monitor.c nft-cache.c \ xtables-arp-standalone.c xtables-arp.c \ - nft-bridge.c nft-cmd.c \ + nft-bridge.c nft-cmd.c nft-chain.c \ xtables-eb-standalone.c xtables-eb.c \ xtables-eb-translate.c \ xtables-translate.c
iptables/nft-cache.c +45 -20
134 lines not on this page · raw message
iptables/nft-cache.h +3 -2
@@ -2,6 +2,7 @@#define _NFT_CACHE_H_struct nft_handle ; +struct nft_chain ;struct nft_cmd ;struct builtin_table ;
@@ -11,12 +12,12 @@ void nft_rebuild_cache(struct nft_handle *h);void nft_release_cache (struct nft_handle *h);void flush_chain_cache (struct nft_handle *h,const char *tablename);int flush_rule_cache (struct nft_handle *h,const char *table, -struct nftnl_chain *c); +struct nft_chain *c);void nft_cache_build (struct nft_handle *h);int nft_cache_add_chain (struct nft_handle *h,const struct builtin_table *t,struct nftnl_chain *c); -struct nftnl_chain * +struct nft_chain *nft_chain_find (struct nft_handle *h,const char *table,const char *chain); struct nftnl_set_list *
iptables/nft-chain.c new file +59 -0
59 lines not on this page · raw message
iptables/nft-chain.h new file +87 -0
87 lines not on this page · raw message
iptables/nft.c +88 -91
488 lines not on this page · raw message
iptables/nft.h +4 -3
@@ -4,6 +4,7 @@#include "xshared.h" #include "nft-shared.h" #include "nft-cache.h" +#include "nft-chain.h" #include "nft-cmd.h" #include <libiptc/linux_list.h>
@@ -39,7 +40,7 @@ enum nft_cache_level {struct nft_cache {struct { -struct nftnl_chain_list *chains; +struct nft_chain_list *chains;struct nftnl_set_list *sets;bool exists; } table[NFT_TABLE_MAX ];
@@ -141,7 +142,7 @@ const struct builtin_table *nft_table_builtin_find(struct nft_handle *h, const cstruct nftnl_chain ;int nft_chain_set (struct nft_handle *h,const char *table,const char *chain,const char *policy,const struct xt_counters *counters); -int nft_chain_save (struct nftnl_chain *c,void *data); +int nft_chain_save (struct nft_chain *c,void *data);int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table);int nft_chain_user_del (struct nft_handle *h,const char *chain,const char *table,bool verbose);int nft_chain_restore (struct nft_handle *h,const char *chain,const char *table);
@@ -152,7 +153,7 @@ bool nft_chain_exists(struct nft_handle *h, const char *table, const char *chainvoid nft_bridge_chain_postprocess (struct nft_handle *h,struct nftnl_chain *c);int nft_chain_foreach (struct nft_handle *h,const char *table, -int (*cb)(struct nftnl_chain *c,void *data), +int (*cb)(struct nft_chain *c,void *data),void *data);
Signature · 1 line
2.28.0
Pablo Neira Ayuso
maintainerRe: [iptables PATCH v2 06/10] nft: Introduce struct nft_chain
Quoted 7 lines · Phil Sutter
Preparing for ordered output of user-defined chains, introduce a local datatype wrapping
nftnl_chain. In order to maintain the chain name hash table, introducenft_chain_listas well and use it instead ofnftnl_chain_list.Put everything into a dedicated source file and provide a bunch of getters for attributes of the embedded
libnftnl_chainobject.
[...]
Quoted 73 lines
iptables/nft-chain.h new file +67
-0@@ -0,0 +1,87 @@ +#ifndef _NFT_CHAIN_H_ +#define _NFT_CHAIN_H_ + +#include <libnftnl/chain.h> +#include <libiptc/linux_list.h> + +struct nft_handle ; + +struct nft_chain { +struct list_head head; +struct hlist_node hnode; +struct nftnl_chain *nftnl; +}; + +#define CHAIN_NAME_HSIZE 512 + +struct nft_chain_list { +struct list_head list; +struct hlist_head names[CHAIN_NAME_HSIZE ]; +}; + +struct nft_chain *nft_chain_alloc (struct nftnl_chain *nftnl); +void nft_chain_free (struct nft_chain *c); + +struct nft_chain_list *nft_chain_list_alloc (void ); +void nft_chain_list_free (struct nft_chain_list *list); +void nft_chain_list_del (struct nft_chain *c); + +static inline const char *nft_chain_name (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_NAME ); +} + +static inline const char *nft_chain_table (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_TABLE ); +} + +static inline const char *nft_chain_type (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_TYPE ); +} + +static inline uint32_t nft_chain_prio (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_PRIO ); +} + +static inline uint32_t nft_chain_hooknum (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_HOOKNUM ); +} + +static inline uint64_t nft_chain_packets (struct nft_chain *c) +{ +return nftnl_chain_get_u64 (c->nftnl,NFTNL_CHAIN_PACKETS ); +} + +static inline uint64_t nft_chain_bytes (struct nft_chain *c) +{ +return nftnl_chain_get_u64 (c->nftnl,NFTNL_CHAIN_BYTES ); +} + +static inline bool nft_chain_has_policy (struct nft_chain *c) +{ +return nftnl_chain_is_set (c->nftnl,NFTNL_CHAIN_POLICY ); +}
iptables/nft-chain.h line 77
Quoted 10 lines
iptables/nft-chain.h new file +10
-0+ +static inline uint32_t nft_chain_policy (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_POLICY ); +} + +static inline uint32_t nft_chain_use (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_USE ); +}
Do you need this wrapper functions now? I mean, the intention is to have a native nft_chain structure so nft_chain_use() become:
static inline uint32_t nft_chain_use(struct nft_chain *c)
{
return c->use;
}at some point?
Sorry but I don't see this is happening in this batch?
I remember the original intention was to support for sorting chains, so the listing is predictable. But this batch is updating more things than that and I don't see a clear connection with the goal.
Thanks Phil.
Phil Sutter
reviewerRe: [iptables PATCH v2 06/10] nft: Introduce struct nft_chain
Quoted 96 lines · Pablo Neira Ayuso
Quoted 7 lines · Phil Sutter
Preparing for ordered output of user-defined chains, introduce a local datatype wrapping
nftnl_chain. In order to maintain the chain name hash table, introducenft_chain_listas well and use it instead ofnftnl_chain_list.Put everything into a dedicated source file and provide a bunch of getters for attributes of the embedded
libnftnl_chainobject.[...]
Quoted 73 lines
iptables/nft-chain.h new file +67
-0@@ -0,0 +1,87 @@ +#ifndef _NFT_CHAIN_H_ +#define _NFT_CHAIN_H_ + +#include <libnftnl/chain.h> +#include <libiptc/linux_list.h> + +struct nft_handle ; + +struct nft_chain { +struct list_head head; +struct hlist_node hnode; +struct nftnl_chain *nftnl; +}; + +#define CHAIN_NAME_HSIZE 512 + +struct nft_chain_list { +struct list_head list; +struct hlist_head names[CHAIN_NAME_HSIZE ]; +}; + +struct nft_chain *nft_chain_alloc (struct nftnl_chain *nftnl); +void nft_chain_free (struct nft_chain *c); + +struct nft_chain_list *nft_chain_list_alloc (void ); +void nft_chain_list_free (struct nft_chain_list *list); +void nft_chain_list_del (struct nft_chain *c); + +static inline const char *nft_chain_name (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_NAME ); +} + +static inline const char *nft_chain_table (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_TABLE ); +} + +static inline const char *nft_chain_type (struct nft_chain *c) +{ +return nftnl_chain_get_str (c->nftnl,NFTNL_CHAIN_TYPE ); +} + +static inline uint32_t nft_chain_prio (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_PRIO ); +} + +static inline uint32_t nft_chain_hooknum (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_HOOKNUM ); +} + +static inline uint64_t nft_chain_packets (struct nft_chain *c) +{ +return nftnl_chain_get_u64 (c->nftnl,NFTNL_CHAIN_PACKETS ); +} + +static inline uint64_t nft_chain_bytes (struct nft_chain *c) +{ +return nftnl_chain_get_u64 (c->nftnl,NFTNL_CHAIN_BYTES ); +} + +static inline bool nft_chain_has_policy (struct nft_chain *c) +{ +return nftnl_chain_is_set (c->nftnl,NFTNL_CHAIN_POLICY ); +}iptables/nft-chain.h line 77
Quoted 10 lines
iptables/nft-chain.h new file +10
-0+ +static inline uint32_t nft_chain_policy (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_POLICY ); +} + +static inline uint32_t nft_chain_use (struct nft_chain *c) +{ +return nftnl_chain_get_u32 (c->nftnl,NFTNL_CHAIN_USE ); +}Do you need this wrapper functions now? I mean, the intention is to have a native
nft_chainstructure sonft_chain_use()become:
Quoted 4 lines
static inline
uint32_tnft_chain_use(struct nft_chain *c){ return c->use; }
Potentially, yes. I played with "pre-extracting" some attributes from nftnl_chain object once, populating pointers in nft_chain object and making above getters just return that pointer.
Quoted 3 lines
at some point?
Sorry but I don't see this is happening in this batch?
I'm not entirely sure it is much use. In fact, we get nftnl_chain objects when fetching cache from kernel and when pushing changes to kernel we need nftnl_chain objects again. So unless we're concerned with memory use in between or we get rid of the need for nftnl_chain objects, dropping and recreating them is just extra work.
Quoted 3 lines
I remember the original intention was to support for sorting chains, so the listing is predictable. But this batch is updating more things than that and I don't see a clear connection with the goal.
The nft_chain struct is needed mostly to allow for sorting the chain list without adding code to libnftnl. This was your request before this respin, you claimed it is important to keep libnftnl code size small. So nft_chain is mostly a reimplementation of nftnl_chain_list, including chain name hash.
The getter introduction is handy as I had many change like:
- nftnl_rule_set_str(rule, NFTNL_RULE_TABLE,
- nftnl_chain_get_str(c, NFTNL_CHAIN_TABLE));
+ nftnl_rule_set_str(rule, NFTNL_RULE_TABLE,
+ nftnl_chain_get_str(c->nftnl, NFTNL_CHAIN_TABLE));
Given that I have to touch those lines anyway, with introducing a getter things become a bit cleaner also:
- nftnl_rule_set_str(rule, NFTNL_RULE_TABLE,
- nftnl_chain_get_str(c, NFTNL_CHAIN_TABLE));
+ nftnl_rule_set_str(rule, NFTNL_RULE_TABLE, nft_chain_table(c));
Thinking about it, I could introduce the getters in a separate, early patch. This would reduce the nft_chain introduction patch quite a bit. But since these getters are (in the current form) specific to nft_chain objects, I find it all belongs together.
Cheers, Phil
Phil Sutter
reviewerPATCH v2 7/10 nft: Introduce a dedicated base chain array
In reply to Phil SutterPreparing for sorted chain output, introduce a per-table array holding base chains indexed by nf_inet_hooks value. Since the latter is ordered correctly, iterating over the array will return base chains in expected order.
---
Changes since v1:
- Use nft_chain getters in nft_cache_add_chain().
- Introduce flush_base_chain_cache().
- Simplified patch since nft_cache_add_chain() hides some details.
--- iptables/nft-cache.c | 34 +++++++++++++++++++++++++++++++++- iptables/nft.c | 12 +++++++++++- iptables/nft.h | 1 + 3 files changed, 45 insertions(+), 2 deletions(-)
iptables/nft-cache.c +33 -1
@@ -206,7 +206,24 @@ int nft_cache_add_chain(struct nft_handle *h, const struct builtin_table *t, {struct nft_chain *nc =nft_chain_alloc (c); -list_add_tail (&nc->head, &h->cache->table[t->type].chains->list); +if (nft_chain_builtin (nc)) { +uint32_t hooknum =nft_chain_hooknum (nc); + +if (hooknum >=NF_INET_NUMHOOKS ) { +nft_chain_free (nc); +return -EINVAL ; + } + +if (h->cache->table[t->type].base_chains[hooknum]) { +nft_chain_free (nc); +return -EEXIST ; + } + + h->cache->table[t->type].base_chains[hooknum] = nc; + }else { +list_add_tail (&nc->head, + &h->cache->table[t->type].chains->list); + }hlist_add_head (&nc->hnode,chain_name_hlist (h, t,nft_chain_name (nc)));return 0 ; }
@@ -605,6 +622,19 @@ static int __flush_set_cache(struct nftnl_set *s, void *data)return 0 ; } +static void flush_base_chain_cache (struct nft_chain **base_chains) +{ +int i; + +for (i =0 ; i <NF_INET_NUMHOOKS ; i++) { +if (!base_chains[i]) +continue ; +hlist_del (&base_chains[i]->hnode); +nft_chain_free (base_chains[i]); + base_chains[i] =NULL ; + } +} +static int flush_cache (struct nft_handle *h,struct nft_cache *c,const char *tablename) {
@@ -616,6 +646,7 @@ static int flush_cache(struct nft_handle *h, struct nft_cache *c,if (!table)return 0 ; +flush_base_chain_cache (c->table[table->type].base_chains);nft_chain_foreach (h, tablename, __flush_chain_cache,NULL );if (c->table[table->type].sets)
@@ -628,6 +659,7 @@ static int flush_cache(struct nft_handle *h, struct nft_cache *c,if (h->tables[i].name ==NULL )continue ; +flush_base_chain_cache (c->table[i].base_chains);if (c->table[i].chains) {nft_chain_list_free (c->table[i].chains); c->table[i].chains =NULL ;
iptables/nft.c +11 -1
@@ -2380,12 +2380,22 @@ int nft_chain_foreach(struct nft_handle *h, const char *table,const struct builtin_table *t;struct nft_chain_list *list;struct nft_chain *c, *c_bak; -int ret; +int i, ret; t =nft_table_builtin_find (h, table);if (!t)return -1 ; +for (i =0 ; i <NF_INET_NUMHOOKS ; i++) { + c = h->cache->table[t->type].base_chains[i]; +if (!c) +continue ; + + ret =cb (c, data); +if (ret <0 ) +return ret; + } + list = h->cache->table[t->type].chains;if (!list)return -1 ;
iptables/nft.h +1 -0
@@ -40,6 +40,7 @@ enum nft_cache_level {struct nft_cache {struct { +struct nft_chain *base_chains[NF_INET_NUMHOOKS ];struct nft_chain_list *chains;struct nftnl_set_list *sets;bool exists;
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH v2 8/10 nft: cache: Sort custom chains by name
In reply to Phil SutterWith base chains no longer residing in the tables' chain lists, they can easily be sorted upon insertion. This on one hand aligns custom chain ordering with legacy iptables and on the other makes it predictable, which is very helpful when manually comparing ruleset dumps for instance.
Adjust the one ebtables-nft test case this change breaks (as wrong ordering is expected in there). The manual output sorting done for tests which apply to legacy as well as nft is removed in a separate patch.
---
Changes since v1:
- Extended commit message.
- Rewrote to not rely upon changes in libnftnl (namely, nftnl_chain_list_add_sorted()).
--- iptables/nft-cache.c | 16 +++++++++++++--- .../ebtables/0002-ebtables-save-restore_0 | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-)
iptables/nft-cache.c +13 -3
@@ -205,6 +205,7 @@ int nft_cache_add_chain(struct nft_handle *h, const struct builtin_table *t, struct nftnl_chain *c) {struct nft_chain *nc =nft_chain_alloc (c); +const char *cname =nft_chain_name (nc);if (nft_chain_builtin (nc)) {uint32_t hooknum =nft_chain_hooknum (nc);
@@ -221,10 +222,19 @@ int nft_cache_add_chain(struct nft_handle *h, const struct builtin_table *t, h->cache->table[t->type].base_chains[hooknum] = nc; }else { -list_add_tail (&nc->head, - &h->cache->table[t->type].chains->list); +struct nft_chain_list *clist = h->cache->table[t->type].chains; +struct list_head *pos = &clist->list; +struct nft_chain *cur; + +list_for_each_entry (cur, &clist->list, head) { +if (strcmp (cname,nft_chain_name (cur)) <=0 ) { + pos = &cur->head; +break ; + } + } +list_add_tail (&nc->head, pos); } -hlist_add_head (&nc->hnode,chain_name_hlist (h, t,nft_chain_name (nc))); +hlist_add_head (&nc->hnode,chain_name_hlist (h, t, cname));return 0 ; }
iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0 +1 -1
@@ -70,8 +70,8 @@ DUMP='*filter :INPUT ACCEPT :FORWARD DROP :OUTPUT ACCEPT -:foo ACCEPT :bar RETURN +:foo ACCEPT -A INPUT -p IPv4 -i lo -j ACCEPT -A FORWARD -j foo -A OUTPUT -s Broadcast -j DROP
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH v2 9/10 tests: shell: Drop any dump sorting in place
In reply to Phil SutterWith iptables-nft-save output now sorted just like legacy one, no sorting to unify them is needed anymore.
--- .../firewalld-restore/0001-firewalld_0 | 17 ++--------------- .../testcases/ipt-restore/0007-flush-noflush_0 | 4 ++-- .../ipt-restore/0014-verbose-restore_0 | 2 +- 3 files changed, 5 insertions(+), 18 deletions(-)
iptables/tests/shell/testcases/firewalld-restore/0001-firewalld_0 +2 -15
@@ -230,21 +230,8 @@ for table in nat mangle raw filter;do $XT_MULTI iptables-save -t $table | grep -v '^#' >> "$tmpfile" done -case "$XT_MULTI" in -*xtables-nft-multi) - # nft-multi displays chain names in different order, work around this for now - tmpfile2=$(mktemp) - sort "$tmpfile" > "$tmpfile2" - sort $(dirname "$0")/dumps/ipt-save-completed.txt > "$tmpfile" - diff -u $tmpfile $tmpfile2 - RET=$? - rm -f "$tmpfile2" - ;; -*) - diff -u $tmpfile $(dirname "$0")/dumps/ipt-save-completed.txt - RET=$? - ;; -esac +diff -u $tmpfile $(dirname "$0")/dumps/ipt-save-completed.txt +RET=$? rm -f "$tmpfile"
iptables/tests/shell/testcases/ipt-restore/0007-flush-noflush_0 +2 -2
@@ -18,7 +18,7 @@ EXPECT="*nat :POSTROUTING ACCEPT [0:0] -A POSTROUTING -j ACCEPT COMMIT" -diff -u -Z <(echo -e "$EXPECT" | sort) <($XT_MULTI iptables-save | grep -v '^#' | sort) +diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI iptables-save | grep -v '^#') $XT_MULTI iptables-restore <<EOF *filter
@@ -39,4 +39,4 @@ COMMIT :POSTROUTING ACCEPT [0:0] -A POSTROUTING -j ACCEPT COMMIT" -diff -u -Z <(echo -e "$EXPECT" | sort) <($XT_MULTI iptables-save | grep -v '^#' | sort) +diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI iptables-save | grep -v '^#')
iptables/tests/shell/testcases/ipt-restore/0014-verbose-restore_0 +1 -1
@@ -59,7 +59,7 @@ Flushing chain \`secfoo' Deleting chain \`secfoo'" for ipt in iptables-restore ip6tables-restore; do - diff -u -Z <(sort <<< "$EXPECT") <($XT_MULTI $ipt -v <<< "$DUMP" | sort) + diff -u -Z <(echo "$EXPECT") <($XT_MULTI $ipt -v <<< "$DUMP") done DUMP="*filter
Signature · 1 line
2.28.0
Phil Sutter
reviewerPATCH v2 10/10 nft: Avoid pointless table/chain creation
In reply to Phil SutterAccept a chain name in nft_xt_builtin_init() to limit the base chain creation to that specific chain only.
Introduce nft_xt_builtin_table_init() to create just the table for situations where no builtin chains are needed but the command may still succeed in an empty ruleset, particularly when creating a custom chain, restoring base chains or adding a set for ebtables among match.
Introduce nft_xt_fake_builtin_chains(), a function to call after cache has been populated to fill empty base chain slots. This keeps ruleset listing output intact if some base chains do not exist (or even the whole ruleset is completely empty).
---
Changes since v1:
- Add 'fake' parameter to nft_chain_builtin_add() to reuse its code for chain faking.
- Rebase onto previous changes.
- Accept a chain name in nft_xt_fake_builtin_chains() to fake only that specific chain.
--- iptables/nft.c | 96 ++++++++++++++++++++++++++++++++++------- iptables/nft.h | 1 + iptables/xtables-save.c | 1 + 3 files changed, 82 insertions(+), 16 deletions(-)
iptables/nft.c +80 -16
@@ -686,7 +686,8 @@ nft_chain_builtin_alloc(const struct builtin_table *table,static void nft_chain_builtin_add (struct nft_handle *h,const struct builtin_table *table, -const struct builtin_chain *chain) +const struct builtin_chain *chain, +bool fake) {struct nftnl_chain *c;
@@ -694,7 +695,8 @@ static void nft_chain_builtin_add(struct nft_handle *h,if (c ==NULL )return ; -batch_chain_add (h,NFT_COMPAT_CHAIN_ADD , c); +if (!fake) +batch_chain_add (h,NFT_COMPAT_CHAIN_ADD , c);nft_cache_add_chain (h, table, c); }
@@ -746,11 +748,12 @@ static void nft_chain_builtin_init(struct nft_handle *h,if (nft_chain_find (h, table->name, table->chains[i].name))continue ; -nft_chain_builtin_add (h, table, &table->chains[i]); +nft_chain_builtin_add (h, table, &table->chains[i], false); } } -static int nft_xt_builtin_init (struct nft_handle *h,const char *table) +static const struct builtin_table * +nft_xt_builtin_table_init (struct nft_handle *h,const char *table) {const struct builtin_table *t;
@@ -758,20 +761,81 @@ static int nft_xt_builtin_init(struct nft_handle *h, const char *table)return 0 ; t =nft_table_builtin_find (h, table); -if (t ==NULL ) -return -1 ; +if (!t) +return NULL ;if (nft_table_builtin_add (h, t) <0 ) +return NULL ; + +return t; +} + +static int nft_xt_builtin_init (struct nft_handle *h,const char *table, +const char *chain) +{ +const struct builtin_table *t; +const struct builtin_chain *c; + +if (!h->cache_init) +return 0 ; + + t =nft_xt_builtin_table_init (h, table); +if (!t)return -1 ;if (h->cache_req.level <NFT_CL_CHAINS )return 0 ; -nft_chain_builtin_init (h, t); +if (!chain) { +nft_chain_builtin_init (h, t); +return 0 ; + } + + c =nft_chain_builtin_find (t, chain); +if (!c) +return -1 ; + +if (h->cache->table[t->type].base_chains[c->hook]) +return 0 ; + +nft_chain_builtin_add (h, t, c, false); +return 0 ; +} +static int __nft_xt_fake_builtin_chains (struct nft_handle *h, +const char *table,void *data) +{ +const char *chain = data ? *(const char **)data :NULL ; +const struct builtin_table *t; +struct nft_chain **bcp; +int i; + + t =nft_table_builtin_find (h, table); +if (!t) +return -1 ; + + bcp = h->cache->table[t->type].base_chains; +for (i =0 ; i <NF_INET_NUMHOOKS && t->chains[i].name; i++) { +if (bcp[t->chains[i].hook]) +continue ; + +if (chain &&strcmp (chain, t->chains[i].name)) +continue ; + +nft_chain_builtin_add (h, t, &t->chains[i], true); + }return 0 ; } +int nft_xt_fake_builtin_chains (struct nft_handle *h, +const char *table,const char *chain) +{ +if (table) +return __nft_xt_fake_builtin_chains (h, table, &chain); + +return nft_for_each_table (h, __nft_xt_fake_builtin_chains, &chain); +} +int nft_restart (struct nft_handle *h) {mnl_socket_close (h->nl);
@@ -864,7 +928,7 @@ static struct nftnl_chain *nft_chain_new(struct nft_handle *h, }/* if this built-in table does not exists, create it */ -nft_xt_builtin_init (h, table); +nft_xt_builtin_init (h, table, chain); _c =nft_chain_builtin_find (_t, chain);if (_c !=NULL ) {
@@ -1379,7 +1443,7 @@ nft_rule_append(struct nft_handle *h, const char *chain, const char *table,struct nft_chain *c;int type; -nft_xt_builtin_init (h, table); +nft_xt_builtin_init (h, table, chain); nft_fn = nft_rule_append;
@@ -1658,7 +1722,7 @@ int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table, nft_fn = nft_rule_flush;if (chain || verbose) -nft_xt_builtin_init (h, table); +nft_xt_builtin_init (h, table, chain);else if (!nft_table_find (h, table))return 1 ;
@@ -1691,7 +1755,7 @@ int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *tabl nft_fn = nft_chain_user_add; -nft_xt_builtin_init (h, table); +nft_xt_builtin_table_init (h, table);if (nft_chain_exists (h, table, chain)) { errno =EEXIST ;
@@ -1724,7 +1788,7 @@ int nft_chain_restore(struct nft_handle *h, const char *chain, const char *tablebool created = false;int ret; -nft_xt_builtin_init (h, table); +nft_xt_builtin_table_init (h, table); nc =nft_chain_find (h, table, chain);if (nc) {
@@ -2136,7 +2200,7 @@ int nft_rule_insert(struct nft_handle *h, const char *chain,struct nftnl_rule *r =NULL ;struct nft_chain *c; -nft_xt_builtin_init (h, table); +nft_xt_builtin_init (h, table, chain); nft_fn = nft_rule_insert;
@@ -2342,7 +2406,7 @@ int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, };struct nft_chain *c; -nft_xt_builtin_init (h, table); +nft_xt_fake_builtin_chains (h, table, chain);nft_assert_table_compatible (h, table, chain);if (chain) {
@@ -2439,7 +2503,7 @@ int nft_rule_list_save(struct nft_handle *h, const char *chain,struct nft_chain *c;int ret =0 ; -nft_xt_builtin_init (h, table); +nft_xt_fake_builtin_chains (h, table, chain);nft_assert_table_compatible (h, table, chain);if (counters <0 )
@@ -3046,7 +3110,7 @@ static int nft_prepare(struct nft_handle *h) cmd->chain, cmd->policy);break ;case NFT_COMPAT_SET_ADD : -nft_xt_builtin_init (h, cmd->table); +nft_xt_builtin_table_init (h, cmd->table);batch_set_add (h,NFT_COMPAT_SET_ADD , cmd->obj.set); ret =1 ;break ;
iptables/nft.h +1 -0
@@ -136,6 +136,7 @@ bool nft_table_find(struct nft_handle *h, const char *tablename);int nft_table_purge_chains (struct nft_handle *h,const char *table,struct nftnl_chain_list *list);int nft_table_flush (struct nft_handle *h,const char *table);const struct builtin_table *nft_table_builtin_find (struct nft_handle *h,const char *table); +int nft_xt_fake_builtin_chains (struct nft_handle *h,const char *table,const char *chain);/* * Operations with chains.
iptables/xtables-save.c +1 -0
@@ -236,6 +236,7 @@ xtables_save_main(int family, int argc, char *argv[],nft_cache_level_set (&h,NFT_CL_RULES ,NULL );nft_cache_build (&h); +nft_xt_fake_builtin_chains (&h, tablename,NULL ); ret =do_output (&h, tablename, &d);nft_fini (&h);
Signature · 1 line
2.28.0