Skip to content

net/sched: act_vlan: Fix modify to allow 0

Boris Sukholitko linux-kselftest netdev 4 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (refs/heads/master):

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest3 patches 1 replyApplied 3/3
  2. v33 patches 5 repliesSuperseded
  3. v23 patches 4 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v11 patch5 repliesSuperseded

Changes in v4 from the cover letter

- revert tcf_vlan_get_fill_size change: total size calculation may race vs dump

Patches in v4 All 3 applied

#Subject and filesSizeRepliesApplied
1/3net/sched: act_vlan: Fix modify to allow 0include/net/tc_act/tc_vlan.h net/sched/act_vlan.c+6 -20 repliesApplied
2/3net/sched: act_vlan: No dump for unset prioritynet/sched/act_vlan.c tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json+4 -40 repliesApplied
3/3net/sched: act_vlan: Test priority 0 modificationtools/testing/selftests/tc-testing/tc-tests/actions/vlan.json+24 -00 repliesApplied

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDavide Caratti
SeriesR-b
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH net-next v4 0/3] net/sched: act_vlan: Fix modify to allow 0

Currently vlan modification action checks existence of vlan priority by comparing it to 0. Therefore it is impossible to modify existing vlan tag to have priority 0.

For example, the following tc command will change the vlan id but will not affect vlan priority:

tc filter add dev eth1 ingress matchall action vlan modify id 300 \
priority 0 pipe mirred egress redirect dev eth2

The incoming packet on eth1:

ethertype 802.1Q (0x8100), vlan 200, p 4, ethertype IPv4

will be changed to:

ethertype 802.1Q (0x8100), vlan 300, p 4, ethertype IPv4

although the user has intended to have p == 0.

The fix is to add tcfv_push_prio_exists flag to struct tcf_vlan_params and rely on it when deciding to set the priority.

The same flag is used to avoid dumping unset vlan priority.

Change Log:
v3 -> v4:
- revert tcf_vlan_get_fill_size change: total size calculation may race vs dump

v2 -> v3:
- Push assumes that the priority is being set
- tcf_vlan_get_fill_size accounts for priority existence

v1 -> v2:
- Do not dump unset priority and fix tests accordingly
- Test for priority 0 modification

Boris Sukholitko (3):
net/sched: act_vlan: Fix modify to allow 0 net/sched: act_vlan: No dump for unset priority net/sched: act_vlan: Test priority 0 modification

 include/net/tc_act/tc_vlan.h                  |  1 +
 net/sched/act_vlan.c                          | 11 +++++---
 .../tc-testing/tc-tests/actions/vlan.json     | 28 +++++++++++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)
Signature · 1 line
2.29.3