kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Process incoming packets on different interfaces in a round robin fashion. (#514)

Browse Source 
* Round-robin order for receiving packets

* Update next packet after sending packet

* fix up some formatted raised during review

* remove the whitespace noise from last commit
This commit is contained in:
Liam Murphy
2022-07-26 21:07:26 +10:00
committed by GitHub
parent 8ef813cf76
commit 2bc405165e
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/tock/12-pending-deadlock.patch
View File

@@ -1,9 +1,9 @@
diff --git a/capsules/src/usb/usbc_ctap_hid.rs b/capsules/src/usb/usbc_ctap_hid.rs diff --git a/capsules/src/usb/usbc_ctap_hid.rs b/capsules/src/usb/usbc_ctap_hid.rs
index 16b80cb10..c71ed639a 100644 index 16b80cb10..949388b70 100644
--- a/capsules/src/usb/usbc_ctap_hid.rs --- a/capsules/src/usb/usbc_ctap_hid.rs
+++ b/capsules/src/usb/usbc_ctap_hid.rs +++ b/capsules/src/usb/usbc_ctap_hid.rs
@@ -120,7 +120,6 @@ struct EndpointState { @@ -120,7 +120,6 @@ struct EndpointState {
tx_packet: OptionalCell<[u8; 64]>, tx_packet: OptionalCell<[u8; 64]>,
pending_in: Cell<bool>, pending_in: Cell<bool>,
- pending_out: Cell<bool>, - pending_out: Cell<bool>,
@@ -18,27 +18,29 @@ index 16b80cb10..c71ed639a 100644
delayed_out: Cell::new(false), delayed_out: Cell::new(false),
} }
} }
@@ -142,6 +140,9 @@ impl EndpointState { @@ -142,6 +140,10 @@ impl EndpointState {
pub struct ClientCtapHID<'a, 'b, C: 'a> { pub struct ClientCtapHID<'a, 'b, C: 'a> {
client_ctrl: ClientCtrl<'a, 'static, C>, client_ctrl: ClientCtrl<'a, 'static, C>,
+ // Is there a pending OUT transaction happening? + // Is there a pending OUT transaction happening?
+ pending_out: Cell<bool>, + pending_out: Cell<bool>,
+ next_endpoint_index: Cell<usize>,
+ +
endpoints: [EndpointState; NUM_ENDPOINTS], endpoints: [EndpointState; NUM_ENDPOINTS],
// Interaction with the client // Interaction with the client
@@ -264,6 +265,7 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> { @@ -264,6 +266,8 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> {
LANGUAGES, LANGUAGES,
strings, strings,
), ),
+ pending_out: Cell::new(false), + pending_out: Cell::new(false),
+ next_endpoint_index: Cell::new(0),
endpoints: [ endpoints: [
EndpointState::new(ENDPOINT_NUM), EndpointState::new(ENDPOINT_NUM),
#[cfg(feature = "vendor_hid")] #[cfg(feature = "vendor_hid")]
@@ -306,12 +308,14 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> { @@ -306,12 +310,13 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> {
} }
pub fn receive_packet(&'a self, app: &mut App) { pub fn receive_packet(&'a self, app: &mut App) {
- for (_, s) in self.endpoints.iter().enumerate() { - for (_, s) in self.endpoints.iter().enumerate() {
- if s.pending_out.get() { - if s.pending_out.get() {
@@ -50,25 +52,38 @@ index 16b80cb10..c71ed639a 100644
+ // The previous packet has not yet been received, reject the new one. + // The previous packet has not yet been received, reject the new one.
+ } else { + } else {
+ self.pending_out.set(true); + self.pending_out.set(true);
+ // Process the first endpoint that has a delayed packet. + // Process the next endpoint that has a delayed packet.
+ // TODO(liamjm): Determine if a round-robin approach reduces latency + for i in self.next_endpoint_index.get()..self.next_endpoint_index.get() + NUM_ENDPOINTS {
+ // in the worst case. + let s = &self.endpoints[i % NUM_ENDPOINTS];
+ for (_, s) in self.endpoints.iter().enumerate() {
// In case we reported Delay before, send the pending packet back to the client. // In case we reported Delay before, send the pending packet back to the client.
// Otherwise, there's nothing to do, the controller will send us a packet_out when a // Otherwise, there's nothing to do, the controller will send us a packet_out when a
// packet arrives. // packet arrives.
@@ -344,7 +348,7 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> { @@ -344,7 +349,7 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> {
.client .client
.map_or(false, |client| client.can_receive_packet(&app)) .map_or(false, |client| client.can_receive_packet(&app))
{ {
- assert!(s.pending_out.take()); - assert!(s.pending_out.take());
+ assert!(self.pending_out.take()); + assert!(self.pending_out.take());
// Clear any pending packet on the transmitting side. // Clear any pending packet on the transmitting side.
// It's up to the client to handle the received packet and decide if this packet // It's up to the client to handle the received packet and decide if this packet
@@ -387,8 +391,8 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> { @@ -352,6 +357,13 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> {
self.cancel_in_transaction(endpoint);
self.client.map(|client| client.packet_received(&buf, endpoint, app));
+ // Update next packet to send.
+ for (i, ep) in self.endpoints.iter().enumerate() {
+ if ep.endpoint == endpoint {
+ self.next_endpoint_index.set((i + 1) % NUM_ENDPOINTS);
+ break;
+ }
+ }
true
} else {
// Cannot receive now, indicate a delay to the controller.
@@ -387,8 +399,8 @@ impl<'a, 'b, C: hil::usb::UsbController<'a>> ClientCtapHID<'a, 'b, C> {
} }
fn cancel_out_transaction(&'a self, endpoint: usize) -> bool { fn cancel_out_transaction(&'a self, endpoint: usize) -> bool {
- if let Some(s) = self.get_endpoint(endpoint) { - if let Some(s) = self.get_endpoint(endpoint) {
- s.pending_out.take() - s.pending_out.take()