[Devel] [PATCH RHEL9 COMMIT] ms/nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-4.vz9.10.32
------>
commit 5852998a636fcb2ba0d17d643a65e3ccbec62c7e
Author: Stefano Brivio <sbrivio at redhat.com>
Date:   Mon Dec 6 19:43:39 2021 +0300

    ms/nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups
    
    The sixth byte of packet data has to be looked up in the sixth group,
    not in the seventh one, even if we load the bucket data into ymm6
    (and not ymm5, for convenience of tracking stalls).
    
    Without this fix, matching on a MAC address as first field of a set,
    if 8-bit groups are selected (due to a small set size) would fail,
    that is, the given MAC address would never match.
    
    Reported-by: Nikita Yushchenko <nikita.yushchenko at virtuozzo.com>
    Cc: <stable at vger.kernel.org> # 5.6.x
    Fixes: 7400b063969b ("nft_set_pipapo: Introduce AVX2-based lookup implementation")
    Signed-off-by: Stefano Brivio <sbrivio at redhat.com>
    
    https://jira.sw.ru/browse/PSBM-135664
    Signed-off-by: Nikita Yushchenko <nikita.yushchenko at virtuozzo.com>
---
 net/netfilter/nft_set_pipapo_avx2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c
index e517663e0cd1..6f4116e72958 100644
--- a/net/netfilter/nft_set_pipapo_avx2.c
+++ b/net/netfilter/nft_set_pipapo_avx2.c
@@ -886,7 +886,7 @@ static int nft_pipapo_avx2_lookup_8b_6(unsigned long *map, unsigned long *fill,
 			NFT_PIPAPO_AVX2_BUCKET_LOAD8(4,  lt, 4, pkt[4], bsize);
 
 			NFT_PIPAPO_AVX2_AND(5, 0, 1);
-			NFT_PIPAPO_AVX2_BUCKET_LOAD8(6,  lt, 6, pkt[5], bsize);
+			NFT_PIPAPO_AVX2_BUCKET_LOAD8(6,  lt, 5, pkt[5], bsize);
 			NFT_PIPAPO_AVX2_AND(7, 2, 3);
 
 			/* Stall */