Fix data race leading to a deadlock when opening QuicStream - #101250

Merged
rzikm merged 7 commits into
dotnet:mainfrom
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged

Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom
rzikm:quic-stream-abort-from-api

Conversation

@rzikm

@rzikmrzikm commented Apr 18, 2024•
edited by CarnaViire
Loading

Copy link
Copy Markdown
Member

Fixes#101233.
Fixes#100971.
Contributes to #101463

See original issue for the description of the deadlock scenario.

@rzikm
rzikm requested a review from a teamApril 18, 2024 16:43
@dotnet-policy-service

dotnet-policy-serviceBot commented Apr 18, 2024

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024
Closed
Closed
Closed
wfurt
wfurt reviewed Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs Outdated
ManickaP
ManickaP reviewed Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs Outdated
ManickaP
ManickaP approved these changes Apr 19, 2024
View reviewed changes

@ManickaPManickaP left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs Outdated
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs Outdated
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
This was referenced Apr 22, 2024
Closed
Closed
ManickaP
ManickaP reviewed Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
@rzikm

rzikm commented Apr 23, 2024

Copy link
Copy Markdown
MemberAuthor

The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.

runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436 in 79a7156

if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}

So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.

@rzikm
rzikm requested a review from ManickaPApril 23, 2024 08:03
rzikm
rzikm commented Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
@rzikm

rzikm commented Apr 23, 2024

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines

azure-pipelinesBot commented Apr 23, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024
Closed
Closed
@CarnaViireCarnaViire mentioned this pull request Apr 24, 2024
Merged
@rzikm
rzikm requested a review from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire reviewed Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
CarnaViire
CarnaViire reviewed Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
CarnaViire
CarnaViire reviewed Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs Outdated
This was referenced Apr 24, 2024
Closed
Closed
Closed
Closed
Closed
This was referenced Apr 24, 2024
Closed
Closed
Closed
@rzikm
rzikmforce-pushed the quic-stream-abort-from-api branch from 69d4dc1 to 5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP approved these changes Apr 25, 2024
View reviewed changes

@ManickaPManickaP left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🥳 :shipit:

CarnaViire
CarnaViire approved these changes Apr 25, 2024
View reviewed changes

@CarnaViireCarnaViire left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:

@build-analysisbuild-analysisBot mentioned this pull request Apr 25, 2024
Closed
@rzikm

rzikm commented Apr 25, 2024

Copy link
Copy Markdown
MemberAuthor

no QUIC or HTTP/3 failures in CI.

@rzikm
rzikm merged commit 127844c into dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot mentioned this pull request Apr 25, 2024
Closed
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit to michaelgsharp/runtime that referenced this pull request May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm

rzikm commented May 13, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0-staging

@github-actions

github-actionsBot commented May 13, 2024

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753

@github-actions

github-actionsBot commented May 13, 2024

Copy link
Copy Markdown
Contributor

@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions

github-actionsBot commented May 13, 2024

Copy link
Copy Markdown
Contributor

@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

rzikm added a commit to rzikm/dotnet-runtime that referenced this pull request May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan mentioned this pull request May 13, 2024
Merged
@karelzkarelz added this to the 9.0.0 milestone May 13, 2024
rzikm added a commit that referenced this pull request May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes
+1 more reviewer
@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects

None yet

Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix data race leading to a deadlock when opening QuicStream - #101250
Merged
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Apr 25, 2024
Merged
Fix data race leading to a deadlock when opening QuicStream#101250
rzikm merged 7 commits into
dotnet:mainfrom 
rzikm:quic-stream-abort-from-api
Conversation
@rzikm
@rzikmrzikm
commented
Apr 18, 2024•

edited by CarnaViire

Loading

Copy link


Copy Markdown

Member
Fixes#101233.
Fixes#100971.

Contributes to #101463
See original issue for the description of the deadlock scenario.
@rzikm
rzikm
requested a review
from a teamApril 18, 2024 16:43
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Apr 18, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/ncl

See info in area-owners.md if you want to be subscribed.

This was referenced Apr 18, 2024

Closed


Closed


Closed

wfurt
wfurt
reviewed
Apr 18, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
Outdated

ManickaP
ManickaP
reviewed
Apr 19, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

