MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-18 15:19:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: rust_binder: return pending info for frozen async txns

Browse Source 
When a transaction is queued due to being a oneway transaction to a
frozen process, we currently just return success. Instead, report a
BR_TRANSACTION_PENDING_FROZEN code so that userspace knows that its
transaction is queued for a frozen process.

Bug: 333852369
Link: https://lore.kernel.org/r/20221123201654.589322-1-dualli@chromium.org
Change-Id: Ib3f2773872f431aad564b439bc2d1cdb02ae4b29
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
This commit is contained in:
Alice Ryhl 2024-04-11 10:57:23 +00:00
parent f7562fbffd
commit c9370a3cbb
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/android/binder/defs.rs
View File

@ -26,6 +26,7 @@ pub_no_prefix!(
BR_NOOP, BR_NOOP,
BR_SPAWN_LOOPER, BR_SPAWN_LOOPER,
BR_TRANSACTION_COMPLETE, BR_TRANSACTION_COMPLETE,
BR_TRANSACTION_PENDING_FROZEN,
BR_ONEWAY_SPAM_SUSPECT, BR_ONEWAY_SPAM_SUSPECT,
BR_OK, BR_OK,
BR_ERROR, BR_ERROR,

8
drivers/android/binder/error.rs
View File

@ -30,6 +30,13 @@ impl BinderError {
} }
} }
pub(crate) fn new_frozen_oneway() -> Self {
Self {
reply: BR_TRANSACTION_PENDING_FROZEN,
source: None,
}
}
pub(crate) fn is_dead(&self) -> bool { pub(crate) fn is_dead(&self) -> bool {
self.reply == BR_DEAD_REPLY self.reply == BR_DEAD_REPLY
} }
@ -86,6 +93,7 @@ impl core::fmt::Debug for BinderError {
}, },
BR_DEAD_REPLY => f.pad("BR_DEAD_REPLY"), BR_DEAD_REPLY => f.pad("BR_DEAD_REPLY"),
BR_FROZEN_REPLY => f.pad("BR_FROZEN_REPLY"), BR_FROZEN_REPLY => f.pad("BR_FROZEN_REPLY"),
BR_TRANSACTION_PENDING_FROZEN => f.pad("BR_TRANSACTION_PENDING_FROZEN"),
BR_TRANSACTION_COMPLETE => f.pad("BR_TRANSACTION_COMPLETE"), BR_TRANSACTION_COMPLETE => f.pad("BR_TRANSACTION_COMPLETE"),
_ => f _ => f
.debug_struct("BinderError") .debug_struct("BinderError")

8
drivers/android/binder/transaction.rs
View File

@ -282,7 +282,7 @@ impl Transaction {
} }
} }
match target_node.submit_oneway(self, &mut process_inner) { match target_node.submit_oneway(self, &mut process_inner) {
Ok(()) => return Ok(()), Ok(()) => {}
Err((err, work)) => { Err((err, work)) => {
drop(process_inner); drop(process_inner);
// Drop work after releasing process lock. // Drop work after releasing process lock.
@ -290,6 +290,12 @@ impl Transaction {
return Err(err); return Err(err);
} }
} }
if process_inner.is_frozen {
return Err(BinderError::new_frozen_oneway());
} else {
return Ok(());
}
} else { } else {
pr_err!("Failed to submit oneway transaction to node."); pr_err!("Failed to submit oneway transaction to node.");
} }