d9f08f29ae
* Thu Nov 07 2024 Phil Sutter <psutter@redhat.com> [1.1.1-1.el10] - monitor: Recognize flowtable add/del events (Phil Sutter) [RHEL-65346] - tests: py: Fix for storing payload into missing file (Phil Sutter) [RHEL-65346] - json: Support typeof in set and map types (Phil Sutter) [RHEL-65346] - json: collapse set element commands from parser (Phil Sutter) [RHEL-65346] - doc: extend description of fib expression (Phil Sutter) [RHEL-65346] - tests: monitor: fix up test case breakage (Phil Sutter) [RHEL-65346] - src: fix extended netlink error reporting with large set elements (Phil Sutter) [RHEL-65346] - rule: netlink attribute offset is uint32_t for struct nlerr_loc (Phil Sutter) [RHEL-65346] - mnl: update cmd_add_loc() to take struct nlmsghdr (Phil Sutter) [RHEL-65346] - mnl: rename to mnl_seqnum_alloc() to mnl_seqnum_inc() (Phil Sutter) [RHEL-65346] - src: collapse set element commands from parser (Phil Sutter) [RHEL-65346] - libnftables-json: fix raw payload expression documentation (Phil Sutter) [RHEL-65346] - tests: shell: fix spurious dump failure in vmap timeout test (Phil Sutter) [RHEL-65346] - Rebase onto version 1.1.1 (Phil Sutter) [RHEL-65346] Resolves: RHEL-65346
84 lines
2.5 KiB
Diff
84 lines
2.5 KiB
Diff
From 21295af879d5cc6a41bd823e708a97684034ed1e Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Thu, 7 Nov 2024 18:38:46 +0100
|
|
Subject: [PATCH] json: collapse set element commands from parser
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-65346
|
|
Upstream Status: nftables commit 193faa5475a5df7d9ac0b1a8fe647196de3e5688
|
|
|
|
commit 193faa5475a5df7d9ac0b1a8fe647196de3e5688
|
|
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Thu Oct 31 21:38:02 2024 +0100
|
|
|
|
json: collapse set element commands from parser
|
|
|
|
Update json parser to collapse {add,create} element commands to reduce
|
|
memory consumption in the case of large sets defined by one element per
|
|
command:
|
|
|
|
{"nftables": [{"add": {"element": {"family": "ip", "table": "x", "name":
|
|
"y", "elem": [{"set": ["1.1.0.0"]}]}}},...]}
|
|
|
|
Add CTX_F_COLLAPSED flag to report that command has been collapsed.
|
|
|
|
This patch reduces memory consumption by ~32% this case.
|
|
|
|
Fixes: 20f1c60ac8c8 ("src: collapse set element commands from parser")
|
|
Reported-by: Eric Garver <eric@garver.life>
|
|
Tested-by: Eric Garver <eric@garver.life>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/parser_json.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/src/parser_json.c b/src/parser_json.c
|
|
index 37ec34c..68c0600 100644
|
|
--- a/src/parser_json.c
|
|
+++ b/src/parser_json.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <netlink.h>
|
|
#include <parser.h>
|
|
#include <rule.h>
|
|
+#include <cmd.h>
|
|
#include <sctp_chunk.h>
|
|
#include <socket.h>
|
|
|
|
@@ -49,6 +50,7 @@
|
|
#define CTX_F_SES (1 << 6) /* set_elem_expr_stmt */
|
|
#define CTX_F_MAP (1 << 7) /* LHS of map_expr */
|
|
#define CTX_F_CONCAT (1 << 8) /* inside concat_expr */
|
|
+#define CTX_F_COLLAPSED (1 << 9)
|
|
|
|
struct json_ctx {
|
|
struct nft_ctx *nft;
|
|
@@ -3490,6 +3492,15 @@ static struct cmd *json_parse_cmd_add_element(struct json_ctx *ctx,
|
|
handle_free(&h);
|
|
return NULL;
|
|
}
|
|
+
|
|
+ if ((op == CMD_CREATE || op == CMD_ADD) &&
|
|
+ nft_cmd_collapse_elems(op, ctx->cmds, &h, expr)) {
|
|
+ handle_free(&h);
|
|
+ expr_free(expr);
|
|
+ ctx->flags |= CTX_F_COLLAPSED;
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
return cmd_alloc(op, cmd_obj, &h, int_loc, expr);
|
|
}
|
|
|
|
@@ -4319,6 +4330,11 @@ static int __json_parse(struct json_ctx *ctx)
|
|
cmd = json_parse_cmd(ctx, value);
|
|
|
|
if (!cmd) {
|
|
+ if (ctx->flags & CTX_F_COLLAPSED) {
|
|
+ ctx->flags &= ~CTX_F_COLLAPSED;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
json_error(ctx, "Parsing command array at index %zd failed.", index);
|
|
return -1;
|
|
}
|