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=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A359AC47E48 for ; Thu, 15 Jul 2021 09:18: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 76D3860BD3 for ; Thu, 15 Jul 2021 09:18:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76D3860BD3 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 9D0EF6E7D9; Thu, 15 Jul 2021 09:18:44 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C3AD6E7D3; Thu, 15 Jul 2021 09:18:40 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10045"; a="232333025" X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="232333025" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 02:18:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="572767990" Received: from shyland-mobl2.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.241.81]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 02:18:38 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Subject: [RFC 7/8] drm/i915: Expose client engine utilisation via fdinfo Date: Thu, 15 Jul 2021 10:18:19 +0100 Message-Id: <20210715091820.1613726-8-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715091820.1613726-1-tvrtko.ursulin@linux.intel.com> References: <20210715091820.1613726-1-tvrtko.ursulin@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: David M Nieto , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org, Tvrtko Ursulin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Tvrtko Ursulin Similar to AMD commit 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the infrastructure added in previous patches, we add basic client info and GPU engine utilisation for i915. Example of the output: pos: 0 flags: 0100002 mnt_id: 21 drm-driver: i915 drm-pdev: 0000:00:02.0 drm-client-id: 7 drm-engine-render: 9288864723 ns drm-engine-copy: 2035071108 ns drm-engine-video: 0 ns drm-engine-video-enhance: 0 ns v2: * Update for removal of name and pid. Signed-off-by: Tvrtko Ursulin Cc: David M Nieto Cc: Christian König Cc: Daniel Vetter --- Documentation/gpu/drm-usage-stats.rst | 6 +++ Documentation/gpu/i915.rst | 27 ++++++++++ drivers/gpu/drm/i915/i915_drm_client.c | 73 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drm_client.h | 4 ++ drivers/gpu/drm/i915/i915_drv.c | 3 ++ 5 files changed, 113 insertions(+) diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst index 78dc01c30e22..b87505438aaa 100644 --- a/Documentation/gpu/drm-usage-stats.rst +++ b/Documentation/gpu/drm-usage-stats.rst @@ -95,3 +95,9 @@ object belong to this client, in the respective memory region. Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' indicating kibi- or mebi-bytes. + +=============================== +Driver specific implementations +=============================== + +:ref:`i915-usage-stats` diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst index 204ebdaadb45..b28cc316dbd9 100644 --- a/Documentation/gpu/i915.rst +++ b/Documentation/gpu/i915.rst @@ -701,3 +701,30 @@ The style guide for ``i915_reg.h``. .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h :doc: The i915 register macro definition style guide + +.. _i915-usage-stats: + +i915 DRM client usage stats implementation +========================================== + +The drm/i915 driver implements the DRM client usage stats specification as +documented in :ref:`drm-client-usage-stats`. + +Example of the output showing the implemented key value pairs and entirety of +the currenly possible format options: + +:: + + pos: 0 + flags: 0100002 + mnt_id: 21 + drm-driver: i915 + drm-pdev: 0000:00:02.0 + drm-client-id: 7 + drm-engine-render: 9288864723 ns + drm-engine-copy: 2035071108 ns + drm-engine-video: 0 ns + drm-engine-video-enhance: 0 ns + +Possible `drm-engine-` key names are: `render`, `copy`, `video` and +`video-enhance`. diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c index 91a8559bebf7..8a6706e06e31 100644 --- a/drivers/gpu/drm/i915/i915_drm_client.c +++ b/drivers/gpu/drm/i915/i915_drm_client.c @@ -7,6 +7,11 @@ #include #include +#include + +#include + +#include "gem/i915_gem_context.h" #include "i915_drm_client.h" #include "i915_gem.h" #include "i915_utils.h" @@ -68,3 +73,71 @@ void i915_drm_clients_fini(struct i915_drm_clients *clients) GEM_BUG_ON(!xa_empty(&clients->xarray)); xa_destroy(&clients->xarray); } + +#ifdef CONFIG_PROC_FS +static const char * const uabi_class_names[] = { + [I915_ENGINE_CLASS_RENDER] = "render", + [I915_ENGINE_CLASS_COPY] = "copy", + [I915_ENGINE_CLASS_VIDEO] = "video", + [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance", +}; + +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class) +{ + struct i915_gem_engines_iter it; + struct intel_context *ce; + u64 total = 0; + + for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) { + if (ce->engine->uabi_class != class) + continue; + + total += intel_context_get_total_runtime_ns(ce); + } + + return total; +} + +static void +show_client_class(struct seq_file *m, + struct i915_drm_client *client, + unsigned int class) +{ + const struct list_head *list = &client->ctx_list; + u64 total = atomic64_read(&client->past_runtime[class]); + struct i915_gem_context *ctx; + + rcu_read_lock(); + list_for_each_entry_rcu(ctx, list, client_link) + total += busy_add(ctx, class); + rcu_read_unlock(); + + return seq_printf(m, "drm-engine-%s:\t%llu ns\n", + uabi_class_names[class], total); +} + +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f) +{ + struct drm_file *file = f->private_data; + struct drm_i915_file_private *file_priv = file->driver_priv; + struct drm_i915_private *i915 = file_priv->dev_priv; + struct i915_drm_client *client = file_priv->client; + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); + unsigned int i; + + /* + * ****************************************************************** + * For text output format description please see drm-usage-stats.rst! + * ****************************************************************** + */ + + seq_puts(m, "drm-driver:\ti915\n"); + seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n", + pci_domain_nr(pdev->bus), pdev->bus->number, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); + seq_printf(m, "drm-client-id:\t%u\n", client->id); + + for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++) + show_client_class(m, client, i); +} +#endif diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h index 7416e18aa33c..d96d6a06302e 100644 --- a/drivers/gpu/drm/i915/i915_drm_client.h +++ b/drivers/gpu/drm/i915/i915_drm_client.h @@ -57,6 +57,10 @@ static inline void i915_drm_client_put(struct i915_drm_client *client) struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients); +#ifdef CONFIG_PROC_FS +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f); +#endif + void i915_drm_clients_fini(struct i915_drm_clients *clients); #endif /* !__I915_DRM_CLIENT_H__ */ diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index bb628eade92a..b2736b1e5a06 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1706,6 +1706,9 @@ static const struct file_operations i915_driver_fops = { .read = drm_read, .compat_ioctl = i915_ioc32_compat_ioctl, .llseek = noop_llseek, +#ifdef CONFIG_PROC_FS + .show_fdinfo = i915_drm_client_fdinfo, +#endif }; static int -- 2.30.2 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=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 BD50DC47E4D for ; Thu, 15 Jul 2021 09:18:50 +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 90660610C7 for ; Thu, 15 Jul 2021 09:18:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90660610C7 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 37DBB6E5CF; Thu, 15 Jul 2021 09:18:42 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C3AD6E7D3; Thu, 15 Jul 2021 09:18:40 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10045"; a="232333025" X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="232333025" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 02:18:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="572767990" Received: from shyland-mobl2.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.241.81]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2021 02:18:38 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 15 Jul 2021 10:18:19 +0100 Message-Id: <20210715091820.1613726-8-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715091820.1613726-1-tvrtko.ursulin@linux.intel.com> References: <20210715091820.1613726-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [RFC 7/8] drm/i915: Expose client engine utilisation via fdinfo 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: David M Nieto , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbWlsYXIg dG8gQU1EIGNvbW1pdAo4NzQ0NDI1NDExMzMgKCJkcm0vYW1kZ3B1OiBBZGQgc2hvd19mZGluZm8o KSBpbnRlcmZhY2UiKSwgdXNpbmcgdGhlCmluZnJhc3RydWN0dXJlIGFkZGVkIGluIHByZXZpb3Vz IHBhdGNoZXMsIHdlIGFkZCBiYXNpYyBjbGllbnQgaW5mbwphbmQgR1BVIGVuZ2luZSB1dGlsaXNh dGlvbiBmb3IgaTkxNS4KCkV4YW1wbGUgb2YgdGhlIG91dHB1dDoKCiAgcG9zOiAgICAwCiAgZmxh Z3M6ICAwMTAwMDAyCiAgbW50X2lkOiAyMQogIGRybS1kcml2ZXI6IGk5MTUKICBkcm0tcGRldjog ICAwMDAwOjAwOjAyLjAKICBkcm0tY2xpZW50LWlkOiAgICAgIDcKICBkcm0tZW5naW5lLXJlbmRl cjogIDkyODg4NjQ3MjMgbnMKICBkcm0tZW5naW5lLWNvcHk6ICAgIDIwMzUwNzExMDggbnMKICBk cm0tZW5naW5lLXZpZGVvOiAgIDAgbnMKICBkcm0tZW5naW5lLXZpZGVvLWVuaGFuY2U6ICAgMCBu cwoKdjI6CiAqIFVwZGF0ZSBmb3IgcmVtb3ZhbCBvZiBuYW1lIGFuZCBwaWQuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogRGF2aWQg TSBOaWV0byA8RGF2aWQuTmlldG9AYW1kLmNvbT4KQ2M6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlz dGlhbi5rb2VuaWdAYW1kLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4K LS0tCiBEb2N1bWVudGF0aW9uL2dwdS9kcm0tdXNhZ2Utc3RhdHMucnN0ICB8ICA2ICsrKwogRG9j dW1lbnRhdGlvbi9ncHUvaTkxNS5yc3QgICAgICAgICAgICAgfCAyNyArKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RybV9jbGllbnQuYyB8IDczICsrKysrKysrKysrKysrKysr KysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RybV9jbGllbnQuaCB8ICA0ICsr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICB8ICAzICsrCiA1IGZpbGVz IGNoYW5nZWQsIDExMyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9n cHUvZHJtLXVzYWdlLXN0YXRzLnJzdCBiL0RvY3VtZW50YXRpb24vZ3B1L2RybS11c2FnZS1zdGF0 cy5yc3QKaW5kZXggNzhkYzAxYzMwZTIyLi5iODc1MDU0MzhhYWEgMTAwNjQ0Ci0tLSBhL0RvY3Vt ZW50YXRpb24vZ3B1L2RybS11c2FnZS1zdGF0cy5yc3QKKysrIGIvRG9jdW1lbnRhdGlvbi9ncHUv ZHJtLXVzYWdlLXN0YXRzLnJzdApAQCAtOTUsMyArOTUsOSBAQCBvYmplY3QgYmVsb25nIHRvIHRo aXMgY2xpZW50LCBpbiB0aGUgcmVzcGVjdGl2ZSBtZW1vcnkgcmVnaW9uLgogCiBEZWZhdWx0IHVu aXQgc2hhbGwgYmUgYnl0ZXMgd2l0aCBvcHRpb25hbCB1bml0IHNwZWNpZmllcnMgb2YgJ0tpQicg b3IgJ01pQicKIGluZGljYXRpbmcga2liaS0gb3IgbWViaS1ieXRlcy4KKworPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQorRHJpdmVyIHNwZWNpZmljIGltcGxlbWVudGF0aW9ucworPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCis6cmVmOmBpOTE1LXVzYWdlLXN0YXRzYApk aWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9ncHUvaTkxNS5yc3QgYi9Eb2N1bWVudGF0aW9uL2dw dS9pOTE1LnJzdAppbmRleCAyMDRlYmRhYWRiNDUuLmIyOGNjMzE2ZGJkOSAxMDA2NDQKLS0tIGEv RG9jdW1lbnRhdGlvbi9ncHUvaTkxNS5yc3QKKysrIGIvRG9jdW1lbnRhdGlvbi9ncHUvaTkxNS5y c3QKQEAgLTcwMSwzICs3MDEsMzAgQEAgVGhlIHN0eWxlIGd1aWRlIGZvciBgYGk5MTVfcmVnLmhg YC4KIAogLi4ga2VybmVsLWRvYzo6IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKICAg IDpkb2M6IFRoZSBpOTE1IHJlZ2lzdGVyIG1hY3JvIGRlZmluaXRpb24gc3R5bGUgZ3VpZGUKKwor Li4gX2k5MTUtdXNhZ2Utc3RhdHM6CisKK2k5MTUgRFJNIGNsaWVudCB1c2FnZSBzdGF0cyBpbXBs ZW1lbnRhdGlvbgorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisK K1RoZSBkcm0vaTkxNSBkcml2ZXIgaW1wbGVtZW50cyB0aGUgRFJNIGNsaWVudCB1c2FnZSBzdGF0 cyBzcGVjaWZpY2F0aW9uIGFzCitkb2N1bWVudGVkIGluIDpyZWY6YGRybS1jbGllbnQtdXNhZ2Ut c3RhdHNgLgorCitFeGFtcGxlIG9mIHRoZSBvdXRwdXQgc2hvd2luZyB0aGUgaW1wbGVtZW50ZWQg a2V5IHZhbHVlIHBhaXJzIGFuZCBlbnRpcmV0eSBvZgordGhlIGN1cnJlbmx5IHBvc3NpYmxlIGZv cm1hdCBvcHRpb25zOgorCis6OgorCisgICAgICBwb3M6ICAgIDAKKyAgICAgIGZsYWdzOiAgMDEw MDAwMgorICAgICAgbW50X2lkOiAyMQorICAgICAgZHJtLWRyaXZlcjogaTkxNQorICAgICAgZHJt LXBkZXY6ICAgMDAwMDowMDowMi4wCisgICAgICBkcm0tY2xpZW50LWlkOiAgICAgIDcKKyAgICAg IGRybS1lbmdpbmUtcmVuZGVyOiAgOTI4ODg2NDcyMyBucworICAgICAgZHJtLWVuZ2luZS1jb3B5 OiAgICAyMDM1MDcxMTA4IG5zCisgICAgICBkcm0tZW5naW5lLXZpZGVvOiAgIDAgbnMKKyAgICAg IGRybS1lbmdpbmUtdmlkZW8tZW5oYW5jZTogICAwIG5zCisKK1Bvc3NpYmxlIGBkcm0tZW5naW5l LWAga2V5IG5hbWVzIGFyZTogYHJlbmRlcmAsIGBjb3B5YCwgYHZpZGVvYCBhbmQKK2B2aWRlby1l bmhhbmNlYC4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJtX2NsaWVu dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcm1fY2xpZW50LmMKaW5kZXggOTFhODU1 OWJlYmY3Li44YTY3MDZlMDZlMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJtX2NsaWVudC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJtX2NsaWVu dC5jCkBAIC03LDYgKzcsMTEgQEAKICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CiAjaW5jbHVkZSA8 bGludXgvdHlwZXMuaD4KIAorI2luY2x1ZGUgPHVhcGkvZHJtL2k5MTVfZHJtLmg+CisKKyNpbmNs dWRlIDxkcm0vZHJtX3ByaW50Lmg+CisKKyNpbmNsdWRlICJnZW0vaTkxNV9nZW1fY29udGV4dC5o IgogI2luY2x1ZGUgImk5MTVfZHJtX2NsaWVudC5oIgogI2luY2x1ZGUgImk5MTVfZ2VtLmgiCiAj aW5jbHVkZSAiaTkxNV91dGlscy5oIgpAQCAtNjgsMyArNzMsNzEgQEAgdm9pZCBpOTE1X2RybV9j bGllbnRzX2Zpbmkoc3RydWN0IGk5MTVfZHJtX2NsaWVudHMgKmNsaWVudHMpCiAJR0VNX0JVR19P TigheGFfZW1wdHkoJmNsaWVudHMtPnhhcnJheSkpOwogCXhhX2Rlc3Ryb3koJmNsaWVudHMtPnhh cnJheSk7CiB9CisKKyNpZmRlZiBDT05GSUdfUFJPQ19GUworc3RhdGljIGNvbnN0IGNoYXIgKiBj b25zdCB1YWJpX2NsYXNzX25hbWVzW10gPSB7CisJW0k5MTVfRU5HSU5FX0NMQVNTX1JFTkRFUl0g PSAicmVuZGVyIiwKKwlbSTkxNV9FTkdJTkVfQ0xBU1NfQ09QWV0gPSAiY29weSIsCisJW0k5MTVf RU5HSU5FX0NMQVNTX1ZJREVPXSA9ICJ2aWRlbyIsCisJW0k5MTVfRU5HSU5FX0NMQVNTX1ZJREVP X0VOSEFOQ0VdID0gInZpZGVvLWVuaGFuY2UiLAorfTsKKworc3RhdGljIHU2NCBidXN5X2FkZChz dHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LCB1bnNpZ25lZCBpbnQgY2xhc3MpCit7CisJc3Ry dWN0IGk5MTVfZ2VtX2VuZ2luZXNfaXRlciBpdDsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2U7 CisJdTY0IHRvdGFsID0gMDsKKworCWZvcl9lYWNoX2dlbV9lbmdpbmUoY2UsIHJjdV9kZXJlZmVy ZW5jZShjdHgtPmVuZ2luZXMpLCBpdCkgeworCQlpZiAoY2UtPmVuZ2luZS0+dWFiaV9jbGFzcyAh PSBjbGFzcykKKwkJCWNvbnRpbnVlOworCisJCXRvdGFsICs9IGludGVsX2NvbnRleHRfZ2V0X3Rv dGFsX3J1bnRpbWVfbnMoY2UpOworCX0KKworCXJldHVybiB0b3RhbDsKK30KKworc3RhdGljIHZv aWQKK3Nob3dfY2xpZW50X2NsYXNzKHN0cnVjdCBzZXFfZmlsZSAqbSwKKwkJICBzdHJ1Y3QgaTkx NV9kcm1fY2xpZW50ICpjbGllbnQsCisJCSAgdW5zaWduZWQgaW50IGNsYXNzKQoreworCWNvbnN0 IHN0cnVjdCBsaXN0X2hlYWQgKmxpc3QgPSAmY2xpZW50LT5jdHhfbGlzdDsKKwl1NjQgdG90YWwg PSBhdG9taWM2NF9yZWFkKCZjbGllbnQtPnBhc3RfcnVudGltZVtjbGFzc10pOworCXN0cnVjdCBp OTE1X2dlbV9jb250ZXh0ICpjdHg7CisKKwlyY3VfcmVhZF9sb2NrKCk7CisJbGlzdF9mb3JfZWFj aF9lbnRyeV9yY3UoY3R4LCBsaXN0LCBjbGllbnRfbGluaykKKwkJdG90YWwgKz0gYnVzeV9hZGQo Y3R4LCBjbGFzcyk7CisJcmN1X3JlYWRfdW5sb2NrKCk7CisKKwlyZXR1cm4gc2VxX3ByaW50Ziht LCAiZHJtLWVuZ2luZS0lczpcdCVsbHUgbnNcbiIsCisJCQkgIHVhYmlfY2xhc3NfbmFtZXNbY2xh c3NdLCB0b3RhbCk7Cit9CisKK3ZvaWQgaTkxNV9kcm1fY2xpZW50X2ZkaW5mbyhzdHJ1Y3Qgc2Vx X2ZpbGUgKm0sIHN0cnVjdCBmaWxlICpmKQoreworCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSA9IGYt PnByaXZhdGVfZGF0YTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYg PSBmaWxlLT5kcml2ZXJfcHJpdjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGZp bGVfcHJpdi0+ZGV2X3ByaXY7CisJc3RydWN0IGk5MTVfZHJtX2NsaWVudCAqY2xpZW50ID0gZmls ZV9wcml2LT5jbGllbnQ7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGk5MTUt PmRybS5kZXYpOworCXVuc2lnbmVkIGludCBpOworCisJLyoKKwkgKiAqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKwkgKiBG b3IgdGV4dCBvdXRwdXQgZm9ybWF0IGRlc2NyaXB0aW9uIHBsZWFzZSBzZWUgZHJtLXVzYWdlLXN0 YXRzLnJzdCEKKwkgKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioKKwkgKi8KKworCXNlcV9wdXRzKG0sICJkcm0tZHJpdmVy Olx0aTkxNVxuIik7CisJc2VxX3ByaW50ZihtLCAiZHJtLXBkZXY6XHQlMDR4OiUwMng6JTAyeC4l ZFxuIiwKKwkJICAgcGNpX2RvbWFpbl9ucihwZGV2LT5idXMpLCBwZGV2LT5idXMtPm51bWJlciwK KwkJICAgUENJX1NMT1QocGRldi0+ZGV2Zm4pLCBQQ0lfRlVOQyhwZGV2LT5kZXZmbikpOworCXNl cV9wcmludGYobSwgImRybS1jbGllbnQtaWQ6XHQldVxuIiwgY2xpZW50LT5pZCk7CisKKwlmb3Ig KGkgPSAwOyBpIDwgQVJSQVlfU0laRSh1YWJpX2NsYXNzX25hbWVzKTsgaSsrKQorCQlzaG93X2Ns aWVudF9jbGFzcyhtLCBjbGllbnQsIGkpOworfQorI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RybV9jbGllbnQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJtX2NsaWVudC5oCmluZGV4IDc0MTZlMThhYTMzYy4uZDk2ZDZhMDYzMDJlIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RybV9jbGllbnQuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RybV9jbGllbnQuaApAQCAtNTcsNiArNTcsMTAgQEAgc3RhdGlj IGlubGluZSB2b2lkIGk5MTVfZHJtX2NsaWVudF9wdXQoc3RydWN0IGk5MTVfZHJtX2NsaWVudCAq Y2xpZW50KQogCiBzdHJ1Y3QgaTkxNV9kcm1fY2xpZW50ICppOTE1X2RybV9jbGllbnRfYWRkKHN0 cnVjdCBpOTE1X2RybV9jbGllbnRzICpjbGllbnRzKTsKIAorI2lmZGVmIENPTkZJR19QUk9DX0ZT Cit2b2lkIGk5MTVfZHJtX2NsaWVudF9mZGluZm8oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3Qg ZmlsZSAqZik7CisjZW5kaWYKKwogdm9pZCBpOTE1X2RybV9jbGllbnRzX2Zpbmkoc3RydWN0IGk5 MTVfZHJtX2NsaWVudHMgKmNsaWVudHMpOwogCiAjZW5kaWYgLyogIV9fSTkxNV9EUk1fQ0xJRU5U X0hfXyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYmI2MjhlYWRlOTJhLi5iMjczNmIx ZTVhMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTcwNiw2ICsxNzA2LDkgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBmaWxlX29wZXJhdGlvbnMgaTkxNV9kcml2ZXJfZm9wcyA9IHsKIAku cmVhZCA9IGRybV9yZWFkLAogCS5jb21wYXRfaW9jdGwgPSBpOTE1X2lvYzMyX2NvbXBhdF9pb2N0 bCwKIAkubGxzZWVrID0gbm9vcF9sbHNlZWssCisjaWZkZWYgQ09ORklHX1BST0NfRlMKKwkuc2hv d19mZGluZm8gPSBpOTE1X2RybV9jbGllbnRfZmRpbmZvLAorI2VuZGlmCiB9OwogCiBzdGF0aWMg aW50Ci0tIAoyLjMwLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=