From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 752D551B68D; Mon, 31 Aug 2026 13:43:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788183821; cv=none; b=FA8xIYqunRaQBDRuQc0LvI9DTKUZF5zUdWhPvXCn/B9880eIoNZF3mvttoZnK9qUeqOMf83cEoaKHHEMz1SFBSWyFlRsdYXJepBQOqdkv+Js09iSYrY4yh9oCDffzF4xoFhkeciNXOlh/SU/vSlA4JialPWv/EXaXeUFf80xma0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788183821; c=relaxed/simple; bh=G9mIqwFudK/ZW3d92Ncp4OIcsZvuYmFawa3ZwgrkgNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PLpqizdyZVYeuZqAPwGRQFR5IpXO3osXwASPgbh9+wcPt1ZBuL0ERzEvVX7a9wF8aBE5VdAgrs9AQxOi9KKM81AwXFciY8scca+HYp0HHFCB3kMFeFfOzivTfcdTthhDHpOqUs5ldESIWN5WmhbBEGJTLKK0pRwPz+ugQxEQtDA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rcDK0JcD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rcDK0JcD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1A8A1F00ACA; Mon, 31 Aug 2026 13:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788183819; bh=Nyv6w3phXBfUL6ZbvmqYBDv6AB3mULT5V/HiAbPmojM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rcDK0JcDOnc1iddjiuf/MLLKfGV09RjTTyFbbTaIJPywZfQFaQ0sIzb3uePN32bT+ H2BrZUqu0bUrLAv3944H7/LAaysuTzkxWit9AEYfkOfJAdpvgJvh9SJueciqqyFTsu TXTpPWrt/RTbHW2kTl0FRGE8vEa2oL9oLRG0nMtw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Biggers , Stefano Brivio , Pablo Neira Ayuso Subject: [PATCH 7.1 52/76] netfilter: nft_set_pipapo_avx2: add missing vzeroupper Date: Mon, 31 Aug 2026 15:34:24 +0200 Message-ID: <20260831133402.120263739@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831133359.185608553@linuxfoundation.org> References: <20260831133359.185608553@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 55dd20f0f4b1be5c9c8a0275d8d763c86563eac2 upstream. Since pipapo_get_avx2() uses YMM registers, execute vzeroupper before returning from it. This is needed to avoid degrading the performance of any later SSE code that may happen to be executed. Fixes: 7400b063969b ("nft_set_pipapo: Introduce AVX2-based lookup implementation") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Reviewed-by: Stefano Brivio Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nft_set_pipapo_avx2.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) --- a/net/netfilter/nft_set_pipapo_avx2.c +++ b/net/netfilter/nft_set_pipapo_avx2.c @@ -1142,6 +1142,7 @@ struct nft_pipapo_elem *pipapo_get_avx2( struct nft_pipapo_scratch *scratch; const struct nft_pipapo_field *f; unsigned long *res, *fill, *map; + struct nft_pipapo_elem *e; bool map_index; int i; @@ -1214,14 +1215,11 @@ struct nft_pipapo_elem *pipapo_get_avx2( next_match: if (ret < 0) { scratch->map_index = map_index; - kernel_fpu_end(); - __local_unlock_nested_bh(&scratch->bh_lock); - return NULL; + e = NULL; + goto out; } if (last) { - struct nft_pipapo_elem *e; - e = f->mt[ret].e; if (unlikely(__nft_set_elem_expired(&e->ext, tstamp) || !nft_set_elem_active(&e->ext, genmask))) { @@ -1231,9 +1229,7 @@ next_match: } scratch->map_index = map_index; - kernel_fpu_end(); - __local_unlock_nested_bh(&scratch->bh_lock); - return e; + goto out; } map_index = !map_index; @@ -1241,9 +1237,12 @@ next_match: data += NFT_PIPAPO_GROUPS_PADDED_SIZE(f); } + e = NULL; +out: + asm volatile("vzeroupper"); kernel_fpu_end(); __local_unlock_nested_bh(&scratch->bh_lock); - return NULL; + return e; } /**