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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 D9270C3A5A2 for ; Wed, 21 Aug 2019 12:31:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1E97233A0 for ; Wed, 21 Aug 2019 12:31:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rYoioTgG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728284AbfHUMb4 (ORCPT ); Wed, 21 Aug 2019 08:31:56 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41072 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728267AbfHUMb4 (ORCPT ); Wed, 21 Aug 2019 08:31:56 -0400 Received: by mail-wr1-f65.google.com with SMTP id j16so1858133wrr.8 for ; Wed, 21 Aug 2019 05:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ni/csKYEDyOv/GI6Uu6YVFIStPM3qd3+Rn6zbLv7UUM=; b=rYoioTgGNdJPTEsCmhjUF1HZX9gcEpjaHfX4q0zA+y0r2/iQMVtuDahOaLCGbLxbzm ytAht059xFcw3KyV5Lc9xrn35bWcY5Fgs3twscL4TSdDdnv3WmiaCPZsau0ApeQVzW8z F1RkXtpUTWQwRJ/KSO+u/bRX7SzKCgKbchepGlwDfuDXANndCWB5kDZMoDw0qqM/u4Lf EXvri2vke4YiZROmzcnVU/BuYq1S8Nd5UD2C1ygsx2t2TpfhPoUVsbzwAJWd0muTmoaf Irt2Iz5lqF7y53cHC+J8xX8IVNart9/UdcYQA+jGuOpkgUsNMr4XWR02cbJHkVcwPyEz K2hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ni/csKYEDyOv/GI6Uu6YVFIStPM3qd3+Rn6zbLv7UUM=; b=FPO39aHpxXgt0avYZd+UNmy22/tzp+9+TBtsHrbPqAp/avwbjlPIXM1gw7NfpuWyHW 07hCCY/TiT31t4P9Uz9J7mM5qCFOPAHBuccdwbk+l4AWmh3wqs1CWQzn+IlxZwf9lfYq 3Go45EQ4EsdEvAC1GLWFxgJvqOdXsXrKXepoiQ1cLomx92+dlTnfivs9HXza2A7H6OTo hEjvNOiwrXT5y4naRmCz/KfgzxnQIukLW1Er2nzuBUR6CPX8R7CntMlEZpMrk27y8wL+ vKFgDkk7ad5mU+uZz1f2y7emn/QxAJc+zr9q1m/i3BxNKfHz7HenGOO0KNrH3Un840mp rgPA== X-Gm-Message-State: APjAAAX4fZLNsR9CLMGLkKQsAvt3w0xrkU7+cxrnweFX+xcu6CLto9D5 Hgh47RhqFtp2AbBJAEE3/RM= X-Google-Smtp-Source: APXvYqynWHiNIzC4shkDTUZTBtVbuOpu7CcIRalVRJfof4Zw588JseDXLH/DpOXIFmxsKWDuM5O1oQ== X-Received: by 2002:adf:fc03:: with SMTP id i3mr37946824wrr.48.1566390713679; Wed, 21 Aug 2019 05:31:53 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:8189:dd33:a934:c4fa]) by smtp.gmail.com with ESMTPSA id v3sm23084571wrq.34.2019.08.21.05.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 05:31:53 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, daniel.vetter@ffwll.ch, sumit.semwal@linaro.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 05/10] dma-buf/resv: add dma_resv_prune_fences Date: Wed, 21 Aug 2019 14:31:42 +0200 Message-Id: <20190821123147.110736-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821123147.110736-1-christian.koenig@amd.com> References: <20190821123147.110736-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add a new dma_resv_prune_fences() function to improve memory management. Signed-off-by: Christian König --- drivers/dma-buf/dma-resv.c | 37 ++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_wait.c | 3 +- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 3 +- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- include/linux/dma-resv.h | 1 + 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 42a8f3f11681..24adc32d36d4 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -301,6 +301,43 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence) } EXPORT_SYMBOL(dma_resv_add_excl_fence); +/** + * dma_resv_prune_fences - prune signaled fences from the resv object + * @obj: the reservation object to prune + * + * Prune all signaled fences from the reservation object. + */ +void dma_resv_prune_fences(struct dma_resv *obj) +{ + struct dma_resv_list *list; + struct dma_fence *fence; + unsigned int i; + + dma_resv_assert_held(obj); + + fence = dma_resv_get_excl(obj); + if (dma_fence_is_signaled(fence)) { + RCU_INIT_POINTER(obj->fence_excl, NULL); + dma_fence_put(fence); + } + + list = dma_resv_get_list(obj); + if (!list) + return; + + for (i = 0; i < list->shared_count; ++i) { + fence = rcu_dereference_protected(list->shared[i], + dma_resv_held(obj)); + + if (!dma_fence_is_signaled(fence)) + continue; + + RCU_INIT_POINTER(list->shared[i], dma_fence_get_stub()); + dma_fence_put(fence); + } +} +EXPORT_SYMBOL(dma_resv_prune_fences); + /** * dma_resv_copy_fences - Copy all fences from src to dst. * @dst: the destination reservation object diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c index 8af55cd3e690..a76d36f8fb77 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c @@ -85,8 +85,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv, * signaled. */ if (prune_fences && dma_resv_trylock(resv)) { - if (dma_resv_test_signaled_rcu(resv, true)) - dma_resv_add_excl_fence(resv, NULL); + dma_resv_prune_fences(resv); dma_resv_unlock(resv); } diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c index 5f82a763e64c..274cf5b19fc9 100644 --- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c @@ -114,7 +114,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, */ if (rcu_access_pointer(resv->fence)) { dma_resv_lock(resv, NULL); - dma_resv_add_excl_fence(resv, NULL); + dma_resv_prune_fences(resv); dma_resv_unlock(resv); } } diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index ebfd03d117cd..fcbe433a968c 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -100,8 +100,7 @@ static void __i915_vma_retire(struct i915_active *ref) /* Prune the shared fence arrays iff completely idle (inc. external) */ if (dma_resv_trylock(obj->base.resv)) { - if (dma_resv_test_signaled_rcu(obj->base.resv, true)) - dma_resv_add_excl_fence(obj->base.resv, NULL); + dma_resv_prune_fences(obj->base.resv); dma_resv_unlock(obj->base.resv); } diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 58d1f2b28132..f78f52cc2e6d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1818,7 +1818,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, if (timeout == 0) return -EBUSY; - dma_resv_add_excl_fence(bo->base.resv, NULL); + dma_resv_prune_fences(bo->base.resv); return 0; } EXPORT_SYMBOL(ttm_bo_wait); diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index ee50d10f052b..03b0f95682b0 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -279,6 +279,7 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences); void dma_resv_add_shared_fence(struct dma_resv *obj, struct dma_fence *fence); void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence); +void dma_resv_prune_fences(struct dma_resv *obj); int dma_resv_get_fences_rcu(struct dma_resv *obj, struct dma_fence **pfence_excl, -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 05/10] dma-buf/resv: add dma_resv_prune_fences Date: Wed, 21 Aug 2019 14:31:42 +0200 Message-ID: <20190821123147.110736-6-christian.koenig@amd.com> References: <20190821123147.110736-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 557256E315 for ; Wed, 21 Aug 2019 12:31:55 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id g17so1867841wrr.5 for ; Wed, 21 Aug 2019 05:31:55 -0700 (PDT) In-Reply-To: <20190821123147.110736-1-christian.koenig@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, daniel.vetter@ffwll.ch, sumit.semwal@linaro.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org List-Id: dri-devel@lists.freedesktop.org QWRkIGEgbmV3IGRtYV9yZXN2X3BydW5lX2ZlbmNlcygpIGZ1bmN0aW9uIHRvIGltcHJvdmUgbWVt b3J5IG1hbmFnZW1lbnQuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3Rp YW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9kbWEtYnVmL2RtYS1yZXN2LmMgICAgICAg ICAgICAgICAgIHwgMzcgKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ2VtL2k5MTVfZ2VtX3dhaXQuYyAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2JhdGNoX3Bvb2wuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Zt YS5jICAgICAgICAgICAgfCAgMyArLQogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm8uYyAgICAg ICAgICAgICAgIHwgIDIgKy0KIGluY2x1ZGUvbGludXgvZG1hLXJlc3YuaCAgICAgICAgICAgICAg ICAgICB8ICAxICsKIDYgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvZG1hLXJlc3YuYyBiL2RyaXZlcnMv ZG1hLWJ1Zi9kbWEtcmVzdi5jCmluZGV4IDQyYThmM2YxMTY4MS4uMjRhZGMzMmQzNmQ0IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2RtYS1idWYvZG1hLXJlc3YuYworKysgYi9kcml2ZXJzL2RtYS1idWYv ZG1hLXJlc3YuYwpAQCAtMzAxLDYgKzMwMSw0MyBAQCB2b2lkIGRtYV9yZXN2X2FkZF9leGNsX2Zl bmNlKHN0cnVjdCBkbWFfcmVzdiAqb2JqLCBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSkKIH0KIEVY UE9SVF9TWU1CT0woZG1hX3Jlc3ZfYWRkX2V4Y2xfZmVuY2UpOwogCisvKioKKyAqIGRtYV9yZXN2 X3BydW5lX2ZlbmNlcyAtIHBydW5lIHNpZ25hbGVkIGZlbmNlcyBmcm9tIHRoZSByZXN2IG9iamVj dAorICogQG9iajogdGhlIHJlc2VydmF0aW9uIG9iamVjdCB0byBwcnVuZQorICoKKyAqIFBydW5l IGFsbCBzaWduYWxlZCBmZW5jZXMgZnJvbSB0aGUgcmVzZXJ2YXRpb24gb2JqZWN0LgorICovCit2 b2lkIGRtYV9yZXN2X3BydW5lX2ZlbmNlcyhzdHJ1Y3QgZG1hX3Jlc3YgKm9iaikKK3sKKwlzdHJ1 Y3QgZG1hX3Jlc3ZfbGlzdCAqbGlzdDsKKwlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKKwl1bnNp Z25lZCBpbnQgaTsKKworCWRtYV9yZXN2X2Fzc2VydF9oZWxkKG9iaik7CisKKwlmZW5jZSA9IGRt YV9yZXN2X2dldF9leGNsKG9iaik7CisJaWYgKGRtYV9mZW5jZV9pc19zaWduYWxlZChmZW5jZSkp IHsKKwkJUkNVX0lOSVRfUE9JTlRFUihvYmotPmZlbmNlX2V4Y2wsIE5VTEwpOworCQlkbWFfZmVu Y2VfcHV0KGZlbmNlKTsKKwl9CisKKwlsaXN0ID0gZG1hX3Jlc3ZfZ2V0X2xpc3Qob2JqKTsKKwlp ZiAoIWxpc3QpCisJCXJldHVybjsKKworCWZvciAoaSA9IDA7IGkgPCBsaXN0LT5zaGFyZWRfY291 bnQ7ICsraSkgeworCQlmZW5jZSA9IHJjdV9kZXJlZmVyZW5jZV9wcm90ZWN0ZWQobGlzdC0+c2hh cmVkW2ldLAorCQkJCQkJICBkbWFfcmVzdl9oZWxkKG9iaikpOworCisJCWlmICghZG1hX2ZlbmNl X2lzX3NpZ25hbGVkKGZlbmNlKSkKKwkJCWNvbnRpbnVlOworCisJCVJDVV9JTklUX1BPSU5URVIo bGlzdC0+c2hhcmVkW2ldLCBkbWFfZmVuY2VfZ2V0X3N0dWIoKSk7CisJCWRtYV9mZW5jZV9wdXQo ZmVuY2UpOworCX0KK30KK0VYUE9SVF9TWU1CT0woZG1hX3Jlc3ZfcHJ1bmVfZmVuY2VzKTsKKwog LyoqCiAqIGRtYV9yZXN2X2NvcHlfZmVuY2VzIC0gQ29weSBhbGwgZmVuY2VzIGZyb20gc3JjIHRv IGRzdC4KICogQGRzdDogdGhlIGRlc3RpbmF0aW9uIHJlc2VydmF0aW9uIG9iamVjdApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX3dhaXQuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV93YWl0LmMKaW5kZXggOGFmNTVjZDNlNjkwLi5hNzZk MzZmOGZiNzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV93 YWl0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX3dhaXQuYwpAQCAt ODUsOCArODUsNyBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZXNlcnZhdGlvbihzdHJ1Y3QgZG1h X3Jlc3YgKnJlc3YsCiAJICogc2lnbmFsZWQuCiAJICovCiAJaWYgKHBydW5lX2ZlbmNlcyAmJiBk bWFfcmVzdl90cnlsb2NrKHJlc3YpKSB7Ci0JCWlmIChkbWFfcmVzdl90ZXN0X3NpZ25hbGVkX3Jj dShyZXN2LCB0cnVlKSkKLQkJCWRtYV9yZXN2X2FkZF9leGNsX2ZlbmNlKHJlc3YsIE5VTEwpOwor CQlkbWFfcmVzdl9wcnVuZV9mZW5jZXMocmVzdik7CiAJCWRtYV9yZXN2X3VubG9jayhyZXN2KTsK IAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bv b2wuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bvb2wuYwppbmRleCA1 ZjgyYTc2M2U2NGMuLjI3NGNmNWIxOWZjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2JhdGNoX3Bvb2wuYwpAQCAtMTE0LDcgKzExNCw3IEBAIGk5MTVfZ2VtX2JhdGNoX3Bvb2xf Z2V0KHN0cnVjdCBpOTE1X2dlbV9iYXRjaF9wb29sICpwb29sLAogCQkJICovCiAJCQlpZiAocmN1 X2FjY2Vzc19wb2ludGVyKHJlc3YtPmZlbmNlKSkgewogCQkJCWRtYV9yZXN2X2xvY2socmVzdiwg TlVMTCk7Ci0JCQkJZG1hX3Jlc3ZfYWRkX2V4Y2xfZmVuY2UocmVzdiwgTlVMTCk7CisJCQkJZG1h X3Jlc3ZfcHJ1bmVfZmVuY2VzKHJlc3YpOwogCQkJCWRtYV9yZXN2X3VubG9jayhyZXN2KTsKIAkJ CX0KIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKaW5kZXggZWJmZDAzZDExN2NkLi5mY2JlNDMz YTk2OGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYwpAQCAtMTAwLDggKzEwMCw3IEBAIHN0YXRp YyB2b2lkIF9faTkxNV92bWFfcmV0aXJlKHN0cnVjdCBpOTE1X2FjdGl2ZSAqcmVmKQogCiAJLyog UHJ1bmUgdGhlIHNoYXJlZCBmZW5jZSBhcnJheXMgaWZmIGNvbXBsZXRlbHkgaWRsZSAoaW5jLiBl eHRlcm5hbCkgKi8KIAlpZiAoZG1hX3Jlc3ZfdHJ5bG9jayhvYmotPmJhc2UucmVzdikpIHsKLQkJ aWYgKGRtYV9yZXN2X3Rlc3Rfc2lnbmFsZWRfcmN1KG9iai0+YmFzZS5yZXN2LCB0cnVlKSkKLQkJ CWRtYV9yZXN2X2FkZF9leGNsX2ZlbmNlKG9iai0+YmFzZS5yZXN2LCBOVUxMKTsKKwkJZG1hX3Jl c3ZfcHJ1bmVfZmVuY2VzKG9iai0+YmFzZS5yZXN2KTsKIAkJZG1hX3Jlc3ZfdW5sb2NrKG9iai0+ YmFzZS5yZXN2KTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2Jv LmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5jCmluZGV4IDU4ZDFmMmIyODEzMi4uZjc4 ZjUyY2MyZTZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMKQEAgLTE4MTgsNyArMTgxOCw3IEBAIGludCB0 dG1fYm9fd2FpdChzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogCWlmICh0aW1lb3V0ID09 IDApCiAJCXJldHVybiAtRUJVU1k7CiAKLQlkbWFfcmVzdl9hZGRfZXhjbF9mZW5jZShiby0+YmFz ZS5yZXN2LCBOVUxMKTsKKwlkbWFfcmVzdl9wcnVuZV9mZW5jZXMoYm8tPmJhc2UucmVzdik7CiAJ cmV0dXJuIDA7CiB9CiBFWFBPUlRfU1lNQk9MKHR0bV9ib193YWl0KTsKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvbGludXgvZG1hLXJlc3YuaCBiL2luY2x1ZGUvbGludXgvZG1hLXJlc3YuaAppbmRleCBl ZTUwZDEwZjA1MmIuLjAzYjBmOTU2ODJiMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9kbWEt cmVzdi5oCisrKyBiL2luY2x1ZGUvbGludXgvZG1hLXJlc3YuaApAQCAtMjc5LDYgKzI3OSw3IEBA IGludCBkbWFfcmVzdl9yZXNlcnZlX3NoYXJlZChzdHJ1Y3QgZG1hX3Jlc3YgKm9iaiwgdW5zaWdu ZWQgaW50IG51bV9mZW5jZXMpOwogdm9pZCBkbWFfcmVzdl9hZGRfc2hhcmVkX2ZlbmNlKHN0cnVj dCBkbWFfcmVzdiAqb2JqLCBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSk7CiAKIHZvaWQgZG1hX3Jl c3ZfYWRkX2V4Y2xfZmVuY2Uoc3RydWN0IGRtYV9yZXN2ICpvYmosIHN0cnVjdCBkbWFfZmVuY2Ug KmZlbmNlKTsKK3ZvaWQgZG1hX3Jlc3ZfcHJ1bmVfZmVuY2VzKHN0cnVjdCBkbWFfcmVzdiAqb2Jq KTsKIAogaW50IGRtYV9yZXN2X2dldF9mZW5jZXNfcmN1KHN0cnVjdCBkbWFfcmVzdiAqb2JqLAog CQkJICAgIHN0cnVjdCBkbWFfZmVuY2UgKipwZmVuY2VfZXhjbCwKLS0gCjIuMTcuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs