[PATCH nft] tests: shell: add test case for netdev + dormant table

[PATCH nft] tests: shell: add test case for netdev + dormant table

[Florian Westphal]

both commit update and abort path need to release memory associated with
netdev hooks.  kfree gets skipped because it mixes registration and
allocation.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 .../transactions/dormant_updchain_abort       | 23 +++++++++++++
 .../dumps/dormant_updchain_abort.json-nft     | 33 +++++++++++++++++++
 .../dumps/dormant_updchain_abort.nft          |  7 ++++
 3 files changed, 63 insertions(+)
 create mode 100755 tests/shell/testcases/transactions/dormant_updchain_abort
 create mode 100644 tests/shell/testcases/transactions/dumps/dormant_updchain_abort.json-nft
 create mode 100644 tests/shell/testcases/transactions/dumps/dormant_updchain_abort.nft

diff --git a/tests/shell/testcases/transactions/dormant_updchain_abort b/tests/shell/testcases/transactions/dormant_updchain_abort
new file mode 100755
index 000000000000..56ad887d0d92
--- /dev/null
+++ b/tests/shell/testcases/transactions/dormant_updchain_abort
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+$NFT -f - <<EOF
+table netdev t {
+	flags dormant
+
+	chain c {
+		type filter hook ingress priority 0
+	}
+}
+EOF
+
+# check abort path frees transaction
+$NFT --check --f - <<EOF
+table netdev t {
+	flags dormant
+	chain c {
+		type filter hook ingress device lo priority 0
+	}
+}
+EOF
diff --git a/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.json-nft b/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.json-nft
new file mode 100644
index 000000000000..f6838c15e9f1
--- /dev/null
+++ b/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.json-nft
@@ -0,0 +1,33 @@
+{
+  "nftables": [
+    {
+      "metainfo": {
+        "version": "VERSION",
+        "release_name": "RELEASE_NAME",
+        "json_schema_version": 1
+      }
+    },
+    {
+      "table": {
+        "family": "netdev",
+        "name": "t",
+        "handle": 0,
+        "flags": [
+          "dormant"
+        ]
+      }
+    },
+    {
+      "chain": {
+        "family": "netdev",
+        "table": "t",
+        "name": "c",
+        "handle": 0,
+        "type": "filter",
+        "hook": "ingress",
+        "prio": 0,
+        "policy": "accept"
+      }
+    }
+  ]
+}
diff --git a/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.nft b/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.nft
new file mode 100644
index 000000000000..95dcc59a3e46
--- /dev/null
+++ b/tests/shell/testcases/transactions/dumps/dormant_updchain_abort.nft
@@ -0,0 +1,7 @@
+table netdev t {
+	flags dormant
+
+	chain c {
+		type filter hook ingress priority filter; policy accept;
+	}
+}
-- 
2.53.0

Re: [PATCH nft] tests: shell: add test case for netdev + dormant table

[Florian Westphal]

Florian Westphal <fw@strlen.de> wrote:
> both commit update and abort path need to release memory associated with
> netdev hooks.  kfree gets skipped because it mixes registration and
> allocation.

I have a kernel fix for this bug but I am waiting for the pending PR to
get merged before sending it, the fix depends on the new unlink+free
helper and doesn't apply to main branch.