Skip to content

ibmveth: Add multi-queue RX support

Mingming Cao linux-perf-users linuxppc-dev lkml netdev 8 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest15 patches 0 repliesNew
  2. v715 patches 3 repliesSuperseded
  3. v615 patches 12 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v515 patches30 repliesSuperseded
v414 patches30 repliesSuperseded
v315 patches21 repliesSuperseded
v215 patches0 repliesSuperseded
v118 patches0 repliesSuperseded

Changes in v5 from the cover letter

* Restack mailed v4 (14 patches) to v5 (15):

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15ibmveth: Add MQ RX hypercall wrappers and call definitionsarch/powerpc/include/asm/hvcall.h drivers/net/ethernet/ibm/ibmveth.h tools/perf/python/powerpc-hcalls.py+155 -10 replies
2/15ibmveth: Prepare MQ RX adapter data structuresdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+141 -1160 replies
3/15ibmveth: Refactor RX resource allocation for MQ RX bring-updrivers/net/ethernet/ibm/ibmveth.c+206 -780 replies
4/15ibmveth: Refactor buffer pool management for per-queue MQ RXdrivers/net/ethernet/ibm/ibmveth.c+139 -200 replies
5/15ibmveth: Refactor RX interrupt control for MQ RX queuesdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+357 -490 replies
6/15ibmveth: Refactor TX resource allocation in open/close pathsdrivers/net/ethernet/ibm/ibmveth.c+89 -220 replies
7/15ibmveth: Add RX queue register helpers for MQdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+159 -460 replies
8/15ibmveth: Add queue-aware RX buffer submit helper for MQdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+459 -1780 replies
9/15ibmveth: Split RX poll into per-slot helpers for MQdrivers/net/ethernet/ibm/ibmveth.c+259 -1760 replies
10/15ibmveth: Enable multi-queue RX receive pathdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+579 -1090 replies
11/15ibmveth: Add per-queue RX and TX statistics collectiondrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+542 -670 replies
12/15ibmveth: Report MQ-aware RX counts in ethtool get_channelsdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+12 -60 replies
13/15ibmveth: Expose per-queue buffer pool details via debugfsdrivers/net/ethernet/ibm/ibmveth.c drivers/net/ethernet/ibm/ibmveth.h+81 -10 replies
14/15ibmveth: Implement incremental MQ RX queue resizedrivers/net/ethernet/ibm/ibmveth.c+1078 -740 replies
15/15ibmveth: Complete set_channels down-pathdrivers/net/ethernet/ibm/ibmveth.c+105 -390 replies

Reviews trailers per patch

All 15 patches have a Reviewed-by or Acked-by.

PatchDave MarquardtShaik Abdulla
1/15R-b T-b
2/15R-b T-b
3/15R-b T-b
4/15R-b T-b
5/15R-b T-b
6/15R-b T-b
7/15R-b T-b
8/15R-b T-b
9/15R-b T-b
10/15R-b T-b
11/15R-b T-b
12/15R-b T-b
13/15R-b T-b
14/15R-b T-b
15/15R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v8 thread

Cover letter [PATCH net-next v8 00/15] ibmveth: Add multi-queue RX support

Hi,

Power11 PHYP adds Virtual Ethernet multi-queue (MQ) RX: multiple logical-LAN RX queues, per-queue buffer posting, and completion delivery. Guest Linux did not use that; ibmveth still registered one RX queue even when PHYP was MQ-capable.

This series adds the ibmveth MQ client for net-next. When PHYP advertises IBMVETH_ILLAN_RX_MULTI_QUEUE_SUPPORT via H_ILLAN_ATTRIBUTES, probe enables MQ with a default RX count of min(num_online_cpus(), 8) (same cap as TX today); ethtool -L can raise RX up to 16. Packets are received on per-queue NAPI. Older firmware without the bit is unchanged. Queue selection remains firmware-defined (PHYP hash). Ethtool RSS hash get/set for that algorithm is deferred to a follow-up series so this one stays MQ datapath only.

User-visible bits: ethtool -l/-L (channels); standard per-queue packets/bytes and RX drops via netdev_stat_ops, with ndo_get_stats64 as the aggregate (including queues since removed); and a read-only debugfs buffer_pools dump. ethtool -S keeps its existing keys and adds per-queue driver counters (rx%d_interrupts, rx%d_polls, rx%d_large_packets, rx%d_invalid_buffers, tx%d_send_failures). rx_no_buffer is now cumulative across close/open instead of the current buffer-list page's count, and no-buffer drops show up as rx_missed_errors. poolN/ sysfs is unchanged.

This version is based on net-next, which now has the two open() error-path fixes (af0524bf4ce1, 84bec0bf0352) and the nine ibmveth fixes that came out of the v7 review (merge d53a5309cc4a, [1]). The MQ patches extend that handling per queue instead of carrying their own copy, so this series no longer fixes single-queue bugs. Patch 5 makes the wait from commit 3f872b34368c ("ibmveth: wait for the RX poll to return before freeing the RX queue") per queue, and patch 9 keeps the header checks from commit 9486c89a8e15 ("ibmveth: check headers in the RX large send and checksum helpers").

Background:

ibmveth today uses one logical LAN, one set of buffer pools, and one NAPI context. PHYP MQ mode gives each RX queue its own handle (post via H_ADD_LOGICAL_LAN_BUFFERS_QUEUE, subordinate register via H_REG_LOGICAL_LAN_QUEUE); traffic can land on any active queue. The driver needs per-queue pools, IRQs, and NAPI to match. Legacy firmware keeps the original hcall path.

Series layout (15 patches):

1-2 Hypercall wrappers; MQ adapter layout (MAX_RX_QUEUES stays 1)
3-9 Queue-aware helpers (still SQ runtime): RX, per-queue pools,
IRQ, TX, PHYP register (open/close 3-7); buffer submit (8); split RX poll helpers for MQ (9)
10 Enable MQ datapath at probe/open (subordinate register helpers
land here with first use)
11-13 Per-queue RX/TX stats; get_channels MQ counts; debugfs buffer_pools
14 Incremental RX resize; live ethtool -L rx
15 Down-path publish

- Helper patches (3-7) reshape ibmveth_open()/close() into queue-aware helpers; patch 8 adds the queue-aware buffer submit used by replenish. Patch 9 splits the SQ poll path into per-slot helpers for MQ; it does not change open/close. MQ stays off through 3-9: num_rx_queues stays 1 and multi_queue is false until patch 10. The live single-queue path still changes where the review required it (IRQ teardown wait and remask, replenish lock, poll harden).
- Patch 10 is the switch: probe sets multi_queue from firmware and raises num_rx_queues; open() registers the subordinate queues and replenishes every active queue.
- Patch 11 moves counters per queue and exports packets/bytes and RX drops through netdev_stat_ops. The existing -S keys stay, and per-queue driver keys are added.

Testing:

W=1 ibmveth.o at every commit (plain and KUnit), KUnit 5/5 at tip (qemu pseries).

ppc64le PowerVM LPARs on POWER11, MQ and legacy firmware, all passing on this version:
* channels: ethtool -l/-L with the interface up and down, mq_fallback, module reload
* stats: qstats vs ethtool -S vs ip -s link; counters across ifdown/up and queue removal
* resize under iperf3 RX+TX: ethtool -L 1..16 with RX spread checked at each step, and -L cycling in parallel with ifdown/up
* close/open under iperf3 load (MQ and rx 1)
* rx 1 on MQ firmware and legacy firmware: ifdown/up churn, soak, stats

Changes in v8:

Same 15 patches as v7, rebased onto net-next, which now carries the open-fail pair and the nine ibmveth fixes. v7's in-tree copies of those single-queue fixes are gone; the per-patch --- notes list what each commit dropped and which merged commit owns it. The rest comes from the v7 review and our own re-review.

Code changes:
* Patch 4: a pool-alloc failure in open() unwinds through h_free_logical_lan(), as the merged open-fail fix does.
* Patch 5: teardown runs synchronize_net() after napi_disable(), then remasks and frees the IRQ; close() keeps net-next's no_buffer order.
* Patch 6: open() starts with netif_tx_disable() and starts the TX queues under netif_tx_lock_bh(), since NAPI and generic XDP_TX are already live.
* Patch 7: queue_registered[] marks a live slot (handle 0 is valid); ibmveth_register_logical_lan() returns long.
* Patch 8: replenish_lock is spin_lock_bh(); poll reads each correlator once and harvest resets on a bad one.
* Patch 9: bad and oversize slots count rx_dropped and consume budget; a poll that uses its whole budget returns without completing NAPI.
* Patch 10: in MQ mode a hard H_FREE_LOGICAL_LAN failure keeps the LAN memory mapped until the next open() or remove() frees it; poolN writes return -EBUSY meanwhile. Single queue still unmaps. restart_rx_queue() no longer unmasks PHYP; apply_mq_fallback() sets real_num to 1; set_channels rejects an RX change until patch 14.
* Patch 11: counters use WRITE_ONCE()/READ_ONCE(); no_buffer is retired at every unmap, so no counter goes backwards; three per-queue -S keys are dropped.
* Patch 12: max_rx is the live rx_count, not a fixed 1, on single queue or once mq_fallback is set.
* Patch 14: live -L waits after napi_disable() before remasking and rolls RX back if TX fails; a rollback whose set_real() fails skips the unmask, and scale-up unmasks only through enable_irq(). A queue stranded by a failed scale-up is freed after the next successful H_FREE_LOGICAL_LAN.
* Patch 15: the down-path returns -EBUSY if a queue in the new range is still registered.

Changes in v7:

Same 15 patches as v6. We followed up the v6 netdev-bot review with replies; this v7 is the series after that, plus a few items from our own re-review.

* Patch 3: update_rx_no_buffer() returns if buffer_list_addr[0] is NULL (the per-queue form stays in patch 10).
* Patch 6: synchronize_net() on the late TX-alloc unwind before RX is freed.
* Patch 8: replenish failure log names the wrapper from the filled count; advance ring on NULL buffer so poll does not spin.
* Patch 9: oversize bound is min(skb_tailroom, pool->buff_size).
* Patch 10: unregister_netdev before cancel_work_sync and gate reset on NETREG_REGISTERED (moved from patch 11); wait for pool kobject release before free_netdev(). Drop the probe CMO refresh and the two CMO follow-ups: CMO (Power9 and earlier) and MQ firmware (Power11+) do not coexist.
* Patch 11: replenish_lock on the close harvest (remove-path unregister/cancel reorder moved to patch 10 with the reset producer).
* Patch 12: set_channels() returns -EOPNOTSUPP on rx_count changes until patch 14 implements live resize.
* Patch 14: key buffer-list unmap on allocation presence because DMA address zero is valid; reject an RX count change while down with -EOPNOTSUPP. Failed H_FREE skips unmap and restores the surviving count; widen real_num before scale-up unmask. Scale-up register -EOPNOTSUPP latches mq_fallback. The scale-up / scale-down helper split is code motion only.
* Patch 15: publish the down-path RX count, which lifts patch 14's temporary rejection. get_channels max_tx is at least the live tx_count, and set_channels uses the same ceiling, so CPU offline cannot block an RX-only ethtool -L.
* Commit message / kdoc / comment / debug-log updates on 1, 3, 4, 5, 7, 8, 9, 10, 11, 12, 14 and 15 (patch 1 also names the new hcalls in the perf powerpc-hcalls script and documents H_BUSY on the register-queue wrapper; patch 10 prints the register-queue failure with %ld).
* Kept: enable_irq on schedule_prep failure; mask PHYP before napi_disable; get_channels reports the live rx_count (no clamp).
* Reopen unwind in patches 3 and 6 is pre-existing. No Fixes: tag here. The SQ open-fail path is already on the list as
[PATCH net 0/2] (Message-ID:
<[email protected]>). This series does not depend on it. If both land, keep the helper versions in patches 3/4/6; the net pair is the current single-queue path only.

Changes in v6:

Same 15 patches as v5. Jakub v5 review folded in; per-patch detail is below --- on each commit.

* Both new registration wrappers use plpar_hcall(), not plpar_hcall9().
* Poll: IPv4 check through skb->data; budget 0 does not complete NAPI.
* Scale-down: publish the surviving count, then synchronize_net(), then destroy. num_rx_queues uses smp_store_release / smp_load_acquire.
* packets/bytes/drops through netdev_stat_ops, not private -S strings. Thirteen existing -S keys kept. No hcall_* or pool%d_ keys. replenish_* are per-queue u64; no atomics. get_base_stats() is the retired-queue remainder.
* Reset worker gated on NETREG_REGISTERED (cannot reopen after unregister).
* get_channels() keeps the live rx_count; mq_fallback caps max_rx so a TX-only ethtool -L is not a silent RX shrink.

Changes in v5:

* Restack mailed v4 (14 patches) to v5 (15):

    v4 1-8  helpers                -> v5 1-8
    (new)   SQ poll harden         -> v5 9   (before MQ enable)
    v4 9    MQ enable              -> v5 10
    v4 10   stats                  -> v5 11
    (new)   get_channels           -> v5 12  (peeled from stats)
    v4 11   debugfs                -> v5 13
    v4 12   resize                 -> v5 14
    v4 13   set_channels           -> v5 15
    v4 14   trailing poll/shutdown -> folded into v5 5/9/10/14

(mailed "P14" was that trailer, not v5 14)
* Teardown-first resize after aggressive ethtool -L; thin defensive poll skip remains; no correlator generation field this series
* opened / rx_irq_setup; set_channels keys on opened (not IFF_UP)
* filter_list_dma=0 on map error; restore default-active 64 KiB pool; unwind pools by allocation presence; probe_cleanup clears vio drvdata; remove: unregister then cancel_work
* TX quiesce before freeing bounce buffers; guard start_xmit if LTB gone
* MQ H_FUNCTION recovery (reset + SQ fallback); no printk under replenish_lock; lock harvest with replenish; resume kicks all queues
* Per-queue update_rx_no_buffer; publish-before-free on resize; CMO refresh; IRQ helpers return errno
* Harvest abort (no fake GRO / UAF); poll refuses PHYP re-arm on close; wrap-safe skb_put; atomic set_channels; monotonic stats across shrink
* Keep mask -> sync -> napi_disable on teardown; open stays request_irq -> napi_enable while PHYP masked; scale-up/recovery keep napi_enable before enable_irq
* Pool geometry kept on free; restart_rx_queue after open/scale-down; remask after napi_disable; schedule_rx_queue masks only when napi_schedule_prep succeeds (STOP + poll no-rearm for storms)

Changes in v4:

Addresses Simon's v3 review and related fixes:
* First-use helpers/includes (irqdomain.h with first dispose); no unused statics; dropped orphan open/close pipeline patch
* Open/close unwind (free LAN before RX pools); no double TX teardown
* MQ open: replenish all queues before PHYP unmask; H_FUNCTION on subordinate register is a hard open failure
* Resize/set_channels hardenings; stats probe-lifetime + sum-on-read; buffer_pools diagnostic on debugfs
* Patch 9: put already-created pool kobjects on probe failure paths
* Patch 14: correlator skip, skb tailroom check, napi_complete_done shutdown return < budget
* Bisect-friendly restack (helpers with first use)

Changes in v3:

* Dropped RFC; addressed style / DMA feedback from earlier revisions
* Early MQ enablement iterations (see lore links below)

Comments welcome.

[1] https://patch.msgid.link/[email protected]

---
v7 lore:
https://lore.kernel.org/r/[email protected]
Sashiko NIPA (v7):
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]
v6 lore:
https://lore.kernel.org/r/[email protected]
Sashiko NIPA (v6):
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]
v5 lore:
https://lore.kernel.org/r/[email protected]
v5 review (Jakub Kicinski):
https://lore.kernel.org/r/[email protected]
Sashiko Gemini (sashiko.dev):
https://sashiko.dev/#/patchset/[email protected]
Sashiko NIPA (v5):
https://netdev-ai.bots.linux.dev/sashiko/#/patchset/[email protected]

Previous versions
v7: https://lore.kernel.org/r/[email protected]
v6: https://lore.kernel.org/r/[email protected]
v5: https://lore.kernel.org/r/[email protected]
v4: https://lore.kernel.org/r/[email protected]
v3: https://lore.kernel.org/r/[email protected]
v2: https://lore.kernel.org/r/[email protected]
v1: https://lore.kernel.org/r/[email protected]
v4 review (Jakub Kicinski):
https://lore.kernel.org/r/[email protected]
v3 review (Simon Horman):
https://lore.kernel.org/r/[email protected]

Mingming Cao (15):
ibmveth: Add MQ RX hypercall wrappers and call definitions
ibmveth: Prepare MQ RX adapter data structures
ibmveth: Refactor RX resource allocation for MQ RX bring-up
ibmveth: Refactor buffer pool management for per-queue MQ RX
ibmveth: Refactor RX interrupt control for MQ RX queues
ibmveth: Refactor TX resource allocation in open/close paths
ibmveth: Add RX queue register helpers for MQ
ibmveth: Add queue-aware RX buffer submit helper for MQ
ibmveth: Split RX poll into per-slot helpers for MQ
ibmveth: Enable multi-queue RX receive path
ibmveth: Add per-queue RX and TX statistics collection
ibmveth: Report MQ-aware RX counts in ethtool get_channels
ibmveth: Expose per-queue buffer pool details via debugfs
ibmveth: Implement incremental MQ RX queue resize
ibmveth: Complete set_channels down-path

 arch/powerpc/include/asm/hvcall.h   |    6 +-
 drivers/net/ethernet/ibm/ibmveth.c  | 5007 ++++++++++++++++++++++-----
 drivers/net/ethernet/ibm/ibmveth.h  |  240 +-
 tools/perf/python/powerpc-hcalls.py |    4 +
 4 files changed, 4318 insertions(+), 939 deletions(-)

base-commit: fa5196392691051963726787944db872420dfa75

Signature · 1 line
2.50.1 (Apple Git-155)