On Fri, Aug 21, 2020 at 6:50 AM Greg Rose <[email protected]> wrote: > > From: Tonghao Zhang <[email protected]> > > Upstream commit: > commit 0a3e01371db17d753dd92ec4d0fc6247412d3b01 > Author: Tonghao Zhang <[email protected]> > 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 <[email protected]> > Tested-by: Greg Rose <[email protected]> > Acked-by: William Tu <[email protected]> > Acked-by: Pravin B Shelar <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > > Cc: Tonghao Zhang <[email protected]> > Signed-off-by: Greg Rose <[email protected]> Reviewed-by: Tonghao Zhang <[email protected]> > --- > datapath/flow_table.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/datapath/flow_table.c b/datapath/flow_table.c > index 7efaa80..ca2efe9 100644 > --- a/datapath/flow_table.c > +++ b/datapath/flow_table.c > @@ -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); > @@ -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); > -- > 1.8.3.1 >
-- Best regards, Tonghao _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
