| Message ID | 20210530114052.16483-1-boris.sukholitko@broadcom.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | net/sched: act_vlan: Fix modify to allow 0 | expand |
On Sun, May 30, 2021 at 02:40:49PM +0300, Boris Sukholitko wrote: > 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. hello Boris, thanks for following up! > Change Log: > v2 -> v3: > - Push assumes that the priority is being set > - tcf_vlan_get_fill_size accounts for priority existence Reviewed-by: Davide Caratti <dcaratti@redhat.com>
On 2021-05-31 7:57 a.m., Davide Caratti wrote: > On Sun, May 30, 2021 at 02:40:49PM +0300, Boris Sukholitko wrote: >> 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. > > hello Boris, thanks for following up! > >> Change Log: >> v2 -> v3: >> - Push assumes that the priority is being set >> - tcf_vlan_get_fill_size accounts for priority existence > > Reviewed-by: Davide Caratti <dcaratti@redhat.com> > Looks good to me as well. And thanks for adding the tests! Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal
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: 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 | 26 ++++++++++++----- .../tc-testing/tc-tests/actions/vlan.json | 28 +++++++++++++++++-- 3 files changed, 46 insertions(+), 9 deletions(-)