[PATCH 16/27] gpu: nova-core: add GMC transport receive path
John Hubbard <[email protected]>
| Newsgroups | dev.linux.lists.nova-gpu,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
GSP-RM posts GMC and RPC messages on the same message queue. Both use the same MCTP and NVDM transport headers, but RPC messages continue with rpc_message_header_v and GMC messages continue with GmcApiHeader. Existing RPC receive code cannot parse the GMC layout. Add a GMC receive path that validates the MCTP magic and rejects payloads whose advertised length exceeds the available queue contents. On a framing or length failure, poison the queue because the driver cannot safely advance the read pointer without a trusted length. Assisted-by: Cursor:claude-opus-5 Signed-off-by: John Hubbard <[email protected]> --- drivers/gpu/nova-core/gsp/cmdq.rs | 83 ++++++++++++++++++++++++++++++- drivers/gpu/nova-core/gsp/fw.rs | 10 ++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/gsp/cmdq.rs b/drivers/gpu/nova-core/gsp/cmdq.rs index 88b143c6a7b7..fba94153e744 100644 --- a/drivers/gpu/nova-core/gsp/cmdq.rs +++ b/drivers/gpu/nova-core/gsp/cmdq.rs @@ -629,7 +629,7 @@ struct GspCommand<'a, H = GspMsgElement> { /// A message ready to be processed from the message queue. /// -/// This is the type returned by [`Cmdq::wait_for_msg`]. +/// This is the type returned by [`CmdqInner::wait_for_msg`]. struct GspMessage<'a> { // Reference to the header of the message. header: &'a GspMsgElement, @@ -638,6 +638,18 @@ struct GspMessage<'a> { contents: (&'a [u8], &'a [u8]), } +/// A GMC message ready to be processed from the message queue. +/// +/// This is the type returned by [`CmdqInner::wait_for_gmc_msg`]. +#[expect(dead_code)] +struct GmcMessage<'a> { + // Reference to the header of the message. + header: &'a GspGmcMsgElement, + // Slices of the payload following the `GmcApiHeader`. The second slice is empty unless the + // payload wraps around the end of the message queue. + contents: (&'a [u8], &'a [u8]), +} + /// GSP command queue. /// /// Provides the ability to send commands and receive messages from the GSP using a shared memory @@ -1285,4 +1297,73 @@ fn drain(&mut self) -> Result { Ok(()) } + + /// Wait for a GMC message to become available on the message queue. + /// + /// This is the GMC counterpart to [`Self::wait_for_msg`] and reads the same queue. Like that + /// method it works purely at the transport layer, validating the MCTP framing and the + /// advertised length and nothing else. + /// + /// A [`GspGmcMsgElement`] and a [`GspMsgElement`] share every field through `nvdm_header`, + /// so a caller that may see either must check the NVDM type before reading `gmc`. Both + /// layouts put the element length in the same place, so the caller can advance the read + /// pointer past a returned message either way. + /// + /// # Errors + /// + /// - `ETIMEDOUT` if `timeout` has elapsed before any message becomes available. + /// - `EIO` if the framing is invalid, or the queue was already poisoned by an earlier such + /// failure. Either failure poisons the queue, so recovery requires a reset. + #[expect(dead_code)] + fn wait_for_gmc_msg(&self, timeout: Delta) -> Result<GmcMessage<'_>> { + if self.poisoned.get() { + return Err(EIO); + } + + let (slice_1, slice_2) = read_poll_timeout( + || Ok(self.gsp_mem.driver_read_area()), + |driver_area| !driver_area.0.is_empty(), + Delta::from_millis(1), + timeout, + ) + .map(|(slice_1, slice_2)| (slice_1.as_flattened(), slice_2.as_flattened()))?; + + let Some((header, slice_1)) = GspGmcMsgElement::from_bytes_prefix(slice_1) else { + self.poisoned.set(true); + return Err(EIO); + }; + + // Checked before any length field is read, since a bad magic leaves them untrusted. + if !header.has_valid_magic() { + dev_err!(&self.dev, "GSP GMC: receive: bad MCTP magic\n"); + self.poisoned.set(true); + return Err(EIO); + } + + 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 { + self.poisoned.set(true); + return Err(EIO); + } + + // Cut the message slices down to the actual length of the message. + let (slice_1, slice_2) = if slice_1.len() > payload_length { + // PANIC: we checked above that `slice_1` is at least as long as `payload_length`. + (slice_1.split_at(payload_length).0, &slice_2[0..0]) + } else { + ( + slice_1, + // PANIC: we checked above that `slice_1.len() + slice_2.len()` is at least as + // large as `payload_length`. + slice_2.split_at(payload_length - slice_1.len()).0, + ) + }; + + Ok(GmcMessage { + header, + contents: (slice_1, slice_2), + }) + } } diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs index 56f255a3d49c..9e6b5ec6aadb 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -1055,11 +1055,21 @@ pub(crate) fn init( }) } + /// Returns the length of the response payload (data after the [`GmcApiHeader`]). + pub(crate) fn payload_length(&self) -> usize { + num::u32_as_usize(self.nvdm_payload_size).saturating_sub(size_of::<GmcApiHeader>()) + } + /// Returns the total length of the message, transport and GMC headers included. pub(crate) fn length(&self) -> usize { num::u32_as_usize(self.mctp_payload_size) } + /// Returns `true` if the MCTP magic field contains the expected value. + pub(crate) fn has_valid_magic(&self) -> bool { + self.mctp_magic == MCTP_MAGIC + } + /// Returns the number of elements (i.e. memory pages) used by this message. pub(crate) fn element_count(&self) -> u32 { self.mctp_payload_size -- 2.55.0