[PATCH net-next v2 2/3] net/sched: act_vlan: No dump for unset priority
From: Boris Sukholitko <hidden>
Date: 2021-05-25 15:38:12
Subsystem:
kernel selftest framework, networking [general], tc subsystem, the rest · Maintainers:
Shuah Khan, Shuah Khan, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
Dump vlan priority only if it has been previously set. Fix the tests accordingly. Signed-off-by: Boris Sukholitko <redacted> --- net/sched/act_vlan.c | 4 ++-- .../tc-testing/tc-tests/actions/vlan.json | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index cca10b5e99c9..6765096b99b3 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c@@ -307,8 +307,8 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a, (nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, p->tcfv_push_vid) || nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL, p->tcfv_push_proto) || - (nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY, - p->tcfv_push_prio)))) + (p->tcfv_push_prio_exists && + nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY, p->tcfv_push_prio)))) goto nla_put_failure; if (p->tcfv_action == TCA_VLAN_ACT_PUSH_ETH) {
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
index 41d783254b08..4675f1c04d17 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json@@ -297,7 +297,7 @@ "cmdUnderTest": "$TC actions add action vlan push id 123 index 18", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 18", - "matchPattern": "action order [0-9]+: vlan.*push id 123 protocol 802.1Q priority 0 pipe.*index 18 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 123 protocol 802.1Q pipe.*index 18 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -345,7 +345,7 @@ "cmdUnderTest": "$TC actions add action vlan push id 1024 protocol 802.1AD pass index 10000", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 10000", - "matchPattern": "action order [0-9]+: vlan.*push id 1024 protocol 802.1ad priority 0 pass.*index 10000 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 1024 protocol 802.1ad pass.*index 10000 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -369,7 +369,7 @@ "cmdUnderTest": "$TC actions add action vlan push id 4094 index 1", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 1", - "matchPattern": "action order [0-9]+: vlan.*push id 4094.*protocol 802.1Q.*priority 0.*index 1 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 4094.*protocol 802.1Q.*index 1 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -463,7 +463,7 @@ "cmdUnderTest": "$TC actions add action vlan modify protocol 802.1Q id 5 index 100", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 100", - "matchPattern": "action order [0-9]+: vlan.*modify id 100 protocol 802.1Q priority 0 pipe.*index 100 ref", + "matchPattern": "action order [0-9]+: vlan.*modify id 100 protocol 802.1Q pipe.*index 100 ref", "matchCount": "0", "teardown": [ "$TC actions flush action vlan"
@@ -487,7 +487,7 @@ "cmdUnderTest": "$TC actions add action vlan modify protocol 802.1ad id 500 reclassify index 12", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 12", - "matchPattern": "action order [0-9]+: vlan.*modify id 500 protocol 802.1ad priority 0 reclassify.*index 12 ref", + "matchPattern": "action order [0-9]+: vlan.*modify id 500 protocol 802.1ad reclassify.*index 12 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -512,7 +512,7 @@ "cmdUnderTest": "$TC actions replace action vlan push id 700 pipe index 12", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 12", - "matchPattern": "action order [0-9]+: vlan.*push id 700 protocol 802.1Q priority 0 pipe.*index 12 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 700 protocol 802.1Q pipe.*index 12 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -537,7 +537,7 @@ "cmdUnderTest": "$TC actions replace action vlan push id 1 protocol 802.1ad pipe index 1", "expExitCode": "0", "verifyCmd": "$TC actions get action vlan index 1", - "matchPattern": "action order [0-9]+: vlan.*push id 1 protocol 802.1ad priority 0 pipe.*index 1 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 1 protocol 802.1ad pipe.*index 1 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
@@ -635,7 +635,7 @@ "cmdUnderTest": "$TC actions del action vlan index 999", "expExitCode": "0", "verifyCmd": "$TC actions list action vlan", - "matchPattern": "action order [0-9]+: vlan.*push id 4094 protocol 802.1Q priority 0 pipe.*index 999 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 4094 protocol 802.1Q pipe.*index 999 ref", "matchCount": "0", "teardown": [] },
@@ -708,7 +708,7 @@ "cmdUnderTest": "$TC actions replace action vlan push id 500 goto chain 42 index 90 cookie c1a0c1a0", "expExitCode": "255", "verifyCmd": "$TC actions get action vlan index 90", - "matchPattern": "action order [0-9]+: vlan.*push id 500 protocol 802.1Q priority 0 pass.*index 90 ref", + "matchPattern": "action order [0-9]+: vlan.*push id 500 protocol 802.1Q pass.*index 90 ref", "matchCount": "1", "teardown": [ "$TC actions flush action vlan"
--
2.29.3
Attachments
- smime.p7s [application/pkcs7-signature] 4221 bytes