From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 017B319447 for ; Mon, 18 Dec 2023 11:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jz+SzucO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7649CC433C7; Mon, 18 Dec 2023 11:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702897966; bh=b3qgeC/uwYa0bAnJnS8yTjTGc8YGVC+z+HwE1Gsl07s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jz+SzucOjnNFhYTnbfhox/DuNTjCitlCXduJrd8TCV3KrvwrmPa2NorJ3QS1Uztwj uTxsqKn2z1YmGBhvrbghxgMGhezEH5+JVgfD27ZvWam5nOz41FF38cNuU3WzwPVWzu pWfaroKLOGY6Ko6dDsuY6zMobwG72ff/uOH2zrr2LHT2OiwvEo+Ij8H+z1DHSPyP55 nscFyaMGwDLGVHaziqcwfnd6/20WHVZMt9iuaDMB1XtWtExc6fPHQtPtJ91Dkjc9yG 9AY7qOh9Zgdoe3qSeMNB7IY5VCcPW+HRdXvrpuLM9dnVc/YokgMNI8T7YXDXBMyp/0 jhKsuLwBml1UQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rFBYB-0050pv-UT; Mon, 18 Dec 2023 11:12:44 +0000 Date: Mon, 18 Dec 2023 11:12:43 +0000 Message-ID: <86v88vahn8.wl-maz@kernel.org> From: Marc Zyngier To: Fuad Tabba Cc: kvmarm@lists.linux.dev, oliver.upton@linux.dev, broonie@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 14/17] KVM: arm64: Macros for setting/clearing FGT bits In-Reply-To: References: <20231214100158.2305400-1-tabba@google.com> <20231214100158.2305400-15-tabba@google.com> <86wmtbalx9.wl-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: tabba@google.com, kvmarm@lists.linux.dev, oliver.upton@linux.dev, broonie@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, linux-arm-kernel@lists.infradead.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Mon, 18 Dec 2023 09:56:32 +0000, Fuad Tabba wrote: >=20 > Hi Marc, >=20 > On Mon, Dec 18, 2023 at 9:40=E2=80=AFAM Marc Zyngier wro= te: > > > > On Thu, 14 Dec 2023 10:01:54 +0000, > > Fuad Tabba wrote: > > > > > > There's a lot of boilerplate code for setting and clearing FGT > > > bits when activating guest traps. Refactor it into macros. These > > > macros will also be used in future patch series. > > > > > > No functional change intended. > > > > > > Signed-off-by: Fuad Tabba > > > --- > > > arch/arm64/kvm/hyp/include/hyp/switch.h | 60 +++++++++--------------= -- > > > 1 file changed, 21 insertions(+), 39 deletions(-) > > > > > > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm= /hyp/include/hyp/switch.h > > > index 17ce40f5b006..e223fc0d5193 100644 > > > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > > > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > > > @@ -79,6 +79,23 @@ static inline void __activate_traps_fpsimd32(struc= t kvm_vcpu *vcpu) > > > clr |=3D ~hfg & __ ## reg ## _nMASK; = \ > > > } while(0) > > > > > > +#define update_fgt_traps_cs(reg, clr, set) = \ > > > + do { = \ > > > + struct kvm_cpu_context *hctxt =3D = \ > > > + &this_cpu_ptr(&kvm_host_data)->host_ctxt; = \ > > > + u64 val, c =3D 0, s =3D 0; = \ > > > + = \ > > > + ctxt_sys_reg(hctxt, reg) =3D read_sysreg_s(SYS_ ## reg)= ; \ > > > + compute_clr_set(vcpu, reg, c, s); = \ > > > > You are referring to a variable name that is in the scope of the macro > > user, and not the macro itself. It is so fragile it isn't funny. > > > > Why don't you simply pass the vcpu as a parameter to the function? > > > > Another thing is that this read/write can be expensive. How about not > > doing anything when there is no change to the value of the sysreg? >=20 > What do you think of this (spacing will be fixed): >=20 > #define update_fgt_traps_cs(vcpu, reg, clr, set) \ > do { > \ > struct kvm_cpu_context *hctxt =3D > \ > &this_cpu_ptr(&kvm_host_data)->host_ctxt; \ > u64 val, c =3D 0, s =3D 0; > \ >=20 > \ > ctxt_sys_reg(hctxt, reg) =3D read_sysreg_s(SYS_ ## reg); \ > compute_clr_set(vcpu, reg, c, s); > \ > val =3D __ ## reg ## _nMASK; > \ > val |=3D (s | set); > \ > val &=3D ~(c | clr); > \ > if (ctxt_sys_reg(hctxt, reg) !=3D val) > \ > write_sysreg_s(val, SYS_ ## reg); > \ > } while(0) >=20 > If it looks good to you, I'll fix it on the respin. This is what I have on top at the moment: diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/i= nclude/hyp/switch.h index 27077e1f7de2..d56fef44dc31 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -79,22 +79,26 @@ static inline void __activate_traps_fpsimd32(struct kvm= _vcpu *vcpu) clr |=3D ~hfg & __ ## reg ## _nMASK; \ } while(0) =20 -#define update_fgt_traps_cs(reg, clr, set) \ +#define update_fgt_traps_cs(vcpu, reg, clr, set) \ do { \ struct kvm_cpu_context *hctxt =3D \ &this_cpu_ptr(&kvm_host_data)->host_ctxt; \ - u64 val, c =3D 0, s =3D 0; \ + u64 c =3D 0, s =3D 0; \ \ ctxt_sys_reg(hctxt, reg) =3D read_sysreg_s(SYS_ ## reg); \ compute_clr_set(vcpu, reg, c, s); \ - val =3D __ ## reg ## _nMASK; \ - val |=3D (s | set); \ - val &=3D ~(c | clr); \ - write_sysreg_s(val, SYS_ ## reg); \ + s |=3D set; \ + c |=3D clr; \ + if (c || s) { \ + u64 val =3D __ ## reg ## _nMASK; \ + val |=3D s; \ + val &=3D ~c; \ + write_sysreg_s(val, SYS_ ## reg); \ + } \ } while(0) =20 -#define update_fgt_traps(reg) \ - update_fgt_traps_cs(reg, 0, 0) +#define update_fgt_traps(vcpu, reg) \ + update_fgt_traps_cs(vcpu, reg, 0, 0) =20 /* * Validate the fine grain trap masks. @@ -171,9 +175,9 @@ static inline void __activate_traps_hfgxtr(struct kvm_v= cpu *vcpu) if (!vcpu_has_nv(vcpu) || is_hyp_ctxt(vcpu)) return; =20 - update_fgt_traps(HFGITR_EL2); - update_fgt_traps(HDFGRTR_EL2); - update_fgt_traps(HDFGWTR_EL2); + update_fgt_traps(vcpu, HFGITR_EL2); + update_fgt_traps(vcpu, HDFGRTR_EL2); + update_fgt_traps(vcpu, HDFGWTR_EL2); =20 if (cpu_has_amu()) update_fgt_traps(vcpu, HAFGRTR_EL2); If that seems sensible to you, I'll fold it in, as I'd like to do without a respin if we can avoid it. ` M. --=20 Without deviation from the norm, progress is not possible. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D5A1C35274 for ; Mon, 18 Dec 2023 11:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gnRBmsC9lNC3t8hyIYVv9QDF4PyVTyP9I2AUUfZhOOo=; b=0GiFjJUphctYIP 2wxZxbEa/TlY1btcwnGH6sNYDBYcSVMbbjK7eSYxQT2o9TsYwcMFVolwr0EoQey/rWXWfceiBPs3H lVJ7wpmodf2qyD2UkiFB9Dny64tqwmIwc/Mo0zzNMVpWayb8XIwsKyuTJMK1Ef/D2Io5V2NiUBI6b 05F6zSZZiQ8L0cyIdaeSZh7/MRr/kWqhJCYrh59zMBVH72RY65eh6rWA/j23Wt8aQifA1s4rVOH4E ybPmIDb//vYvRk3TgUx/G32bsPCUDal5Gd83xkP7csIJx8dhczW21AynGGo9LLY+J7tGwmGAHbvM0 wqfyy5BLl6aa3Lc38D+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rFBYN-00A0XO-06; Mon, 18 Dec 2023 11:12:55 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rFBYH-00A0X1-0a for linux-arm-kernel@lists.infradead.org; Mon, 18 Dec 2023 11:12:52 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 8FFC0B80E4C; Mon, 18 Dec 2023 11:12:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7649CC433C7; Mon, 18 Dec 2023 11:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702897966; bh=b3qgeC/uwYa0bAnJnS8yTjTGc8YGVC+z+HwE1Gsl07s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jz+SzucOjnNFhYTnbfhox/DuNTjCitlCXduJrd8TCV3KrvwrmPa2NorJ3QS1Uztwj uTxsqKn2z1YmGBhvrbghxgMGhezEH5+JVgfD27ZvWam5nOz41FF38cNuU3WzwPVWzu pWfaroKLOGY6Ko6dDsuY6zMobwG72ff/uOH2zrr2LHT2OiwvEo+Ij8H+z1DHSPyP55 nscFyaMGwDLGVHaziqcwfnd6/20WHVZMt9iuaDMB1XtWtExc6fPHQtPtJ91Dkjc9yG 9AY7qOh9Zgdoe3qSeMNB7IY5VCcPW+HRdXvrpuLM9dnVc/YokgMNI8T7YXDXBMyp/0 jhKsuLwBml1UQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rFBYB-0050pv-UT; Mon, 18 Dec 2023 11:12:44 +0000 Date: Mon, 18 Dec 2023 11:12:43 +0000 Message-ID: <86v88vahn8.wl-maz@kernel.org> From: Marc Zyngier To: Fuad Tabba Cc: kvmarm@lists.linux.dev, oliver.upton@linux.dev, broonie@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 14/17] KVM: arm64: Macros for setting/clearing FGT bits In-Reply-To: References: <20231214100158.2305400-1-tabba@google.com> <20231214100158.2305400-15-tabba@google.com> <86wmtbalx9.wl-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: tabba@google.com, kvmarm@lists.linux.dev, oliver.upton@linux.dev, broonie@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, linux-arm-kernel@lists.infradead.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231218_031249_533685_13DF905C X-CRM114-Status: GOOD ( 32.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gTW9uLCAxOCBEZWMgMjAyMyAwOTo1NjozMiArMDAwMCwKRnVhZCBUYWJiYSA8dGFiYmFAZ29v Z2xlLmNvbT4gd3JvdGU6Cj4gCj4gSGkgTWFyYywKPiAKPiBPbiBNb24sIERlYyAxOCwgMjAyMyBh dCA5OjQw4oCvQU0gTWFyYyBaeW5naWVyIDxtYXpAa2VybmVsLm9yZz4gd3JvdGU6Cj4gPgo+ID4g T24gVGh1LCAxNCBEZWMgMjAyMyAxMDowMTo1NCArMDAwMCwKPiA+IEZ1YWQgVGFiYmEgPHRhYmJh QGdvb2dsZS5jb20+IHdyb3RlOgo+ID4gPgo+ID4gPiBUaGVyZSdzIGEgbG90IG9mIGJvaWxlcnBs YXRlIGNvZGUgZm9yIHNldHRpbmcgYW5kIGNsZWFyaW5nIEZHVAo+ID4gPiBiaXRzIHdoZW4gYWN0 aXZhdGluZyBndWVzdCB0cmFwcy4gUmVmYWN0b3IgaXQgaW50byBtYWNyb3MuIFRoZXNlCj4gPiA+ IG1hY3JvcyB3aWxsIGFsc28gYmUgdXNlZCBpbiBmdXR1cmUgcGF0Y2ggc2VyaWVzLgo+ID4gPgo+ ID4gPiBObyBmdW5jdGlvbmFsIGNoYW5nZSBpbnRlbmRlZC4KPiA+ID4KPiA+ID4gU2lnbmVkLW9m Zi1ieTogRnVhZCBUYWJiYSA8dGFiYmFAZ29vZ2xlLmNvbT4KPiA+ID4gLS0tCj4gPiA+ICBhcmNo L2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNoLmggfCA2MCArKysrKysrKystLS0tLS0t LS0tLS0tLS0tCj4gPiA+ICAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMzkgZGVs ZXRpb25zKC0pCj4gPiA+Cj4gPiA+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9oeXAvaW5j bHVkZS9oeXAvc3dpdGNoLmggYi9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNo LmgKPiA+ID4gaW5kZXggMTdjZTQwZjViMDA2Li5lMjIzZmMwZDUxOTMgMTAwNjQ0Cj4gPiA+IC0t LSBhL2FyY2gvYXJtNjQva3ZtL2h5cC9pbmNsdWRlL2h5cC9zd2l0Y2guaAo+ID4gPiArKysgYi9h cmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNoLmgKPiA+ID4gQEAgLTc5LDYgKzc5 LDIzIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBfX2FjdGl2YXRlX3RyYXBzX2Zwc2ltZDMyKHN0cnVj dCBrdm1fdmNwdSAqdmNwdSkKPiA+ID4gICAgICAgICAgICAgICBjbHIgfD0gfmhmZyAmIF9fICMj IHJlZyAjIyBfbk1BU0s7ICAgICAgICAgICAgICAgICAgICAgIFwKPiA+ID4gICAgICAgfSB3aGls ZSgwKQo+ID4gPgo+ID4gPiArI2RlZmluZSB1cGRhdGVfZmd0X3RyYXBzX2NzKHJlZywgY2xyLCBz ZXQpICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ID4gPiArICAgICBkbyB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ID4g PiArICAgICAgICAgICAgIHN0cnVjdCBrdm1fY3B1X2NvbnRleHQgKmhjdHh0ID0gICAgICAgICAg ICAgICAgICAgICAgICAgXAo+ID4gPiArICAgICAgICAgICAgICAgICAgICAgJnRoaXNfY3B1X3B0 cigma3ZtX2hvc3RfZGF0YSktPmhvc3RfY3R4dDsgICAgICAgXAo+ID4gPiArICAgICAgICAgICAg IHU2NCB2YWwsIGMgPSAwLCBzID0gMDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAo+ID4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAo+ID4gPiArICAgICAgICAgICAgIGN0eHRfc3lzX3JlZyho Y3R4dCwgcmVnKSA9IHJlYWRfc3lzcmVnX3MoU1lTXyAjIyByZWcpOyAgXAo+ID4gPiArICAgICAg ICAgICAgIGNvbXB1dGVfY2xyX3NldCh2Y3B1LCByZWcsIGMsIHMpOyAgICAgICAgICAgICAgICAg ICAgICAgXAo+ID4KPiA+IFlvdSBhcmUgcmVmZXJyaW5nIHRvIGEgdmFyaWFibGUgbmFtZSB0aGF0 IGlzIGluIHRoZSBzY29wZSBvZiB0aGUgbWFjcm8KPiA+IHVzZXIsIGFuZCBub3QgdGhlIG1hY3Jv IGl0c2VsZi4gSXQgaXMgc28gZnJhZ2lsZSBpdCBpc24ndCBmdW5ueS4KPiA+Cj4gPiBXaHkgZG9u J3QgeW91IHNpbXBseSBwYXNzIHRoZSB2Y3B1IGFzIGEgcGFyYW1ldGVyIHRvIHRoZSBmdW5jdGlv bj8KPiA+Cj4gPiBBbm90aGVyIHRoaW5nIGlzIHRoYXQgdGhpcyByZWFkL3dyaXRlIGNhbiBiZSBl eHBlbnNpdmUuIEhvdyBhYm91dCBub3QKPiA+IGRvaW5nIGFueXRoaW5nIHdoZW4gdGhlcmUgaXMg bm8gY2hhbmdlIHRvIHRoZSB2YWx1ZSBvZiB0aGUgc3lzcmVnPwo+IAo+IFdoYXQgZG8geW91IHRo aW5rIG9mIHRoaXMgKHNwYWNpbmcgd2lsbCBiZSBmaXhlZCk6Cj4gCj4gI2RlZmluZSB1cGRhdGVf Zmd0X3RyYXBzX2NzKHZjcHUsIHJlZywgY2xyLCBzZXQpICAgICAgICAgICAgICAgICAgICAgICAg IFwKPiAgICAgZG8gewo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKPiAgICAgICAgIHN0 cnVjdCBrdm1fY3B1X2NvbnRleHQgKmhjdHh0ID0KPiAgICAgICAgICBcCj4gICAgICAgICAgICAg JnRoaXNfY3B1X3B0cigma3ZtX2hvc3RfZGF0YSktPmhvc3RfY3R4dDsgICAgICAgICAgICAgICAg ICBcCj4gICAgICAgICB1NjQgdmFsLCBjID0gMCwgcyA9IDA7Cj4gICAgICAgICAgICAgICAgICAg XAo+IAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ICAgICAgICAgY3R4dF9zeXNf cmVnKGhjdHh0LCByZWcpID0gcmVhZF9zeXNyZWdfcyhTWVNfICMjIHJlZyk7ICAgXAo+ICAgICAg ICAgY29tcHV0ZV9jbHJfc2V0KHZjcHUsIHJlZywgYywgcyk7Cj4gICAgICAgICAgIFwKPiAgICAg ICAgIHZhbCA9IF9fICMjIHJlZyAjIyBfbk1BU0s7Cj4gICAgICAgICAgIFwKPiAgICAgICAgIHZh bCB8PSAocyB8IHNldCk7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgXAo+ICAgICAgICAgdmFs ICY9IH4oYyB8IGNscik7Cj4gICAgICAgICAgICAgICAgICAgICAgICBcCj4gICAgICAgICBpZiAo Y3R4dF9zeXNfcmVnKGhjdHh0LCByZWcpICE9IHZhbCkKPiAgICAgICAgICAgICAgIFwKPiAgICAg ICAgICAgICB3cml0ZV9zeXNyZWdfcyh2YWwsIFNZU18gIyMgcmVnKTsKPiAgICAgICAgICAgIFwK PiAgICAgfSB3aGlsZSgwKQo+IAo+IElmIGl0IGxvb2tzIGdvb2QgdG8geW91LCBJJ2xsIGZpeCBp dCBvbiB0aGUgcmVzcGluLgoKVGhpcyBpcyB3aGF0IEkgaGF2ZSBvbiB0b3AgYXQgdGhlIG1vbWVu dDoKCmRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNoLmgg Yi9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNoLmgKaW5kZXggMjcwNzdlMWY3 ZGUyLi5kNTZmZWY0NGRjMzEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQva3ZtL2h5cC9pbmNsdWRl L2h5cC9zd2l0Y2guaAorKysgYi9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9oeXAvc3dpdGNo LmgKQEAgLTc5LDIyICs3OSwyNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX19hY3RpdmF0ZV90cmFw c19mcHNpbWQzMihzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCiAJCWNsciB8PSB+aGZnICYgX18gIyMg cmVnICMjIF9uTUFTSzsgCQkJXAogCX0gd2hpbGUoMCkKIAotI2RlZmluZSB1cGRhdGVfZmd0X3Ry YXBzX2NzKHJlZywgY2xyLCBzZXQpCQkJCVwKKyNkZWZpbmUgdXBkYXRlX2ZndF90cmFwc19jcyh2 Y3B1LCByZWcsIGNsciwgc2V0KQkJCVwKIAlkbyB7CQkJCQkJCQlcCiAJCXN0cnVjdCBrdm1fY3B1 X2NvbnRleHQgKmhjdHh0ID0JCQkJXAogCQkJJnRoaXNfY3B1X3B0cigma3ZtX2hvc3RfZGF0YSkt Pmhvc3RfY3R4dDsJXAotCQl1NjQgdmFsLCBjID0gMCwgcyA9IDA7CQkJCQlcCisJCXU2NCBjID0g MCwgcyA9IDA7CQkJCQlcCiAJCQkJCQkJCQlcCiAJCWN0eHRfc3lzX3JlZyhoY3R4dCwgcmVnKSA9 IHJlYWRfc3lzcmVnX3MoU1lTXyAjIyByZWcpOwlcCiAJCWNvbXB1dGVfY2xyX3NldCh2Y3B1LCBy ZWcsIGMsIHMpOwkJCVwKLQkJdmFsID0gX18gIyMgcmVnICMjIF9uTUFTSzsJCQkJXAotCQl2YWwg fD0gKHMgfCBzZXQpOwkJCQkJXAotCQl2YWwgJj0gfihjIHwgY2xyKTsJCQkJCVwKLQkJd3JpdGVf c3lzcmVnX3ModmFsLCBTWVNfICMjIHJlZyk7CQkJXAorCQlzIHw9IHNldDsJCQkJCQlcCisJCWMg fD0gY2xyOwkJCQkJCVwKKwkJaWYgKGMgfHwgcykgewkJCQkJCVwKKwkJCXU2NCB2YWwgPSBfXyAj IyByZWcgIyMgX25NQVNLOwkJCVwKKwkJCXZhbCB8PSBzOwkJCQkJXAorCQkJdmFsICY9IH5jOwkJ CQkJXAorCQkJd3JpdGVfc3lzcmVnX3ModmFsLCBTWVNfICMjIHJlZyk7CQlcCisJCX0JCQkJCQkJ XAogCX0gd2hpbGUoMCkKIAotI2RlZmluZSB1cGRhdGVfZmd0X3RyYXBzKHJlZykJCQkJCQlcCi0J dXBkYXRlX2ZndF90cmFwc19jcyhyZWcsIDAsIDApCisjZGVmaW5lIHVwZGF0ZV9mZ3RfdHJhcHMo dmNwdSwgcmVnKQkJXAorCXVwZGF0ZV9mZ3RfdHJhcHNfY3ModmNwdSwgcmVnLCAwLCAwKQogCiAv KgogICogVmFsaWRhdGUgdGhlIGZpbmUgZ3JhaW4gdHJhcCBtYXNrcy4KQEAgLTE3MSw5ICsxNzUs OSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX19hY3RpdmF0ZV90cmFwc19oZmd4dHIoc3RydWN0IGt2 bV92Y3B1ICp2Y3B1KQogCWlmICghdmNwdV9oYXNfbnYodmNwdSkgfHwgaXNfaHlwX2N0eHQodmNw dSkpCiAJCXJldHVybjsKIAotCXVwZGF0ZV9mZ3RfdHJhcHMoSEZHSVRSX0VMMik7Ci0JdXBkYXRl X2ZndF90cmFwcyhIREZHUlRSX0VMMik7Ci0JdXBkYXRlX2ZndF90cmFwcyhIREZHV1RSX0VMMik7 CisJdXBkYXRlX2ZndF90cmFwcyh2Y3B1LCBIRkdJVFJfRUwyKTsKKwl1cGRhdGVfZmd0X3RyYXBz KHZjcHUsIEhERkdSVFJfRUwyKTsKKwl1cGRhdGVfZmd0X3RyYXBzKHZjcHUsIEhERkdXVFJfRUwy KTsKIAogCWlmIChjcHVfaGFzX2FtdSgpKQogCQl1cGRhdGVfZmd0X3RyYXBzKHZjcHUsIEhBRkdS VFJfRUwyKTsKCklmIHRoYXQgc2VlbXMgc2Vuc2libGUgdG8geW91LCBJJ2xsIGZvbGQgaXQgaW4s IGFzIEknZCBsaWtlIHRvIGRvCndpdGhvdXQgYSByZXNwaW4gaWYgd2UgY2FuIGF2b2lkIGl0LgoK YAlNLgoKLS0gCldpdGhvdXQgZGV2aWF0aW9uIGZyb20gdGhlIG5vcm0sIHByb2dyZXNzIGlzIG5v dCBwb3NzaWJsZS4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMu aW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2xpbnV4LWFybS1rZXJuZWwK