Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f41ec8c authored by Louis Peens's avatar Louis Peens Committed by Greg Kroah-Hartman
Browse files

nfp: flower: fix ida_idx not being released 



[ Upstream commit 7db788ad627aabff2b74d4f1a3b68516d0fee0d7 ]

When looking for a global mac index the extra NFP_TUN_PRE_TUN_IDX_BIT
that gets set if nfp_flower_is_supported_bridge is true is not taken
into account. Consequently the path that should release the ida_index
in cleanup is never triggered, causing messages like:

    nfp 0000:02:00.0: nfp: Failed to offload MAC on br-ex.
    nfp 0000:02:00.0: nfp: Failed to offload MAC on br-ex.
    nfp 0000:02:00.0: nfp: Failed to offload MAC on br-ex.

after NFP_MAX_MAC_INDEX number of reconfigs. Ultimately this lead to
new tunnel flows not being offloaded.

Fix this by unsetting the NFP_TUN_PRE_TUN_IDX_BIT before checking if
the port is of type OTHER.

Fixes: 2e0bc7f3 ("nfp: flower: encode mac indexes with pre-tunnel rule check")
Signed-off-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20220208101453.321949-1-simon.horman@corigine.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 16dcfde9

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

+8 −4
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 
	struct nfp_flower_repr_priv *repr_priv;

	struct nfp_tun_offloaded_mac *entry;

	struct nfp_repr *repr;

	u16 nfp_mac_idx;

	int ida_idx;



	entry = nfp_tunnel_lookup_offloaded_macs(app, mac);
@@ -695,8 +696,6 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 
		entry->bridge_count--;



		if (!entry->bridge_count && entry->ref_count) {

			u16 nfp_mac_idx;



			nfp_mac_idx = entry->index & ~NFP_TUN_PRE_TUN_IDX_BIT;

			if (__nfp_tunnel_offload_mac(app, mac, nfp_mac_idx,

						     false)) {
@@ -712,7 +711,6 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 


	/* If MAC is now used by 1 repr set the offloaded MAC index to port. */

	if (entry->ref_count == 1 && list_is_singular(&entry->repr_list)) {

		u16 nfp_mac_idx;

		int port, err;



		repr_priv = list_first_entry(&entry->repr_list,
@@ -740,8 +738,14 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev, 
	WARN_ON_ONCE(rhashtable_remove_fast(&priv->tun.offloaded_macs,

					    &entry->ht_node,

					    offloaded_macs_params));



	if (nfp_flower_is_supported_bridge(netdev))

		nfp_mac_idx = entry->index & ~NFP_TUN_PRE_TUN_IDX_BIT;

	else

		nfp_mac_idx = entry->index;



	/* If MAC has global ID then extract and free the ida entry. */

	if (nfp_tunnel_is_mac_idx_global(entry->index)) {

	if (nfp_tunnel_is_mac_idx_global(nfp_mac_idx)) {

		ida_idx = nfp_tunnel_get_ida_from_global_mac_idx(entry->index);

		ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);

	}