From: Shradha Shah <sshah@solarflare•com>
To: David Miller <davem@davemloft•net>
Cc: <netdev@vger•kernel.org>, <linux-net-drivers@solarflare•com>
Subject: [PATCH net-next v3 10/15] sfc: suppress ENOENT error messages from MC_CMD_MAC_STATS
Date: Tue, 2 Jun 2015 11:39:49 +0100 [thread overview]
Message-ID: <556D87F5.3010406@solarflare.com> (raw)
In-Reply-To: <556D8710.6060706@solarflare.com>
From: Daniel Pieczko <dpieczko@solarflare•com>
MC_CMD_MAC_STATS can be called on a function before a
vadaptor has been created, as the kernel can call into this
through ndo_get_stats/ndo_get_stats64.
If MC_CMD_MAC_STATS is called before the DMA queues have been
setup, so that a vadaptor has not been created yet, firmware
will return ENOENT. This is expected, so suppress the MCDI
error message in this case.
Signed-off-by: Shradha Shah <sshah@solarflare•com>
---
drivers/net/ethernet/sfc/ef10.c | 11 ++++++++---
drivers/net/ethernet/sfc/mcdi_port.c | 8 ++++++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index b880d98..a79a24f 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -1316,11 +1316,16 @@ static int efx_ef10_try_update_nic_stats_vf(struct efx_nic *efx)
MCDI_SET_DWORD(inbuf, MAC_STATS_IN_PORT_ID, EVB_PORT_ID_ASSIGNED);
spin_unlock_bh(&efx->stats_lock);
- rc = efx_mcdi_rpc(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf), NULL,
- 0, NULL);
+ rc = efx_mcdi_rpc_quiet(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf),
+ NULL, 0, NULL);
spin_lock_bh(&efx->stats_lock);
- if (rc)
+ if (rc) {
+ /* Expect ENOENT if DMA queues have not been set up */
+ if (rc != -ENOENT || atomic_read(&efx->active_queues))
+ efx_mcdi_display_error(efx, MC_CMD_MAC_STATS,
+ sizeof(inbuf), NULL, 0, rc);
goto out;
+ }
generation_end = dma_stats[MC_CMD_MAC_GENERATION_END];
if (generation_end == EFX_MC_STATS_GENERATION_INVALID) {
diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c
index fffc348..7f295c4 100644
--- a/drivers/net/ethernet/sfc/mcdi_port.c
+++ b/drivers/net/ethernet/sfc/mcdi_port.c
@@ -948,8 +948,12 @@ static int efx_mcdi_mac_stats(struct efx_nic *efx,
MCDI_SET_DWORD(inbuf, MAC_STATS_IN_DMA_LEN, dma_len);
MCDI_SET_DWORD(inbuf, MAC_STATS_IN_PORT_ID, nic_data->vport_id);
- rc = efx_mcdi_rpc(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf),
- NULL, 0, NULL);
+ rc = efx_mcdi_rpc_quiet(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf),
+ NULL, 0, NULL);
+ /* Expect ENOENT if DMA queues have not been set up */
+ if (rc && (rc != -ENOENT || atomic_read(&efx->active_queues)))
+ efx_mcdi_display_error(efx, MC_CMD_MAC_STATS, sizeof(inbuf),
+ NULL, 0, rc);
return rc;
}
next prev parent reply other threads:[~2015-06-02 10:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 10:36 [PATCH net-next v3 00/15] sfc: ndo_get_phys_port_id, vadaptor stats and PF unload when Vf's assigned to guest Shradha Shah
2015-06-02 10:37 ` [PATCH net-next v3 01/15] sfc: Add code to export port_num in netdev->dev_port Shradha Shah
2015-06-02 10:37 ` [PATCH net-next v3 02/15] sfc: Add paranthesis correctly on all branches of the if statement Shradha Shah
2015-06-02 10:37 ` [PATCH net-next v3 03/15] sfc: Add sysfs entry for flags (link control and primary) Shradha Shah
2015-06-02 10:38 ` [PATCH net-next v3 04/15] sfc: Implement ndo_gets_phys_port_id() for EF10 VFs Shradha Shah
2015-06-02 10:38 ` [PATCH net-next v3 05/15] sfc: add "port_" prefix to MAC stats Shradha Shah
2015-06-02 10:38 ` [PATCH net-next v3 06/15] sfc: set the port-id when calling MC_CMD_MAC_STATS Shradha Shah
2015-06-02 10:39 ` [PATCH net-next v3 07/15] sfc: display vadaptor statistics for all interfaces Shradha Shah
2015-06-02 10:39 ` [PATCH net-next v3 08/15] sfc: DMA the VF stats only when requested Shradha Shah
2015-06-02 10:39 ` [PATCH net-next v3 09/15] sfc: update netdevice statistics to use vadaptor stats Shradha Shah
2015-06-02 10:39 ` Shradha Shah [this message]
2015-06-02 10:40 ` [PATCH net-next v3 11/15] sfc: suppress vadaptor stats when EVB is not present Shradha Shah
2015-06-02 10:40 ` [PATCH net-next v3 12/15] sfc: don't update stats on VF when called in atomic context Shradha Shah
2015-06-02 10:40 ` [PATCH net-next v3 13/15] sfc: do not allow VFs to be destroyed if assigned to guests Shradha Shah
2015-06-02 10:40 ` [PATCH net-next v3 14/15] sfc: force removal of VF and vport on driver removal Shradha Shah
2015-06-02 10:41 ` [PATCH net-next v3 15/15] sfc: leak vports if a VF is assigned during PF unload Shradha Shah
2015-06-02 20:02 ` [PATCH net-next v3 00/15] sfc: ndo_get_phys_port_id, vadaptor stats and PF unload when Vf's assigned to guest David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=556D87F5.3010406@solarflare.com \
--to=sshah@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-net-drivers@solarflare$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox