netfilter: nft_set_pipapo: remove scratch_aligned pointer

Browse source

[ Upstream commit 5a8cdf6fd8 ]

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: 7400b06396 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Florian Westphal 2024-02-08 10:31:29 +01:00 • committed by Greg Kroah-Hartman

parent 14429a716d

commit f125d00e61

3 changed files with 10 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

41

net/netfilter/nft_set_pipapo.c

View file

6

net/netfilter/nft_set_pipapo.h

View file

2

net/netfilter/nft_set_pipapo_avx2.c

View file