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

Commit 377cc249 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: exit ATR mode only when adding TCP/IPv4 filter succeeds 



Move ATR exit check after we have sent the TCP/IPv4 filter to the ring
successfully. This avoids an issue where we potentially update the
filter count without actually succeeding in adding the filter. Now, we
only increment the fd_tcp_rule after we've succeeded. Additionally, we
will re-enable ATR mode only after deletion of the filter is actually
posted to the FDIR ring.

Change-ID: If5c1dea422081cc5e2de65618b01b4c3bf6bd586
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e5187ee3

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

+17 −17
Original line number Diff line number Diff line
@@ -284,23 +284,6 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
	ip->saddr = fd_data->src_ip;

	tcp->source = fd_data->src_port;



	if (add) {

		pf->fd_tcp_rule++;

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

		    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->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;

	} else {

		pf->fd_tcp_rule = (pf->fd_tcp_rule > 0) ?

				  (pf->fd_tcp_rule - 1) : 0;

		if (pf->fd_tcp_rule == 0) {

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

			    I40E_DEBUG_FD & pf->hw.debug_mask)

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

			pf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;

		}

	}



	fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP;

	ret = i40e_program_fdir_filter(fd_data, raw_packet, pf, add);

	if (ret) {
@@ -320,6 +303,23 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
				 fd_data->pctype, fd_data->fd_id);

	}



	if (add) {

		pf->fd_tcp_rule++;

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

		    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->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;

	} else {

		pf->fd_tcp_rule = (pf->fd_tcp_rule > 0) ?

				  (pf->fd_tcp_rule - 1) : 0;

		if (pf->fd_tcp_rule == 0) {

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

			    I40E_DEBUG_FD & pf->hw.debug_mask)

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

			pf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;

		}

	}



	return 0;

}