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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA997C4649B for ; Fri, 5 Jul 2019 15:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE20321721 for ; Fri, 5 Jul 2019 15:28:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727266AbfGEP2k (ORCPT ); Fri, 5 Jul 2019 11:28:40 -0400 Received: from foss.arm.com ([217.140.110.172]:42056 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725497AbfGEP2k (ORCPT ); Fri, 5 Jul 2019 11:28:40 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8141328; Fri, 5 Jul 2019 08:28:39 -0700 (PDT) Received: from [10.1.31.185] (e121566-lin.cambridge.arm.com [10.1.31.185]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 125AA3F246; Fri, 5 Jul 2019 08:28:37 -0700 (PDT) Subject: Re: [PATCH 39/59] KVM: arm64: nv: Move last_vcpu_ran to be per s2 mmu To: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Andre Przywara , Dave Martin References: <20190621093843.220980-1-marc.zyngier@arm.com> <20190621093843.220980-40-marc.zyngier@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 5 Jul 2019 16:28:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190621093843.220980-40-marc.zyngier@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 6/21/19 10:38 AM, Marc Zyngier wrote: > last_vcpu_ran has to be per s2 mmu now that we can have multiple S2 > per VM. Let's take this opportunity to perform some cleanup. > > Signed-off-by: Marc Zyngier > --- > arch/arm/include/asm/kvm_host.h | 6 +++--- > arch/arm/include/asm/kvm_mmu.h | 2 +- > arch/arm64/include/asm/kvm_host.h | 6 +++--- > arch/arm64/include/asm/kvm_mmu.h | 2 +- > arch/arm64/kvm/nested.c | 13 ++++++------- > virt/kvm/arm/arm.c | 22 ++++------------------ > virt/kvm/arm/mmu.c | 26 ++++++++++++++++++++------ > 7 files changed, 38 insertions(+), 39 deletions(-) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index b821eb2383ad..cc761610e41e 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -63,15 +63,15 @@ struct kvm_s2_mmu { > pgd_t *pgd; > phys_addr_t pgd_phys; > > + /* The last vcpu id that ran on each physical CPU */ > + int __percpu *last_vcpu_ran; > + > struct kvm *kvm; > }; > > struct kvm_arch { > struct kvm_s2_mmu mmu; > > - /* The last vcpu id that ran on each physical CPU */ > - int __percpu *last_vcpu_ran; > - > /* Stage-2 page table */ > pgd_t *pgd; > phys_addr_t pgd_phys; > diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h > index afabf1fd1d17..7a6e9008ed45 100644 > --- a/arch/arm/include/asm/kvm_mmu.h > +++ b/arch/arm/include/asm/kvm_mmu.h > @@ -52,7 +52,7 @@ int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size, > void free_hyp_pgds(void); > > void stage2_unmap_vm(struct kvm *kvm); > -int kvm_alloc_stage2_pgd(struct kvm_s2_mmu *mmu); > +int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu); > void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu); > int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, > phys_addr_t pa, unsigned long size, bool writable); > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index cc238de170d2..b71a7a237f95 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -104,6 +104,9 @@ struct kvm_s2_mmu { > * >0: Somebody is actively using this. > */ > atomic_t refcnt; > + > + /* The last vcpu id that ran on each physical CPU */ > + int __percpu *last_vcpu_ran; > }; > > static inline bool kvm_s2_mmu_valid(struct kvm_s2_mmu *mmu) > @@ -124,9 +127,6 @@ struct kvm_arch { > /* VTCR_EL2 value for this VM */ > u64 vtcr; > > - /* The last vcpu id that ran on each physical CPU */ > - int __percpu *last_vcpu_ran; > - > /* The maximum number of vCPUs depends on the used GIC model */ > int max_vcpus; > > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h > index f4c5ac5eb95f..53103607065a 100644 > --- a/arch/arm64/include/asm/kvm_mmu.h > +++ b/arch/arm64/include/asm/kvm_mmu.h > @@ -169,7 +169,7 @@ void free_hyp_pgds(void); > > void kvm_unmap_stage2_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size); > void stage2_unmap_vm(struct kvm *kvm); > -int kvm_alloc_stage2_pgd(struct kvm_s2_mmu *mmu); > +int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu); > void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu); > int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, > phys_addr_t pa, unsigned long size, bool writable); > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > index 8880033fb6e0..09afafbdc8fe 100644 > --- a/arch/arm64/kvm/nested.c > +++ b/arch/arm64/kvm/nested.c > @@ -52,18 +52,17 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) > GFP_KERNEL | __GFP_ZERO); > > if (tmp) { > - if (tmp != kvm->arch.nested_mmus) > + if (tmp != kvm->arch.nested_mmus) { > kfree(kvm->arch.nested_mmus); > + kvm->arch.nested_mmus = NULL; > + kvm->arch.nested_mmus_size = 0; > + } > > - tmp[num_mmus - 1].kvm = kvm; > - atomic_set(&tmp[num_mmus - 1].refcnt, 0); > - ret = kvm_alloc_stage2_pgd(&tmp[num_mmus - 1]); > + ret = kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 1]); > if (ret) > goto out; > > - tmp[num_mmus - 2].kvm = kvm; > - atomic_set(&tmp[num_mmus - 2].refcnt, 0); > - ret = kvm_alloc_stage2_pgd(&tmp[num_mmus - 2]); > + ret = kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 2]); > if (ret) { > kvm_free_stage2_pgd(&tmp[num_mmus - 1]); > goto out; > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index bcca27d5c481..e8b584b79847 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -99,29 +99,21 @@ void kvm_arch_check_processor_compat(void *rtn) > *(int *)rtn = 0; > } > > - > /** > * kvm_arch_init_vm - initializes a VM data structure > * @kvm: pointer to the KVM struct > */ > int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > { > - int ret, cpu; > + int ret; > > ret = kvm_arm_setup_stage2(kvm, type); > if (ret) > return ret; > > - kvm->arch.last_vcpu_ran = alloc_percpu(typeof(*kvm->arch.last_vcpu_ran)); > - if (!kvm->arch.last_vcpu_ran) > - return -ENOMEM; > - > - for_each_possible_cpu(cpu) > - *per_cpu_ptr(kvm->arch.last_vcpu_ran, cpu) = -1; > - > - ret = kvm_alloc_stage2_pgd(&kvm->arch.mmu); > + ret = kvm_init_stage2_mmu(kvm, &kvm->arch.mmu); > if (ret) > - goto out_fail_alloc; > + return ret; > > /* Mark the initial VMID generation invalid */ > kvm->arch.mmu.vmid.vmid_gen = 0; More context:  int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)  { -    int ret, cpu; +    int ret;        ret = kvm_arm_setup_stage2(kvm, type);      if (ret)          return ret;   -    kvm->arch.last_vcpu_ran = alloc_percpu(typeof(*kvm->arch.last_vcpu_ran)); -    if (!kvm->arch.last_vcpu_ran) -        return -ENOMEM; - -    for_each_possible_cpu(cpu) -        *per_cpu_ptr(kvm->arch.last_vcpu_ran, cpu) = -1; - -    ret = kvm_alloc_stage2_pgd(&kvm->arch.mmu); +    ret = kvm_init_stage2_mmu(kvm, &kvm->arch.mmu);      if (ret) -        goto out_fail_alloc; +        return ret;        /* Mark the initial VMID generation invalid */      kvm->arch.mmu.vmid.vmid_gen = 0;      kvm->arch.mmu.kvm = kvm;   kvm_init_stage2_mmu already sets vmid_gen and kvm. > @@ -142,9 +134,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > return ret; > out_free_stage2_pgd: > kvm_free_stage2_pgd(&kvm->arch.mmu); > -out_fail_alloc: > - free_percpu(kvm->arch.last_vcpu_ran); > - kvm->arch.last_vcpu_ran = NULL; > return ret; > } > > @@ -174,9 +163,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm) > > kvm_vgic_destroy(kvm); > > - free_percpu(kvm->arch.last_vcpu_ran); > - kvm->arch.last_vcpu_ran = NULL; > - > for (i = 0; i < KVM_MAX_VCPUS; ++i) { > if (kvm->vcpus[i]) { > kvm_arch_vcpu_free(kvm->vcpus[i]); > @@ -359,7 +345,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) > if (nested_virt_in_use(vcpu)) > kvm_vcpu_load_hw_mmu(vcpu); > > - last_ran = this_cpu_ptr(vcpu->kvm->arch.last_vcpu_ran); > + last_ran = this_cpu_ptr(vcpu->arch.hw_mmu->last_vcpu_ran); > cpu_data = this_cpu_ptr(&kvm_host_data); > > /* > diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c > index 94d400e7af57..6a7cba077bce 100644 > --- a/virt/kvm/arm/mmu.c > +++ b/virt/kvm/arm/mmu.c > @@ -903,8 +903,9 @@ int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size, > } > > /** > - * kvm_alloc_stage2_pgd - allocate level-1 table for stage-2 translation. > - * @mmu: The stage 2 mmu struct pointer > + * kvm_init_stage2_mmu - Initialise a S2 MMU strucrure > + * @kvm: The pointer to the KVM structure > + * @mmu: The pointer to the s2 MMU structure > * > * Allocates only the stage-2 HW PGD level table(s) of size defined by > * stage2_pgd_size(mmu->kvm). > @@ -912,10 +913,11 @@ int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size, > * Note we don't need locking here as this is only called when the VM is > * created, which can only be done once. > */ > -int kvm_alloc_stage2_pgd(struct kvm_s2_mmu *mmu) > +int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu) > { > phys_addr_t pgd_phys; > pgd_t *pgd; > + int cpu; > > if (mmu->pgd != NULL) { > kvm_err("kvm_arch already initialized?\n"); > @@ -923,18 +925,28 @@ int kvm_alloc_stage2_pgd(struct kvm_s2_mmu *mmu) > } > > /* Allocate the HW PGD, making sure that each page gets its own refcount */ > - pgd = alloc_pages_exact(stage2_pgd_size(mmu->kvm), GFP_KERNEL | __GFP_ZERO); > + pgd = alloc_pages_exact(stage2_pgd_size(kvm), GFP_KERNEL | __GFP_ZERO); > if (!pgd) > return -ENOMEM; > > pgd_phys = virt_to_phys(pgd); > - if (WARN_ON(pgd_phys & ~kvm_vttbr_baddr_mask(mmu->kvm))) > + if (WARN_ON(pgd_phys & ~kvm_vttbr_baddr_mask(kvm))) > return -EINVAL; > > + mmu->last_vcpu_ran = alloc_percpu(typeof(*mmu->last_vcpu_ran)); > + if (!mmu->last_vcpu_ran) { > + free_pages_exact(pgd, stage2_pgd_size(kvm)); > + return -ENOMEM; > + } > + > + mmu->kvm = kvm; > mmu->pgd = pgd; > mmu->pgd_phys = pgd_phys; > mmu->vmid.vmid_gen = 0; > > + for_each_possible_cpu(cpu) > + *per_cpu_ptr(mmu->last_vcpu_ran, cpu) = -1; > + > kvm_init_s2_mmu(mmu); > > return 0; > @@ -1021,8 +1033,10 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) > spin_unlock(&kvm->mmu_lock); > > /* Free the HW pgd, one page at a time */ last_vcpu_ran too. > - if (pgd) > + if (pgd) { > free_pages_exact(pgd, stage2_pgd_size(kvm)); > + free_percpu(mmu->last_vcpu_ran); > + } > } > > static pud_t *stage2_get_pud(struct kvm_s2_mmu *mmu, struct kvm_mmu_memory_cache *cache, 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 X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF5F9C4649B for ; Fri, 5 Jul 2019 15:28:45 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 807DD21721 for ; Fri, 5 Jul 2019 15:28:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 807DD21721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DDD984A4F5; Fri, 5 Jul 2019 11:28:44 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1jPkMQVtnU7y; Fri, 5 Jul 2019 11:28:43 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 4AD434A479; Fri, 5 Jul 2019 11:28:43 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E42E94A4C1 for ; Fri, 5 Jul 2019 11:28:41 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DBfyJEuB1ACu for ; Fri, 5 Jul 2019 11:28:40 -0400 (EDT) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 248824A4C0 for ; Fri, 5 Jul 2019 11:28:40 -0400 (EDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8141328; Fri, 5 Jul 2019 08:28:39 -0700 (PDT) Received: from [10.1.31.185] (e121566-lin.cambridge.arm.com [10.1.31.185]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 125AA3F246; Fri, 5 Jul 2019 08:28:37 -0700 (PDT) Subject: Re: [PATCH 39/59] KVM: arm64: nv: Move last_vcpu_ran to be per s2 mmu To: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org References: <20190621093843.220980-1-marc.zyngier@arm.com> <20190621093843.220980-40-marc.zyngier@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 5 Jul 2019 16:28:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190621093843.220980-40-marc.zyngier@arm.com> Content-Language: en-US Cc: Andre Przywara , Dave Martin X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu T24gNi8yMS8xOSAxMDozOCBBTSwgTWFyYyBaeW5naWVyIHdyb3RlOgo+IGxhc3RfdmNwdV9yYW4g aGFzIHRvIGJlIHBlciBzMiBtbXUgbm93IHRoYXQgd2UgY2FuIGhhdmUgbXVsdGlwbGUgUzIKPiBw ZXIgVk0uIExldCdzIHRha2UgdGhpcyBvcHBvcnR1bml0eSB0byBwZXJmb3JtIHNvbWUgY2xlYW51 cC4KPgo+IFNpZ25lZC1vZmYtYnk6IE1hcmMgWnluZ2llciA8bWFyYy56eW5naWVyQGFybS5jb20+ Cj4gLS0tCj4gIGFyY2gvYXJtL2luY2x1ZGUvYXNtL2t2bV9ob3N0LmggICB8ICA2ICsrKy0tLQo+ ICBhcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1fbW11LmggICAgfCAgMiArLQo+ICBhcmNoL2FybTY0 L2luY2x1ZGUvYXNtL2t2bV9ob3N0LmggfCAgNiArKystLS0KPiAgYXJjaC9hcm02NC9pbmNsdWRl L2FzbS9rdm1fbW11LmggIHwgIDIgKy0KPiAgYXJjaC9hcm02NC9rdm0vbmVzdGVkLmMgICAgICAg ICAgIHwgMTMgKysrKysrLS0tLS0tLQo+ICB2aXJ0L2t2bS9hcm0vYXJtLmMgICAgICAgICAgICAg ICAgfCAyMiArKysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gIHZpcnQva3ZtL2FybS9tbXUuYyAgICAg ICAgICAgICAgICB8IDI2ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tCj4gIDcgZmlsZXMgY2hh bmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX2hvc3QuaCBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2t2 bV9ob3N0LmgKPiBpbmRleCBiODIxZWIyMzgzYWQuLmNjNzYxNjEwZTQxZSAxMDA2NDQKPiAtLS0g YS9hcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4gKysrIGIvYXJjaC9hcm0vaW5jbHVk ZS9hc20va3ZtX2hvc3QuaAo+IEBAIC02MywxNSArNjMsMTUgQEAgc3RydWN0IGt2bV9zMl9tbXUg ewo+ICAJcGdkX3QgKnBnZDsKPiAgCXBoeXNfYWRkcl90IHBnZF9waHlzOwo+ICAKPiArCS8qIFRo ZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiArCWludCBf X3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiArCj4gIAlzdHJ1Y3Qga3ZtICprdm07Cj4gIH07Cj4g IAo+ICBzdHJ1Y3Qga3ZtX2FyY2ggewo+ICAJc3RydWN0IGt2bV9zMl9tbXUgbW11Owo+ICAKPiAt CS8qIFRoZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiAt CWludCBfX3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAtCj4gIAkvKiBTdGFnZS0yIHBhZ2UgdGFi bGUgKi8KPiAgCXBnZF90ICpwZ2Q7Cj4gIAlwaHlzX2FkZHJfdCBwZ2RfcGh5czsKPiBkaWZmIC0t Z2l0IGEvYXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX21tdS5oIGIvYXJjaC9hcm0vaW5jbHVkZS9h c20va3ZtX21tdS5oCj4gaW5kZXggYWZhYmYxZmQxZDE3Li43YTZlOTAwOGVkNDUgMTAwNjQ0Cj4g LS0tIGEvYXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX21tdS5oCj4gKysrIGIvYXJjaC9hcm0vaW5j bHVkZS9hc20va3ZtX21tdS5oCj4gQEAgLTUyLDcgKzUyLDcgQEAgaW50IGNyZWF0ZV9oeXBfZXhl Y19tYXBwaW5ncyhwaHlzX2FkZHJfdCBwaHlzX2FkZHIsIHNpemVfdCBzaXplLAo+ICB2b2lkIGZy ZWVfaHlwX3BnZHModm9pZCk7Cj4gIAo+ICB2b2lkIHN0YWdlMl91bm1hcF92bShzdHJ1Y3Qga3Zt ICprdm0pOwo+IC1pbnQga3ZtX2FsbG9jX3N0YWdlMl9wZ2Qoc3RydWN0IGt2bV9zMl9tbXUgKm1t dSk7Cj4gK2ludCBrdm1faW5pdF9zdGFnZTJfbW11KHN0cnVjdCBrdm0gKmt2bSwgc3RydWN0IGt2 bV9zMl9tbXUgKm1tdSk7Cj4gIHZvaWQga3ZtX2ZyZWVfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3My X21tdSAqbW11KTsKPiAgaW50IGt2bV9waHlzX2FkZHJfaW9yZW1hcChzdHJ1Y3Qga3ZtICprdm0s IHBoeXNfYWRkcl90IGd1ZXN0X2lwYSwKPiAgCQkJICBwaHlzX2FkZHJfdCBwYSwgdW5zaWduZWQg bG9uZyBzaXplLCBib29sIHdyaXRhYmxlKTsKPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9pbmNs dWRlL2FzbS9rdm1faG9zdC5oIGIvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4g aW5kZXggY2MyMzhkZTE3MGQyLi5iNzFhN2EyMzdmOTUgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm02 NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4gKysrIGIvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9r dm1faG9zdC5oCj4gQEAgLTEwNCw2ICsxMDQsOSBAQCBzdHJ1Y3Qga3ZtX3MyX21tdSB7Cj4gIAkg KiA+MDogU29tZWJvZHkgaXMgYWN0aXZlbHkgdXNpbmcgdGhpcy4KPiAgCSAqLwo+ICAJYXRvbWlj X3QgcmVmY250Owo+ICsKPiArCS8qIFRoZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBw aHlzaWNhbCBDUFUgKi8KPiArCWludCBfX3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAgfTsKPiAg Cj4gIHN0YXRpYyBpbmxpbmUgYm9vbCBrdm1fczJfbW11X3ZhbGlkKHN0cnVjdCBrdm1fczJfbW11 ICptbXUpCj4gQEAgLTEyNCw5ICsxMjcsNiBAQCBzdHJ1Y3Qga3ZtX2FyY2ggewo+ICAJLyogVlRD Ul9FTDIgdmFsdWUgZm9yIHRoaXMgVk0gKi8KPiAgCXU2NCAgICB2dGNyOwo+ICAKPiAtCS8qIFRo ZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiAtCWludCBf X3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAtCj4gIAkvKiBUaGUgbWF4aW11bSBudW1iZXIgb2Yg dkNQVXMgZGVwZW5kcyBvbiB0aGUgdXNlZCBHSUMgbW9kZWwgKi8KPiAgCWludCBtYXhfdmNwdXM7 Cj4gIAo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2luY2x1ZGUvYXNtL2t2bV9tbXUuaCBiL2Fy Y2gvYXJtNjQvaW5jbHVkZS9hc20va3ZtX21tdS5oCj4gaW5kZXggZjRjNWFjNWViOTVmLi41MzEw MzYwNzA2NWEgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1fbW11LmgK PiArKysgYi9hcmNoL2FybTY0L2luY2x1ZGUvYXNtL2t2bV9tbXUuaAo+IEBAIC0xNjksNyArMTY5 LDcgQEAgdm9pZCBmcmVlX2h5cF9wZ2RzKHZvaWQpOwo+ICAKPiAgdm9pZCBrdm1fdW5tYXBfc3Rh Z2UyX3JhbmdlKHN0cnVjdCBrdm1fczJfbW11ICptbXUsIHBoeXNfYWRkcl90IHN0YXJ0LCB1NjQg c2l6ZSk7Cj4gIHZvaWQgc3RhZ2UyX3VubWFwX3ZtKHN0cnVjdCBrdm0gKmt2bSk7Cj4gLWludCBr dm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KTsKPiAraW50IGt2bV9p bml0X3N0YWdlMl9tbXUoc3RydWN0IGt2bSAqa3ZtLCBzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KTsK PiAgdm9pZCBrdm1fZnJlZV9zdGFnZTJfcGdkKHN0cnVjdCBrdm1fczJfbW11ICptbXUpOwo+ICBp bnQga3ZtX3BoeXNfYWRkcl9pb3JlbWFwKHN0cnVjdCBrdm0gKmt2bSwgcGh5c19hZGRyX3QgZ3Vl c3RfaXBhLAo+ICAJCQkgIHBoeXNfYWRkcl90IHBhLCB1bnNpZ25lZCBsb25nIHNpemUsIGJvb2wg d3JpdGFibGUpOwo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9uZXN0ZWQuYyBiL2FyY2gv YXJtNjQva3ZtL25lc3RlZC5jCj4gaW5kZXggODg4MDAzM2ZiNmUwLi4wOWFmYWZiZGM4ZmUgMTAw NjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9rdm0vbmVzdGVkLmMKPiArKysgYi9hcmNoL2FybTY0L2t2 bS9uZXN0ZWQuYwo+IEBAIC01MiwxOCArNTIsMTcgQEAgaW50IGt2bV92Y3B1X2luaXRfbmVzdGVk KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkKPiAgCQkJIEdGUF9LRVJORUwgfCBfX0dGUF9aRVJPKTsK PiAgCj4gIAlpZiAodG1wKSB7Cj4gLQkJaWYgKHRtcCAhPSBrdm0tPmFyY2gubmVzdGVkX21tdXMp Cj4gKwkJaWYgKHRtcCAhPSBrdm0tPmFyY2gubmVzdGVkX21tdXMpIHsKPiAgCQkJa2ZyZWUoa3Zt LT5hcmNoLm5lc3RlZF9tbXVzKTsKPiArCQkJa3ZtLT5hcmNoLm5lc3RlZF9tbXVzID0gTlVMTDsK PiArCQkJa3ZtLT5hcmNoLm5lc3RlZF9tbXVzX3NpemUgPSAwOwo+ICsJCX0KPiAgCj4gLQkJdG1w W251bV9tbXVzIC0gMV0ua3ZtID0ga3ZtOwo+IC0JCWF0b21pY19zZXQoJnRtcFtudW1fbW11cyAt IDFdLnJlZmNudCwgMCk7Cj4gLQkJcmV0ID0ga3ZtX2FsbG9jX3N0YWdlMl9wZ2QoJnRtcFtudW1f bW11cyAtIDFdKTsKPiArCQlyZXQgPSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJnRtcFtudW1f bW11cyAtIDFdKTsKPiAgCQlpZiAocmV0KQo+ICAJCQlnb3RvIG91dDsKPiAgCj4gLQkJdG1wW251 bV9tbXVzIC0gMl0ua3ZtID0ga3ZtOwo+IC0JCWF0b21pY19zZXQoJnRtcFtudW1fbW11cyAtIDJd LnJlZmNudCwgMCk7Cj4gLQkJcmV0ID0ga3ZtX2FsbG9jX3N0YWdlMl9wZ2QoJnRtcFtudW1fbW11 cyAtIDJdKTsKPiArCQlyZXQgPSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJnRtcFtudW1fbW11 cyAtIDJdKTsKPiAgCQlpZiAocmV0KSB7Cj4gIAkJCWt2bV9mcmVlX3N0YWdlMl9wZ2QoJnRtcFtu dW1fbW11cyAtIDFdKTsKPiAgCQkJZ290byBvdXQ7Cj4gZGlmZiAtLWdpdCBhL3ZpcnQva3ZtL2Fy bS9hcm0uYyBiL3ZpcnQva3ZtL2FybS9hcm0uYwo+IGluZGV4IGJjY2EyN2Q1YzQ4MS4uZThiNTg0 Yjc5ODQ3IDEwMDY0NAo+IC0tLSBhL3ZpcnQva3ZtL2FybS9hcm0uYwo+ICsrKyBiL3ZpcnQva3Zt L2FybS9hcm0uYwo+IEBAIC05OSwyOSArOTksMjEgQEAgdm9pZCBrdm1fYXJjaF9jaGVja19wcm9j ZXNzb3JfY29tcGF0KHZvaWQgKnJ0bikKPiAgCSooaW50ICopcnRuID0gMDsKPiAgfQo+ICAKPiAt Cj4gIC8qKgo+ICAgKiBrdm1fYXJjaF9pbml0X3ZtIC0gaW5pdGlhbGl6ZXMgYSBWTSBkYXRhIHN0 cnVjdHVyZQo+ICAgKiBAa3ZtOglwb2ludGVyIHRvIHRoZSBLVk0gc3RydWN0Cj4gICAqLwo+ICBp bnQga3ZtX2FyY2hfaW5pdF92bShzdHJ1Y3Qga3ZtICprdm0sIHVuc2lnbmVkIGxvbmcgdHlwZSkK PiAgewo+IC0JaW50IHJldCwgY3B1Owo+ICsJaW50IHJldDsKPiAgCj4gIAlyZXQgPSBrdm1fYXJt X3NldHVwX3N0YWdlMihrdm0sIHR5cGUpOwo+ICAJaWYgKHJldCkKPiAgCQlyZXR1cm4gcmV0Owo+ ICAKPiAtCWt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFuID0gYWxsb2NfcGVyY3B1KHR5cGVvZigqa3Zt LT5hcmNoLmxhc3RfdmNwdV9yYW4pKTsKPiAtCWlmICgha3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4p Cj4gLQkJcmV0dXJuIC1FTk9NRU07Cj4gLQo+IC0JZm9yX2VhY2hfcG9zc2libGVfY3B1KGNwdSkK PiAtCQkqcGVyX2NwdV9wdHIoa3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4sIGNwdSkgPSAtMTsKPiAt Cj4gLQlyZXQgPSBrdm1fYWxsb2Nfc3RhZ2UyX3BnZCgma3ZtLT5hcmNoLm1tdSk7Cj4gKwlyZXQg PSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJmt2bS0+YXJjaC5tbXUpOwo+ICAJaWYgKHJldCkK PiAtCQlnb3RvIG91dF9mYWlsX2FsbG9jOwo+ICsJCXJldHVybiByZXQ7Cj4gIAo+ICAJLyogTWFy ayB0aGUgaW5pdGlhbCBWTUlEIGdlbmVyYXRpb24gaW52YWxpZCAqLwo+ICAJa3ZtLT5hcmNoLm1t dS52bWlkLnZtaWRfZ2VuID0gMDsKCk1vcmUgY29udGV4dDoKCsKgaW50IGt2bV9hcmNoX2luaXRf dm0oc3RydWN0IGt2bSAqa3ZtLCB1bnNpZ25lZCBsb25nIHR5cGUpCsKgewotwqDCoMKgIGludCBy ZXQsIGNwdTsKK8KgwqDCoCBpbnQgcmV0OwrCoArCoMKgwqDCoCByZXQgPSBrdm1fYXJtX3NldHVw X3N0YWdlMihrdm0sIHR5cGUpOwrCoMKgwqDCoCBpZiAocmV0KQrCoMKgwqDCoCDCoMKgwqAgcmV0 dXJuIHJldDsKwqAKLcKgwqDCoCBrdm0tPmFyY2gubGFzdF92Y3B1X3JhbiA9IGFsbG9jX3BlcmNw dSh0eXBlb2YoKmt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFuKSk7Ci3CoMKgwqAgaWYgKCFrdm0tPmFy Y2gubGFzdF92Y3B1X3JhbikKLcKgwqDCoCDCoMKgwqAgcmV0dXJuIC1FTk9NRU07Ci0KLcKgwqDC oCBmb3JfZWFjaF9wb3NzaWJsZV9jcHUoY3B1KQotwqDCoMKgIMKgwqDCoCAqcGVyX2NwdV9wdHIo a3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4sIGNwdSkgPSAtMTsKLQotwqDCoMKgIHJldCA9IGt2bV9h bGxvY19zdGFnZTJfcGdkKCZrdm0tPmFyY2gubW11KTsKK8KgwqDCoCByZXQgPSBrdm1faW5pdF9z dGFnZTJfbW11KGt2bSwgJmt2bS0+YXJjaC5tbXUpOwrCoMKgwqDCoCBpZiAocmV0KQotwqDCoMKg IMKgwqDCoCBnb3RvIG91dF9mYWlsX2FsbG9jOworwqDCoMKgIMKgwqDCoCByZXR1cm4gcmV0OwrC oArCoMKgwqDCoCAvKiBNYXJrIHRoZSBpbml0aWFsIFZNSUQgZ2VuZXJhdGlvbiBpbnZhbGlkICov CsKgwqDCoMKgIGt2bS0+YXJjaC5tbXUudm1pZC52bWlkX2dlbiA9IDA7CsKgwqDCoMKgIGt2bS0+ YXJjaC5tbXUua3ZtID0ga3ZtOwrCoAoKa3ZtX2luaXRfc3RhZ2UyX21tdSBhbHJlYWR5IHNldHMg dm1pZF9nZW4gYW5kIGt2bS4KCj4gQEAgLTE0Miw5ICsxMzQsNiBAQCBpbnQga3ZtX2FyY2hfaW5p dF92bShzdHJ1Y3Qga3ZtICprdm0sIHVuc2lnbmVkIGxvbmcgdHlwZSkKPiAgCXJldHVybiByZXQ7 Cj4gIG91dF9mcmVlX3N0YWdlMl9wZ2Q6Cj4gIAlrdm1fZnJlZV9zdGFnZTJfcGdkKCZrdm0tPmFy Y2gubW11KTsKPiAtb3V0X2ZhaWxfYWxsb2M6Cj4gLQlmcmVlX3BlcmNwdShrdm0tPmFyY2gubGFz dF92Y3B1X3Jhbik7Cj4gLQlrdm0tPmFyY2gubGFzdF92Y3B1X3JhbiA9IE5VTEw7Cj4gIAlyZXR1 cm4gcmV0Owo+ICB9Cj4gIAo+IEBAIC0xNzQsOSArMTYzLDYgQEAgdm9pZCBrdm1fYXJjaF9kZXN0 cm95X3ZtKHN0cnVjdCBrdm0gKmt2bSkKPiAgCj4gIAlrdm1fdmdpY19kZXN0cm95KGt2bSk7Cj4g IAo+IC0JZnJlZV9wZXJjcHUoa3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4pOwo+IC0Ja3ZtLT5hcmNo Lmxhc3RfdmNwdV9yYW4gPSBOVUxMOwo+IC0KPiAgCWZvciAoaSA9IDA7IGkgPCBLVk1fTUFYX1ZD UFVTOyArK2kpIHsKPiAgCQlpZiAoa3ZtLT52Y3B1c1tpXSkgewo+ICAJCQlrdm1fYXJjaF92Y3B1 X2ZyZWUoa3ZtLT52Y3B1c1tpXSk7Cj4gQEAgLTM1OSw3ICszNDUsNyBAQCB2b2lkIGt2bV9hcmNo X3ZjcHVfbG9hZChzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsIGludCBjcHUpCj4gIAlpZiAobmVzdGVk X3ZpcnRfaW5fdXNlKHZjcHUpKQo+ICAJCWt2bV92Y3B1X2xvYWRfaHdfbW11KHZjcHUpOwo+ICAK PiAtCWxhc3RfcmFuID0gdGhpc19jcHVfcHRyKHZjcHUtPmt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFu KTsKPiArCWxhc3RfcmFuID0gdGhpc19jcHVfcHRyKHZjcHUtPmFyY2guaHdfbW11LT5sYXN0X3Zj cHVfcmFuKTsKPiAgCWNwdV9kYXRhID0gdGhpc19jcHVfcHRyKCZrdm1faG9zdF9kYXRhKTsKPiAg Cj4gIAkvKgo+IGRpZmYgLS1naXQgYS92aXJ0L2t2bS9hcm0vbW11LmMgYi92aXJ0L2t2bS9hcm0v bW11LmMKPiBpbmRleCA5NGQ0MDBlN2FmNTcuLjZhN2NiYTA3N2JjZSAxMDA2NDQKPiAtLS0gYS92 aXJ0L2t2bS9hcm0vbW11LmMKPiArKysgYi92aXJ0L2t2bS9hcm0vbW11LmMKPiBAQCAtOTAzLDgg KzkwMyw5IEBAIGludCBjcmVhdGVfaHlwX2V4ZWNfbWFwcGluZ3MocGh5c19hZGRyX3QgcGh5c19h ZGRyLCBzaXplX3Qgc2l6ZSwKPiAgfQo+ICAKPiAgLyoqCj4gLSAqIGt2bV9hbGxvY19zdGFnZTJf cGdkIC0gYWxsb2NhdGUgbGV2ZWwtMSB0YWJsZSBmb3Igc3RhZ2UtMiB0cmFuc2xhdGlvbi4KPiAt ICogQG1tdToJVGhlIHN0YWdlIDIgbW11IHN0cnVjdCBwb2ludGVyCj4gKyAqIGt2bV9pbml0X3N0 YWdlMl9tbXUgLSBJbml0aWFsaXNlIGEgUzIgTU1VIHN0cnVjcnVyZQo+ICsgKiBAa3ZtOglUaGUg cG9pbnRlciB0byB0aGUgS1ZNIHN0cnVjdHVyZQo+ICsgKiBAbW11OglUaGUgcG9pbnRlciB0byB0 aGUgczIgTU1VIHN0cnVjdHVyZQo+ICAgKgo+ICAgKiBBbGxvY2F0ZXMgb25seSB0aGUgc3RhZ2Ut MiBIVyBQR0QgbGV2ZWwgdGFibGUocykgb2Ygc2l6ZSBkZWZpbmVkIGJ5Cj4gICAqIHN0YWdlMl9w Z2Rfc2l6ZShtbXUtPmt2bSkuCj4gQEAgLTkxMiwxMCArOTEzLDExIEBAIGludCBjcmVhdGVfaHlw X2V4ZWNfbWFwcGluZ3MocGh5c19hZGRyX3QgcGh5c19hZGRyLCBzaXplX3Qgc2l6ZSwKPiAgICog Tm90ZSB3ZSBkb24ndCBuZWVkIGxvY2tpbmcgaGVyZSBhcyB0aGlzIGlzIG9ubHkgY2FsbGVkIHdo ZW4gdGhlIFZNIGlzCj4gICAqIGNyZWF0ZWQsIHdoaWNoIGNhbiBvbmx5IGJlIGRvbmUgb25jZS4K PiAgICovCj4gLWludCBrdm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11 KQo+ICtpbnQga3ZtX2luaXRfc3RhZ2UyX21tdShzdHJ1Y3Qga3ZtICprdm0sIHN0cnVjdCBrdm1f czJfbW11ICptbXUpCj4gIHsKPiAgCXBoeXNfYWRkcl90IHBnZF9waHlzOwo+ICAJcGdkX3QgKnBn ZDsKPiArCWludCBjcHU7Cj4gIAo+ICAJaWYgKG1tdS0+cGdkICE9IE5VTEwpIHsKPiAgCQlrdm1f ZXJyKCJrdm1fYXJjaCBhbHJlYWR5IGluaXRpYWxpemVkP1xuIik7Cj4gQEAgLTkyMywxOCArOTI1 LDI4IEBAIGludCBrdm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KQo+ ICAJfQo+ICAKPiAgCS8qIEFsbG9jYXRlIHRoZSBIVyBQR0QsIG1ha2luZyBzdXJlIHRoYXQgZWFj aCBwYWdlIGdldHMgaXRzIG93biByZWZjb3VudCAqLwo+IC0JcGdkID0gYWxsb2NfcGFnZXNfZXhh Y3Qoc3RhZ2UyX3BnZF9zaXplKG1tdS0+a3ZtKSwgR0ZQX0tFUk5FTCB8IF9fR0ZQX1pFUk8pOwo+ ICsJcGdkID0gYWxsb2NfcGFnZXNfZXhhY3Qoc3RhZ2UyX3BnZF9zaXplKGt2bSksIEdGUF9LRVJO RUwgfCBfX0dGUF9aRVJPKTsKPiAgCWlmICghcGdkKQo+ICAJCXJldHVybiAtRU5PTUVNOwo+ICAK PiAgCXBnZF9waHlzID0gdmlydF90b19waHlzKHBnZCk7Cj4gLQlpZiAoV0FSTl9PTihwZ2RfcGh5 cyAmIH5rdm1fdnR0YnJfYmFkZHJfbWFzayhtbXUtPmt2bSkpKQo+ICsJaWYgKFdBUk5fT04ocGdk X3BoeXMgJiB+a3ZtX3Z0dGJyX2JhZGRyX21hc2soa3ZtKSkpCj4gIAkJcmV0dXJuIC1FSU5WQUw7 Cj4gIAo+ICsJbW11LT5sYXN0X3ZjcHVfcmFuID0gYWxsb2NfcGVyY3B1KHR5cGVvZigqbW11LT5s YXN0X3ZjcHVfcmFuKSk7Cj4gKwlpZiAoIW1tdS0+bGFzdF92Y3B1X3Jhbikgewo+ICsJCWZyZWVf cGFnZXNfZXhhY3QocGdkLCBzdGFnZTJfcGdkX3NpemUoa3ZtKSk7Cj4gKwkJcmV0dXJuIC1FTk9N RU07Cj4gKwl9Cj4gKwo+ICsJbW11LT5rdm0gPSBrdm07Cj4gIAltbXUtPnBnZCA9IHBnZDsKPiAg CW1tdS0+cGdkX3BoeXMgPSBwZ2RfcGh5czsKPiAgCW1tdS0+dm1pZC52bWlkX2dlbiA9IDA7Cj4g IAo+ICsJZm9yX2VhY2hfcG9zc2libGVfY3B1KGNwdSkKPiArCQkqcGVyX2NwdV9wdHIobW11LT5s YXN0X3ZjcHVfcmFuLCBjcHUpID0gLTE7Cj4gKwo+ICAJa3ZtX2luaXRfczJfbW11KG1tdSk7Cj4g IAo+ICAJcmV0dXJuIDA7Cj4gQEAgLTEwMjEsOCArMTAzMywxMCBAQCB2b2lkIGt2bV9mcmVlX3N0 YWdlMl9wZ2Qoc3RydWN0IGt2bV9zMl9tbXUgKm1tdSkKPiAgCXNwaW5fdW5sb2NrKCZrdm0tPm1t dV9sb2NrKTsKPiAgCj4gIAkvKiBGcmVlIHRoZSBIVyBwZ2QsIG9uZSBwYWdlIGF0IGEgdGltZSAq LwoKbGFzdF92Y3B1X3JhbiB0b28uCgo+IC0JaWYgKHBnZCkKPiArCWlmIChwZ2QpIHsKPiAgCQlm cmVlX3BhZ2VzX2V4YWN0KHBnZCwgc3RhZ2UyX3BnZF9zaXplKGt2bSkpOwo+ICsJCWZyZWVfcGVy Y3B1KG1tdS0+bGFzdF92Y3B1X3Jhbik7Cj4gKwl9Cj4gIH0KPiAgCj4gIHN0YXRpYyBwdWRfdCAq c3RhZ2UyX2dldF9wdWQoc3RydWN0IGt2bV9zMl9tbXUgKm1tdSwgc3RydWN0IGt2bV9tbXVfbWVt b3J5X2NhY2hlICpjYWNoZSwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18Ka3ZtYXJtIG1haWxpbmcgbGlzdAprdm1hcm1AbGlzdHMuY3MuY29sdW1iaWEuZWR1 Cmh0dHBzOi8vbGlzdHMuY3MuY29sdW1iaWEuZWR1L21haWxtYW4vbGlzdGluZm8va3ZtYXJtCg== 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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AD29C46499 for ; Fri, 5 Jul 2019 15:28:52 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5C9C721721 for ; Fri, 5 Jul 2019 15:28:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j5BvtuWB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C9C721721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Cd0Qf0CxzJiRN3mQ1IlJvCg3dVg1lDwv64BbKNE0VIc=; b=j5BvtuWBDHLe7q 1SNsJmsmGbJgLTm088gaAlMibeYv1fR0egeyTqGJvjgt4y/fXND/RFPB0OVa0euA/Uz3ZR6rq/9UU YQvrxFQIR1ZqusTXeUcCoKf4rtDpPy1pXp4Wptepf7TzMIIFI6sF+ivAnpSY83zqcOQO877VMEUTE KXzWesMHFiiaLCZa1Pjd8d0+1POVLTgQI5purKysDHmRyY66iuUWN93Otw1PVF3xRdzTbfXQaCB8b 5Pte0WVzIc4YOcMq+2QVDqdMB9+AYdQVM94tJNQzEUnYmUUF/wcJi+2tk78W2CdkxO1ufZIP9WBUA GW4LvSU9AIA3OPYghsXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hjQ8j-0007qF-Fz; Fri, 05 Jul 2019 15:28:45 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hjQ8f-0007oi-69 for linux-arm-kernel@lists.infradead.org; Fri, 05 Jul 2019 15:28:42 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8141328; Fri, 5 Jul 2019 08:28:39 -0700 (PDT) Received: from [10.1.31.185] (e121566-lin.cambridge.arm.com [10.1.31.185]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 125AA3F246; Fri, 5 Jul 2019 08:28:37 -0700 (PDT) Subject: Re: [PATCH 39/59] KVM: arm64: nv: Move last_vcpu_ran to be per s2 mmu To: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org References: <20190621093843.220980-1-marc.zyngier@arm.com> <20190621093843.220980-40-marc.zyngier@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 5 Jul 2019 16:28:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190621093843.220980-40-marc.zyngier@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190705_082841_323156_E80C8DE2 X-CRM114-Status: GOOD ( 25.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andre Przywara , Dave Martin Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gNi8yMS8xOSAxMDozOCBBTSwgTWFyYyBaeW5naWVyIHdyb3RlOgo+IGxhc3RfdmNwdV9yYW4g aGFzIHRvIGJlIHBlciBzMiBtbXUgbm93IHRoYXQgd2UgY2FuIGhhdmUgbXVsdGlwbGUgUzIKPiBw ZXIgVk0uIExldCdzIHRha2UgdGhpcyBvcHBvcnR1bml0eSB0byBwZXJmb3JtIHNvbWUgY2xlYW51 cC4KPgo+IFNpZ25lZC1vZmYtYnk6IE1hcmMgWnluZ2llciA8bWFyYy56eW5naWVyQGFybS5jb20+ Cj4gLS0tCj4gIGFyY2gvYXJtL2luY2x1ZGUvYXNtL2t2bV9ob3N0LmggICB8ICA2ICsrKy0tLQo+ ICBhcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1fbW11LmggICAgfCAgMiArLQo+ICBhcmNoL2FybTY0 L2luY2x1ZGUvYXNtL2t2bV9ob3N0LmggfCAgNiArKystLS0KPiAgYXJjaC9hcm02NC9pbmNsdWRl L2FzbS9rdm1fbW11LmggIHwgIDIgKy0KPiAgYXJjaC9hcm02NC9rdm0vbmVzdGVkLmMgICAgICAg ICAgIHwgMTMgKysrKysrLS0tLS0tLQo+ICB2aXJ0L2t2bS9hcm0vYXJtLmMgICAgICAgICAgICAg ICAgfCAyMiArKysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gIHZpcnQva3ZtL2FybS9tbXUuYyAgICAg ICAgICAgICAgICB8IDI2ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tCj4gIDcgZmlsZXMgY2hh bmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX2hvc3QuaCBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2t2 bV9ob3N0LmgKPiBpbmRleCBiODIxZWIyMzgzYWQuLmNjNzYxNjEwZTQxZSAxMDA2NDQKPiAtLS0g YS9hcmNoL2FybS9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4gKysrIGIvYXJjaC9hcm0vaW5jbHVk ZS9hc20va3ZtX2hvc3QuaAo+IEBAIC02MywxNSArNjMsMTUgQEAgc3RydWN0IGt2bV9zMl9tbXUg ewo+ICAJcGdkX3QgKnBnZDsKPiAgCXBoeXNfYWRkcl90IHBnZF9waHlzOwo+ICAKPiArCS8qIFRo ZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiArCWludCBf X3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiArCj4gIAlzdHJ1Y3Qga3ZtICprdm07Cj4gIH07Cj4g IAo+ICBzdHJ1Y3Qga3ZtX2FyY2ggewo+ICAJc3RydWN0IGt2bV9zMl9tbXUgbW11Owo+ICAKPiAt CS8qIFRoZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiAt CWludCBfX3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAtCj4gIAkvKiBTdGFnZS0yIHBhZ2UgdGFi bGUgKi8KPiAgCXBnZF90ICpwZ2Q7Cj4gIAlwaHlzX2FkZHJfdCBwZ2RfcGh5czsKPiBkaWZmIC0t Z2l0IGEvYXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX21tdS5oIGIvYXJjaC9hcm0vaW5jbHVkZS9h c20va3ZtX21tdS5oCj4gaW5kZXggYWZhYmYxZmQxZDE3Li43YTZlOTAwOGVkNDUgMTAwNjQ0Cj4g LS0tIGEvYXJjaC9hcm0vaW5jbHVkZS9hc20va3ZtX21tdS5oCj4gKysrIGIvYXJjaC9hcm0vaW5j bHVkZS9hc20va3ZtX21tdS5oCj4gQEAgLTUyLDcgKzUyLDcgQEAgaW50IGNyZWF0ZV9oeXBfZXhl Y19tYXBwaW5ncyhwaHlzX2FkZHJfdCBwaHlzX2FkZHIsIHNpemVfdCBzaXplLAo+ICB2b2lkIGZy ZWVfaHlwX3BnZHModm9pZCk7Cj4gIAo+ICB2b2lkIHN0YWdlMl91bm1hcF92bShzdHJ1Y3Qga3Zt ICprdm0pOwo+IC1pbnQga3ZtX2FsbG9jX3N0YWdlMl9wZ2Qoc3RydWN0IGt2bV9zMl9tbXUgKm1t dSk7Cj4gK2ludCBrdm1faW5pdF9zdGFnZTJfbW11KHN0cnVjdCBrdm0gKmt2bSwgc3RydWN0IGt2 bV9zMl9tbXUgKm1tdSk7Cj4gIHZvaWQga3ZtX2ZyZWVfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3My X21tdSAqbW11KTsKPiAgaW50IGt2bV9waHlzX2FkZHJfaW9yZW1hcChzdHJ1Y3Qga3ZtICprdm0s IHBoeXNfYWRkcl90IGd1ZXN0X2lwYSwKPiAgCQkJICBwaHlzX2FkZHJfdCBwYSwgdW5zaWduZWQg bG9uZyBzaXplLCBib29sIHdyaXRhYmxlKTsKPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9pbmNs dWRlL2FzbS9rdm1faG9zdC5oIGIvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4g aW5kZXggY2MyMzhkZTE3MGQyLi5iNzFhN2EyMzdmOTUgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm02 NC9pbmNsdWRlL2FzbS9rdm1faG9zdC5oCj4gKysrIGIvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9r dm1faG9zdC5oCj4gQEAgLTEwNCw2ICsxMDQsOSBAQCBzdHJ1Y3Qga3ZtX3MyX21tdSB7Cj4gIAkg KiA+MDogU29tZWJvZHkgaXMgYWN0aXZlbHkgdXNpbmcgdGhpcy4KPiAgCSAqLwo+ICAJYXRvbWlj X3QgcmVmY250Owo+ICsKPiArCS8qIFRoZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBw aHlzaWNhbCBDUFUgKi8KPiArCWludCBfX3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAgfTsKPiAg Cj4gIHN0YXRpYyBpbmxpbmUgYm9vbCBrdm1fczJfbW11X3ZhbGlkKHN0cnVjdCBrdm1fczJfbW11 ICptbXUpCj4gQEAgLTEyNCw5ICsxMjcsNiBAQCBzdHJ1Y3Qga3ZtX2FyY2ggewo+ICAJLyogVlRD Ul9FTDIgdmFsdWUgZm9yIHRoaXMgVk0gKi8KPiAgCXU2NCAgICB2dGNyOwo+ICAKPiAtCS8qIFRo ZSBsYXN0IHZjcHUgaWQgdGhhdCByYW4gb24gZWFjaCBwaHlzaWNhbCBDUFUgKi8KPiAtCWludCBf X3BlcmNwdSAqbGFzdF92Y3B1X3JhbjsKPiAtCj4gIAkvKiBUaGUgbWF4aW11bSBudW1iZXIgb2Yg dkNQVXMgZGVwZW5kcyBvbiB0aGUgdXNlZCBHSUMgbW9kZWwgKi8KPiAgCWludCBtYXhfdmNwdXM7 Cj4gIAo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2luY2x1ZGUvYXNtL2t2bV9tbXUuaCBiL2Fy Y2gvYXJtNjQvaW5jbHVkZS9hc20va3ZtX21tdS5oCj4gaW5kZXggZjRjNWFjNWViOTVmLi41MzEw MzYwNzA2NWEgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9rdm1fbW11LmgK PiArKysgYi9hcmNoL2FybTY0L2luY2x1ZGUvYXNtL2t2bV9tbXUuaAo+IEBAIC0xNjksNyArMTY5 LDcgQEAgdm9pZCBmcmVlX2h5cF9wZ2RzKHZvaWQpOwo+ICAKPiAgdm9pZCBrdm1fdW5tYXBfc3Rh Z2UyX3JhbmdlKHN0cnVjdCBrdm1fczJfbW11ICptbXUsIHBoeXNfYWRkcl90IHN0YXJ0LCB1NjQg c2l6ZSk7Cj4gIHZvaWQgc3RhZ2UyX3VubWFwX3ZtKHN0cnVjdCBrdm0gKmt2bSk7Cj4gLWludCBr dm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KTsKPiAraW50IGt2bV9p bml0X3N0YWdlMl9tbXUoc3RydWN0IGt2bSAqa3ZtLCBzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KTsK PiAgdm9pZCBrdm1fZnJlZV9zdGFnZTJfcGdkKHN0cnVjdCBrdm1fczJfbW11ICptbXUpOwo+ICBp bnQga3ZtX3BoeXNfYWRkcl9pb3JlbWFwKHN0cnVjdCBrdm0gKmt2bSwgcGh5c19hZGRyX3QgZ3Vl c3RfaXBhLAo+ICAJCQkgIHBoeXNfYWRkcl90IHBhLCB1bnNpZ25lZCBsb25nIHNpemUsIGJvb2wg d3JpdGFibGUpOwo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9uZXN0ZWQuYyBiL2FyY2gv YXJtNjQva3ZtL25lc3RlZC5jCj4gaW5kZXggODg4MDAzM2ZiNmUwLi4wOWFmYWZiZGM4ZmUgMTAw NjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9rdm0vbmVzdGVkLmMKPiArKysgYi9hcmNoL2FybTY0L2t2 bS9uZXN0ZWQuYwo+IEBAIC01MiwxOCArNTIsMTcgQEAgaW50IGt2bV92Y3B1X2luaXRfbmVzdGVk KHN0cnVjdCBrdm1fdmNwdSAqdmNwdSkKPiAgCQkJIEdGUF9LRVJORUwgfCBfX0dGUF9aRVJPKTsK PiAgCj4gIAlpZiAodG1wKSB7Cj4gLQkJaWYgKHRtcCAhPSBrdm0tPmFyY2gubmVzdGVkX21tdXMp Cj4gKwkJaWYgKHRtcCAhPSBrdm0tPmFyY2gubmVzdGVkX21tdXMpIHsKPiAgCQkJa2ZyZWUoa3Zt LT5hcmNoLm5lc3RlZF9tbXVzKTsKPiArCQkJa3ZtLT5hcmNoLm5lc3RlZF9tbXVzID0gTlVMTDsK PiArCQkJa3ZtLT5hcmNoLm5lc3RlZF9tbXVzX3NpemUgPSAwOwo+ICsJCX0KPiAgCj4gLQkJdG1w W251bV9tbXVzIC0gMV0ua3ZtID0ga3ZtOwo+IC0JCWF0b21pY19zZXQoJnRtcFtudW1fbW11cyAt IDFdLnJlZmNudCwgMCk7Cj4gLQkJcmV0ID0ga3ZtX2FsbG9jX3N0YWdlMl9wZ2QoJnRtcFtudW1f bW11cyAtIDFdKTsKPiArCQlyZXQgPSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJnRtcFtudW1f bW11cyAtIDFdKTsKPiAgCQlpZiAocmV0KQo+ICAJCQlnb3RvIG91dDsKPiAgCj4gLQkJdG1wW251 bV9tbXVzIC0gMl0ua3ZtID0ga3ZtOwo+IC0JCWF0b21pY19zZXQoJnRtcFtudW1fbW11cyAtIDJd LnJlZmNudCwgMCk7Cj4gLQkJcmV0ID0ga3ZtX2FsbG9jX3N0YWdlMl9wZ2QoJnRtcFtudW1fbW11 cyAtIDJdKTsKPiArCQlyZXQgPSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJnRtcFtudW1fbW11 cyAtIDJdKTsKPiAgCQlpZiAocmV0KSB7Cj4gIAkJCWt2bV9mcmVlX3N0YWdlMl9wZ2QoJnRtcFtu dW1fbW11cyAtIDFdKTsKPiAgCQkJZ290byBvdXQ7Cj4gZGlmZiAtLWdpdCBhL3ZpcnQva3ZtL2Fy bS9hcm0uYyBiL3ZpcnQva3ZtL2FybS9hcm0uYwo+IGluZGV4IGJjY2EyN2Q1YzQ4MS4uZThiNTg0 Yjc5ODQ3IDEwMDY0NAo+IC0tLSBhL3ZpcnQva3ZtL2FybS9hcm0uYwo+ICsrKyBiL3ZpcnQva3Zt L2FybS9hcm0uYwo+IEBAIC05OSwyOSArOTksMjEgQEAgdm9pZCBrdm1fYXJjaF9jaGVja19wcm9j ZXNzb3JfY29tcGF0KHZvaWQgKnJ0bikKPiAgCSooaW50ICopcnRuID0gMDsKPiAgfQo+ICAKPiAt Cj4gIC8qKgo+ICAgKiBrdm1fYXJjaF9pbml0X3ZtIC0gaW5pdGlhbGl6ZXMgYSBWTSBkYXRhIHN0 cnVjdHVyZQo+ICAgKiBAa3ZtOglwb2ludGVyIHRvIHRoZSBLVk0gc3RydWN0Cj4gICAqLwo+ICBp bnQga3ZtX2FyY2hfaW5pdF92bShzdHJ1Y3Qga3ZtICprdm0sIHVuc2lnbmVkIGxvbmcgdHlwZSkK PiAgewo+IC0JaW50IHJldCwgY3B1Owo+ICsJaW50IHJldDsKPiAgCj4gIAlyZXQgPSBrdm1fYXJt X3NldHVwX3N0YWdlMihrdm0sIHR5cGUpOwo+ICAJaWYgKHJldCkKPiAgCQlyZXR1cm4gcmV0Owo+ ICAKPiAtCWt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFuID0gYWxsb2NfcGVyY3B1KHR5cGVvZigqa3Zt LT5hcmNoLmxhc3RfdmNwdV9yYW4pKTsKPiAtCWlmICgha3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4p Cj4gLQkJcmV0dXJuIC1FTk9NRU07Cj4gLQo+IC0JZm9yX2VhY2hfcG9zc2libGVfY3B1KGNwdSkK PiAtCQkqcGVyX2NwdV9wdHIoa3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4sIGNwdSkgPSAtMTsKPiAt Cj4gLQlyZXQgPSBrdm1fYWxsb2Nfc3RhZ2UyX3BnZCgma3ZtLT5hcmNoLm1tdSk7Cj4gKwlyZXQg PSBrdm1faW5pdF9zdGFnZTJfbW11KGt2bSwgJmt2bS0+YXJjaC5tbXUpOwo+ICAJaWYgKHJldCkK PiAtCQlnb3RvIG91dF9mYWlsX2FsbG9jOwo+ICsJCXJldHVybiByZXQ7Cj4gIAo+ICAJLyogTWFy ayB0aGUgaW5pdGlhbCBWTUlEIGdlbmVyYXRpb24gaW52YWxpZCAqLwo+ICAJa3ZtLT5hcmNoLm1t dS52bWlkLnZtaWRfZ2VuID0gMDsKCk1vcmUgY29udGV4dDoKCsKgaW50IGt2bV9hcmNoX2luaXRf dm0oc3RydWN0IGt2bSAqa3ZtLCB1bnNpZ25lZCBsb25nIHR5cGUpCsKgewotwqDCoMKgIGludCBy ZXQsIGNwdTsKK8KgwqDCoCBpbnQgcmV0OwrCoArCoMKgwqDCoCByZXQgPSBrdm1fYXJtX3NldHVw X3N0YWdlMihrdm0sIHR5cGUpOwrCoMKgwqDCoCBpZiAocmV0KQrCoMKgwqDCoCDCoMKgwqAgcmV0 dXJuIHJldDsKwqAKLcKgwqDCoCBrdm0tPmFyY2gubGFzdF92Y3B1X3JhbiA9IGFsbG9jX3BlcmNw dSh0eXBlb2YoKmt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFuKSk7Ci3CoMKgwqAgaWYgKCFrdm0tPmFy Y2gubGFzdF92Y3B1X3JhbikKLcKgwqDCoCDCoMKgwqAgcmV0dXJuIC1FTk9NRU07Ci0KLcKgwqDC oCBmb3JfZWFjaF9wb3NzaWJsZV9jcHUoY3B1KQotwqDCoMKgIMKgwqDCoCAqcGVyX2NwdV9wdHIo a3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4sIGNwdSkgPSAtMTsKLQotwqDCoMKgIHJldCA9IGt2bV9h bGxvY19zdGFnZTJfcGdkKCZrdm0tPmFyY2gubW11KTsKK8KgwqDCoCByZXQgPSBrdm1faW5pdF9z dGFnZTJfbW11KGt2bSwgJmt2bS0+YXJjaC5tbXUpOwrCoMKgwqDCoCBpZiAocmV0KQotwqDCoMKg IMKgwqDCoCBnb3RvIG91dF9mYWlsX2FsbG9jOworwqDCoMKgIMKgwqDCoCByZXR1cm4gcmV0OwrC oArCoMKgwqDCoCAvKiBNYXJrIHRoZSBpbml0aWFsIFZNSUQgZ2VuZXJhdGlvbiBpbnZhbGlkICov CsKgwqDCoMKgIGt2bS0+YXJjaC5tbXUudm1pZC52bWlkX2dlbiA9IDA7CsKgwqDCoMKgIGt2bS0+ YXJjaC5tbXUua3ZtID0ga3ZtOwrCoAoKa3ZtX2luaXRfc3RhZ2UyX21tdSBhbHJlYWR5IHNldHMg dm1pZF9nZW4gYW5kIGt2bS4KCj4gQEAgLTE0Miw5ICsxMzQsNiBAQCBpbnQga3ZtX2FyY2hfaW5p dF92bShzdHJ1Y3Qga3ZtICprdm0sIHVuc2lnbmVkIGxvbmcgdHlwZSkKPiAgCXJldHVybiByZXQ7 Cj4gIG91dF9mcmVlX3N0YWdlMl9wZ2Q6Cj4gIAlrdm1fZnJlZV9zdGFnZTJfcGdkKCZrdm0tPmFy Y2gubW11KTsKPiAtb3V0X2ZhaWxfYWxsb2M6Cj4gLQlmcmVlX3BlcmNwdShrdm0tPmFyY2gubGFz dF92Y3B1X3Jhbik7Cj4gLQlrdm0tPmFyY2gubGFzdF92Y3B1X3JhbiA9IE5VTEw7Cj4gIAlyZXR1 cm4gcmV0Owo+ICB9Cj4gIAo+IEBAIC0xNzQsOSArMTYzLDYgQEAgdm9pZCBrdm1fYXJjaF9kZXN0 cm95X3ZtKHN0cnVjdCBrdm0gKmt2bSkKPiAgCj4gIAlrdm1fdmdpY19kZXN0cm95KGt2bSk7Cj4g IAo+IC0JZnJlZV9wZXJjcHUoa3ZtLT5hcmNoLmxhc3RfdmNwdV9yYW4pOwo+IC0Ja3ZtLT5hcmNo Lmxhc3RfdmNwdV9yYW4gPSBOVUxMOwo+IC0KPiAgCWZvciAoaSA9IDA7IGkgPCBLVk1fTUFYX1ZD UFVTOyArK2kpIHsKPiAgCQlpZiAoa3ZtLT52Y3B1c1tpXSkgewo+ICAJCQlrdm1fYXJjaF92Y3B1 X2ZyZWUoa3ZtLT52Y3B1c1tpXSk7Cj4gQEAgLTM1OSw3ICszNDUsNyBAQCB2b2lkIGt2bV9hcmNo X3ZjcHVfbG9hZChzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsIGludCBjcHUpCj4gIAlpZiAobmVzdGVk X3ZpcnRfaW5fdXNlKHZjcHUpKQo+ICAJCWt2bV92Y3B1X2xvYWRfaHdfbW11KHZjcHUpOwo+ICAK PiAtCWxhc3RfcmFuID0gdGhpc19jcHVfcHRyKHZjcHUtPmt2bS0+YXJjaC5sYXN0X3ZjcHVfcmFu KTsKPiArCWxhc3RfcmFuID0gdGhpc19jcHVfcHRyKHZjcHUtPmFyY2guaHdfbW11LT5sYXN0X3Zj cHVfcmFuKTsKPiAgCWNwdV9kYXRhID0gdGhpc19jcHVfcHRyKCZrdm1faG9zdF9kYXRhKTsKPiAg Cj4gIAkvKgo+IGRpZmYgLS1naXQgYS92aXJ0L2t2bS9hcm0vbW11LmMgYi92aXJ0L2t2bS9hcm0v bW11LmMKPiBpbmRleCA5NGQ0MDBlN2FmNTcuLjZhN2NiYTA3N2JjZSAxMDA2NDQKPiAtLS0gYS92 aXJ0L2t2bS9hcm0vbW11LmMKPiArKysgYi92aXJ0L2t2bS9hcm0vbW11LmMKPiBAQCAtOTAzLDgg KzkwMyw5IEBAIGludCBjcmVhdGVfaHlwX2V4ZWNfbWFwcGluZ3MocGh5c19hZGRyX3QgcGh5c19h ZGRyLCBzaXplX3Qgc2l6ZSwKPiAgfQo+ICAKPiAgLyoqCj4gLSAqIGt2bV9hbGxvY19zdGFnZTJf cGdkIC0gYWxsb2NhdGUgbGV2ZWwtMSB0YWJsZSBmb3Igc3RhZ2UtMiB0cmFuc2xhdGlvbi4KPiAt ICogQG1tdToJVGhlIHN0YWdlIDIgbW11IHN0cnVjdCBwb2ludGVyCj4gKyAqIGt2bV9pbml0X3N0 YWdlMl9tbXUgLSBJbml0aWFsaXNlIGEgUzIgTU1VIHN0cnVjcnVyZQo+ICsgKiBAa3ZtOglUaGUg cG9pbnRlciB0byB0aGUgS1ZNIHN0cnVjdHVyZQo+ICsgKiBAbW11OglUaGUgcG9pbnRlciB0byB0 aGUgczIgTU1VIHN0cnVjdHVyZQo+ICAgKgo+ICAgKiBBbGxvY2F0ZXMgb25seSB0aGUgc3RhZ2Ut MiBIVyBQR0QgbGV2ZWwgdGFibGUocykgb2Ygc2l6ZSBkZWZpbmVkIGJ5Cj4gICAqIHN0YWdlMl9w Z2Rfc2l6ZShtbXUtPmt2bSkuCj4gQEAgLTkxMiwxMCArOTEzLDExIEBAIGludCBjcmVhdGVfaHlw X2V4ZWNfbWFwcGluZ3MocGh5c19hZGRyX3QgcGh5c19hZGRyLCBzaXplX3Qgc2l6ZSwKPiAgICog Tm90ZSB3ZSBkb24ndCBuZWVkIGxvY2tpbmcgaGVyZSBhcyB0aGlzIGlzIG9ubHkgY2FsbGVkIHdo ZW4gdGhlIFZNIGlzCj4gICAqIGNyZWF0ZWQsIHdoaWNoIGNhbiBvbmx5IGJlIGRvbmUgb25jZS4K PiAgICovCj4gLWludCBrdm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11 KQo+ICtpbnQga3ZtX2luaXRfc3RhZ2UyX21tdShzdHJ1Y3Qga3ZtICprdm0sIHN0cnVjdCBrdm1f czJfbW11ICptbXUpCj4gIHsKPiAgCXBoeXNfYWRkcl90IHBnZF9waHlzOwo+ICAJcGdkX3QgKnBn ZDsKPiArCWludCBjcHU7Cj4gIAo+ICAJaWYgKG1tdS0+cGdkICE9IE5VTEwpIHsKPiAgCQlrdm1f ZXJyKCJrdm1fYXJjaCBhbHJlYWR5IGluaXRpYWxpemVkP1xuIik7Cj4gQEAgLTkyMywxOCArOTI1 LDI4IEBAIGludCBrdm1fYWxsb2Nfc3RhZ2UyX3BnZChzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11KQo+ ICAJfQo+ICAKPiAgCS8qIEFsbG9jYXRlIHRoZSBIVyBQR0QsIG1ha2luZyBzdXJlIHRoYXQgZWFj aCBwYWdlIGdldHMgaXRzIG93biByZWZjb3VudCAqLwo+IC0JcGdkID0gYWxsb2NfcGFnZXNfZXhh Y3Qoc3RhZ2UyX3BnZF9zaXplKG1tdS0+a3ZtKSwgR0ZQX0tFUk5FTCB8IF9fR0ZQX1pFUk8pOwo+ ICsJcGdkID0gYWxsb2NfcGFnZXNfZXhhY3Qoc3RhZ2UyX3BnZF9zaXplKGt2bSksIEdGUF9LRVJO RUwgfCBfX0dGUF9aRVJPKTsKPiAgCWlmICghcGdkKQo+ICAJCXJldHVybiAtRU5PTUVNOwo+ICAK PiAgCXBnZF9waHlzID0gdmlydF90b19waHlzKHBnZCk7Cj4gLQlpZiAoV0FSTl9PTihwZ2RfcGh5 cyAmIH5rdm1fdnR0YnJfYmFkZHJfbWFzayhtbXUtPmt2bSkpKQo+ICsJaWYgKFdBUk5fT04ocGdk X3BoeXMgJiB+a3ZtX3Z0dGJyX2JhZGRyX21hc2soa3ZtKSkpCj4gIAkJcmV0dXJuIC1FSU5WQUw7 Cj4gIAo+ICsJbW11LT5sYXN0X3ZjcHVfcmFuID0gYWxsb2NfcGVyY3B1KHR5cGVvZigqbW11LT5s YXN0X3ZjcHVfcmFuKSk7Cj4gKwlpZiAoIW1tdS0+bGFzdF92Y3B1X3Jhbikgewo+ICsJCWZyZWVf cGFnZXNfZXhhY3QocGdkLCBzdGFnZTJfcGdkX3NpemUoa3ZtKSk7Cj4gKwkJcmV0dXJuIC1FTk9N RU07Cj4gKwl9Cj4gKwo+ICsJbW11LT5rdm0gPSBrdm07Cj4gIAltbXUtPnBnZCA9IHBnZDsKPiAg CW1tdS0+cGdkX3BoeXMgPSBwZ2RfcGh5czsKPiAgCW1tdS0+dm1pZC52bWlkX2dlbiA9IDA7Cj4g IAo+ICsJZm9yX2VhY2hfcG9zc2libGVfY3B1KGNwdSkKPiArCQkqcGVyX2NwdV9wdHIobW11LT5s YXN0X3ZjcHVfcmFuLCBjcHUpID0gLTE7Cj4gKwo+ICAJa3ZtX2luaXRfczJfbW11KG1tdSk7Cj4g IAo+ICAJcmV0dXJuIDA7Cj4gQEAgLTEwMjEsOCArMTAzMywxMCBAQCB2b2lkIGt2bV9mcmVlX3N0 YWdlMl9wZ2Qoc3RydWN0IGt2bV9zMl9tbXUgKm1tdSkKPiAgCXNwaW5fdW5sb2NrKCZrdm0tPm1t dV9sb2NrKTsKPiAgCj4gIAkvKiBGcmVlIHRoZSBIVyBwZ2QsIG9uZSBwYWdlIGF0IGEgdGltZSAq LwoKbGFzdF92Y3B1X3JhbiB0b28uCgo+IC0JaWYgKHBnZCkKPiArCWlmIChwZ2QpIHsKPiAgCQlm cmVlX3BhZ2VzX2V4YWN0KHBnZCwgc3RhZ2UyX3BnZF9zaXplKGt2bSkpOwo+ICsJCWZyZWVfcGVy Y3B1KG1tdS0+bGFzdF92Y3B1X3Jhbik7Cj4gKwl9Cj4gIH0KPiAgCj4gIHN0YXRpYyBwdWRfdCAq c3RhZ2UyX2dldF9wdWQoc3RydWN0IGt2bV9zMl9tbXUgKm1tdSwgc3RydWN0IGt2bV9tbXVfbWVt b3J5X2NhY2hlICpjYWNoZSwKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxA bGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK