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 A47B140DB55 for ; Mon, 31 Aug 2026 12:58:52 +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=1788181135; cv=none; b=M7c7/EegqODFjF9tv2p0rbaD9ro+uO4dQRD14FXFx/xY39YbQLTVStJR7ZErkKF87HZ/iPLFrfdvJHSJP6IDrp22qxwTWHeZ+gpTV/yT7oSa+bhB9vgJvsMv2HQxAdzPS2OcqtwyA9nIdTNhHvdofIfkBl9wvJn4syXQddlLPAI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788181135; c=relaxed/simple; bh=0PWgyLyOxo2ah1jQW9ZRdPHxGWh1PyvvS167GTFHZYA=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=kalux/XNiq7ctuiwevLHD+77QaBOG1ZXnTF4BfC4fjxokeJWvm3Uohtr54B6zUbE/dQrycrTGZ1HDOl5PORSUhkSvu27nrPwVQdQ5QY36EfhnAcIjPxqxZfHjCmcTj0SLdG7r5L4o3a7rc43JEo7gb8N3gPctCiIKr/VE51AYLE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2eaZKwDl; 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="2eaZKwDl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E02711F000E9; Mon, 31 Aug 2026 12:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788181132; bh=GbiHsCNaUL1nZmtNe4W0n1e6dxc0WHdglGwyW1olf+g=; h=Subject:To:Cc:From:Date; b=2eaZKwDltlVmRv1Jo8IhUAbRSQioIfd2Whf0tNh7mjrIXcyuD6135ivqPahdBBfIa MeQ3XGu+Hf/IF2PN5S5qYHb7oLphH/VNScOi89B9S2D1KO3uumIrB8o5dfM7qETvpI cAQISDTiyYkVq5FNSW0uDKjxOilRCwfeAB9/eiPE= Subject: FAILED: patch "[PATCH] netfilter: nft_set_pipapo_avx2: add missing vzeroupper" failed to apply to 6.6-stable tree To: ebiggers@kernel.org,pablo@netfilter.org,sbrivio@redhat.com Cc: From: Date: Mon, 31 Aug 2026 14:58:40 +0200 Message-ID: <2026083140-manatee-lively-cd49@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 55dd20f0f4b1be5c9c8a0275d8d763c86563eac2 # git commit -s git send-email --to '' --in-reply-to '2026083140-manatee-lively-cd49@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 55dd20f0f4b1be5c9c8a0275d8d763c86563eac2 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 15 Aug 2026 13:57:50 -0700 Subject: [PATCH] netfilter: nft_set_pipapo_avx2: add missing vzeroupper 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 diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c index b3f105520a85..21f5be68c703 100644 --- a/net/netfilter/nft_set_pipapo_avx2.c +++ b/net/netfilter/nft_set_pipapo_avx2.c @@ -1134,6 +1134,7 @@ struct nft_pipapo_elem *pipapo_get_avx2(const struct nft_pipapo_match *m, 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 ret = 0; int i; @@ -1207,14 +1208,11 @@ struct nft_pipapo_elem *pipapo_get_avx2(const struct nft_pipapo_match *m, 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))) { @@ -1224,9 +1222,7 @@ struct nft_pipapo_elem *pipapo_get_avx2(const struct nft_pipapo_match *m, } scratch->map_index = map_index; - kernel_fpu_end(); - __local_unlock_nested_bh(&scratch->bh_lock); - return e; + goto out; } map_index = !map_index; @@ -1234,9 +1230,12 @@ struct nft_pipapo_elem *pipapo_get_avx2(const struct nft_pipapo_match *m, 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; } /**