Skip to content

SSL distribution protocol fixes for kTLS #10232

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

Open
wants to merge 2 commits into
base: maint
Choose a base branch
from
Open

SSL distribution protocol fixes for kTLS #10232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b05062
Set missing link for connection teardown
RaimoNiskanen Sep 17, 2025
071b88f
Make kTLS activation more resilient
RaimoNiskanen Oct 6, 2025
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
12 changes: 12 additions & 0 deletions lib/ssl/src/inet_epmd_tls_socket.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,18 @@ connect(
%% ------------------------------------------------------------
start_dist_ctrl(
NetAddress, #sslsocket{payload_sender = DistCtrl} = SslSocket) ->
%% The distribution controller (output controller) needs to be linked
%% to the caller, which becomes the distribution ticker
%% after distribution handshake.
%%
%% net_kernel takes down either the distribution controller
%% or the ticker, but all processes involved in the channel
%% must be taken down when the channel goes down.
%%
%% The SSL socket receiver and payload sender will go down
%% together thanks to their supervisor.
%%
link(DistCtrl),
#hs_data{
socket = DistCtrl,
f_send =
Expand Down
46 changes: 21 additions & 25 deletions lib/ssl/src/inet_tls_dist.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,18 @@ hs_data_inet_tcp(Driver, Socket) ->
end}.

hs_data_ssl(Family, #sslsocket{payload_sender = DistCtrl} = SslSocket) ->
%% The distribution controller (output controller) needs to be linked
%% to the caller, which becomes the distribution ticker
%% after distribution handshake.
%%
%% net_kernel takes down either the distribution controller
%% or the ticker, but all processes involved in the channel
%% must be taken down when the channel goes down.
%%
%% The SSL socket receiver and payload sender will go down
%% together thanks to their supervisor.
%%
link(DistCtrl),
{ok, Address} =
maybe
{error, einval} ?= ssl:peername(SslSocket),
Expand Down Expand Up @@ -513,15 +525,13 @@ do_accept(
Timer = dist_util:start_timer(SetupTime),
{HSData0, NewAllowed} =
case DistSocket of
SslSocket = #sslsocket{payload_sender = Sender} ->
link(Sender),
{hs_data_ssl(Family, SslSocket),
allowed_nodes(SslSocket, Allowed)};
SslSocket = #sslsocket{} ->
HSDataSsl = hs_data_ssl(Family, SslSocket),
{HSDataSsl, allowed_nodes(SslSocket, Allowed)};
PortSocket when is_port(DistSocket) ->
%%% XXX Breaking abstraction barrier
Driver = erlang:port_get_data(PortSocket),
{hs_data_inet_tcp(Driver, PortSocket),
Allowed}
{hs_data_inet_tcp(Driver, PortSocket), Allowed}
end,
HSData =
HSData0#hs_data{
Expand Down Expand Up @@ -648,13 +658,14 @@ do_setup(
KTLS = proplists:get_value(ktls, Opts, false),
dist_util:reset_timer(Timer),
maybe
{ok, #sslsocket{connection_handler = Receiver, payload_sender = Sender} = SslSocket} ?=
{ok, SslSocket} ?=
ssl:connect(IP, PortNum, Opts, net_kernel:connecttime()),
HSData =
case KTLS of
true ->
{ok, KtlsInfo} =
ssl_gen_statem:ktls_handover(Receiver),
ssl_gen_statem:ktls_handover(
SslSocket#sslsocket.connection_handler),
Socket = maps:get(socket, KtlsInfo),
case inet_set_ktls(KtlsInfo) of
ok when is_port(Socket) ->
Expand All @@ -667,9 +678,7 @@ do_setup(
trace({set_ktls_failed, KtlsReason}))
end;
false ->
_ = monitor_pid(Sender),
ok = ssl:controlling_process(SslSocket, self()),
link(Sender),
hs_data_ssl(Family, SslSocket)
end
#hs_data{
Expand Down Expand Up @@ -1011,26 +1020,13 @@ set_ktls_cipher(
cipher_suite := CipherSuite,
%%
socket := Socket,
setopt_fun := SetoptFun,
getopt_fun := GetoptFun },
setopt_fun := SetoptFun },
OS, CipherState, CipherSeq, TxRx) ->
maybe
{ok, {Option, Value}} ?=
ktls_opt_cipher(
OS, TLS_version, CipherSuite, CipherState, CipherSeq, TxRx),
_ = SetoptFun(Socket, Option, Value),
case TxRx of
tx ->
Size = byte_size(Value),
case GetoptFun(Socket, Option, Size) of
{ok, Value} ->
ok;
Other ->
{error, {ktls_set_cipher_failed, Other}}
end;
rx ->
ok
end
SetoptFun(Socket, Option, Value)
end.

ktls_os() ->
Expand Down
Loading