Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [91.216.245.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 888061B07AE for ; Fri, 4 Apr 2025 13:33:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.245.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743773619; cv=none; b=YHf7VtuFrjjJJrX5ZCE6xtIThqYPLA194KIrQLCqHXwTBaPWAwuLT0JHSf5WbVPoHXGxgEsn/Eqh2zSDo6yV+y3oAf1hYaT/GypMCEbK4wgkiXWPtGBMaqi7ZSiHkhLyAI/fkqceEWv/w2+r9jPgo5YoDTr8ACud0DXt3o7eF/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743773619; c=relaxed/simple; bh=I973FjrWzSUt0ZJ2c+cJwmuNiU5hqemGZBYH/KQRDZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZkxWh72q+cGOmQnRZce4ITb+DyPPSBYQcSZhYjIKAjL62qO4qYmT7Awl0j+XWLKycowqEyxNa30LXl3wzX3ARg9/JqAZCxG9dX6ltovED+Xz0EDu8fppt6mYsiKMI/N23wwmtx/05I+rR3bRzAM+h1PXYCcYGbb+9HWHDlhUeug= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de; spf=pass smtp.mailfrom=breakpoint.cc; arc=none smtp.client-ip=91.216.245.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=breakpoint.cc Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1u0hAt-00011a-Kp; Fri, 04 Apr 2025 15:33:35 +0200 From: Florian Westphal To: Cc: sbrivio@redhat.com, Florian Westphal , sontu mazumdar Subject: [PATCH v2 nf 2/3] nft_set_pipapo: fix incorrect avx2 match of 5th field octet Date: Fri, 4 Apr 2025 15:32:25 +0200 Message-ID: <20250404133229.12395-3-fw@strlen.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250404133229.12395-1-fw@strlen.de> References: <20250404133229.12395-1-fw@strlen.de> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Given a set element like: icmpv6 . dead:beef:00ff::1 The value of 'ff' is irrelevant, any address will be matched as long as the other octets are the same. This is because of too-early register clobbering: ymm7 is reloaded with new packet data (pkt[9]) but it still holds data of an earlier load that wasn't processed yet. The existing tests in nft_concat_range.sh selftests do exercise this code path, but do not trigger incorrect matching due to the network prefix limitation. Reported-by: sontu mazumdar Fixes: 7400b063969b ("nft_set_pipapo: Introduce AVX2-based lookup implementation") Reviewed-by: Stefano Brivio Signed-off-by: Florian Westphal --- v2: no changes. net/netfilter/nft_set_pipapo_avx2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c index 334d16096d00..7792625b8100 100644 --- a/net/netfilter/nft_set_pipapo_avx2.c +++ b/net/netfilter/nft_set_pipapo_avx2.c @@ -1183,8 +1183,9 @@ static int nft_pipapo_avx2_lookup_8b_16(unsigned long *map, unsigned long *fill, NFT_PIPAPO_AVX2_BUCKET_LOAD8(5, lt, 8, pkt[8], bsize); NFT_PIPAPO_AVX2_AND(6, 2, 3); + NFT_PIPAPO_AVX2_AND(3, 4, 7); NFT_PIPAPO_AVX2_BUCKET_LOAD8(7, lt, 9, pkt[9], bsize); - NFT_PIPAPO_AVX2_AND(0, 4, 5); + NFT_PIPAPO_AVX2_AND(0, 3, 5); NFT_PIPAPO_AVX2_BUCKET_LOAD8(1, lt, 10, pkt[10], bsize); NFT_PIPAPO_AVX2_AND(2, 6, 7); NFT_PIPAPO_AVX2_BUCKET_LOAD8(3, lt, 11, pkt[11], bsize); -- 2.49.0