gpu: nova-core: gsp: add continuation record support
Subsystems (4)
v6 cover gpu: nova-core: gsp: add continuation record support
GSP commands over 16 pages need to be sent using "continuation records" which essentially means splitting the payload over multiple commands.
This series adds a command type ContinuationRecord which just writes its header and whatever payload it is given. It also adds types SplitState and SplitCommand which support splitting a large RPC into smaller ones while transparently letting regular sized RPCs be sent without extra copies.
The send pathway uses SplitState to send all commands, but if the command fits into 16 pages, it still writes directly into the command queue. If it is larger than 16 pages and needs continuation records, it writes into a staging buffer, so there is one copy.
---
Changes in v6:
- Renamed size_in_bytes to size
- Changed poll delay from zero to 1us
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Moved continuation module under cmdq.
- Made timeout into a constant.
- Renamed command_size to size_in_bytes and made it a default method
on CommandToGsp
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Removed Tested-by Zhi on the ContinuationRecord patch, since it
changed substantively.
- Incorporated Alex's design for SplitState
- Moved the continuation record types into their own module.
- Tightened visibility on continuation record types.
- Used non-zero sized command in tests.
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Rebased onto drm-rust-next
- Added some doc comments
- Reworded command_size doc comment
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Added doccoments
- Renamed driver_bytes_available_to_write to driver_write_area_size
- allocate_command_with_timeout merged allocate_command with timeout parameter
- Replaced hardcoded GSP_PAGE_SIZE * 16 with bindings
- Changed oversized command error from EIO to EMSGSIZE
- Added EMSGSIZE to kernel/error.rs
- Split WrappingCommand functionality into SplitState + SplitCommand enum
- Made max_size a const (MAX_CMD_SIZE)
- Removed send_continuation_record + added comment for type inference
- send_single_command now consumes the command
- Extracted command_size + used in SplitState
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Eliot Courtney (9):
gpu: nova-core: gsp: sort MsgFunction variants alphabetically
gpu: nova-core: gsp: add mechanism to wait for space on command queue
rust: add EMSGSIZE error code
gpu: nova-core: gsp: add checking oversized commands
gpu: nova-core: gsp: clarify invariant on command queue
gpu: nova-core: gsp: unconditionally call variable payload handling
gpu: nova-core: gsp: add size helper to CommandToGsp
gpu: nova-core: gsp: support large RPCs via continuation record
gpu: nova-core: gsp: add tests for continuation records
drivers/gpu/nova-core/gsp/cmdq.rs | 119 +++++++-- drivers/gpu/nova-core/gsp/cmdq/continuation.rs | 301 ++++++++++++++++++++++ drivers/gpu/nova-core/gsp/fw.rs | 75 +++--- drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 1 + rust/kernel/error.rs | 1 + 5 files changed, 439 insertions(+), 58 deletions(-)
---
base-commit: 4a49fe23e357b48845e31fe9c28a802c05458198
change-id: 20260203-cmdq-continuation-b99f3d5966c3
Best regards,
Signature · 1 line
Eliot Courtney <[email protected]>
PATCH v6 1/9 gpu: nova-core: gsp: sort `MsgFunction` variants alphabetically
There is no particular order required here and keeping them alphabetical will help preventing future mistakes.
--- drivers/gpu/nova-core/gsp/fw.rs | 67 +++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 32 deletions(-)
drivers/gpu/nova-core/gsp/fw.rs +35 -32
@@ -191,34 +191,34 @@ pub(crate) fn new(gsp_firmware: &GspFirmware, fb_layout: &FbLayout) -> Self {#[repr( u32 )] pub (crate )enum MsgFunction {// Common function codes -Nop = bindings::NV_VGPU_MSG_FUNCTION_NOP , -SetGuestSystemInfo = bindings::NV_VGPU_MSG_FUNCTION_SET_GUEST_SYSTEM_INFO , -AllocRoot = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT , +AllocChannelDma = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CHANNEL_DMA , +AllocCtxDma = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CTX_DMA ,AllocDevice = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_DEVICE ,AllocMemory = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_MEMORY , -AllocCtxDma = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CTX_DMA , -AllocChannelDma = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CHANNEL_DMA , -MapMemory = bindings::NV_VGPU_MSG_FUNCTION_MAP_MEMORY , -BindCtxDma = bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA ,AllocObject = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_OBJECT , +AllocRoot = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT , +BindCtxDma = bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA ,Free = bindings::NV_VGPU_MSG_FUNCTION_FREE , -Log = bindings::NV_VGPU_MSG_FUNCTION_LOG ,GetGspStaticInfo = bindings::NV_VGPU_MSG_FUNCTION_GET_GSP_STATIC_INFO , -SetRegistry = bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY , -GspSetSystemInfo = bindings::NV_VGPU_MSG_FUNCTION_GSP_SET_SYSTEM_INFO , +GetStaticInfo = bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO ,GspInitPostObjGpu = bindings::NV_VGPU_MSG_FUNCTION_GSP_INIT_POST_OBJGPU ,GspRmControl = bindings::NV_VGPU_MSG_FUNCTION_GSP_RM_CONTROL , -GetStaticInfo = bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO , +GspSetSystemInfo = bindings::NV_VGPU_MSG_FUNCTION_GSP_SET_SYSTEM_INFO , +Log = bindings::NV_VGPU_MSG_FUNCTION_LOG , +MapMemory = bindings::NV_VGPU_MSG_FUNCTION_MAP_MEMORY , +Nop = bindings::NV_VGPU_MSG_FUNCTION_NOP , +SetGuestSystemInfo = bindings::NV_VGPU_MSG_FUNCTION_SET_GUEST_SYSTEM_INFO , +SetRegistry = bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY ,// Event codes GspInitDone = bindings::NV_VGPU_MSG_EVENT_GSP_INIT_DONE , +GspLockdownNotice = bindings::NV_VGPU_MSG_EVENT_GSP_LOCKDOWN_NOTICE , +GspPostNoCat = bindings::NV_VGPU_MSG_EVENT_GSP_POST_NOCAT_RECORD ,GspRunCpuSequencer = bindings::NV_VGPU_MSG_EVENT_GSP_RUN_CPU_SEQUENCER , -PostEvent = bindings::NV_VGPU_MSG_EVENT_POST_EVENT , -RcTriggered = bindings::NV_VGPU_MSG_EVENT_RC_TRIGGERED ,MmuFaultQueued = bindings::NV_VGPU_MSG_EVENT_MMU_FAULT_QUEUED ,OsErrorLog = bindings::NV_VGPU_MSG_EVENT_OS_ERROR_LOG , -GspPostNoCat = bindings::NV_VGPU_MSG_EVENT_GSP_POST_NOCAT_RECORD , -GspLockdownNotice = bindings::NV_VGPU_MSG_EVENT_GSP_LOCKDOWN_NOTICE , +PostEvent = bindings::NV_VGPU_MSG_EVENT_POST_EVENT , +RcTriggered = bindings::NV_VGPU_MSG_EVENT_RC_TRIGGERED ,UcodeLibOsPrint = bindings::NV_VGPU_MSG_EVENT_UCODE_LIBOS_PRINT , }
@@ -227,38 +227,41 @@ impl TryFrom<u32> for MsgFunction {fn try_from (value:u32 ) ->Result <MsgFunction > {match value { - bindings::NV_VGPU_MSG_FUNCTION_NOP =>Ok (MsgFunction ::Nop ), - bindings::NV_VGPU_MSG_FUNCTION_SET_GUEST_SYSTEM_INFO => { -Ok (MsgFunction ::SetGuestSystemInfo ) - } - bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT =>Ok (MsgFunction ::AllocRoot ), +// Common function codes + bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CHANNEL_DMA =>Ok (MsgFunction ::AllocChannelDma ), + bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CTX_DMA =>Ok (MsgFunction ::AllocCtxDma ), bindings::NV_VGPU_MSG_FUNCTION_ALLOC_DEVICE =>Ok (MsgFunction ::AllocDevice ), bindings::NV_VGPU_MSG_FUNCTION_ALLOC_MEMORY =>Ok (MsgFunction ::AllocMemory ), - bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CTX_DMA =>Ok (MsgFunction ::AllocCtxDma ), - bindings::NV_VGPU_MSG_FUNCTION_ALLOC_CHANNEL_DMA =>Ok (MsgFunction ::AllocChannelDma ), - bindings::NV_VGPU_MSG_FUNCTION_MAP_MEMORY =>Ok (MsgFunction ::MapMemory ), - bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA =>Ok (MsgFunction ::BindCtxDma ), bindings::NV_VGPU_MSG_FUNCTION_ALLOC_OBJECT =>Ok (MsgFunction ::AllocObject ), + bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT =>Ok (MsgFunction ::AllocRoot ), + bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA =>Ok (MsgFunction ::BindCtxDma ), bindings::NV_VGPU_MSG_FUNCTION_FREE =>Ok (MsgFunction ::Free ), - bindings::NV_VGPU_MSG_FUNCTION_LOG =>Ok (MsgFunction ::Log ), bindings::NV_VGPU_MSG_FUNCTION_GET_GSP_STATIC_INFO =>Ok (MsgFunction ::GetGspStaticInfo ), - bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY =>Ok (MsgFunction ::SetRegistry ), - bindings::NV_VGPU_MSG_FUNCTION_GSP_SET_SYSTEM_INFO =>Ok (MsgFunction ::GspSetSystemInfo ), + bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO =>Ok (MsgFunction ::GetStaticInfo ), bindings::NV_VGPU_MSG_FUNCTION_GSP_INIT_POST_OBJGPU => {Ok (MsgFunction ::GspInitPostObjGpu ) } bindings::NV_VGPU_MSG_FUNCTION_GSP_RM_CONTROL =>Ok (MsgFunction ::GspRmControl ), - bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO =>Ok (MsgFunction ::GetStaticInfo ), + bindings::NV_VGPU_MSG_FUNCTION_GSP_SET_SYSTEM_INFO =>Ok (MsgFunction ::GspSetSystemInfo ), + bindings::NV_VGPU_MSG_FUNCTION_LOG =>Ok (MsgFunction ::Log ), + bindings::NV_VGPU_MSG_FUNCTION_MAP_MEMORY =>Ok (MsgFunction ::MapMemory ), + bindings::NV_VGPU_MSG_FUNCTION_NOP =>Ok (MsgFunction ::Nop ), + bindings::NV_VGPU_MSG_FUNCTION_SET_GUEST_SYSTEM_INFO => { +Ok (MsgFunction ::SetGuestSystemInfo ) + } + bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY =>Ok (MsgFunction ::SetRegistry ), + +// Event codes bindings::NV_VGPU_MSG_EVENT_GSP_INIT_DONE =>Ok (MsgFunction ::GspInitDone ), + bindings::NV_VGPU_MSG_EVENT_GSP_LOCKDOWN_NOTICE =>Ok (MsgFunction ::GspLockdownNotice ), + bindings::NV_VGPU_MSG_EVENT_GSP_POST_NOCAT_RECORD =>Ok (MsgFunction ::GspPostNoCat ), bindings::NV_VGPU_MSG_EVENT_GSP_RUN_CPU_SEQUENCER => {Ok (MsgFunction ::GspRunCpuSequencer ) } - bindings::NV_VGPU_MSG_EVENT_POST_EVENT =>Ok (MsgFunction ::PostEvent ), - bindings::NV_VGPU_MSG_EVENT_RC_TRIGGERED =>Ok (MsgFunction ::RcTriggered ), bindings::NV_VGPU_MSG_EVENT_MMU_FAULT_QUEUED =>Ok (MsgFunction ::MmuFaultQueued ), bindings::NV_VGPU_MSG_EVENT_OS_ERROR_LOG =>Ok (MsgFunction ::OsErrorLog ), - bindings::NV_VGPU_MSG_EVENT_GSP_POST_NOCAT_RECORD =>Ok (MsgFunction ::GspPostNoCat ), - bindings::NV_VGPU_MSG_EVENT_GSP_LOCKDOWN_NOTICE =>Ok (MsgFunction ::GspLockdownNotice ), + bindings::NV_VGPU_MSG_EVENT_POST_EVENT =>Ok (MsgFunction ::PostEvent ), + bindings::NV_VGPU_MSG_EVENT_RC_TRIGGERED =>Ok (MsgFunction ::RcTriggered ), bindings::NV_VGPU_MSG_EVENT_UCODE_LIBOS_PRINT =>Ok (MsgFunction ::UcodeLibOsPrint ), _ =>Err (EINVAL ), }
Signature · 1 line
2.53.0
PATCH v6 2/9 gpu: nova-core: gsp: add mechanism to wait for space on command queue
In reply to Eliot CourtneyAdd a timeout to allocate_command which waits for space on the GSP command queue. It uses a similar timeout to nouveau.
This lets send_command wait for space to free up in the command queue. This is required to support continuation records which can fill up the queue.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 42 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-)
drivers/gpu/nova-core/gsp/cmdq.rs +30 -12
@@ -250,6 +250,19 @@ fn new(dev: &device::Device<device::Bound>) -> Result<Self> { } } +/// Returns the size of the region of the CPU message queue that the driver is currently allowed +/// to write to, in bytes. +fn driver_write_area_size (&self) ->usize { +let tx = self.cpu_write_ptr (); +let rx = self.gsp_read_ptr (); + +// `rx` and `tx` are both in `0..MSGQ_NUM_PAGES` per the invariants of `gsp_read_ptr` and +// `cpu_write_ptr`. The minimum value case is where `rx == 0` and `tx == MSGQ_NUM_PAGES - +// 1`, which gives `0 + MSGQ_NUM_PAGES - (MSGQ_NUM_PAGES - 1) - 1 == 0`. +let slots = (rx +MSGQ_NUM_PAGES - tx -1 ) %MSGQ_NUM_PAGES ; + num::u32_as_usize (slots) *GSP_PAGE_SIZE + } +/// Returns the region of the GSP message queue that the driver is currently allowed to read /// from. ///
@@ -281,15 +294,22 @@ fn new(dev: &device::Device<device::Bound>) -> Result<Self> { }/// Allocates a region on the command queue that is large enough to send a command of `size` -/// bytes. +/// bytes, waiting for space to become available based on the provided timeout. /// /// This returns a [`GspCommand`] ready to be written to by the caller. /// /// # Errors /// -/// - `EAGAIN` if the driver area is too small to hold the requested command. +/// - `ETIMEDOUT` if space does not become available within the timeout. /// - `EIO` if the command header is not properly aligned. -fn allocate_command (&mut self, size:usize ) ->Result <GspCommand <'_>> { +fn allocate_command (&mut self, size:usize , timeout:Delta ) ->Result <GspCommand <'_>> { +read_poll_timeout ( + ||Ok (self.driver_write_area_size ()), + |available_bytes| *available_bytes >=size_of ::<GspMsgElement >() + size, +Delta ::from_micros (1 ), + timeout, + )?; +// Get the current writable area as an array of bytes. let (slice_1, slice_2) = {let (slice_1, slice_2) = self.driver_write_area ();
@@ -298,13 +318,6 @@ fn allocate_command(&mut self, size: usize) -> Result<GspCommand<'_>> { (slice_1.as_flattened_mut (), slice_2.as_flattened_mut ()) }; -// If the GSP is still processing previous messages the shared region -// may be full in which case we will have to retry once the GSP has -// processed the existing commands. -if size_of ::<GspMsgElement >() + size > slice_1.len () + slice_2.len () { -return Err (EAGAIN ); - } -// Extract area for the `GspMsgElement`. let (header, slice_1) =GspMsgElement ::from_bytes_mut_prefix (slice_1).ok_or (EIO )?;
@@ -462,6 +475,9 @@ impl Cmdq {/// Number of page table entries for the GSP shared region. pub (crate )const NUM_PTES :usize =size_of ::<GspMem >() >>GSP_PAGE_SHIFT ; +/// Timeout for waiting for space on the command queue. +const ALLOCATE_TIMEOUT :Delta =Delta ::from_secs (1 ); +/// Creates a new command queue for `dev`. pub (crate )fn new (dev: &device::Device <device::Bound >) ->Result <Cmdq > {let gsp_mem =DmaGspMem ::new (dev)?;
@@ -497,7 +513,7 @@ fn notify_gsp(bar: &Bar0) {/// /// # Errors /// -/// - `EAGAIN` if there was not enough space in the command queue to send the command. +/// - `ETIMEDOUT` if space does not become available within the timeout. /// - `EIO` if the variable payload requested by the command has not been entirely /// written to by its [`CommandToGsp::init_variable_payload`] method. ///
@@ -509,7 +525,9 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> Result Error: From<M::InitError>, {let command_size =size_of ::<M ::Command >() + command.variable_payload_len (); -let dst = self.gsp_mem.allocate_command (command_size)?; +let dst = self + .gsp_mem + .allocate_command (command_size,Self ::ALLOCATE_TIMEOUT )?;// Extract area for the command itself. let (cmd, payload_1) =M ::Command ::from_bytes_mut_prefix (dst.contents.0 ).ok_or (EIO )?;
Signature · 1 line
2.53.0
PATCH v6 3/9 rust: add EMSGSIZE error code
In reply to Eliot CourtneyAdd the EMSGSIZE error code, which indicates that a message is too long.
--- rust/kernel/error.rs | 1 + 1 file changed, 1 insertion(+)
rust/kernel/error.rs +1 -0
@@ -67,6 +67,7 @@ macro_rules! declare_err {declare_err! (EDOM ,"Math argument out of domain of func." );declare_err! (ERANGE ,"Math result not representable." );declare_err! (EOVERFLOW ,"Value too large for defined data type." ); +declare_err! (EMSGSIZE ,"Message too long." );declare_err! (ETIMEDOUT ,"Connection timed out." );declare_err! (ERESTARTSYS ,"Restart the system call." );declare_err! (ERESTARTNOINTR ,"System call was interrupted by a signal and will be restarted." );
Signature · 1 line
2.53.0
PATCH v6 4/9 gpu: nova-core: gsp: add checking oversized commands
In reply to Eliot CourtneyThe limit is 16 pages for a single command sent to the GSP. Return an error if allocate_command is called with a too large size.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 7 ++++++- drivers/gpu/nova-core/gsp/fw.rs | 4 ++++ drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/cmdq.rs +6 -1
@@ -32,7 +32,8 @@ GspMsgElement, MsgFunction, MsgqRxHeader, - MsgqTxHeader, // + MsgqTxHeader, + GSP_MSG_QUEUE_ELEMENT_SIZE_MAX, // }, PteArray, GSP_PAGE_SHIFT,
@@ -300,9 +301,13 @@ fn driver_write_area_size(&self) -> usize {/// /// # Errors /// +/// - `EMSGSIZE` if the command is larger than [`GSP_MSG_QUEUE_ELEMENT_SIZE_MAX`]. /// - `ETIMEDOUT` if space does not become available within the timeout. /// - `EIO` if the command header is not properly aligned. fn allocate_command (&mut self, size:usize , timeout:Delta ) ->Result <GspCommand <'_>> { +if size_of ::<GspMsgElement >() + size >GSP_MSG_QUEUE_ELEMENT_SIZE_MAX { +return Err (EMSGSIZE ); + }read_poll_timeout ( ||Ok (self.driver_write_area_size ()), |available_bytes| *available_bytes >= size_of::<GspMsgElement>() + size,
drivers/gpu/nova-core/gsp/fw.rs +4 -0
@@ -39,6 +39,10 @@ }, }; +/// Maximum size of a single GSP message queue element in bytes. +pub (crate )const GSP_MSG_QUEUE_ELEMENT_SIZE_MAX :usize = + num::u32_as_usize (bindings::GSP_MSG_QUEUE_ELEMENT_SIZE_MAX ); +/// Empty type to group methods related to heap parameters for running the GSP firmware. enum GspFwHeapParams {}
drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs +1 -0
@@ -43,6 +43,7 @@ fn fmt(&self, fmt: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {pub const GSP_FW_WPR_META_REVISION :u32 =1 ;pub const GSP_FW_WPR_META_MAGIC :i64 = -2577556379034558285 ;pub const REGISTRY_TABLE_ENTRY_TYPE_DWORD :u32 =1 ; +pub const GSP_MSG_QUEUE_ELEMENT_SIZE_MAX :u32 =65536 ;pub type __u8 = ffi::c_uchar ;pub type __u16 = ffi::c_ushort ;pub type __u32 = ffi::c_uint ;
Signature · 1 line
2.53.0
PATCH v6 5/9 gpu: nova-core: gsp: clarify invariant on command queue
In reply to Eliot CourtneyClarify why using only the first returned slice from allocate_command for the message headers is okay.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/cmdq.rs +3 -1
@@ -534,7 +534,9 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> Result .gsp_mem .allocate_command (command_size,Self ::ALLOCATE_TIMEOUT )?; -// Extract area for the command itself. +// Extract area for the command itself. The GSP message header and the command header +// together are guaranteed to fit entirely into a single page, so it's ok to only look +// at `dst.contents.0` here. let (cmd, payload_1) =M ::Command ::from_bytes_mut_prefix (dst.contents.0 ).ok_or (EIO )?;// Fill the header and command in-place.
Signature · 1 line
2.53.0
PATCH v6 6/9 gpu: nova-core: gsp: unconditionally call variable payload handling
In reply to Eliot CourtneyUnconditionally call the variable length payload code, which is a no-op if there is no such payload but could defensively catch some coding errors by e.g. checking that the allocated size is completely filled.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/nova-core/gsp/cmdq.rs +6 -8
@@ -548,16 +548,14 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> Result command.init ().__init (core::ptr::from_mut (cmd))?; } -// Fill the variable-length payload. -if command_size >size_of ::<M ::Command >() { -let mut sbuffer = -SBufferIter ::new_writer ([&mut payload_1[..], &mut dst.contents.1 [..]]); - command.init_variable_payload (&mut sbuffer)?; +// Fill the variable-length payload, which may be empty. +let mut sbuffer =SBufferIter ::new_writer ([&mut payload_1[..], &mut dst.contents.1 [..]]); + command.init_variable_payload (&mut sbuffer)?; -if !sbuffer.is_empty () { -return Err (EIO ); - } +if !sbuffer.is_empty () { +return Err (EIO ); } +drop (sbuffer);// Compute checksum now that the whole message is ready. dst.header
Signature · 1 line
2.53.0
PATCH v6 7/9 gpu: nova-core: gsp: add `size` helper to `CommandToGsp`
In reply to Eliot CourtneyAdd a default method to CommandToGsp which computes the size of a command.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/nova-core/gsp/cmdq.rs +9 -3
@@ -94,6 +94,12 @@ fn init_variable_payload( ) -> Result { Ok(()) } + +/// Total size of the command (including its variable-length payload) without the +/// [`GspMsgElement`] header. +fn size (&self) ->usize { +size_of ::<Self ::Command >() + self.variable_payload_len () + } }/// Trait representing messages received from the GSP.
@@ -529,10 +535,10 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> Result// This allows all error types, including `Infallible`, to be used for `M::InitError`. Error: From<M::InitError>, { -let command_size =size_of ::<M ::Command >() + command.variable_payload_len (); +let size_in_bytes = command.size ();let dst = self .gsp_mem - .allocate_command (command_size,Self ::ALLOCATE_TIMEOUT )?; + .allocate_command (size_in_bytes,Self ::ALLOCATE_TIMEOUT )?;// Extract area for the command itself. The GSP message header and the command header // together are guaranteed to fit entirely into a single page, so it's ok to only look
@@ -540,7 +546,7 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> Resultlet (cmd, payload_1) =M ::Command ::from_bytes_mut_prefix (dst.contents.0 ).ok_or (EIO )?;// Fill the header and command in-place. -let msg_element =GspMsgElement ::init (self.seq, command_size,M ::FUNCTION ); +let msg_element =GspMsgElement ::init (self.seq, size_in_bytes,M ::FUNCTION );// SAFETY: `msg_header` and `cmd` are valid references, and not touched if the initializer // fails. unsafe {
Signature · 1 line
2.53.0
PATCH v6 8/9 gpu: nova-core: gsp: support large RPCs via continuation record
In reply to Eliot CourtneySplits large RPCs if necessary and sends the remaining parts using continuation records. RPCs that do not need continuation records continue to write directly into the command buffer. Ones that do write into a staging buffer first, so there is one copy.
Continuation record for receive is not necessary to support at the moment because those replies do not need to be read and are currently drained by retrying receive_msg on ERANGE.
--- drivers/gpu/nova-core/gsp/cmdq.rs | 42 ++++++- drivers/gpu/nova-core/gsp/cmdq/continuation.rs | 163 +++++++++++++++++++++++++ drivers/gpu/nova-core/gsp/fw.rs | 4 + 3 files changed, 207 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/gsp/cmdq.rs +40 -2
@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +mod continuation; +use core::{ mem, sync::atomic::{
@@ -25,6 +27,11 @@ }, }; +use continuation::{ +ContinuationRecord , +SplitState ,// +}; +use crate ::{ driver::Bar0 , gsp::{
@@ -520,7 +527,7 @@ fn notify_gsp(bar: &Bar0) { .write(bar); } -/// Sends `command` to the GSP. +/// Sends `command` to the GSP, without splitting it. /// /// # Errors ///
@@ -529,7 +536,7 @@ fn notify_gsp(bar: &Bar0) {/// written to by its [`CommandToGsp::init_variable_payload`] method. /// /// Error codes returned by the command initializers are propagated as-is. -pub (crate )fn send_command <M >(&mut self, bar: &Bar0 , command:M ) ->Result +fn send_single_command <M >(&mut self, bar: &Bar0 , command:M ) ->Result where M :CommandToGsp ,// This allows all error types, including `Infallible`, to be used for `M::InitError`.
@@ -588,6 +595,37 @@ pub(crate) fn send_command<M>(&mut self, bar: &Bar0, command: M) -> ResultOk (()) } +/// Sends `command` to the GSP. +/// +/// The command may be split into multiple messages if it is large. +/// +/// # Errors +/// +/// - `ETIMEDOUT` if space does not become available within the timeout. +/// - `EIO` if the variable payload requested by the command has not been entirely +/// written to by its [`CommandToGsp::init_variable_payload`] method. +/// +/// Error codes returned by the command initializers are propagated as-is. +pub (crate )fn send_command <M >(&mut self, bar: &Bar0 , command:M ) ->Result +where +M :CommandToGsp , +Error :From <M ::InitError >, + { +match SplitState ::new (command)? { +SplitState ::Single (command) => self.send_single_command (bar, command), +SplitState ::Split (command,mut continuations) => { + self.send_single_command (bar, command)?; + +while let Some (continuation) = continuations.next () { +// Turbofish needed because the compiler cannot infer M here. + self.send_single_command ::<ContinuationRecord <'_>>(bar, continuation)?; + } + +Ok (()) + } + } + } +/// Wait for a message to become available on the message queue. /// /// This works purely at the transport layer and does not interpret or validate the message
drivers/gpu/nova-core/gsp/cmdq/continuation.rs new file +163 -0
163 lines not on this page · raw message
drivers/gpu/nova-core/gsp/fw.rs +4 -0
@@ -202,6 +202,7 @@ pub(crate) enum MsgFunction { AllocObject = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_OBJECT, AllocRoot = bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT, BindCtxDma = bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA, + ContinuationRecord = bindings::NV_VGPU_MSG_FUNCTION_CONTINUATION_RECORD, Free = bindings::NV_VGPU_MSG_FUNCTION_FREE, GetGspStaticInfo = bindings::NV_VGPU_MSG_FUNCTION_GET_GSP_STATIC_INFO, GetStaticInfo = bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO,
@@ -239,6 +240,9 @@ fn try_from(value: u32) -> Result<MsgFunction> { bindings::NV_VGPU_MSG_FUNCTION_ALLOC_OBJECT => Ok(MsgFunction::AllocObject), bindings::NV_VGPU_MSG_FUNCTION_ALLOC_ROOT => Ok(MsgFunction::AllocRoot), bindings::NV_VGPU_MSG_FUNCTION_BIND_CTX_DMA => Ok(MsgFunction::BindCtxDma), + bindings::NV_VGPU_MSG_FUNCTION_CONTINUATION_RECORD => { + Ok(MsgFunction::ContinuationRecord) + } bindings::NV_VGPU_MSG_FUNCTION_FREE => Ok(MsgFunction::Free), bindings::NV_VGPU_MSG_FUNCTION_GET_GSP_STATIC_INFO => Ok(MsgFunction::GetGspStaticInfo), bindings::NV_VGPU_MSG_FUNCTION_GET_STATIC_INFO => Ok(MsgFunction::GetStaticInfo),
Signature · 1 line
2.53.0
PATCH v6 9/9 gpu: nova-core: gsp: add tests for continuation records
In reply to Eliot CourtneyAdd tests for continuation record splitting. They cover boundary conditions at the split points to make sure the right number of continuation records are made. They also check that the data concatenated is correct.
--- drivers/gpu/nova-core/gsp/cmdq/continuation.rs | 138 +++++++++++++++++++++++++ 1 file changed, 138 insertions(+)
drivers/gpu/nova-core/gsp/cmdq/continuation.rs +138 -0
@@ -161,3 +161,141 @@ fn init_variable_payload( dst.write_all (&self.payload) } } + +#[kunit_tests(nova_core_gsp_continuation)] +mod tests { +use super ::*; + +use kernel::transmute::{ +AsBytes , +FromBytes ,// + }; + +/// Non-zero-sized command header for testing. +#[repr( C )] +#[derive( Clone , Copy , Zeroable )] +struct TestHeader ([u8 ;64 ]); + +// SAFETY: `TestHeader` is a plain array of bytes for which all bit patterns are valid. +unsafe impl FromBytes for TestHeader {} + +// SAFETY: `TestHeader` is a plain array of bytes for which all bit patterns are valid. +unsafe impl AsBytes for TestHeader {} + +struct TestPayload { + data:KVVec <u8 >, + } + +impl TestPayload { +fn generate_pattern (len:usize ) ->Result <KVVec <u8 >> { +let mut data =KVVec ::with_capacity (len,GFP_KERNEL )?; +for iin 0 ..len { +// Mix in higher bits so the pattern does not repeat every 256 bytes. + data.push ((i ^ (i >>8 ))as u8 ,GFP_KERNEL )?; + } +Ok (data) + } + +fn new (len:usize ) ->Result <Self > { +Ok (Self { + data:Self ::generate_pattern (len)?, + }) + } + } + +impl CommandToGsp for TestPayload { +const FUNCTION :MsgFunction =MsgFunction ::Nop ; +type Command =TestHeader ; +type InitError =Infallible ; + +fn init (&self) ->impl Init <Self ::Command ,Self ::InitError > { +TestHeader ::init_zeroed () + } + +fn variable_payload_len (&self) ->usize { + self.data.len () + } + +fn init_variable_payload ( + &self, + dst: &mut SBufferIter <core::array::IntoIter <&mut [u8 ],2 >>, + ) ->Result { + dst.write_all (self.data.as_slice ()) + } + } + +/// Maximum variable payload size that fits in the first command alongside the header. +const MAX_FIRST_PAYLOAD :usize =SplitState ::<TestPayload >::MAX_FIRST_PAYLOAD ; + +fn read_payload (cmd:impl CommandToGsp ) ->Result <KVVec <u8 >> { +let len = cmd.variable_payload_len (); +let mut buf =KVVec ::from_elem (0u8 , len,GFP_KERNEL )?; +let mut sbuf =SBufferIter ::new_writer ([buf.as_mut_slice (), &mut []]); + cmd.init_variable_payload (&mut sbuf)?; +drop (sbuf); +Ok (buf) + } + +struct SplitTest { + payload_size:usize , + num_continuations:usize , + } + +fn check_split (t:SplitTest ) ->Result { +let payload =TestPayload ::new (t.payload_size)?; +let mut num_continuations =0 ; + +let buf =match SplitState ::new (payload)? { +SplitState ::Single (cmd) =>read_payload (cmd)?, +SplitState ::Split (cmd,mut continuations) => { +let mut buf =read_payload (cmd)?; +assert! (size_of ::<TestHeader >() + buf.len () <=MAX_CMD_SIZE ); + +while let Some (cont) = continuations.next () { +let payload =read_payload (cont)?; +assert! (payload.len () <=MAX_CMD_SIZE ); + buf.extend_from_slice (&payload,GFP_KERNEL )?; + num_continuations +=1 ; + } + + buf + } + }; + +assert_eq! (num_continuations, t.num_continuations); +assert_eq! ( + buf.as_slice (), +TestPayload ::generate_pattern (t.payload_size)?.as_slice () + ); +Ok (()) + } + +#[test] +fn split_command () ->Result { +check_split (SplitTest { + payload_size:0 , + num_continuations:0 , + })?; +check_split (SplitTest { + payload_size:MAX_FIRST_PAYLOAD , + num_continuations:0 , + })?; +check_split (SplitTest { + payload_size:MAX_FIRST_PAYLOAD +1 , + num_continuations:1 , + })?; +check_split (SplitTest { + payload_size:MAX_FIRST_PAYLOAD +MAX_CMD_SIZE , + num_continuations:1 , + })?; +check_split (SplitTest { + payload_size:MAX_FIRST_PAYLOAD +MAX_CMD_SIZE +1 , + num_continuations:2 , + })?; +check_split (SplitTest { + payload_size:MAX_FIRST_PAYLOAD +MAX_CMD_SIZE *3 +MAX_CMD_SIZE /2 , + num_continuations:4 , + })?; +Ok (()) + } +}
Signature · 1 line
2.53.0
Quoted 9 lines · Eliot Courtney
GSP commands over 16 pages need to be sent using "continuation records" which essentially means splitting the payload over multiple commands.
This series adds a command type
ContinuationRecordwhich just writes its header and whatever payload it is given. It also adds typesSplitStateandSplitCommandwhich support splitting a large RPC into smaller ones while transparently letting regular sized RPCs be sent without extra copies.
Quoted 6 lines
The send pathway uses
SplitStateto send all commands, but if the command fits into 16 pages, it still writes directly into the command queue. If it is larger than 16 pages and needs continuation records, it writes into a staging buffer, so there is one copy.Signed-off-by Eliot Courtney <[email protected]>
Merged to drm-rust-next, thanks!