230016 2021-09-07 12:44:54 -0700 Remove responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection 2021-09-08 14:56:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226994 InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez ggaren webkit-bug-importer oldest_to_newest 1791163 0 sihui_liu 2021-09-07 12:44:54 -0700 ... 1791169 1 437543 sihui_liu 2021-09-07 12:51:43 -0700 Created attachment 437543 Patch 1791179 2 437543 cdumez 2021-09-07 13:06:15 -0700 Comment on attachment 437543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437543&action=review > Source/WebKit/ChangeLog:9 > + responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection, blocked netowrk process will be killed typo: netowrk > Source/WebKit/ChangeLog:10 > + and a new network process will be launched for getting connection. However, the new network process may stuck "may get stuck" > Source/WebKit/ChangeLog:11 > + in initializeNetworkProcess too. In this case, web process will crash for not able to get network process "for not being able" > Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:-253 > - startResponsivenessTimer(UseLazyStop::No); What if we have a hung network process? Now we won't recover. This patch is a revert of https://bugs.webkit.org/show_bug.cgi?id=226994 without trying to resolve the problem https://bugs.webkit.org/show_bug.cgi?id=226994 was addressing. 1791183 3 437543 cdumez 2021-09-07 13:10:32 -0700 Comment on attachment 437543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437543&action=review >> Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:-253 >> - startResponsivenessTimer(UseLazyStop::No); > > What if we have a hung network process? Now we won't recover. > > This patch is a revert of https://bugs.webkit.org/show_bug.cgi?id=226994 without trying to resolve the problem https://bugs.webkit.org/show_bug.cgi?id=226994 was addressing. Maybe we only want to start the responsiveness timer if state() == Running to avoid starting it in the "process launch" case. That said, if the process hangs on launch, I believe we want and try to recover too so it would not be great. Alternatively, we can use a longer responsiveness timer if we believe the process may take more than 3 seconds to launch but still eventually complete launching. It's hard to tell without data but dropping hang detection completely seems wrong. 1791195 4 sihui_liu 2021-09-07 13:35:46 -0700 (In reply to Chris Dumez from comment #3) > Comment on attachment 437543 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437543&action=review > > >> Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:-253 > >> - startResponsivenessTimer(UseLazyStop::No); > > > > What if we have a hung network process? Now we won't recover. > > > > This patch is a revert of https://bugs.webkit.org/show_bug.cgi?id=226994 without trying to resolve the problem https://bugs.webkit.org/show_bug.cgi?id=226994 was addressing. > > Maybe we only want to start the responsiveness timer if state() == Running > to avoid starting it in the "process launch" case. That said, if the process > hangs on launch, I believe we want and try to recover too so it would not be > great. Hmm but state() == Running does not mean process does not hang. In this case network process is processing initializeNetowrkProcess message. One problem for killing network process when it hangs is we won't know why it hangs. > > Alternatively, we can use a longer responsiveness timer if we believe the > process may take more than 3 seconds to launch but still eventually complete > launching. It's hard to tell without data but dropping hang detection > completely seems wrong. According to rdar://78729329(or rdar://78636467), the hang can be very long, which is a bug but may not get fixed soon. 1791197 5 437553 sihui_liu 2021-09-07 13:40:24 -0700 Created attachment 437553 Patch 1791615 6 sihui_liu 2021-09-08 14:08:08 -0700 rdar://80760179 1791622 7 437665 sihui_liu 2021-09-08 14:23:06 -0700 Created attachment 437665 Patch for landing 1791632 8 ews-feeder 2021-09-08 14:56:27 -0700 Committed r282174 (241466@main): <https://commits.webkit.org/241466@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437665. 437543 2021-09-07 12:51:43 -0700 2021-09-07 13:40:22 -0700 Patch bug-230016-20210907125142.patch text/plain 4559 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyM2IzMjE3MjY3YWM1OGNj OGQyMzE3OWIyNTY1ZGI3ODZiMTY5NjcuLjY1ZTQ3ZjQ4NjAwZTI5MzYyNDNjMzlhZjQ4MGFjNzM5 MzdiMDg5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDktMDcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlc3BvbnNpdmVuZXNz IHRpbWVyIGluIE5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMDE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UndmUg c2VlbiBldmlkZW5jZSB0aGF0IG5ldHdvcmsgcHJvY2VzcyBtYXkgYmUgYmxvY2tlZCBpbiBpbml0 aWFsaXplTmV0d29ya1Byb2Nlc3MuIFNpbmNlIHdlIGhhdmUgYSAzLXNlY29uZAorICAgICAgICBy ZXNwb25zaXZlbmVzcyB0aW1lciBpbiBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb24sIGJsb2NrZWQgbmV0b3dyayBwcm9jZXNzIHdpbGwgYmUga2lsbGVkCisg ICAgICAgIGFuZCBhIG5ldyBuZXR3b3JrIHByb2Nlc3Mgd2lsbCBiZSBsYXVuY2hlZCBmb3IgZ2V0 dGluZyBjb25uZWN0aW9uLiBIb3dldmVyLCB0aGUgbmV3IG5ldHdvcmsgcHJvY2VzcyBtYXkgc3R1 Y2sKKyAgICAgICAgaW4gaW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzIHRvby4gSW4gdGhpcyBjYXNl LCB3ZWIgcHJvY2VzcyB3aWxsIGNyYXNoIGZvciBub3QgYWJsZSB0byBnZXQgbmV0d29yayBwcm9j ZXNzIAorICAgICAgICBjb25uZWN0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsv TmV0d29ya1Byb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNz UHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOiBjaGFuZ2UgUkVMRUFTRV9BU1NFUlRf Tk9UX1JFQUNIRURfV0lUSF9NRVNTQUdFIHRvCisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SIGFz IHRoZSBtZXNzYWdlIGlzIG5vdCBwcmludGVkIGluIG5vbi1kZWJ1ZyBidWlsZC4KKyAgICAgICAg KFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToK KwogMjAyMS0wOS0wNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBQb3N0LWxheW91dCBgRWRpdG9yU3RhdGVgIHVwZGF0ZXMgc2hvdWxkIGJlIHNjaGVk dWxlZCB1c2luZyBgUmVuZGVyaW5nVXBkYXRlU2NoZWR1bGVyYApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKaW5kZXgg MmYyNTQ1NzI0NTRhNjkzNGU3NTI5ZTkxMTU1OGQwNjA1ODVhZDJlZi4uZTBjYjNmYmU4MmU5Y2Q5 MmE4NWU1ZDMwMDEwYmVkMzA4Y2QyODlhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCkBAIC0yNTAsMTQgKzI1 MCwxMiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnByb2Nlc3NXaWxsU2h1dERvd24oSVBD OjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXRO ZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9jZXNzUHJveHks IE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6 RGVsYXllZFJlcGx5JiYgcmVwbHkpCiB7CiAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNp b24sICIlcCAtIE5ldHdvcmtQcm9jZXNzUHJveHkgaXMgdGFraW5nIGEgYmFja2dyb3VuZCBhc3Nl cnRpb24gYmVjYXVzZSBhIHdlYiBwcm9jZXNzIGlzIHJlcXVlc3RpbmcgYSBjb25uZWN0aW9uIiwg dGhpcyk7Ci0gICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKFVzZUxhenlTdG9wOjpObyk7CiAg ICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6Q3JlYXRlTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgeyB3ZWJQcm9jZXNzUHJveHkuY29yZVByb2Nlc3NJ ZGVudGlmaWVyKCksIHdlYlByb2Nlc3NQcm94eS5zZXNzaW9uSUQoKSB9LCBbdGhpcywgd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHJlcGx5ID0gV1RGTW92ZShyZXBseSldKGF1dG8mJiBp ZGVudGlmaWVyLCBhdXRvIGNvb2tpZUFjY2VwdFBvbGljeSkgbXV0YWJsZSB7CiAgICAgICAgIGlm ICghd2Vha1RoaXMpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJO ZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IE5ldHdvcmtQ cm9jZXNzUHJveHkgZGVhbGxvY2F0ZWQgZHVyaW5nIGNvbm5lY3Rpb24gZXN0YWJsaXNobWVudCIp OwogICAgICAgICAgICAgcmV0dXJuIHJlcGx5KHsgfSk7CiAgICAgICAgIH0KIAotICAgICAgICBz dG9wUmVzcG9uc2l2ZW5lc3NUaW1lcigpOwogICAgICAgICBpZiAoIWlkZW50aWZpZXIpIHsKICAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJOZXR3b3JrUHJvY2Vzc1Byb3h5 OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IGNvbm5lY3Rpb24gaWRlbnRpZmllciBpcyBl bXB0eSIpOwogICAgICAgICAgICAgcmV0dXJuIHJlcGx5KHsgfSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmlu ZGV4IGNhNWM2YmFlOTFlMjQwODA2Y2U0NGZlNTFiMTI5YTA2ZjcyNmMxZmEuLjNlOTJmZDMwYmJk NTI0MjFjNDA3NTNkNjQzNzVjYzQ3ODkzYWFkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xNzQ2 LDcgKzE3NDYsOCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldE5ldHdvcmtQcm9jZXNzQ29u bmVjdGlvbihXZWJQcm9jZXNzUHJveHkmIHdlYlByb2Nlc3NQcgogICAgICAgICAgICAgICAgICAg ICBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIgPSBuZXR3b3JrUHJvY2Vzc1Byb3h5LT5wcm9jZXNz SWRlbnRpZmllcigpOwogICAgICAgICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc1N0YXRlID0g bmV0d29ya1Byb2Nlc3NQcm94eS0+c3RhdGVTdHJpbmcoKTsKICAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRURfV0lUSF9NRVNTQUdFKCJX ZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBn ZXQgY29ubmVjdGlvbiAtIG5ldHdvcmtQcm9jZXNzUHJveHk9JXAsIG5ldHdvcmtQcm9jZXNzSWRl bnRpZmllcj0lZCwgcHJvY2Vzc1N0YXRlPSVzLCB3ZWJQcm9jZXNzUHJveHk9JXAsIHdlYlByb2Nl c3NJZGVudGlmaWVyPSVkIiwgbmV0d29ya1Byb2Nlc3NQcm94eS5nZXQoKSwgbmV0d29ya1Byb2Nl c3NJZGVudGlmaWVyLCBuZXR3b3JrUHJvY2Vzc1N0YXRlLnV0ZjgoKS5kYXRhKCksIHdlYlByb2Nl c3NQcm94eS5nZXQoKSwgd2ViUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAg ICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiV2Vic2l0ZURhdGFTdG9y ZTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5lY3Rpb24g LSBuZXR3b3JrUHJvY2Vzc1Byb3h5PSVwLCBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXI9JWQsIHBy b2Nlc3NTdGF0ZT0lcywgd2ViUHJvY2Vzc1Byb3h5PSVwLCB3ZWJQcm9jZXNzSWRlbnRpZmllcj0l ZCIsIG5ldHdvcmtQcm9jZXNzUHJveHkuZ2V0KCksIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllciwg bmV0d29ya1Byb2Nlc3NTdGF0ZS51dGY4KCkuZGF0YSgpLCB3ZWJQcm9jZXNzUHJveHkuZ2V0KCks IHdlYlByb2Nlc3NQcm94eS0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgICAgICAgICAg UkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICNlbmRpZgogICAgICAgICAgICAgfTsKIAo= 437553 2021-09-07 13:40:24 -0700 2021-09-08 14:23:04 -0700 Patch bug-230016-20210907134023.patch text/plain 4379 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyM2IzMjE3MjY3YWM1OGNj OGQyMzE3OWIyNTY1ZGI3ODZiMTY5NjcuLjBjYjY5M2YwNDUyM2U2MzBhMmY2NWEyZGEwMjVkMjI5 YTk4NWRiY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDktMDcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlc3BvbnNpdmVuZXNz IHRpbWVyIGluIE5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMDE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UndmUg c2VlbiBldmlkZW5jZSB0aGF0IG5ldHdvcmsgcHJvY2VzcyBtYXkgYmUgYmxvY2tlZCBpbiBpbml0 aWFsaXplTmV0d29ya1Byb2Nlc3MuIFNpbmNlIHdlIGhhdmUgYSAzLXNlY29uZAorICAgICAgICBy ZXNwb25zaXZlbmVzcyB0aW1lciBpbiBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb24sIGJsb2NrZWQgbmV0d29yayBwcm9jZXNzIHdpbGwgYmUga2lsbGVkCisg ICAgICAgIGFuZCBhIG5ldyBuZXR3b3JrIHByb2Nlc3Mgd2lsbCBiZSBsYXVuY2hlZCBmb3IgZ2V0 dGluZyBjb25uZWN0aW9uLiBIb3dldmVyLCB0aGUgbmV3IG5ldHdvcmsgcHJvY2VzcyBtYXkgZ2V0 IAorICAgICAgICBzdHVjayBpbiBpbml0aWFsaXplTmV0d29ya1Byb2Nlc3MgdG9vLiBJbiB0aGlz IGNhc2UsIHdlYiBwcm9jZXNzIHdpbGwgY3Jhc2ggZm9yIG5vdCBiZWluZyBhYmxlIHRvIGdldCBu ZXR3b3JrIAorICAgICAgICBwcm9jZXNzIGNvbm5lY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6IGNoYW5nZSBSRUxF QVNFX0FTU0VSVF9OT1RfUkVBQ0hFRF9XSVRIX01FU1NBR0UgdG8KKyAgICAgICAgUkVMRUFTRV9M T0dfRVJST1IgYXMgdGhlIG1lc3NhZ2UgaXMgbm90IHByaW50ZWQgaW4gbm9uLWRlYnVnIGJ1aWxk LgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nv bm5lY3Rpb24pOgorCiAyMDIxLTA5LTA3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIFBvc3QtbGF5b3V0IGBFZGl0b3JTdGF0ZWAgdXBkYXRlcyBzaG91 bGQgYmUgc2NoZWR1bGVkIHVzaW5nIGBSZW5kZXJpbmdVcGRhdGVTY2hlZHVsZXJgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5 LmNwcAppbmRleCAyZjI1NDU3MjQ1NGE2OTM0ZTc1MjllOTExNTU4ZDA2MDU4NWFkMmVmLi42Zjhh MWJlZDYzMDgyY2UzNzlhZGU2ZGJmNmQyYjQwMDg3NTRiMDEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKQEAg LTI1MCw3ICsyNTAsOCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnByb2Nlc3NXaWxsU2h1 dERvd24oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogdm9pZCBOZXR3b3JrUHJvY2Vzc1By b3h5OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9j ZXNzUHJveHksIE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQcm9jZXNzQ29u bmVjdGlvbjo6RGVsYXllZFJlcGx5JiYgcmVwbHkpCiB7CiAgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N1c3BlbnNpb24sICIlcCAtIE5ldHdvcmtQcm9jZXNzUHJveHkgaXMgdGFraW5nIGEgYmFja2dy b3VuZCBhc3NlcnRpb24gYmVjYXVzZSBhIHdlYiBwcm9jZXNzIGlzIHJlcXVlc3RpbmcgYSBjb25u ZWN0aW9uIiwgdGhpcyk7Ci0gICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKFVzZUxhenlTdG9w OjpObyk7CisgICAgaWYgKCFpc0xhdW5jaGluZygpKQorICAgICAgICBzdGFydFJlc3BvbnNpdmVu ZXNzVGltZXIoVXNlTGF6eVN0b3A6Ok5vKTsKICAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2Fn ZXM6Ok5ldHdvcmtQcm9jZXNzOjpDcmVhdGVOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcyB7 IHdlYlByb2Nlc3NQcm94eS5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSwgd2ViUHJvY2Vzc1Byb3h5 LnNlc3Npb25JRCgpIH0sIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgcmVw bHkgPSBXVEZNb3ZlKHJlcGx5KV0oYXV0byYmIGlkZW50aWZpZXIsIGF1dG8gY29va2llQWNjZXB0 UG9saWN5KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykgewogICAgICAgICAgICAg UkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgIk5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdv cmtQcm9jZXNzQ29ubmVjdGlvbjogTmV0d29ya1Byb2Nlc3NQcm94eSBkZWFsbG9jYXRlZCBkdXJp bmcgY29ubmVjdGlvbiBlc3RhYmxpc2htZW50Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IGNhNWM2 YmFlOTFlMjQwODA2Y2U0NGZlNTFiMTI5YTA2ZjcyNmMxZmEuLjNlOTJmZDMwYmJkNTI0MjFjNDA3 NTNkNjQzNzVjYzQ3ODkzYWFkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xNzQ2LDcgKzE3NDYs OCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbihX ZWJQcm9jZXNzUHJveHkmIHdlYlByb2Nlc3NQcgogICAgICAgICAgICAgICAgICAgICBuZXR3b3Jr UHJvY2Vzc0lkZW50aWZpZXIgPSBuZXR3b3JrUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmll cigpOwogICAgICAgICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc1N0YXRlID0gbmV0d29ya1By b2Nlc3NQcm94eS0+c3RhdGVTdHJpbmcoKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRURfV0lUSF9NRVNTQUdFKCJXZWJzaXRlRGF0 YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVj dGlvbiAtIG5ldHdvcmtQcm9jZXNzUHJveHk9JXAsIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllcj0l ZCwgcHJvY2Vzc1N0YXRlPSVzLCB3ZWJQcm9jZXNzUHJveHk9JXAsIHdlYlByb2Nlc3NJZGVudGlm aWVyPSVkIiwgbmV0d29ya1Byb2Nlc3NQcm94eS5nZXQoKSwgbmV0d29ya1Byb2Nlc3NJZGVudGlm aWVyLCBuZXR3b3JrUHJvY2Vzc1N0YXRlLnV0ZjgoKS5kYXRhKCksIHdlYlByb2Nlc3NQcm94eS5n ZXQoKSwgd2ViUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiV2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0 d29ya1Byb2Nlc3NDb25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5lY3Rpb24gLSBuZXR3b3Jr UHJvY2Vzc1Byb3h5PSVwLCBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXI9JWQsIHByb2Nlc3NTdGF0 ZT0lcywgd2ViUHJvY2Vzc1Byb3h5PSVwLCB3ZWJQcm9jZXNzSWRlbnRpZmllcj0lZCIsIG5ldHdv cmtQcm9jZXNzUHJveHkuZ2V0KCksIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllciwgbmV0d29ya1By b2Nlc3NTdGF0ZS51dGY4KCkuZGF0YSgpLCB3ZWJQcm9jZXNzUHJveHkuZ2V0KCksIHdlYlByb2Nl c3NQcm94eS0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9B U1NFUlRfTk9UX1JFQUNIRUQoKTsKICNlbmRpZgogICAgICAgICAgICAgfTsKIAo= 437665 2021-09-08 14:23:06 -0700 2021-09-08 14:56:28 -0700 Patch for landing bug-230016-20210908142305.patch text/plain 4367 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3MDIwMGFiNzliNGJlNDUy ZGY3YWJjM2UxMDkxNjU3ZTY1NzFhN2QuLjhjOWFmYzUxNWUyNWUyNjRiMjc0Y2JkNWU3NWQyNzE5 YWE0MWU1ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDktMDggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlc3BvbnNpdmVuZXNz IHRpbWVyIGluIE5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMDE2 CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzgwNzYwMTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRHVtZXouCisKKyAgICAgICAgV2UndmUgc2VlbiBldmlkZW5jZSB0aGF0IG5ldHdvcmsg cHJvY2VzcyBtYXkgYmUgYmxvY2tlZCBpbiBpbml0aWFsaXplTmV0d29ya1Byb2Nlc3MuIFNpbmNl IHdlIGhhdmUgYSAzLXNlY29uZAorICAgICAgICByZXNwb25zaXZlbmVzcyB0aW1lciBpbiBOZXR3 b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24sIGJsb2NrZWQgbmV0 d29yayBwcm9jZXNzIHdpbGwgYmUga2lsbGVkCisgICAgICAgIGFuZCBhIG5ldyBuZXR3b3JrIHBy b2Nlc3Mgd2lsbCBiZSBsYXVuY2hlZCBmb3IgZ2V0dGluZyBjb25uZWN0aW9uLiBIb3dldmVyLCB0 aGUgbmV3IG5ldHdvcmsgcHJvY2VzcyBtYXkgZ2V0IAorICAgICAgICBzdHVjayBpbiBpbml0aWFs aXplTmV0d29ya1Byb2Nlc3MgdG9vLiBJbiB0aGlzIGNhc2UsIHdlYiBwcm9jZXNzIHdpbGwgY3Jh c2ggZm9yIG5vdCBiZWluZyBhYmxlIHRvIGdldCBuZXR3b3JrIAorICAgICAgICBwcm9jZXNzIGNv bm5lY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1By b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29y a1Byb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHA6IGNoYW5nZSBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRF9XSVRI X01FU1NBR0UgdG8KKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IgYXMgdGhlIG1lc3NhZ2UgaXMg bm90IHByaW50ZWQgaW4gbm9uLWRlYnVnIGJ1aWxkLgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRl RGF0YVN0b3JlOjpnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24pOgorCiAyMDIxLTA5LTA4ICBQ ZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBj YWxsIG9uIHN0YXJ0dXAgb2YgV2ViQ29udGVudCBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAppbmRleCAy ZjI1NDU3MjQ1NGE2OTM0ZTc1MjllOTExNTU4ZDA2MDU4NWFkMmVmLi42ZjhhMWJlZDYzMDgyY2Uz NzlhZGU2ZGJmNmQyYjQwMDg3NTRiMDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKQEAgLTI1MCw3ICsyNTAs OCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnByb2Nlc3NXaWxsU2h1dERvd24oSVBDOjpD b25uZWN0aW9uJiBjb25uZWN0aW9uKQogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9jZXNzUHJveHksIE1l c3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6RGVs YXllZFJlcGx5JiYgcmVwbHkpCiB7CiAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24s ICIlcCAtIE5ldHdvcmtQcm9jZXNzUHJveHkgaXMgdGFraW5nIGEgYmFja2dyb3VuZCBhc3NlcnRp b24gYmVjYXVzZSBhIHdlYiBwcm9jZXNzIGlzIHJlcXVlc3RpbmcgYSBjb25uZWN0aW9uIiwgdGhp cyk7Ci0gICAgc3RhcnRSZXNwb25zaXZlbmVzc1RpbWVyKFVzZUxhenlTdG9wOjpObyk7CisgICAg aWYgKCFpc0xhdW5jaGluZygpKQorICAgICAgICBzdGFydFJlc3BvbnNpdmVuZXNzVGltZXIoVXNl TGF6eVN0b3A6Ok5vKTsKICAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtQ cm9jZXNzOjpDcmVhdGVOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcyB7IHdlYlByb2Nlc3NQ cm94eS5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSwgd2ViUHJvY2Vzc1Byb3h5LnNlc3Npb25JRCgp IH0sIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgcmVwbHkgPSBXVEZNb3Zl KHJlcGx5KV0oYXV0byYmIGlkZW50aWZpZXIsIGF1dG8gY29va2llQWNjZXB0UG9saWN5KSBtdXRh YmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykgewogICAgICAgICAgICAgUkVMRUFTRV9MT0df RVJST1IoUHJvY2VzcywgIk5ldHdvcmtQcm9jZXNzUHJveHk6OmdldE5ldHdvcmtQcm9jZXNzQ29u bmVjdGlvbjogTmV0d29ya1Byb2Nlc3NQcm94eSBkZWFsbG9jYXRlZCBkdXJpbmcgY29ubmVjdGlv biBlc3RhYmxpc2htZW50Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDQ5NzhjY2NiNGNiYTYxNWRl ZDY5MDgyODYwMzM0OWRkZDQ0MWI0OWMuLmFmNDIwNDUxOGExNmMwNjUwMmU3MDRjZThjNzM1Njkz YTZhMWNlZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xNzQ4LDcgKzE3NDgsOCBAQCB2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbihXZWJQcm9jZXNzUHJv eHkmIHdlYlByb2Nlc3NQcgogICAgICAgICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc0lkZW50 aWZpZXIgPSBuZXR3b3JrUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpOwogICAgICAg ICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc1N0YXRlID0gbmV0d29ya1Byb2Nlc3NQcm94eS0+ c3RhdGVTdHJpbmcoKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgUkVMRUFT RV9BU1NFUlRfTk9UX1JFQUNIRURfV0lUSF9NRVNTQUdFKCJXZWJzaXRlRGF0YVN0b3JlOjpnZXRO ZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246IEZhaWxlZCB0byBnZXQgY29ubmVjdGlvbiAtIG5ldHdv cmtQcm9jZXNzUHJveHk9JXAsIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllcj0lZCwgcHJvY2Vzc1N0 YXRlPSVzLCB3ZWJQcm9jZXNzUHJveHk9JXAsIHdlYlByb2Nlc3NJZGVudGlmaWVyPSVkIiwgbmV0 d29ya1Byb2Nlc3NQcm94eS5nZXQoKSwgbmV0d29ya1Byb2Nlc3NJZGVudGlmaWVyLCBuZXR3b3Jr UHJvY2Vzc1N0YXRlLnV0ZjgoKS5kYXRhKCksIHdlYlByb2Nlc3NQcm94eS5nZXQoKSwgd2ViUHJv Y2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgICAgICAgICBSRUxFQVNF X0xPR19FUlJPUihQcm9jZXNzLCAiV2Vic2l0ZURhdGFTdG9yZTo6Z2V0TmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uOiBGYWlsZWQgdG8gZ2V0IGNvbm5lY3Rpb24gLSBuZXR3b3JrUHJvY2Vzc1Byb3h5 PSVwLCBuZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXI9JWQsIHByb2Nlc3NTdGF0ZT0lcywgd2ViUHJv Y2Vzc1Byb3h5PSVwLCB3ZWJQcm9jZXNzSWRlbnRpZmllcj0lZCIsIG5ldHdvcmtQcm9jZXNzUHJv eHkuZ2V0KCksIG5ldHdvcmtQcm9jZXNzSWRlbnRpZmllciwgbmV0d29ya1Byb2Nlc3NTdGF0ZS51 dGY4KCkuZGF0YSgpLCB3ZWJQcm9jZXNzUHJveHkuZ2V0KCksIHdlYlByb2Nlc3NQcm94eS0+cHJv Y2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JF QUNIRUQoKTsKICNlbmRpZgogICAgICAgICAgICAgfTsKIAo=