Cherry-pick b341c44: Fix ETW trace logging crash in multithreading situations #21602
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix SecureKernel break on Session Creation The SecureKernel crashes on session creation due to TraceLoggingOptions. Disable the logging call for now to unblock payload. Co-authored-by: Sheil Kumar <[email protected]>
### Description Fix WAI build by only conditionally copying linker flags ### Motivation and Context I broke the WAI build that contains ORT on ARM64
### Description <!-- Describe your changes. --> ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> --------- Co-authored-by: Adrian Lizarraga <[email protected]> Co-authored-by: Rachel Guo <[email protected]> Co-authored-by: wejoncy <[email protected]> Co-authored-by: Xavier Dupré <[email protected]> Co-authored-by: Yulong Wang <[email protected]> Co-authored-by: Hector Li <[email protected]> Co-authored-by: luoyu-intel <[email protected]> Co-authored-by: kunal-vaishnavi <[email protected]> Co-authored-by: Chi Lo <[email protected]> Co-authored-by: Ye Wang <[email protected]> Co-authored-by: snadampal <[email protected]> Co-authored-by: Tianlei Wu <[email protected]> Co-authored-by: Heflin Stephen Raj <[email protected]> Co-authored-by: Yifan Li <[email protected]> Co-authored-by: Yufeng Li <[email protected]> Co-authored-by: Changming Sun <[email protected]> Co-authored-by: rachguo <[email protected]> Co-authored-by: Edward Chen <[email protected]> Co-authored-by: aciddelgado <[email protected]> Co-authored-by: petermcaughan <[email protected]> Co-authored-by: Peter McAughan <[email protected]> Co-authored-by: Patrice Vignola <[email protected]> Co-authored-by: ivberg <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: Preetha Veeramalai <[email protected]> Co-authored-by: fxmarty <[email protected]> Co-authored-by: Sheil Kumar <[email protected]> Co-authored-by: Sheil Kumar <[email protected]> Co-authored-by: Prathik Rao <[email protected]> Co-authored-by: Shubham Bhokare <[email protected]> Co-authored-by: Jian Chen <[email protected]> Co-authored-by: satyajandhyala <[email protected]> Co-authored-by: rachguo <[email protected]>
### Description <!-- Describe your changes. --> ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> --------- Co-authored-by: Sheil Kumar <[email protected]> Co-authored-by: Sheil Kumar <[email protected]> Co-authored-by: Yufeng Li <[email protected]>
### Description <!-- Describe your changes. --> Windows memory map casts mapped_offset to DWORD directly. It will be truncated if it is larger than 2^32-1. We need to set high dwFileOffsetHigh for this case. ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> The bug was found from #19450 ### Description <!-- Describe your changes. --> ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> Co-authored-by: Yufeng Li <[email protected]>
ETW trace logger is fakely registered as initialized_ is marked as true before the registration is done, causing crashing issue for Lenovo camera application. A prior attempt to address was made here: #21226 It was reverted here: #21360 The problem is that during initialization of TraceLoggingRegisterEx, it will reinvoke the callback and attempt reinitialization, which is not allowed. TraceLoggingRegisterEx however can be initialized concurrently when initialization happens on multiple threads. For these reasons it needs to be protected by a lock, but the lock cannot naively block because the callback's reinvocation will cause a deadlock. To solve this problem another tracking variable is added : "initializing" which protects against reinitialization during the first initialization. --------- Co-authored-by: Sheil Kumar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Cherry-pick: #21566