Changing an RX ring can leave the shared free queue order unchanged while increasing the number of pages which may be in flight. The queue resize fast path then retains a metadata pool sized for the old RX rings. A failed resize also leaves the new RX order installed, and open accepts -EBUSY and proceeds with that larger ring. Derive the required metadata capacity in one helper and include it in the resize fast path. Reuse an oversized queue only while another port is running; otherwise rebuild it at the requested order so downsizing releases the surplus pages. Propagate resize failures from open and restore the old RX order after a failed ethtool request. Assisted-by: LLM Signed-off-by: Linus Walleij --- drivers/net/ethernet/cortina/gemini.c | 51 ++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 284823bdfd50..cd5ded7384a5 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1068,21 +1068,31 @@ static void geth_freeq_release_pages(struct gemini_ethernet *geth) xa_destroy(&geth->freeq_mappings); } +static unsigned int +geth_freeq_page_slots(struct gemini_ethernet *geth, unsigned int order) +{ + unsigned int fpp_order = PAGE_SHIFT - geth->freeq_frag_order; + unsigned int slots = 1 << (order - fpp_order); + + if (geth->port0 && geth->port0->netdev) + slots += 1 << geth->port0->rxq_order; + if (geth->port1 && geth->port1->netdev) + slots += 1 << geth->port1->rxq_order; + + return slots; +} + static int geth_setup_freeq(struct gemini_ethernet *geth) { unsigned int fpp_order = PAGE_SHIFT - geth->freeq_frag_order; unsigned int len = 1 << geth->freeq_order; - unsigned int pages = len >> fpp_order; - unsigned int page_slots = pages; + unsigned int page_slots; unsigned int expected; union queue_threshold qt; union dma_skb_size skbsz; unsigned int filled; - if (geth->port0) - page_slots += 1 << geth->port0->rxq_order; - if (geth->port1) - page_slots += 1 << geth->port1->rxq_order; + page_slots = geth_freeq_page_slots(geth, geth->freeq_order); geth->freeq_ring = dma_alloc_coherent(geth->dev, sizeof(*geth->freeq_ring) << geth->freeq_order, @@ -1196,7 +1206,9 @@ static int geth_resize_freeq(struct gemini_ethernet_port *port) struct net_device *netdev = port->netdev; struct gemini_ethernet_port *other_port; struct net_device *other_netdev; + bool other_running; unsigned int new_size = 0; + unsigned int page_slots; unsigned int new_order; int ret; @@ -1211,9 +1223,7 @@ static int geth_resize_freeq(struct gemini_ethernet_port *port) else other_port = geth->port0; other_netdev = other_port ? other_port->netdev : NULL; - - if (other_netdev && netif_running(other_netdev)) - return -EBUSY; + other_running = other_netdev && netif_running(other_netdev); new_size = 1 << (port->rxq_order + 1); netdev_dbg(netdev, "port %d size: %d order %d\n", @@ -1234,8 +1244,16 @@ static int geth_resize_freeq(struct gemini_ethernet_port *port) if (new_order <= PAGE_SHIFT - geth->freeq_frag_order) return -EINVAL; - if (geth->freeq_ring && geth->freeq_order == new_order) - return 0; + if (geth->freeq_ring) { + page_slots = geth_freeq_page_slots(geth, geth->freeq_order); + if (geth->num_freeq_pages >= page_slots && + (geth->freeq_order == new_order || + (other_running && geth->freeq_order > new_order))) + return 0; + } + + if (other_running) + return -EBUSY; disable_irq(geth->port1->irq); geth_set_freeq_irq(geth, false); @@ -2014,10 +2032,7 @@ static int gmac_open(struct net_device *netdev) phy_start(netdev->phydev); err = geth_resize_freeq(port); - /* It's fine if it's just busy, the other port has set up - * the freeq in that case. - */ - if (err && (err != -EBUSY)) { + if (err) { netdev_err(netdev, "could not resize freeq\n"); goto err_stop_phy; } @@ -2376,14 +2391,20 @@ static int gmac_set_ringparam(struct net_device *netdev, struct netlink_ext_ack *extack) { struct gemini_ethernet_port *port = netdev_priv(netdev); + unsigned int old_rxq_order; int err = 0; if (netif_running(netdev)) return -EBUSY; if (rp->rx_pending) { + old_rxq_order = port->rxq_order; port->rxq_order = min(15, ilog2(rp->rx_pending - 1) + 1); err = geth_resize_freeq(port); + if (err) { + port->rxq_order = old_rxq_order; + return err; + } } if (rp->tx_pending) { port->txq_order = min(15, ilog2(rp->tx_pending - 1) + 1); -- 2.56.0