Skip to content

Commit

Permalink
datapath: add likely in flow_lookup
Browse files Browse the repository at this point in the history
Upstream commit:
    commit 0a3e01371db17d753dd92ec4d0fc6247412d3b01
    Author: Tonghao Zhang <xiangxia.m.yue@gmail.com>
    Date:   Fri Nov 1 22:23:51 2019 +0800

    net: openvswitch: add likely in flow_lookup

    The most case *index < ma->max, and flow-mask is not NULL.
    We add un/likely for performance.

    Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
    Tested-by: Greg Rose <gvrose8192@gmail.com>
    Acked-by: William Tu <u9012063@gmail.com>
    Acked-by: Pravin B Shelar <pshelar@ovn.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Reviewed-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
  • Loading branch information
xpu22 authored and igsilya committed Oct 17, 2020
1 parent cdc58fe commit e546631
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions datapath/flow_table.c
Expand Up @@ -541,7 +541,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
struct sw_flow_mask *mask;
int i;

if (*index < ma->max) {
if (likely(*index < ma->max)) {
mask = rcu_dereference_ovsl(ma->masks[*index]);
if (mask) {
flow = masked_flow_lookup(ti, key, mask, n_mask_hit);
Expand All @@ -556,7 +556,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
continue;

mask = rcu_dereference_ovsl(ma->masks[i]);
if (!mask)
if (unlikely(!mask))
break;

flow = masked_flow_lookup(ti, key, mask, n_mask_hit);
Expand Down

0 comments on commit e546631

Please sign in to comment.