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 47C9D1DA22 for ; Tue, 28 May 2024 08:21:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716884512; cv=none; b=VTKuLja7o4WulIKK3JgGZx3wxwRpdR4Wa87Uf5ivKsqdl8qd5a3TfQP4TNQGyu3O9kCk833/pm9CzvhPnNXysBANARJLLJM5CEPdo4EpX6xWM3vwlQakyh6LLUgVORYUT7ehX4sQAHN5kw3qtbZmZ259VFyGOxdQW5aTYf7K7nM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716884512; c=relaxed/simple; bh=T8XtyMXUOxDkPa6rHXsZSS1yEry7dOt9zfp3Po4pmBQ=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=cLeRexmwbAQM94+7nExhTaCIcWghYf0Ol4rWu6Aj7gatkHnXtNvsNW+QpzSHy42GstU4P0Fu0YOR3rWqKKlkllTq1YvyQzldiA3zpKey9vLA87t3WL9CM9X/PgHIzra9byymmNcs5E1L5Ee1jBchrIzd3L7oEZyI0Ji4lQMISJU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fXsHkLUW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fXsHkLUW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C0D2C3277B; Tue, 28 May 2024 08:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716884511; bh=T8XtyMXUOxDkPa6rHXsZSS1yEry7dOt9zfp3Po4pmBQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fXsHkLUWh1Mhuv/m/jKVlABU3oaL5MnfGlVlieke4YOA62/GkRa5quNzZVZ7OKl57 vLTeRBQTVXUlO/da3tdAw7YmaK30k7lquhM9or8GMbJ9hMzyAcbu6Bhl1pYk78iuEi HhvbUL1BvQo9kiprGMb3eR1WGIuLQ0cUbf/j6mPNAAZH5iC0ttHz/kxMwmUuvsZ2Uw e6c8l3yKWLPNRIdK29mIIhrbxSxvML6MI4q3iA5g26IbB9IZi7qJK2FulHQGb+XObj ip0br5sIrKOE6fz6M9eg539z4oj/igiAw94o0nRdtNPioHV2d9PS2B10hrZYBb51Ol IPNoNhFW2HZfw== 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 1sBs5d-00GDw2-Cw; Tue, 28 May 2024 09:21:49 +0100 Date: Tue, 28 May 2024 09:21:49 +0100 Message-ID: <86fru2mjmq.wl-maz@kernel.org> From: Marc Zyngier To: Fuad Tabba Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, will@kernel.org, qperret@google.com, seanjc@google.com, alexandru.elisei@arm.com, catalin.marinas@arm.com, philmd@linaro.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, mark.rutland@arm.com, broonie@kernel.org, joey.gouly@arm.com, rananta@google.com, yuzenghui@huawei.com Subject: Re: [PATCH v2 6/7] KVM: arm64: Eagerly restore host fpsimd/sve state in pKVM In-Reply-To: References: <20240521163720.3812851-1-tabba@google.com> <20240521163720.3812851-7-tabba@google.com> <86o78yn5ga.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.2 (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, linux-arm-kernel@lists.infradead.org, will@kernel.org, qperret@google.com, seanjc@google.com, alexandru.elisei@arm.com, catalin.marinas@arm.com, philmd@linaro.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, mark.rutland@arm.com, broonie@kernel.org, joey.gouly@arm.com, rananta@google.com, yuzenghui@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Wed, 22 May 2024 15:48:39 +0100, Fuad Tabba wrote: >=20 > Hi Marc, >=20 > On Tue, May 21, 2024 at 11:52=E2=80=AFPM Marc Zyngier wr= ote: > > > > On Tue, 21 May 2024 17:37:19 +0100, > > Fuad Tabba wrote: > > > > > > When running in protected mode we don't want to leak protected > > > guest state to the host, including whether a guest has used > > > fpsimd/sve. Therefore, eagerly restore the host state on guest > > > exit when running in protected mode, which happens only if the > > > guest has used fpsimd/sve. > > > > > > As a future optimisation, we could go back to lazy restoring > > > state at the host after exiting non-protected guests. > > > > No. This sort of things is way too invasive and would require mapping > > the VHE host data at EL2. If we need to optimise this crap, then we > > apply the same techniques as we use for guests. If that's good enough > > for the guests, that's good enough for the host. >=20 > :D >=20 > > > > > > Signed-off-by: Fuad Tabba > > > --- > > > arch/arm64/kvm/hyp/include/hyp/switch.h | 13 +++++- > > > arch/arm64/kvm/hyp/nvhe/hyp-main.c | 53 +++++++++++++++++++++++= -- > > > arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 + > > > arch/arm64/kvm/hyp/nvhe/switch.c | 16 +++++++- > > > 4 files changed, 79 insertions(+), 5 deletions(-) > > > > > > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm= /hyp/include/hyp/switch.h > > > index 1897b73e635c..2fa29bfec0b6 100644 > > > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > > > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > > > @@ -320,6 +320,16 @@ static inline void __hyp_sve_restore_guest(struc= t kvm_vcpu *vcpu) > > > write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR); > > > } > > > > > > +static inline void __hyp_sve_save_host(void) > > > +{ > > > + struct user_sve_state *sve_state =3D *host_data_ptr(sve_state); > > > + > > > + sve_state->zcr_el1 =3D read_sysreg_el1(SYS_ZCR); > > > + sve_cond_update_zcr_vq(ZCR_ELx_LEN_MASK, SYS_ZCR_EL2); > > > + __sve_save_state(sve_state->sve_regs + sve_ffr_offset(kvm_host_= sve_max_vl), > > > + &sve_state->fpsr); > > > +} > > > + > > > static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu); > > > > > > /* > > > @@ -356,7 +366,8 @@ static bool kvm_hyp_handle_fpsimd(struct kvm_vcpu= *vcpu, u64 *exit_code) > > > > > > /* First disable enough traps to allow us to update the registe= rs */ > > > reg =3D CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN; > > > - if (sve_guest) > > > + if (sve_guest || > > > + (is_protected_kvm_enabled() && system_supports_sve())) > > > > This looks really ugly. Why can't we just compute sve_guest to take > > these conditions into account? >=20 > Because this is just for disabling the SVE traps, which we would need > to do even in the case where the guest doesn't support SVE in order to > be able to store the host sve state. >=20 > sve_guest is also used later in the function to determine whether we > need to restore the guest's sve state, and earlier to determine > whether an SVE trap from a non-sve guest should result in injecting an > undef instruction. >=20 > That said, maybe the following is a bit less ugly? >=20 > if (sve_guest || (is_protected_kvm_enabled() && system_supports_sve()= )) > cpacr_clear_set(0, CPACR_ELx_FPEN|CPACR_ELx_ZEN); > else > cpacr_clear_set(0, CPACR_ELx_FPEN); Yes, this looks marginally better. Overall, this helper is in dire need of a full rewrite... > > > > > reg |=3D CPACR_EL1_ZEN_EL0EN | CPACR_EL1_ZEN_EL1EN; > > > cpacr_clear_set(0, reg); > > > isb(); > > > diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/= nvhe/hyp-main.c > > > index b07d44484f42..f79f0f7b2759 100644 > > > --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c > > > +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > > > @@ -23,20 +23,66 @@ DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_i= nit_params); > > > > > > void __kvm_hyp_host_forward_smc(struct kvm_cpu_context *host_ctxt); > > > > > > +static void __hyp_sve_save_guest(struct kvm_vcpu *vcpu) > > > +{ > > > + __vcpu_sys_reg(vcpu, ZCR_EL1) =3D read_sysreg_el1(SYS_ZCR); > > > + sve_cond_update_zcr_vq(vcpu_sve_max_vq(vcpu) - 1, SYS_ZCR_EL2); > > > + __sve_save_state(vcpu_sve_pffr(vcpu), &vcpu->arch.ctxt.fp_regs.= fpsr); > > > + sve_cond_update_zcr_vq(ZCR_ELx_LEN_MASK, SYS_ZCR_EL2); > > > +} > > > + > > > +static void __hyp_sve_restore_host(void) > > > +{ > > > + struct user_sve_state *sve_state =3D *host_data_ptr(sve_state); > > > + > > > + sve_cond_update_zcr_vq(ZCR_ELx_LEN_MASK, SYS_ZCR_EL2); > > > + __sve_restore_state(sve_state->sve_regs + sve_ffr_offset(kvm_ho= st_sve_max_vl), > > > > This is what I was worried about in a previous patch. > > kvm_host_sve_max_vl represents the max VL across all CPUs. if CPU0 > > supports 128bit SVE and CPU1 256bit, the value is 256. but on CPU0, > > ZCR_ELx_LEN_MASK will results in using 128bit accesses, and the offset > > will be wrong. I can't convince myself that anything really goes wrong > > as long as we're consistent between save and restore, but that's at > > best ugly and needs extensive documenting. >=20 > As I mentioned in my reply to the previous patch, I _think_ that it > represents the maximum common VL across CPUs. Since the value comes > from vl_info.vq_map, which is calculated by filtering out all the VQs > not supported. >=20 > In kvm_arch_vcpu_put_fp(), we always assume the maximum VL supported > by the guest, regardless of which cpu this happens to be running on. > That said, there's a comment there outlining that. I'll add a comment > here to document it. That'd be helpful, thanks. >=20 > > On top of that, a conditional update of ZCR_EL2 with ZCR_ELx_LEN_MASK > > is unlikely to be beneficial, since nobody implements 2k vectors. A > > direct write followed by an ISB is likely to be better. >=20 > Will do. [..] > > > diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe= /pkvm.c > > > index 25e9a94f6d76..feb27b4ce459 100644 > > > --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c > > > +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c > > > @@ -588,6 +588,8 @@ int __pkvm_init_vcpu(pkvm_handle_t handle, struct= kvm_vcpu *host_vcpu, > > > if (ret) > > > unmap_donated_memory(hyp_vcpu, sizeof(*hyp_vcpu)); > > > > > > + hyp_vcpu->vcpu.arch.cptr_el2 =3D kvm_get_reset_cptr_el2(&hyp_vc= pu->vcpu); > > > + > > > > Eventually, we need to rename this to cpacr_el2 and make sure we > > consistently use the VHE format everywhere. I'm starting to be worried > > that we mix things badly. >=20 > Would you like me to do that in this patch series, or should I submit > another one after this that does this cleanup? Later please. Let's focus on getting this series across first. Thanks, 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 E309CC25B78 for ; Tue, 28 May 2024 08:22:14 +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=P//UQWSSOaYL1scV8dYugbUOgFOHY04WNWXhN4IS+4I=; b=K7HYwtf0Y19hr/ X0vFCgXC+jNiK9s8plcJBQo0eQl9AjY4hzPsUugyNxa4emS8rfXvTV4jGDkoug3+FsBFQFuHUSTGi 4yhzLSNgVV4nT6g7GVE4kQK8VAweAOpQv7cnZKIEnHkHCXtQTxMVJu/WIKl0MpWe1L6SrGIaLepUZ yyP2P8dsTqB/gwiFm58fWmTDFCUk60OM/q0SANp53H70UfIbkT3xuI+D4NgAcZgwJargnsMBH/97B AO00zJPMPMYHYQGyYANziXGI7PZuPAopujiO5vN83yNgHlzUevLVBDgE1R3uxYOFY1ZvILWq/csAS xT0iVrwQjtkD+WKDXrZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBs5o-0000000HSo9-3eTj; Tue, 28 May 2024 08:22:00 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBs5i-0000000HSnj-1Pfw for linux-arm-kernel@lists.infradead.org; Tue, 28 May 2024 08:21:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 82478CE10D7; Tue, 28 May 2024 08:21:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C0D2C3277B; Tue, 28 May 2024 08:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716884511; bh=T8XtyMXUOxDkPa6rHXsZSS1yEry7dOt9zfp3Po4pmBQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fXsHkLUWh1Mhuv/m/jKVlABU3oaL5MnfGlVlieke4YOA62/GkRa5quNzZVZ7OKl57 vLTeRBQTVXUlO/da3tdAw7YmaK30k7lquhM9or8GMbJ9hMzyAcbu6Bhl1pYk78iuEi HhvbUL1BvQo9kiprGMb3eR1WGIuLQ0cUbf/j6mPNAAZH5iC0ttHz/kxMwmUuvsZ2Uw e6c8l3yKWLPNRIdK29mIIhrbxSxvML6MI4q3iA5g26IbB9IZi7qJK2FulHQGb+XObj ip0br5sIrKOE6fz6M9eg539z4oj/igiAw94o0nRdtNPioHV2d9PS2B10hrZYBb51Ol IPNoNhFW2HZfw== 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 1sBs5d-00GDw2-Cw; Tue, 28 May 2024 09:21:49 +0100 Date: Tue, 28 May 2024 09:21:49 +0100 Message-ID: <86fru2mjmq.wl-maz@kernel.org> From: Marc Zyngier To: Fuad Tabba Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, will@kernel.org, qperret@google.com, seanjc@google.com, alexandru.elisei@arm.com, catalin.marinas@arm.com, philmd@linaro.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, mark.rutland@arm.com, broonie@kernel.org, joey.gouly@arm.com, rananta@google.com, yuzenghui@huawei.com Subject: Re: [PATCH v2 6/7] KVM: arm64: Eagerly restore host fpsimd/sve state in pKVM In-Reply-To: References: <20240521163720.3812851-1-tabba@google.com> <20240521163720.3812851-7-tabba@google.com> <86o78yn5ga.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.2 (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, linux-arm-kernel@lists.infradead.org, will@kernel.org, qperret@google.com, seanjc@google.com, alexandru.elisei@arm.com, catalin.marinas@arm.com, philmd@linaro.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, mark.rutland@arm.com, broonie@kernel.org, joey.gouly@arm.com, rananta@google.com, yuzenghui@huawei.com 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-20240528_012154_765185_C74FBD62 X-CRM114-Status: GOOD ( 49.28 ) 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 T24gV2VkLCAyMiBNYXkgMjAyNCAxNTo0ODozOSArMDEwMCwKRnVhZCBUYWJiYSA8dGFiYmFAZ29v Z2xlLmNvbT4gd3JvdGU6Cj4gCj4gSGkgTWFyYywKPiAKPiBPbiBUdWUsIE1heSAyMSwgMjAyNCBh dCAxMTo1MuKAr1BNIE1hcmMgWnluZ2llciA8bWF6QGtlcm5lbC5vcmc+IHdyb3RlOgo+ID4KPiA+ IE9uIFR1ZSwgMjEgTWF5IDIwMjQgMTc6Mzc6MTkgKzAxMDAsCj4gPiBGdWFkIFRhYmJhIDx0YWJi YUBnb29nbGUuY29tPiB3cm90ZToKPiA+ID4KPiA+ID4gV2hlbiBydW5uaW5nIGluIHByb3RlY3Rl ZCBtb2RlIHdlIGRvbid0IHdhbnQgdG8gbGVhayBwcm90ZWN0ZWQKPiA+ID4gZ3Vlc3Qgc3RhdGUg dG8gdGhlIGhvc3QsIGluY2x1ZGluZyB3aGV0aGVyIGEgZ3Vlc3QgaGFzIHVzZWQKPiA+ID4gZnBz aW1kL3N2ZS4gVGhlcmVmb3JlLCBlYWdlcmx5IHJlc3RvcmUgdGhlIGhvc3Qgc3RhdGUgb24gZ3Vl c3QKPiA+ID4gZXhpdCB3aGVuIHJ1bm5pbmcgaW4gcHJvdGVjdGVkIG1vZGUsIHdoaWNoIGhhcHBl bnMgb25seSBpZiB0aGUKPiA+ID4gZ3Vlc3QgaGFzIHVzZWQgZnBzaW1kL3N2ZS4KPiA+ID4KPiA+ ID4gQXMgYSBmdXR1cmUgb3B0aW1pc2F0aW9uLCB3ZSBjb3VsZCBnbyBiYWNrIHRvIGxhenkgcmVz dG9yaW5nCj4gPiA+IHN0YXRlIGF0IHRoZSBob3N0IGFmdGVyIGV4aXRpbmcgbm9uLXByb3RlY3Rl ZCBndWVzdHMuCj4gPgo+ID4gTm8uIFRoaXMgc29ydCBvZiB0aGluZ3MgaXMgd2F5IHRvbyBpbnZh c2l2ZSBhbmQgd291bGQgcmVxdWlyZSBtYXBwaW5nCj4gPiB0aGUgVkhFIGhvc3QgZGF0YSBhdCBF TDIuIElmIHdlIG5lZWQgdG8gb3B0aW1pc2UgdGhpcyBjcmFwLCB0aGVuIHdlCj4gPiBhcHBseSB0 aGUgc2FtZSB0ZWNobmlxdWVzIGFzIHdlIHVzZSBmb3IgZ3Vlc3RzLiBJZiB0aGF0J3MgZ29vZCBl bm91Z2gKPiA+IGZvciB0aGUgZ3Vlc3RzLCB0aGF0J3MgZ29vZCBlbm91Z2ggZm9yIHRoZSBob3N0 Lgo+IAo+IDpECj4gCj4gPiA+Cj4gPiA+IFNpZ25lZC1vZmYtYnk6IEZ1YWQgVGFiYmEgPHRhYmJh QGdvb2dsZS5jb20+Cj4gPiA+IC0tLQo+ID4gPiAgYXJjaC9hcm02NC9rdm0vaHlwL2luY2x1ZGUv aHlwL3N3aXRjaC5oIHwgMTMgKysrKystCj4gPiA+ICBhcmNoL2FybTY0L2t2bS9oeXAvbnZoZS9o eXAtbWFpbi5jICAgICAgfCA1MyArKysrKysrKysrKysrKysrKysrKysrKy0tCj4gPiA+ICBhcmNo L2FybTY0L2t2bS9oeXAvbnZoZS9wa3ZtLmMgICAgICAgICAgfCAgMiArCj4gPiA+ICBhcmNoL2Fy bTY0L2t2bS9oeXAvbnZoZS9zd2l0Y2guYyAgICAgICAgfCAxNiArKysrKysrLQo+ID4gPiAgNCBm aWxlcyBjaGFuZ2VkLCA3OSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+ID4gPgo+ID4g PiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9rdm0vaHlwL2luY2x1ZGUvaHlwL3N3aXRjaC5oIGIv YXJjaC9hcm02NC9rdm0vaHlwL2luY2x1ZGUvaHlwL3N3aXRjaC5oCj4gPiA+IGluZGV4IDE4OTdi NzNlNjM1Yy4uMmZhMjliZmVjMGI2IDEwMDY0NAo+ID4gPiAtLS0gYS9hcmNoL2FybTY0L2t2bS9o eXAvaW5jbHVkZS9oeXAvc3dpdGNoLmgKPiA+ID4gKysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL2lu Y2x1ZGUvaHlwL3N3aXRjaC5oCj4gPiA+IEBAIC0zMjAsNiArMzIwLDE2IEBAIHN0YXRpYyBpbmxp bmUgdm9pZCBfX2h5cF9zdmVfcmVzdG9yZV9ndWVzdChzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUpCj4g PiA+ICAgICAgIHdyaXRlX3N5c3JlZ19lbDEoX192Y3B1X3N5c19yZWcodmNwdSwgWkNSX0VMMSks IFNZU19aQ1IpOwo+ID4gPiAgfQo+ID4gPgo+ID4gPiArc3RhdGljIGlubGluZSB2b2lkIF9faHlw X3N2ZV9zYXZlX2hvc3Qodm9pZCkKPiA+ID4gK3sKPiA+ID4gKyAgICAgc3RydWN0IHVzZXJfc3Zl X3N0YXRlICpzdmVfc3RhdGUgPSAqaG9zdF9kYXRhX3B0cihzdmVfc3RhdGUpOwo+ID4gPiArCj4g PiA+ICsgICAgIHN2ZV9zdGF0ZS0+emNyX2VsMSA9IHJlYWRfc3lzcmVnX2VsMShTWVNfWkNSKTsK PiA+ID4gKyAgICAgc3ZlX2NvbmRfdXBkYXRlX3pjcl92cShaQ1JfRUx4X0xFTl9NQVNLLCBTWVNf WkNSX0VMMik7Cj4gPiA+ICsgICAgIF9fc3ZlX3NhdmVfc3RhdGUoc3ZlX3N0YXRlLT5zdmVfcmVn cyArIHN2ZV9mZnJfb2Zmc2V0KGt2bV9ob3N0X3N2ZV9tYXhfdmwpLAo+ID4gPiArICAgICAgICAg ICAgICAgICAgICAgICZzdmVfc3RhdGUtPmZwc3IpOwo+ID4gPiArfQo+ID4gPiArCj4gPiA+ICBz dGF0aWMgdm9pZCBrdm1faHlwX3NhdmVfZnBzaW1kX2hvc3Qoc3RydWN0IGt2bV92Y3B1ICp2Y3B1 KTsKPiA+ID4KPiA+ID4gIC8qCj4gPiA+IEBAIC0zNTYsNyArMzY2LDggQEAgc3RhdGljIGJvb2wg a3ZtX2h5cF9oYW5kbGVfZnBzaW1kKHN0cnVjdCBrdm1fdmNwdSAqdmNwdSwgdTY0ICpleGl0X2Nv ZGUpCj4gPiA+Cj4gPiA+ICAgICAgIC8qIEZpcnN0IGRpc2FibGUgZW5vdWdoIHRyYXBzIHRvIGFs bG93IHVzIHRvIHVwZGF0ZSB0aGUgcmVnaXN0ZXJzICovCj4gPiA+ICAgICAgIHJlZyA9IENQQUNS X0VMMV9GUEVOX0VMMEVOIHwgQ1BBQ1JfRUwxX0ZQRU5fRUwxRU47Cj4gPiA+IC0gICAgIGlmIChz dmVfZ3Vlc3QpCj4gPiA+ICsgICAgIGlmIChzdmVfZ3Vlc3QgfHwKPiA+ID4gKyAgICAgICAgIChp c19wcm90ZWN0ZWRfa3ZtX2VuYWJsZWQoKSAmJiBzeXN0ZW1fc3VwcG9ydHNfc3ZlKCkpKQo+ID4K PiA+IFRoaXMgbG9va3MgcmVhbGx5IHVnbHkuIFdoeSBjYW4ndCB3ZSBqdXN0IGNvbXB1dGUgc3Zl X2d1ZXN0IHRvIHRha2UKPiA+IHRoZXNlIGNvbmRpdGlvbnMgaW50byBhY2NvdW50Pwo+IAo+IEJl Y2F1c2UgdGhpcyBpcyBqdXN0IGZvciBkaXNhYmxpbmcgdGhlIFNWRSB0cmFwcywgd2hpY2ggd2Ug d291bGQgbmVlZAo+IHRvIGRvIGV2ZW4gaW4gdGhlIGNhc2Ugd2hlcmUgdGhlIGd1ZXN0IGRvZXNu J3Qgc3VwcG9ydCBTVkUgaW4gb3JkZXIgdG8KPiBiZSBhYmxlIHRvIHN0b3JlIHRoZSBob3N0IHN2 ZSBzdGF0ZS4KPiAKPiBzdmVfZ3Vlc3QgaXMgYWxzbyB1c2VkIGxhdGVyIGluIHRoZSBmdW5jdGlv biB0byBkZXRlcm1pbmUgd2hldGhlciB3ZQo+IG5lZWQgdG8gcmVzdG9yZSB0aGUgZ3Vlc3QncyBz dmUgc3RhdGUsIGFuZCBlYXJsaWVyIHRvIGRldGVybWluZQo+IHdoZXRoZXIgYW4gU1ZFIHRyYXAg ZnJvbSBhIG5vbi1zdmUgZ3Vlc3Qgc2hvdWxkIHJlc3VsdCBpbiBpbmplY3RpbmcgYW4KPiB1bmRl ZiBpbnN0cnVjdGlvbi4KPiAKPiBUaGF0IHNhaWQsIG1heWJlIHRoZSBmb2xsb3dpbmcgaXMgYSBi aXQgbGVzcyB1Z2x5Pwo+IAo+ICAgICBpZiAoc3ZlX2d1ZXN0IHx8IChpc19wcm90ZWN0ZWRfa3Zt X2VuYWJsZWQoKSAmJiBzeXN0ZW1fc3VwcG9ydHNfc3ZlKCkpKQo+ICAgICAgICAgY3BhY3JfY2xl YXJfc2V0KDAsIENQQUNSX0VMeF9GUEVOfENQQUNSX0VMeF9aRU4pOwo+ICAgICBlbHNlCj4gICAg ICAgICBjcGFjcl9jbGVhcl9zZXQoMCwgQ1BBQ1JfRUx4X0ZQRU4pOwoKWWVzLCB0aGlzIGxvb2tz IG1hcmdpbmFsbHkgYmV0dGVyLiBPdmVyYWxsLCB0aGlzIGhlbHBlciBpcyBpbiBkaXJlCm5lZWQg b2YgYSBmdWxsIHJld3JpdGUuLi4KCj4gPgo+ID4gPiAgICAgICAgICAgICAgIHJlZyB8PSBDUEFD Ul9FTDFfWkVOX0VMMEVOIHwgQ1BBQ1JfRUwxX1pFTl9FTDFFTjsKPiA+ID4gICAgICAgY3BhY3Jf Y2xlYXJfc2V0KDAsIHJlZyk7Cj4gPiA+ICAgICAgIGlzYigpOwo+ID4gPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm02NC9rdm0vaHlwL252aGUvaHlwLW1haW4uYyBiL2FyY2gvYXJtNjQva3ZtL2h5cC9u dmhlL2h5cC1tYWluLmMKPiA+ID4gaW5kZXggYjA3ZDQ0NDg0ZjQyLi5mNzlmMGY3YjI3NTkgMTAw NjQ0Cj4gPiA+IC0tLSBhL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL2h5cC1tYWluLmMKPiA+ID4g KysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvaHlwLW1haW4uYwo+ID4gPiBAQCAtMjMsMjAg KzIzLDY2IEBAIERFRklORV9QRVJfQ1BVKHN0cnVjdCBrdm1fbnZoZV9pbml0X3BhcmFtcywga3Zt X2luaXRfcGFyYW1zKTsKPiA+ID4KPiA+ID4gIHZvaWQgX19rdm1faHlwX2hvc3RfZm9yd2FyZF9z bWMoc3RydWN0IGt2bV9jcHVfY29udGV4dCAqaG9zdF9jdHh0KTsKPiA+ID4KPiA+ID4gK3N0YXRp YyB2b2lkIF9faHlwX3N2ZV9zYXZlX2d1ZXN0KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkKPiA+ID4g K3sKPiA+ID4gKyAgICAgX192Y3B1X3N5c19yZWcodmNwdSwgWkNSX0VMMSkgPSByZWFkX3N5c3Jl Z19lbDEoU1lTX1pDUik7Cj4gPiA+ICsgICAgIHN2ZV9jb25kX3VwZGF0ZV96Y3JfdnEodmNwdV9z dmVfbWF4X3ZxKHZjcHUpIC0gMSwgU1lTX1pDUl9FTDIpOwo+ID4gPiArICAgICBfX3N2ZV9zYXZl X3N0YXRlKHZjcHVfc3ZlX3BmZnIodmNwdSksICZ2Y3B1LT5hcmNoLmN0eHQuZnBfcmVncy5mcHNy KTsKPiA+ID4gKyAgICAgc3ZlX2NvbmRfdXBkYXRlX3pjcl92cShaQ1JfRUx4X0xFTl9NQVNLLCBT WVNfWkNSX0VMMik7Cj4gPiA+ICt9Cj4gPiA+ICsKPiA+ID4gK3N0YXRpYyB2b2lkIF9faHlwX3N2 ZV9yZXN0b3JlX2hvc3Qodm9pZCkKPiA+ID4gK3sKPiA+ID4gKyAgICAgc3RydWN0IHVzZXJfc3Zl X3N0YXRlICpzdmVfc3RhdGUgPSAqaG9zdF9kYXRhX3B0cihzdmVfc3RhdGUpOwo+ID4gPiArCj4g PiA+ICsgICAgIHN2ZV9jb25kX3VwZGF0ZV96Y3JfdnEoWkNSX0VMeF9MRU5fTUFTSywgU1lTX1pD Ul9FTDIpOwo+ID4gPiArICAgICBfX3N2ZV9yZXN0b3JlX3N0YXRlKHN2ZV9zdGF0ZS0+c3ZlX3Jl Z3MgKyBzdmVfZmZyX29mZnNldChrdm1faG9zdF9zdmVfbWF4X3ZsKSwKPiA+Cj4gPiBUaGlzIGlz IHdoYXQgSSB3YXMgd29ycmllZCBhYm91dCBpbiBhIHByZXZpb3VzIHBhdGNoLgo+ID4ga3ZtX2hv c3Rfc3ZlX21heF92bCByZXByZXNlbnRzIHRoZSBtYXggVkwgYWNyb3NzIGFsbCBDUFVzLiBpZiBD UFUwCj4gPiBzdXBwb3J0cyAxMjhiaXQgU1ZFIGFuZCBDUFUxIDI1NmJpdCwgdGhlIHZhbHVlIGlz IDI1Ni4gYnV0IG9uIENQVTAsCj4gPiBaQ1JfRUx4X0xFTl9NQVNLIHdpbGwgcmVzdWx0cyBpbiB1 c2luZyAxMjhiaXQgYWNjZXNzZXMsIGFuZCB0aGUgb2Zmc2V0Cj4gPiB3aWxsIGJlIHdyb25nLiBJ IGNhbid0IGNvbnZpbmNlIG15c2VsZiB0aGF0IGFueXRoaW5nIHJlYWxseSBnb2VzIHdyb25nCj4g PiBhcyBsb25nIGFzIHdlJ3JlIGNvbnNpc3RlbnQgYmV0d2VlbiBzYXZlIGFuZCByZXN0b3JlLCBi dXQgdGhhdCdzIGF0Cj4gPiBiZXN0IHVnbHkgYW5kIG5lZWRzIGV4dGVuc2l2ZSBkb2N1bWVudGlu Zy4KPiAKPiBBcyBJIG1lbnRpb25lZCBpbiBteSByZXBseSB0byB0aGUgcHJldmlvdXMgcGF0Y2gs IEkgX3RoaW5rXyB0aGF0IGl0Cj4gcmVwcmVzZW50cyB0aGUgbWF4aW11bSBjb21tb24gVkwgYWNy b3NzIENQVXMuIFNpbmNlIHRoZSB2YWx1ZSBjb21lcwo+IGZyb20gdmxfaW5mby52cV9tYXAsIHdo aWNoIGlzIGNhbGN1bGF0ZWQgYnkgZmlsdGVyaW5nIG91dCBhbGwgdGhlIFZRcwo+IG5vdCBzdXBw b3J0ZWQuCj4gCj4gSW4ga3ZtX2FyY2hfdmNwdV9wdXRfZnAoKSwgd2UgYWx3YXlzIGFzc3VtZSB0 aGUgbWF4aW11bSBWTCBzdXBwb3J0ZWQKPiBieSB0aGUgZ3Vlc3QsIHJlZ2FyZGxlc3Mgb2Ygd2hp Y2ggY3B1IHRoaXMgaGFwcGVucyB0byBiZSBydW5uaW5nIG9uLgo+IFRoYXQgc2FpZCwgdGhlcmUn cyBhIGNvbW1lbnQgdGhlcmUgb3V0bGluaW5nIHRoYXQuIEknbGwgYWRkIGEgY29tbWVudAo+IGhl cmUgdG8gZG9jdW1lbnQgaXQuCgpUaGF0J2QgYmUgaGVscGZ1bCwgdGhhbmtzLgoKPiAKPiA+IE9u IHRvcCBvZiB0aGF0LCBhIGNvbmRpdGlvbmFsIHVwZGF0ZSBvZiBaQ1JfRUwyIHdpdGggWkNSX0VM eF9MRU5fTUFTSwo+ID4gaXMgdW5saWtlbHkgdG8gYmUgYmVuZWZpY2lhbCwgc2luY2Ugbm9ib2R5 IGltcGxlbWVudHMgMmsgdmVjdG9ycy4gQQo+ID4gZGlyZWN0IHdyaXRlIGZvbGxvd2VkIGJ5IGFu IElTQiBpcyBsaWtlbHkgdG8gYmUgYmV0dGVyLgo+IAo+IFdpbGwgZG8uCgpbLi5dCgo+ID4gPiBk aWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvcGt2bS5jIGIvYXJjaC9hcm02NC9r dm0vaHlwL252aGUvcGt2bS5jCj4gPiA+IGluZGV4IDI1ZTlhOTRmNmQ3Ni4uZmViMjdiNGNlNDU5 IDEwMDY0NAo+ID4gPiAtLS0gYS9hcmNoL2FybTY0L2t2bS9oeXAvbnZoZS9wa3ZtLmMKPiA+ID4g KysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvcGt2bS5jCj4gPiA+IEBAIC01ODgsNiArNTg4 LDggQEAgaW50IF9fcGt2bV9pbml0X3ZjcHUocGt2bV9oYW5kbGVfdCBoYW5kbGUsIHN0cnVjdCBr dm1fdmNwdSAqaG9zdF92Y3B1LAo+ID4gPiAgICAgICBpZiAocmV0KQo+ID4gPiAgICAgICAgICAg ICAgIHVubWFwX2RvbmF0ZWRfbWVtb3J5KGh5cF92Y3B1LCBzaXplb2YoKmh5cF92Y3B1KSk7Cj4g PiA+Cj4gPiA+ICsgICAgIGh5cF92Y3B1LT52Y3B1LmFyY2guY3B0cl9lbDIgPSBrdm1fZ2V0X3Jl c2V0X2NwdHJfZWwyKCZoeXBfdmNwdS0+dmNwdSk7Cj4gPiA+ICsKPiA+Cj4gPiBFdmVudHVhbGx5 LCB3ZSBuZWVkIHRvIHJlbmFtZSB0aGlzIHRvIGNwYWNyX2VsMiBhbmQgbWFrZSBzdXJlIHdlCj4g PiBjb25zaXN0ZW50bHkgdXNlIHRoZSBWSEUgZm9ybWF0IGV2ZXJ5d2hlcmUuIEknbSBzdGFydGlu ZyB0byBiZSB3b3JyaWVkCj4gPiB0aGF0IHdlIG1peCB0aGluZ3MgYmFkbHkuCj4gCj4gV291bGQg eW91IGxpa2UgbWUgdG8gZG8gdGhhdCBpbiB0aGlzIHBhdGNoIHNlcmllcywgb3Igc2hvdWxkIEkg c3VibWl0Cj4gYW5vdGhlciBvbmUgYWZ0ZXIgdGhpcyB0aGF0IGRvZXMgdGhpcyBjbGVhbnVwPwoK TGF0ZXIgcGxlYXNlLiBMZXQncyBmb2N1cyBvbiBnZXR0aW5nIHRoaXMgc2VyaWVzIGFjcm9zcyBm aXJzdC4KClRoYW5rcywKCglNLgoKLS0gCldpdGhvdXQgZGV2aWF0aW9uIGZyb20gdGhlIG5vcm0s IHByb2dyZXNzIGlzIG5vdCBwb3NzaWJsZS4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK