]> git.itanic.dy.fi Git - linux-stable/commit
netfilter: nft_set_pipapo: remove scratch_aligned pointer
authorFlorian Westphal <fw@strlen.de>
Thu, 8 Feb 2024 09:31:29 +0000 (10:31 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 8 Feb 2024 11:24:02 +0000 (12:24 +0100)
commit5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4
treef6300ea55eb89b9ae57553e9c2e976b75e275eb4
parent47b1c03c3c1a119435480a1e73f27197dc59131d
netfilter: nft_set_pipapo: remove scratch_aligned pointer

use ->scratch for both avx2 and the generic implementation.

After previous change the scratch->map member is always aligned properly
for AVX2, so we can just use scratch->map in AVX2 too.

The alignoff delta is stored in the scratchpad so we can reconstruct
the correct address to free the area again.

Fixes: 7400b063969b ("nft_set_pipapo: Introduce AVX2-based lookup implementation")
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_set_pipapo.c
net/netfilter/nft_set_pipapo.h
net/netfilter/nft_set_pipapo_avx2.c