[PATCH net 3/7] nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups

STALE1770d SUPERSEDED: 1 (0M)

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: 2021-12-09 00:09:03
Also in: netfilter-devel
Subsystem: netfilter, networking [general], the rest · Maintainers: Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 227 in this series; 1 review trailer.

Revisions (227)

2013-04-12 v1
2013-06-17 v1
2013-09-17 v1
2013-10-23 v1
2013-11-21 v1
2013-12-07 v1
2014-02-19 v1
2014-04-05 v1
2014-04-14 v1
2014-05-09 v1
2014-06-18 v1
2014-08-11 v1
2014-10-20 v1
2014-10-27 v1
2015-03-22 v1
2015-05-16 v1
2015-05-22 v1
2015-07-08 v1
2015-08-10 v1
2015-09-03 v1
2015-09-18 v1
2015-10-19 v1
2015-11-04 v1
2015-11-11 v1
2015-12-14 v1
2016-01-20 v1
2016-02-16 v1
2016-03-28 v1
2016-04-13 v1
2016-05-09 v1
2016-06-01 v1
2016-06-17 v1
2016-08-10 v1
2016-08-10 v1
2016-08-18 v1
2016-08-30 v1
2016-09-13 v1
2016-10-21 v1
2016-11-10 v1
2016-11-30 v1
2017-01-05 v1
2017-01-26 v1
2017-02-23 v1
2017-02-27 v1
2017-03-03 v1
2017-03-15 v1
2017-03-29 v1
2017-04-14 v1
2017-05-29 v1
2017-07-18 v1
2017-08-24 v1
2017-12-13 v1
2018-01-05 v1
2018-02-01 v1
2018-02-07 v1
2018-02-20 v1
2018-03-12 v1
2018-03-24 v1
2018-06-13 v1
2018-06-27 v1
2018-07-09 v1
2018-07-24 v1
2018-09-11 v1
2018-10-02 v1
2018-10-23 v1
2018-11-06 v1
2018-11-28 v1
2018-12-13 v1
2018-12-29 v1
2019-01-14 v1
2019-02-05 v1
2019-03-11 v1
2019-03-21 v1
2019-05-13 v1
2019-06-17 v1
2019-07-19 v1
2019-07-31 v1
2019-08-14 v1
2019-08-19 v1
2019-08-30 v1
2019-09-04 v1
2019-09-25 v1
2019-11-06 v1
2019-12-09 v1
2019-12-26 v1
2020-01-08 v1
2020-01-25 v1
2020-01-31 v1
2020-02-18 v1
2020-02-26 v1
2020-03-06 v1
2020-03-20 v1
2020-03-24 v1
2020-04-07 v1
2020-05-14 v1
2020-05-25 v1
2020-05-27 v1
2020-06-14 v1
2020-06-25 v1
2020-08-04 v1
2020-08-15 v1
2020-08-24 v1
2020-08-31 v1
2020-09-08 v1
2020-10-07 v1
2020-10-13 v1
2020-10-22 v1
2020-10-31 v1
2020-11-21 v1
2020-11-27 v1
2020-12-09 v1
2020-12-18 v1
2021-01-03 v1
2021-01-12 v1
2021-01-27 v1
2021-02-05 v1
2021-03-06 v1
2021-03-19 v1
2021-04-12 v1
2021-05-07 v1
2021-06-10 v1
2021-06-22 v1
2021-07-07 v1
2021-07-23 v1
2021-08-06 v1
2021-08-06 v2 [diff vs current]
2021-09-03 v1
2021-09-29 v1
2021-11-18 v1
2021-12-09 v1 current
2021-12-17 v1
2022-01-06 v1
2022-01-20 v1
2022-01-27 v1
2022-02-04 v1
2022-02-10 v1
2022-02-21 v1
2022-02-22 v2 [diff vs current]
2022-03-01 v1
2022-03-12 v1
2022-03-17 v1
2022-03-28 v1
2022-04-25 v1
2022-04-28 v1
2022-05-18 v1
2022-05-27 v1
2022-05-31 v1
2022-06-06 v1
2022-06-21 v1
2022-06-29 v1
2022-07-11 v1
2022-08-09 v1
2022-08-24 v1
2022-11-09 v1
2022-11-22 v1
2022-11-30 v1
2023-01-02 v1
2023-01-11 v1
2023-01-13 v1
2023-01-24 v1
2023-03-01 v1
2023-03-07 v1
2023-03-09 v1
2023-04-18 v1
2023-05-03 v1
2023-06-06 v1
2023-06-08 v1
2023-06-27 v1
2023-07-05 v1
2023-08-10 v1
2023-08-30 v1
2023-09-13 v1
2023-11-08 v1
2023-11-15 v1
2023-12-06 v1
2024-01-17 v1
2024-01-18 v2 [diff vs current]
2024-01-24 v1
2024-01-31 v1
2024-02-07 v1
2024-02-08 v2 [diff vs current]
2024-02-14 v1
2024-02-22 v1
2024-02-29 v1
2024-03-07 v1
2024-03-21 v1
2024-03-21 v2 [diff vs current]
2024-03-28 v1
2024-04-04 v1
2024-04-11 v1
2024-04-18 v1
2024-05-22 v1
2024-05-23 v2 [diff vs current]
2024-05-28 v3 [diff vs current]
2024-06-11 v1
2024-06-19 v1
2024-08-14 v1
2024-08-22 v1
2024-08-22 v2 [diff vs current]
2024-09-24 v1
2024-09-26 v2 [diff vs current]
2024-10-02 v1
2024-10-09 v1
2024-10-31 v1
2024-11-14 v1
2024-11-28 v1
2024-11-28 v2 [diff vs current]
2024-12-05 v1
2024-12-11 v1
2025-03-06 v1
2025-04-03 v1
2025-06-05 v1
2025-07-17 v1
2025-08-07 v1
2026-03-25 v2 [diff vs current]
2026-04-01 v1
2026-04-28 v2 [diff vs current]
2026-05-01 v1
2026-05-07 v1
2026-06-10 v1
2026-06-19 v1
2026-06-20 v2 [diff vs current]
2026-06-23 v1
2026-08-21 v1
2026-08-27 v2 [diff vs current]
2026-09-11 v2 [diff vs current]
2026-09-13 v2 [diff vs current]

From: Stefano Brivio <redacted>

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 <redacted>
Cc: <redacted> # 5.6.x
Fixes: 7400b063969b ("nft_set_pipapo: Introduce AVX2-based lookup implementation")
Signed-off-by: Stefano Brivio <redacted>
Tested-By: Nikita Yushchenko <redacted>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 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 */

-- 
2.30.2

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help