netfilter: nft_set_pipapo: Don't abuse unlikely() in pipapo_refill()
authorStefano Brivio <sbrivio@redhat.com>
Fri, 14 Feb 2020 17:14:14 +0000 (18:14 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 18 Feb 2020 21:07:09 +0000 (22:07 +0100)
commit9a7712048f9d43da5022e75eca3d6b81080e76d3
tree81a504947b2cf86d20f53c370422d2d1b94f9d62
parentbd97ad51a7eb1b02049deca56bc26d96cabbac8a
netfilter: nft_set_pipapo: Don't abuse unlikely() in pipapo_refill()

I originally used unlikely() in the if (match_only) clause, which
we hit on the mapping table for the last field in a set, to ensure
we avoid branching to the rest of for loop body, which is executed
more frequently.

However, Pablo reports, this is confusing as it gives the impression
that this is not a common case, and it's actually not the intended
usage of unlikely().

I couldn't observe any statistical difference in matching rates on
x864_64 and aarch64 without it, so just drop it.

Reported-by: Pablo Neira Ayuso <pablo@netfilter.org>
Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_set_pipapo.c