From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rxONGch+cGbITTsAWB0awg (envelope-from ) for ; Mon, 17 Jun 2024 14:22:00 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Xt4mpPxk; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=GeVtaR9e; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Xt4mpPxk; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=GeVtaR9e; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 5BDDC1E0C1; Mon, 17 Jun 2024 14:22:00 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 21EBB1E092 for ; Mon, 17 Jun 2024 14:21:58 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C01033857340 for ; Mon, 17 Jun 2024 18:21:57 +0000 (GMT) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 65D6A3858CDA for ; Mon, 17 Jun 2024 18:21:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 65D6A3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 65D6A3858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718648498; cv=none; b=RElFHgUWlJls1v7Rptl2fl9EraFZr9+TL/+FQx1YHlxUFFABXeC/BefVonx+yj1hw7g00GaimDdBDvGtsStviOGgR2yPXagCpxxInWXUGpWvv3Tkq56RcHGvlFJyMiAaf7TNGumXICsxBlvHe/UwUDe2wS8ea0uCeTgMMzdf3oA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718648498; c=relaxed/simple; bh=RvR3m5jXTE5suA1l438nvZbXCDe48s5L78+YuJf2oAw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:To:From; b=COdViZ/4jFVIwc3ZLtaOeTVrFd503yAEbiUV7ldowckZ+ykk+C4+QPCFVuLSS6edBO2Ko3giYCFKDi4Y7VPdjFpiLfag+LU/nQVJ3EWWDoIL2Gd5zehvkNRCGO8xD75miOVCz94I5pE13yoHbGwG8gLmNfiqfGOrnfEcul7MFqs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 409D8219FD; Mon, 17 Jun 2024 18:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718648494; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l/4cEpgs7qAJLXiJ4O52H2k6RiveUU9nanFcJUF1c0U=; b=Xt4mpPxkMhJrdAhTaSziTUtFKZw8FlwrztqXPmC4u8T6I5r6GVCjTmPxhtN5bpJ3hv65uZ 5YpKpNuZwKHdrsWPQ/Ard+dGgWif0TpF1E1QSNNmfb2r19KYhTgiJe7nioC/DrvA6dFQh0 aWQuIEIdYFHVxDEtnWuJNED0/yGvma8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718648494; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l/4cEpgs7qAJLXiJ4O52H2k6RiveUU9nanFcJUF1c0U=; b=GeVtaR9emAVbcXvgOfFxYcBvTA6wt/EDPtLkbsL2GH+AkV3sEJn1Vo6Zz8kBmwKM+iolMX fxQfqvMg5NXU2XDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Xt4mpPxk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=GeVtaR9e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718648494; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l/4cEpgs7qAJLXiJ4O52H2k6RiveUU9nanFcJUF1c0U=; b=Xt4mpPxkMhJrdAhTaSziTUtFKZw8FlwrztqXPmC4u8T6I5r6GVCjTmPxhtN5bpJ3hv65uZ 5YpKpNuZwKHdrsWPQ/Ard+dGgWif0TpF1E1QSNNmfb2r19KYhTgiJe7nioC/DrvA6dFQh0 aWQuIEIdYFHVxDEtnWuJNED0/yGvma8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718648494; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l/4cEpgs7qAJLXiJ4O52H2k6RiveUU9nanFcJUF1c0U=; b=GeVtaR9emAVbcXvgOfFxYcBvTA6wt/EDPtLkbsL2GH+AkV3sEJn1Vo6Zz8kBmwKM+iolMX fxQfqvMg5NXU2XDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 20496139AB; Mon, 17 Jun 2024 18:21:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id YjHeBa5+cGahHgAAD6G6ig (envelope-from ); Mon, 17 Jun 2024 18:21:34 +0000 Content-Type: multipart/mixed; boundary="------------1rJ20AxE1ThM95w3l8SG08Re" Message-ID: <88e14e37-9fbd-4dfb-ac37-6bee23eff372@suse.de> Date: Mon, 17 Jun 2024 20:22:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] [gdb/tdep] Fix gdb.base/watchpoint-running on {arm, ppc64le}-linux To: Pedro Alves , gdb-patches@sourceware.org References: <20240607063525.9887-1-tdevries@suse.de> <9c0d2050-3555-47c9-bec8-1f2548eba9c6@palves.net> Content-Language: en-US From: Tom de Vries In-Reply-To: <9c0d2050-3555-47c9-bec8-1f2548eba9c6@palves.net> X-Rspamd-Queue-Id: 409D8219FD X-Spam-Score: -3.39 X-Spam-Level: X-Spamd-Result: default: False [-3.39 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_BASE64_TEXT_BOGUS(1.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.19)[-0.973]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; XM_UA_NO_VERSION(0.01)[]; MX_GOOD(-0.01)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_ATTACHMENT(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org This is a multi-part message in MIME format. --------------1rJ20AxE1ThM95w3l8SG08Re Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/14/24 18:49, Pedro Alves wrote: > Hi! > > Sorry for the delay. I've been super swamped. :-/ > Hi Pedro, thanks for the review. > On 2024-06-07 07:35, Tom de Vries wrote: > >> PR tdep/31834 >> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31834 >> PR tdep/31705 >> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31705 >> --- >> gdb/linux-nat.c | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c >> index c95d420d416..d8b5a99269b 100644 >> --- a/gdb/linux-nat.c >> +++ b/gdb/linux-nat.c >> @@ -454,6 +454,18 @@ linux_init_ptrace_procfs (pid_t pid, int attached) >> linux_ptrace_init_warnings (); >> linux_proc_init_warnings (); >> proc_mem_file_is_writable (); >> + >> + /* Some targets (for instance ppc and arm) may call ptrace to answer a >> + target_can_use_hardware_watchpoint query, and cache the result. However, >> + the ptrace call will fail with errno ESRCH if the tracee is not >> + ptrace-stopped, making the query fail. And if the caching mechanism does >> + not disregard an ESRCH result, all subsequent queries will also fail. >> + Call it now, where we known the tracee is ptrace-stopped. >> + >> + Other targets (for instance aarch64) do the relevant ptrace call and >> + caching in their implementation of post_attach and post_startup_inferior, >> + in which case this call is expected to have no effect. */ >> + target_can_use_hardware_watchpoint (bp_hardware_watchpoint, 1, 0); > > To be honest, I kind of preferred the other version of the patch. This is a single call, > yes, but then you have to explain details about the different backend implementations, > anyhow, and it raises questions like, what if bp_hardware_watchpoint is the right > type? What if some architecture caches the resources for bp_hardware_breakpoint > differently? > I did think about that, and as a solution considered looping over all types of breakpoints. But it seemed somewhat of an overkill, so I went with just bp_hardware_watchpoint. Of course, if your specific concern is bp_hardware_breakpoint, then this: ... target_can_use_hardware_watchpoint (bp_hardware_watchpoint, 1, 0); target_can_use_hardware_watchpoint (bp_hardware_breakpoint, 1, 0); ... addresses that. > And, from another angle, why isn't aarch64 doing the same, why two mechanisms? Well, the patch adds a fallback, that aarch64 doesn't need, but that powerpc and arm do need. There might be other targets that needs such a fallback, but that we don't know about. So, I don't mind your patch, it's certainly cleaner, but I don't mind a functional default implementation either. So, I'd move the target_can_use_hardware_watchpoint call to the default implementation of low_init_process. We should consider fixing things in a way that minimizes efforts for target maintainers. > I guess the wart with the other approach would be that you have to handle > this from both post_startup_inferior and post_attach? I think we can fix > that -- add a new low_init_process method that is called in both scenarios, > where the backend can do what it needs to. > > I was going to write small draft patch that just adds the method in question, > for discussion, but then as I was already looking at the code, I ended up > implementing the arm, aarch64, ppc backend versions of it. I noticed > that all the m_dreg_interface.detect and m_dreg_interface.detected_p > calls throughout ppc-linux-nat.c could be removed, since we now > always call m_dreg_interface.detect() early. > > I only build-tested this on x86_64, which of course is not sufficient > testing. > > Overall it's a net reduction of code, which seems nice to me. > I ran into trouble building the patch due to type of pid parameter mismatches. After fixing that, I ran into trouble on ppc64le, because low_prepare_to_resume is called before low_init_process. I fixed that by sinking this code in the function a bit: ... if (m_dreg_interface.unavailable_p ()) return; ... And after fixing this, I still ran into failures and identified at least two more locations that needed fixing due to the cleanup, at which point I decided that the cleanup part is out-of-scope for the patch fixing the PR. So, this is what I have tested on x86_64-linux, aarch64-linux, arm-linux and ppc64le-linux. Thanks, - Tom --------------1rJ20AxE1ThM95w3l8SG08Re Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-tdep-Fix-gdb.base-watchpoint-running-on-arm-ppc6.patch" Content-Disposition: attachment; filename*0="0001-gdb-tdep-Fix-gdb.base-watchpoint-running-on-arm-ppc6.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA1MWJlMDkyMTU1Y2QyNGNlMWZiNjQ4ZWJhZjdmNWJkNGZiZDk5YTZmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZWRybyBBbHZlcyA8cGVkcm9AcGFsdmVzLm5ldD4K RGF0ZTogRnJpLCAxNCBKdW4gMjAyNCAxNzo0OToxNiArMDEwMApTdWJqZWN0OiBbUEFUQ0hd IFtnZGIvdGRlcF0gRml4IGdkYi5iYXNlL3dhdGNocG9pbnQtcnVubmluZyBvbiB7YXJtLAog cHBjNjRsZX0tbGludXgKCi0tLQogZ2RiL2FhcmNoNjQtbGludXgtbmF0LmMgfCAzMCArKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGdkYi9hcm0tbGludXgtbmF0LmMgICAgIHwg IDcgKysrKysrKwogZ2RiL2xpbnV4LW5hdC5jICAgICAgICAgfCAgNiArKysrKysKIGdkYi9s aW51eC1uYXQuaCAgICAgICAgIHwgIDYgKysrKysrCiBnZGIvcHBjLWxpbnV4LW5hdC5jICAg ICB8ICA4ICsrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDI0 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dkYi9hYXJjaDY0LWxpbnV4LW5hdC5jIGIv Z2RiL2FhcmNoNjQtbGludXgtbmF0LmMKaW5kZXggNGIyYTBiYTlmN2IuLjhiYWI1OTRmMWIz IDEwMDY0NAotLS0gYS9nZGIvYWFyY2g2NC1saW51eC1uYXQuYworKysgYi9nZGIvYWFyY2g2 NC1saW51eC1uYXQuYwpAQCAtNzgsMTIgKzc4LDYgQEAgY2xhc3MgYWFyY2g2NF9saW51eF9u YXRfdGFyZ2V0IGZpbmFsCiAKICAgaW50IGNhbl9kb19zaW5nbGVfc3RlcCAoKSBvdmVycmlk ZTsKIAotICAvKiBPdmVycmlkZSB0aGUgR05VL0xpbnV4IGluZmVyaW9yIHN0YXJ0dXAgaG9v ay4gICovCi0gIHZvaWQgcG9zdF9zdGFydHVwX2luZmVyaW9yIChwdGlkX3QpIG92ZXJyaWRl OwotCi0gIC8qIE92ZXJyaWRlIHRoZSBHTlUvTGludXggcG9zdCBhdHRhY2ggaG9vay4gICov Ci0gIHZvaWQgcG9zdF9hdHRhY2ggKGludCBwaWQpIG92ZXJyaWRlOwotCiAgIC8qIFRoZXNl IHRocmVlIGRlZmVyIHRvIGNvbW1vbiBuYXQvIGNvZGUuICAqLwogICB2b2lkIGxvd19uZXdf dGhyZWFkIChzdHJ1Y3QgbHdwX2luZm8gKmxwKSBvdmVycmlkZQogICB7IGFhcmNoNjRfbGlu dXhfbmV3X3RocmVhZCAobHApOyB9CkBAIC05Myw2ICs4Nyw3IEBAIGNsYXNzIGFhcmNoNjRf bGludXhfbmF0X3RhcmdldCBmaW5hbAogICB7IGFhcmNoNjRfbGludXhfcHJlcGFyZV90b19y ZXN1bWUgKGxwKTsgfQogCiAgIHZvaWQgbG93X25ld19mb3JrIChzdHJ1Y3QgbHdwX2luZm8g KnBhcmVudCwgcGlkX3QgY2hpbGRfcGlkKSBvdmVycmlkZTsKKyAgdm9pZCBsb3dfaW5pdF9w cm9jZXNzIChwaWRfdCBwaWQpIG92ZXJyaWRlOwogICB2b2lkIGxvd19mb3JnZXRfcHJvY2Vz cyAocGlkX3QgcGlkKSBvdmVycmlkZTsKIAogICAvKiBBZGQgb3VyIHNpZ2luZm8gbGF5b3V0 IGNvbnZlcnRlci4gICovCkBAIC04NDQsMjkgKzgzOSwxNiBAQCBwc19nZXRfdGhyZWFkX2Fy ZWEgKHN0cnVjdCBwc19wcm9jaGFuZGxlICpwaCwKIH0KIAwKIAotLyogSW1wbGVtZW50IHRo ZSB2aXJ0dWFsIGluZl9wdHJhY2VfdGFyZ2V0Ojpwb3N0X3N0YXJ0dXBfaW5mZXJpb3IgbWV0 aG9kLiAgKi8KLQotdm9pZAotYWFyY2g2NF9saW51eF9uYXRfdGFyZ2V0Ojpwb3N0X3N0YXJ0 dXBfaW5mZXJpb3IgKHB0aWRfdCBwdGlkKQotewotICBsb3dfZm9yZ2V0X3Byb2Nlc3MgKHB0 aWQucGlkICgpKTsKLSAgYWFyY2g2NF9saW51eF9nZXRfZGVidWdfcmVnX2NhcGFjaXR5IChw dGlkLnBpZCAoKSk7Ci0gIGxpbnV4X25hdF90YXJnZXQ6OnBvc3Rfc3RhcnR1cF9pbmZlcmlv ciAocHRpZCk7Ci19Ci0KLS8qIEltcGxlbWVudCB0aGUgInBvc3RfYXR0YWNoIiB0YXJnZXRf b3BzIG1ldGhvZC4gICovCisvKiBJbXBsZW1lbnQgdGhlICJsb3dfaW5pdF9wcm9jZXNzIiB0 YXJnZXRfb3BzIG1ldGhvZC4gICovCiAKIHZvaWQKLWFhcmNoNjRfbGludXhfbmF0X3Rhcmdl dDo6cG9zdF9hdHRhY2ggKGludCBwaWQpCithYXJjaDY0X2xpbnV4X25hdF90YXJnZXQ6Omxv d19pbml0X3Byb2Nlc3MgKHBpZF90IHBpZCkKIHsKICAgbG93X2ZvcmdldF9wcm9jZXNzIChw aWQpOwotICAvKiBTZXQgdGhlIGhhcmR3YXJlIGRlYnVnIHJlZ2lzdGVyIGNhcGFjaXR5LiAg SWYKLSAgICAgYWFyY2g2NF9saW51eF9nZXRfZGVidWdfcmVnX2NhcGFjaXR5IGlzIG5vdCBj YWxsZWQKLSAgICAgKGFzIGl0IGlzIGluIGFhcmNoNjRfbGludXhfY2hpbGRfcG9zdF9zdGFy dHVwX2luZmVyaW9yKSB0aGVuCi0gICAgIHNvZnR3YXJlIHdhdGNocG9pbnRzIHdpbGwgYmUg dXNlZCBpbnN0ZWFkIG9mIGhhcmR3YXJlCi0gICAgIHdhdGNocG9pbnRzIHdoZW4gYXR0YWNo aW5nIHRvIGEgdGFyZ2V0LiAgKi8KKyAgLyogU2V0IHRoZSBoYXJkd2FyZSBkZWJ1ZyByZWdp c3RlciBjYXBhY2l0eS4gIElmIHRoaXMgaXMgbm90IGNhbGxlZAorICAgICB0aGVuIHNvZnR3 YXJlIHdhdGNocG9pbnRzIHdpbGwgYmUgdXNlZCBpbnN0ZWFkIG9mIGhhcmR3YXJlCisgICAg IHdhdGNocG9pbnRzLiAgKi8KICAgYWFyY2g2NF9saW51eF9nZXRfZGVidWdfcmVnX2NhcGFj aXR5IChwaWQpOwotICBsaW51eF9uYXRfdGFyZ2V0Ojpwb3N0X2F0dGFjaCAocGlkKTsKIH0K IAogLyogSW1wbGVtZW50IHRoZSAicmVhZF9kZXNjcmlwdGlvbiIgdGFyZ2V0X29wcyBtZXRo b2QuICAqLwpkaWZmIC0tZ2l0IGEvZ2RiL2FybS1saW51eC1uYXQuYyBiL2dkYi9hcm0tbGlu dXgtbmF0LmMKaW5kZXggNTBjMjRlY2ZjZDIuLjUzMWQ1NTU0NzRhIDEwMDY0NAotLS0gYS9n ZGIvYXJtLWxpbnV4LW5hdC5jCisrKyBiL2dkYi9hcm0tbGludXgtbmF0LmMKQEAgLTEwMyw2 ICsxMDMsNyBAQCBjbGFzcyBhcm1fbGludXhfbmF0X3RhcmdldCBmaW5hbCA6IHB1YmxpYyBs aW51eF9uYXRfdGFyZ2V0CiAKICAgLyogSGFuZGxlIHByb2Nlc3MgY3JlYXRpb24gYW5kIGV4 aXQuICAqLwogICB2b2lkIGxvd19uZXdfZm9yayAoc3RydWN0IGx3cF9pbmZvICpwYXJlbnQs IHBpZF90IGNoaWxkX3BpZCkgb3ZlcnJpZGU7CisgIHZvaWQgbG93X2luaXRfcHJvY2VzcyAo cGlkX3QgcGlkKSBvdmVycmlkZTsKICAgdm9pZCBsb3dfZm9yZ2V0X3Byb2Nlc3MgKHBpZF90 IHBpZCkgb3ZlcnJpZGU7CiB9OwogCkBAIC04MDUsNiArODA2LDEyIEBAIGFybV9saW51eF9w cm9jZXNzX2luZm9fZ2V0IChwaWRfdCBwaWQpCiAgIHJldHVybiBwcm9jOwogfQogCit2b2lk Cithcm1fbGludXhfbmF0X3RhcmdldDo6bG93X2luaXRfcHJvY2VzcyAocGlkX3QgcGlkKQor eworICBhcm1fbGludXhfZ2V0X2h3YnBfY2FwICgpOworfQorCiAvKiBDYWxsZWQgd2hlbmV2 ZXIgR0RCIGlzIG5vIGxvbmdlciBkZWJ1Z2dpbmcgcHJvY2VzcyBQSUQuICBJdCBkZWxldGVz CiAgICBkYXRhIHN0cnVjdHVyZXMgdGhhdCBrZWVwIHRyYWNrIG9mIGRlYnVnIHJlZ2lzdGVy IHN0YXRlLiAgKi8KIApkaWZmIC0tZ2l0IGEvZ2RiL2xpbnV4LW5hdC5jIGIvZ2RiL2xpbnV4 LW5hdC5jCmluZGV4IGMwZmUwOGEyYThiLi4zZjI1MjM3MGM3YiAxMDA2NDQKLS0tIGEvZ2Ri L2xpbnV4LW5hdC5jCisrKyBiL2dkYi9saW51eC1uYXQuYwpAQCAtNDU0LDYgKzQ1NCwxMiBA QCBsaW51eF9pbml0X3B0cmFjZV9wcm9jZnMgKHBpZF90IHBpZCwgaW50IGF0dGFjaGVkKQog ICBsaW51eF9wdHJhY2VfaW5pdF93YXJuaW5ncyAoKTsKICAgbGludXhfcHJvY19pbml0X3dh cm5pbmdzICgpOwogICBwcm9jX21lbV9maWxlX2lzX3dyaXRhYmxlICgpOworCisgIC8qIExl dCB0aGUgYXJjaC1zcGVjaWZpYyBuYXRpdmUgY29kZSBkbyBhbnkgbmVlZGVkIGluaXRpYWxp emF0aW9uLgorICAgICBTb21lIGFyY2hpdGVjdHVyZXMgbmVlZCB0byBjYWxsIHB0cmFjZSB0 byBjaGVjayBmb3IgaGFyZHdhcmUKKyAgICAgd2F0Y2hwb2ludHMgc3VwcG9ydCwgZXRjLiAg Q2FsbCBpdCBub3csIHdoZW4gd2Uga25vdyB0aGUgdHJhY2VlCisgICAgIGlzIHB0cmFjZS1z dG9wcGVkLiAgKi8KKyAgbGludXhfdGFyZ2V0LT5sb3dfaW5pdF9wcm9jZXNzIChwaWQpOwog fQogCiBsaW51eF9uYXRfdGFyZ2V0Ojp+bGludXhfbmF0X3RhcmdldCAoKQpkaWZmIC0tZ2l0 IGEvZ2RiL2xpbnV4LW5hdC5oIGIvZ2RiL2xpbnV4LW5hdC5oCmluZGV4IGYzMGE1ZjkwZTJh Li5lZTg2MDM3NDNmNiAxMDA2NDQKLS0tIGEvZ2RiL2xpbnV4LW5hdC5oCisrKyBiL2dkYi9s aW51eC1uYXQuaApAQCAtMTY0LDYgKzE2NCwxMiBAQCBjbGFzcyBsaW51eF9uYXRfdGFyZ2V0 IDogcHVibGljIGluZl9wdHJhY2VfdGFyZ2V0CiAgIHZpcnR1YWwgdm9pZCBsb3dfbmV3X2Ns b25lIChzdHJ1Y3QgbHdwX2luZm8gKnBhcmVudCwgcGlkX3QgY2hpbGRfbHdwKQogICB7fQog CisgIC8qIFRoZSBtZXRob2QgdG8gY2FsbCwgaWYgYW55LCB3aGVuIHdlIGhhdmUgYSBuZXcg KGZyb20gcnVuL2F0dGFjaCwKKyAgICAgbm90IGZvcmspIHByb2Nlc3MgdG8gZGVidWcuICBU aGUgcHJvY2VzcyBpcyBwdHJhY2Utc3RvcHBlZCB3aGVuCisgICAgIHRoaXMgaXMgY2FsbGVk LiAgKi8KKyAgdmlydHVhbCB2b2lkIGxvd19pbml0X3Byb2Nlc3MgKHBpZF90IHBpZCkKKyAg e30KKwogICAvKiBUaGUgbWV0aG9kIHRvIGNhbGwsIGlmIGFueSwgd2hlbiBhIHByb2Nlc3Mg aXMgbm8gbG9uZ2VyCiAgICAgIGF0dGFjaGVkLiAgKi8KICAgdmlydHVhbCB2b2lkIGxvd19m b3JnZXRfcHJvY2VzcyAocGlkX3QgcGlkKQpkaWZmIC0tZ2l0IGEvZ2RiL3BwYy1saW51eC1u YXQuYyBiL2dkYi9wcGMtbGludXgtbmF0LmMKaW5kZXggYzczYzdjOTBiNGMuLmViZDIyMmI4 OTZlIDEwMDY0NAotLS0gYS9nZGIvcHBjLWxpbnV4LW5hdC5jCisrKyBiL2dkYi9wcGMtbGlu dXgtbmF0LmMKQEAgLTU0NSw2ICs1NDUsOCBAQCBzdHJ1Y3QgcHBjX2xpbnV4X25hdF90YXJn ZXQgZmluYWwgOiBwdWJsaWMgbGludXhfbmF0X3RhcmdldAogCiAgIHZvaWQgbG93X25ld19j bG9uZSAoc3RydWN0IGx3cF9pbmZvICosIHBpZF90KSBvdmVycmlkZTsKIAorICB2b2lkIGxv d19pbml0X3Byb2Nlc3MgKHBpZF90IHBpZCkgb3ZlcnJpZGU7CisKICAgdm9pZCBsb3dfZm9y Z2V0X3Byb2Nlc3MgKHBpZF90IHBpZCkgb3ZlcnJpZGU7CiAKICAgdm9pZCBsb3dfcHJlcGFy ZV90b19yZXN1bWUgKHN0cnVjdCBsd3BfaW5mbyAqKSBvdmVycmlkZTsKQEAgLTI3MDUsNiAr MjcwNywxMiBAQCBwcGNfbGludXhfbmF0X3RhcmdldDo6cmVtb3ZlX3dhdGNocG9pbnQgKENP UkVfQUREUiBhZGRyLCBpbnQgbGVuLAogICByZXR1cm4gMDsKIH0KIAordm9pZAorcHBjX2xp bnV4X25hdF90YXJnZXQ6Omxvd19pbml0X3Byb2Nlc3MgKHBpZF90IHBpZCkKK3sKKyAgbV9k cmVnX2ludGVyZmFjZS5kZXRlY3QgKHB0aWRfdCAocGlkLCBwaWQpKTsKK30KKwogLyogQ2xl YW4gdXAgdGhlIHBlci1wcm9jZXNzIGluZm8gYXNzb2NpYXRlZCB3aXRoIFBJRC4gIFdoZW4g dXNpbmcgdGhlCiAgICBIV0RFQlVHIGludGVyZmFjZSwgd2UgYWxzbyBlcmFzZSB0aGUgcGVy LXRocmVhZCBzdGF0ZSBvZiBpbnN0YWxsZWQKICAgIGRlYnVnIHJlZ2lzdGVycyBmb3IgYWxs IHRoZSB0aHJlYWRzIHRoYXQgYmVsb25nIHRvIHRoZSBncm91cCBvZiBQSUQuCgpiYXNlLWNv bW1pdDogYzNkMjNmNzUzZGFhYWM1MmVlNmM3ODgwOTA4NDVmZjBmMzU5Y2YyNwotLSAKMi4z NS4zCgo= --------------1rJ20AxE1ThM95w3l8SG08Re--