really handle stacked l2 headers
Florian Westphal
maintainercover really handle stacked l2 headers
Eric Garver reported a number of issues when matching vlan headers:
In: update @macset { ether saddr . vlan id timeout 5s }
Out: update @macset { @ll,48,48 . @ll,112,16 & 0xfff timeout 5s }This is because of amnesia in nft during expression decoding:
When we encounter 'vlan id', the L2 protocl (ethernet) is replaced by vlan, so we attempt to match @ll,48,48 vs. the vlan header and come up empty.
The vlan decode fails because we can't handle '& 0xfff' in this instance, so we can locate the right offset but the payload expression length doesn't match the template length (16 vs 12 bits).
The main patch is patch 3, which adds a stack of l2 protocols to track instead of only keeping the cumulative size.
The latter is ok for serialization (we have the expression tree, so its enough to add the size of the 'previous' l2 headers to payload expressions that match the new 'top' l2 header.
But for deserialization, we need to be able to search all protocols base headers seen.
The remaining patches improve handling of 'integer base type' expressions and add test cases.
Florian Westphal
maintainerPATCH 1/7 netlink_delinearize: allow postprocessing on concatenated elements
Currently there is no case where the individual expressions inside a mapped concatenation need to be munged.
However, to support proper delinearization for an input like 'rule netdev nt nc set update ether saddr . vlan id timeout 5s @macset'
we need to allow this.
Right now, this gets listed as:
update @macset { @ll,48,48 . @ll,112,16 & 0xfff timeout 5s }
because the ethernet protocol is replaced by vlan beforehand, so we fail to map @ll,48,48 to a vlan protocol.
Likewise, we can't map the vlan info either because we cannot cope with the 'and' operation properly, nor is it removed.
Prepare for this by deleting and re-adding so that we do not corrupt the linked list.
After this, the list can be safely changed and a followup patch can start to delete/reallocate expressions.
--- src/netlink_delinearize.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
src/netlink_delinearize.c +6 -1
@@ -2539,16 +2539,21 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)unsigned int type = expr->dtype->type, ntype =0 ;int off = expr->dtype->subtypes;const struct datatype *dtype; +LIST_HEAD (tmp); +struct expr *n; -list_for_each_entry (i, &expr->expressions, list) { +list_for_each_entry_safe (i, n, &expr->expressions, list) {if (type) { dtype =concat_subtype_lookup (type, --off);expr_set_type (i, dtype, dtype->byteorder); } +list_del (&i->list);expr_postprocess (ctx, &i); +list_add_tail (&i->list, &tmp); ntype =concat_subtype_add (ntype, i->dtype->type); } +list_splice (&tmp, &expr->expressions);datatype_set (expr,concat_type_alloc (ntype));break ; }
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 2/7 netlink_delinearize: postprocess binary ands in set expressions
In reply to Florian WestphalInput:
update ether saddr . vlan id timeout 5s @macset
is now rendered as:
update @macset { @ll,48,48 . vlan id timeout 5s }
The @ll, ... is due to vlan description replacing the ethernet one, so payload decode fails to take the concatenation apart (the ethernet header payload info is matched vs. vlan template).
This will be adjusted by a followup patch.
--- include/netlink.h | 4 ++++ src/netlink_delinearize.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-)
include/netlink.h +4 -0
@@ -42,10 +42,14 @@ struct netlink_parse_ctx {struct netlink_ctx *nlctx; }; + +#define RULE_PP_IN_CONCATENATION (1 << 0) +struct rule_pp_ctx {struct proto_ctx pctx;struct payload_dep_ctx pdctx;struct stmt *stmt; +unsigned int flags; };extern const struct input_descriptor indesc_netlink;
src/netlink_delinearize.c +35 -4
@@ -2260,12 +2260,13 @@ static void binop_adjust(const struct expr *binop, struct expr *right, } } -static void binop_postprocess (struct rule_pp_ctx *ctx,struct expr *expr, -struct expr **expr_binop) +static void __binop_postprocess (struct rule_pp_ctx *ctx, +struct expr *expr, +struct expr *left, +struct expr *mask, +struct expr **expr_binop) {struct expr *binop = *expr_binop; -struct expr *left = binop->left; -struct expr *mask = binop->right;unsigned int shift;assert (binop->etype ==EXPR_BINOP );
@@ -2310,6 +2311,16 @@ static void binop_postprocess(struct rule_pp_ctx *ctx, struct expr *expr, } } +static void binop_postprocess (struct rule_pp_ctx *ctx,struct expr *expr, +struct expr **expr_binop) +{ +struct expr *binop = *expr_binop; +struct expr *left = binop->left; +struct expr *mask = binop->right; + +__binop_postprocess (ctx, expr, left, mask, expr_binop); +} +static void map_binop_postprocess (struct rule_pp_ctx *ctx,struct expr *expr) {struct expr *binop = expr->map;
@@ -2542,6 +2553,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)LIST_HEAD (tmp);struct expr *n; + ctx->flags |=RULE_PP_IN_CONCATENATION ;list_for_each_entry_safe (i, n, &expr->expressions, list) {if (type) { dtype =concat_subtype_lookup (type, --off);
@@ -2553,6 +2565,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) ntype =concat_subtype_add (ntype, i->dtype->type); } + ctx->flags &= ~RULE_PP_IN_CONCATENATION ;list_splice (&tmp, &expr->expressions);datatype_set (expr,concat_type_alloc (ntype));break ;
@@ -2569,6 +2582,24 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)expr_set_type (expr->right, &integer_type,BYTEORDER_HOST_ENDIAN );break ; +case OP_AND : +expr_set_type (expr->right, expr->left->dtype, + expr->left->byteorder); + +/* Only process OP_AND if we are inside a concatenation. +* +* Else, we remove it too early, for normal contect OP_AND +* removal needs to be performed as part of the relational +* operation because the RHS constant might need to be adjusted +* (shifted). +*/ +if ((ctx->flags &RULE_PP_IN_CONCATENATION ) && + expr->left->etype ==EXPR_PAYLOAD && + expr->right->etype ==EXPR_VALUE ) { +__binop_postprocess (ctx, expr, expr->left, expr->right, exprp); +return ; + } +break ;default :expr_set_type (expr->right, expr->left->dtype, expr->left->byteorder);
Signature · 1 line
2.35.1
Pablo Neira Ayuso
maintainerRe: [PATCH nft 2/7] netlink_delinearize: postprocess binary ands in set expressions
Hi Florian,
On Wed, Jul 27, 2022 at 01:19:58PM +0200, Florian Westphal wrote:
[..]
Quoted 4 lines
include/netlink.h +0
-0
[...]
Quoted 12 lines
include/netlink.h +8
-0@@ -2569,6 +2582,24 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)expr_set_type (expr->right, &integer_type,BYTEORDER_HOST_ENDIAN );break ; +case OP_AND : +expr_set_type (expr->right, expr->left->dtype, + expr->left->byteorder); + +/* Only process OP_AND if we are inside a concatenation. +* +* Else, we remove it too early, for normal contect OP_AND +* removal needs to be performed as part of the relational
include/netlink.h static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) · line 2602
Quoted 10 lines
include/netlink.h +10
-0+* operation because the RHS constant might need to be adjusted +* (shifted). +*/ +if ((ctx->flags &RULE_PP_IN_CONCATENATION ) && + expr->left->etype ==EXPR_PAYLOAD && + expr->right->etype ==EXPR_VALUE ) { +__binop_postprocess (ctx, expr, expr->left, expr->right, exprp); +return ; + } +break ;
Not sure this flag is enough. If I load this ruleset
table netdev nt {
set macset {
typeof vlan id
size 1024
flags dynamic,timeout
}
chain y {
} }
add rule netdev nt y update @macset { vlan id timeout 5s }
listing still shows the raw expression:
table netdev nt {
set macset {
typeof vlan id
size 1024
flags dynamic,timeout
}
chain y {
update @macset { @ll,112,16 & 0xfff timeout 5s }
}}
looks like the problem is related to expressions in set statements?
Remaining patches in this series LGTM.
Florian Westphal
maintainerRe: [PATCH nft 2/7] netlink_delinearize: postprocess binary ands in set expressions
Quoted 57 lines · Pablo Neira Ayuso
Hi Florian,
On Wed, Jul 27, 2022 at 01:19:58PM +0200, Florian Westphal wrote:
[..]Quoted 4 lines
include/netlink.h +0
-0[...]
Quoted 12 lines
include/netlink.h +8
-0@@ -2569,6 +2582,24 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)expr_set_type (expr->right, &integer_type,BYTEORDER_HOST_ENDIAN );break ; +case OP_AND : +expr_set_type (expr->right, expr->left->dtype, + expr->left->byteorder); + +/* Only process OP_AND if we are inside a concatenation. +* +* Else, we remove it too early, for normal contect OP_AND +* removal needs to be performed as part of the relational include/netlink.h static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) · line 2602
Quoted 10 lines
include/netlink.h +10
-0+* operation because the RHS constant might need to be adjusted +* (shifted). +*/ +if ((ctx->flags &RULE_PP_IN_CONCATENATION ) && + expr->left->etype ==EXPR_PAYLOAD && + expr->right->etype ==EXPR_VALUE ) { +__binop_postprocess (ctx, expr, expr->left, expr->right, exprp); +return ; + } +break ;Not sure this flag is enough. If I load this ruleset
table netdev nt { set macset { typeof vlan id size 1024 flags dynamic,timeout } chain y { }}
add rule netdev nt y update @macset { vlan id timeout 5s }listing still shows the raw expression:
table netdev nt { set macset { typeof vlan id size 1024 flags dynamic,timeout } chain y { update @macset { @ll,112,16 & 0xfff timeout 5s } }
Quoted 3 lines
}
looks like the problem is related to expressions in set statements?
Good catch, I added a patch to the series that also enabled OP_AND removal for the set elem key case.
I took the above and added it to the test case.
Florian Westphal
maintainerPATCH 3/7 proto: track full stack of seen l2 protocols, not just cumulative offset
In reply to Florian WestphalFor input, a cumulative size counter of all pushed l2 headers is enough, because we have the full expression tree available to us.
For delinearization we need to track all seen l2 headers, else we lose information that we might need at a later time.
Consider:
rule netdev nt nc set update ether saddr . vlan id
during delinearization, the vlan proto_desc replaces the ethernet one, and by the time we try to split the concatenation apart we will search the ether saddr offset vs. the templates for proto_vlan.
This replaces the offset with an array that stores the protocol descriptions seen.
Then, if the payload offset is larger than our description, search the l2 stack and adjust the offset until we're within the expected offset boundary.
--- include/proto.h | 3 +- src/evaluate.c | 15 +++++++-- src/netlink_delinearize.c | 5 --- src/payload.c | 67 ++++++++++++++++++++++++++++++++------- src/proto.c | 2 -- 5 files changed, 71 insertions(+), 21 deletions(-)
include/proto.h +2 -1
@@ -193,13 +193,14 @@ struct proto_ctx {struct {struct location location;const struct proto_desc *desc; -unsigned int offset;struct {struct location location;const struct proto_desc *desc; } protos[PROTO_CTX_NUM_PROTOS ];unsigned int num_protos; } protocol[PROTO_BASE_MAX +1 ]; +const struct proto_desc *stacked_ll[PROTO_CTX_NUM_PROTOS ]; +uint8_t stacked_ll_count; }; extern void proto_ctx_init(struct proto_ctx *ctx, unsigned int family,
src/evaluate.c +13 -2
@@ -678,7 +678,13 @@ static int resolve_protocol_conflict(struct eval_ctx *ctx, conflict_resolution_gen_dependency(ctx, link, payload, &nstmt) < 0)return 1 ; - payload->payload.offset += ctx->pctx.protocol[base].offset; +if (base ==PROTO_BASE_LL_HDR ) { +unsigned int i; + +for (i =0 ; i < ctx->pctx.stacked_ll_count; i++) + payload->payload.offset += ctx->pctx.stacked_ll[i]->length; + } +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt);return 0 ;
@@ -727,7 +733,12 @@ static int __expr_evaluate_payload(struct eval_ctx *ctx, struct expr *expr)if (desc == payload->payload.desc) {const struct proto_hdr_template *tmpl; - payload->payload.offset += ctx->pctx.protocol[base].offset; +if (desc->base ==PROTO_BASE_LL_HDR ) { +unsigned int i; + +for (i =0 ; i < ctx->pctx.stacked_ll_count; i++) + payload->payload.offset += ctx->pctx.stacked_ll[i]->length; + } check_icmp:if (desc != &proto_icmp && desc != &proto_icmp6)return 0 ;
src/netlink_delinearize.c +0 -5
@@ -1977,11 +1977,6 @@ static void payload_match_postprocess(struct rule_pp_ctx *ctx, struct expr *expr, struct expr *payload) { - enum proto_bases base = payload->payload.base; - -assert (payload->payload.offset >= ctx->pctx.protocol[base].offset); - payload->payload.offset -= ctx->pctx.protocol[base].offset; -switch (expr->op) {case OP_EQ :case OP_NEQ :
src/payload.c +56 -11
140 lines not on this page · raw message
src/proto.c +0 -2
@@ -160,8 +160,6 @@ static void proto_ctx_debug(const struct proto_ctx *ctx, enum proto_bases base, proto_base_names[i], ctx->protocol[i].desc ? ctx->protocol[i].desc->name : "none"); -if (ctx->protocol[i].offset) -pr_debug (" (offset: %u)" , ctx->protocol[i].offset);if (i == base)pr_debug (" <-" );pr_debug ("\n" );
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 4/7 debug: dump the l2 protocol stack
In reply to Florian WestphalPreviously we used to print the cumulative size of the headers, update this to print the tracked l2 stack.
--- src/proto.c | 6 ++++++ 1 file changed, 6 insertions(+)
src/proto.c +6 -0
@@ -154,6 +154,12 @@ static void proto_ctx_debug(const struct proto_ctx *ctx, enum proto_bases base,if (!(debug_mask &NFT_DEBUG_PROTO_CTX ))return ; +if (base ==PROTO_BASE_LL_HDR && ctx->stacked_ll_count) { +pr_debug (" saved ll headers:" ); +for (i =0 ; i < ctx->stacked_ll_count; i++) +pr_debug (" %s" , ctx->stacked_ll[i]->name); + } +pr_debug ("update %s protocol context:\n" , proto_base_names[base]);for (i =PROTO_BASE_LL_HDR ; i <=PROTO_BASE_MAX ; i++) { pr_debug(" %-20s: %s",
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 5/7 tests: add a test case for ether and vlan listing
In reply to Florian Westphalbefore this patch series, test fails dump validation:
- update @macset { ether saddr . vlan id timeout 5s } counter packets 0 bytes 0
- ether saddr . vlan id @macset
+ update @macset { @ll,48,48 . @ll,112,16 & 0xfff timeout 5s } counter packets 0 bytes 0
+ @ll,48,48 . @ll,112,16 & 0xfff @macset--- tests/shell/testcases/sets/0070stacked_l2_headers | 6 ++++++ .../sets/dumps/0070stacked_l2_headers.nft | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100755 tests/shell/testcases/sets/0070stacked_l2_headers create mode 100644 tests/shell/testcases/sets/dumps/0070stacked_l2_headers.nft
tests/shell/testcases/sets/0070stacked_l2_headers new file +6 -0
@@ -0,0 +1,6 @@ +#!/bin/bash + +set -e +dumpfile=$(dirname $0)/dumps/$(basename $0).nft + +$NFT -f "$dumpfile"
tests/shell/testcases/sets/dumps/0070stacked_l2_headers.nft new file +14 -0
@@ -0,0 +1,14 @@ +table netdev nt { + set macset { + typeof ether saddr . vlan id + size 1024 + flags dynamic,timeout + } + + chain nc { + update @macset { ether saddr . vlan id timeout 5s } counter packets 0 bytes 0 + ether saddr . vlan id @macset + vlan pcp 1 + ether saddr 0a:0b:0c:0d:0e:0f vlan id 42 + } +}
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 6/7 evaluate: search stacked header list for matching payload dep
In reply to Florian Westphal"ether saddr 0:1:2:3:4:6 vlan id 2" works, but reverse fails:
"vlan id 2 ether saddr 0:1:2:3:4:6" will give
Error: conflicting protocols specified: vlan vs. ether
After "proto: track full stack of seen l2 protocols, not just cumulative offset", we have a list of all l2 headers, so search those to see if we had this proto base in the past before rejecting this.
--- src/evaluate.c | 21 +++++++--- tests/py/bridge/vlan.t | 3 ++ tests/py/bridge/vlan.t.json | 56 +++++++++++++++++++++++++++ tests/py/bridge/vlan.t.payload | 16 ++++++++ tests/py/bridge/vlan.t.payload.netdev | 20 ++++++++++ 5 files changed, 110 insertions(+), 6 deletions(-)
src/evaluate.c +15 -6
@@ -659,13 +659,22 @@ static int resolve_protocol_conflict(struct eval_ctx *ctx,struct stmt *nstmt =NULL ;int link, err; -if (payload->payload.base ==PROTO_BASE_LL_HDR && -proto_is_dummy (desc)) { - err =meta_iiftype_gen_dependency (ctx, payload, &nstmt); -if (err <0 ) -return err; +if (payload->payload.base ==PROTO_BASE_LL_HDR ) { +if (proto_is_dummy (desc)) { + err =meta_iiftype_gen_dependency (ctx, payload, &nstmt); +if (err <0 ) +return err; -rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); + }else { +unsigned int i; + +/* payload desc stored in the L2 header stack? No conflict. */ +for (i =0 ; i < ctx->pctx.stacked_ll_count; i++) { +if (ctx->pctx.stacked_ll[i] == payload->payload.desc) +return 0 ; + } + } }assert (base <=PROTO_BASE_MAX );
tests/py/bridge/vlan.t +3 -0
@@ -47,3 +47,6 @@ ether type ip vlan id 1 ip saddr 10.0.0.1;fail # mangling vlan id 1 vlan id set 2;ok + +ether saddr 00:01:02:03:04:05 vlan id 1;ok +vlan id 2 ether saddr 0:1:2:3:4:6;ok;ether saddr 00:01:02:03:04:06 vlan id 2
tests/py/bridge/vlan.t.json +56 -0
59 lines not on this page · raw message
tests/py/bridge/vlan.t.payload +16 -0
@@ -276,3 +276,19 @@ bridge [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00000200 ] [ payload write reg 1 => 2b @ link header + 14 csum_type 0 csum_off 0 csum_flags 0x0 ] + +# ether saddr 00:01:02:03:04:05 vlan id 1 +bridge test-bridge input + [ payload load 8b @ link header + 6 => reg 1 ] + [ cmp eq reg 1 0x03020100 0x00810504 ] + [ payload load 2b @ link header + 14 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] + [ cmp eq reg 1 0x00000100 ] + +# vlan id 2 ether saddr 0:1:2:3:4:6 +bridge test-bridge input + [ payload load 8b @ link header + 6 => reg 1 ] + [ cmp eq reg 1 0x03020100 0x00810604 ] + [ payload load 2b @ link header + 14 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] + [ cmp eq reg 1 0x00000200 ]
tests/py/bridge/vlan.t.payload.netdev +20 -0
@@ -322,3 +322,23 @@ netdev [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00000200 ] [ payload write reg 1 => 2b @ link header + 14 csum_type 0 csum_off 0 csum_flags 0x0 ] + +# vlan id 2 ether saddr 0:1:2:3:4:6 +netdev test-netdev ingress + [ meta load iiftype => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 8b @ link header + 6 => reg 1 ] + [ cmp eq reg 1 0x03020100 0x00810604 ] + [ payload load 2b @ link header + 14 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] + [ cmp eq reg 1 0x00000200 ] + +# ether saddr 00:01:02:03:04:05 vlan id 1 +netdev test-netdev ingress + [ meta load iiftype => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 8b @ link header + 6 => reg 1 ] + [ cmp eq reg 1 0x03020100 0x00810504 ] + [ payload load 2b @ link header + 14 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] + [ cmp eq reg 1 0x00000100 ]
Signature · 1 line
2.35.1
Florian Westphal
maintainerPATCH 7/7 src: allow anon set concatenation with ether and vlan
In reply to Florian Westphalvlan id uses integer type (which has a length of 0).
Using it was possible, but listing would assert:
python: mergesort.c:24: concat_expr_msort_value: Assertion `ilen > 0' failed.
There are two reasons for this.
First reason is that the udata/typeof information lacks the 'vlan id' part, because internally this is 'payload . binop(payload AND mask)'.
binop lacks an udata store. It makes little sense to store it, 'typeof' keyword expects normal match syntax.
So, when storing udata, store the left hand side of the binary operation, i.e. the load of the 2-byte key.
With that resolved, delinerization could work, but concat_elem_expr() would splice 12 bits off the elements value, but it should be 16 (on a byte boundary).
--- src/expression.c | 17 +++++++++-- src/netlink.c | 10 +++++-- tests/py/bridge/vlan.t | 2 ++ tests/py/bridge/vlan.t.json | 41 +++++++++++++++++++++++++++ tests/py/bridge/vlan.t.payload | 12 ++++++++ tests/py/bridge/vlan.t.payload.netdev | 14 +++++++++ 6 files changed, 91 insertions(+), 5 deletions(-)
src/expression.c +15 -2
@@ -879,17 +879,30 @@ static void concat_expr_print(const struct expr *expr, struct output_ctx *octx)#define NFTNL_UDATA_SET_KEY_CONCAT_SUB_DATA 1#define NFTNL_UDATA_SET_KEY_CONCAT_SUB_MAX 2 +static struct expr *expr_build_udata_recurse (struct expr *e) +{ +switch (e->etype) { +case EXPR_BINOP : +return e->left; +default : +break ; + } + +return e; +} +static int concat_expr_build_udata (struct nftnl_udata_buf *udbuf,const struct expr *concat_expr) {struct nftnl_udata *nest; +struct expr *expr, *tmp;unsigned int i =0 ; -struct expr *expr; -list_for_each_entry (expr, &concat_expr->expressions, list) { +list_for_each_entry_safe (expr, tmp, &concat_expr->expressions, list) {struct nftnl_udata *nest_expr;int err; + expr =expr_build_udata_recurse (expr);if (!expr_ops (expr)->build_udata || i >=NFT_REG32_SIZE )return -1 ;
src/netlink.c +7 -3
@@ -1114,17 +1114,21 @@ static struct expr *concat_elem_expr(struct expr *key, struct expr *data, int *off) {const struct datatype *subtype; +unsigned int sub_length;struct expr *expr;if (key) { (*off)--; - expr =constant_expr_splice (data, key->len); + sub_length =round_up (key->len,BITS_PER_BYTE ); + + expr =constant_expr_splice (data, sub_length); expr->dtype =datatype_get (key->dtype); expr->byteorder = key->byteorder; expr->len = key->len; }else { subtype =concat_subtype_lookup (dtype->type, --(*off)); - expr =constant_expr_splice (data, subtype->size); + sub_length =round_up (subtype->size,BITS_PER_BYTE ); + expr =constant_expr_splice (data, sub_length); expr->dtype = subtype; expr->byteorder = subtype->byteorder; }
@@ -1136,7 +1140,7 @@ static struct expr *concat_elem_expr(struct expr *key, expr->dtype->basetype->type == TYPE_BITMASK) expr =bitmask_expr_to_binops (expr); - data->len -=netlink_padding_len (expr->len); + data->len -=netlink_padding_len (sub_length);return expr; }
tests/py/bridge/vlan.t +2 -0
@@ -50,3 +50,5 @@ vlan id 1 vlan id set 2;ok ether saddr 00:01:02:03:04:05 vlan id 1;ok vlan id 2 ether saddr 0:1:2:3:4:6;ok;ether saddr 00:01:02:03:04:06 vlan id 2 + +ether saddr . vlan id { 0a:0b:0c:0d:0e:0f . 42, 0a:0b:0c:0d:0e:0f . 4095 };ok
tests/py/bridge/vlan.t.json +41 -0
44 lines not on this page · raw message
tests/py/bridge/vlan.t.payload +12 -0
@@ -292,3 +292,15 @@ bridge test-bridge input [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000200 ] + +# ether saddr . vlan id { 0a:0b:0c:0d:0e:0f . 42, 0a:0b:0c:0d:0e:0f . 4095 } +__set%d test-bridge 3 size 2 +__set%d test-bridge 0 + element 0d0c0b0a 00000f0e 00002a00 : 0 [end] element 0d0c0b0a 00000f0e 0000ff0f : 0 [end] +bridge test-bridge input + [ payload load 2b @ link header + 12 => reg 1 ] + [ cmp eq reg 1 0x00000081 ] + [ payload load 6b @ link header + 6 => reg 1 ] + [ payload load 2b @ link header + 14 => reg 10 ] + [ bitwise reg 10 = ( reg 10 & 0x0000ff0f ) ^ 0x00000000 ] + [ lookup reg 1 set __set%d ]
tests/py/bridge/vlan.t.payload.netdev +14 -0
@@ -342,3 +342,17 @@ netdev test-netdev ingress [ payload load 2b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000100 ] + +# ether saddr . vlan id { 0a:0b:0c:0d:0e:0f . 42, 0a:0b:0c:0d:0e:0f . 4095 } +__set%d test-netdev 3 size 2 +__set%d test-netdev 0 + element 0d0c0b0a 00000f0e 00002a00 : 0 [end] element 0d0c0b0a 00000f0e 0000ff0f : 0 [end] +netdev test-netdev ingress + [ meta load iiftype => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 2b @ link header + 12 => reg 1 ] + [ cmp eq reg 1 0x00000081 ] + [ payload load 6b @ link header + 6 => reg 1 ] + [ payload load 2b @ link header + 14 => reg 10 ] + [ bitwise reg 10 = ( reg 10 & 0x0000ff0f ) ^ 0x00000000 ] + [ lookup reg 1 set __set%d ]
Signature · 1 line
2.35.1