Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Make memory pressure handler call deleteAllCode with PreventCollectionAndDeleteAllCode #10847

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Make memory pressure handler call deleteAllCode with PreventCollectionAndDeleteAllCode #10847

merged 1 commit into from
Mar 2, 2023

Conversation

heycam
Copy link
Contributor

@heycam heycam commented Mar 1, 2023 •
edited by webkit-early-warning-system

69098eb

Make memory pressure handler call deleteAllCode with PreventCollectionAndDeleteAllCode
https://bugs.webkit.org/show_bug.cgi?id=253133
<rdar://problem/106065668>

Reviewed by Mark Lam and Yusuke Suzuki.

The memory pressure handler currently calls
GCController::deleteAllCode(DeleteAllCodeIfNotCollecting), but it turns out we
hit the case of a collection being in progress moderately often. We already
do a bunch of blocky work here to get memory usage down, so let's change this
to PreventCollectionAndDeleteAllCode to guarantee we can drop all JIT code.

* Source/WebCore/page/MemoryRelease.cpp:
(WebCore::releaseCriticalMemory):

Canonical link: https://commits.webkit.org/261061@main

ebcd2f5

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac   🧪 gtk-wk2
  🧪 api-ios ✅ 🧪 mac-wk1   🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim   🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@heycam heycam requested a review from cdumez as a code owner March 1, 2023 03:46
@heycam heycam self-assigned this Mar 1, 2023
@heycam heycam added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Mar 1, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 395436d)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim

MenloDorian
MenloDorian approved these changes Mar 1, 2023
View reviewed changes
Copy link

@MenloDorian MenloDorian left a comment

Choose a reason for hiding this comment

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

r=me

Constellation
Constellation approved these changes Mar 1, 2023
View reviewed changes
Copy link
Member

@Constellation Constellation left a comment

Choose a reason for hiding this comment

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

r=me. This is always run under VM::whenIdle. So discarding CodeBlock is safe.

@heycam heycam force-pushed the delete-code-wait-for-collector branch from 395436d to ebcd2f5 Compare March 2, 2023 10:05
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash ebcd2f5)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac   🧪 gtk-wk2
  🧪 api-ios ✅ 🧪 mac-wk1   🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim   🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@heycam heycam added the merge-queue Applied to send a pull request to merge-queue label Mar 2, 2023
@heycam
Make memory pressure handler call deleteAllCode with PreventCollectio…
69098eb 
…nAndDeleteAllCode

https://bugs.webkit.org/show_bug.cgi?id=253133
<rdar://problem/106065668>

Reviewed by Mark Lam and Yusuke Suzuki.

The memory pressure handler currently calls
GCController::deleteAllCode(DeleteAllCodeIfNotCollecting), but it turns out we
hit the case of a collection being in progress moderately often. We already
do a bunch of blocky work here to get memory usage down, so let's change this
to PreventCollectionAndDeleteAllCode to guarantee we can drop all JIT code.

* Source/WebCore/page/MemoryRelease.cpp:
(WebCore::releaseCriticalMemory):

Canonical link: https://commits.webkit.org/261061@main
@webkit-commit-queue
Copy link
Collaborator

Committed 261061@main (69098eb): https://commits.webkit.org/261061@main

Reviewed commits have been landed. Closing PR #10847 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 2, 2023
@webkit-early-warning-system webkit-early-warning-system merged commit 69098eb into WebKit:main Mar 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Constellation Constellation Constellation approved these changes

@MenloDorian MenloDorian MenloDorian approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

Assignees

@heycam heycam

Labels
WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
Projects
None yet
Milestone
No milestone
5 participants
@heycam @webkit-early-warning-system @webkit-commit-queue @Constellation @MenloDorian