From nobody Thu Apr 9 08:58:36 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3FB8136EA91; Tue, 10 Mar 2026 10:08:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773137337; cv=none; b=NGG6KkSk+Li2QzT+gRljQPSvazcfynxGVDVlqCb/n/m8doMlRNKh8cw+j+AxuiqaxHMT3l+enDOk3dAxr5uZjZU3nw9+6e8+NG6PYYJ+C1k++vS8Cs+DtqQlZCWx7CG2zE0ixYfwqFhfOonpQMdM21utBRkq9+ttdnNKS89Etxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773137337; c=relaxed/simple; bh=S4vp4JQ72s3eWuG8J9mcgxDfPnpnYZ+oZQ9woXEJC0c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ryBuDuBiNaiTMpMXrMSOHlBpZbvk3XNfaq2LHD1LYuabaQcxa2rtXabY/Uj6ePKHs41SrVYNWSDfUfvbFyJv/KQSWNoPReX15v50m2GChPRgBYQxDfzhv5eSIkWfsU2Nn3F2lnhnc4Hi0dlVW9Lyll2mu1APOs4tovn4/vRBljQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QbxZtmg5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QbxZtmg5" Received: by smtp.kernel.org (Postfix) with ESMTPS id F281AC2BC87; Tue, 10 Mar 2026 10:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773137337; bh=S4vp4JQ72s3eWuG8J9mcgxDfPnpnYZ+oZQ9woXEJC0c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=QbxZtmg5InxsxN2Ad/rlY6MR/ODXG7M9n/Xtp6wa3jvyIWPOVHVKlYTrT1byuvsUM 7to6C6Wf/dxcf7+1l1m3nBFGO4Q5ukAmek3lcpBxAjHjqjGPXbNA9NGWjY+JykC6nJ 5wdbN0VwHlGgBCwzs/Y9+Ok9UIv1ef9OG5NU42w2LfT4u2SIBTIFLdKd+o0YiTa6rN jkssNIF1IPAtaSzZHPy9LXEOkiPqXMG0BmJ1HyUHn440DoA5uHawcwqgQjL5N4/ms7 zpX/InwRDmiwEYMAwhe83mWDOGbrB+pS60UnYDnYJHjXzcFzv3i4HAvAsjp9M9AY3B 71Z0iDdDKwX8w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E038FF3C27D; Tue, 10 Mar 2026 10:08:56 +0000 (UTC) From: Cedric Jehasse via B4 Relay Date: Tue, 10 Mar 2026 11:07:25 +0100 Subject: [PATCH net-next v7 1/2] net/sched: cls_flower: remove unions from fl_flow_key Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260310-net-next-mv88e6xxx-tcam-v7-1-7d9db9012b28@luminex.be> References: <20260310-net-next-mv88e6xxx-tcam-v7-0-7d9db9012b28@luminex.be> In-Reply-To: <20260310-net-next-mv88e6xxx-tcam-v7-0-7d9db9012b28@luminex.be> To: Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Jamal Hadi Salim , Jiri Pirko , Simon Horman Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Cedric Jehasse X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773137335; l=1808; i=cedric.jehasse@luminex.be; s=20260213; h=from:subject:message-id; bh=XHxAavS3OSIr6KhDGV4nKk6jIBOKNR2K6BPZWurwweQ=; b=gXslnaHvJgfKOdQQiBya9sTc5aUd9Q2StXrdRncdn3+ObkV/DtLqwiqd02r8/SgXVvokn/SxL Ppu9+yZQylIDIdjPXDTHUJsnO8Cr5GB5dRuRhrEX8JzgZLTikiBWL2O X-Developer-Key: i=cedric.jehasse@luminex.be; a=ed25519; pk=DL2RaHc2bc7tTDTMJdugm42BtJk4Ip+7V41Gkj+Avjk= X-Endpoint-Received: by B4 Relay for cedric.jehasse@luminex.be/20260213 with auth_id=638 X-Original-From: Cedric Jehasse Reply-To: cedric.jehasse@luminex.be From: Cedric Jehasse When creating a flower classifier with an ipv4 address the flow_dissector has both FLOW_DISSECTOR_KEY_IPV4_ADDRS and FLOW_DISSECTOR_KEY_IPV6_ADDRS bits set in used_keys. This happens because ipv4/ipv6 fields are a union and FL_KEY_SET_IF_MASKED() will interpret either being set as both. Removing the unions fixes this behavior without needing special handling for union fields. Example of a command that caused FLOW_DISSECTOR_KEY_IPV4_ADDRS and FLOW_DISSECTOR_KEY_IPV6_ADDRS to be set: tc filter add dev p1 ingress protocol ip flower skip_sw \ dst_ip 224.0.1.129 action trap Signed-off-by: Cedric Jehasse --- net/sched/cls_flower.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 7669371c1354..b95dbe847dde 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -59,18 +59,14 @@ struct fl_flow_key { struct flow_dissector_key_eth_addrs eth; struct flow_dissector_key_vlan vlan; struct flow_dissector_key_vlan cvlan; - union { - struct flow_dissector_key_ipv4_addrs ipv4; - struct flow_dissector_key_ipv6_addrs ipv6; - }; + struct flow_dissector_key_ipv4_addrs ipv4; + struct flow_dissector_key_ipv6_addrs ipv6; struct flow_dissector_key_ports tp; struct flow_dissector_key_icmp icmp; struct flow_dissector_key_arp arp; struct flow_dissector_key_keyid enc_key_id; - union { - struct flow_dissector_key_ipv4_addrs enc_ipv4; - struct flow_dissector_key_ipv6_addrs enc_ipv6; - }; + struct flow_dissector_key_ipv4_addrs enc_ipv4; + struct flow_dissector_key_ipv6_addrs enc_ipv6; struct flow_dissector_key_ports enc_tp; struct flow_dissector_key_mpls mpls; struct flow_dissector_key_tcp tcp; --=20 2.43.0