Commit 0f750966 authored by Ariel Levkovich's avatar Ariel Levkovich Committed by Doug Ledford

IB/mlx5: Add inner spec and IPv6 validation in user's flow attribute list

This change fixes an incomplete validation of the user's
flow attributes list.

Previous implementation validated only matching of IPv4 Ethertype
to IPv4 spec of outer headers (in case both Ethernet with specified
Ethertype and IP specs were present) and lacked the validation of:
1. Matching of IPv6 Ethertype in Ethernet spec (if such exists) to an
   IPv6 protocol spec (if such exists).
2. Validation of Ethertype to IP protocol matching on inner headers specs.
Which could cause some combinations of unmatching Ethernet and IP
protocols to pass validation and apply on the device.

The fix adds validation of IPv6 Ethertype and IP spec as well as
performing the scan on both outer and inner attributes.

Fixes: 038d2ef8 ("Add flow steering support")
Signed-off-by: default avatarAriel Levkovich <lariel@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 44f2e99e
...@@ -1968,26 +1968,50 @@ static bool flow_is_multicast_only(struct ib_flow_attr *ib_attr) ...@@ -1968,26 +1968,50 @@ static bool flow_is_multicast_only(struct ib_flow_attr *ib_attr)
is_multicast_ether_addr(eth_spec->val.dst_mac); is_multicast_ether_addr(eth_spec->val.dst_mac);
} }
static bool is_valid_attr(const struct ib_flow_attr *flow_attr) static bool is_valid_ethertype(const struct ib_flow_attr *flow_attr,
bool check_inner)
{ {
union ib_flow_spec *ib_spec = (union ib_flow_spec *)(flow_attr + 1); union ib_flow_spec *ib_spec = (union ib_flow_spec *)(flow_attr + 1);
bool has_ipv4_spec = false; int inner_bit = check_inner ? IB_FLOW_SPEC_INNER : 0;
bool eth_type_ipv4 = true; bool ipv4_spec_valid, ipv6_spec_valid;
unsigned int ip_spec_type = 0;
bool has_ethertype = false;
unsigned int spec_index; unsigned int spec_index;
bool mask_valid = true;
u16 eth_type = 0;
bool type_valid;
/* Validate that ethertype is correct */ /* Validate that ethertype is correct */
for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) { for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) {
if (ib_spec->type == IB_FLOW_SPEC_ETH && if ((ib_spec->type == (IB_FLOW_SPEC_ETH | inner_bit)) &&
ib_spec->eth.mask.ether_type) { ib_spec->eth.mask.ether_type) {
if (!((ib_spec->eth.mask.ether_type == htons(0xffff)) && mask_valid = (ib_spec->eth.mask.ether_type ==
ib_spec->eth.val.ether_type == htons(ETH_P_IP))) htons(0xffff));
eth_type_ipv4 = false; has_ethertype = true;
} else if (ib_spec->type == IB_FLOW_SPEC_IPV4) { eth_type = ntohs(ib_spec->eth.val.ether_type);
has_ipv4_spec = true; } else if ((ib_spec->type == (IB_FLOW_SPEC_IPV4 | inner_bit)) ||
(ib_spec->type == (IB_FLOW_SPEC_IPV6 | inner_bit))) {
ip_spec_type = ib_spec->type;
} }
ib_spec = (void *)ib_spec + ib_spec->size; ib_spec = (void *)ib_spec + ib_spec->size;
} }
return !has_ipv4_spec || eth_type_ipv4;
type_valid = (!has_ethertype) || (!ip_spec_type);
if (!type_valid && mask_valid) {
ipv4_spec_valid = (eth_type == ETH_P_IP) &&
(ip_spec_type == (IB_FLOW_SPEC_IPV4 | inner_bit));
ipv6_spec_valid = (eth_type == ETH_P_IPV6) &&
(ip_spec_type == (IB_FLOW_SPEC_IPV6 | inner_bit));
type_valid = ipv4_spec_valid || ipv6_spec_valid;
}
return type_valid;
}
static bool is_valid_attr(const struct ib_flow_attr *flow_attr)
{
return is_valid_ethertype(flow_attr, false) &&
is_valid_ethertype(flow_attr, true);
} }
static void put_flow_table(struct mlx5_ib_dev *dev, static void put_flow_table(struct mlx5_ib_dev *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment