JBR-10347 Wayland: fix deadlock between WLClipboard dataLock and clipboard monitor - #615
Open
verglor wants to merge 1838 commits into
Open
JBR-10347 Wayland: fix deadlock between WLClipboard dataLock and clipboard monitor#615verglor wants to merge 1838 commits into
verglor wants to merge 1838 commits into
Conversation
Vitaly Provodin (vprovodin)
force-pushed
the
main
branch
2 times, most recently
from
July 5, 2026 00:04
3bd956d to
2eca7ae
Compare
verglor
force-pushed
the
verglor/JBR-10347-wlclipboard-lock-inversion
branch
from
July 5, 2026 19:08
a76d673 to
2132857
Compare
The WinAPI function `GetFileAttributesW` actually opens a file and immediately closes it. If the file is a named pipe, it triggers a connection to the listener of the pipe. The listener closes the connection also asynchronously.
If the pipe is created with `nMaxInstances=1`, this code does not work:
```java
var path = Path.of("""\\.\pipe\openssh-ssh-agent""")
// `readAttributes` calls `GetFileAttributesW`, it opens the file and then closes it.
if (Files.readAttributes(path, BasicFileAttributes.class).isRegularFile()) {
// Very probable race condition: the listener of the pipe has already received
// the request of opening the file triggered by `GetFileAttributesW`
// but hasn't closed the connection on their side yet.
Files.newByteChannel(path); // Fails with ERROR_PIPE_BUSY.
}
```
This revision adds an explicit check if some file looks like a Windows pipe. In these cases `RandomAccessFile` and `FileInputStream` don't call `Files.readAttributes` for the file.
Support for gnome-specific dialog modality is disabled by default. Use -Dsun.awt.wl.NativeModality=true to enable.
…me process This patch makes the WLClipboard not call lostOwnershipNow() when a data offer is available that was made previously by this clipboard. To do this, WLClipboard's data sources announce a random cookie string as one of the supported mime types. This string is then checked for when receiving a data offer.
…ter press space or alt key. Fixing the timestamps of each KeyEvent/MouseEvent/MouseWheelEvent created by WLToolkit. (cherry picked from commit 4d1f4d9)
This patch removes holding a clipboard-global lock when receiving data by reading from a pipe, since that has the potential to cause deadlocks under specific circumstances. To synchronize destroying the offer objects on the Java side, they are now refcounted.
…ional scaling is OFF The size is corrected only under -Dsun.awt.wl.correctLogicalSize=true. The location is unchanged.
…utes instance Reviewed-by: jpai
Relaxed the logging entry level from WARNING to INFO. (cherry picked from commit 28c83fe)
… during Japanese typing in Editor Make the caret within preedit text be sourced from cursor_begin of zwp_text_input_v3::preedit_string and not from cursor_end. (cherry picked from commit 29ede7b)
…ly highlighted in search * Completely reimplementing JavaPreeditString#fromWaylandPreeditString and JavaCommitString#fromWaylandCommitString to make sure they don't ignore UTF-8 encoding errors and that JavaPreeditString#fromWaylandPreeditString sensibly handles invalid cursor indices. * Covering the new JavaPreeditString#fromWaylandPreeditString with tests. * Working around https://gitlab.gnome.org/GNOME/mutter/-/issues/3547. (cherry picked from commit e621663)
…t_manager_v3 if IM support is disabled * Introducing a new WLToolkit method isNativeInputMethodSupportEnabled * Deciding whether to bind to a zwp_text_input_manager_v3 based on the value returned by the new method
…nd VulkanDisposeBlitDstTest
Removed AppContext usage
…cursive for JTree * Use tree.getSelectionPaths() for JAVA_AX_SELECTED_CHILDREN * For JAVA_AX_ALL_CHILDREN and JAVA_AX_VISIBLE_CHILDREN also use linear iteration to avoid expensive operations with arrays on each level * Flip comparison order for accessible states to not call getAccessibleStateSet() when not needed because it can be expensive (cherry picked from commit fb21f0f)
… unclickable (Wayland) Passed origin relocation of the device to top-levels upd: Fix popup
* Refactor WLRoundedCornersManager.RoundedCornerKind Introduce subclasses to put additional parameters there later for more sophisticated painting. DEFAULT and NONE are left alone because DEFAULT is used for instance comparison in DefaultFrameDecoration, which we won't change here, and NONE is just a nice shortcut. * Merge canPaintRoundedCorners and roundedCornersRequested Rationale: they're always called in pair, and we'll need that instanceof check in canPaintRoundedCorners now as well to check if the border width is valid. A side note: this also fixes roundedCornerKind without synchronized() in canPaintRoundedCorners(). * Refactor rounded corner painting Rename masks to paths, because we'll soon have more paths to paint the border. Move resetCornerPaths() to keep createCornerPaths() overloads together. Move the graphics.setComposite() call closer to fill() because we'll need different composites for different parts. * Implement macOS-like rounded corner params for Wayland To make it easier for client code, use exactly the same format for the parameters as for macOS.
Vitaly Provodin (vprovodin)
force-pushed
the
main
branch
from
July 6, 2026 00:04
2eca7ae to
f132481
Compare
Author
|
Hi Vitaly Provodin (@vprovodin), is force pushing |
Member
|
Hi, Thank you for the pull request and your hard work. It saddens me to say it, but due to various legal reasons we cannot accept pull requests from external contributors: https://github.com/JetBrains/JetBrainsRuntime#contributing. Consider contributing this to OpenJDK project Wakefield https://openjdk.org/projects/wakefield/ instead. Please also note that you cannot have used AI at all to help you develop this code. Otherwise it will be rejected by OpenJDK https://openjdk.org/legal/ai. |
…board monitor WLClipboard.handleClipboardOffer() called SunClipboard.lostOwnershipNow() while holding dataLock. lostOwnershipNow() synchronizes on the clipboard's monitor, which SunClipboard's public API (getContents(), isDataFlavorAvailable(), ...) holds while calling back into getClipboardFormats(), which acquires dataLock. The two opposite lock acquisition orders deadlock when a clipboard offer arrives while another thread is reading the clipboard. This reinstates the invariant established by the JBR-7896 fix (never enter clipboard-monitor code while holding dataLock), which was regressed by JBR-9898: the new ownership check reads state guarded by dataLock, so the lostOwnershipNow() call was moved inside the synchronized block. Evaluate the condition under dataLock, but invoke lostOwnershipNow() after releasing it. Add a regression test that deterministically provokes the inverted interleaving via reflection and fails with the JVM's deadlock detector report when the inversion is present.
verglor
force-pushed
the
verglor/JBR-10347-wlclipboard-lock-inversion
branch
from
July 6, 2026 14:48
2132857 to
e87d38a
Compare
Author
|
Hi Nikita Tsarev (@tsarn), thank you for the information. So could you please fix it ? It seems to be trivial change and prevents serious deadlock. |
Vitaly Provodin (vprovodin)
force-pushed
the
main
branch
5 times, most recently
from
July 11, 2026 00:05
d0ce210 to
4313d55
Compare
Nikita Provotorov (OnePatchGuy)
force-pushed
the
main
branch
from
July 15, 2026 06:58
4313d55 to
d2f3cc6
Compare
Vitaly Provodin (vprovodin)
force-pushed
the
main
branch
from
July 16, 2026 00:05
d2f3cc6 to
d8f8a5b
Compare
Anton Shangareev (shananton)
force-pushed
the
main
branch
from
July 22, 2026 09:36
d8f8a5b to
58cea0a
Compare
Nikita Gubarkov (YaaZ)
force-pushed
the
main
branch
from
July 30, 2026 08:47
f7ca760 to
44f3f86
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
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.
Fixes JBR-10347 (also reported as IJPL-248197) — IDE-wide UI freezes/deadlocks on Wayland when a clipboard offer arrives while another thread reads the clipboard.
Root cause
An AB–BA lock inversion, regressed from the JBR-7896 fix by the JBR-9898 change:
WLDataDevice.handleSelection→WLClipboard.handleClipboardOffertakesdataLock, thenSunClipboard.lostOwnershipNow()needs the clipboard monitor (SunClipboard.java:242)SunClipboard.getContents()/isDataFlavorAvailable()(synchronized, holds the monitor) →WLClipboard.getClipboardFormats()needsdataLockThe JBR-7896 fix ("Avoid performing blocking I/O while holding a lock") deliberately kept
lostOwnershipNow()outsidedataLock, and the JBR-8833 refactor preserved that. JBR-9898's ownership check readsdataLock-guarded state (ourDataSource), so thelostOwnershipNow()call moved inside the synchronized block, re-creating the inversion. JBR-9865 shortened the freeze window (non-blockinggetMimes()) but the inversion remained.Fix
Evaluate the ownership condition under
dataLock, invokelostOwnershipNow()after releasing it — restoring the JBR-7896 invariant of never entering clipboard-monitor code while holdingdataLock.Test
WLClipboardLockOrderTestprovokes the exact interleaving deterministically: a reader thread holds the clipboard monitor (asSunClipboard.getContents()does), waits for the offer-handler thread to block, then callsgetClipboardFormats(). Failure is detected viaThreadMXBean.findDeadlockedThreads()and reported with the JVM deadlock report.Verified on JBR 25.0.3+9-b329.124 under a real GNOME Wayland session:
RuntimeException: Deadlock detectedwith stacks identical to the field thread dumps in JBR-10347--patch-module→Test passedBackport
The
jbr25tip carries the same inversion (withlostOwnershipNow(null)instead oflostOwnershipNow(), so not a clean cherry-pick). Since that line ships in 2026.1/2026.2 IDEs, I'm happy to submit thejbr25backport PR as well once this one is reviewed.