So far, the GSP command queue transport and message layer code were intertwined, a design issue that goes as deep as the types themselves: the generated bindings for `GspMsgElement` even include the RPC header at its end.
This makes it difficult to introduce the new GMC message type; thus this patch works around these limitations to make the RPC message header more explicit and allow it to be eventually handled by a different layer. The `RpcMessageHeader` wrapping type is introduced following the same model as `GspMsgElement`, and can be obtained from the latter. The methods of `GspMsgElement` that actually query the RPC header are moved to `RpcMessageHeader`. Regarding initialization, `GspMsgElement` leaves the RPC header zeroed, and the command queue code is now responsible for initializing it in a separate call. The only functional change is that the RPC debug messages now display the size of the RPC payload instead of the whole message including its headers, as they are technically part of the message layer. This metric is arguably more useful as the headers have successfully been parsed by the time we can print these messages. Signed-off-by: Alexandre Courbot <[email protected]> Reviewed-by: Eliot Courtney <[email protected]> --- drivers/gpu/nova-core/gsp/cmdq.rs | 35 +++++++++++----- drivers/gpu/nova-core/gsp/fw.rs | 88 ++++++++++++++++++++++++--------------- 2 files changed, 78 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/nova-core/gsp/cmdq.rs b/drivers/gpu/nova-core/gsp/cmdq.rs index d293d28b0967..b40d45bf0a92 100644 --- a/drivers/gpu/nova-core/gsp/cmdq.rs +++ b/drivers/gpu/nova-core/gsp/cmdq.rs @@ -50,6 +50,7 @@ MsgFunction, MsgqRxHeader, MsgqTxHeader, + RpcMessageHeader, GSP_MSG_QUEUE_ELEMENT_SIZE_MAX, // }, PteArray, @@ -664,11 +665,22 @@ fn send_single_command<M>(&mut self, command: M) -> Result let (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, size_in_bytes, M::FUNCTION); - // SAFETY: `msg_header` and `cmd` are valid references, and not touched if the initializer - // fails. + let msg_element_init = GspMsgElement::init(self.seq, size_in_bytes); + let rpc_header_init = RpcMessageHeader::init(size_in_bytes, M::FUNCTION); + // SAFETY: `dst.header` is a valid reference, and is not touched if the initializer fails. + unsafe { + pin_init::raw_try_init(core::ptr::from_mut(dst.header), msg_element_init)?; + } + // SAFETY: `dst.header.rpc_header_mut()` is a valid reference, and is not touched if the + // initializer fails. + unsafe { + pin_init::raw_try_init( + core::ptr::from_mut(dst.header.rpc_header_mut()), + rpc_header_init, + )?; + } + // SAFETY: `cmd` is a valid reference, and is not touched if the initializer fails. unsafe { - pin_init::raw_try_init(core::ptr::from_mut(dst.header), msg_element)?; pin_init::raw_try_init(core::ptr::from_mut(cmd), command.init())?; } @@ -694,7 +706,7 @@ fn send_single_command<M>(&mut self, command: M) -> Result "GSP RPC: send: seq# {}, function={:?}, length=0x{:x}\n", self.seq, M::FUNCTION, - dst.header.length(), + size_in_bytes, ); // All set - update the write pointer and inform the GSP of the new command. @@ -777,16 +789,17 @@ fn wait_for_msg(&self, timeout: Delta) -> Result<GspMessage<'_>> { return Err(EIO); } + let rpc_header = header.rpc_header(); + let payload_length = rpc_header.length(); + dev_dbg!( &self.dev, "GSP RPC: receive: seq# {}, function={:?}, length=0x{:x}\n", - header.sequence(), - header.function(), - header.length(), + rpc_header.sequence(), + rpc_header.function(), + payload_length, ); - let payload_length = header.payload_length(); - // Check that the driver read area is large enough for the message. if slice_1.len() + slice_2.len() < payload_length { return Err(EIO); @@ -833,7 +846,7 @@ fn receive_msg<M: MessageFromGsp>(&mut self, timeout: Delta) -> Result<M> Error: From<M::InitError>, { let message = self.wait_for_msg(timeout)?; - let function = message.header.function().map_err(|_| EINVAL)?; + let function = message.header.rpc_header().function().map_err(|_| EINVAL)?; // Extract the message. Store the result as we want to advance the read pointer even in // case of failure. diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs index 918a7ae809eb..58ae82dab5e5 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -781,11 +781,18 @@ fn new() -> Self { } } -impl bindings::rpc_message_header_v { - fn init(cmd_size: usize, function: MsgFunction) -> impl Init<Self, Error> { - type RpcMessageHeader = bindings::rpc_message_header_v; +#[repr(transparent)] +pub(crate) struct RpcMessageHeader { + inner: bindings::rpc_message_header_v, +} - try_init!(RpcMessageHeader { +impl RpcMessageHeader { + /// Creates a new RPC header. + /// + /// `cmd_size` is the size in bytes of the payload. `function` is the RPC function of the + /// message. + pub(crate) fn init(cmd_size: usize, function: MsgFunction) -> impl Init<Self, Error> { + let init_inner = try_init!(bindings::rpc_message_header_v { header_version: MsgHeaderVersion::new().into(), signature: bindings::NV_VGPU_MSG_SIGNATURE_VALID, function: function.into(), @@ -796,8 +803,32 @@ fn init(cmd_size: usize, function: MsgFunction) -> impl Init<Self, Error> { rpc_result: 0xffffffff, rpc_result_private: 0xffffffff, ..Zeroable::init_zeroed() + }); + + try_init!(RpcMessageHeader { + inner <- init_inner, }) } + + /// Returns the length of the RPC's payload, not including the header. + pub(crate) fn length(&self) -> usize { + // `length` includes the length of the RPC message header. + num::u32_as_usize(self.inner.length).saturating_sub(size_of::<Self>()) + } + + /// Returns the sequence number of the message. + pub(crate) fn sequence(&self) -> u32 { + self.inner.sequence + } + + /// Returns the function of the message, if it is valid, or the invalid function number as an + /// error. + pub(crate) fn function(&self) -> Result<MsgFunction, u32> { + self.inner + .function + .try_into() + .map_err(|_| self.inner.function) + } } /// GSP Message Element. @@ -811,17 +842,14 @@ pub(crate) struct GspMsgElement { impl GspMsgElement { /// Creates a new message element. /// + /// The RPC header is left initialized to zero and must be initialized separately using e.g. + /// [`Self::rpc_header_mut`]. + /// /// # Arguments /// /// * `sequence` - Sequence number of the message. /// * `cmd_size` - Size of the command (not including the message element), in bytes. - /// * `function` - Function of the message. - pub(crate) fn init( - sequence: u32, - cmd_size: usize, - function: MsgFunction, - ) -> impl Init<Self, Error> { - type RpcMessageHeader = bindings::rpc_message_header_v; + pub(crate) fn init(sequence: u32, cmd_size: usize) -> impl Init<Self, Error> { type InnerGspMsgElement = bindings::GSP_MSG_QUEUE_ELEMENT; let init_inner = try_init!(InnerGspMsgElement { seqNum: sequence, @@ -831,7 +859,6 @@ pub(crate) fn init( .div_ceil(GSP_PAGE_SIZE) .try_into() .map_err(|_| EOVERFLOW)?, - rpc <- RpcMessageHeader::init(cmd_size, function), ..Zeroable::init_zeroed() }); @@ -848,34 +875,27 @@ pub(crate) fn set_checksum(&mut self, checksum: u32) { self.inner.checkSum = checksum; } - /// Returns the length of the message's payload. - pub(crate) fn payload_length(&self) -> usize { - // `rpc.length` includes the length of the RPC message header. - num::u32_as_usize(self.inner.rpc.length) - .saturating_sub(size_of::<bindings::rpc_message_header_v>()) + /// Returns a reference to the RPC header within the message element. + pub(crate) fn rpc_header(&self) -> &RpcMessageHeader { + // SAFETY: transparent type. + unsafe { core::mem::transmute(&self.inner.rpc) } + } + + /// Returns a mutable reference to the RPC header within the message element. + pub(crate) fn rpc_header_mut(&mut self) -> &mut RpcMessageHeader { + // SAFETY: `RpcMessageHeader` is a transparent wrapper for the type of `inner.rpc`. + unsafe { core::mem::transmute(&mut self.inner.rpc) } } /// Returns the total length of the message, message and RPC headers included. pub(crate) fn length(&self) -> usize { - size_of::<Self>() + self.payload_length() + // Note: this is transport-layer code accessing message-layer data, which is only ok here + // because RPC is the only kind of message we handle, and its header can (with a stretch) be + // considered part of the transport header. + size_of::<Self>() + self.rpc_header().length() } - // Returns the sequence number of the message. - pub(crate) fn sequence(&self) -> u32 { - self.inner.rpc.sequence - } - - // Returns the function of the message, if it is valid, or the invalid function number as an - // error. - pub(crate) fn function(&self) -> Result<MsgFunction, u32> { - self.inner - .rpc - .function - .try_into() - .map_err(|_| self.inner.rpc.function) - } - - // Returns the number of elements (i.e. memory pages) used by this message. + /// Returns the number of elements (i.e. memory pages) used by this message. pub(crate) fn element_count(&self) -> u32 { self.inner.elemCount } -- 2.55.0
