evalute: make vlan pcp updates work
Florian Westphal
maintainerPATCH 1/1 evalute: make vlan pcp updates work
On kernel side, nft_payload_set_vlan() requires a 2 or 4 byte write to the vlan header.
As-is, nft emits a 1 byte write:
[ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000001f ) ^ 0x00000020 ]
... which the kernel doesn't support. Expand all vlan header updates to a 2 or 4 byte write and update the existing vlan id test case.
--- src/evaluate.c | 42 +++++++++++++++++-- .../shell/testcases/packetpath/vlan_mangling | 2 + 2 files changed, 40 insertions(+), 4 deletions(-)
src/evaluate.c +38 -4
@@ -3258,6 +3258,40 @@ static bool stmt_evaluate_payload_need_csum(const struct expr *payload)return desc && desc->checksum_key; } +static bool stmt_evaluate_is_vlan (const struct expr *payload) +{ +return payload->payload.base ==PROTO_BASE_LL_HDR && + payload->payload.desc == &proto_vlan; +} + +/** stmt_evaluate_payload_need_aligned_fetch +* +* @payload: payload expression to check +* +* Some types of stores need to round up to an even sized byte length, +* typically 1 -> 2 or 3 -> 4 bytes. +* +* This includes anything that needs inet checksum fixups and also writes +* to the vlan header. This is because of VLAN header removal in the +* kernel: nftables kernel side provides illusion of a linear packet, i.e. +* ethernet_header|vlan_header|network_header. +* +* When a write to the vlan header is performed, kernel side updates the +* pseudoheader, but only accepts 2 or 4 byte writes to vlan proto/TCI. +* +* Return true if load needs to be expanded to cover even amount of bytes +*/ +static bool stmt_evaluate_payload_need_aligned_fetch (const struct expr *payload) +{ +if (stmt_evaluate_payload_need_csum (payload)) +return true; + +if (stmt_evaluate_is_vlan (payload)) +return true; + +return false; +} +static int stmt_evaluate_exthdr (struct eval_ctx *ctx,struct stmt *stmt) {struct expr *exthdr;
@@ -3287,7 +3321,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)unsigned int masklen, extra_len =0 ;struct expr *payload;mpz_t bitmask, ff; -bool need_csum; +bool aligned_fetch;if (stmt->payload.expr->payload.inner_desc) { return expr_error(ctx->msgs, stmt->payload.expr,
@@ -3310,7 +3344,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)if (stmt->payload.val->etype ==EXPR_RANGE )return stmt_error_range (ctx, stmt, stmt->payload.val); - need_csum =stmt_evaluate_payload_need_csum (payload); + aligned_fetch =stmt_evaluate_payload_need_aligned_fetch (payload);if (!payload_needs_adjustment (payload)) {
@@ -3318,7 +3352,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)* update checksum and the length is not even because * kernel checksum functions cannot deal with odd lengths. */ -if (!need_csum || ((payload->len /BITS_PER_BYTE ) &1 ) ==0 ) +if (!aligned_fetch || ((payload->len /BITS_PER_BYTE ) &1 ) ==0 )return 0 ; }
@@ -3334,7 +3368,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)"uneven load cannot span more than %u bytes, got %u" , sizeof(data), payload_byte_size); -if (need_csum && payload_byte_size &1 ) { +if (aligned_fetch && payload_byte_size &1 ) { payload_byte_size++;if (payload_byte_offset &1 ) {/* prefer 16bit aligned fetch */
tests/shell/testcases/packetpath/vlan_mangling +2 -0
@@ -48,12 +48,14 @@ table netdev t { chain in { type filter hook ingress device veth0 priority filter; + vlan pcp 0 counter ether saddr da:d3:00:01:02:03 vlan id 123 jump in_update_vlan } chain out_update_vlan { vlan type arp vlan id set 123 counter ip daddr 10.1.1.1 icmp type echo-reply vlan id set 123 counter + vlan pcp set 6 counter } chain out {
Signature · 1 line
2.49.0
Quoted 7 lines · Florian Westphal
On kernel side,
nft_payload_set_vlan()requires a 2 or 4 byte write to the vlan header.As-is, nft emits a 1 byte write:
[ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 &0x0000001f) ^0x00000020]
Quoted 5 lines
... which the kernel doesn't support. Expand all vlan header updates to a 2 or 4 byte write and update the existing vlan id test case.
Reported-by Kevin Vigouroux <[email protected]>Signed-off-by Florian Westphal <[email protected]>
Thanks
Quoted 109 lines
--- src/evaluate.c | 42 +++++++++++++++++-- .../shell/testcases/packetpath/vlan_mangling | 2 + 2 files changed, 40 insertions(+), 4 deletions(-)src/evaluate.c +38
-4@@ -3258,6 +3258,40 @@ static bool stmt_evaluate_payload_need_csum(const struct expr *payload)return desc && desc->checksum_key; } +static bool stmt_evaluate_is_vlan (const struct expr *payload) +{ +return payload->payload.base ==PROTO_BASE_LL_HDR && + payload->payload.desc == &proto_vlan; +} + +/** stmt_evaluate_payload_need_aligned_fetch +* +* @payload: payload expression to check +* +* Some types of stores need to round up to an even sized byte length, +* typically 1 -> 2 or 3 -> 4 bytes. +* +* This includes anything that needs inet checksum fixups and also writes +* to the vlan header. This is because of VLAN header removal in the +* kernel: nftables kernel side provides illusion of a linear packet, i.e. +* ethernet_header|vlan_header|network_header. +* +* When a write to the vlan header is performed, kernel side updates the +* pseudoheader, but only accepts 2 or 4 byte writes to vlan proto/TCI. +* +* Return true if load needs to be expanded to cover even amount of bytes +*/ +static bool stmt_evaluate_payload_need_aligned_fetch (const struct expr *payload) +{ +if (stmt_evaluate_payload_need_csum (payload)) +return true; + +if (stmt_evaluate_is_vlan (payload)) +return true; + +return false; +} +static int stmt_evaluate_exthdr (struct eval_ctx *ctx,struct stmt *stmt) {struct expr *exthdr;@@ -3287,7 +3321,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)unsigned int masklen, extra_len =0 ;struct expr *payload;mpz_t bitmask, ff; -bool need_csum; +bool aligned_fetch;if (stmt->payload.expr->payload.inner_desc) { return expr_error(ctx->msgs, stmt->payload.expr,@@ -3310,7 +3344,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)if (stmt->payload.val->etype ==EXPR_RANGE )return stmt_error_range (ctx, stmt, stmt->payload.val); - need_csum =stmt_evaluate_payload_need_csum (payload); + aligned_fetch =stmt_evaluate_payload_need_aligned_fetch (payload);if (!payload_needs_adjustment (payload)) {@@ -3318,7 +3352,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)* update checksum and the length is not even because * kernel checksum functions cannot deal with odd lengths. */ -if (!need_csum || ((payload->len /BITS_PER_BYTE ) &1 ) ==0 ) +if (!aligned_fetch || ((payload->len /BITS_PER_BYTE ) &1 ) ==0 )return 0 ; }@@ -3334,7 +3368,7 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)"uneven load cannot span more than %u bytes, got %u" , sizeof(data), payload_byte_size); -if (need_csum && payload_byte_size &1 ) { +if (aligned_fetch && payload_byte_size &1 ) { payload_byte_size++;if (payload_byte_offset &1 ) {/* prefer 16bit aligned fetch */ tests/shell/testcases/packetpath/vlan_mangling +2
-0@@ -48,12 +48,14 @@ table netdev t { chain in { type filter hook ingress device veth0 priority filter; + vlan pcp 0 counter ether saddr da:d3:00:01:02:03 vlan id 123 jump in_update_vlan } chain out_update_vlan { vlan type arp vlan id set 123 counter ip daddr 10.1.1.1 icmp type echo-reply vlan id set 123 counter + vlan pcp set 6 counter } chain out {Signature · 1 line
2.49.0