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

Commit 2e4875e3 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: Move the FD ATR/SB messages to a higher debug level 



These are not useful unless SV is happening as there is a FD flush counter
that tracks this.

Change-ID: If2655b5a29687247d03a51d35f69854bbeb711ce
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 41837cad

drivers/net/ethernet/intel/i40e/i40e_main.c

+12 −6
Original line number Diff line number Diff line
@@ -4744,6 +4744,7 @@ static int i40e_up_complete(struct i40e_vsi *vsi) 
		pf->fd_add_err = pf->fd_atr_cnt = 0;

		if (pf->fd_tcp_rule > 0) {

			pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "Forcing ATR off, sideband rules for TCP/IPv4 exist\n");

			pf->fd_tcp_rule = 0;

		}
@@ -5433,6 +5434,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf) 
		if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&

		    (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {

			pf->auto_disable_flags &= ~I40E_FLAG_FD_SB_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "FD Sideband/ntuple is being enabled since we have space in the table now\n");

		}

	}
@@ -5441,6 +5443,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf) 
		if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&

		    (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED)) {

			pf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR is being enabled since we have space in the table now\n");

		}

	}
@@ -5474,6 +5477,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf) 


		if (!(time_after(jiffies, min_flush_time)) &&

		    (fd_room < I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR)) {

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR disabled, not enough FD filter space.\n");

			disable_atr = true;

		}
@@ -5501,6 +5505,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf) 
			if (!disable_atr)

				pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

			clear_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "FD Filter table flushed and FD-SB replayed.\n");

		}

	}
@@ -7772,6 +7777,7 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features) 
		pf->fd_add_err = pf->fd_atr_cnt = pf->fd_tcp_rule = 0;

		pf->fdir_pf_active_filters = 0;

		pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

		if (I40E_DEBUG_FD & pf->hw.debug_mask)

			dev_info(&pf->pdev->dev, "ATR re-enabled.\n");

		/* if ATR was auto disabled it can be re-enabled. */

		if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+6 −3
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
	if (add) {

		pf->fd_tcp_rule++;

		if (pf->flags & I40E_FLAG_FD_ATR_ENABLED) {

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "Forcing ATR off, sideband rules for TCP/IPv4 flow being applied\n");

			pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;

		}
@@ -291,6 +292,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
				  (pf->fd_tcp_rule - 1) : 0;

		if (pf->fd_tcp_rule == 0) {

			pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR re-enabled due to no sideband TCP/IPv4 rules\n");

		}

	}
@@ -501,6 +503,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, 
			if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&

			    !(pf->auto_disable_flags &

				     I40E_FLAG_FD_SB_ENABLED)) {

				if (I40E_DEBUG_FD & pf->hw.debug_mask)

					dev_warn(&pdev->dev, "FD filter space full, new ntuple rules will not be added\n");

				pf->auto_disable_flags |=

							I40E_FLAG_FD_SB_ENABLED;