220659 2021-01-15 08:52:56 -0800 [GPUProcess] Improve the GPUProcess' memory pressure handler 2021-01-15 10:30:22 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez ggaren simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1719887 0 cdumez 2021-01-15 08:52:56 -0800 Improve the GPUProcess' memory pressure handler to clear things like the IOSurfacePool and the SubimageCacheWithTimer. 1719890 1 417703 cdumez 2021-01-15 08:54:35 -0800 Created attachment 417703 Patch 1719903 2 417703 simon.fraser 2021-01-15 09:37:44 -0800 Comment on attachment 417703 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417703&action=review Should we also propagate the memory warning to the web content processes? Or will they also get the warning? > Source/WebCore/page/MemoryRelease.cpp:169 > + // Return unused pages back to the OS now as this will likely give us a little memory to work with. I don't think this comment adds anything. In fact, I'm confused by it. > Source/WebCore/page/MemoryRelease.cpp:176 > + if (synchronous == Synchronous::Yes) > + WTF::releaseFastMallocFreeMemory(); What's the reason for calling it a second time? 1719905 3 417703 cdumez 2021-01-15 09:41:25 -0800 Comment on attachment 417703 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417703&action=review >> Source/WebCore/page/MemoryRelease.cpp:169 >> + // Return unused pages back to the OS now as this will likely give us a little memory to work with. > > I don't think this comment adds anything. In fact, I'm confused by it. Ok. This was from releaseMemory() above. >> Source/WebCore/page/MemoryRelease.cpp:176 >> + WTF::releaseFastMallocFreeMemory(); > > What's the reason for calling it a second time? I am not sure. This is a stripped down version of releaseMemory() above. 1719907 4 417703 simon.fraser 2021-01-15 09:46:17 -0800 Comment on attachment 417703 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417703&action=review >>> Source/WebCore/page/MemoryRelease.cpp:169 >>> + // Return unused pages back to the OS now as this will likely give us a little memory to work with. >> >> I don't think this comment adds anything. In fact, I'm confused by it. > > Ok. This was from releaseMemory() above. I need to read more closely. This is releasing "free" memory, so presumably pages that are free to return to the OS. The comments makes more sense now (but the comment should use "free", not "unused" to match the function name). >>> Source/WebCore/page/MemoryRelease.cpp:176 >>> + WTF::releaseFastMallocFreeMemory(); >> >> What's the reason for calling it a second time? > > I am not sure. This is a stripped down version of releaseMemory() above. I'm guessing this can touch pages and thus trigger them getting mapped back in. 1719908 5 417711 cdumez 2021-01-15 09:47:09 -0800 Created attachment 417711 Patch 1719920 6 ews-feeder 2021-01-15 10:29:13 -0800 Committed r271526: <https://trac.webkit.org/changeset/271526> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417711. 1719921 7 webkit-bug-importer 2021-01-15 10:30:22 -0800 <rdar://problem/73254115> 417703 2021-01-15 08:54:35 -0800 2021-01-15 09:47:07 -0800 Patch bug-220659-20210115085434.patch text/plain 7099 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEzM2ZlOWU0NzkzZDlj YTg2ODI0OTU2YzQ5NWJkY2M3NDc3ZDQ1Zi4uYTQ0ZGRjYWRkYjRjOWI2NTA3NmMwMWE1NWQyYzE3 YmFiNjFlMTQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVByb2Nlc3NdIEltcHJv dmUgdGhlIEdQVVByb2Nlc3MnIG1lbW9yeSBwcmVzc3VyZSBoYW5kbGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2NTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIHRoZSBHUFVQcm9jZXNz JyBtZW1vcnkgcHJlc3N1cmUgaGFuZGxlciB0byBjbGVhciB0aGluZ3MgbGlrZSB0aGUgSU9TdXJm YWNlUG9vbAorICAgICAgICBhbmQgdGhlIFN1YmltYWdlQ2FjaGVXaXRoVGltZXIuCisKKyAgICAg ICAgKiBwYWdlL01lbW9yeVJlbGVhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVsZWFzZUdy YXBoaWNzTWVtb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3JtUmVsZWFzZUdyYXBoaWNz TWVtb3J5KToKKyAgICAgICAgKiBwYWdlL01lbW9yeVJlbGVhc2UuaDoKKyAgICAgICAgKiBwYWdl L2NvY29hL01lbW9yeVJlbGVhc2VDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3Jt UmVsZWFzZUdyYXBoaWNzTWVtb3J5KToKKwogMjAyMS0wMS0xNSAgUm9iIEJ1aXMgIDxyYnVpc0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIE1hcmsgb25seSBjaGlsZCBmb3IgbGF5b3V0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDdlNjZkNmVjYzk5OTgzNDRhMmFiNDYzMmFlNDQxMGE4ZDJlNWY3MmMuLmM4MWYxNzE0YjJl NTc3NDU0NWIwMWI1MWQ4MTkyYzY0NGExNWE3OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMjEtMDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBb R1BVUHJvY2Vzc10gSW1wcm92ZSB0aGUgR1BVUHJvY2VzcycgbWVtb3J5IHByZXNzdXJlIGhhbmRs ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDY1 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJv dmUgdGhlIEdQVVByb2Nlc3MnIG1lbW9yeSBwcmVzc3VyZSBoYW5kbGVyIHRvIGNsZWFyIHRoaW5n cyBsaWtlIHRoZSBJT1N1cmZhY2VQb29sCisgICAgICAgIGFuZCB0aGUgU3ViaW1hZ2VDYWNoZVdp dGhUaW1lci4KKworICAgICAgICAqIEdQVVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6OkdQVVByb2Nlc3M6Omxvd01lbW9yeUhhbmRsZXIpOgorICAgICAgICAoV2ViS2l0 OjpHUFVQcm9jZXNzOjppbml0aWFsaXplR1BVUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OkdQ VVByb2Nlc3M6OnByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAqIEdQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5oOgorCiAyMDIxLTAxLTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBVSTwtPldlYlBvY2VzcyBJUEMgbmVlZGVkIGZv ciBlbnVtZXJhdGVEZXZpY2VzIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvTWVtb3J5UmVsZWFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL01lbW9yeVJlbGVhc2Uu Y3BwCmluZGV4IDdjY2IzNGYyMGZmYjVkNDUwN2E1NzM0ZGNlNjlkMmJjOWM4Y2RmNjQuLmIwNjJl YmUyNjM0YTc0NzZjNDhkOWI0NDc4OTI4MDM4NTIzZjQ0YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvTWVtb3J5UmVsZWFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9N ZW1vcnlSZWxlYXNlLmNwcApAQCAtMTYxLDYgKzE2MSwyMSBAQCB2b2lkIHJlbGVhc2VNZW1vcnko Q3JpdGljYWwgY3JpdGljYWwsIFN5bmNocm9ub3VzIHN5bmNocm9ub3VzLCBNYWludGFpbkJhY2tG b3J3YQogI2VuZGlmCiB9CiAKK3ZvaWQgcmVsZWFzZUdyYXBoaWNzTWVtb3J5KENyaXRpY2FsIGNy aXRpY2FsLCBTeW5jaHJvbm91cyBzeW5jaHJvbm91cykKK3sKKyAgICBUcmFjZVNjb3BlIHNjb3Bl KE1lbW9yeVByZXNzdXJlSGFuZGxlclN0YXJ0LCBNZW1vcnlQcmVzc3VyZUhhbmRsZXJFbmQsIHN0 YXRpY19jYXN0PHVpbnQ2NF90Pihjcml0aWNhbCksIHN0YXRpY19jYXN0PHVpbnQ2NF90PihzeW5j aHJvbm91cykpOworCisgICAgaWYgKGNyaXRpY2FsID09IENyaXRpY2FsOjpZZXMpIHsKKyAgICAg ICAgLy8gUmV0dXJuIHVudXNlZCBwYWdlcyBiYWNrIHRvIHRoZSBPUyBub3cgYXMgdGhpcyB3aWxs IGxpa2VseSBnaXZlIHVzIGEgbGl0dGxlIG1lbW9yeSB0byB3b3JrIHdpdGguCisgICAgICAgIFdU Rjo6cmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5KCk7CisgICAgfQorCisgICAgcGxhdGZvcm1S ZWxlYXNlR3JhcGhpY3NNZW1vcnkoY3JpdGljYWwpOworCisgICAgaWYgKHN5bmNocm9ub3VzID09 IFN5bmNocm9ub3VzOjpZZXMpCisgICAgICAgIFdURjo6cmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVt b3J5KCk7Cit9CisKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKIHN0YXRpYyB1bnNpZ25lZCBw YWdlQ291bnQoKQogewpAQCAtMjEzLDYgKzIyOCw3IEBAIHZvaWQgbG9nTWVtb3J5U3RhdGlzdGlj c0F0VGltZU9mRGVhdGgoKQogCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogdm9pZCBwbGF0Zm9ybVJl bGVhc2VNZW1vcnkoQ3JpdGljYWwpIHsgfQordm9pZCBwbGF0Zm9ybVJlbGVhc2VHcmFwaGljc01l bW9yeShDcml0aWNhbCkgeyB9CiB2b2lkIGpldHRpc29uRXhwZW5zaXZlT2JqZWN0c09uVG9wTGV2 ZWxOYXZpZ2F0aW9uKCkgeyB9CiB2b2lkIHJlZ2lzdGVyTWVtb3J5UmVsZWFzZU5vdGlmeUNhbGxi YWNrcygpIHsgfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL01lbW9y eVJlbGVhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTWVtb3J5UmVsZWFzZS5oCmluZGV4IDZl NWViZDg4NWM0YzYwNzMyNDIyZGVhNzBiOTFjZWMyNDI0MTBhMjAuLjIwZmEzNjgwODIxYjAxZmI4 MTM3NGU1YzU5YTU3NDFjNjg5YjczOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv TWVtb3J5UmVsZWFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTWVtb3J5UmVsZWFzZS5o CkBAIC0zNCw2ICszNCw4IEBAIGVudW0gY2xhc3MgTWFpbnRhaW5NZW1vcnlDYWNoZSA6IGJvb2wg eyBObywgWWVzIH07CiAKIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVsZWFzZU1lbW9yeShDcml0aWNh bCwgU3luY2hyb25vdXMsIE1haW50YWluQmFja0ZvcndhcmRDYWNoZSA9IE1haW50YWluQmFja0Zv cndhcmRDYWNoZTo6Tm8sIE1haW50YWluTWVtb3J5Q2FjaGUgPSBNYWludGFpbk1lbW9yeUNhY2hl OjpObyk7CiB2b2lkIHBsYXRmb3JtUmVsZWFzZU1lbW9yeShDcml0aWNhbCk7CitXRUJDT1JFX0VY UE9SVCB2b2lkIHJlbGVhc2VHcmFwaGljc01lbW9yeShDcml0aWNhbCwgU3luY2hyb25vdXMpOwor dm9pZCBwbGF0Zm9ybVJlbGVhc2VHcmFwaGljc01lbW9yeShDcml0aWNhbCk7CiB2b2lkIGpldHRp c29uRXhwZW5zaXZlT2JqZWN0c09uVG9wTGV2ZWxOYXZpZ2F0aW9uKCk7CiBXRUJDT1JFX0VYUE9S VCB2b2lkIHJlZ2lzdGVyTWVtb3J5UmVsZWFzZU5vdGlmeUNhbGxiYWNrcygpOwogV0VCQ09SRV9F WFBPUlQgdm9pZCBsb2dNZW1vcnlTdGF0aXN0aWNzQXRUaW1lT2ZEZWF0aCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9NZW1vcnlSZWxlYXNlQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2NvY29hL01lbW9yeVJlbGVhc2VDb2NvYS5tbQppbmRleCBiNzFmMDFl NDliMjdhYTg4YzFmNzJjMzViYTA5YjViODc0M2I4YjMxLi4zM2NkZTliNjlhMDVjODU5ZTkxYmRi Nzk0NDBiMzg2OTdhODgyMTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29h L01lbW9yeVJlbGVhc2VDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL01l bW9yeVJlbGVhc2VDb2NvYS5tbQpAQCAtNzIsNiArNzIsMTUgQEAgdm9pZCBwbGF0Zm9ybVJlbGVh c2VNZW1vcnkoQ3JpdGljYWwpCiAjZW5kaWYKIH0KIAordm9pZCBwbGF0Zm9ybVJlbGVhc2VHcmFw aGljc01lbW9yeShDcml0aWNhbCkKK3sKKyAgICBJT1N1cmZhY2VQb29sOjpzaGFyZWRQb29sKCku ZGlzY2FyZEFsbFN1cmZhY2VzKCk7CisKKyNpZiBDQUNIRV9TVUJJTUFHRVMKKyAgICBTdWJpbWFn ZUNhY2hlV2l0aFRpbWVyOjpjbGVhcigpOworI2VuZGlmCit9CisKIHZvaWQgamV0dGlzb25FeHBl bnNpdmVPYmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24oKQogewogI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5j cHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHAKaW5kZXggNTYxODEz MjEzYmEwZTEyNzkwZDFlMGRlY2FhN2Y2MTJkYjk0MDY2YS4uNGI4MGU2ZjEyYTY4YWQ2OTBkYTg5 N2UwODdlMGJjMDQwM2ExOGE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L0dQVVByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNz LmNwcApAQCAtNDEsNiArNDEsNyBAQAogI2luY2x1ZGUgIldlYlByb2Nlc3NQb29sTWVzc2FnZXMu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KKyNpbmNsdWRlIDxXZWJDb3JlL01lbW9y eVJlbGVhc2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL05vd1BsYXlpbmdNYW5hZ2VyLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaD4KICNpbmNsdWRlIDx3dGYv QWxnb3JpdGhtcy5oPgpAQCAtMTE0LDkgKzExNSw5IEBAIGJvb2wgR1BVUHJvY2Vzczo6c2hvdWxk VGVybWluYXRlKCkKICAgICByZXR1cm4gbV93ZWJQcm9jZXNzQ29ubmVjdGlvbnMuaXNFbXB0eSgp OwogfQogCi12b2lkIEdQVVByb2Nlc3M6Omxvd01lbW9yeUhhbmRsZXIoQ3JpdGljYWwgY3JpdGlj YWwpCit2b2lkIEdQVVByb2Nlc3M6Omxvd01lbW9yeUhhbmRsZXIoQ3JpdGljYWwgY3JpdGljYWws IFN5bmNocm9ub3VzIHN5bmNocm9ub3VzKQogewotICAgIFdURjo6cmVsZWFzZUZhc3RNYWxsb2NG cmVlTWVtb3J5KCk7CisgICAgV2ViQ29yZTo6cmVsZWFzZUdyYXBoaWNzTWVtb3J5KGNyaXRpY2Fs LCBzeW5jaHJvbm91cyk7CiB9CiAKIHZvaWQgR1BVUHJvY2Vzczo6aW5pdGlhbGl6ZUdQVVByb2Nl c3MoR1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCkBAIC0xMjUsOCAr MTI2LDggQEAgdm9pZCBHUFVQcm9jZXNzOjppbml0aWFsaXplR1BVUHJvY2VzcyhHUFVQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBBdG9tU3RyaW5nOjppbml0KCk7 CiAKICAgICBhdXRvJiBtZW1vcnlQcmVzc3VyZUhhbmRsZXIgPSBNZW1vcnlQcmVzc3VyZUhhbmRs ZXI6OnNpbmdsZXRvbigpOwotICAgIG1lbW9yeVByZXNzdXJlSGFuZGxlci5zZXRMb3dNZW1vcnlI YW5kbGVyKFt0aGlzXSAoQ3JpdGljYWwgY3JpdGljYWwsIFN5bmNocm9ub3VzKSB7Ci0gICAgICAg IGxvd01lbW9yeUhhbmRsZXIoY3JpdGljYWwpOworICAgIG1lbW9yeVByZXNzdXJlSGFuZGxlci5z ZXRMb3dNZW1vcnlIYW5kbGVyKFt0aGlzXSAoQ3JpdGljYWwgY3JpdGljYWwsIFN5bmNocm9ub3Vz IHN5bmNocm9ub3VzKSB7CisgICAgICAgIGxvd01lbW9yeUhhbmRsZXIoY3JpdGljYWwsIHN5bmNo cm9ub3VzKTsKICAgICB9KTsKICAgICBtZW1vcnlQcmVzc3VyZUhhbmRsZXIuaW5zdGFsbCgpOwog CkBAIC0xNjUsNyArMTY2LDcgQEAgdm9pZCBHUFVQcm9jZXNzOjpwcmVwYXJlVG9TdXNwZW5kKGJv b2wgaXNTdXNwZW5zaW9uSW1taW5lbnQsIENvbXBsZXRpb25IYW5kbGVyPHYKIHsKICAgICBSRUxF QVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gR1BVUHJvY2Vzczo6cHJlcGFyZVRvU3Vz cGVuZCgpLCBpc1N1c3BlbnNpb25JbW1pbmVudDogJWQiLCB0aGlzLCBpc1N1c3BlbnNpb25JbW1p bmVudCk7CiAKLSAgICBsb3dNZW1vcnlIYW5kbGVyKENyaXRpY2FsOjpZZXMpOworICAgIGxvd01l bW9yeUhhbmRsZXIoQ3JpdGljYWw6OlllcywgU3luY2hyb25vdXM6Olllcyk7CiAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L0dQVVByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmgKaW5k ZXggNjA0MDFmNzJkNzc2YzQ1MDQyYmViZDI3NTg1ODQ5ZmVmMGZmOTExMS4uMDU0ZGU1ZThjYmMx MjY4OTM4NTI1MGQ3MTI4ODI4YzRmNDljYTdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL0dQVVByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BV UHJvY2Vzcy5oCkBAIC04OCw3ICs4OCw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcml2YXRlOgot ICAgIHZvaWQgbG93TWVtb3J5SGFuZGxlcihDcml0aWNhbCk7CisgICAgdm9pZCBsb3dNZW1vcnlI YW5kbGVyKENyaXRpY2FsLCBTeW5jaHJvbm91cyk7CiAKICAgICAvLyBBdXhpbGlhcnlQcm9jZXNz CiAgICAgdm9pZCBpbml0aWFsaXplUHJvY2Vzcyhjb25zdCBBdXhpbGlhcnlQcm9jZXNzSW5pdGlh bGl6YXRpb25QYXJhbWV0ZXJzJikgb3ZlcnJpZGU7Cg== 417711 2021-01-15 09:47:09 -0800 2021-01-15 10:29:14 -0800 Patch bug-220659-20210115094708.patch text/plain 6852 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEzM2ZlOWU0NzkzZDlj YTg2ODI0OTU2YzQ5NWJkY2M3NDc3ZDQ1Zi4uYTQ0ZGRjYWRkYjRjOWI2NTA3NmMwMWE1NWQyYzE3 YmFiNjFlMTQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVByb2Nlc3NdIEltcHJv dmUgdGhlIEdQVVByb2Nlc3MnIG1lbW9yeSBwcmVzc3VyZSBoYW5kbGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2NTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIHRoZSBHUFVQcm9jZXNz JyBtZW1vcnkgcHJlc3N1cmUgaGFuZGxlciB0byBjbGVhciB0aGluZ3MgbGlrZSB0aGUgSU9TdXJm YWNlUG9vbAorICAgICAgICBhbmQgdGhlIFN1YmltYWdlQ2FjaGVXaXRoVGltZXIuCisKKyAgICAg ICAgKiBwYWdlL01lbW9yeVJlbGVhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVsZWFzZUdy YXBoaWNzTWVtb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3JtUmVsZWFzZUdyYXBoaWNz TWVtb3J5KToKKyAgICAgICAgKiBwYWdlL01lbW9yeVJlbGVhc2UuaDoKKyAgICAgICAgKiBwYWdl L2NvY29hL01lbW9yeVJlbGVhc2VDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3Jt UmVsZWFzZUdyYXBoaWNzTWVtb3J5KToKKwogMjAyMS0wMS0xNSAgUm9iIEJ1aXMgIDxyYnVpc0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIE1hcmsgb25seSBjaGlsZCBmb3IgbGF5b3V0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDdlNjZkNmVjYzk5OTgzNDRhMmFiNDYzMmFlNDQxMGE4ZDJlNWY3MmMuLmM4MWYxNzE0YjJl NTc3NDU0NWIwMWI1MWQ4MTkyYzY0NGExNWE3OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMjEtMDEtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBb R1BVUHJvY2Vzc10gSW1wcm92ZSB0aGUgR1BVUHJvY2VzcycgbWVtb3J5IHByZXNzdXJlIGhhbmRs ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDY1 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJv dmUgdGhlIEdQVVByb2Nlc3MnIG1lbW9yeSBwcmVzc3VyZSBoYW5kbGVyIHRvIGNsZWFyIHRoaW5n cyBsaWtlIHRoZSBJT1N1cmZhY2VQb29sCisgICAgICAgIGFuZCB0aGUgU3ViaW1hZ2VDYWNoZVdp dGhUaW1lci4KKworICAgICAgICAqIEdQVVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6OkdQVVByb2Nlc3M6Omxvd01lbW9yeUhhbmRsZXIpOgorICAgICAgICAoV2ViS2l0 OjpHUFVQcm9jZXNzOjppbml0aWFsaXplR1BVUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OkdQ VVByb2Nlc3M6OnByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAqIEdQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5oOgorCiAyMDIxLTAxLTE1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBVSTwtPldlYlBvY2VzcyBJUEMgbmVlZGVkIGZv ciBlbnVtZXJhdGVEZXZpY2VzIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvTWVtb3J5UmVsZWFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL01lbW9yeVJlbGVhc2Uu Y3BwCmluZGV4IDdjY2IzNGYyMGZmYjVkNDUwN2E1NzM0ZGNlNjlkMmJjOWM4Y2RmNjQuLmE1Zjdj MDEzN2RmNTNmMTQzMjRlYzA1YTBlNDMxYTQ1MmIwY2JjNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvTWVtb3J5UmVsZWFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9N ZW1vcnlSZWxlYXNlLmNwcApAQCAtMTYxLDYgKzE2MSwxNSBAQCB2b2lkIHJlbGVhc2VNZW1vcnko Q3JpdGljYWwgY3JpdGljYWwsIFN5bmNocm9ub3VzIHN5bmNocm9ub3VzLCBNYWludGFpbkJhY2tG b3J3YQogI2VuZGlmCiB9CiAKK3ZvaWQgcmVsZWFzZUdyYXBoaWNzTWVtb3J5KENyaXRpY2FsIGNy aXRpY2FsLCBTeW5jaHJvbm91cyBzeW5jaHJvbm91cykKK3sKKyAgICBUcmFjZVNjb3BlIHNjb3Bl KE1lbW9yeVByZXNzdXJlSGFuZGxlclN0YXJ0LCBNZW1vcnlQcmVzc3VyZUhhbmRsZXJFbmQsIHN0 YXRpY19jYXN0PHVpbnQ2NF90Pihjcml0aWNhbCksIHN0YXRpY19jYXN0PHVpbnQ2NF90PihzeW5j aHJvbm91cykpOworCisgICAgcGxhdGZvcm1SZWxlYXNlR3JhcGhpY3NNZW1vcnkoY3JpdGljYWwp OworCisgICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnkoKTsKK30KKwogI2lmICFS RUxFQVNFX0xPR19ESVNBQkxFRAogc3RhdGljIHVuc2lnbmVkIHBhZ2VDb3VudCgpCiB7CkBAIC0y MTMsNiArMjIyLDcgQEAgdm9pZCBsb2dNZW1vcnlTdGF0aXN0aWNzQXRUaW1lT2ZEZWF0aCgpCiAK ICNpZiAhUExBVEZPUk0oQ09DT0EpCiB2b2lkIHBsYXRmb3JtUmVsZWFzZU1lbW9yeShDcml0aWNh bCkgeyB9Cit2b2lkIHBsYXRmb3JtUmVsZWFzZUdyYXBoaWNzTWVtb3J5KENyaXRpY2FsKSB7IH0K IHZvaWQgamV0dGlzb25FeHBlbnNpdmVPYmplY3RzT25Ub3BMZXZlbE5hdmlnYXRpb24oKSB7IH0K IHZvaWQgcmVnaXN0ZXJNZW1vcnlSZWxlYXNlTm90aWZ5Q2FsbGJhY2tzKCkgeyB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTWVtb3J5UmVsZWFzZS5oIGIvU291cmNl L1dlYkNvcmUvcGFnZS9NZW1vcnlSZWxlYXNlLmgKaW5kZXggNmU1ZWJkODg1YzRjNjA3MzI0MjJk ZWE3MGI5MWNlYzI0MjQxMGEyMC4uMjBmYTM2ODA4MjFiMDFmYjgxMzc0ZTVjNTlhNTc0MWM2ODli NzM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9NZW1vcnlSZWxlYXNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9NZW1vcnlSZWxlYXNlLmgKQEAgLTM0LDYgKzM0LDggQEAg ZW51bSBjbGFzcyBNYWludGFpbk1lbW9yeUNhY2hlIDogYm9vbCB7IE5vLCBZZXMgfTsKIAogV0VC Q09SRV9FWFBPUlQgdm9pZCByZWxlYXNlTWVtb3J5KENyaXRpY2FsLCBTeW5jaHJvbm91cywgTWFp bnRhaW5CYWNrRm9yd2FyZENhY2hlID0gTWFpbnRhaW5CYWNrRm9yd2FyZENhY2hlOjpObywgTWFp bnRhaW5NZW1vcnlDYWNoZSA9IE1haW50YWluTWVtb3J5Q2FjaGU6Ok5vKTsKIHZvaWQgcGxhdGZv cm1SZWxlYXNlTWVtb3J5KENyaXRpY2FsKTsKK1dFQkNPUkVfRVhQT1JUIHZvaWQgcmVsZWFzZUdy YXBoaWNzTWVtb3J5KENyaXRpY2FsLCBTeW5jaHJvbm91cyk7Cit2b2lkIHBsYXRmb3JtUmVsZWFz ZUdyYXBoaWNzTWVtb3J5KENyaXRpY2FsKTsKIHZvaWQgamV0dGlzb25FeHBlbnNpdmVPYmplY3Rz T25Ub3BMZXZlbE5hdmlnYXRpb24oKTsKIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVnaXN0ZXJNZW1v cnlSZWxlYXNlTm90aWZ5Q2FsbGJhY2tzKCk7CiBXRUJDT1JFX0VYUE9SVCB2b2lkIGxvZ01lbW9y eVN0YXRpc3RpY3NBdFRpbWVPZkRlYXRoKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2NvY29hL01lbW9yeVJlbGVhc2VDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29j b2EvTWVtb3J5UmVsZWFzZUNvY29hLm1tCmluZGV4IGI3MWYwMWU0OWIyN2FhODhjMWY3MmMzNWJh MDliNWI4NzQzYjhiMzEuLjMzY2RlOWI2OWEwNWM4NTllOTFiZGI3OTQ0MGIzODY5N2E4ODIxNTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvTWVtb3J5UmVsZWFzZUNvY29h Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvTWVtb3J5UmVsZWFzZUNvY29hLm1t CkBAIC03Miw2ICs3MiwxNSBAQCB2b2lkIHBsYXRmb3JtUmVsZWFzZU1lbW9yeShDcml0aWNhbCkK ICNlbmRpZgogfQogCit2b2lkIHBsYXRmb3JtUmVsZWFzZUdyYXBoaWNzTWVtb3J5KENyaXRpY2Fs KQoreworICAgIElPU3VyZmFjZVBvb2w6OnNoYXJlZFBvb2woKS5kaXNjYXJkQWxsU3VyZmFjZXMo KTsKKworI2lmIENBQ0hFX1NVQklNQUdFUworICAgIFN1YmltYWdlQ2FjaGVXaXRoVGltZXI6OmNs ZWFyKCk7CisjZW5kaWYKK30KKwogdm9pZCBqZXR0aXNvbkV4cGVuc2l2ZU9iamVjdHNPblRvcExl dmVsTmF2aWdhdGlvbigpCiB7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmNwcAppbmRleCA1NjE4MTMyMTNiYTBlMTI3OTBkMWUwZGVj YWE3ZjYxMmRiOTQwNjZhLi40YjgwZTZmMTJhNjhhZDY5MGRhODk3ZTA4N2UwYmMwNDAzYTE4YTk3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHAKKysr IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuY3BwCkBAIC00MSw2ICs0MSw3 IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2xNZXNzYWdlcy5oIgogI2luY2x1ZGUgPFdlYkNv cmUvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Mb2dJbml0 aWFsaXphdGlvbi5oPgorI2luY2x1ZGUgPFdlYkNvcmUvTWVtb3J5UmVsZWFzZS5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvTm93UGxheWluZ01hbmFnZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1J1bnRp bWVBcHBsaWNhdGlvbkNoZWNrcy5oPgogI2luY2x1ZGUgPHd0Zi9BbGdvcml0aG1zLmg+CkBAIC0x MTQsOSArMTE1LDkgQEAgYm9vbCBHUFVQcm9jZXNzOjpzaG91bGRUZXJtaW5hdGUoKQogICAgIHJl dHVybiBtX3dlYlByb2Nlc3NDb25uZWN0aW9ucy5pc0VtcHR5KCk7CiB9CiAKLXZvaWQgR1BVUHJv Y2Vzczo6bG93TWVtb3J5SGFuZGxlcihDcml0aWNhbCBjcml0aWNhbCkKK3ZvaWQgR1BVUHJvY2Vz czo6bG93TWVtb3J5SGFuZGxlcihDcml0aWNhbCBjcml0aWNhbCwgU3luY2hyb25vdXMgc3luY2hy b25vdXMpCiB7Ci0gICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnkoKTsKKyAgICBX ZWJDb3JlOjpyZWxlYXNlR3JhcGhpY3NNZW1vcnkoY3JpdGljYWwsIHN5bmNocm9ub3VzKTsKIH0K IAogdm9pZCBHUFVQcm9jZXNzOjppbml0aWFsaXplR1BVUHJvY2VzcyhHUFVQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKQEAgLTEyNSw4ICsxMjYsOCBAQCB2b2lkIEdQVVBy b2Nlc3M6OmluaXRpYWxpemVHUFVQcm9jZXNzKEdQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMm JiBwYXJhbWV0ZXJzKQogICAgIEF0b21TdHJpbmc6OmluaXQoKTsKIAogICAgIGF1dG8mIG1lbW9y eVByZXNzdXJlSGFuZGxlciA9IE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2luZ2xldG9uKCk7Ci0g ICAgbWVtb3J5UHJlc3N1cmVIYW5kbGVyLnNldExvd01lbW9yeUhhbmRsZXIoW3RoaXNdIChDcml0 aWNhbCBjcml0aWNhbCwgU3luY2hyb25vdXMpIHsKLSAgICAgICAgbG93TWVtb3J5SGFuZGxlcihj cml0aWNhbCk7CisgICAgbWVtb3J5UHJlc3N1cmVIYW5kbGVyLnNldExvd01lbW9yeUhhbmRsZXIo W3RoaXNdIChDcml0aWNhbCBjcml0aWNhbCwgU3luY2hyb25vdXMgc3luY2hyb25vdXMpIHsKKyAg ICAgICAgbG93TWVtb3J5SGFuZGxlcihjcml0aWNhbCwgc3luY2hyb25vdXMpOwogICAgIH0pOwog ICAgIG1lbW9yeVByZXNzdXJlSGFuZGxlci5pbnN0YWxsKCk7CiAKQEAgLTE2NSw3ICsxNjYsNyBA QCB2b2lkIEdQVVByb2Nlc3M6OnByZXBhcmVUb1N1c3BlbmQoYm9vbCBpc1N1c3BlbnNpb25JbW1p bmVudCwgQ29tcGxldGlvbkhhbmRsZXI8dgogewogICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNw ZW5zaW9uLCAiJXAgLSBHUFVQcm9jZXNzOjpwcmVwYXJlVG9TdXNwZW5kKCksIGlzU3VzcGVuc2lv bkltbWluZW50OiAlZCIsIHRoaXMsIGlzU3VzcGVuc2lvbkltbWluZW50KTsKIAotICAgIGxvd01l bW9yeUhhbmRsZXIoQ3JpdGljYWw6Olllcyk7CisgICAgbG93TWVtb3J5SGFuZGxlcihDcml0aWNh bDo6WWVzLCBTeW5jaHJvbm91czo6WWVzKTsKICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oIGIvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuaAppbmRleCA2MDQwMWY3MmQ3NzZjNDUw NDJiZWJkMjc1ODU4NDlmZWYwZmY5MTExLi4wNTRkZTVlOGNiYzEyNjg5Mzg1MjUwZDcxMjg4Mjhj NGY0OWNhN2UzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vz cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmgKQEAgLTg4LDcg Kzg4LDcgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6Ci0gICAgdm9pZCBsb3dNZW1vcnlI YW5kbGVyKENyaXRpY2FsKTsKKyAgICB2b2lkIGxvd01lbW9yeUhhbmRsZXIoQ3JpdGljYWwsIFN5 bmNocm9ub3VzKTsKIAogICAgIC8vIEF1eGlsaWFyeVByb2Nlc3MKICAgICB2b2lkIGluaXRpYWxp emVQcm9jZXNzKGNvbnN0IEF1eGlsaWFyeVByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMm KSBvdmVycmlkZTsK