2021-10-25 21:38:47

by Haiyang Zhang

Subject: [PATCH net-next] net: mana: Allow setting the number of queues while the NIC is down

The existing code doesn't allow setting the number of queues while the
NIC is down.

Update the ethtool handler functions to support setting the number of
queues while the NIC is at down state.

Signed-off-by: Haiyang Zhang <[email protected]>
---
drivers/net/ethernet/microsoft/mana/mana_en.c | 19 +++++++++----------
.../ethernet/microsoft/mana/mana_ethtool.c | 3 ---
2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index d65697c239c8..ef95f4017c6d 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1667,24 +1667,23 @@ int mana_attach(struct net_device *ndev)
if (err)
return err;

- err = mana_alloc_queues(ndev);
- if (err) {
- kfree(apc->rxqs);
- apc->rxqs = NULL;
- return err;
+ if (apc->port_st_save) {
+ err = mana_alloc_queues(ndev);
+ if (err) {
+ mana_cleanup_port_context(apc);
+ return err;
+ }
}

- netif_device_attach(ndev);
-
apc->port_is_up = apc->port_st_save;

/* Ensure port state updated before txq state */
smp_wmb();

- if (apc->port_is_up) {
+ if (apc->port_is_up)
netif_carrier_on(ndev);
- netif_tx_wake_all_queues(ndev);
- }
+
+ netif_device_attach(ndev);

return 0;
}
diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index 7e74339f39ae..c3c81ae3fafd 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -211,9 +211,6 @@ static int mana_set_channels(struct net_device *ndev,
unsigned int old_count = apc->num_queues;
int err, err2;

- if (!apc->port_is_up)
- return -EOPNOTSUPP;
-
err = mana_detach(ndev, false);
if (err) {
netdev_err(ndev, "mana_detach failed: %d\n", err);
--
2.25.1

2021-10-26 17:24:39

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] net: mana: Allow setting the number of queues while the NIC is down

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Mon, 25 Oct 2021 11:37:34 -0700 you wrote:
> The existing code doesn't allow setting the number of queues while the
> NIC is down.
>
> Update the ethtool handler functions to support setting the number of
> queues while the NIC is at down state.
>
> Signed-off-by: Haiyang Zhang <[email protected]>
>
> [...]

Here is the summary with links:
- [net-next] net: mana: Allow setting the number of queues while the NIC is down
https://git.kernel.org/netdev/net-next/c/a137c069fbc1

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html