ManickaP
ManickaP
approved these changes
Apr 19, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Looks good, thanks for finding and fixing this!
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Outdated

Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 22, 2024

Closed


Closed

ManickaP
ManickaP
reviewed
Apr 22, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
The original version was not a complete fix, it turns out that calling Complete on a Channel<T> will not complete the Completion if there are unread items in the channel.
runtime/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

Lines 433 to 436
in
79a7156
if(_acceptQueue.Reader.Completion.IsFaulted||connectionAbortedByPeer)
{
await_acceptQueue.Reader.Completion.ConfigureAwait(false);
}
So I added logic which will drain the channel once we are sure the streams inside have been shutdown. Please take another look.
@rzikm
rzikm
requested a review
from ManickaPApril 23, 2024 08:03
rzikm
rzikm
commented
Apr 23, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

@rzikm
rzikm
commented
Apr 23, 2024

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-libraries-coreclr outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 23, 2024

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 23, 2024

Closed


Closed

@CarnaViireCarnaViire
mentioned this pull request
Apr 24, 2024
 Merged

@rzikm
rzikm
requested a review
from CarnaViireApril 24, 2024 11:34
CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated

CarnaViire
CarnaViire
reviewed
Apr 24, 2024
View reviewed changes
Comment threadsrc/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Outdated


This was referenced Apr 24, 2024

Closed


Closed


Closed


Closed


Closed


This was referenced Apr 24, 2024

Closed


Closed


Closed

@rzikm
rzikmforce-pushed
the
quic-stream-abort-from-api
branch
from
69d4dc1 to
5586d18CompareApril 25, 2024 09:19
ManickaP
ManickaP
approved these changes
Apr 25, 2024
View reviewed changes
@ManickaPManickaP
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

🥳 :shipit:
CarnaViire
CarnaViire
approved these changes
Apr 25, 2024
View reviewed changes
@CarnaViireCarnaViire
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Given the urgency, I won't poke at nits. Otherwise LGTM :shipit:
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

@rzikm
rzikm
commented
Apr 25, 2024

Copy link


Copy Markdown

MemberAuthor
no QUIC or HTTP/3 failures in CI.
@rzikm
rzikm
merged commit 127844c
into
dotnet:mainApr 25, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 25, 2024

Closed

matouskozak pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
@rzikm@matouskozak
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
31244ee
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
michaelgsharp pushed a commit
to michaelgsharp/runtime
that referenced
this pull request
May 9, 2024
@rzikm@michaelgsharp
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
d825519
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@rzikm
rzikm
commented
May 13, 2024

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0-staging
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9059881753
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix data race leading to a deadlock.
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
M	src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicStream.cs
Auto-merging src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
Auto-merging src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix data race leading to a deadlock.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@github-actions
github-actionsBot
commented
May 13, 2024

Copy link


Copy Markdown

Contributor
@rzikm an error occurred while backporting to release/8.0-staging, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
rzikm added a commit
to rzikm/dotnet-runtime
that referenced
this pull request
May 13, 2024
@rzikm
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
0f7fec0
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@MihaZupanMihaZupan
mentioned this pull request
May 13, 2024
 Merged

@karelzkarelz
added this to the 9.0.0 milestone
May 13, 2024
rzikm added a commit
that referenced
this pull request
May 13, 2024
@rzikm
[release/8.0] Fix data race leading to a deadlock when opening QuicSt…
76b5685
…ream (#102147)
* Fix data race leading to a deadlock when opening QuicStream (#101250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
* Fix thrown exception.
Ruihan-Yin pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
@rzikm@Ruihan-Yin
Fix data race leading to a deadlock when opening QuicStream (dotnet#1…
23cd92b
…01250)
* Fix data race leading to a deadlock.
* Remove unwanted change
* Code review feedback
* Fix hang
* Add assert
* Fix potential crash
* Code review feedback
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jun 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@wfurtwfurtwfurt left review comments
@CarnaViireCarnaViireCarnaViire approved these changes
@ManickaPManickaPManickaP approved these changes

+1 more reviewer

@nibanksnibanksnibanks left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@rzikmrzikm

Labels

area-System.Net.Quic

Projects


None yet


Milestone

9.0.0

6 participants

@rzikm@CarnaViire@ManickaP@wfurt@nibanks@karelz