On 10/12/2015 14:47, "Jarno Rajahalme" <ja...@ovn.org> wrote:
>
>> On Dec 9, 2015, at 6:27 PM, Daniele Di Proietto
>><diproiet...@vmware.com> wrote:
>>
>> We should match on the transport ports only if the tunnel has a UDP
>> header. It doesn't make sense to match on transport port for GRE
>> tunnels.
>>
>> Also, to match on fragment bits we should use FLOW_NW_FRAG_MASK instead
>> of 0xFF. FLOW_NW_FRAG_MASK is what we get if we convert to the ODP
>> netlink format and back.
>>
>> Adding the correct masks in the tunnel router classifier helps in making
>> sure that the translation generates a masks that respects prerequisites.
>
>delete the extra ³a².
Oops...
>
>>
>> If the mask has some fields that do not respect prerequisites, the flow
>> will get deleted by revalidation, because translating to ODP format and
>> back will generate a more generic mask, which will be perceived as too
>> generic (compared with the one generated by the translation).
>>
>
>Good catch!
>
>Maybe add a comment that Œup_port¹ is zero for non-UDP tunneling
>protocols, just to make the conditional a bit clearer?
I added
/* 'udp_port' is zero for non-UDP tunnels (e.g. GRE). In this case it
* doesn't make sense to match on UDP port numbers. */
and pushed to master and branch-2.5. Thanks
>
>Acked-by: Jarno Rajahalme <ja...@ovn.org>
>
>> Signed-off-by: Daniele Di Proietto <diproiet...@vmware.com>
>> ---
>> lib/tnl-ports.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c
>> index 3006a8b..890a8b2 100644
>> --- a/lib/tnl-ports.c
>> +++ b/lib/tnl-ports.c
>> @@ -126,8 +126,10 @@ map_insert(odp_port_t port, struct eth_addr mac,
>>struct in6_addr *addr,
>>
>> match.wc.masks.dl_type = OVS_BE16_MAX;
>> match.wc.masks.nw_proto = 0xff;
>> - match.wc.masks.nw_frag = 0xff; /* XXX: No fragments
>>support. */
>> - match.wc.masks.tp_dst = OVS_BE16_MAX;
>> + match.wc.masks.nw_frag = FLOW_NW_FRAG_MASK; /* XXX: No
>>fragments support. */
>> + if (udp_port) {
>> + match.wc.masks.tp_dst = OVS_BE16_MAX;
>> + }
>> if (IN6_IS_ADDR_V4MAPPED(addr)) {
>> match.wc.masks.nw_dst = OVS_BE32_MAX;
>> } else {
>> --
>> 2.1.4
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>>
>>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailm
>>an_listinfo_dev&d=BQIFaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=
>>SmB5nZacmXNq0gKCC1s_Cw5yUNjxgD4v5kJqZ2uWLlE&m=rZht4LWp6boMHNQQ4V-ubJUOJ_k
>>p0tj7BV18EuqEf10&s=QW4iDBUEHEtVqlgSsj6C5PqXolJp_gt4OI201kC1BuE&e=
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
