Turn on the live MQ RX path when firmware sets IBMVETH_ILLAN_RX_MULTI_QUEUE_SUPPORT in H_ILLAN_ATTRIBUTES. Probe sets multi_queue and num_rx_queues to min(num_online_cpus(), IBMVETH_DEFAULT_QUEUES), matching the existing TX default (cap 8). Up to IBMVETH_MAX_RX_QUEUES (16) remains available via ethtool -L. Without the bit, behaviour stays single-queue. Wire subordinate queues through H_REG_LOGICAL_LAN_QUEUE (with irq_create_mapping for subordinate virqs), request_irq/napi_enable, and PHYP enable_irq when multi_queue && num_rx_queues > 1. Queue 0 continues to use netdev->irq and is never disposed with the subordinates. Restate open() here (supersedes the register-helpers patch kick): ... register_rx_queues / set_real_num_rx_queues ... replenish_task() for every live RX queue (before IRQ setup) setup_rx_interrupts() (MQ also unmasks PHYP) restart_rx_queue() for every live queue (schedule NAPI, or enable_irq if prep fails) ... alloc_tx_resources / tx_start / opened ... That path is the same for SQ and MQ. It replaces the prior setup-then-schedule_rx_queue(0) kick and the mailed v4 MQ-only replenish + kick_if_pending split. Close shape is unchanged. H_FUNCTION on subordinate register is a hard open failure (no silent single-queue fallback). Setup failure paths dispose subordinate virq mappings so a request_irq failure after successful registration cannot leak Linux mappings. Buffer-add H_FUNCTION latches mq_fallback so the next open drops to single-queue (apply_mq_fallback at open entry). On probe failure after pool kobjects were created, put them before free_netdev(). Refresh VIO CMO entitlement after MQ probe / pool init, sizing get_desired_dma() from queue-0 pool metadata across num_rx_queues. RX poll harden landed in the previous patch on the SQ poll path so this enablement patch stays focused on MQ bring-up. Hot-path accounting moves to the next patch (per-queue qstats). Signed-off-by: Mingming Cao Reviewed-by: Dave Marquardt Tested-by: Shaik Abdulla --- Changes in v5: - RTNL/serialized readers use get_num_rx_queues() once the helper exists (open/close/register/apply_mq_fallback/alloc/cleanup/IRQ setup) - Interrupt: quiet IRQ_NONE on out-of-range qindex vs published live count (scale-down residual IRQ; no WARN storm) - Series renumber: mailed v4 09/14 MQ enable -> tip P10 (P09 peel; 14->15) - Open: replenish all queues before setup; restart_rx_queue after setup for SQ and MQ - replaces mailed MQ-only replenish + kick_if_pending vs SQ schedule_rx_queue(0) - update_rx_no_buffer(queue_index): NULL-safe, no all-queue walk under one lock (fixes the resize/race class). Still stores adapter->rx_no_buffer for now; per-queue slot + monotonic sum lands with qstats next - H_FUNCTION: subordinate register fails open + stash mq_fallback; buffer-add schedules reset + mq_fallback so next open drops to SQ - Introduce get_num_rx_queues / publish_num_rx_queues (READ/WRITE_ONCE) at first use; lockless IRQ/poll/replenish/interrupt bounds use the getter - Introduce kick_rx_queue_if_pending() for pending-after-unmask; open uses restart_rx_queue, resize calls the helper later - resume() schedules every live RX queue (not only queue 0) - Call out enable_irq-fail synchronize_irq and unused mac register-arg cleanup (mailed enable-path review; code already earlier in tip) Changes in v4: - Fold subordinate register helpers and their review fixes into the MQ enablement patch that first uses them. - Prefer request_irq -> napi_enable -> PHYP enable on MQ open. - Preserve open unwind so set_real_num_rx / IRQ failures free LAN before buffer pools. - MQ open replenishes every queue before setup_rx_interrupts() unmasks PHYP (drop avoidance during open; PHYP only interrupts after a successful enqueue). SQ keeps classic setup-then-schedule kick. - Dispose subordinate virq mappings on setup_rx_interrupts() request_irq failure (err_free_irqs), matching err_disable_napi. - Open unwind: setup/cleanup own subordinate dispose; skip duplicate dispose on those paths. - H_FUNCTION on subordinate register is a hard open failure (no blind retry / no fake single-queue fallback). - Note: hot-path netdev->stats accounting moves to the next patch (qstats). - Put already-created pool kobjects on probe kobject_init_and_add / set_real_num_tx_queues / register_netdev failure (bisect-safe). drivers/net/ethernet/ibm/ibmveth.c | 504 +++++++++++++++++++++++++---- drivers/net/ethernet/ibm/ibmveth.h | 5 +- 2 files changed, 439 insertions(+), 70 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 86299c62d4ec..36f0926711e6 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -156,6 +156,22 @@ static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter, return ibmveth_rxq_flags(adapter, queue_index) & IBMVETH_RXQ_CSUM_GOOD; } +/* Lockless IRQ/poll readers vs resize publishers. */ +static inline unsigned int +ibmveth_get_num_rx_queues(const struct ibmveth_adapter *adapter) +{ + return READ_ONCE(adapter->num_rx_queues); +} + +static inline void +ibmveth_publish_num_rx_queues(struct ibmveth_adapter *adapter, + unsigned int num) +{ + /* Per-queue state must be visible before readers observe num. */ + smp_wmb(); + WRITE_ONCE(adapter->num_rx_queues, num); +} + static unsigned int ibmveth_real_max_tx_queues(void) { unsigned int n_cpu = num_online_cpus(); @@ -235,7 +251,7 @@ ibmveth_alloc_rx_queues(struct ibmveth_adapter *adapter, int rxq_entries) struct net_device *netdev = adapter->netdev; int i; - for (i = 0; i < adapter->num_rx_queues; i++) { + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { adapter->buffer_list_addr[i] = (void *)get_zeroed_page(GFP_KERNEL); if (!adapter->buffer_list_addr[i]) { @@ -283,7 +299,7 @@ ibmveth_alloc_rx_queues(struct ibmveth_adapter *adapter, int rxq_entries) } netdev_dbg(netdev, "allocated %d RX queue(s) with %d entries each\n", - adapter->num_rx_queues, rxq_entries); + ibmveth_get_num_rx_queues(adapter), rxq_entries); return 0; @@ -321,9 +337,9 @@ ibmveth_cleanup_rx_resources(struct ibmveth_adapter *adapter) int i; netdev_dbg(adapter->netdev, "cleaning up %d RX queue(s)\n", - adapter->num_rx_queues); + ibmveth_get_num_rx_queues(adapter)); - for (i = 0; i < adapter->num_rx_queues; i++) { + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { if (adapter->buffer_list_dma[i]) { dma_unmap_single(dev, adapter->buffer_list_dma[i], 4096, DMA_BIDIRECTIONAL); @@ -480,7 +496,7 @@ ibmveth_dispose_subordinate_irq_mappings(struct ibmveth_adapter *adapter) { int i; - for (i = 1; i < adapter->num_rx_queues; i++) + for (i = 1; i < ibmveth_get_num_rx_queues(adapter); i++) ibmveth_dispose_subordinate_irq_mapping(adapter, i); } @@ -503,7 +519,7 @@ static int ibmveth_setup_rx_interrupts(struct ibmveth_adapter *adapter) { struct net_device *netdev = adapter->netdev; - int i, rc, num = adapter->num_rx_queues; + int i, rc, num = ibmveth_get_num_rx_queues(adapter); for (i = 0; i < num; i++) { if (!adapter->queue_irq[i]) { @@ -587,24 +603,24 @@ ibmveth_cleanup_rx_interrupts(struct ibmveth_adapter *adapter) if (!adapter->rx_irq_setup) return; - for (i = 0; i < adapter->num_rx_queues; i++) { + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { if (!adapter->queue_irq[i]) continue; ibmveth_disable_irq(adapter, i); synchronize_irq(adapter->queue_irq[i]); } - for (i = 0; i < adapter->num_rx_queues; i++) + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) napi_disable(&adapter->napi[i]); - for (i = 0; i < adapter->num_rx_queues; i++) { + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { if (!adapter->queue_irq[i]) continue; ibmveth_disable_irq(adapter, i); synchronize_irq(adapter->queue_irq[i]); } - for (i = 0; i < adapter->num_rx_queues; i++) { + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { if (adapter->queue_irq[i]) free_irq(adapter->queue_irq[i], &adapter->napi[i]); } @@ -631,7 +647,7 @@ static bool ibmveth_schedule_rx_queue(struct ibmveth_adapter *adapter, struct napi_struct *napi = &adapter->napi[qindex]; int rc; - if (WARN_ON(qindex < 0 || qindex >= adapter->num_rx_queues)) + if (WARN_ON(qindex < 0 || qindex >= ibmveth_get_num_rx_queues(adapter))) return false; /* @@ -649,6 +665,24 @@ static bool ibmveth_schedule_rx_queue(struct ibmveth_adapter *adapter, return false; } +/** + * ibmveth_kick_rx_queue_if_pending - Schedule NAPI if PHYP posted while masked + * @adapter: ibmveth adapter + * @queue_index: RX queue index just unmasked + * + * After enable_irq() / MQ open unmask, descriptors may already be pending + * (buffers were posted while PHYP was masked). Use schedule_rx_queue() so + * PHYP is masked before NAPI runs — napi_schedule() then disable_irq() from + * process context can race a completing poll and leave the queue masked + * with NAPI idle. + */ +static void +ibmveth_kick_rx_queue_if_pending(struct ibmveth_adapter *adapter, + int queue_index) +{ + if (ibmveth_rxq_pending_buffer(adapter, queue_index)) + ibmveth_schedule_rx_queue(adapter, queue_index); +} /* setup the initial settings for a buffer pool */ static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_index, u32 pool_size, @@ -963,11 +997,21 @@ static int ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, * because there was not a buffer in the buffer list capable of holding * the frame. */ -static void ibmveth_update_rx_no_buffer(struct ibmveth_adapter *adapter) +static void ibmveth_update_rx_no_buffer(struct ibmveth_adapter *adapter, + int queue_index) { - __be64 *p = adapter->buffer_list_addr[0] + 4096 - 8; + __be64 *p; + u64 drops; + + if (queue_index < 0 || + queue_index >= ibmveth_get_num_rx_queues(adapter) || + !adapter->buffer_list_addr[queue_index]) + return; + + p = adapter->buffer_list_addr[queue_index] + 4096 - 8; + drops = be64_to_cpup(p); - adapter->rx_no_buffer = be64_to_cpup(p); + adapter->rx_no_buffer = drops; } /* replenish routine */ @@ -982,10 +1026,10 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter, int batch_fallback = 0; int hcall_fail = 0; - if (queue_index >= adapter->num_rx_queues) { + if (queue_index >= ibmveth_get_num_rx_queues(adapter)) { netdev_dbg(adapter->netdev, "Skipping replenish for freed queue %d (num_queues=%d)\n", - queue_index, adapter->num_rx_queues); + queue_index, ibmveth_get_num_rx_queues(adapter)); return; } @@ -1019,7 +1063,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter, } out_unlock: - ibmveth_update_rx_no_buffer(adapter); + ibmveth_update_rx_no_buffer(adapter, queue_index); spin_unlock_irqrestore(&rxq->replenish_lock, flags); @@ -1033,6 +1077,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter, dev_err_ratelimited(&adapter->netdev->dev, "MQ buffer add H_FUNCTION (q=%d, batch=%u), reset\n", queue_index, fail.batch); + adapter->mq_fallback = true; schedule_work(&adapter->work); } @@ -1052,6 +1097,30 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter, fail.filled, fail.lpar_rc, fail.batch); } +/** + * ibmveth_restart_rx_queue - Post buffers and ensure Q can take RX + * @adapter: ibmveth adapter + * @qindex: RX queue index + * + * SQ open leaves PHYP masked until the first poll. If schedule_prep fails, + * NAPI never runs and the queue stays masked (TX OK, RX/ARP dead) until + * reload. Replenish first so an enable_irq fallback can actually deliver. + * Also used after every open (SQ and MQ) and after scale-down so a + * queue is not left idle+masked. + */ +static void ibmveth_restart_rx_queue(struct ibmveth_adapter *adapter, + int qindex) +{ + int rc; + + ibmveth_replenish_task(adapter, qindex); + if (ibmveth_schedule_rx_queue(adapter, qindex)) + return; + + rc = ibmveth_enable_irq(adapter, qindex); + WARN_ON(rc); +} + /* empty and free ana buffer pool - also used to do cleanup in error paths */ static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter, struct ibmveth_buff_pool *pool) @@ -1180,7 +1249,7 @@ ibmveth_alloc_buffer_pools(struct ibmveth_adapter *adapter) int i, q, rc; /* Initialize pool metadata for queues 1..N from queue 0 settings */ - for (q = 1; q < adapter->num_rx_queues; q++) { + for (q = 1; q < ibmveth_get_num_rx_queues(adapter); q++) { for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { struct ibmveth_buff_pool *src = &adapter->rx_buff_pool[0][i]; @@ -1196,7 +1265,7 @@ ibmveth_alloc_buffer_pools(struct ibmveth_adapter *adapter) } /* Allocate actual buffers for all queues */ - for (q = 0; q < adapter->num_rx_queues; q++) { + for (q = 0; q < ibmveth_get_num_rx_queues(adapter); q++) { rc = ibmveth_alloc_queue_buffer_pools(adapter, q); if (rc) { /* Free pools for all previous queues */ @@ -1207,7 +1276,7 @@ ibmveth_alloc_buffer_pools(struct ibmveth_adapter *adapter) } netdev_dbg(netdev, "allocated buffer pools for %d queue(s)\n", - adapter->num_rx_queues); + ibmveth_get_num_rx_queues(adapter)); return 0; } @@ -1223,11 +1292,11 @@ ibmveth_free_buffer_pools(struct ibmveth_adapter *adapter) int q; /* Free buffer pools for all queues */ - for (q = 0; q < adapter->num_rx_queues; q++) + for (q = 0; q < ibmveth_get_num_rx_queues(adapter); q++) ibmveth_free_queue_buffer_pools(adapter, q); netdev_dbg(adapter->netdev, "freed buffer pools for %d queue(s)\n", - adapter->num_rx_queues); + ibmveth_get_num_rx_queues(adapter)); } static bool ibmveth_rxq_correlator_valid(struct ibmveth_adapter *adapter, @@ -1516,6 +1585,137 @@ static int ibmveth_register_logical_lan(struct ibmveth_adapter *adapter, return rc; } +/** + * ibmveth_register_logical_lan_queue - Register subordinate queue with + * hypervisor + * @adapter: ibmveth adapter structure + * @rxq_desc: Receive queue descriptor + * @queue_index: RX queue index (1..N for subordinate queues) + * + * Registers a subordinate receive queue using H_REG_LOGICAL_LAN_QUEUE. + * On success, stores the queue handle and virtual IRQ in the adapter. + * If IRQ mapping fails after a successful hypervisor registration, the + * queue is freed before returning. + * + * Return: H_SUCCESS on success, negative errno on IRQ mapping failure, + * hypervisor error code otherwise + */ +static int +ibmveth_register_logical_lan_queue(struct ibmveth_adapter *adapter, + union ibmveth_buf_desc rxq_desc, + int queue_index) +{ + unsigned long handle, hwirq; + unsigned int virq; + long lpar_rc; + unsigned long ua = adapter->vdev->unit_address; + unsigned long bl = adapter->buffer_list_dma[queue_index]; + + netdev_dbg(adapter->netdev, + "register queue %d: ua=0x%lx bl=0x%lx rxq=0x%llx\n", + queue_index, ua, bl, rxq_desc.desc); + do { + lpar_rc = h_register_logical_lan_queue(ua, bl, + rxq_desc.desc, &handle, + &hwirq); + } while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY)); + adapter->hcall_stats.reg_lan_queue++; + + if (lpar_rc == H_SUCCESS) { + virq = irq_create_mapping(NULL, hwirq); + if (!virq) { + unsigned long free_rc; + + netdev_err(adapter->netdev, + "Failed to map IRQ for queue %d (hwirq=%lu)\n", + queue_index, hwirq); + do { + free_rc = h_free_logical_lan_queue(ua, handle); + } while (H_IS_LONG_BUSY(free_rc) || + (free_rc == H_BUSY)); + adapter->hcall_stats.free_lan_queue++; + if (free_rc != H_SUCCESS) + netdev_err(adapter->netdev, + "h_free_logical_lan_queue failed for queue %d after IRQ map failure: rc=0x%lx\n", + queue_index, free_rc); + return -EINVAL; + } + + adapter->queue_handle[queue_index] = handle; + adapter->queue_irq[queue_index] = virq; + + netdev_dbg(adapter->netdev, + "queue %d registered: handle=0x%llx irq=%u\n", + queue_index, adapter->queue_handle[queue_index], + adapter->queue_irq[queue_index]); + return H_SUCCESS; + } + + /* + * H_FUNCTION means firmware rejected this subordinate register + * (MQ unsupported / dropped after LPM). Caller fails this open and + * latches mq_fallback so the next open applies SQ; keep a specific + * log then the generic failure lines below. + */ + if (lpar_rc == H_FUNCTION) + netdev_err(adapter->netdev, + "h_register_logical_lan_queue H_FUNCTION for queue %d (firmware MQ unsupported)\n", + queue_index); + + netdev_err(adapter->netdev, + "h_register_logical_lan_queue failed for queue %d with %ld\n", + queue_index, lpar_rc); + netdev_err(adapter->netdev, + "queue %d params: unit_addr=0x%x buffer_list_dma=0x%llx rxq_desc=0x%llx\n", + queue_index, adapter->vdev->unit_address, + adapter->buffer_list_dma[queue_index], + rxq_desc.desc); + + return lpar_rc; +} + +/** + * ibmveth_register_single_rx_queue - Register one subordinate RX queue + * @adapter: ibmveth adapter structure + * @queue_idx: Queue index to register (1..N) + * + * Builds the queue descriptor and registers with the hypervisor via + * ibmveth_register_logical_lan_queue(). + * + * Return: 0 on success, -EINVAL if @queue_idx is invalid, -EOPNOTSUPP if + * firmware rejects MQ (H_FUNCTION), -EIO on other failures + */ +static int +ibmveth_register_single_rx_queue(struct ibmveth_adapter *adapter, + int queue_idx) +{ + struct net_device *netdev = adapter->netdev; + union ibmveth_buf_desc rxq_desc; + long lpar_rc; + + if (WARN_ON(queue_idx < 1 || queue_idx >= IBMVETH_MAX_RX_QUEUES)) + return -EINVAL; + + rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | + adapter->rx_queue[queue_idx].queue_len; + rxq_desc.fields.address = adapter->rx_queue[queue_idx].queue_dma; + + lpar_rc = ibmveth_register_logical_lan_queue(adapter, rxq_desc, + queue_idx); + if (lpar_rc != H_SUCCESS) { + netdev_err(netdev, "Failed to register queue %d: rc=0x%lx\n", + queue_idx, lpar_rc); + if (lpar_rc == H_FUNCTION) + return -EOPNOTSUPP; + return -EIO; + } + + netdev_dbg(netdev, "Registered queue %d with handle 0x%llx\n", + queue_idx, adapter->queue_handle[queue_idx]); + + return 0; +} + /** * ibmveth_free_all_queues - Free all RX queues at once * @adapter: ibmveth adapter structure @@ -1528,7 +1728,8 @@ static int ibmveth_register_logical_lan(struct ibmveth_adapter *adapter, * Used during interface close and registration error cleanup. * * Clears queue handles only; queue_irq[] is released by - * ibmveth_cleanup_rx_interrupts(). + * ibmveth_cleanup_rx_interrupts() on close, or by + * ibmveth_dispose_subordinate_irq_mappings() on partial register failure. */ static void ibmveth_free_all_queues(struct ibmveth_adapter *adapter) { @@ -1547,7 +1748,7 @@ static void ibmveth_free_all_queues(struct ibmveth_adapter *adapter) "h_free_logical_lan failed: %ld\n", lpar_rc); } - for (i = 0; i < adapter->num_rx_queues; i++) + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) adapter->queue_handle[i] = 0; } @@ -1556,10 +1757,12 @@ static void ibmveth_free_all_queues(struct ibmveth_adapter *adapter) * @adapter: ibmveth adapter structure * @mac_address: MAC address for device registration * - * Registers queue 0 via ibmveth_register_logical_lan(). Subordinate queue - * registration is added when multi-queue RX is enabled. + * Registers queue 0 via ibmveth_register_logical_lan(), then subordinate + * queues 1..N when multi-queue mode is enabled. * - * Return: 0 on success, -ENONET if queue 0 registration fails + * Return: 0 on success, -ENONET if queue 0 registration fails, + * -EOPNOTSUPP if firmware rejects a subordinate queue (H_FUNCTION; + * caller latches mq_fallback), -EIO on other subordinate failures */ static int ibmveth_register_rx_queues(struct ibmveth_adapter *adapter, u64 mac_address) @@ -1567,7 +1770,8 @@ ibmveth_register_rx_queues(struct ibmveth_adapter *adapter, u64 mac_address) struct net_device *netdev = adapter->netdev; union ibmveth_buf_desc rxq_desc; unsigned long lpar_rc; - int rc; + unsigned int num; + int i, rc; rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | adapter->rx_queue[0].queue_len; @@ -1592,9 +1796,67 @@ ibmveth_register_rx_queues(struct ibmveth_adapter *adapter, u64 mac_address) return -ENONET; } + num = ibmveth_get_num_rx_queues(adapter); + if (num == 1 || !adapter->multi_queue) { + netdev_dbg(netdev, + "registered 1 RX queue with hypervisor (single-queue mode)\n"); + return 0; + } + + netdev_dbg(netdev, "Registering %d subordinate queues (1-%d)\n", + num - 1, num - 1); + + for (i = 1; i < num; i++) { + rc = ibmveth_register_single_rx_queue(adapter, i); + if (rc) { + /* Firmware MQ gone: fall back to SQ on next open. */ + if (rc == -EOPNOTSUPP) + adapter->mq_fallback = true; + goto err_unregister; + } + } + netdev_dbg(netdev, - "registered 1 RX queue with hypervisor (single-queue mode)\n"); + "registered %d RX queues with hypervisor (multi-queue mode)\n", + num); + return 0; + +err_unregister: + ibmveth_dispose_subordinate_irq_mappings(adapter); + ibmveth_free_all_queues(adapter); + return rc; +} + +/** + * ibmveth_apply_mq_fallback - Drop multi-queue mode after firmware rejection + * @adapter: ibmveth adapter + * + * mq_fallback is latched when firmware rejects MQ (subordinate register or + * buffer-add H_FUNCTION). Apply only at the start of open after teardown so + * num_rx_queues is not shrunk while IRQ/NAPI still reference higher queues. + * Clears multi_queue and forces a single RX queue so subsequent + * register/buffer hcalls use the classic single-queue path. + */ +static void ibmveth_apply_mq_fallback(struct ibmveth_adapter *adapter) +{ + struct net_device *netdev = adapter->netdev; + + if (!adapter->mq_fallback) + return; + + adapter->mq_fallback = false; + + if (!adapter->multi_queue && ibmveth_get_num_rx_queues(adapter) == 1) + return; + + netdev_warn(netdev, + "Falling back to single RX queue (firmware MQ unavailable)\n"); + adapter->multi_queue = 0; + ibmveth_publish_num_rx_queues(adapter, 1); + /* real_num_rx_queues is set later in open after resources exist. */ + if (adapter->rx_buffers_per_hcall > IBMVETH_MAX_RX_REGULAR) + adapter->rx_buffers_per_hcall = IBMVETH_MAX_RX_REGULAR; } static int ibmveth_open(struct net_device *netdev) @@ -1607,6 +1869,8 @@ static int ibmveth_open(struct net_device *netdev) netdev_dbg(netdev, "open starting\n"); + ibmveth_apply_mq_fallback(adapter); + for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) rxq_entries += adapter->rx_buff_pool[0][i].size; @@ -1626,18 +1890,33 @@ static int ibmveth_open(struct net_device *netdev) if (rc) goto out_free_buffer_pools; - rc = netif_set_real_num_rx_queues(netdev, adapter->num_rx_queues); + rc = netif_set_real_num_rx_queues(netdev, + ibmveth_get_num_rx_queues(adapter)); + if (rc) { netdev_err(netdev, "failed to set number of rx queues\n"); goto out_unregister_queues; } + /* + * Post buffers before setup_rx_interrupts(). MQ setup then unmasks + * PHYP; SQ setup leaves PHYP masked. kick_if_pending alone is not + * enough: after ifdown/up (RX=8, no -L) NAPI can be idle with no + * pending descriptor and the queue stays dead (TX OK, ARP/RX fail). + * restart_rx_queue() replenishes, schedules NAPI, and unmasks if + * prep fails. + */ + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) { + netdev_dbg(netdev, "initial replenish cycle for queue %d\n", i); + ibmveth_replenish_task(adapter, i); + } + rc = ibmveth_setup_rx_interrupts(adapter); if (rc) goto out_free_all_queues; /* setup already disposed IRQs */ - netdev_dbg(netdev, "initial replenish cycle\n"); - ibmveth_schedule_rx_queue(adapter, 0); + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) + ibmveth_restart_rx_queue(adapter, i); rc = ibmveth_alloc_tx_resources(adapter); if (rc) @@ -1670,6 +1949,7 @@ static int ibmveth_open(struct net_device *netdev) static int ibmveth_close(struct net_device *netdev) { struct ibmveth_adapter *adapter = netdev_priv(netdev); + int i; /* Gate on opened, not IFF_UP: pool_store/change_mtu close+open can * leave IFF_UP set after a failed reopen. @@ -1690,7 +1970,8 @@ static int ibmveth_close(struct net_device *netdev) /* Wait for softirq/poll that already passed shutdown checks. */ synchronize_net(); - ibmveth_update_rx_no_buffer(adapter); + for (i = 0; i < ibmveth_get_num_rx_queues(adapter); i++) + ibmveth_update_rx_no_buffer(adapter, i); ibmveth_free_all_queues(adapter); /* Free TX LTBs after quiesce and after H_FREE_LOGICAL_LAN so xmit * cannot touch unmapped bounce buffers while the LAN is live. @@ -2094,6 +2375,7 @@ static int ibmveth_send(struct ibmveth_adapter *adapter, return 1; } + adapter->hcall_stats.send_lan++; return 0; } @@ -2501,7 +2783,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) queue_index = napi - adapter->napi; if (WARN_ON(queue_index < 0 || - queue_index >= adapter->num_rx_queues)) { + queue_index >= ibmveth_get_num_rx_queues(adapter))) { napi_complete_done(napi, 0); return 0; } @@ -2589,10 +2871,11 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance) qindex = napi - adapter->napi; /* - * Quiet on out-of-range: teardown can leave a residual IRQ after the - * live count drops. Do not WARN-storm; return IRQ_NONE until free_irq. + * Quiet on out-of-range: scale-down publishes a lower live count + * before free_irq(). A residual IRQ must not WARN-storm; return + * IRQ_NONE until the handler is removed. */ - if (qindex < 0 || qindex >= adapter->num_rx_queues) + if (qindex < 0 || qindex >= ibmveth_get_num_rx_queues(adapter)) return IRQ_NONE; ibmveth_schedule_rx_queue(adapter, qindex); @@ -2701,9 +2984,14 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu) static void ibmveth_poll_controller(struct net_device *dev) { struct ibmveth_adapter *adapter = netdev_priv(dev); + unsigned int num = ibmveth_get_num_rx_queues(adapter); + int i; - ibmveth_replenish_task(adapter, 0); - ibmveth_schedule_rx_queue(adapter, 0); + for (i = 0; i < num; i++) + ibmveth_replenish_task(adapter, i); + + for (i = 0; i < num; i++) + ibmveth_schedule_rx_queue(adapter, i); } #endif @@ -2721,8 +3009,7 @@ static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev) struct ibmveth_adapter *adapter; struct iommu_table *tbl; unsigned long ret; - int i; - int rxqentries = 1; + int i, q; tbl = get_iommu_table_base(&vdev->dev); @@ -2732,23 +3019,35 @@ static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev) adapter = netdev_priv(netdev); - ret = IBMVETH_BUFF_LIST_SIZE + IBMVETH_FILT_LIST_SIZE; + /* One buffer list page per RX queue; filter list is shared. */ + ret = IBMVETH_BUFF_LIST_SIZE * ibmveth_get_num_rx_queues(adapter) + + IBMVETH_FILT_LIST_SIZE; ret += IOMMU_PAGE_ALIGN(netdev->mtu, tbl); /* add size of mapped tx buffers */ ret += IOMMU_PAGE_ALIGN(IBMVETH_MAX_TX_BUF_SIZE, tbl); - for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { - /* add the size of the active receive buffers */ - if (adapter->rx_buff_pool[0][i].active) - ret += - adapter->rx_buff_pool[0][i].size * - IOMMU_PAGE_ALIGN(adapter->rx_buff_pool[0][i]. - buff_size, tbl); - rxqentries += adapter->rx_buff_pool[0][i].size; - } - /* add the size of the receive queue entries */ - ret += IOMMU_PAGE_ALIGN( - rxqentries * sizeof(struct ibmveth_rx_q_entry), tbl); + /* + * Pool metadata for queues 1+ is copied from queue 0 at open. + * Always size from pool 0 x num_rx_queues (valid at probe before that + * copy). + */ + for (q = 0; q < ibmveth_get_num_rx_queues(adapter); q++) { + int rxqentries = 1; + + for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { + struct ibmveth_buff_pool *bpool = + &adapter->rx_buff_pool[0][i]; + + if (bpool->active) + ret += bpool->size * + IOMMU_PAGE_ALIGN(bpool->buff_size, tbl); + rxqentries += bpool->size; + } + + /* add the size of the receive queue entries */ + ret += IOMMU_PAGE_ALIGN(rxqentries * + sizeof(struct ibmveth_rx_q_entry), tbl); + } return ret; } @@ -2813,9 +3112,18 @@ static const struct net_device_ops ibmveth_netdev_ops = { #endif }; +static void ibmveth_put_pool_kobjs(struct ibmveth_adapter *adapter, + int pools_ready) +{ + int i; + + for (i = 0; i < pools_ready; i++) + kobject_put(&adapter->rx_buff_pool[0][i].kobj); +} + static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) { - int rc, i, mac_len; + int rc, i, mac_len, pools_ready = 0; struct net_device *netdev; struct ibmveth_adapter *adapter; unsigned char *mac_addr_p; @@ -2850,7 +3158,8 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) return -EINVAL; } - netdev = alloc_etherdev_mqs(sizeof(struct ibmveth_adapter), IBMVETH_MAX_QUEUES, 1); + netdev = alloc_etherdev_mqs(sizeof(struct ibmveth_adapter), + IBMVETH_MAX_QUEUES, IBMVETH_MAX_RX_QUEUES); if (!netdev) return -ENOMEM; @@ -2863,7 +3172,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p); ibmveth_init_link_settings(netdev); - netif_napi_add_weight(netdev, &adapter->napi[0], ibmveth_poll, 16); + for (i = 0; i < IBMVETH_MAX_RX_QUEUES; i++) + netif_napi_add_weight(netdev, &adapter->napi[i], + ibmveth_poll, 16); netdev->irq = dev->irq; netdev->netdev_ops = &ibmveth_netdev_ops; @@ -2895,16 +3206,29 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) netdev->features |= NETIF_F_FRAGLIST; } - /* Initialize queue count - always 1 for now */ - adapter->multi_queue = 0; - adapter->num_rx_queues = IBMVETH_DEFAULT_RX_QUEUES; + if (ret == H_SUCCESS && + (ret_attr & IBMVETH_ILLAN_RX_MULTI_QUEUE_SUPPORT)) { + adapter->multi_queue = 1; + ibmveth_publish_num_rx_queues(adapter, + min(num_online_cpus(), + IBMVETH_DEFAULT_QUEUES)); + netdev_dbg(netdev, "RX multi queue mode enabled: %d queues\n", + ibmveth_get_num_rx_queues(adapter)); + } else { + adapter->multi_queue = 0; + ibmveth_publish_num_rx_queues(adapter, + IBMVETH_DEFAULT_RX_QUEUES); + } if (ret == H_SUCCESS && (ret_attr & IBMVETH_ILLAN_RX_MULTI_BUFF_SUPPORT)) { - adapter->rx_buffers_per_hcall = IBMVETH_MAX_RX_REGULAR; + if (adapter->multi_queue) + adapter->rx_buffers_per_hcall = IBMVETH_MAX_RX_QUEUE; + else + adapter->rx_buffers_per_hcall = IBMVETH_MAX_RX_REGULAR; netdev_dbg(netdev, "RX Multi-buffer hcall supported by FW, batch set to %u\n", - adapter->rx_buffers_per_hcall); + adapter->rx_buffers_per_hcall); } else { adapter->rx_buffers_per_hcall = 1; netdev_dbg(netdev, @@ -2922,25 +3246,62 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { struct kobject *kobj = &adapter->rx_buff_pool[0][i].kobj; - int error; ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0][i], i, pool_count[i], pool_size[i], pool_active[i]); - error = kobject_init_and_add(kobj, &ktype_veth_pool, - &dev->dev.kobj, "pool%d", i); - if (!error) - kobject_uevent(kobj, KOBJ_ADD); + rc = kobject_init_and_add(kobj, &ktype_veth_pool, + &dev->dev.kobj, "pool%d", i); + if (rc) { + dev_err(&dev->dev, + "failed to create pool%d kobject: %d\n", i, rc); + /* init_and_add takes a ref even on failure */ + kobject_put(kobj); + ibmveth_put_pool_kobjs(adapter, pools_ready); + dev_set_drvdata(&dev->dev, NULL); + free_netdev(netdev); + return rc; + } + + pools_ready++; + kobject_uevent(kobj, KOBJ_ADD); } + /* + * VIO CMO entitlement was set before probe (netdev NULL → default). + * Recompute now that num_rx_queues and pool 0 metadata are known. + */ + if (firmware_has_feature(FW_FEATURE_CMO)) + vio_cmo_set_dev_desired(dev, ibmveth_get_desired_dma(dev)); + rc = netif_set_real_num_tx_queues(netdev, min(num_online_cpus(), IBMVETH_DEFAULT_QUEUES)); if (rc) { netdev_dbg(netdev, "failed to set number of tx queues rc=%d\n", rc); + ibmveth_put_pool_kobjs(adapter, pools_ready); + dev_set_drvdata(&dev->dev, NULL); free_netdev(netdev); return rc; } + + /* + * alloc_etherdev_mqs() sized real_num_rx_queues to MAX. Match the + * advertised default (or SQ 1) before register_netdev so down-state + * readers agree with adapter->num_rx_queues / ethtool -l. + */ + rc = netif_set_real_num_rx_queues(netdev, + ibmveth_get_num_rx_queues(adapter)); + + if (rc) { + netdev_dbg(netdev, "failed to set number of rx queues rc=%d\n", + rc); + ibmveth_put_pool_kobjs(adapter, pools_ready); + dev_set_drvdata(&dev->dev, NULL); + free_netdev(netdev); + return rc; + } + adapter->tx_ltb_size = PAGE_ALIGN(IBMVETH_MAX_TX_BUF_SIZE); for (i = 0; i < IBMVETH_MAX_QUEUES; i++) adapter->tx_ltb_ptr[i] = NULL; @@ -2954,6 +3315,8 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) if (rc) { netdev_dbg(netdev, "failed to register netdev rc=%d\n", rc); + ibmveth_put_pool_kobjs(adapter, pools_ready); + dev_set_drvdata(&dev->dev, NULL); free_netdev(netdev); return rc; } @@ -3125,7 +3488,6 @@ static ssize_t veth_pool_store(struct kobject *kobj, struct attribute *attr, return rc; } - #define ATTR(_name, _mode) \ struct attribute veth_##_name##_attr = { \ .name = __stringify(_name), .mode = _mode, \ @@ -3158,8 +3520,12 @@ static int ibmveth_resume(struct device *dev) { struct net_device *netdev = dev_get_drvdata(dev); struct ibmveth_adapter *adapter = netdev_priv(netdev); + unsigned int num = ibmveth_get_num_rx_queues(adapter); + int i; + + for (i = 0; i < num; i++) + ibmveth_schedule_rx_queue(adapter, i); - ibmveth_schedule_rx_queue(adapter, 0); return 0; } diff --git a/drivers/net/ethernet/ibm/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h index d02444d5b3b8..1394ef97bd8d 100644 --- a/drivers/net/ethernet/ibm/ibmveth.h +++ b/drivers/net/ethernet/ibm/ibmveth.h @@ -30,6 +30,7 @@ #define IbmVethMcastRemoveFilter 0x2UL #define IbmVethMcastClearFilterTable 0x3UL +#define IBMVETH_ILLAN_RX_MULTI_QUEUE_SUPPORT 0x0000000000080000UL #define IBMVETH_ILLAN_RX_MULTI_BUFF_SUPPORT 0x0000000000040000UL #define IBMVETH_ILLAN_LRG_SR_ENABLED 0x0000000000010000UL #define IBMVETH_ILLAN_LRG_SND_SUPPORT 0x0000000000008000UL @@ -259,9 +260,10 @@ static inline long h_illan_attributes(unsigned long unit_address, #define IBMVETH_MAX_TX_BUF_SIZE (1024 * 64) #define IBMVETH_MAX_QUEUES 16U #define IBMVETH_DEFAULT_QUEUES 8U -#define IBMVETH_MAX_RX_QUEUES 1U +#define IBMVETH_MAX_RX_QUEUES 16U #define IBMVETH_DEFAULT_RX_QUEUES 1U #define IBMVETH_MAX_RX_REGULAR 8U +#define IBMVETH_MAX_RX_QUEUE 12U #define IBMVETH_MAX_RX_PER_HCALL 12U static int pool_size[] = { 512, 1024 * 2, 1024 * 16, 1024 * 32, 1024 * 64 }; @@ -327,6 +329,7 @@ struct ibmveth_adapter { unsigned int queue_irq[IBMVETH_MAX_RX_QUEUES]; int multi_queue; unsigned int num_rx_queues; + bool mq_fallback; /* Lifetime: true after successful ndo_open until close clears it. */ bool opened; /* Lifetime: true while RX IRQ handlers / NAPI are installed. */ -- 2.50.1 (Apple Git-155)