Add support for table's persist flag
Phil Sutter
reviewerv2 cover Add support for table's persist flag
Support for kernel commit da5141bbe0c2 ("netfilter: nf_tables: Introduce NFT_TABLE_F_PERSIST") in user space.
Patch 1 is not a dependency, but trivial enough to go along with the second one.
Changes since v1:
- Fix memleak in patch 2.
Phil Sutter (2):
doc: nft.8: Two minor synopsis fixups
Add support for table's persist flag
doc/libnftables-json.adoc | 11 +++- doc/nft.txt | 13 +++- include/rule.h | 3 +- src/parser_bison.y | 43 +++++++++---- src/parser_json.c | 68 ++++++++++++++++++++- src/rule.c | 1 + tests/shell/features/table_flag_persist.nft | 3 + tests/shell/testcases/owner/0002-persist | 36 +++++++++++ 8 files changed, 159 insertions(+), 19 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persist
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH v2 1/2 doc: nft.8: Two minor synopsis fixups
The curly braces in 'add table' are to be put literally, so need to be bold. Also, they are optional unless either one (or both) of 'comment' and 'flags' are specified.
The 'add chain' synopsis contained a stray tick, messing up the following markup.
--- doc/nft.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
doc/nft.txt +2 -2
@@ -321,7 +321,7 @@ Effectively, this is the nft-equivalent of *iptables-save* and TABLES ------ [verse] -{*add* | *create*} *table* ['family'] 'table' [ {*comment* 'comment' *;*'} *{ flags* 'flags' *; }*] +{*add* | *create*} *table* ['family'] 'table' [*{* [*comment* 'comment' *;*] [*flags* 'flags' *;*] *}*] {*delete* | *destroy* | *list* | *flush*} *table* ['family'] 'table' *list tables* ['family'] *delete table* ['family'] *handle* 'handle'
@@ -376,7 +376,7 @@ add table inet mytable CHAINS ------ [verse] -{*add* | *create*} *chain* ['family'] 'table' 'chain' [*{ type* 'type' *hook* 'hook' [*device* 'device'] *priority* 'priority' *;* [*policy* 'policy' *;*] [*comment* 'comment' *;*'] *}*] +{*add* | *create*} *chain* ['family'] 'table' 'chain' [*{ type* 'type' *hook* 'hook' [*device* 'device'] *priority* 'priority' *;* [*policy* 'policy' *;*] [*comment* 'comment' *;*] *}*] {*delete* | *destroy* | *list* | *flush*} *chain* ['family'] 'table' 'chain' *list chains* ['family'] *delete chain* ['family'] 'table' *handle* 'handle'
Signature · 1 line
2.43.0
Phil Sutter
reviewerRe: [nft PATCH v2 1/2] doc: nft.8: Two minor synopsis fixups
Quoted 9 lines · Phil Sutter
The curly braces in 'add table' are to be put literally, so need to be bold. Also, they are optional unless either one (or both) of 'comment' and 'flags' are specified.
The 'add chain' synopsis contained a stray tick, messing up the following markup.
Fixes 7fd67ce121f86 ("doc: fix synopsis of named counter, quota and ct {helper,timeout,expect}")Signed-off-by Phil Sutter <[email protected]>
Patch applied, will respin the second one.
Phil Sutter
reviewerPATCH v2 2/2 Add support for table's persist flag
In reply to Phil SutterBison parser lacked support for passing multiple flags, JSON parser did not support table flags at all.
Document also 'owner' flag (and describe their relationship in nft.8.
---
Changes since v1:
- Add missing free_const() call, noticed by Quentin Deslandes.
--- doc/libnftables-json.adoc | 11 +++- doc/nft.txt | 9 +++ include/rule.h | 3 +- src/parser_bison.y | 43 +++++++++---- src/parser_json.c | 68 ++++++++++++++++++++- src/rule.c | 1 + tests/shell/features/table_flag_persist.nft | 3 + tests/shell/testcases/owner/0002-persist | 36 +++++++++++ 8 files changed, 157 insertions(+), 17 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persist
doc/libnftables-json.adoc +10 -1
@@ -202,12 +202,19 @@ Rename a chain. The new name is expected in a dedicated property named === TABLE [verse] +____ *{ "table": { "family":* 'STRING'*, "name":* 'STRING'*, - "handle":* 'NUMBER' + "handle":* 'NUMBER'*, + "flags":* 'TABLE_FLAGS' *}}* +'TABLE_FLAGS' := 'TABLE_FLAG' | *[* 'TABLE_FLAG_LIST' *]* +'TABLE_FLAG_LIST' := 'TABLE_FLAG' [*,* 'TABLE_FLAG_LIST' ] +'TABLE_FLAG' := *"dormant"* | *"owner"* | *"persist"* +____ + This object describes a table. *family*::
@@ -217,6 +224,8 @@ This object describes a table. *handle*:: The table's handle. In input, it is used only in *delete* command as alternative to *name*. +*flags*:: + The table's flags. === CHAIN [verse]
doc/nft.txt +9 -0
@@ -343,8 +343,17 @@ return an error. |Flag | Description |dormant | table is not evaluated any more (base chains are unregistered). +|owner | +table is owned by the creating process. +|persist | +table shall outlive the owning process. |================= +Creating a table with flag *owner* excludes other processes from manipulating +it or its contents. By default, it will be removed when the process exits. +Setting flag *persist* will prevent this and the resulting orphaned table will +accept a new owner, e.g. a restarting daemon maintaining the table. + .*Add, change, delete a table* --------------------------------------- # start nft in interactive mode
include/rule.h +2 -1
@@ -130,8 +130,9 @@ struct symbol *symbol_get(const struct scope *scope, const char *identifier);enum table_flags {TABLE_F_DORMANT = (1 <<0 ),TABLE_F_OWNER = (1 <<1 ), +TABLE_F_PERSIST = (1 <<2 ), }; -#define TABLE_FLAGS_MAX 2 +#define TABLE_FLAGS_MAX 3const char *table_flag_name (uint32_t flag);
src/parser_bison.y +30 -13
62 lines not on this page · raw message
src/parser_json.c +66 -2
94 lines not on this page · raw message
src/rule.c +1 -0
@@ -1215,6 +1215,7 @@ struct table *table_lookup_fuzzy(const struct handle *h,static const char *table_flags_name[TABLE_FLAGS_MAX ] = {"dormant" ,"owner" , +"persist" , };const char *table_flag_name (uint32_t flag)
tests/shell/features/table_flag_persist.nft new file +3 -0
@@ -0,0 +1,3 @@ +table t { + flags persist; +}
tests/shell/testcases/owner/0002-persist new file +36 -0
@@ -0,0 +1,36 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_owner) +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_persist) + +die() { + echo "$@" + exit 1 +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "table add failed" +} + +$NFT list ruleset | grep -q 'table ip t' || { + die "table does not persist" +} +$NFT list ruleset | grep -q 'flags persist$' || { + die "unexpected flags in orphaned table" +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "retake ownership failed" +} + +exit 0
Signature · 1 line
2.43.0