diff options
| author | Florian Westphal <fw@strlen.de> | 2024-02-08 10:31:29 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2024-02-08 12:24:02 +0100 |
| commit | 5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4 (patch) | |
| tree | f6300ea55eb89b9ae57553e9c2e976b75e275eb4 /net/netfilter/nft_set_pipapo_avx2.c | |
| parent | 47b1c03c3c1a119435480a1e73f27197dc59131d (diff) | |
| download | linux-5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4.tar.gz linux-5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4.tar.bz2 linux-5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4.zip | |
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>
Diffstat (limited to 'net/netfilter/nft_set_pipapo_avx2.c')
| -rw-r--r-- | net/netfilter/nft_set_pipapo_avx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c index 78213c73af2e..90e275bb3e5d 100644 --- a/net/netfilter/nft_set_pipapo_avx2.c +++ b/net/netfilter/nft_set_pipapo_avx2.c @@ -1139,7 +1139,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, */ kernel_fpu_begin_mask(0); - scratch = *raw_cpu_ptr(m->scratch_aligned); + scratch = *raw_cpu_ptr(m->scratch); if (unlikely(!scratch)) { kernel_fpu_end(); return false; |