Skip to content

Commit

Permalink
improve TLS perf on macOS (#32338)
Browse files Browse the repository at this point in the history 
* improve TLS perf on macOS

* feedback from review

* feedback from review

* remove unnecesary locking

Co-authored-by: Tomas Weinfurt <furt@Shining.local>
  • Loading branch information
@wfurt
wfurt and Tomas Weinfurt committed Apr 16, 2020
1 parent a2527e9 commit b44492d
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 95 deletions.
108 changes: 38 additions & 70 deletions src/libraries/System.Net.Security/src/System/Net/Security/Pal.OSX/SafeDeleteSslContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ namespace System.Net
{
internal sealed class SafeDeleteSslContext : SafeDeleteContext
{
private const int InitialBufferSize = 2048;
private SafeSslHandle _sslContext;
private Interop.AppleCrypto.SSLReadFunc _readCallback;
private Interop.AppleCrypto.SSLWriteFunc _writeCallback;
private Queue<byte> _fromConnection = new Queue<byte>();
private Queue<byte> _toConnection = new Queue<byte>();
private ArrayBuffer _inputBuffer = new ArrayBuffer(InitialBufferSize);
private ArrayBuffer _outputBuffer = new ArrayBuffer(InitialBufferSize);

public SafeSslHandle SslContext => _sslContext;

Expand Down Expand Up @@ -141,10 +142,12 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
if (null != _sslContext)
SafeSslHandle sslContext = _sslContext;
if (null != sslContext)
{
_sslContext.Dispose();
_sslContext = null!;
_inputBuffer.Dispose();
_outputBuffer.Dispose();
sslContext.Dispose();
}
}

Expand All @@ -153,18 +156,15 @@ protected override void Dispose(bool disposing)

private unsafe int WriteToConnection(void* connection, byte* data, void** dataLength)
{
ulong toWrite = (ulong)*dataLength;
byte* readFrom = data;
ulong length = (ulong)*dataLength;
Debug.Assert(length <= int.MaxValue);

lock (_toConnection)
{
while (toWrite > 0)
{
_toConnection.Enqueue(*readFrom);
readFrom++;
toWrite--;
}
}
int toWrite = (int)length;
var inputBuffer = new ReadOnlySpan<byte>(data, toWrite);

_outputBuffer.EnsureAvailableSpace(toWrite);
inputBuffer.CopyTo(_outputBuffer.AvailableSpan);
_outputBuffer.Commit(toWrite);

// Since we can enqueue everything, no need to re-assign *dataLength.
const int noErr = 0;
Expand All @@ -175,78 +175,51 @@ private unsafe int ReadFromConnection(void* connection, byte* data, void** dataL
{
const int noErr = 0;
const int errSSLWouldBlock = -9803;

ulong toRead = (ulong)*dataLength;

if (toRead == 0)
{

return noErr;
}

uint transferred = 0;

lock (_fromConnection)
if (_inputBuffer.ActiveLength == 0)
{
*dataLength = (void*)0;
return errSSLWouldBlock;
}

if (_fromConnection.Count == 0)
{

*dataLength = (void*)0;
return errSSLWouldBlock;
}
int limit = Math.Min((int)toRead, _inputBuffer.ActiveLength);

byte* writePos = data;

while (transferred < toRead && _fromConnection.Count > 0)
{
*writePos = _fromConnection.Dequeue();
writePos++;
transferred++;
}
}
_inputBuffer.ActiveSpan.Slice(0, limit).CopyTo(new Span<byte>(data, limit));
_inputBuffer.Discard(limit);
transferred = (uint)limit;

*dataLength = (void*)transferred;
return noErr;
}

internal void Write(byte[] buf, int offset, int count)
{
Debug.Assert(buf != null);
Debug.Assert(offset >= 0);
Debug.Assert(count >= 0);
Debug.Assert(count <= buf.Length - offset);

Write(buf.AsSpan(offset, count));
}

internal void Write(ReadOnlySpan<byte> buf)
{
lock (_fromConnection)
{
foreach (byte b in buf)
{
_fromConnection.Enqueue(b);
}
}
_inputBuffer.EnsureAvailableSpace(buf.Length);
buf.CopyTo(_inputBuffer.AvailableSpan);
_inputBuffer.Commit(buf.Length);
}

internal int BytesReadyForConnection => _toConnection.Count;
internal int BytesReadyForConnection => _outputBuffer.ActiveLength;

internal byte[]? ReadPendingWrites()
{
lock (_toConnection)
if (_outputBuffer.ActiveLength == 0)
{
if (_toConnection.Count == 0)
{
return null;
}
return null;
}

byte[] data = _toConnection.ToArray();
_toConnection.Clear();
byte[] buffer = _outputBuffer.ActiveSpan.ToArray();
_outputBuffer.Discard(_outputBuffer.ActiveLength);

return data;
}
return buffer;
}

internal int ReadPendingWrites(byte[] buf, int offset, int count)
Expand All @@ -256,17 +229,12 @@ internal int ReadPendingWrites(byte[] buf, int offset, int count)
Debug.Assert(count >= 0);
Debug.Assert(count <= buf.Length - offset);

lock (_toConnection)
{
int limit = Math.Min(count, _toConnection.Count);
int limit = Math.Min(count, _outputBuffer.ActiveLength);

for (int i = 0; i < limit; i++)
{
buf[offset + i] = _toConnection.Dequeue();
}
_outputBuffer.ActiveSpan.Slice(0, limit).CopyTo(new Span<byte>(buf, offset, limit));
_outputBuffer.Discard(limit);

return limit;
}
return limit;
}

private static readonly SslProtocols[] s_orderedSslProtocols = new SslProtocols[5]
Expand Down
30 changes: 5 additions & 25 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,11 @@ public static SecurityStatusPal EncryptMessage(
MemoryHandle memHandle = input.Pin();
try
{
PAL_TlsIo status;

lock (sslHandle)
{
status = Interop.AppleCrypto.SslWrite(
PAL_TlsIo status = Interop.AppleCrypto.SslWrite(
sslHandle,
(byte*)memHandle.Pointer,
input.Length,
out int written);
}

if (status < 0)
{
Expand Down Expand Up @@ -154,19 +149,13 @@ public static SecurityStatusPal DecryptMessage(
SafeDeleteSslContext sslContext = (SafeDeleteSslContext)securityContext;
SafeSslHandle sslHandle = sslContext.SslContext;

sslContext.Write(buffer, offset, count);
sslContext.Write(buffer.AsSpan(offset, count));

unsafe
{
fixed (byte* offsetInput = &buffer[offset])
{
int written;
PAL_TlsIo status;

lock (sslHandle)
{
status = Interop.AppleCrypto.SslRead(sslHandle, offsetInput, count, out written);
}
PAL_TlsIo status = Interop.AppleCrypto.SslRead(sslHandle, offsetInput, count, out int written);

if (status < 0)
{
Expand Down Expand Up @@ -266,12 +255,7 @@ private static SecurityStatusPal HandshakeInternal(
}

SafeSslHandle sslHandle = sslContext!.SslContext;
SecurityStatusPal status;

lock (sslHandle)
{
status = PerformHandshake(sslHandle);
}
SecurityStatusPal status = PerformHandshake(sslHandle);

outputBuffer = sslContext.ReadPendingWrites();
return status;
Expand Down Expand Up @@ -329,12 +313,8 @@ public static SecurityStatusPal ApplyShutdownToken(
{
SafeDeleteSslContext sslContext = ((SafeDeleteSslContext)securityContext);
SafeSslHandle sslHandle = sslContext.SslContext;
int osStatus;

lock (sslHandle)
{
osStatus = Interop.AppleCrypto.SslShutdown(sslHandle);
}
int osStatus = Interop.AppleCrypto.SslShutdown(sslHandle);

if (osStatus == 0)
{
Expand Down

0 comments on commit b44492d

Please sign in to comment.