From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 179A653B6 for ; Tue, 4 Jul 2023 16:27:10 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fbb07e7155so275605e9.0 for ; Tue, 04 Jul 2023 09:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688488029; x=1691080029; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=OwQr9W55X8RNR2CtPf2qZuGcHu62lyr7ZUFMcJnQdtM=; b=dEpRBkMSbilzHcQr1TMq36A+As+SAUWyE6TsMGiKt2KbeS3xIsT0UMjIQP7a83WnQ5 hAzTGdi1L7TCDYZfNqN4VOGkKIrZVJeCiu0zGQ+PCHQeCWWV/aVPnnR3xfXpoC1AD+rK 1aZmz+VfUe3T/ILRj2BcIGe2ymiFj3YJLcnAtpprZwSysOC6eaYshs+VBhth48cCvfoN pfKVKpLWAowNo+puq6121BYciZI7feJo4QY3UI/ux8+7lSUc26wQDxlIOK7RnoMW0Gdf se3NJQuiFW6oQdHiSMwrS1H+xguvlnTTT4SKCpcxVbl4oLoBevwT9cznGXmS9NRry4Gg Cn6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688488029; x=1691080029; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OwQr9W55X8RNR2CtPf2qZuGcHu62lyr7ZUFMcJnQdtM=; b=mFZGBNaLIZeTWUHFyq+KtlMPmX6eqh/bGmXqfKNEDGvA69OhYqLwPMkIaGy7KFCVHx wtASnfSEkFiB70JN6xX0eVg73/7/VHPssaz6KgwIOb7BMX+jKh4xPo8j1V80Xffw4wBA W2IFW2zhvtziVlWGqovnjviC8T+imkYdABZKKg23gDRaMJdplqoZqnYs5hcxzKkCjG/X ilIlJaicb9R8NyH50joCIX6+fWkaFu7tlP0b8S+mzY/UT8tgO+m1vgfc21pOhjupfE9f L825A0miB3x2/e306JFJCUVAIDvRozisGYvRvwFzmzDgQ9JI1PARMFnjmJwQno+P+zx9 xkvQ== X-Gm-Message-State: ABy/qLamhWinlKpTYLkKKAi3dWe68L58J83UIj8DYXdQziYLGUv7BkA2 XHn3/7i+ebSdNn/MMwxmn9EpAw== X-Google-Smtp-Source: APBJJlE/AWwOljtrJpRMbdFlc2ytul4cxt3bN0oyBiY21F7m9kugng668rUy4tPk1a6xsNgtqZdjWg== X-Received: by 2002:a05:600c:4f49:b0:3f1:9a3d:4f7f with SMTP id m9-20020a05600c4f4900b003f19a3d4f7fmr79554wmq.1.1688488029067; Tue, 04 Jul 2023 09:27:09 -0700 (PDT) Received: from google.com (44.232.78.34.bc.googleusercontent.com. [34.78.232.44]) by smtp.gmail.com with ESMTPSA id y19-20020a05600c365300b003fa8dbb7b5dsm26836778wmq.25.2023.07.04.09.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 09:27:08 -0700 (PDT) Date: Tue, 4 Jul 2023 16:27:04 +0000 From: Mostafa Saleh To: Sudeep Holla Cc: maz@kernel.org, oliver.upton@linux.dev, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, tabba@google.com, qperret@google.com, will@kernel.org, catalin.marinas@arm.com, yuzenghui@huawei.com, suzuki.poulose@arm.com, james.morse@arm.com, bgardon@google.com, gshan@redhat.com Subject: Re: [PATCH v3] KVM: arm64: Use BTI for nvhe Message-ID: References: <20230530150845.2856828-1-smostafa@google.com> <20230704134136.a5znw4jupt5yp5kg@bogus> <20230704143339.cqrvntq7rmmb2on3@bogus> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230704143339.cqrvntq7rmmb2on3@bogus> Hi Sudeep, On Tue, Jul 04, 2023 at 03:33:39PM +0100, Sudeep Holla wrote: > Hi Mostafa, > > On Tue, Jul 04, 2023 at 02:18:09PM +0000, Mostafa Saleh wrote: > > Hi Sudeep, > > > > On Tue, Jul 04, 2023 at 02:41:36PM +0100, Sudeep Holla wrote: > > > On Tue, May 30, 2023 at 03:08:45PM +0000, Mostafa Saleh wrote: > > > > CONFIG_ARM64_BTI_KERNEL compiles the kernel to support ARMv8.5-BTI. > > > > However, the nvhe code doesn't make use of it as it doesn't map any > > > > pages with Guarded Page(GP) bit. > > > > > > > > kvm pgtable code is modified to map executable pages with GP bit > > > > if BTI is enabled for the kernel. > > > > > > > > At hyp init, SCTLR_EL2.BT is set to 1 to match EL1 configuration > > > > (SCTLR_EL1.BT1) set in bti_enable(). > > > > > > > > One difference between kernel and nvhe code, is that the kernel maps > > > > .text with GP while nvhe maps all the executable pages, this makes > > > > nvhe code need to deal with special initialization code coming from > > > > other executable sections (.idmap.text). > > > > For this we need to add bti instruction at the beginning of > > > > __kvm_handle_stub_hvc as it can be called by __host_hvc through > > > > branch instruction(br) and unlike SYM_FUNC_START, SYM_CODE_START > > > > doesn’t add bti instruction at the beginning, and it can’t be modified > > > > to add it as it is used with vector tables. > > > > Another solution which is more intrusive is to convert > > > > __kvm_handle_stub_hvc to a function and inject “bti jc” instead of > > > > “bti c” in SYM_FUNC_START > > > > > > > > > > I was chasing a bug in linux-next yesterday with protected nVHE(pKVM) and > > > cpuidle enabled. The system fails to boot. I just bisected the issue to this > > > patch and also saw this patch landed in the linus tree yesterday/today. > > > > One of the challenges of BTI is that we need to add explicit BTI instructions > > for assembly code. I checked the code to make sure that nothing was missing, > > but maybe this is not the case. > > Can you please share more about the issue (is ESR a Branch Target Exception, > > call stack...) if possible. > > I haven't debugged it any further, just reported it as soon as I bisected it. > Reverting this get back the booting system. I am not sure if anything is going > wrong when the CPU is entering suspend(highly unlikely in normal scenario but > I am not so sure with pKVM trapping these PSCI calls now) or when it is woken > up and resuming back. IIUC this now will happen via kvm_hyp_cpu_resume-> > __kvm_hyp_init_cpu->___kvm_hyp_init. Thanks a lot for the information. I checked this now, and I believe I found an issue. I see that __kvm_hyp_init_cpu calls kvm_host_psci_cpu_entry indirectly and there is no BTI there. I think this is the only C function that needs special handling. Can you please check if this solves the issue? diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index c87c63133e10..7df63f364c3c 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -297,3 +297,8 @@ SYM_CODE_START(__kvm_hyp_host_forward_smc) ret SYM_CODE_END(__kvm_hyp_host_forward_smc) + +SYM_CODE_START(kvm_host_psci_cpu_entry) + bti j + b __kvm_host_psci_cpu_entry +SYM_CODE_END(kvm_host_psci_cpu_entry) diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c index 08508783ec3d..24543d2a3490 100644 --- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c +++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c @@ -200,7 +200,7 @@ static int psci_system_suspend(u64 func_id, struct kvm_cpu_context *host_ctxt) __hyp_pa(init_params), 0); } -asmlinkage void __noreturn kvm_host_psci_cpu_entry(bool is_cpu_on) +asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on) { struct psci_boot_args *boot_args; struct kvm_cpu_context *host_ctxt; > > Also, is this with CONFIG_ARM_PSCI_CPUIDLE? > > Yes, basically the cpus can enter cpu_suspend which IIUC pKVM traps and > handle for the host. My current setup has no CONFIG_ARM_PSCI_CPUIDLE?, I will try to find something I can test with. > > > > > Not sure if this is something to do with the fact that pKVM skips to > > > __kvm_handle_stub_hvc in __host_hvc. > > Sorry, my bad. I meant pKVM skips calling __kvm_handle_stub_hvc in __host_hvc > and jumps to __host_exit directly. Sorry for that, one wrong "to" changed the > whole meaning. I don't see an issue in this, as this path has no indirect branches. > > __kvm_handle_stub_hvc is called from __host_hvc with "br x5" > > That's why "bti j" was added at the beginning of __kvm_handle_stub_hvc, > > so this should be fine. > > > > Yes I saw that and understood that but I wanted to tell the above which went > horribly wrong before. > Thanks, Mostafa 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 3DC29EB64DD for ; Tue, 4 Jul 2023 16:27:42 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2ZD0jE1wNLMoGb3LGmJVZ/7B0FOHiFA8q6FqAxTbPUM=; b=AKRKKz/ZNHwf5h W83iL1uWk3/fteTIfqVYmEadEklGfTgxIadlpo8EhQ2G608j3qQL37LTWikxPl97pdmnWESzaSS4W TmIZB04tyMjiwzxE2kWLcDkcXj962BJQrtCMGBhON4GdRN2koyjxhK+o256QrTnQT1/RwTgaJX3ce wasz5dF9meM6gVmN+MfPce0rJS4MEek2ouuAErNqKm1maBCQVLsqw5Ohlb5BEnvvrMhhPYgHk8D/Q B20L4t2XGt8RV++g5sOiRwR+/l5azwgtz2YfKm7t27SCoY3PGNJxb8pr24tV7HvGBO/ZvWN7BwDFV yuICTKS63e6s7d3vod9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qGirz-00Doi9-1r; Tue, 04 Jul 2023 16:27:15 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qGiru-00Dof9-3B for linux-arm-kernel@lists.infradead.org; Tue, 04 Jul 2023 16:27:12 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbb07e7155so275615e9.0 for ; Tue, 04 Jul 2023 09:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688488029; x=1691080029; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=OwQr9W55X8RNR2CtPf2qZuGcHu62lyr7ZUFMcJnQdtM=; b=dEpRBkMSbilzHcQr1TMq36A+As+SAUWyE6TsMGiKt2KbeS3xIsT0UMjIQP7a83WnQ5 hAzTGdi1L7TCDYZfNqN4VOGkKIrZVJeCiu0zGQ+PCHQeCWWV/aVPnnR3xfXpoC1AD+rK 1aZmz+VfUe3T/ILRj2BcIGe2ymiFj3YJLcnAtpprZwSysOC6eaYshs+VBhth48cCvfoN pfKVKpLWAowNo+puq6121BYciZI7feJo4QY3UI/ux8+7lSUc26wQDxlIOK7RnoMW0Gdf se3NJQuiFW6oQdHiSMwrS1H+xguvlnTTT4SKCpcxVbl4oLoBevwT9cznGXmS9NRry4Gg Cn6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688488029; x=1691080029; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OwQr9W55X8RNR2CtPf2qZuGcHu62lyr7ZUFMcJnQdtM=; b=VQCALebA5v8KoUMFFbIjhDheZYfEHQzWFwU7TFcRw9ojPRDpcHg+tG+3SHScSORYcC 6vnSjkSUmObQ7KHnrpKXnNgIxR1yXpEfZsF/9GJyUwAFgI+k0f0fJZZiwAfIcE01ztcu WvvFR8n6BknNe7fAYVigNVz/uPG2vYot1BvcybtfbQxn0nLvwFIfx5bPV+k9KDbsuupg NFW3gEpVRiHb1CM07jBH2x0c/pMzcLqVvs4eCV8QsRfOSVu2V/YRTSwi74MC7QzvvtbS Fb//mRYRnaZeFLXZ6TaPsQVkWu88bw4eprv4O8A8n15yQBRKdeZUKmfT2/OIMlLqOKU2 Rueg== X-Gm-Message-State: ABy/qLZwKGzJmztm6Xa0pU4NbKOhJ+t7/rcl0LP0mXxeSnFP9zt728aG /oW8akv/CFDXSQT2XA920+pkPA== X-Google-Smtp-Source: APBJJlE/AWwOljtrJpRMbdFlc2ytul4cxt3bN0oyBiY21F7m9kugng668rUy4tPk1a6xsNgtqZdjWg== X-Received: by 2002:a05:600c:4f49:b0:3f1:9a3d:4f7f with SMTP id m9-20020a05600c4f4900b003f19a3d4f7fmr79554wmq.1.1688488029067; Tue, 04 Jul 2023 09:27:09 -0700 (PDT) Received: from google.com (44.232.78.34.bc.googleusercontent.com. [34.78.232.44]) by smtp.gmail.com with ESMTPSA id y19-20020a05600c365300b003fa8dbb7b5dsm26836778wmq.25.2023.07.04.09.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 09:27:08 -0700 (PDT) Date: Tue, 4 Jul 2023 16:27:04 +0000 From: Mostafa Saleh To: Sudeep Holla Cc: maz@kernel.org, oliver.upton@linux.dev, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, tabba@google.com, qperret@google.com, will@kernel.org, catalin.marinas@arm.com, yuzenghui@huawei.com, suzuki.poulose@arm.com, james.morse@arm.com, bgardon@google.com, gshan@redhat.com Subject: Re: [PATCH v3] KVM: arm64: Use BTI for nvhe Message-ID: References: <20230530150845.2856828-1-smostafa@google.com> <20230704134136.a5znw4jupt5yp5kg@bogus> <20230704143339.cqrvntq7rmmb2on3@bogus> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230704143339.cqrvntq7rmmb2on3@bogus> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230704_092711_043189_00F795D9 X-CRM114-Status: GOOD ( 47.07 ) 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 SGkgU3VkZWVwLAoKT24gVHVlLCBKdWwgMDQsIDIwMjMgYXQgMDM6MzM6MzlQTSArMDEwMCwgU3Vk ZWVwIEhvbGxhIHdyb3RlOgo+IEhpIE1vc3RhZmEsCj4gCj4gT24gVHVlLCBKdWwgMDQsIDIwMjMg YXQgMDI6MTg6MDlQTSArMDAwMCwgTW9zdGFmYSBTYWxlaCB3cm90ZToKPiA+IEhpIFN1ZGVlcCwK PiA+IAo+ID4gT24gVHVlLCBKdWwgMDQsIDIwMjMgYXQgMDI6NDE6MzZQTSArMDEwMCwgU3VkZWVw IEhvbGxhIHdyb3RlOgo+ID4gPiBPbiBUdWUsIE1heSAzMCwgMjAyMyBhdCAwMzowODo0NVBNICsw MDAwLCBNb3N0YWZhIFNhbGVoIHdyb3RlOgo+ID4gPiA+IENPTkZJR19BUk02NF9CVElfS0VSTkVM IGNvbXBpbGVzIHRoZSBrZXJuZWwgdG8gc3VwcG9ydCBBUk12OC41LUJUSS4KPiA+ID4gPiBIb3dl dmVyLCB0aGUgbnZoZSBjb2RlIGRvZXNuJ3QgbWFrZSB1c2Ugb2YgaXQgYXMgaXQgZG9lc24ndCBt YXAgYW55Cj4gPiA+ID4gcGFnZXMgd2l0aCBHdWFyZGVkIFBhZ2UoR1ApIGJpdC4KPiA+ID4gPiAK PiA+ID4gPiBrdm0gcGd0YWJsZSBjb2RlIGlzIG1vZGlmaWVkIHRvIG1hcCBleGVjdXRhYmxlIHBh Z2VzIHdpdGggR1AgYml0Cj4gPiA+ID4gaWYgQlRJIGlzIGVuYWJsZWQgZm9yIHRoZSBrZXJuZWwu Cj4gPiA+ID4gCj4gPiA+ID4gQXQgaHlwIGluaXQsIFNDVExSX0VMMi5CVCBpcyBzZXQgdG8gMSB0 byBtYXRjaCBFTDEgY29uZmlndXJhdGlvbgo+ID4gPiA+IChTQ1RMUl9FTDEuQlQxKSBzZXQgaW4g YnRpX2VuYWJsZSgpLgo+ID4gPiA+IAo+ID4gPiA+IE9uZSBkaWZmZXJlbmNlIGJldHdlZW4ga2Vy bmVsIGFuZCBudmhlIGNvZGUsIGlzIHRoYXQgdGhlIGtlcm5lbCBtYXBzCj4gPiA+ID4gLnRleHQg d2l0aCBHUCB3aGlsZSBudmhlIG1hcHMgYWxsIHRoZSBleGVjdXRhYmxlIHBhZ2VzLCB0aGlzIG1h a2VzCj4gPiA+ID4gbnZoZSBjb2RlIG5lZWQgdG8gZGVhbCB3aXRoIHNwZWNpYWwgaW5pdGlhbGl6 YXRpb24gY29kZSBjb21pbmcgZnJvbQo+ID4gPiA+IG90aGVyIGV4ZWN1dGFibGUgc2VjdGlvbnMg KC5pZG1hcC50ZXh0KS4KPiA+ID4gPiBGb3IgdGhpcyB3ZSBuZWVkIHRvIGFkZCBidGkgaW5zdHJ1 Y3Rpb24gYXQgdGhlIGJlZ2lubmluZyBvZgo+ID4gPiA+IF9fa3ZtX2hhbmRsZV9zdHViX2h2YyBh cyBpdCBjYW4gYmUgY2FsbGVkIGJ5ICBfX2hvc3RfaHZjIHRocm91Z2gKPiA+ID4gPiBicmFuY2gg aW5zdHJ1Y3Rpb24oYnIpIGFuZCB1bmxpa2UgU1lNX0ZVTkNfU1RBUlQsIFNZTV9DT0RFX1NUQVJU Cj4gPiA+ID4gZG9lc27igJl0IGFkZCBidGkgaW5zdHJ1Y3Rpb24gYXQgdGhlIGJlZ2lubmluZywg YW5kIGl0IGNhbuKAmXQgYmUgbW9kaWZpZWQKPiA+ID4gPiB0byBhZGQgaXQgYXMgaXQgaXMgdXNl ZCB3aXRoIHZlY3RvciB0YWJsZXMuCj4gPiA+ID4gQW5vdGhlciBzb2x1dGlvbiB3aGljaCBpcyBt b3JlIGludHJ1c2l2ZSBpcyB0byBjb252ZXJ0Cj4gPiA+ID4gX19rdm1faGFuZGxlX3N0dWJfaHZj IHRvIGEgZnVuY3Rpb24gYW5kIGluamVjdCDigJxidGkgamPigJ0gaW5zdGVhZCBvZgo+ID4gPiA+ IOKAnGJ0aSBj4oCdIGluIFNZTV9GVU5DX1NUQVJUCj4gPiA+ID4KPiA+ID4gCj4gPiA+IEkgd2Fz IGNoYXNpbmcgYSBidWcgaW4gbGludXgtbmV4dCB5ZXN0ZXJkYXkgd2l0aCBwcm90ZWN0ZWQgblZI RShwS1ZNKSBhbmQKPiA+ID4gY3B1aWRsZSBlbmFibGVkLiBUaGUgc3lzdGVtIGZhaWxzIHRvIGJv b3QuIEkganVzdCBiaXNlY3RlZCB0aGUgaXNzdWUgdG8gdGhpcwo+ID4gPiBwYXRjaCBhbmQgYWxz byBzYXcgdGhpcyBwYXRjaCBsYW5kZWQgaW4gdGhlIGxpbnVzIHRyZWUgeWVzdGVyZGF5L3RvZGF5 Lgo+ID4gCj4gPiBPbmUgb2YgdGhlIGNoYWxsZW5nZXMgb2YgQlRJIGlzIHRoYXQgd2UgbmVlZCB0 byBhZGQgZXhwbGljaXQgQlRJIGluc3RydWN0aW9ucwo+ID4gZm9yIGFzc2VtYmx5IGNvZGUuIEkg Y2hlY2tlZCB0aGUgY29kZSB0byBtYWtlIHN1cmUgdGhhdCBub3RoaW5nIHdhcyBtaXNzaW5nLAo+ ID4gYnV0IG1heWJlIHRoaXMgaXMgbm90IHRoZSBjYXNlLgo+ID4gQ2FuIHlvdSBwbGVhc2Ugc2hh cmUgbW9yZSBhYm91dCB0aGUgaXNzdWUgKGlzIEVTUiBhIEJyYW5jaCBUYXJnZXQgRXhjZXB0aW9u LAo+ID4gY2FsbCBzdGFjay4uLikgaWYgcG9zc2libGUuCj4gCj4gSSBoYXZlbid0IGRlYnVnZ2Vk IGl0IGFueSBmdXJ0aGVyLCBqdXN0IHJlcG9ydGVkIGl0IGFzIHNvb24gYXMgSSBiaXNlY3RlZCBp dC4KPiBSZXZlcnRpbmcgdGhpcyBnZXQgYmFjayB0aGUgYm9vdGluZyBzeXN0ZW0uIEkgYW0gbm90 IHN1cmUgaWYgYW55dGhpbmcgaXMgZ29pbmcKPiB3cm9uZyB3aGVuIHRoZSBDUFUgaXMgZW50ZXJp bmcgc3VzcGVuZChoaWdobHkgdW5saWtlbHkgaW4gbm9ybWFsIHNjZW5hcmlvIGJ1dAo+IEkgYW0g bm90IHNvIHN1cmUgd2l0aCBwS1ZNIHRyYXBwaW5nIHRoZXNlIFBTQ0kgY2FsbHMgbm93KSBvciB3 aGVuIGl0IGlzIHdva2VuCj4gdXAgYW5kIHJlc3VtaW5nIGJhY2suIElJVUMgdGhpcyBub3cgd2ls bCBoYXBwZW4gdmlhIGt2bV9oeXBfY3B1X3Jlc3VtZS0+Cj4gX19rdm1faHlwX2luaXRfY3B1LT5f X19rdm1faHlwX2luaXQuIAoKVGhhbmtzIGEgbG90IGZvciB0aGUgaW5mb3JtYXRpb24uCgpJIGNo ZWNrZWQgdGhpcyBub3csIGFuZCBJIGJlbGlldmUgSSBmb3VuZCBhbiBpc3N1ZS4gSSBzZWUgdGhh dCBfX2t2bV9oeXBfaW5pdF9jcHUKY2FsbHMga3ZtX2hvc3RfcHNjaV9jcHVfZW50cnkgaW5kaXJl Y3RseSBhbmQgdGhlcmUgaXMgbm8gQlRJIHRoZXJlLgpJIHRoaW5rIHRoaXMgaXMgdGhlIG9ubHkg QyBmdW5jdGlvbiB0aGF0IG5lZWRzIHNwZWNpYWwgaGFuZGxpbmcuCgpDYW4geW91IHBsZWFzZSBj aGVjayBpZiB0aGlzIHNvbHZlcyB0aGUgaXNzdWU/CgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9r dm0vaHlwL252aGUvaG9zdC5TIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvaG9zdC5TCmluZGV4 IGM4N2M2MzEzM2UxMC4uN2RmNjNmMzY0YzNjIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2t2bS9o eXAvbnZoZS9ob3N0LlMKKysrIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvaG9zdC5TCkBAIC0y OTcsMyArMjk3LDggQEAgU1lNX0NPREVfU1RBUlQoX19rdm1faHlwX2hvc3RfZm9yd2FyZF9zbWMp CiAKICAgICAgICByZXQKIFNZTV9DT0RFX0VORChfX2t2bV9oeXBfaG9zdF9mb3J3YXJkX3NtYykK KworU1lNX0NPREVfU1RBUlQoa3ZtX2hvc3RfcHNjaV9jcHVfZW50cnkpCisgICAgICAgYnRpIGoK KyAgICAgICBiIF9fa3ZtX2hvc3RfcHNjaV9jcHVfZW50cnkKK1NZTV9DT0RFX0VORChrdm1faG9z dF9wc2NpX2NwdV9lbnRyeSkKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL3Bz Y2ktcmVsYXkuYyBiL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL3BzY2ktcmVsYXkuYwppbmRleCAw ODUwODc4M2VjM2QuLjI0NTQzZDJhMzQ5MCAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9rdm0vaHlw L252aGUvcHNjaS1yZWxheS5jCisrKyBiL2FyY2gvYXJtNjQva3ZtL2h5cC9udmhlL3BzY2ktcmVs YXkuYwpAQCAtMjAwLDcgKzIwMCw3IEBAIHN0YXRpYyBpbnQgcHNjaV9zeXN0ZW1fc3VzcGVuZCh1 NjQgZnVuY19pZCwgc3RydWN0IGt2bV9jcHVfY29udGV4dCAqaG9zdF9jdHh0KQogICAgICAgICAg ICAgICAgICAgICAgICAgX19oeXBfcGEoaW5pdF9wYXJhbXMpLCAwKTsKIH0KIAotYXNtbGlua2Fn ZSB2b2lkIF9fbm9yZXR1cm4ga3ZtX2hvc3RfcHNjaV9jcHVfZW50cnkoYm9vbCBpc19jcHVfb24p Cithc21saW5rYWdlIHZvaWQgX19ub3JldHVybiBfX2t2bV9ob3N0X3BzY2lfY3B1X2VudHJ5KGJv b2wgaXNfY3B1X29uKQogewogICAgICAgIHN0cnVjdCBwc2NpX2Jvb3RfYXJncyAqYm9vdF9hcmdz OwogICAgICAgIHN0cnVjdCBrdm1fY3B1X2NvbnRleHQgKmhvc3RfY3R4dDsKCgo+ID4gQWxzbywg aXMgdGhpcyB3aXRoIENPTkZJR19BUk1fUFNDSV9DUFVJRExFPwo+IAo+IFllcywgYmFzaWNhbGx5 IHRoZSBjcHVzIGNhbiBlbnRlciBjcHVfc3VzcGVuZCB3aGljaCBJSVVDIHBLVk0gdHJhcHMgYW5k Cj4gaGFuZGxlIGZvciB0aGUgaG9zdC4KCk15IGN1cnJlbnQgc2V0dXAgaGFzIG5vIENPTkZJR19B Uk1fUFNDSV9DUFVJRExFPywgSSB3aWxsIHRyeSB0byBmaW5kCnNvbWV0aGluZyBJIGNhbiB0ZXN0 IHdpdGguCgo+ID4gCj4gPiA+IE5vdCBzdXJlIGlmIHRoaXMgaXMgc29tZXRoaW5nIHRvIGRvIHdp dGggdGhlIGZhY3QgdGhhdCBwS1ZNIHNraXBzIHRvCj4gPiA+IF9fa3ZtX2hhbmRsZV9zdHViX2h2 YyBpbiBfX2hvc3RfaHZjLgo+IAo+IFNvcnJ5LCBteSBiYWQuIEkgbWVhbnQgcEtWTSBza2lwcyBj YWxsaW5nIF9fa3ZtX2hhbmRsZV9zdHViX2h2YyBpbiBfX2hvc3RfaHZjCj4gYW5kIGp1bXBzIHRv IF9faG9zdF9leGl0IGRpcmVjdGx5LiBTb3JyeSBmb3IgdGhhdCwgb25lIHdyb25nICJ0byIgY2hh bmdlZCB0aGUKPiB3aG9sZSBtZWFuaW5nLgoKSSBkb24ndCBzZWUgYW4gaXNzdWUgaW4gdGhpcywg YXMgdGhpcyBwYXRoIGhhcyBubyBpbmRpcmVjdCBicmFuY2hlcy4KCj4gPiBfX2t2bV9oYW5kbGVf c3R1Yl9odmMgaXMgY2FsbGVkIGZyb20gX19ob3N0X2h2YyB3aXRoICJiciB4NSIKPiA+IFRoYXQn cyB3aHkgImJ0aSBqIiB3YXMgYWRkZWQgYXQgdGhlIGJlZ2lubmluZyBvZiBfX2t2bV9oYW5kbGVf c3R1Yl9odmMsCj4gPiBzbyB0aGlzIHNob3VsZCBiZSBmaW5lLgo+ID4KPiAKPiBZZXMgSSBzYXcg dGhhdCBhbmQgdW5kZXJzdG9vZCB0aGF0IGJ1dCBJIHdhbnRlZCB0byB0ZWxsIHRoZSBhYm92ZSB3 aGljaCB3ZW50Cj4gaG9ycmlibHkgd3JvbmcgYmVmb3JlLgo+IAoKVGhhbmtzLApNb3N0YWZhCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0t a2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcK aHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2Vy bmVsCg==