Commit 2d14d379 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

ibmvnic: Revise RX/TX queue error messages

During a device failover, there may be latency between the loss
of the current backing device and a notification from firmware that
a failover has occurred. This latency can result in a large amount of
error printouts as firmware returns outgoing traffic with a generic
error code. These are not necessarily errors in this case as the
firmware is busy swapping in a new backing adapter and is not ready
to send packets yet. This patch reclassifies those error codes as
warnings with an explanation that a failover may be pending. All
other return codes will be considered errors.
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6651599
...@@ -329,7 +329,8 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter, ...@@ -329,7 +329,8 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
return; return;
failure: failure:
dev_info(dev, "replenish pools failure\n"); if (lpar_rc != H_PARAMETER && lpar_rc != H_CLOSED)
dev_err_ratelimited(dev, "rx: replenish packet buffer failed\n");
pool->free_map[pool->next_free] = index; pool->free_map[pool->next_free] = index;
pool->rx_buff[index].skb = NULL; pool->rx_buff[index].skb = NULL;
...@@ -1617,7 +1618,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -1617,7 +1618,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
&tx_crq); &tx_crq);
} }
if (lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
dev_err(dev, "tx failed with code %ld\n", lpar_rc); if (lpar_rc != H_CLOSED && lpar_rc != H_PARAMETER)
dev_err_ratelimited(dev, "tx: send failed\n");
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
tx_buff->skb = NULL; tx_buff->skb = NULL;
...@@ -3204,6 +3206,25 @@ static union ibmvnic_crq *ibmvnic_next_crq(struct ibmvnic_adapter *adapter) ...@@ -3204,6 +3206,25 @@ static union ibmvnic_crq *ibmvnic_next_crq(struct ibmvnic_adapter *adapter)
return crq; return crq;
} }
static void print_subcrq_error(struct device *dev, int rc, const char *func)
{
switch (rc) {
case H_PARAMETER:
dev_warn_ratelimited(dev,
"%s failed: Send request is malformed or adapter failover pending. (rc=%d)\n",
func, rc);
break;
case H_CLOSED:
dev_warn_ratelimited(dev,
"%s failed: Backing queue closed. Adapter is down or failover pending. (rc=%d)\n",
func, rc);
break;
default:
dev_err_ratelimited(dev, "%s failed: (rc=%d)\n", func, rc);
break;
}
}
static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle, static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
union sub_crq *sub_crq) union sub_crq *sub_crq)
{ {
...@@ -3230,11 +3251,8 @@ static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle, ...@@ -3230,11 +3251,8 @@ static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
cpu_to_be64(u64_crq[2]), cpu_to_be64(u64_crq[2]),
cpu_to_be64(u64_crq[3])); cpu_to_be64(u64_crq[3]));
if (rc) { if (rc)
if (rc == H_CLOSED) print_subcrq_error(dev, rc, __func__);
dev_warn(dev, "CRQ Queue closed\n");
dev_err(dev, "Send error (rc=%d)\n", rc);
}
return rc; return rc;
} }
...@@ -3252,11 +3270,8 @@ static int send_subcrq_indirect(struct ibmvnic_adapter *adapter, ...@@ -3252,11 +3270,8 @@ static int send_subcrq_indirect(struct ibmvnic_adapter *adapter,
cpu_to_be64(remote_handle), cpu_to_be64(remote_handle),
ioba, num_entries); ioba, num_entries);
if (rc) { if (rc)
if (rc == H_CLOSED) print_subcrq_error(dev, rc, __func__);
dev_warn(dev, "CRQ Queue closed\n");
dev_err(dev, "Send (indirect) error (rc=%d)\n", rc);
}
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment