Skip to content

gpu: nova-core: gsp: add locking to Cmdq

Eliot Courtney dri-devel lkml rust-for-linux 5 versions – Applied

Status from this message: Merged into drm-rust-next, thanks!

Get series with b4
b4 am [email protected] change-id 20260225-cmdq-locking-d32928a2c2cf

Versions newest first

  1. v5 Latest5 patches 7 repliesApplied
  2. v45 patches 1 replySuperseded
  3. v35 patches 18 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v24 patches17 repliesSuperseded
v14 patches5 repliesSuperseded

Changes in v5 from the cover letter

- tweak documentation
- rebase on drm-rust-next
- Link to v4: https://lore.kernel.org/r/[email protected]

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/5gpu: nova-core: gsp: fix stale doc comments on command queue methodsdrivers/gpu/nova-core/gsp/cmdq.rs+8 -90 replies
2/5gpu: nova-core: gsp: add `RECEIVE_TIMEOUT` constant for command queuedrivers/gpu/nova-core/gsp/cmdq.rs drivers/gpu/nova-core/gsp/commands.rs drivers/gpu/nova-core/gsp/sequencer.rs+6 -40 replies
3/5gpu: nova-core: gsp: add reply/no-reply info to `CommandToGsp`drivers/gpu/nova-core/gsp/boot.rs drivers/gpu/nova-core/gsp/cmdq.rs drivers/gpu/nova-core/gsp/cmdq/continuation.rs +1 more+75 -160 replies
4/5gpu: nova-core: gsp: make `Cmdq` a pinned typedrivers/gpu/nova-core/gsp.rs drivers/gpu/nova-core/gsp/cmdq.rs+7 -70 replies
5/5gpu: nova-core: gsp: add mutex locking to Cmdqdrivers/gpu/nova-core/gsp/boot.rs drivers/gpu/nova-core/gsp/cmdq.rs drivers/gpu/nova-core/gsp/commands.rs +1 more+107 -776 replies

Reviews trailers per patch

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

PatchZhi WangGary Guo
1/5R-b T-b
2/5T-b R-b
3/5T-b R-b
4/5R-b T-b
5/5R-b T-b

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

Read the v5 thread

Cover letter [PATCH v5 0/5] gpu: nova-core: gsp: add locking to Cmdq

Add locking to Cmdq. This is required e.g. for unloading the driver, which needs to send the UnloadingGuestDriver via the command queue on unbind which may be on a different thread.

We have commands that need a reply and commands that don't. For commands with a reply we want to make sure that they don't get the reply of a different command back. The approach this patch series takes is by making those commands block until they get a response. For now this should be ok, and we expect GSP to be fast anyway.

To do this, we need to know which commands expect a reply and which don't. John's existing series[1] adds IS_ASYNC which solves part of the problem, but we need to know a bit more. So instead, add an associated type called Reply which tells us what the reply is.

An alternative would be to define traits inheriting CommandToGsp, e.g. CommandWithReply and CommandWithoutReply, instead of using the associated type. I implemented the associated type version because it feels more compositional rather than inherity so seemed a bit better to me. But both of these approaches work and are fine, IMO.

In summary, this patch series has three steps:
1. Add the type infrastructure to know what replies are expected for a command and update each caller to explicitly wait for the reply or not.
2. Make Cmdq pinned so we can use Mutex
3. Add a Mutex to protect Cmdq by moving the relevant state to an inner struct.

[1]: https://lore.kernel.org/all/[email protected]/

---
Changes in v5:
- tweak documentation
- rebase on drm-rust-next
- Link to v4: https://lore.kernel.org/r/[email protected]

Changes in v4:
- Change RECEIVE_TIMEOUT from 10s to 5s
- Update NoReply doc comment
- Move CommandToGsp doc comment update
- Fix import formatting in continuation.rs
- Move CmdqInner after Cmdq to reduce diff size
- Link to v3: https://lore.kernel.org/r/[email protected]

Changes in v3:
- Rename send_sync_command/send_async_command to send_command/send_command_no_wait.
- Move dev field into CmdqInner to avoid passing it through method parameters.
- Add RECEIVE_TIMEOUT constant for the 10s receive timeout.
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Rebase on drm-rust-next
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Eliot Courtney (5):
gpu: nova-core: gsp: fix stale doc comments on command queue methods
gpu: nova-core: gsp: add RECEIVE_TIMEOUT constant for command queue
gpu: nova-core: gsp: add reply/no-reply info to CommandToGsp
gpu: nova-core: gsp: make Cmdq a pinned type
gpu: nova-core: gsp: add mutex locking to Cmdq

 drivers/gpu/nova-core/gsp.rs                   |   5 +-
 drivers/gpu/nova-core/gsp/boot.rs              |  13 +-
 drivers/gpu/nova-core/gsp/cmdq.rs              | 159 +++++++++++++++++++------
 drivers/gpu/nova-core/gsp/cmdq/continuation.rs |   8 +-
 drivers/gpu/nova-core/gsp/commands.rs          |  23 ++--
 drivers/gpu/nova-core/gsp/sequencer.rs         |   4 +-
 6 files changed, 151 insertions(+), 61 deletions(-)

---
base-commit: d19ab42867ae7c68be84ed957d95712b7934773f
change-id: 20260225-cmdq-locking-d32928a2c2cf

Best regards,

Signature · 1 line
Eliot Courtney <[email protected]>