[Binder Tansport] Move trans stream receiver callbacks out of `mu_` (#32438)

This prevents deadlock against wire writer issues.

Currently, there are some `transport_stream_receiver_` callbacks
triggered by NDK binder may acquire `WireReaderImpl::mu_` first then
`WireWriterImpl::write_mu_`. We don't like see this.

We have this problem since some client and server are in the same
process. The behavior of NDK binder seems more aggressive when the Tx
and Rx are in the same process.
pull/32572/head
Rokya 2 years ago committed by GitHub
parent 95d6325768
commit 4dd0873ff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      BUILD
  2. 88
      src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
  3. 10
      src/core/ext/transport/binder/wire_format/wire_reader_impl.h

@ -1013,6 +1013,7 @@ grpc_cc_library(
"absl/base:core_headers", "absl/base:core_headers",
"absl/cleanup", "absl/cleanup",
"absl/container:flat_hash_map", "absl/container:flat_hash_map",
"absl/functional:any_invocable",
"absl/hash", "absl/hash",
"absl/memory", "absl/memory",
"absl/meta:type_traits", "absl/meta:type_traits",

@ -24,6 +24,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "absl/functional/any_invocable.h"
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
@ -248,40 +249,24 @@ absl::Status WireReaderImpl::ProcessStreamingTransaction(
transaction_code_t code, ReadableParcel* parcel) { transaction_code_t code, ReadableParcel* parcel) {
bool need_to_send_ack = false; bool need_to_send_ack = false;
int64_t num_bytes = 0; int64_t num_bytes = 0;
// Indicates which callbacks should be cancelled. It will be initialized as
// the flags the in-coming transaction carries, and when a particular
// callback is completed, the corresponding bit in cancellation_flag will be
// set to 0 so that we won't cancel it afterward.
int cancellation_flags = 0;
// The queue saves the actions needed to be done "WITHOUT" `mu_`.
// It prevents deadlock against wire writer issues.
std::queue<absl::AnyInvocable<void() &&>> deferred_func_queue;
absl::Status tx_process_result; absl::Status tx_process_result;
{ {
grpc_core::MutexLock lock(&mu_); grpc_core::MutexLock lock(&mu_);
if (!connected_) { if (!connected_) {
return absl::InvalidArgumentError("Transports not connected yet"); return absl::InvalidArgumentError("Transports not connected yet");
} }
// Indicate which callbacks should be cancelled. It will be initialized as tx_process_result = ProcessStreamingTransactionImpl(
// the flags the in-coming transaction carries, and when a particular code, parcel, &cancellation_flags, deferred_func_queue);
// callback is completed, the corresponding bit in cancellation_flag will be
// set to 0 so that we won't cancel it afterward.
int cancellation_flags = 0;
tx_process_result =
ProcessStreamingTransactionImpl(code, parcel, &cancellation_flags);
if (!tx_process_result.ok()) {
gpr_log(GPR_ERROR, "Failed to process streaming transaction: %s",
tx_process_result.ToString().c_str());
// Something went wrong when receiving transaction. Cancel failed
// requests.
if (cancellation_flags & kFlagPrefix) {
gpr_log(GPR_INFO, "cancelling initial metadata");
transport_stream_receiver_->NotifyRecvInitialMetadata(
code, tx_process_result);
}
if (cancellation_flags & kFlagMessageData) {
gpr_log(GPR_INFO, "cancelling message data");
transport_stream_receiver_->NotifyRecvMessage(code, tx_process_result);
}
if (cancellation_flags & kFlagSuffix) {
gpr_log(GPR_INFO, "cancelling trailing metadata");
transport_stream_receiver_->NotifyRecvTrailingMetadata(
code, tx_process_result, 0);
}
}
if ((num_incoming_bytes_ - num_acknowledged_bytes_) >= if ((num_incoming_bytes_ - num_acknowledged_bytes_) >=
kFlowControlAckBytes) { kFlowControlAckBytes) {
need_to_send_ack = true; need_to_send_ack = true;
@ -289,6 +274,32 @@ absl::Status WireReaderImpl::ProcessStreamingTransaction(
num_acknowledged_bytes_ = num_incoming_bytes_; num_acknowledged_bytes_ = num_incoming_bytes_;
} }
} }
// Executes all actions in the queue.
while (!deferred_func_queue.empty()) {
std::move(deferred_func_queue.front())();
deferred_func_queue.pop();
}
if (!tx_process_result.ok()) {
gpr_log(GPR_ERROR, "Failed to process streaming transaction: %s",
tx_process_result.ToString().c_str());
// Something went wrong when receiving transaction. Cancel failed requests.
if (cancellation_flags & kFlagPrefix) {
gpr_log(GPR_INFO, "cancelling initial metadata");
transport_stream_receiver_->NotifyRecvInitialMetadata(code,
tx_process_result);
}
if (cancellation_flags & kFlagMessageData) {
gpr_log(GPR_INFO, "cancelling message data");
transport_stream_receiver_->NotifyRecvMessage(code, tx_process_result);
}
if (cancellation_flags & kFlagSuffix) {
gpr_log(GPR_INFO, "cancelling trailing metadata");
transport_stream_receiver_->NotifyRecvTrailingMetadata(
code, tx_process_result, 0);
}
}
if (need_to_send_ack) { if (need_to_send_ack) {
if (!wire_writer_ready_notification_.WaitForNotificationWithTimeout( if (!wire_writer_ready_notification_.WaitForNotificationWithTimeout(
absl::Seconds(5))) { absl::Seconds(5))) {
@ -310,7 +321,8 @@ absl::Status WireReaderImpl::ProcessStreamingTransaction(
} }
absl::Status WireReaderImpl::ProcessStreamingTransactionImpl( absl::Status WireReaderImpl::ProcessStreamingTransactionImpl(
transaction_code_t code, ReadableParcel* parcel, int* cancellation_flags) { transaction_code_t code, ReadableParcel* parcel, int* cancellation_flags,
std::queue<absl::AnyInvocable<void() &&>>& deferred_func_queue) {
GPR_ASSERT(cancellation_flags); GPR_ASSERT(cancellation_flags);
num_incoming_bytes_ += parcel->GetDataSize(); num_incoming_bytes_ += parcel->GetDataSize();
gpr_log(GPR_INFO, "Total incoming bytes: %" PRId64, num_incoming_bytes_); gpr_log(GPR_INFO, "Total incoming bytes: %" PRId64, num_incoming_bytes_);
@ -380,8 +392,12 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl(
"binder.authority"); "binder.authority");
} }
} }
transport_stream_receiver_->NotifyRecvInitialMetadata( deferred_func_queue.emplace([this, code,
code, *initial_metadata_or_error); initial_metadata_or_error = std::move(
initial_metadata_or_error)]() mutable {
this->transport_stream_receiver_->NotifyRecvInitialMetadata(
code, std::move(initial_metadata_or_error));
});
*cancellation_flags &= ~kFlagPrefix; *cancellation_flags &= ~kFlagPrefix;
} }
if (flags & kFlagMessageData) { if (flags & kFlagMessageData) {
@ -396,7 +412,9 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl(
if ((flags & kFlagMessageDataIsPartial) == 0) { if ((flags & kFlagMessageDataIsPartial) == 0) {
std::string s = std::move(message_buffer_[code]); std::string s = std::move(message_buffer_[code]);
message_buffer_.erase(code); message_buffer_.erase(code);
transport_stream_receiver_->NotifyRecvMessage(code, std::move(s)); deferred_func_queue.emplace([this, code, s = std::move(s)]() mutable {
this->transport_stream_receiver_->NotifyRecvMessage(code, std::move(s));
});
} }
*cancellation_flags &= ~kFlagMessageData; *cancellation_flags &= ~kFlagMessageData;
} }
@ -416,8 +434,12 @@ absl::Status WireReaderImpl::ProcessStreamingTransactionImpl(
} }
trailing_metadata = *trailing_metadata_or_error; trailing_metadata = *trailing_metadata_or_error;
} }
transport_stream_receiver_->NotifyRecvTrailingMetadata( deferred_func_queue.emplace(
code, std::move(trailing_metadata), status); [this, code, trailing_metadata = std::move(trailing_metadata),
status]() mutable {
this->transport_stream_receiver_->NotifyRecvTrailingMetadata(
code, std::move(trailing_metadata), status);
});
*cancellation_flags &= ~kFlagSuffix; *cancellation_flags &= ~kFlagSuffix;
} }
return absl::OkStatus(); return absl::OkStatus();

@ -18,9 +18,11 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include <memory> #include <memory>
#include <queue>
#include <utility> #include <utility>
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/functional/any_invocable.h"
#include <grpcpp/security/binder_security_policy.h> #include <grpcpp/security/binder_security_policy.h>
@ -99,9 +101,11 @@ class WireReaderImpl : public WireReader {
private: private:
absl::Status ProcessStreamingTransaction(transaction_code_t code, absl::Status ProcessStreamingTransaction(transaction_code_t code,
ReadableParcel* parcel); ReadableParcel* parcel);
absl::Status ProcessStreamingTransactionImpl(transaction_code_t code, absl::Status ProcessStreamingTransactionImpl(
ReadableParcel* parcel, transaction_code_t code, ReadableParcel* parcel, int* cancellation_flags,
int* cancellation_flags) // The queue saves the actions needed to be done "WITHOUT" `mu_`.
// It prevents deadlock against wire writer issues.
std::queue<absl::AnyInvocable<void() &&>>& deferred_func_queue)
ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
std::shared_ptr<TransportStreamReceiver> transport_stream_receiver_; std::shared_ptr<TransportStreamReceiver> transport_stream_receiver_;

Loading…
Cancel
Save