nft: support for dynamic register allocation
Pablo Neira Ayuso
maintainerPATCH v2 1/1 nft: support for dynamic register allocation
Starting Linux kernel 5.18-rc, operations on registers that already contain the expected data are turned into noop.
Use libnftnl dynamic register allocation infrastructure to select the registers to be used for payload and meta expressions.
Using samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
Benchmark #1: match on IPv6 address list
*raw
:PREROUTING DROP [9:2781]
:OUTPUT ACCEPT [0:0]
-A PREROUTING -d aaaa::bbbb -j DROP
[... 98 times same rule above to trigger mismatch ...]
-A PREROUTING -d fd00::1 -j DROP # matching rule
iptables-legacy 798Mb
iptables-nft 801Mb (+0.37)
Benchmark #2: match on layer 4 protocol + port list
*raw
:PREROUTING DROP [9:2781]
:OUTPUT ACCEPT [0:0]
-A PREROUTING -p tcp --dport 23 -j DROP
[... 98 times same rule above to trigger mismatch ...]
-A PREROUTING -p udp --dport 9 -j DROP # matching rule
iptables-legacy 648Mb
iptables-nft 892Mb (+37.65%)
Benchmark #3: match on mark
*raw
:PREROUTING DROP [9:2781]
:OUTPUT ACCEPT [0:0]
-A PREROUTING -m mark --mark 100 -j DROP
[... 98 times same rule above to trigger mismatch ...]
-A PREROUTING -d 198.18.0.42/32 -j DROP # matching rule
iptables-legacy 255Mb
iptables-nft 865Mb (+239.21%)
In all of these cases above, iptables-nft generates netlink bytecode which uses the native expressions, ie. payload + cmp and meta + cmp.
---
v2: now based on libnftnl.
iptables/nft-shared.c | 12 +- iptables/nft.c | 37 +++- iptables/nft.h | 2 + .../nft-only/0009-needless-bitwise_0 | 180 +++++++++--------- 4 files changed, 127 insertions(+), 104 deletions(-)
iptables/nft-shared.c +7 -5
@@ -29,6 +29,7 @@#include <libmnl/libmnl.h> #include <libnftnl/rule.h> #include <libnftnl/expr.h> +#include <libnftnl/regs.h> #include "nft-shared.h" #include "nft-bridge.h"
@@ -50,8 +51,8 @@ void add_meta(struct nft_handle *h, struct nftnl_rule *r, uint32_t key,if (expr ==NULL )return ; - reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_META_KEY , key); + reg =nftnl_reg_get (h->regs, expr);nftnl_expr_set_u32 (expr,NFTNL_EXPR_META_DREG , reg);nftnl_rule_add_expr (r, expr);
@@ -68,11 +69,11 @@ void add_payload(struct nft_handle *h, struct nftnl_rule *r,if (expr ==NULL )return ; - reg =NFT_REG_1 ;nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_BASE , base); -nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_DREG , reg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_OFFSET , offset);nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_LEN , len); + reg =nftnl_reg_get (h->regs, expr); +nftnl_expr_set_u32 (expr,NFTNL_EXPR_PAYLOAD_DREG , reg);nftnl_rule_add_expr (r, expr); *dreg = reg;
@@ -89,7 +90,7 @@ void add_bitwise_u16(struct nft_handle *h, struct nftnl_rule *r,if (expr ==NULL )return ; - reg =NFT_REG_1 ; + reg =nftnl_reg_get_scratch (h->regs,sizeof (uint32_t ));nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_DREG , reg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_LEN ,sizeof (uint16_t ));
@@ -105,12 +106,13 @@ void add_bitwise(struct nft_handle *h, struct nftnl_rule *r, {struct nftnl_expr *expr;uint32_t xor[4 ] = {0 }; -uint8_t reg = *dreg; +uint8_t reg; expr =nftnl_expr_alloc ("bitwise" );if (expr ==NULL )return ; + reg =nftnl_reg_get_scratch (h->regs, len);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_SREG , sreg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_DREG , reg);nftnl_expr_set_u32 (expr,NFTNL_EXPR_BITWISE_LEN , len);
iptables/nft.c +28 -9
@@ -49,6 +49,7 @@#include <libnftnl/rule.h> #include <libnftnl/expr.h> #include <libnftnl/set.h> +#include <libnftnl/regs.h> #include <libnftnl/udata.h> #include <libnftnl/batch.h>
@@ -904,6 +905,12 @@ int nft_init(struct nft_handle *h, int family) h->cache = &h->__cache[0 ]; h->family = family; + h->regs =nftnl_regs_alloc (16 ); +if (!h->regs) { +mnl_socket_close (h->nl); +return -1 ; + } +INIT_LIST_HEAD (&h->obj_list);INIT_LIST_HEAD (&h->err_list);INIT_LIST_HEAD (&h->cmd_list);
@@ -926,6 +933,7 @@ void nft_fini(struct nft_handle *h)mnl_err_list_free (list_entry(pos ,struct mnl_err ,head ));nft_release_cache (h); +nftnl_regs_free (h->regs);mnl_socket_close (h->nl); }
@@ -1109,11 +1117,17 @@ static struct nftnl_expr * gen_payload(struct nft_handle *h, uint32_t base, uint32_t offset, uint32_t len, uint8_t *dreg) { - struct nftnl_expr *e; + struct nftnl_expr *e = nftnl_expr_alloc("payload");uint8_t reg; - reg =NFT_REG_1 ; - e =__gen_payload (base, offset, len, reg); +if (!e) +return NULL ; + +nftnl_expr_set_u32 (e,NFTNL_EXPR_PAYLOAD_BASE , base); +nftnl_expr_set_u32 (e,NFTNL_EXPR_PAYLOAD_OFFSET , offset); +nftnl_expr_set_u32 (e,NFTNL_EXPR_PAYLOAD_LEN , len); + reg =nftnl_reg_get (h->regs, e); +nftnl_expr_set_u32 (e,NFTNL_EXPR_PAYLOAD_DREG , reg); *dreg = reg;return e;
@@ -1157,10 +1171,10 @@ static int __add_nft_among(struct nft_handle *h, const char *table, offsetof(struct iphdr , saddr), offsetof(struct iphdr, daddr) }; +uint8_t reg, concat_len;struct nftnl_expr *e;struct nftnl_set *s;uint32_t flags =0 ; -uint8_t reg;int idx =0 ;if (ip) {
@@ -1201,21 +1215,26 @@ static int __add_nft_among(struct nft_handle *h, const char *table,nftnl_set_elem_add (s, elem); } - e =gen_payload (h,NFT_PAYLOAD_LL_HEADER , - eth_addr_off[dst],ETH_ALEN , ®); + concat_len =ETH_ALEN ; +if (ip) + concat_len +=sizeof (struct in_addr ); + + reg =nftnl_reg_get_scratch (h->regs, concat_len); + e =__gen_payload (NFT_PAYLOAD_LL_HEADER , + eth_addr_off[dst],ETH_ALEN , reg);if (!e)return -ENOMEM ;nftnl_rule_add_expr (r, e);if (ip) { - e =gen_payload (h,NFT_PAYLOAD_NETWORK_HEADER , ip_addr_off[dst], -sizeof (struct in_addr ), ®); + e =__gen_payload (NFT_PAYLOAD_NETWORK_HEADER , ip_addr_off[dst], +sizeof (struct in_addr ), reg +2 );if (!e)return -ENOMEM ;nftnl_rule_add_expr (r, e); } - reg =NFT_REG_1 ; + reg =nftnl_reg_get_scratch (h->regs,sizeof (uint32_t )); e =gen_lookup (reg,"__set%d" , set_id, inv);if (!e)return -ENOMEM ;
iptables/nft.h +2 -0
@@ -111,6 +111,8 @@ struct nft_handle {bool cache_init;int verbose; +struct nftnl_regs *regs; +/* meta data, for error reporting */ struct {unsigned int lineno;
iptables/tests/shell/testcases/nft-only/0009-needless-bitwise_0 +90 -90
269 lines not on this page · raw message
Signature · 1 line
2.30.2