mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 05:34:13 -05:00
net: devmem: don't call queue stop / start when the interface is down
We seem to be missing a netif_running() check from the devmem installation path. Starting a queue on a stopped device makes no sense. We still want to be able to allocate the memory, just to test that the device is indeed setting up the page pools in a memory provider compatible way. This is not a bug fix, because existing drivers check if the interface is down as part of the ops. But new drivers shouldn't have to do this, as long as they can correctly alloc/free while down. Reviewed-by: Mina Almasry <almasrymina@google.com> Link: https://patch.msgid.link/20250206225638.1387810-3-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -117,6 +117,10 @@ struct netdev_stat_ops {
|
||||
*
|
||||
* @ndo_queue_stop: Stop the RX queue at the specified index. The stopped
|
||||
* queue's memory is written at the specified address.
|
||||
*
|
||||
* Note that @ndo_queue_mem_alloc and @ndo_queue_mem_free may be called while
|
||||
* the interface is closed. @ndo_queue_start and @ndo_queue_stop will only
|
||||
* be called for an interface which is open.
|
||||
*/
|
||||
struct netdev_queue_mgmt_ops {
|
||||
size_t ndo_queue_mem_size;
|
||||
|
||||
@@ -38,13 +38,17 @@ int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq_idx)
|
||||
if (err)
|
||||
goto err_free_new_queue_mem;
|
||||
|
||||
err = qops->ndo_queue_stop(dev, old_mem, rxq_idx);
|
||||
if (err)
|
||||
goto err_free_new_queue_mem;
|
||||
if (netif_running(dev)) {
|
||||
err = qops->ndo_queue_stop(dev, old_mem, rxq_idx);
|
||||
if (err)
|
||||
goto err_free_new_queue_mem;
|
||||
|
||||
err = qops->ndo_queue_start(dev, new_mem, rxq_idx);
|
||||
if (err)
|
||||
goto err_start_queue;
|
||||
err = qops->ndo_queue_start(dev, new_mem, rxq_idx);
|
||||
if (err)
|
||||
goto err_start_queue;
|
||||
} else {
|
||||
swap(new_mem, old_mem);
|
||||
}
|
||||
|
||||
qops->ndo_queue_mem_free(dev, old_mem);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user