Skip to content

Use ReadOnlySpan<byte> optimization for static data in Kestrel HTTP2 Connection #7712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use ReadOnlySpan<byte> optimization for static data in Kestrel HTTP2 Connection #7712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using System.IO.Pipelines;
using System.Runtime.CompilerServices;
using System.Security.Authentication;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections;
Expand All @@ -22,26 +21,39 @@
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers;

namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
{
public class Http2Connection : IHttp2StreamLifetimeHandler, IHttpHeadersHandler, IRequestProcessor
{
public static byte[] ClientPreface { get; } = Encoding.ASCII.GetBytes("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n");
public static ReadOnlySpan<byte> ClientPreface => new byte[] {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This property is public, but currently only used in 1 unit test

(byte)'P', (byte)'R', (byte)'I', (byte)' ', (byte)'*', (byte)' ',
(byte)'H', (byte)'T', (byte)'T', (byte)'P', (byte)'/', (byte)'2',
(byte)'.', (byte)'0', (byte)'\r', (byte)'\n', (byte)'\r', (byte)'\n',
(byte)'S', (byte)'M', (byte)'\r', (byte)'\n', (byte)'\r', (byte)'\n'};

private static readonly PseudoHeaderFields _mandatoryRequestPseudoHeaderFields =
PseudoHeaderFields.Method | PseudoHeaderFields.Path | PseudoHeaderFields.Scheme;

private static readonly byte[] _authorityBytes = Encoding.ASCII.GetBytes(HeaderNames.Authority);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HeaderNames are not used anymore

private static readonly byte[] _methodBytes = Encoding.ASCII.GetBytes(HeaderNames.Method);
private static readonly byte[] _pathBytes = Encoding.ASCII.GetBytes(HeaderNames.Path);
private static readonly byte[] _schemeBytes = Encoding.ASCII.GetBytes(HeaderNames.Scheme);
private static readonly byte[] _statusBytes = Encoding.ASCII.GetBytes(HeaderNames.Status);
private static readonly byte[] _connectionBytes = Encoding.ASCII.GetBytes("connection");
private static readonly byte[] _teBytes = Encoding.ASCII.GetBytes("te");
private static readonly byte[] _trailersBytes = Encoding.ASCII.GetBytes("trailers");
private static readonly byte[] _connectBytes = Encoding.ASCII.GetBytes("CONNECT");
private static ReadOnlySpan<byte> Authority => new byte[] {
(byte)':', (byte)'a', (byte)'u', (byte)'t', (byte)'h', (byte)'o', (byte)'r',
(byte)'i', (byte)'t', (byte)'y' };
private static ReadOnlySpan<byte> Method => new byte[] {
(byte)':', (byte)'m', (byte)'e', (byte)'t', (byte)'h', (byte)'o', (byte)'d' };
private static ReadOnlySpan<byte> Path => new byte[] {
(byte)':', (byte)'p', (byte)'a', (byte)'t', (byte)'h' };
private static ReadOnlySpan<byte> Scheme => new byte[] {
(byte)':', (byte)'s', (byte)'c', (byte)'h', (byte)'e', (byte)'m', (byte)'e' };
private static ReadOnlySpan<byte> Status => new byte[] {
(byte)':', (byte)'s', (byte)'t', (byte)'a', (byte)'t', (byte)'u', (byte)'s' };
private static ReadOnlySpan<byte> Connection => new byte[] {
(byte)'c', (byte)'o', (byte)'n', (byte)'n', (byte)'e', (byte)'c', (byte)'t', (byte)'i', (byte)'o', (byte)'n' };
private static ReadOnlySpan<byte> TE => new byte[] {
(byte)'t', (byte)'e' };
private static ReadOnlySpan<byte> Trailers => new byte[] {
(byte)'t', (byte)'r', (byte)'a', (byte)'i', (byte)'l', (byte)'e', (byte)'r', (byte)'s' };
private static ReadOnlySpan<byte> Connect => new byte[] {
(byte)'C', (byte)'O', (byte)'N', (byte)'N', (byte)'E', (byte)'C', (byte)'T' };

private readonly HttpConnectionContext _context;
private readonly Http2FrameWriter _frameWriter;
Expand Down Expand Up @@ -1149,7 +1161,7 @@ implementations to these vulnerabilities.*/

if (headerField == PseudoHeaderFields.Method)
{
_isMethodConnect = value.SequenceEqual(_connectBytes);
_isMethodConnect = value.SequenceEqual(Connect);
}

_parsedPseudoHeaderFields |= headerField;
Expand Down Expand Up @@ -1191,23 +1203,23 @@ private bool IsPseudoHeaderField(Span<byte> name, out PseudoHeaderFields headerF
return false;
}

if (name.SequenceEqual(_pathBytes))
if (name.SequenceEqual(Path))
{
headerField = PseudoHeaderFields.Path;
}
else if (name.SequenceEqual(_methodBytes))
else if (name.SequenceEqual(Method))
{
headerField = PseudoHeaderFields.Method;
}
else if (name.SequenceEqual(_schemeBytes))
else if (name.SequenceEqual(Scheme))
{
headerField = PseudoHeaderFields.Scheme;
}
else if (name.SequenceEqual(_statusBytes))
else if (name.SequenceEqual(Status))
{
headerField = PseudoHeaderFields.Status;
}
else if (name.SequenceEqual(_authorityBytes))
else if (name.SequenceEqual(Authority))
{
headerField = PseudoHeaderFields.Authority;
}
Expand All @@ -1221,7 +1233,7 @@ private bool IsPseudoHeaderField(Span<byte> name, out PseudoHeaderFields headerF

private static bool IsConnectionSpecificHeaderField(Span<byte> name, Span<byte> value)
{
return name.SequenceEqual(_connectionBytes) || (name.SequenceEqual(_teBytes) && !value.SequenceEqual(_trailersBytes));
return name.SequenceEqual(Connection) || (name.SequenceEqual(TE) && !value.SequenceEqual(Trailers));
}

private bool TryClose()
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ protected static async Task FlushAsync(PipeWriter writableBuffer)
await writableBuffer.FlushAsync().AsTask().DefaultTimeout();
}

protected Task SendPreambleAsync() => SendAsync(new ArraySegment<byte>(Http2Connection.ClientPreface));
protected Task SendPreambleAsync() => SendAsync(Http2Connection.ClientPreface);

protected async Task SendSettingsAsync()
{
Expand Down