Commit 584fb767 authored by Brett Creeley's avatar Brett Creeley Committed by David S. Miller
Browse files

ionic: Prevent filter add/del err msgs when the device is not available 



Currently when a request for add/deleting a filter is made when
ionic_heartbeat_check() returns failure the driver will be overly
verbose about failures, especially when these are usually temporary
fails and the request will be retried later. An example of this is
a filter add when the FW is in the middle of resetting:

IONIC_CMD_RX_FILTER_ADD (31) failed: IONIC_RC_ERROR (-6)
rx_filter add failed: ADDR 01:80:c2:00:00:0e

Fix this by checking for -ENXIO and other error values on filter
request fails before printing the error message.  Add similar
checking to the delete filter code.

Fixes: f91958cc ("ionic: tame the filter no space message")
Signed-off-by: default avatarBrett Creeley <brett@pensando.io>
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f16f5be3

drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c

+32 −5
Original line number Diff line number Diff line
@@ -376,10 +376,24 @@ static int ionic_lif_filter_add(struct ionic_lif *lif, 


		spin_unlock_bh(&lif->rx_filters.lock);



		if (err == -ENOSPC) {

			if (le16_to_cpu(ctx.cmd.rx_filter_add.match) == IONIC_RX_FILTER_MATCH_VLAN)

		/* store the max_vlans limit that we found */

		if (err == -ENOSPC &&

		    le16_to_cpu(ctx.cmd.rx_filter_add.match) == IONIC_RX_FILTER_MATCH_VLAN)

			lif->max_vlans = lif->nvlans;



		/* Prevent unnecessary error messages on recoverable

		 * errors as the filter will get retried on the next

		 * sync attempt.

		 */

		switch (err) {

		case -ENOSPC:

		case -ENXIO:

		case -ETIMEDOUT:

		case -EAGAIN:

		case -EBUSY:

			return 0;

		default:

			break;

		}



		ionic_adminq_netdev_err_print(lif, ctx.cmd.cmd.opcode,
@@ -494,10 +508,23 @@ static int ionic_lif_filter_del(struct ionic_lif *lif, 
	spin_unlock_bh(&lif->rx_filters.lock);



	if (state != IONIC_FILTER_STATE_NEW) {

		err = ionic_adminq_post_wait(lif, &ctx);

		if (err && err != -EEXIST)

		err = ionic_adminq_post_wait_nomsg(lif, &ctx);



		switch (err) {

			/* ignore these errors */

		case -EEXIST:

		case -ENXIO:

		case -ETIMEDOUT:

		case -EAGAIN:

		case -EBUSY:

		case 0:

			break;

		default:

			ionic_adminq_netdev_err_print(lif, ctx.cmd.cmd.opcode,

						      ctx.comp.comp.status, err);

			return err;

		}

	}



	return 0;

}