summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorhaavardm <haavardm@opera.com>2014-12-19 05:45:44 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-19 13:46:38 +0000
commit2d92e72b7dbde513405cc79dd648360daec8c2c1 (patch)
treef57122d1dbf6d49bf4f75cd9ccfd8f36b550c0d3 /net
parentaa1713cd2f91670bb25387acb563d923cb490141 (diff)
downloadchromium_src-2d92e72b7dbde513405cc79dd648360daec8c2c1.zip
chromium_src-2d92e72b7dbde513405cc79dd648360daec8c2c1.tar.gz
chromium_src-2d92e72b7dbde513405cc79dd648360daec8c2c1.tar.bz2
Implement zero-copy SSL buffers.
Use the new BoringSSL zero copy interface to avoid allocating new buffers for each read and write operation and save buffer memory. BUG=169885 Review URL: https://codereview.chromium.org/795573002 Cr-Commit-Position: refs/heads/master@{#309191}
Diffstat (limited to 'net')
-rw-r--r--net/socket/ssl_client_socket_openssl.cc78
-rw-r--r--net/socket/ssl_client_socket_openssl.h6
2 files changed, 54 insertions, 30 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 74ac8fc..7f44725 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -68,6 +68,9 @@ const int kNoPendingReadResult = 1;
// the server supports NPN, choosing "http/1.1" is the best answer.
const char kDefaultSupportedNPNProtocol[] = "http/1.1";
+// Default size of the internal BoringSSL buffers.
+const int KDefaultOpenSSLBufferSize = 17 * 1024;
+
void FreeX509Stack(STACK_OF(X509)* ptr) {
sk_X509_pop_free(ptr, X509_free);
}
@@ -728,9 +731,19 @@ int SSLClientSocketOpenSSL::Init() {
trying_cached_session_ = context->session_cache()->SetSSLSessionWithKey(
ssl_, GetSessionCacheKey());
+ send_buffer_ = new GrowableIOBuffer();
+ send_buffer_->SetCapacity(KDefaultOpenSSLBufferSize);
+ recv_buffer_ = new GrowableIOBuffer();
+ recv_buffer_->SetCapacity(KDefaultOpenSSLBufferSize);
+
BIO* ssl_bio = NULL;
- // 0 => use default buffer sizes.
- if (!BIO_new_bio_pair(&ssl_bio, 0, &transport_bio_, 0))
+
+ // SSLClientSocketOpenSSL retains ownership of the BIO buffers.
+ if (!BIO_new_bio_pair_external_buf(
+ &ssl_bio, send_buffer_->capacity(),
+ reinterpret_cast<uint8_t*>(send_buffer_->data()), &transport_bio_,
+ recv_buffer_->capacity(),
+ reinterpret_cast<uint8_t*>(recv_buffer_->data())))
return ERR_UNEXPECTED;
DCHECK(ssl_bio);
DCHECK(transport_bio_);
@@ -1545,20 +1558,20 @@ int SSLClientSocketOpenSSL::BufferSend(void) {
if (transport_send_busy_)
return ERR_IO_PENDING;
- if (!send_buffer_.get()) {
- // Get a fresh send buffer out of the send BIO.
- size_t max_read = BIO_pending(transport_bio_);
- if (!max_read)
- return 0; // Nothing pending in the OpenSSL write BIO.
- send_buffer_ = new DrainableIOBuffer(new IOBuffer(max_read), max_read);
- int read_bytes = BIO_read(transport_bio_, send_buffer_->data(), max_read);
- DCHECK_GT(read_bytes, 0);
- CHECK_EQ(static_cast<int>(max_read), read_bytes);
- }
+ size_t buffer_read_offset;
+ uint8_t* read_buf;
+ size_t max_read;
+ int status = BIO_zero_copy_get_read_buf(transport_bio_, &read_buf,
+ &buffer_read_offset, &max_read);
+ DCHECK_EQ(status, 1); // Should never fail.
+ if (!max_read)
+ return 0; // Nothing pending in the OpenSSL write BIO.
+ CHECK_EQ(read_buf, reinterpret_cast<uint8_t*>(send_buffer_->StartOfBuffer()));
+ CHECK_LT(buffer_read_offset, static_cast<size_t>(send_buffer_->capacity()));
+ send_buffer_->set_offset(buffer_read_offset);
int rv = transport_->socket()->Write(
- send_buffer_.get(),
- send_buffer_->BytesRemaining(),
+ send_buffer_.get(), max_read,
base::Bind(&SSLClientSocketOpenSSL::BufferSendComplete,
base::Unretained(this)));
if (rv == ERR_IO_PENDING) {
@@ -1591,11 +1604,21 @@ int SSLClientSocketOpenSSL::BufferRecv(void) {
// fill |transport_bio_| is issued. As long as an SSL client socket cannot
// be gracefully shutdown (via SSL close alerts) and re-used for non-SSL
// traffic, this over-subscribed Read()ing will not cause issues.
- size_t max_write = BIO_ctrl_get_write_guarantee(transport_bio_);
+
+ size_t buffer_write_offset;
+ uint8_t* write_buf;
+ size_t max_write;
+ int status = BIO_zero_copy_get_write_buf(transport_bio_, &write_buf,
+ &buffer_write_offset, &max_write);
+ DCHECK_EQ(status, 1); // Should never fail.
if (!max_write)
return ERR_IO_PENDING;
- recv_buffer_ = new IOBuffer(max_write);
+ CHECK_EQ(write_buf,
+ reinterpret_cast<uint8_t*>(recv_buffer_->StartOfBuffer()));
+ CHECK_LT(buffer_write_offset, static_cast<size_t>(recv_buffer_->capacity()));
+
+ recv_buffer_->set_offset(buffer_write_offset);
int rv = transport_->socket()->Read(
recv_buffer_.get(),
max_write,
@@ -1610,7 +1633,6 @@ int SSLClientSocketOpenSSL::BufferRecv(void) {
}
void SSLClientSocketOpenSSL::BufferSendComplete(int result) {
- transport_send_busy_ = false;
TransportWriteComplete(result);
OnSendComplete(result);
}
@@ -1622,18 +1644,18 @@ void SSLClientSocketOpenSSL::BufferRecvComplete(int result) {
void SSLClientSocketOpenSSL::TransportWriteComplete(int result) {
DCHECK(ERR_IO_PENDING != result);
+ int bytes_written = 0;
if (result < 0) {
// Record the error. Save it to be reported in a future read or write on
// transport_bio_'s peer.
transport_write_error_ = result;
- send_buffer_ = NULL;
} else {
- DCHECK(send_buffer_.get());
- send_buffer_->DidConsume(result);
- DCHECK_GE(send_buffer_->BytesRemaining(), 0);
- if (send_buffer_->BytesRemaining() <= 0)
- send_buffer_ = NULL;
+ bytes_written = result;
}
+ DCHECK_GE(send_buffer_->RemainingCapacity(), bytes_written);
+ int ret = BIO_zero_copy_get_read_buf_done(transport_bio_, bytes_written);
+ DCHECK_EQ(1, ret);
+ transport_send_busy_ = false;
}
int SSLClientSocketOpenSSL::TransportReadComplete(int result) {
@@ -1642,18 +1664,18 @@ int SSLClientSocketOpenSSL::TransportReadComplete(int result) {
// does not report success.
if (result == 0)
result = ERR_CONNECTION_CLOSED;
+ int bytes_read = 0;
if (result < 0) {
DVLOG(1) << "TransportReadComplete result " << result;
// Received an error. Save it to be reported in a future read on
// transport_bio_'s peer.
transport_read_error_ = result;
} else {
- DCHECK(recv_buffer_.get());
- int ret = BIO_write(transport_bio_, recv_buffer_->data(), result);
- // A write into a memory BIO should always succeed.
- DCHECK_EQ(result, ret);
+ bytes_read = result;
}
- recv_buffer_ = NULL;
+ DCHECK_GE(recv_buffer_->RemainingCapacity(), bytes_read);
+ int ret = BIO_zero_copy_get_write_buf_done(transport_bio_, bytes_read);
+ DCHECK_EQ(1, ret);
transport_recv_busy_ = false;
return result;
}
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index 6343cb7..6aaf1e1 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -187,8 +187,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
bool transport_send_busy_;
bool transport_recv_busy_;
- scoped_refptr<DrainableIOBuffer> send_buffer_;
- scoped_refptr<IOBuffer> recv_buffer_;
+ // Buffers which are shared by BoringSSL and SSLClientSocketOpenSSL.
+ // GrowableIOBuffer is used to keep ownership and setting offset.
+ scoped_refptr<GrowableIOBuffer> send_buffer_;
+ scoped_refptr<GrowableIOBuffer> recv_buffer_;
CompletionCallback user_connect_callback_;
CompletionCallback user_read_callback_;