Commit 65fbb273 authored by Louis Peens's avatar Louis Peens Committed by Zheng Zengkai
Browse files

nfp: flower: add ipv6 bit to pre_tunnel control message 



stable inclusion
from stable-5.10.27
commit 47dae14b21f7da4cf9ea3359aa4b4c75bf55636a
bugzilla: 51493

--------------------------------

[ Upstream commit 5c4f5e19 ]

Differentiate between ipv4 and ipv6 flows when configuring the pre_tunnel
table to prevent them trampling each other in the table.

Fixes: 78346160 ("nfp: flower: update flow merge code to support IPv6 tunnels")
Signed-off-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 0c5a49e9

drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c

+13 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
#define NFP_FL_MAX_ROUTES               32



#define NFP_TUN_PRE_TUN_RULE_LIMIT	32

#define NFP_TUN_PRE_TUN_RULE_DEL	0x1

#define NFP_TUN_PRE_TUN_IDX_BIT		0x8

#define NFP_TUN_PRE_TUN_RULE_DEL	BIT(0)

#define NFP_TUN_PRE_TUN_IDX_BIT		BIT(3)

#define NFP_TUN_PRE_TUN_IPV6_BIT	BIT(7)



/**

 * struct nfp_tun_pre_run_rule - rule matched before decap
@@ -1268,6 +1269,7 @@ int nfp_flower_xmit_pre_tun_flow(struct nfp_app *app, 
{

	struct nfp_flower_priv *app_priv = app->priv;

	struct nfp_tun_offloaded_mac *mac_entry;

	struct nfp_flower_meta_tci *key_meta;

	struct nfp_tun_pre_tun_rule payload;

	struct net_device *internal_dev;

	int err;
@@ -1290,6 +1292,15 @@ int nfp_flower_xmit_pre_tun_flow(struct nfp_app *app, 
	if (!mac_entry)

		return -ENOENT;



	/* Set/clear IPV6 bit. cpu_to_be16() swap will lead to MSB being

	 * set/clear for port_idx.

	 */

	key_meta = (struct nfp_flower_meta_tci *)flow->unmasked_data;

	if (key_meta->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV6)

		mac_entry->index |= NFP_TUN_PRE_TUN_IPV6_BIT;

	else

		mac_entry->index &= ~NFP_TUN_PRE_TUN_IPV6_BIT;



	payload.port_idx = cpu_to_be16(mac_entry->index);



	/* Copy mac id and vlan to flow - dev may not exist at delete time. */