mbox series

[nft,0/8] Enableruntime queue selection via jhash, numgen and map statement

Message ID 20210616211652.11765-1-fw@strlen.de
Headers show
Series Enableruntime queue selection via jhash, numgen and map statement | expand


Florian Westphal June 16, 2021, 9:16 p.m. UTC
Back in 2016 Liping Zhang added support to kernel and libnftnl to
specify a source register containing the queue number to use.

This was never added to nft itself, so allow this.

On linearization side, check if attached expression is a range.
If its not, allocate a new register and set NFTNL_EXPR_QUEUE_SREG_QNUM
attribute after generating the lowlevel expressions for the kernel.

On delinarization we need to check for presence of
NFTNL_EXPR_QUEUE_SREG_QNUM and decode the expression(s) when present.

Also need to do postprocessing for STMT_QUEUE so that the protocol
context is set correctly, without this only raw payload expressions
will be shown (@nh,32,...) instead of 'ip ...'.

Unfortunately, it turned out that just removing the eval checks
to allow arbitrary statements as 'num' argument results in parser

One example is this:
   queue num jhash ip saddr mod 4 bypass

This fails because scanner is still in 'ip' state, not 'queue', when
"bypass" is read, so this will not be recognized as belonging to the
queue statement.

This series solves this in the following way:
1. On output, nft will now always prepend the flags, i.e.
  queue flags bypass num 42

2. On input, 'queue num' is restricted to numbers and ranges.
This is backwards compatible because range and value were the
only permitted inputs (eval step rejects non-constant expressions).

3. To use numgen or jhash, new grammar is added:
 queue flags bypass to jhash ip saddr mod 4

I've restricted the 'to' expressions to numgen, (sym)hash and map
for now.

This can be relaxed later on if other usecases become available.

Florian Westphal (8):
  evaluate: fix hash expression maxval
  parser: restrict queue num expressiveness
  src: add queue expr and flags to queue_stmt_alloc
  parser: add queue_stmt_compat
  parser: new queue flag input format
  src: queue: allow use of arbitrary queue expressions
  tests: extend queue testcases for new sreg support
  src: queue: allow use of MAP statement for queue number retrieval

 doc/statements.txt           | 10 +++-
 include/statement.h          |  3 +-
 src/evaluate.c               | 21 +++++----
 src/netlink_delinearize.c    | 56 +++++++++++++++-------
 src/netlink_linearize.c      | 28 +++++++++--
 src/parser_bison.y           | 38 ++++++++++++---
 src/parser_json.c            | 22 ++++-----
 src/statement.c              | 30 +++++++++---
 tests/py/any/queue.t         | 18 ++++++--
 tests/py/any/queue.t.json    | 90 ++++++++++++++++++++++++++++++++++++
 tests/py/any/queue.t.payload | 25 ++++++++++
 11 files changed, 281 insertions(+), 60 deletions(-)