netfilter: nft_set_pipapo: remove redundant test for avx feature bit

Sebastian points out that avx2 depends on avx, see check_cpufeature_deps()
in arch/x86/kernel/cpu/cpuid-deps.c:
avx2 feature bit will be cleared when avx isn't available.

No functional change intended.

Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index b385cfcf886f9812bc0cdde09cc031be124ef4dc..4b64c3bd8e70e2d3ffeefaa90eea55e29af30bcb 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -530,8 +530,7 @@ static struct nft_pipapo_elem *pipapo_get(const struct nft_pipapo_match *m,
        local_bh_disable();
 
 #if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
-       if (boot_cpu_has(X86_FEATURE_AVX2) && boot_cpu_has(X86_FEATURE_AVX) &&
-           irq_fpu_usable()) {
+       if (boot_cpu_has(X86_FEATURE_AVX2) && irq_fpu_usable()) {
                e = pipapo_get_avx2(m, data, genmask, tstamp);
                local_bh_enable();
                return e;

diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c
index 29326f3fcaf3f746101df330b6a07ebb0368f3c5..7559306d0aeddc2599c311bdc3ba687da4e8e4ca 100644 (file)
--- a/net/netfilter/nft_set_pipapo_avx2.c
+++ b/net/netfilter/nft_set_pipapo_avx2.c
@@ -1099,7 +1099,7 @@ bool nft_pipapo_avx2_estimate(const struct nft_set_desc *desc, u32 features,
            desc->field_count < NFT_PIPAPO_MIN_FIELDS)
                return false;
 
-       if (!boot_cpu_has(X86_FEATURE_AVX2) || !boot_cpu_has(X86_FEATURE_AVX))
+       if (!boot_cpu_has(X86_FEATURE_AVX2))
                return false;
 
        est->size = pipapo_estimate_size(desc);