| Message ID | 1542799669-21425-1-git-send-email-viacheslavo@mellanox.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Shahaf Shuler |
| Headers | show |
| Series | net/mlx5: fix TPID check for VLAN push action on E-Switch | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/Intel-compilation | success | Compilation OK |
| ci/mellanox-Performance-Testing | success | Performance Testing PASS |
| ci/intel-Performance-Testing | success | Performance Testing PASS |
Wednesday, November 21, 2018 1:28 PM, Viacheslav Ovsiienko: > Subject: [PATCH] net/mlx5: fix TPID check for VLAN push action on E-Switch > > The VLAN push action on E-Switch supports only 802.1Q (0x8100) and > 802.1AD (0x88A8) Tag Protocol ID (TPID) insertions. The parameter check for > RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN action is added. > > Fixes: 57123c00c1b8 ("net/mlx5: add Linux TC flower driver for E-Switch > flow") > > Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com> Applied to next-net-mlx, thanks.
diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index 2f6b7d6..22a866d 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -1887,9 +1887,23 @@ struct pedit_parser { case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: current_action_flag = MLX5_FLOW_ACTION_OF_POP_VLAN; break; - case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: { + rte_be16_t ethertype; + current_action_flag = MLX5_FLOW_ACTION_OF_PUSH_VLAN; + if (!actions->conf) + break; + conf.of_push_vlan = actions->conf; + ethertype = conf.of_push_vlan->ethertype; + if (ethertype != RTE_BE16(ETH_P_8021Q) && + ethertype != RTE_BE16(ETH_P_8021AD)) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, actions, + "vlan push TPID must be " + "802.1Q or 802.1AD"); break; + } case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: if (!(action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN)) return rte_flow_error_set
The VLAN push action on E-Switch supports only 802.1Q (0x8100) and 802.1AD (0x88A8) Tag Protocol ID (TPID) insertions. The parameter check for RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN action is added. Fixes: 57123c00c1b8 ("net/mlx5: add Linux TC flower driver for E-Switch flow") Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com> --- drivers/net/mlx5/mlx5_flow_tcf.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)