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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 21898C47092 for ; Wed, 2 Jun 2021 17:08:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 E7F8D61CA9 for ; Wed, 2 Jun 2021 17:08:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7F8D61CA9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E1236EE17; Wed, 2 Jun 2021 17:08:40 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA26B6EDD4; Wed, 2 Jun 2021 17:08:37 +0000 (UTC) IronPort-SDR: ef3tKBVlIFVov8bBW3L9laldWJviRAg0DWbnhZBHoV7MWa3/WsBX0DqNWFzuXpxs7dPumqbq3C xqMMIHPh4jdw== X-IronPort-AV: E=McAfee;i="6200,9189,10003"; a="225133309" X-IronPort-AV: E=Sophos;i="5.83,242,1616482800"; d="scan'208";a="225133309" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2021 10:07:47 -0700 IronPort-SDR: wNv1OZCyfIIUYGdKrw1RPGOErYKVVWDfdIfuCwCab+8JdSOw0BaAflRWFlCSKDF1LSr62NaWzI pR591XvmQNwA== X-IronPort-AV: E=Sophos;i="5.83,242,1616482800"; d="scan'208";a="550220271" Received: from ibanaga-mobl.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.50]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2021 10:07:45 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 5/5] drm/i915/ttm: Implement object migration Date: Wed, 2 Jun 2021 19:07:16 +0200 Message-Id: <20210602170716.280491-6-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> References: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Implement object migration, needed primarily for dma-buf exports of objects currently residing in LMEM, until we land p2pdma. There are no users yet of this code. Signed-off-by: Thomas Hellström --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 100 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 10 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 7 ++ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 51 ++++++++- 4 files changed, 164 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 07e8ff9a8aae..1589053ea99e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -475,6 +475,106 @@ bool i915_gem_object_migratable(struct drm_i915_gem_object *obj) return obj->mm.n_placements > 1; } +bool i915_gem_object_can_migrate_to_region(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr, + unsigned int *placement_index) +{ + unsigned int i; + unsigned int num_allowed = obj->mm.n_placements; + + if (!i915_gem_object_evictable(obj)) + return false; + + if (num_allowed == 0 && mr != obj->mm.region) + return false; + + if (num_allowed == 1 && mr != obj->mm.placements[0]) + return false; + + for (i = 0; i < num_allowed; ++i) { + if (mr == obj->mm.placements[i]) { + if (placement_index) + *placement_index = i; + return true; + } + } + + return false; +} + +/** + * i915_gem_object_migrate_to_region_lazy - Lazily migrate an object + * @obj: The object to migrate. + * @mr: The region to migrate to. + * + * Check that @obj can migrate to @mr, and update all data necessary to + * make that happen on the next get_pages(). We sync and unbind gpu bindings + * and put pages. The word "lazy" means that the actual migration blit + * is not triggered by this function. + * + * Return: Zero on success, negative error code on failure. + */ +int i915_gem_object_migrate_to_region_lazy(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr) +{ + unsigned int index; + int ret; + + if (obj->mm.region == mr) + return 0; + + if (!i915_gem_object_can_migrate_to_region(obj, mr, &index)) + return -EINVAL; + + ret = i915_gem_object_unbind(obj, I915_GEM_OBJECT_UNBIND_ACTIVE); + if (ret) + return ret; + + ret = __i915_gem_object_put_pages(obj); + if (ret) + return ret; + + /* + * The next get_pages() will pick up the new desired placement + * and migrate. + */ + if (obj->mm.override_region) { + intel_memory_region_put(obj->mm.override_region); + obj->mm.override_region = NULL; + } + + if (index != 0) + obj->mm.override_region = + intel_memory_region_get(obj->mm.placements[index]); + + return 0; +} + +/** + * i915_gem_object_migrate_to_region - Migrate an object + * @obj: The object to migrate. + * @mr: The region to migrate to. + * + * Check that @obj can migrate to @mr, and migrate the object. + * The caller needs to check that the final region was the + * desired one since the object may have ended up elsewhere on + * lack of space in the desired region, and if there are other + * allowed placements. + * + * Return: Zero on success, negative error code on failure. + */ +int i915_gem_object_migrate_to_region(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr) +{ + int ret; + + ret = i915_gem_object_migrate_to_region_lazy(obj, mr); + if (ret) + return ret; + + return ____i915_gem_object_get_pages(obj); +} + /** * i915_gem_object_has_struct_page - Whether the object is page-backed * @obj: The object to query. diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 23e26f6b1db9..dfab5b080c54 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -592,6 +592,16 @@ bool i915_gem_object_migratable(struct drm_i915_gem_object *obj); bool i915_gem_object_validates_to_lmem(struct drm_i915_gem_object *obj); +bool i915_gem_object_can_migrate_to_region(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr, + unsigned int *placement_index); + +int i915_gem_object_migrate_to_region_lazy(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr); + +int i915_gem_object_migrate_to_region(struct drm_i915_gem_object *obj, + struct intel_memory_region *mr); + #ifdef CONFIG_MMU_NOTIFIER static inline bool i915_gem_object_is_userptr(struct drm_i915_gem_object *obj) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index fb9ccc3f50e7..d645fa6f4c37 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -264,6 +264,13 @@ struct drm_i915_gem_object { */ struct intel_memory_region *region; + /** + * Override memory region for this object. Use to + * override the order of the placement list to migrate + * an object to the desired region. + */ + struct intel_memory_region *override_region; + /** * Memory manager node allocated for this object. */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 42e89bf43708..c798470173e2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -104,19 +104,45 @@ i915_ttm_placement_from_obj(const struct drm_i915_gem_object *obj, { unsigned int i; unsigned int num_allowed = obj->mm.n_placements; + struct intel_memory_region *requested_mr; + unsigned int swap_index = 0; placement->num_placement = 1; - i915_ttm_place_from_region(num_allowed ? obj->mm.placements[0] : - obj->mm.region, requested); - /* Cache this on object? */ + /* + * We migrate by setting the override region to something sensible. + * Warn if the override region is not in the allowed regions list + */ + if (obj->mm.override_region && !GEM_WARN_ON(!num_allowed)) { + requested_mr = obj->mm.override_region; + swap_index = num_allowed; + } else if (num_allowed) { + requested_mr = obj->mm.placements[0]; + } else { + requested_mr = obj->mm.region; + } + i915_ttm_place_from_region(requested_mr, requested); + + /* In the future we might want to cache the busy list on the object? */ placement->num_busy_placement = num_allowed; - for (i = 0; i < placement->num_busy_placement; ++i) + for (i = 0; i < placement->num_busy_placement; ++i) { i915_ttm_place_from_region(obj->mm.placements[i], busy + i); + if (requested_mr == obj->mm.placements[i]) + swap_index = i; + } + + /* Override region was not in placement list. */ + if (num_allowed && GEM_WARN_ON(swap_index == num_allowed)) { + swap_index = 0; + i915_ttm_place_from_region(obj->mm.placements[0], requested); + } if (num_allowed == 0) { *busy = *requested; placement->num_busy_placement = 1; + } else if (swap_index != 0) { + /* Put the override placement highest in the busy list */ + swap(busy[0], busy[swap_index]); } placement->placement = requested; @@ -246,6 +272,23 @@ static void i915_ttm_adjust_gem_after_move(struct drm_i915_gem_object *obj) struct drm_i915_private *i915 = to_i915(obj->base.dev); struct ttm_buffer_object *bo = i915_gem_to_ttm(obj); unsigned int cache_level; + unsigned int i; + + /* + * If object was moved to an allowable region, update the object + * region to consider it migrated. Note that if it's currently not + * in an allowable region, it's evicted and we don't update the + * object region. + */ + for (i = 0; i < obj->mm.n_placements; ++i) { + struct intel_memory_region *mr = obj->mm.placements[i]; + + if (intel_region_to_ttm_type(mr) == bo->mem.mem_type && + mr != obj->mm.region) { + intel_memory_region_put(obj->mm.region); + obj->mm.region = intel_memory_region_get(mr); + } + } obj->mem_flags &= ~(I915_BO_FLAG_STRUCT_PAGE | I915_BO_FLAG_IOMEM); -- 2.31.1 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 35F52C47083 for ; Wed, 2 Jun 2021 17:08:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0B04961CA8 for ; Wed, 2 Jun 2021 17:08:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B04961CA8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D4DF6EE0C; Wed, 2 Jun 2021 17:08:41 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA26B6EDD4; Wed, 2 Jun 2021 17:08:37 +0000 (UTC) IronPort-SDR: ef3tKBVlIFVov8bBW3L9laldWJviRAg0DWbnhZBHoV7MWa3/WsBX0DqNWFzuXpxs7dPumqbq3C xqMMIHPh4jdw== X-IronPort-AV: E=McAfee;i="6200,9189,10003"; a="225133309" X-IronPort-AV: E=Sophos;i="5.83,242,1616482800"; d="scan'208";a="225133309" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2021 10:07:47 -0700 IronPort-SDR: wNv1OZCyfIIUYGdKrw1RPGOErYKVVWDfdIfuCwCab+8JdSOw0BaAflRWFlCSKDF1LSr62NaWzI pR591XvmQNwA== X-IronPort-AV: E=Sophos;i="5.83,242,1616482800"; d="scan'208";a="550220271" Received: from ibanaga-mobl.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.50]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2021 10:07:45 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Wed, 2 Jun 2021 19:07:16 +0200 Message-Id: <20210602170716.280491-6-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> References: <20210602170716.280491-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 5/5] drm/i915/ttm: Implement object migration X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" SW1wbGVtZW50IG9iamVjdCBtaWdyYXRpb24sIG5lZWRlZCBwcmltYXJpbHkgZm9yIGRtYS1idWYg ZXhwb3J0cyBvZgpvYmplY3RzIGN1cnJlbnRseSByZXNpZGluZyBpbiBMTUVNLCB1bnRpbCB3ZSBs YW5kIHAycGRtYS4KVGhlcmUgYXJlIG5vIHVzZXJzIHlldCBvZiB0aGlzIGNvZGUuCgpTaWduZWQt b2ZmLWJ5OiBUaG9tYXMgSGVsbHN0csO2bSA8dGhvbWFzLmhlbGxzdHJvbUBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX29iamVjdC5jICAgIHwg MTAwICsrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2Vt X29iamVjdC5oICAgIHwgIDEwICsrCiAuLi4vZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmpl Y3RfdHlwZXMuaCAgfCAgIDcgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV90 dG0uYyAgICAgICB8ICA1MSArKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTY0IGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z2VtL2k5MTVfZ2VtX29iamVjdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2Vt X29iamVjdC5jCmluZGV4IDA3ZThmZjlhOGFhZS4uMTU4OTA1M2VhOTllIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fb2JqZWN0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX29iamVjdC5jCkBAIC00NzUsNiArNDc1LDEwNiBAQCBi b29sIGk5MTVfZ2VtX29iamVjdF9taWdyYXRhYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopCiAJcmV0dXJuIG9iai0+bW0ubl9wbGFjZW1lbnRzID4gMTsKIH0KIAorYm9vbCBpOTE1 X2dlbV9vYmplY3RfY2FuX21pZ3JhdGVfdG9fcmVnaW9uKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCisJCQkJCSAgIHN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICptciwKKwkJCQkJ ICAgdW5zaWduZWQgaW50ICpwbGFjZW1lbnRfaW5kZXgpCit7CisJdW5zaWduZWQgaW50IGk7CisJ dW5zaWduZWQgaW50IG51bV9hbGxvd2VkID0gb2JqLT5tbS5uX3BsYWNlbWVudHM7CisKKwlpZiAo IWk5MTVfZ2VtX29iamVjdF9ldmljdGFibGUob2JqKSkKKwkJcmV0dXJuIGZhbHNlOworCisJaWYg KG51bV9hbGxvd2VkID09IDAgJiYgbXIgIT0gb2JqLT5tbS5yZWdpb24pCisJCXJldHVybiBmYWxz ZTsKKworCWlmIChudW1fYWxsb3dlZCA9PSAxICYmIG1yICE9IG9iai0+bW0ucGxhY2VtZW50c1sw XSkKKwkJcmV0dXJuIGZhbHNlOworCisJZm9yIChpID0gMDsgaSA8IG51bV9hbGxvd2VkOyArK2kp IHsKKwkJaWYgKG1yID09IG9iai0+bW0ucGxhY2VtZW50c1tpXSkgeworCQkJaWYgKHBsYWNlbWVu dF9pbmRleCkKKwkJCQkqcGxhY2VtZW50X2luZGV4ID0gaTsKKwkJCXJldHVybiB0cnVlOworCQl9 CisJfQorCisJcmV0dXJuIGZhbHNlOworfQorCisvKioKKyAqIGk5MTVfZ2VtX29iamVjdF9taWdy YXRlX3RvX3JlZ2lvbl9sYXp5IC0gTGF6aWx5IG1pZ3JhdGUgYW4gb2JqZWN0CisgKiBAb2JqOiBU aGUgb2JqZWN0IHRvIG1pZ3JhdGUuCisgKiBAbXI6IFRoZSByZWdpb24gdG8gbWlncmF0ZSB0by4K KyAqCisgKiBDaGVjayB0aGF0IEBvYmogY2FuIG1pZ3JhdGUgdG8gQG1yLCBhbmQgdXBkYXRlIGFs bCBkYXRhIG5lY2Vzc2FyeSB0bworICogbWFrZSB0aGF0IGhhcHBlbiBvbiB0aGUgbmV4dCBnZXRf cGFnZXMoKS4gV2Ugc3luYyBhbmQgdW5iaW5kIGdwdSBiaW5kaW5ncworICogYW5kIHB1dCBwYWdl cy4gVGhlIHdvcmQgImxhenkiIG1lYW5zIHRoYXQgdGhlIGFjdHVhbCBtaWdyYXRpb24gYmxpdAor ICogaXMgbm90IHRyaWdnZXJlZCBieSB0aGlzIGZ1bmN0aW9uLgorICoKKyAqIFJldHVybjogWmVy byBvbiBzdWNjZXNzLCBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCisgKi8KK2ludCBp OTE1X2dlbV9vYmplY3RfbWlncmF0ZV90b19yZWdpb25fbGF6eShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAorCQkJCQkgICBzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lvbiAqbXIpCit7 CisJdW5zaWduZWQgaW50IGluZGV4OworCWludCByZXQ7CisKKwlpZiAob2JqLT5tbS5yZWdpb24g PT0gbXIpCisJCXJldHVybiAwOworCisJaWYgKCFpOTE1X2dlbV9vYmplY3RfY2FuX21pZ3JhdGVf dG9fcmVnaW9uKG9iaiwgbXIsICZpbmRleCkpCisJCXJldHVybiAtRUlOVkFMOworCisJcmV0ID0g aTkxNV9nZW1fb2JqZWN0X3VuYmluZChvYmosIEk5MTVfR0VNX09CSkVDVF9VTkJJTkRfQUNUSVZF KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0ID0gX19pOTE1X2dlbV9vYmplY3Rf cHV0X3BhZ2VzKG9iaik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCS8qCisJICogVGhl IG5leHQgZ2V0X3BhZ2VzKCkgd2lsbCBwaWNrIHVwIHRoZSBuZXcgZGVzaXJlZCBwbGFjZW1lbnQK KwkgKiBhbmQgbWlncmF0ZS4KKwkgKi8KKwlpZiAob2JqLT5tbS5vdmVycmlkZV9yZWdpb24pIHsK KwkJaW50ZWxfbWVtb3J5X3JlZ2lvbl9wdXQob2JqLT5tbS5vdmVycmlkZV9yZWdpb24pOworCQlv YmotPm1tLm92ZXJyaWRlX3JlZ2lvbiA9IE5VTEw7CisJfQorCisJaWYgKGluZGV4ICE9IDApCisJ CW9iai0+bW0ub3ZlcnJpZGVfcmVnaW9uID0KKwkJCWludGVsX21lbW9yeV9yZWdpb25fZ2V0KG9i ai0+bW0ucGxhY2VtZW50c1tpbmRleF0pOworCisJcmV0dXJuIDA7Cit9CisKKy8qKgorICogaTkx NV9nZW1fb2JqZWN0X21pZ3JhdGVfdG9fcmVnaW9uIC0gTWlncmF0ZSBhbiBvYmplY3QKKyAqIEBv Ymo6IFRoZSBvYmplY3QgdG8gbWlncmF0ZS4KKyAqIEBtcjogVGhlIHJlZ2lvbiB0byBtaWdyYXRl IHRvLgorICoKKyAqIENoZWNrIHRoYXQgQG9iaiBjYW4gbWlncmF0ZSB0byBAbXIsIGFuZCBtaWdy YXRlIHRoZSBvYmplY3QuCisgKiBUaGUgY2FsbGVyIG5lZWRzIHRvIGNoZWNrIHRoYXQgdGhlIGZp bmFsIHJlZ2lvbiB3YXMgdGhlCisgKiBkZXNpcmVkIG9uZSBzaW5jZSB0aGUgb2JqZWN0IG1heSBo YXZlIGVuZGVkIHVwIGVsc2V3aGVyZSBvbgorICogbGFjayBvZiBzcGFjZSBpbiB0aGUgZGVzaXJl ZCByZWdpb24sIGFuZCBpZiB0aGVyZSBhcmUgb3RoZXIKKyAqIGFsbG93ZWQgcGxhY2VtZW50cy4K KyAqCisgKiBSZXR1cm46IFplcm8gb24gc3VjY2VzcywgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBm YWlsdXJlLgorICovCitpbnQgaTkxNV9nZW1fb2JqZWN0X21pZ3JhdGVfdG9fcmVnaW9uKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJICAgICAgc3RydWN0IGludGVsX21lbW9y eV9yZWdpb24gKm1yKQoreworCWludCByZXQ7CisKKwlyZXQgPSBpOTE1X2dlbV9vYmplY3RfbWln cmF0ZV90b19yZWdpb25fbGF6eShvYmosIG1yKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0Owor CisJcmV0dXJuIF9fX19pOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKG9iaik7Cit9CisKIC8qKgog ICogaTkxNV9nZW1fb2JqZWN0X2hhc19zdHJ1Y3RfcGFnZSAtIFdoZXRoZXIgdGhlIG9iamVjdCBp cyBwYWdlLWJhY2tlZAogICogQG9iajogVGhlIG9iamVjdCB0byBxdWVyeS4KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuaAppbmRleCAyM2UyNmY2YjFkYjkuLmRmYWI1 YjA4MGM1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX29i amVjdC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuaApA QCAtNTkyLDYgKzU5MiwxNiBAQCBib29sIGk5MTVfZ2VtX29iamVjdF9taWdyYXRhYmxlKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwogCiBib29sIGk5MTVfZ2VtX29iamVjdF92YWxp ZGF0ZXNfdG9fbG1lbShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIAorYm9vbCBp OTE1X2dlbV9vYmplY3RfY2FuX21pZ3JhdGVfdG9fcmVnaW9uKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCisJCQkJCSAgIHN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICptciwKKwkJ CQkJICAgdW5zaWduZWQgaW50ICpwbGFjZW1lbnRfaW5kZXgpOworCitpbnQgaTkxNV9nZW1fb2Jq ZWN0X21pZ3JhdGVfdG9fcmVnaW9uX2xhenkoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aiwKKwkJCQkJICAgc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24gKm1yKTsKKworaW50IGk5MTVf Z2VtX29iamVjdF9taWdyYXRlX3RvX3JlZ2lvbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICptcik7CisKICNpZmRl ZiBDT05GSUdfTU1VX05PVElGSUVSCiBzdGF0aWMgaW5saW5lIGJvb2wKIGk5MTVfZ2VtX29iamVj dF9pc191c2VycHRyKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fb2JqZWN0X3R5cGVzLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fb2JqZWN0X3R5cGVzLmgKaW5kZXggZmI5Y2Nj M2Y1MGU3Li5kNjQ1ZmE2ZjRjMzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dl bS9pOTE1X2dlbV9vYmplY3RfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0v aTkxNV9nZW1fb2JqZWN0X3R5cGVzLmgKQEAgLTI2NCw2ICsyNjQsMTMgQEAgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgewogCQkgKi8KIAkJc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24gKnJl Z2lvbjsKIAorCQkvKioKKwkJICogT3ZlcnJpZGUgbWVtb3J5IHJlZ2lvbiBmb3IgdGhpcyBvYmpl Y3QuIFVzZSB0bworCQkgKiBvdmVycmlkZSB0aGUgb3JkZXIgb2YgdGhlIHBsYWNlbWVudCBsaXN0 IHRvIG1pZ3JhdGUKKwkJICogYW4gb2JqZWN0IHRvIHRoZSBkZXNpcmVkIHJlZ2lvbi4KKwkJICov CisJCXN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICpvdmVycmlkZV9yZWdpb247CisKIAkJLyoq CiAJCSAqIE1lbW9yeSBtYW5hZ2VyIG5vZGUgYWxsb2NhdGVkIGZvciB0aGlzIG9iamVjdC4KIAkJ ICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fdHRtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fdHRtLmMKaW5kZXggNDJlODliZjQz NzA4Li5jNzk4NDcwMTczZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9p OTE1X2dlbV90dG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fdHRt LmMKQEAgLTEwNCwxOSArMTA0LDQ1IEBAIGk5MTVfdHRtX3BsYWNlbWVudF9mcm9tX29iaihjb25z dCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogewogCXVuc2lnbmVkIGludCBpOwog CXVuc2lnbmVkIGludCBudW1fYWxsb3dlZCA9IG9iai0+bW0ubl9wbGFjZW1lbnRzOworCXN0cnVj dCBpbnRlbF9tZW1vcnlfcmVnaW9uICpyZXF1ZXN0ZWRfbXI7CisJdW5zaWduZWQgaW50IHN3YXBf aW5kZXggPSAwOwogCiAJcGxhY2VtZW50LT5udW1fcGxhY2VtZW50ID0gMTsKLQlpOTE1X3R0bV9w bGFjZV9mcm9tX3JlZ2lvbihudW1fYWxsb3dlZCA/IG9iai0+bW0ucGxhY2VtZW50c1swXSA6Ci0J CQkJICAgb2JqLT5tbS5yZWdpb24sIHJlcXVlc3RlZCk7CiAKLQkvKiBDYWNoZSB0aGlzIG9uIG9i amVjdD8gKi8KKwkvKgorCSAqIFdlIG1pZ3JhdGUgYnkgc2V0dGluZyB0aGUgb3ZlcnJpZGUgcmVn aW9uIHRvIHNvbWV0aGluZyBzZW5zaWJsZS4KKwkgKiBXYXJuIGlmIHRoZSBvdmVycmlkZSByZWdp b24gaXMgbm90IGluIHRoZSBhbGxvd2VkIHJlZ2lvbnMgbGlzdAorCSAqLworCWlmIChvYmotPm1t Lm92ZXJyaWRlX3JlZ2lvbiAmJiAhR0VNX1dBUk5fT04oIW51bV9hbGxvd2VkKSkgeworCQlyZXF1 ZXN0ZWRfbXIgPSBvYmotPm1tLm92ZXJyaWRlX3JlZ2lvbjsKKwkJc3dhcF9pbmRleCA9IG51bV9h bGxvd2VkOworCX0gZWxzZSBpZiAobnVtX2FsbG93ZWQpIHsKKwkJcmVxdWVzdGVkX21yID0gb2Jq LT5tbS5wbGFjZW1lbnRzWzBdOworCX0gZWxzZSB7CisJCXJlcXVlc3RlZF9tciA9IG9iai0+bW0u cmVnaW9uOworCX0KKwlpOTE1X3R0bV9wbGFjZV9mcm9tX3JlZ2lvbihyZXF1ZXN0ZWRfbXIsIHJl cXVlc3RlZCk7CisKKwkvKiBJbiB0aGUgZnV0dXJlIHdlIG1pZ2h0IHdhbnQgdG8gY2FjaGUgdGhl IGJ1c3kgbGlzdCBvbiB0aGUgb2JqZWN0PyAqLwogCXBsYWNlbWVudC0+bnVtX2J1c3lfcGxhY2Vt ZW50ID0gbnVtX2FsbG93ZWQ7Ci0JZm9yIChpID0gMDsgaSA8IHBsYWNlbWVudC0+bnVtX2J1c3lf cGxhY2VtZW50OyArK2kpCisJZm9yIChpID0gMDsgaSA8IHBsYWNlbWVudC0+bnVtX2J1c3lfcGxh Y2VtZW50OyArK2kpIHsKIAkJaTkxNV90dG1fcGxhY2VfZnJvbV9yZWdpb24ob2JqLT5tbS5wbGFj ZW1lbnRzW2ldLCBidXN5ICsgaSk7CisJCWlmIChyZXF1ZXN0ZWRfbXIgPT0gb2JqLT5tbS5wbGFj ZW1lbnRzW2ldKQorCQkJc3dhcF9pbmRleCA9IGk7CisJfQorCisJLyogT3ZlcnJpZGUgcmVnaW9u IHdhcyBub3QgaW4gcGxhY2VtZW50IGxpc3QuICovCisJaWYgKG51bV9hbGxvd2VkICYmIEdFTV9X QVJOX09OKHN3YXBfaW5kZXggPT0gbnVtX2FsbG93ZWQpKSB7CisJCXN3YXBfaW5kZXggPSAwOwor CQlpOTE1X3R0bV9wbGFjZV9mcm9tX3JlZ2lvbihvYmotPm1tLnBsYWNlbWVudHNbMF0sIHJlcXVl c3RlZCk7CisJfQogCiAJaWYgKG51bV9hbGxvd2VkID09IDApIHsKIAkJKmJ1c3kgPSAqcmVxdWVz dGVkOwogCQlwbGFjZW1lbnQtPm51bV9idXN5X3BsYWNlbWVudCA9IDE7CisJfSBlbHNlIGlmIChz d2FwX2luZGV4ICE9IDApIHsKKwkJLyogUHV0IHRoZSBvdmVycmlkZSBwbGFjZW1lbnQgaGlnaGVz dCBpbiB0aGUgYnVzeSBsaXN0ICovCisJCXN3YXAoYnVzeVswXSwgYnVzeVtzd2FwX2luZGV4XSk7 CiAJfQogCiAJcGxhY2VtZW50LT5wbGFjZW1lbnQgPSByZXF1ZXN0ZWQ7CkBAIC0yNDYsNiArMjcy LDIzIEBAIHN0YXRpYyB2b2lkIGk5MTVfdHRtX2FkanVzdF9nZW1fYWZ0ZXJfbW92ZShzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 ID0gdG9faTkxNShvYmotPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJv ID0gaTkxNV9nZW1fdG9fdHRtKG9iaik7CiAJdW5zaWduZWQgaW50IGNhY2hlX2xldmVsOworCXVu c2lnbmVkIGludCBpOworCisJLyoKKwkgKiBJZiBvYmplY3Qgd2FzIG1vdmVkIHRvIGFuIGFsbG93 YWJsZSByZWdpb24sIHVwZGF0ZSB0aGUgb2JqZWN0CisJICogcmVnaW9uIHRvIGNvbnNpZGVyIGl0 IG1pZ3JhdGVkLiBOb3RlIHRoYXQgaWYgaXQncyBjdXJyZW50bHkgbm90CisJICogaW4gYW4gYWxs b3dhYmxlIHJlZ2lvbiwgaXQncyBldmljdGVkIGFuZCB3ZSBkb24ndCB1cGRhdGUgdGhlCisJICog b2JqZWN0IHJlZ2lvbi4KKwkgKi8KKwlmb3IgKGkgPSAwOyBpIDwgb2JqLT5tbS5uX3BsYWNlbWVu dHM7ICsraSkgeworCQlzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lvbiAqbXIgPSBvYmotPm1tLnBs YWNlbWVudHNbaV07CisKKwkJaWYgKGludGVsX3JlZ2lvbl90b190dG1fdHlwZShtcikgPT0gYm8t Pm1lbS5tZW1fdHlwZSAmJgorCQkgICAgbXIgIT0gb2JqLT5tbS5yZWdpb24pIHsKKwkJCWludGVs X21lbW9yeV9yZWdpb25fcHV0KG9iai0+bW0ucmVnaW9uKTsKKwkJCW9iai0+bW0ucmVnaW9uID0g aW50ZWxfbWVtb3J5X3JlZ2lvbl9nZXQobXIpOworCQl9CisJfQogCiAJb2JqLT5tZW1fZmxhZ3Mg Jj0gfihJOTE1X0JPX0ZMQUdfU1RSVUNUX1BBR0UgfCBJOTE1X0JPX0ZMQUdfSU9NRU0pOwogCi0t IAoyLjMxLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=