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.7 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 0970DC47076 for ; Fri, 21 May 2021 15:33:39 +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 C42D6613D9 for ; Fri, 21 May 2021 15:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C42D6613D9 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 A28116E194; Fri, 21 May 2021 15:33:29 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 692316EE2D; Fri, 21 May 2021 15:33:23 +0000 (UTC) IronPort-SDR: dydm7h1F5FNKBkF2e+qog/FV0uXHYibRoSqD4im8+mYcR5iG2S1dpYnGLiE0MzU/36Zhp9qoD+ 4kYS9CcAuSrA== X-IronPort-AV: E=McAfee;i="6200,9189,9990"; a="265415725" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="265415725" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 08:33:22 -0700 IronPort-SDR: PVCgY+JFd81itaVa6m7DTUAZQFVPgqChRKo4bYTvB7bMsXLYqM0Gncvulvg4eKSIdcA+ev0Ga/ d4nA1ciu4eGQ== X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="441125473" Received: from imarinmo-mobl1.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.34]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 08:33:21 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 09/12] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() Date: Fri, 21 May 2021 17:32:50 +0200 Message-Id: <20210521153253.518037-10-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521153253.518037-1-thomas.hellstrom@linux.intel.com> References: <20210521153253.518037-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?= , =?UTF-8?q?Christian=20K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If the bo is idle when calling ttm_bo_pipeline_gutting(), we unnecessarily create a ghost object and push it out to delayed destroy. Fix this by adding a path for idle, and document the function. Also avoid having the bo end up in a bad state vulnerable to user-space triggered kernel BUGs if the call to ttm_tt_create() fails. Finally reuse ttm_bo_pipeline_gutting() in ttm_bo_evict(). Cc: Christian König Signed-off-by: Thomas Hellström --- drivers/gpu/drm/ttm/ttm_bo.c | 20 ++++++------ drivers/gpu/drm/ttm/ttm_bo_util.c | 52 ++++++++++++++++++++++++++++--- drivers/gpu/drm/ttm/ttm_tt.c | 5 +++ include/drm/ttm/ttm_tt.h | 10 ++++++ 4 files changed, 73 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ca1b098b6a56..a8fa3375b8aa 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -501,10 +501,15 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bdev->funcs->evict_flags(bo, &placement); if (!placement.num_placement && !placement.num_busy_placement) { - ttm_bo_wait(bo, false, false); + ret = ttm_bo_wait(bo, true, false); + if (ret) + return ret; - ttm_bo_cleanup_memtype_use(bo); - return ttm_tt_create(bo, false); + /* + * Since we've already synced, this frees backing store + * immediately. + */ + return ttm_bo_pipeline_gutting(bo); } ret = ttm_bo_mem_space(bo, &placement, &evict_mem, ctx); @@ -974,13 +979,8 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, /* * Remove the backing store if no placement is given. */ - if (!placement->num_placement && !placement->num_busy_placement) { - ret = ttm_bo_pipeline_gutting(bo); - if (ret) - return ret; - - return ttm_tt_create(bo, false); - } + if (!placement->num_placement && !placement->num_busy_placement) + return ttm_bo_pipeline_gutting(bo); /* * Check whether we need to move buffer. diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 4a7d3d672f9a..7fa9b3a852eb 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -585,26 +585,70 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, } EXPORT_SYMBOL(ttm_bo_move_accel_cleanup); +/** + * ttm_bo_pipeline_gutting - purge the contents of a bo + * @bo: The buffer object + * + * Purge the contents of a bo, async if the bo is not idle. + * After a successful call, the bo is left unpopulated in + * system placement. The function may wait uninterruptible + * for idle on OOM. + * + * Return: 0 if successful, negative error code on failure. + */ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) { static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM }; struct ttm_buffer_object *ghost; + struct ttm_tt *ttm; int ret; - ret = ttm_buffer_object_transfer(bo, &ghost); + /* If already idle, no need for ghost object dance. */ + ret = ttm_bo_wait(bo, false, true); + if (ret != -EBUSY) { + if (!bo->ttm) { + ret = ttm_tt_create(bo, true); + if (ret) + return ret; + } else { + ttm_tt_unpopulate(bo->bdev, bo->ttm); + if (bo->type == ttm_bo_type_device) + ttm_tt_mark_for_clear(bo->ttm); + } + ttm_resource_free(bo, &bo->mem); + ttm_resource_alloc(bo, &sys_mem, &bo->mem); + + return 0; + } + + /* + * We need an unpopulated ttm_tt after giving our current one, + * if any, to the ghost object. And we can't afford to fail + * creating one *after* the operation. + */ + + ttm = bo->ttm; + bo->ttm = NULL; + ret = ttm_tt_create(bo, true); + swap(bo->ttm, ttm); if (ret) return ret; + ret = ttm_buffer_object_transfer(bo, &ghost); + if (ret) { + ttm_tt_destroy(bo->bdev, ttm); + return ret; + } + ret = dma_resv_copy_fences(&ghost->base._resv, bo->base.resv); /* Last resort, wait for the BO to be idle when we are OOM */ if (ret) ttm_bo_wait(bo, false, false); - ttm_resource_alloc(bo, &sys_mem, &bo->mem); - bo->ttm = NULL; - dma_resv_unlock(&ghost->base._resv); ttm_bo_put(ghost); + bo->ttm = ttm; + ttm_resource_alloc(bo, &sys_mem, &bo->mem); return 0; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 0e41227116b1..913b330a234b 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -134,6 +134,11 @@ void ttm_tt_destroy_common(struct ttm_device *bdev, struct ttm_tt *ttm) } EXPORT_SYMBOL(ttm_tt_destroy_common); +void ttm_tt_mark_for_clear(struct ttm_tt *ttm) +{ + ttm->page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC; +} + void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) { bdev->funcs->ttm_tt_destroy(bdev, ttm); diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 3102059db726..daa9c4cf48bb 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -170,6 +170,16 @@ int ttm_tt_populate(struct ttm_device *bdev, struct ttm_tt *ttm, struct ttm_oper */ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm); +/** + * ttm_tt_mark_for_clear - Mark pages for clearing on populate. + * + * @ttm: Pointer to the ttm_tt structure + * + * Marks pages for clearing so that the next time the page vector is + * populated, the pages will be cleared. + */ +void ttm_tt_mark_for_clear(struct ttm_tt *ttm); + void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages); struct ttm_kmap_iter *ttm_kmap_iter_tt_init(struct ttm_kmap_iter_tt *iter_tt, -- 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.7 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 04AFDC47076 for ; Fri, 21 May 2021 15:33:32 +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 C17E56135B for ; Fri, 21 May 2021 15:33:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C17E56135B 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 2C28188FA0; Fri, 21 May 2021 15:33:26 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 692316EE2D; Fri, 21 May 2021 15:33:23 +0000 (UTC) IronPort-SDR: dydm7h1F5FNKBkF2e+qog/FV0uXHYibRoSqD4im8+mYcR5iG2S1dpYnGLiE0MzU/36Zhp9qoD+ 4kYS9CcAuSrA== X-IronPort-AV: E=McAfee;i="6200,9189,9990"; a="265415725" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="265415725" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 08:33:22 -0700 IronPort-SDR: PVCgY+JFd81itaVa6m7DTUAZQFVPgqChRKo4bYTvB7bMsXLYqM0Gncvulvg4eKSIdcA+ev0Ga/ d4nA1ciu4eGQ== X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="441125473" Received: from imarinmo-mobl1.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.34]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2021 08:33:21 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Fri, 21 May 2021 17:32:50 +0200 Message-Id: <20210521153253.518037-10-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521153253.518037-1-thomas.hellstrom@linux.intel.com> References: <20210521153253.518037-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 09/12] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() 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?= , =?UTF-8?q?Christian=20K=C3=B6nig?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" SWYgdGhlIGJvIGlzIGlkbGUgd2hlbiBjYWxsaW5nIHR0bV9ib19waXBlbGluZV9ndXR0aW5nKCks IHdlIHVubmVjZXNzYXJpbHkKY3JlYXRlIGEgZ2hvc3Qgb2JqZWN0IGFuZCBwdXNoIGl0IG91dCB0 byBkZWxheWVkIGRlc3Ryb3kuCkZpeCB0aGlzIGJ5IGFkZGluZyBhIHBhdGggZm9yIGlkbGUsIGFu ZCBkb2N1bWVudCB0aGUgZnVuY3Rpb24uCgpBbHNvIGF2b2lkIGhhdmluZyB0aGUgYm8gZW5kIHVw IGluIGEgYmFkIHN0YXRlIHZ1bG5lcmFibGUgdG8gdXNlci1zcGFjZQp0cmlnZ2VyZWQga2VybmVs IEJVR3MgaWYgdGhlIGNhbGwgdG8gdHRtX3R0X2NyZWF0ZSgpIGZhaWxzLgoKRmluYWxseSByZXVz ZSB0dG1fYm9fcGlwZWxpbmVfZ3V0dGluZygpIGluIHR0bV9ib19ldmljdCgpLgoKQ2M6IENocmlz dGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogVGhv bWFzIEhlbGxzdHLDtm0gPHRob21hcy5oZWxsc3Ryb21AbGludXguaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMgICAgICB8IDIwICsrKysrKy0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jIHwgNTIgKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLQogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYyAgICAgIHwgIDUgKysrCiBpbmNs dWRlL2RybS90dG0vdHRtX3R0LmggICAgICAgICAgfCAxMCArKysrKysKIDQgZmlsZXMgY2hhbmdl ZCwgNzMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fYm8uYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMKaW5k ZXggY2ExYjA5OGI2YTU2Li5hOGZhMzM3NWI4YWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS90dG0vdHRtX2JvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm8uYwpAQCAtNTAx LDEwICs1MDEsMTUgQEAgc3RhdGljIGludCB0dG1fYm9fZXZpY3Qoc3RydWN0IHR0bV9idWZmZXJf b2JqZWN0ICpibywKIAliZGV2LT5mdW5jcy0+ZXZpY3RfZmxhZ3MoYm8sICZwbGFjZW1lbnQpOwog CiAJaWYgKCFwbGFjZW1lbnQubnVtX3BsYWNlbWVudCAmJiAhcGxhY2VtZW50Lm51bV9idXN5X3Bs YWNlbWVudCkgewotCQl0dG1fYm9fd2FpdChibywgZmFsc2UsIGZhbHNlKTsKKwkJcmV0ID0gdHRt X2JvX3dhaXQoYm8sIHRydWUsIGZhbHNlKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CiAK LQkJdHRtX2JvX2NsZWFudXBfbWVtdHlwZV91c2UoYm8pOwotCQlyZXR1cm4gdHRtX3R0X2NyZWF0 ZShibywgZmFsc2UpOworCQkvKgorCQkgKiBTaW5jZSB3ZSd2ZSBhbHJlYWR5IHN5bmNlZCwgdGhp cyBmcmVlcyBiYWNraW5nIHN0b3JlCisJCSAqIGltbWVkaWF0ZWx5LgorCQkgKi8KKwkJcmV0dXJu IHR0bV9ib19waXBlbGluZV9ndXR0aW5nKGJvKTsKIAl9CiAKIAlyZXQgPSB0dG1fYm9fbWVtX3Nw YWNlKGJvLCAmcGxhY2VtZW50LCAmZXZpY3RfbWVtLCBjdHgpOwpAQCAtOTc0LDEzICs5NzksOCBA QCBpbnQgdHRtX2JvX3ZhbGlkYXRlKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCiAJLyoK IAkgKiBSZW1vdmUgdGhlIGJhY2tpbmcgc3RvcmUgaWYgbm8gcGxhY2VtZW50IGlzIGdpdmVuLgog CSAqLwotCWlmICghcGxhY2VtZW50LT5udW1fcGxhY2VtZW50ICYmICFwbGFjZW1lbnQtPm51bV9i dXN5X3BsYWNlbWVudCkgewotCQlyZXQgPSB0dG1fYm9fcGlwZWxpbmVfZ3V0dGluZyhibyk7Ci0J CWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCi0JCXJldHVybiB0dG1fdHRfY3JlYXRlKGJvLCBm YWxzZSk7Ci0JfQorCWlmICghcGxhY2VtZW50LT5udW1fcGxhY2VtZW50ICYmICFwbGFjZW1lbnQt Pm51bV9idXN5X3BsYWNlbWVudCkKKwkJcmV0dXJuIHR0bV9ib19waXBlbGluZV9ndXR0aW5nKGJv KTsKIAogCS8qCiAJICogQ2hlY2sgd2hldGhlciB3ZSBuZWVkIHRvIG1vdmUgYnVmZmVyLgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jIGIvZHJpdmVycy9ncHUv ZHJtL3R0bS90dG1fYm9fdXRpbC5jCmluZGV4IDRhN2QzZDY3MmY5YS4uN2ZhOWIzYTg1MmViIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9ib191dGlsLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jCkBAIC01ODUsMjYgKzU4NSw3MCBAQCBpbnQgdHRt X2JvX21vdmVfYWNjZWxfY2xlYW51cChzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogfQog RVhQT1JUX1NZTUJPTCh0dG1fYm9fbW92ZV9hY2NlbF9jbGVhbnVwKTsKIAorLyoqCisgKiB0dG1f Ym9fcGlwZWxpbmVfZ3V0dGluZyAtIHB1cmdlIHRoZSBjb250ZW50cyBvZiBhIGJvCisgKiBAYm86 IFRoZSBidWZmZXIgb2JqZWN0CisgKgorICogUHVyZ2UgdGhlIGNvbnRlbnRzIG9mIGEgYm8sIGFz eW5jIGlmIHRoZSBibyBpcyBub3QgaWRsZS4KKyAqIEFmdGVyIGEgc3VjY2Vzc2Z1bCBjYWxsLCB0 aGUgYm8gaXMgbGVmdCB1bnBvcHVsYXRlZCBpbgorICogc3lzdGVtIHBsYWNlbWVudC4gVGhlIGZ1 bmN0aW9uIG1heSB3YWl0IHVuaW50ZXJydXB0aWJsZQorICogZm9yIGlkbGUgb24gT09NLgorICoK KyAqIFJldHVybjogMCBpZiBzdWNjZXNzZnVsLCBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1 cmUuCisgKi8KIGludCB0dG1fYm9fcGlwZWxpbmVfZ3V0dGluZyhzdHJ1Y3QgdHRtX2J1ZmZlcl9v YmplY3QgKmJvKQogewogCXN0YXRpYyBjb25zdCBzdHJ1Y3QgdHRtX3BsYWNlIHN5c19tZW0gPSB7 IC5tZW1fdHlwZSA9IFRUTV9QTF9TWVNURU0gfTsKIAlzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3Qg Kmdob3N0OworCXN0cnVjdCB0dG1fdHQgKnR0bTsKIAlpbnQgcmV0OwogCi0JcmV0ID0gdHRtX2J1 ZmZlcl9vYmplY3RfdHJhbnNmZXIoYm8sICZnaG9zdCk7CisJLyogSWYgYWxyZWFkeSBpZGxlLCBu byBuZWVkIGZvciBnaG9zdCBvYmplY3QgZGFuY2UuICovCisJcmV0ID0gdHRtX2JvX3dhaXQoYm8s IGZhbHNlLCB0cnVlKTsKKwlpZiAocmV0ICE9IC1FQlVTWSkgeworCQlpZiAoIWJvLT50dG0pIHsK KwkJCXJldCA9IHR0bV90dF9jcmVhdGUoYm8sIHRydWUpOworCQkJaWYgKHJldCkKKwkJCQlyZXR1 cm4gcmV0OworCQl9IGVsc2UgeworCQkJdHRtX3R0X3VucG9wdWxhdGUoYm8tPmJkZXYsIGJvLT50 dG0pOworCQkJaWYgKGJvLT50eXBlID09IHR0bV9ib190eXBlX2RldmljZSkKKwkJCQl0dG1fdHRf bWFya19mb3JfY2xlYXIoYm8tPnR0bSk7CisJCX0KKwkJdHRtX3Jlc291cmNlX2ZyZWUoYm8sICZi by0+bWVtKTsKKwkJdHRtX3Jlc291cmNlX2FsbG9jKGJvLCAmc3lzX21lbSwgJmJvLT5tZW0pOwor CisJCXJldHVybiAwOworCX0KKworCS8qCisJICogV2UgbmVlZCBhbiB1bnBvcHVsYXRlZCB0dG1f dHQgYWZ0ZXIgZ2l2aW5nIG91ciBjdXJyZW50IG9uZSwKKwkgKiBpZiBhbnksIHRvIHRoZSBnaG9z dCBvYmplY3QuIEFuZCB3ZSBjYW4ndCBhZmZvcmQgdG8gZmFpbAorCSAqIGNyZWF0aW5nIG9uZSAq YWZ0ZXIqIHRoZSBvcGVyYXRpb24uCisJICovCisKKwl0dG0gPSBiby0+dHRtOworCWJvLT50dG0g PSBOVUxMOworCXJldCA9IHR0bV90dF9jcmVhdGUoYm8sIHRydWUpOworCXN3YXAoYm8tPnR0bSwg dHRtKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCisJcmV0ID0gdHRtX2J1ZmZlcl9vYmpl Y3RfdHJhbnNmZXIoYm8sICZnaG9zdCk7CisJaWYgKHJldCkgeworCQl0dG1fdHRfZGVzdHJveShi by0+YmRldiwgdHRtKTsKKwkJcmV0dXJuIHJldDsKKwl9CisKIAlyZXQgPSBkbWFfcmVzdl9jb3B5 X2ZlbmNlcygmZ2hvc3QtPmJhc2UuX3Jlc3YsIGJvLT5iYXNlLnJlc3YpOwogCS8qIExhc3QgcmVz b3J0LCB3YWl0IGZvciB0aGUgQk8gdG8gYmUgaWRsZSB3aGVuIHdlIGFyZSBPT00gKi8KIAlpZiAo cmV0KQogCQl0dG1fYm9fd2FpdChibywgZmFsc2UsIGZhbHNlKTsKIAotCXR0bV9yZXNvdXJjZV9h bGxvYyhibywgJnN5c19tZW0sICZiby0+bWVtKTsKLQliby0+dHRtID0gTlVMTDsKLQogCWRtYV9y ZXN2X3VubG9jaygmZ2hvc3QtPmJhc2UuX3Jlc3YpOwogCXR0bV9ib19wdXQoZ2hvc3QpOworCWJv LT50dG0gPSB0dG07CisJdHRtX3Jlc291cmNlX2FsbG9jKGJvLCAmc3lzX21lbSwgJmJvLT5tZW0p OwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV90 dC5jIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYwppbmRleCAwZTQxMjI3MTE2YjEuLjkx M2IzMzBhMjM0YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV90dC5jCkBAIC0xMzQsNiArMTM0LDExIEBAIHZvaWQg dHRtX3R0X2Rlc3Ryb3lfY29tbW9uKHN0cnVjdCB0dG1fZGV2aWNlICpiZGV2LCBzdHJ1Y3QgdHRt X3R0ICp0dG0pCiB9CiBFWFBPUlRfU1lNQk9MKHR0bV90dF9kZXN0cm95X2NvbW1vbik7CiAKK3Zv aWQgdHRtX3R0X21hcmtfZm9yX2NsZWFyKHN0cnVjdCB0dG1fdHQgKnR0bSkKK3sKKwl0dG0tPnBh Z2VfZmxhZ3MgfD0gVFRNX1BBR0VfRkxBR19aRVJPX0FMTE9DOworfQorCiB2b2lkIHR0bV90dF9k ZXN0cm95KHN0cnVjdCB0dG1fZGV2aWNlICpiZGV2LCBzdHJ1Y3QgdHRtX3R0ICp0dG0pCiB7CiAJ YmRldi0+ZnVuY3MtPnR0bV90dF9kZXN0cm95KGJkZXYsIHR0bSk7CmRpZmYgLS1naXQgYS9pbmNs dWRlL2RybS90dG0vdHRtX3R0LmggYi9pbmNsdWRlL2RybS90dG0vdHRtX3R0LmgKaW5kZXggMzEw MjA1OWRiNzI2Li5kYWE5YzRjZjQ4YmIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL3R0bS90dG1f dHQuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX3R0LmgKQEAgLTE3MCw2ICsxNzAsMTYgQEAg aW50IHR0bV90dF9wb3B1bGF0ZShzdHJ1Y3QgdHRtX2RldmljZSAqYmRldiwgc3RydWN0IHR0bV90 dCAqdHRtLCBzdHJ1Y3QgdHRtX29wZXIKICAqLwogdm9pZCB0dG1fdHRfdW5wb3B1bGF0ZShzdHJ1 Y3QgdHRtX2RldmljZSAqYmRldiwgc3RydWN0IHR0bV90dCAqdHRtKTsKIAorLyoqCisgKiB0dG1f dHRfbWFya19mb3JfY2xlYXIgLSBNYXJrIHBhZ2VzIGZvciBjbGVhcmluZyBvbiBwb3B1bGF0ZS4K KyAqCisgKiBAdHRtOiBQb2ludGVyIHRvIHRoZSB0dG1fdHQgc3RydWN0dXJlCisgKgorICogTWFy a3MgcGFnZXMgZm9yIGNsZWFyaW5nIHNvIHRoYXQgdGhlIG5leHQgdGltZSB0aGUgcGFnZSB2ZWN0 b3IgaXMKKyAqIHBvcHVsYXRlZCwgdGhlIHBhZ2VzIHdpbGwgYmUgY2xlYXJlZC4KKyAqLwordm9p ZCB0dG1fdHRfbWFya19mb3JfY2xlYXIoc3RydWN0IHR0bV90dCAqdHRtKTsKKwogdm9pZCB0dG1f dHRfbWdyX2luaXQodW5zaWduZWQgbG9uZyBudW1fcGFnZXMsIHVuc2lnbmVkIGxvbmcgbnVtX2Rt YTMyX3BhZ2VzKTsKIAogc3RydWN0IHR0bV9rbWFwX2l0ZXIgKnR0bV9rbWFwX2l0ZXJfdHRfaW5p dChzdHJ1Y3QgdHRtX2ttYXBfaXRlcl90dCAqaXRlcl90dCwKLS0gCjIuMzEuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==