On 2019-06-19 12:16 PM, Ilya Maximets wrote:
> 'mask' must be checked first before configuring key in flower.
>
> CC: Eli Britstein <el...@mellanox.com>
> Fixes: 0b0a84783cd6 ("netdev-tc-offloads: Support match on priority tags")
> Signed-off-by: Ilya Maximets <i.maxim...@samsung.com>
> ---
> lib/netdev-offload-tc.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
> index 902ec9543..4cc044b4b 100644
> --- a/lib/netdev-offload-tc.c
> +++ b/lib/netdev-offload-tc.c
> @@ -1146,9 +1146,11 @@ netdev_tc_flow_put(struct netdev *netdev, struct match
> *match,
> }
> mask->mpls_lse[0] = 0;
>
> - if (eth_type_vlan(key->vlans[0].tpid)) {
> + if (mask->vlans[0].tpid && eth_type_vlan(key->vlans[0].tpid)) {
> flower.key.encap_eth_type[0] = flower.key.eth_type;
> + flower.mask.encap_eth_type[0] = flower.mask.eth_type;
> flower.key.eth_type = key->vlans[0].tpid;
> + flower.mask.eth_type = mask->vlans[0].tpid;
> }
> if (mask->vlans[0].tci) {
> ovs_be16 vid_mask = mask->vlans[0].tci & htons(VLAN_VID_MASK);
> @@ -1179,9 +1181,11 @@ netdev_tc_flow_put(struct netdev *netdev, struct match
> *match,
> }
> }
>
> - if (eth_type_vlan(key->vlans[1].tpid)) {
> + if (mask->vlans[1].tpid && eth_type_vlan(key->vlans[1].tpid)) {
> flower.key.encap_eth_type[1] = flower.key.encap_eth_type[0];
> + flower.mask.encap_eth_type[1] = flower.mask.encap_eth_type[0];
> flower.key.encap_eth_type[0] = key->vlans[1].tpid;
> + flower.mask.encap_eth_type[0] = mask->vlans[1].tpid;
> }
> if (mask->vlans[1].tci) {
> ovs_be16 vid_mask = mask->vlans[1].tci & htons(VLAN_VID_MASK);
>
Acked-by: Roi Dayan <r...@mellanox.com>
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev