Commit 4faeadfd authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Refactor ntuple filter removal logic in bnxt_cfg_ntp_filters(). 



Refactor the logic into a new function bnxt_del_ntp_filters().  The
same call will be used when the user deletes an ntuple filter.

The bnxt_hwrm_cfa_ntuple_filter_free() function to call fw to free
the ntuple filter is exported so that the ethtool logic can call it.

Reviewed-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Reviewed-by: default avatarAndy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80cfde29

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+19 −16
Original line number Diff line number Diff line
@@ -5609,7 +5609,7 @@ int bnxt_hwrm_l2_filter_alloc(struct bnxt *bp, struct bnxt_l2_filter *fltr) 
	return rc;

}



static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,

int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,

				     struct bnxt_ntuple_filter *fltr)

{

	struct hwrm_cfa_ntuple_filter_free_input *req;
@@ -14011,6 +14011,21 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
}

#endif



void bnxt_del_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr)

{

	spin_lock_bh(&bp->ntp_fltr_lock);

	if (!test_and_clear_bit(BNXT_FLTR_INSERTED, &fltr->base.state)) {

		spin_unlock_bh(&bp->ntp_fltr_lock);

		return;

	}

	hlist_del_rcu(&fltr->base.hash);

	bp->ntp_fltr_count--;

	spin_unlock_bh(&bp->ntp_fltr_lock);

	bnxt_del_l2_filter(bp, fltr->l2_fltr);

	clear_bit(fltr->base.sw_id, bp->ntp_fltr_bmap);

	kfree_rcu(fltr, base.rcu);

}



static void bnxt_cfg_ntp_filters(struct bnxt *bp)

{

	int i;
@@ -14042,20 +14057,8 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) 
					set_bit(BNXT_FLTR_VALID, &fltr->base.state);

			}



			if (del) {

				spin_lock_bh(&bp->ntp_fltr_lock);

				if (!test_and_clear_bit(BNXT_FLTR_INSERTED, &fltr->base.state)) {

					spin_unlock_bh(&bp->ntp_fltr_lock);

					continue;

				}

				hlist_del_rcu(&fltr->base.hash);

				bp->ntp_fltr_count--;

				spin_unlock_bh(&bp->ntp_fltr_lock);

				bnxt_del_l2_filter(bp, fltr->l2_fltr);

				synchronize_rcu();

				clear_bit(fltr->base.sw_id, bp->ntp_fltr_bmap);

				kfree(fltr);

			}

			if (del)

				bnxt_del_ntp_filter(bp, fltr);

		}

	}

	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+3 −0
Original line number Diff line number Diff line
@@ -2636,6 +2636,8 @@ int bnxt_hwrm_func_drv_unrgtr(struct bnxt *bp); 
void bnxt_del_l2_filter(struct bnxt *bp, struct bnxt_l2_filter *fltr);

int bnxt_hwrm_l2_filter_free(struct bnxt *bp, struct bnxt_l2_filter *fltr);

int bnxt_hwrm_l2_filter_alloc(struct bnxt *bp, struct bnxt_l2_filter *fltr);

int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,

				     struct bnxt_ntuple_filter *fltr);

int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings);

int bnxt_hwrm_vnic_cfg(struct bnxt *bp, u16 vnic_id);

int __bnxt_hwrm_get_tx_rings(struct bnxt *bp, u16 fid, int *tx_rings);
@@ -2685,6 +2687,7 @@ u32 bnxt_get_ntp_filter_idx(struct bnxt *bp, struct flow_keys *fkeys, 
			    const struct sk_buff *skb);

int bnxt_insert_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr,

			   u32 idx);

void bnxt_del_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr);

int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);

int bnxt_restore_pf_fw_resources(struct bnxt *bp);

int bnxt_get_port_parent_id(struct net_device *dev,