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 67D081A629 for ; Thu, 10 Nov 2022 19:03:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA7FCC433B5; Thu, 10 Nov 2022 19:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668107029; bh=q8DM+gOeyXyLvKxIUVra0BSqrL0sCMYCmOPZxl8A8VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InS3LxOXfa0J6Tcfryo27VTpHlpWADpnMJeamIElbcCn7e1izv3ICfYb9rglXegW4 As8/Kc7Wy/hsMoLnd4nyixkGNExiVPgHDDRTcsNPdTrGiAmj0gN5g6kxWR9EelAzuk 0XSrDT96aLiLUlcORsDZcuYS2KZkotPFHemWV7QRb91c9yaJZ21sBEMbBPaZMJ3DIH 72IkVOi/D+ywL2p1QoIDKG14WCDyylsmBzAMrow/MufMfN4A8njwzvmts+kmugzDJ3 gyA7O4vG54XfWKFFkKtoqFtZI/Btc8XxaQmUhst98Yyr6wlcfY3Xv3AXFH/yQIY8M7 xZ/gsQW7Bwaew== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , James Morse , Chao Peng , Quentin Perret , Suzuki K Poulose , Mark Rutland , Fuad Tabba , Oliver Upton , Marc Zyngier , kernel-team@android.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 11/26] KVM: arm64: Rename 'host_kvm' to 'host_mmu' Date: Thu, 10 Nov 2022 19:02:44 +0000 Message-Id: <20221110190259.26861-12-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221110190259.26861-1-will@kernel.org> References: <20221110190259.26861-1-will@kernel.org> 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-Transfer-Encoding: 8bit In preparation for introducing VM and vCPU state at EL2, rename the existing 'struct host_kvm' and its singleton 'host_kvm' instance to 'host_mmu' so as to avoid confusion between the structure tracking the host stage-2 MMU state and the host instance of a 'struct kvm' for a protected guest. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Vincent Donnefort Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 6 +-- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 46 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 3bea816296dc..0a6d3e7f2a43 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -44,13 +44,13 @@ static inline enum pkvm_page_state pkvm_getstate(enum kvm_pgtable_prot prot) return prot & PKVM_PAGE_STATE_PROT_MASK; } -struct host_kvm { +struct host_mmu { struct kvm_arch arch; struct kvm_pgtable pgt; struct kvm_pgtable_mm_ops mm_ops; hyp_spinlock_t lock; }; -extern struct host_kvm host_kvm; +extern struct host_mmu host_mmu; /* This corresponds to page-table locking order */ enum pkvm_component_id { @@ -76,7 +76,7 @@ void hyp_unpin_shared_mem(void *from, void *to); static __always_inline void __load_host_stage2(void) { if (static_branch_likely(&kvm_protected_mode_initialized)) - __load_stage2(&host_kvm.arch.mmu, &host_kvm.arch); + __load_stage2(&host_mmu.arch.mmu, &host_mmu.arch); else write_sysreg(0, vttbr_el2); } diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 83c2f67e1b58..06c6a24c0eae 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -22,18 +22,18 @@ #define KVM_HOST_S2_FLAGS (KVM_PGTABLE_S2_NOFWB | KVM_PGTABLE_S2_IDMAP) extern unsigned long hyp_nr_cpus; -struct host_kvm host_kvm; +struct host_mmu host_mmu; static struct hyp_pool host_s2_pool; static void host_lock_component(void) { - hyp_spin_lock(&host_kvm.lock); + hyp_spin_lock(&host_mmu.lock); } static void host_unlock_component(void) { - hyp_spin_unlock(&host_kvm.lock); + hyp_spin_unlock(&host_mmu.lock); } static void hyp_lock_component(void) @@ -88,7 +88,7 @@ static int prepare_s2_pool(void *pgt_pool_base) if (ret) return ret; - host_kvm.mm_ops = (struct kvm_pgtable_mm_ops) { + host_mmu.mm_ops = (struct kvm_pgtable_mm_ops) { .zalloc_pages_exact = host_s2_zalloc_pages_exact, .zalloc_page = host_s2_zalloc_page, .phys_to_virt = hyp_phys_to_virt, @@ -109,7 +109,7 @@ static void prepare_host_vtcr(void) parange = kvm_get_parange(id_aa64mmfr0_el1_sys_val); phys_shift = id_aa64mmfr0_parange_to_phys_shift(parange); - host_kvm.arch.vtcr = kvm_get_vtcr(id_aa64mmfr0_el1_sys_val, + host_mmu.arch.vtcr = kvm_get_vtcr(id_aa64mmfr0_el1_sys_val, id_aa64mmfr1_el1_sys_val, phys_shift); } @@ -117,25 +117,25 @@ static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot pr int kvm_host_prepare_stage2(void *pgt_pool_base) { - struct kvm_s2_mmu *mmu = &host_kvm.arch.mmu; + struct kvm_s2_mmu *mmu = &host_mmu.arch.mmu; int ret; prepare_host_vtcr(); - hyp_spin_lock_init(&host_kvm.lock); - mmu->arch = &host_kvm.arch; + hyp_spin_lock_init(&host_mmu.lock); + mmu->arch = &host_mmu.arch; ret = prepare_s2_pool(pgt_pool_base); if (ret) return ret; - ret = __kvm_pgtable_stage2_init(&host_kvm.pgt, mmu, - &host_kvm.mm_ops, KVM_HOST_S2_FLAGS, + ret = __kvm_pgtable_stage2_init(&host_mmu.pgt, mmu, + &host_mmu.mm_ops, KVM_HOST_S2_FLAGS, host_stage2_force_pte_cb); if (ret) return ret; - mmu->pgd_phys = __hyp_pa(host_kvm.pgt.pgd); - mmu->pgt = &host_kvm.pgt; + mmu->pgd_phys = __hyp_pa(host_mmu.pgt.pgd); + mmu->pgt = &host_mmu.pgt; atomic64_set(&mmu->vmid.id, 0); return 0; @@ -143,19 +143,19 @@ int kvm_host_prepare_stage2(void *pgt_pool_base) int __pkvm_prot_finalize(void) { - struct kvm_s2_mmu *mmu = &host_kvm.arch.mmu; + struct kvm_s2_mmu *mmu = &host_mmu.arch.mmu; struct kvm_nvhe_init_params *params = this_cpu_ptr(&kvm_init_params); if (params->hcr_el2 & HCR_VM) return -EPERM; params->vttbr = kvm_get_vttbr(mmu); - params->vtcr = host_kvm.arch.vtcr; + params->vtcr = host_mmu.arch.vtcr; params->hcr_el2 |= HCR_VM; kvm_flush_dcache_to_poc(params, sizeof(*params)); write_sysreg(params->hcr_el2, hcr_el2); - __load_stage2(&host_kvm.arch.mmu, &host_kvm.arch); + __load_stage2(&host_mmu.arch.mmu, &host_mmu.arch); /* * Make sure to have an ISB before the TLB maintenance below but only @@ -173,7 +173,7 @@ int __pkvm_prot_finalize(void) static int host_stage2_unmap_dev_all(void) { - struct kvm_pgtable *pgt = &host_kvm.pgt; + struct kvm_pgtable *pgt = &host_mmu.pgt; struct memblock_region *reg; u64 addr = 0; int i, ret; @@ -258,7 +258,7 @@ static bool range_is_memory(u64 start, u64 end) static inline int __host_stage2_idmap(u64 start, u64 end, enum kvm_pgtable_prot prot) { - return kvm_pgtable_stage2_map(&host_kvm.pgt, start, end - start, start, + return kvm_pgtable_stage2_map(&host_mmu.pgt, start, end - start, start, prot, &host_s2_pool); } @@ -271,7 +271,7 @@ static inline int __host_stage2_idmap(u64 start, u64 end, #define host_stage2_try(fn, ...) \ ({ \ int __ret; \ - hyp_assert_lock_held(&host_kvm.lock); \ + hyp_assert_lock_held(&host_mmu.lock); \ __ret = fn(__VA_ARGS__); \ if (__ret == -ENOMEM) { \ __ret = host_stage2_unmap_dev_all(); \ @@ -294,8 +294,8 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) u32 level; int ret; - hyp_assert_lock_held(&host_kvm.lock); - ret = kvm_pgtable_get_leaf(&host_kvm.pgt, addr, &pte, &level); + hyp_assert_lock_held(&host_mmu.lock); + ret = kvm_pgtable_get_leaf(&host_mmu.pgt, addr, &pte, &level); if (ret) return ret; @@ -327,7 +327,7 @@ int host_stage2_idmap_locked(phys_addr_t addr, u64 size, int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) { - return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, + return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_mmu.pgt, addr, size, &host_s2_pool, owner_id); } @@ -468,8 +468,8 @@ static int __host_check_page_state_range(u64 addr, u64 size, .get_page_state = host_get_page_state, }; - hyp_assert_lock_held(&host_kvm.lock); - return check_page_state_range(&host_kvm.pgt, addr, size, &d); + hyp_assert_lock_held(&host_mmu.lock); + return check_page_state_range(&host_mmu.pgt, addr, size, &d); } static int __host_set_page_state_range(u64 addr, u64 size, -- 2.38.1.431.g37b22c650d-goog 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 25C34C433FE for ; Thu, 10 Nov 2022 19:10:10 +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: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=19NICeHmmM2n3sKd0nAEo+4LjvdMfHCIqIpD+cQcUD0=; b=p1OYui6dW5BMo7 Vo7baSmNfrG1YYcdHulXMEFCphWNGnAEdGzAsCFiSLAjl2pow7yIvRNvGnMlArwzoF8C5UgYaR8fR gMDHL5lGqNGdGOByn7gAyimVy9HjFEdENiGgiKtyM+fmQTxyzXWnQLeO2jwW6zWznWGBuesGnLy22 KpSef9/htETihORbBqt1WmW6X0xDoIRNaa5hT4vaTJYN6vzg0isqOU20MZ0ULyniYD9T8ytrwu2wY 4fmfRuqQEaoRYFEt9pR0TunuSdSvDyBTtsPx1JufR/sTzR89VHfO4Sy+saB2XyLlX6Wk7eC36QPXQ mPgMIu11CKkCzNSTKGNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCv4-008WBF-HQ; Thu, 10 Nov 2022 19:08:58 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCq6-008SLC-9b for linux-arm-kernel@lists.infradead.org; Thu, 10 Nov 2022 19:03:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D17D761E15; Thu, 10 Nov 2022 19:03:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA7FCC433B5; Thu, 10 Nov 2022 19:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668107029; bh=q8DM+gOeyXyLvKxIUVra0BSqrL0sCMYCmOPZxl8A8VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InS3LxOXfa0J6Tcfryo27VTpHlpWADpnMJeamIElbcCn7e1izv3ICfYb9rglXegW4 As8/Kc7Wy/hsMoLnd4nyixkGNExiVPgHDDRTcsNPdTrGiAmj0gN5g6kxWR9EelAzuk 0XSrDT96aLiLUlcORsDZcuYS2KZkotPFHemWV7QRb91c9yaJZ21sBEMbBPaZMJ3DIH 72IkVOi/D+ywL2p1QoIDKG14WCDyylsmBzAMrow/MufMfN4A8njwzvmts+kmugzDJ3 gyA7O4vG54XfWKFFkKtoqFtZI/Btc8XxaQmUhst98Yyr6wlcfY3Xv3AXFH/yQIY8M7 xZ/gsQW7Bwaew== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , James Morse , Chao Peng , Quentin Perret , Suzuki K Poulose , Mark Rutland , Fuad Tabba , Oliver Upton , Marc Zyngier , kernel-team@android.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 11/26] KVM: arm64: Rename 'host_kvm' to 'host_mmu' Date: Thu, 10 Nov 2022 19:02:44 +0000 Message-Id: <20221110190259.26861-12-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221110190259.26861-1-will@kernel.org> References: <20221110190259.26861-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221110_110350_504455_92303A7B X-CRM114-Status: GOOD ( 17.94 ) 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 SW4gcHJlcGFyYXRpb24gZm9yIGludHJvZHVjaW5nIFZNIGFuZCB2Q1BVIHN0YXRlIGF0IEVMMiwg cmVuYW1lIHRoZQpleGlzdGluZyAnc3RydWN0IGhvc3Rfa3ZtJyBhbmQgaXRzIHNpbmdsZXRvbiAn aG9zdF9rdm0nIGluc3RhbmNlIHRvCidob3N0X21tdScgc28gYXMgdG8gYXZvaWQgY29uZnVzaW9u IGJldHdlZW4gdGhlIHN0cnVjdHVyZSB0cmFja2luZyB0aGUKaG9zdCBzdGFnZS0yIE1NVSBzdGF0 ZSBhbmQgdGhlIGhvc3QgaW5zdGFuY2Ugb2YgYSAnc3RydWN0IGt2bScgZm9yIGEKcHJvdGVjdGVk IGd1ZXN0LgoKUmV2aWV3ZWQtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAbGlu YXJvLm9yZz4KVGVzdGVkLWJ5OiBWaW5jZW50IERvbm5lZm9ydCA8dmRvbm5lZm9ydEBnb29nbGUu Y29tPgpTaWduZWQtb2ZmLWJ5OiBXaWxsIERlYWNvbiA8d2lsbEBrZXJuZWwub3JnPgotLS0KIGFy Y2gvYXJtNjQva3ZtL2h5cC9pbmNsdWRlL252aGUvbWVtX3Byb3RlY3QuaCB8ICA2ICstLQogYXJj aC9hcm02NC9rdm0vaHlwL252aGUvbWVtX3Byb3RlY3QuYyAgICAgICAgIHwgNDYgKysrKysrKysr LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9udmhlL21lbV9w cm90ZWN0LmggYi9hcmNoL2FybTY0L2t2bS9oeXAvaW5jbHVkZS9udmhlL21lbV9wcm90ZWN0LmgK aW5kZXggM2JlYTgxNjI5NmRjLi4wYTZkM2U3ZjJhNDMgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQv a3ZtL2h5cC9pbmNsdWRlL252aGUvbWVtX3Byb3RlY3QuaAorKysgYi9hcmNoL2FybTY0L2t2bS9o eXAvaW5jbHVkZS9udmhlL21lbV9wcm90ZWN0LmgKQEAgLTQ0LDEzICs0NCwxMyBAQCBzdGF0aWMg aW5saW5lIGVudW0gcGt2bV9wYWdlX3N0YXRlIHBrdm1fZ2V0c3RhdGUoZW51bSBrdm1fcGd0YWJs ZV9wcm90IHByb3QpCiAJcmV0dXJuIHByb3QgJiBQS1ZNX1BBR0VfU1RBVEVfUFJPVF9NQVNLOwog fQogCi1zdHJ1Y3QgaG9zdF9rdm0geworc3RydWN0IGhvc3RfbW11IHsKIAlzdHJ1Y3Qga3ZtX2Fy Y2ggYXJjaDsKIAlzdHJ1Y3Qga3ZtX3BndGFibGUgcGd0OwogCXN0cnVjdCBrdm1fcGd0YWJsZV9t bV9vcHMgbW1fb3BzOwogCWh5cF9zcGlubG9ja190IGxvY2s7CiB9OwotZXh0ZXJuIHN0cnVjdCBo b3N0X2t2bSBob3N0X2t2bTsKK2V4dGVybiBzdHJ1Y3QgaG9zdF9tbXUgaG9zdF9tbXU7CiAKIC8q IFRoaXMgY29ycmVzcG9uZHMgdG8gcGFnZS10YWJsZSBsb2NraW5nIG9yZGVyICovCiBlbnVtIHBr dm1fY29tcG9uZW50X2lkIHsKQEAgLTc2LDcgKzc2LDcgQEAgdm9pZCBoeXBfdW5waW5fc2hhcmVk X21lbSh2b2lkICpmcm9tLCB2b2lkICp0byk7CiBzdGF0aWMgX19hbHdheXNfaW5saW5lIHZvaWQg X19sb2FkX2hvc3Rfc3RhZ2UyKHZvaWQpCiB7CiAJaWYgKHN0YXRpY19icmFuY2hfbGlrZWx5KCZr dm1fcHJvdGVjdGVkX21vZGVfaW5pdGlhbGl6ZWQpKQotCQlfX2xvYWRfc3RhZ2UyKCZob3N0X2t2 bS5hcmNoLm1tdSwgJmhvc3Rfa3ZtLmFyY2gpOworCQlfX2xvYWRfc3RhZ2UyKCZob3N0X21tdS5h cmNoLm1tdSwgJmhvc3RfbW11LmFyY2gpOwogCWVsc2UKIAkJd3JpdGVfc3lzcmVnKDAsIHZ0dGJy X2VsMik7CiB9CmRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2t2bS9oeXAvbnZoZS9tZW1fcHJvdGVj dC5jIGIvYXJjaC9hcm02NC9rdm0vaHlwL252aGUvbWVtX3Byb3RlY3QuYwppbmRleCA4M2MyZjY3 ZTFiNTguLjA2YzZhMjRjMGVhZSAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9rdm0vaHlwL252aGUv bWVtX3Byb3RlY3QuYworKysgYi9hcmNoL2FybTY0L2t2bS9oeXAvbnZoZS9tZW1fcHJvdGVjdC5j CkBAIC0yMiwxOCArMjIsMTggQEAKICNkZWZpbmUgS1ZNX0hPU1RfUzJfRkxBR1MgKEtWTV9QR1RB QkxFX1MyX05PRldCIHwgS1ZNX1BHVEFCTEVfUzJfSURNQVApCiAKIGV4dGVybiB1bnNpZ25lZCBs b25nIGh5cF9ucl9jcHVzOwotc3RydWN0IGhvc3Rfa3ZtIGhvc3Rfa3ZtOworc3RydWN0IGhvc3Rf bW11IGhvc3RfbW11OwogCiBzdGF0aWMgc3RydWN0IGh5cF9wb29sIGhvc3RfczJfcG9vbDsKIAog c3RhdGljIHZvaWQgaG9zdF9sb2NrX2NvbXBvbmVudCh2b2lkKQogewotCWh5cF9zcGluX2xvY2so Jmhvc3Rfa3ZtLmxvY2spOworCWh5cF9zcGluX2xvY2soJmhvc3RfbW11LmxvY2spOwogfQogCiBz dGF0aWMgdm9pZCBob3N0X3VubG9ja19jb21wb25lbnQodm9pZCkKIHsKLQloeXBfc3Bpbl91bmxv Y2soJmhvc3Rfa3ZtLmxvY2spOworCWh5cF9zcGluX3VubG9jaygmaG9zdF9tbXUubG9jayk7CiB9 CiAKIHN0YXRpYyB2b2lkIGh5cF9sb2NrX2NvbXBvbmVudCh2b2lkKQpAQCAtODgsNyArODgsNyBA QCBzdGF0aWMgaW50IHByZXBhcmVfczJfcG9vbCh2b2lkICpwZ3RfcG9vbF9iYXNlKQogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKLQlob3N0X2t2bS5tbV9vcHMgPSAoc3RydWN0IGt2bV9wZ3Rh YmxlX21tX29wcykgeworCWhvc3RfbW11Lm1tX29wcyA9IChzdHJ1Y3Qga3ZtX3BndGFibGVfbW1f b3BzKSB7CiAJCS56YWxsb2NfcGFnZXNfZXhhY3QgPSBob3N0X3MyX3phbGxvY19wYWdlc19leGFj dCwKIAkJLnphbGxvY19wYWdlID0gaG9zdF9zMl96YWxsb2NfcGFnZSwKIAkJLnBoeXNfdG9fdmly dCA9IGh5cF9waHlzX3RvX3ZpcnQsCkBAIC0xMDksNyArMTA5LDcgQEAgc3RhdGljIHZvaWQgcHJl cGFyZV9ob3N0X3Z0Y3Iodm9pZCkKIAlwYXJhbmdlID0ga3ZtX2dldF9wYXJhbmdlKGlkX2FhNjRt bWZyMF9lbDFfc3lzX3ZhbCk7CiAJcGh5c19zaGlmdCA9IGlkX2FhNjRtbWZyMF9wYXJhbmdlX3Rv X3BoeXNfc2hpZnQocGFyYW5nZSk7CiAKLQlob3N0X2t2bS5hcmNoLnZ0Y3IgPSBrdm1fZ2V0X3Z0 Y3IoaWRfYWE2NG1tZnIwX2VsMV9zeXNfdmFsLAorCWhvc3RfbW11LmFyY2gudnRjciA9IGt2bV9n ZXRfdnRjcihpZF9hYTY0bW1mcjBfZWwxX3N5c192YWwsCiAJCQkJCSAgaWRfYWE2NG1tZnIxX2Vs MV9zeXNfdmFsLCBwaHlzX3NoaWZ0KTsKIH0KIApAQCAtMTE3LDI1ICsxMTcsMjUgQEAgc3RhdGlj IGJvb2wgaG9zdF9zdGFnZTJfZm9yY2VfcHRlX2NiKHU2NCBhZGRyLCB1NjQgZW5kLCBlbnVtIGt2 bV9wZ3RhYmxlX3Byb3QgcHIKIAogaW50IGt2bV9ob3N0X3ByZXBhcmVfc3RhZ2UyKHZvaWQgKnBn dF9wb29sX2Jhc2UpCiB7Ci0Jc3RydWN0IGt2bV9zMl9tbXUgKm1tdSA9ICZob3N0X2t2bS5hcmNo Lm1tdTsKKwlzdHJ1Y3Qga3ZtX3MyX21tdSAqbW11ID0gJmhvc3RfbW11LmFyY2gubW11OwogCWlu dCByZXQ7CiAKIAlwcmVwYXJlX2hvc3RfdnRjcigpOwotCWh5cF9zcGluX2xvY2tfaW5pdCgmaG9z dF9rdm0ubG9jayk7Ci0JbW11LT5hcmNoID0gJmhvc3Rfa3ZtLmFyY2g7CisJaHlwX3NwaW5fbG9j a19pbml0KCZob3N0X21tdS5sb2NrKTsKKwltbXUtPmFyY2ggPSAmaG9zdF9tbXUuYXJjaDsKIAog CXJldCA9IHByZXBhcmVfczJfcG9vbChwZ3RfcG9vbF9iYXNlKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gX19rdm1fcGd0YWJsZV9zdGFnZTJfaW5pdCgmaG9zdF9rdm0ucGd0 LCBtbXUsCi0JCQkJCSZob3N0X2t2bS5tbV9vcHMsIEtWTV9IT1NUX1MyX0ZMQUdTLAorCXJldCA9 IF9fa3ZtX3BndGFibGVfc3RhZ2UyX2luaXQoJmhvc3RfbW11LnBndCwgbW11LAorCQkJCQkmaG9z dF9tbXUubW1fb3BzLCBLVk1fSE9TVF9TMl9GTEFHUywKIAkJCQkJaG9zdF9zdGFnZTJfZm9yY2Vf cHRlX2NiKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JbW11LT5wZ2RfcGh5cyA9IF9f aHlwX3BhKGhvc3Rfa3ZtLnBndC5wZ2QpOwotCW1tdS0+cGd0ID0gJmhvc3Rfa3ZtLnBndDsKKwlt bXUtPnBnZF9waHlzID0gX19oeXBfcGEoaG9zdF9tbXUucGd0LnBnZCk7CisJbW11LT5wZ3QgPSAm aG9zdF9tbXUucGd0OwogCWF0b21pYzY0X3NldCgmbW11LT52bWlkLmlkLCAwKTsKIAogCXJldHVy biAwOwpAQCAtMTQzLDE5ICsxNDMsMTkgQEAgaW50IGt2bV9ob3N0X3ByZXBhcmVfc3RhZ2UyKHZv aWQgKnBndF9wb29sX2Jhc2UpCiAKIGludCBfX3Brdm1fcHJvdF9maW5hbGl6ZSh2b2lkKQogewot CXN0cnVjdCBrdm1fczJfbW11ICptbXUgPSAmaG9zdF9rdm0uYXJjaC5tbXU7CisJc3RydWN0IGt2 bV9zMl9tbXUgKm1tdSA9ICZob3N0X21tdS5hcmNoLm1tdTsKIAlzdHJ1Y3Qga3ZtX252aGVfaW5p dF9wYXJhbXMgKnBhcmFtcyA9IHRoaXNfY3B1X3B0cigma3ZtX2luaXRfcGFyYW1zKTsKIAogCWlm IChwYXJhbXMtPmhjcl9lbDIgJiBIQ1JfVk0pCiAJCXJldHVybiAtRVBFUk07CiAKIAlwYXJhbXMt PnZ0dGJyID0ga3ZtX2dldF92dHRicihtbXUpOwotCXBhcmFtcy0+dnRjciA9IGhvc3Rfa3ZtLmFy Y2gudnRjcjsKKwlwYXJhbXMtPnZ0Y3IgPSBob3N0X21tdS5hcmNoLnZ0Y3I7CiAJcGFyYW1zLT5o Y3JfZWwyIHw9IEhDUl9WTTsKIAlrdm1fZmx1c2hfZGNhY2hlX3RvX3BvYyhwYXJhbXMsIHNpemVv ZigqcGFyYW1zKSk7CiAKIAl3cml0ZV9zeXNyZWcocGFyYW1zLT5oY3JfZWwyLCBoY3JfZWwyKTsK LQlfX2xvYWRfc3RhZ2UyKCZob3N0X2t2bS5hcmNoLm1tdSwgJmhvc3Rfa3ZtLmFyY2gpOworCV9f bG9hZF9zdGFnZTIoJmhvc3RfbW11LmFyY2gubW11LCAmaG9zdF9tbXUuYXJjaCk7CiAKIAkvKgog CSAqIE1ha2Ugc3VyZSB0byBoYXZlIGFuIElTQiBiZWZvcmUgdGhlIFRMQiBtYWludGVuYW5jZSBi ZWxvdyBidXQgb25seQpAQCAtMTczLDcgKzE3Myw3IEBAIGludCBfX3Brdm1fcHJvdF9maW5hbGl6 ZSh2b2lkKQogCiBzdGF0aWMgaW50IGhvc3Rfc3RhZ2UyX3VubWFwX2Rldl9hbGwodm9pZCkKIHsK LQlzdHJ1Y3Qga3ZtX3BndGFibGUgKnBndCA9ICZob3N0X2t2bS5wZ3Q7CisJc3RydWN0IGt2bV9w Z3RhYmxlICpwZ3QgPSAmaG9zdF9tbXUucGd0OwogCXN0cnVjdCBtZW1ibG9ja19yZWdpb24gKnJl ZzsKIAl1NjQgYWRkciA9IDA7CiAJaW50IGksIHJldDsKQEAgLTI1OCw3ICsyNTgsNyBAQCBzdGF0 aWMgYm9vbCByYW5nZV9pc19tZW1vcnkodTY0IHN0YXJ0LCB1NjQgZW5kKQogc3RhdGljIGlubGlu ZSBpbnQgX19ob3N0X3N0YWdlMl9pZG1hcCh1NjQgc3RhcnQsIHU2NCBlbmQsCiAJCQkJICAgICAg ZW51bSBrdm1fcGd0YWJsZV9wcm90IHByb3QpCiB7Ci0JcmV0dXJuIGt2bV9wZ3RhYmxlX3N0YWdl Ml9tYXAoJmhvc3Rfa3ZtLnBndCwgc3RhcnQsIGVuZCAtIHN0YXJ0LCBzdGFydCwKKwlyZXR1cm4g a3ZtX3BndGFibGVfc3RhZ2UyX21hcCgmaG9zdF9tbXUucGd0LCBzdGFydCwgZW5kIC0gc3RhcnQs IHN0YXJ0LAogCQkJCSAgICAgIHByb3QsICZob3N0X3MyX3Bvb2wpOwogfQogCkBAIC0yNzEsNyAr MjcxLDcgQEAgc3RhdGljIGlubGluZSBpbnQgX19ob3N0X3N0YWdlMl9pZG1hcCh1NjQgc3RhcnQs IHU2NCBlbmQsCiAjZGVmaW5lIGhvc3Rfc3RhZ2UyX3RyeShmbiwgLi4uKQkJCQkJXAogCSh7CQkJ CQkJCQlcCiAJCWludCBfX3JldDsJCQkJCQlcCi0JCWh5cF9hc3NlcnRfbG9ja19oZWxkKCZob3N0 X2t2bS5sb2NrKTsJCQlcCisJCWh5cF9hc3NlcnRfbG9ja19oZWxkKCZob3N0X21tdS5sb2NrKTsJ CQlcCiAJCV9fcmV0ID0gZm4oX19WQV9BUkdTX18pOwkJCQlcCiAJCWlmIChfX3JldCA9PSAtRU5P TUVNKSB7CQkJCQlcCiAJCQlfX3JldCA9IGhvc3Rfc3RhZ2UyX3VubWFwX2Rldl9hbGwoKTsJCVwK QEAgLTI5NCw4ICsyOTQsOCBAQCBzdGF0aWMgaW50IGhvc3Rfc3RhZ2UyX2FkanVzdF9yYW5nZSh1 NjQgYWRkciwgc3RydWN0IGt2bV9tZW1fcmFuZ2UgKnJhbmdlKQogCXUzMiBsZXZlbDsKIAlpbnQg cmV0OwogCi0JaHlwX2Fzc2VydF9sb2NrX2hlbGQoJmhvc3Rfa3ZtLmxvY2spOwotCXJldCA9IGt2 bV9wZ3RhYmxlX2dldF9sZWFmKCZob3N0X2t2bS5wZ3QsIGFkZHIsICZwdGUsICZsZXZlbCk7CisJ aHlwX2Fzc2VydF9sb2NrX2hlbGQoJmhvc3RfbW11LmxvY2spOworCXJldCA9IGt2bV9wZ3RhYmxl X2dldF9sZWFmKCZob3N0X21tdS5wZ3QsIGFkZHIsICZwdGUsICZsZXZlbCk7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIApAQCAtMzI3LDcgKzMyNyw3IEBAIGludCBob3N0X3N0YWdlMl9pZG1h cF9sb2NrZWQocGh5c19hZGRyX3QgYWRkciwgdTY0IHNpemUsCiAKIGludCBob3N0X3N0YWdlMl9z ZXRfb3duZXJfbG9ja2VkKHBoeXNfYWRkcl90IGFkZHIsIHU2NCBzaXplLCB1OCBvd25lcl9pZCkK IHsKLQlyZXR1cm4gaG9zdF9zdGFnZTJfdHJ5KGt2bV9wZ3RhYmxlX3N0YWdlMl9zZXRfb3duZXIs ICZob3N0X2t2bS5wZ3QsCisJcmV0dXJuIGhvc3Rfc3RhZ2UyX3RyeShrdm1fcGd0YWJsZV9zdGFn ZTJfc2V0X293bmVyLCAmaG9zdF9tbXUucGd0LAogCQkJICAgICAgIGFkZHIsIHNpemUsICZob3N0 X3MyX3Bvb2wsIG93bmVyX2lkKTsKIH0KIApAQCAtNDY4LDggKzQ2OCw4IEBAIHN0YXRpYyBpbnQg X19ob3N0X2NoZWNrX3BhZ2Vfc3RhdGVfcmFuZ2UodTY0IGFkZHIsIHU2NCBzaXplLAogCQkuZ2V0 X3BhZ2Vfc3RhdGUJPSBob3N0X2dldF9wYWdlX3N0YXRlLAogCX07CiAKLQloeXBfYXNzZXJ0X2xv Y2tfaGVsZCgmaG9zdF9rdm0ubG9jayk7Ci0JcmV0dXJuIGNoZWNrX3BhZ2Vfc3RhdGVfcmFuZ2Uo Jmhvc3Rfa3ZtLnBndCwgYWRkciwgc2l6ZSwgJmQpOworCWh5cF9hc3NlcnRfbG9ja19oZWxkKCZo b3N0X21tdS5sb2NrKTsKKwlyZXR1cm4gY2hlY2tfcGFnZV9zdGF0ZV9yYW5nZSgmaG9zdF9tbXUu cGd0LCBhZGRyLCBzaXplLCAmZCk7CiB9CiAKIHN0YXRpYyBpbnQgX19ob3N0X3NldF9wYWdlX3N0 YXRlX3JhbmdlKHU2NCBhZGRyLCB1NjQgc2l6ZSwKLS0gCjIuMzguMS40MzEuZzM3YjIyYzY1MGQt Z29vZwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxp bnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LWFybS1rZXJuZWwK