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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 A0DF1C00454 for ; Tue, 10 Dec 2019 21:47:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76DB4205C9 for ; Tue, 10 Dec 2019 21:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576014437; bh=rnAF06ciDbzbqruYIqLqTiLgbm5Tt/iFKd+qYBb1bHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RX/2cYyyv35hwNxFUrWeWo065YUiLqncrJ6LUZydHU6YfCFshlqwjd1ng1A7/FoMO MplZKjXlF3CH5ciJC1QPKBmS3iq2Yi+x19noDY73fdT2v+pIscW9ig+wc20fJiW0ov X4l+X/Xzx0pxi1lSURTvMp9Pb0qyUtnyTfYiqoC8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729895AbfLJVrM (ORCPT ); Tue, 10 Dec 2019 16:47:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:36054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728530AbfLJVc3 (ORCPT ); Tue, 10 Dec 2019 16:32:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA08A21556; Tue, 10 Dec 2019 21:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013548; bh=rnAF06ciDbzbqruYIqLqTiLgbm5Tt/iFKd+qYBb1bHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pEOY8vLbeXgtzELfETrcZzO6FzgqXaoL8rF6yS2bbvupOPC2CQRwlr27EFrVJqmz+ TjGD1KY+UNb9o58Y777yFNqrnhJlL+kOCLR4sZU3iBly1TuLkPcNlP4QGUg45mkuQv 5e5ozPgyR7RMqyKm/La/qVdStd/U0X2PfAm4108c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Chunming Zhou , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 005/177] drm/amdgpu: grab the id mgr lock while accessing passid_mapping Date: Tue, 10 Dec 2019 16:29:29 -0500 Message-Id: <20191210213221.11921-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian König [ Upstream commit 6817bf283b2b851095825ec7f0e9f10398e09125 ] Need to make sure that we actually dropping the right fence. Could be done with RCU as well, but to complicated for a fix. Signed-off-by: Christian König Reviewed-by: Chunming Zhou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 49fe5084c53dd..69fb90d9c4855 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -700,10 +700,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ id->oa_base != job->oa_base || id->oa_size != job->oa_size); bool vm_flush_needed = job->vm_needs_flush; - bool pasid_mapping_needed = id->pasid != job->pasid || - !id->pasid_mapping || - !dma_fence_is_signaled(id->pasid_mapping); struct dma_fence *fence = NULL; + bool pasid_mapping_needed; unsigned patch_offset = 0; int r; @@ -713,6 +711,12 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ pasid_mapping_needed = true; } + mutex_lock(&id_mgr->lock); + if (id->pasid != job->pasid || !id->pasid_mapping || + !dma_fence_is_signaled(id->pasid_mapping)) + pasid_mapping_needed = true; + mutex_unlock(&id_mgr->lock); + gds_switch_needed &= !!ring->funcs->emit_gds_switch; vm_flush_needed &= !!ring->funcs->emit_vm_flush && job->vm_pd_addr != AMDGPU_BO_INVALID_OFFSET; @@ -752,9 +756,11 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ } if (pasid_mapping_needed) { + mutex_lock(&id_mgr->lock); id->pasid = job->pasid; dma_fence_put(id->pasid_mapping); id->pasid_mapping = dma_fence_get(fence); + mutex_unlock(&id_mgr->lock); } dma_fence_put(fence); -- 2.20.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=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 D6965C2D0BF for ; Tue, 10 Dec 2019 21:32:36 +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 A6D3A208C3 for ; Tue, 10 Dec 2019 21:32:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="pEOY8vLb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6D3A208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 9A0366E991; Tue, 10 Dec 2019 21:32:31 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBE166E991; Tue, 10 Dec 2019 21:32:28 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA08A21556; Tue, 10 Dec 2019 21:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013548; bh=rnAF06ciDbzbqruYIqLqTiLgbm5Tt/iFKd+qYBb1bHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pEOY8vLbeXgtzELfETrcZzO6FzgqXaoL8rF6yS2bbvupOPC2CQRwlr27EFrVJqmz+ TjGD1KY+UNb9o58Y777yFNqrnhJlL+kOCLR4sZU3iBly1TuLkPcNlP4QGUg45mkuQv 5e5ozPgyR7RMqyKm/La/qVdStd/U0X2PfAm4108c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 005/177] drm/amdgpu: grab the id mgr lock while accessing passid_mapping Date: Tue, 10 Dec 2019 16:29:29 -0500 Message-Id: <20191210213221.11921-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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: Sasha Levin , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKWyBVcHN0 cmVhbSBjb21taXQgNjgxN2JmMjgzYjJiODUxMDk1ODI1ZWM3ZjBlOWYxMDM5OGUwOTEyNSBdCgpO ZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IHdlIGFjdHVhbGx5IGRyb3BwaW5nIHRoZSByaWdodCBmZW5j ZS4KQ291bGQgYmUgZG9uZSB3aXRoIFJDVSBhcyB3ZWxsLCBidXQgdG8gY29tcGxpY2F0ZWQgZm9y IGEgZml4LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5p Z0BhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2h1bm1pbmcgWmhvdSA8ZGF2aWQxLnpob3VAYW1kLmNv bT4KU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29t PgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgfCAxMiArKysrKysrKystLS0KIDEg ZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCA0OWZlNTA4NGM1M2RkLi42OWZiOTBkOWM0 ODU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpAQCAtNzAwLDEwICs3 MDAsOCBAQCBpbnQgYW1kZ3B1X3ZtX2ZsdXNoKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3Ry dWN0IGFtZGdwdV9qb2IgKmpvYiwgYm9vbCBuZWVkXwogCQlpZC0+b2FfYmFzZSAhPSBqb2ItPm9h X2Jhc2UgfHwKIAkJaWQtPm9hX3NpemUgIT0gam9iLT5vYV9zaXplKTsKIAlib29sIHZtX2ZsdXNo X25lZWRlZCA9IGpvYi0+dm1fbmVlZHNfZmx1c2g7Ci0JYm9vbCBwYXNpZF9tYXBwaW5nX25lZWRl ZCA9IGlkLT5wYXNpZCAhPSBqb2ItPnBhc2lkIHx8Ci0JCSFpZC0+cGFzaWRfbWFwcGluZyB8fAot CQkhZG1hX2ZlbmNlX2lzX3NpZ25hbGVkKGlkLT5wYXNpZF9tYXBwaW5nKTsKIAlzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZSA9IE5VTEw7CisJYm9vbCBwYXNpZF9tYXBwaW5nX25lZWRlZDsKIAl1bnNp Z25lZCBwYXRjaF9vZmZzZXQgPSAwOwogCWludCByOwogCkBAIC03MTMsNiArNzExLDEyIEBAIGlu dCBhbWRncHVfdm1fZmx1c2goc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBzdHJ1Y3QgYW1kZ3B1 X2pvYiAqam9iLCBib29sIG5lZWRfCiAJCXBhc2lkX21hcHBpbmdfbmVlZGVkID0gdHJ1ZTsKIAl9 CiAKKwltdXRleF9sb2NrKCZpZF9tZ3ItPmxvY2spOworCWlmIChpZC0+cGFzaWQgIT0gam9iLT5w YXNpZCB8fCAhaWQtPnBhc2lkX21hcHBpbmcgfHwKKwkgICAgIWRtYV9mZW5jZV9pc19zaWduYWxl ZChpZC0+cGFzaWRfbWFwcGluZykpCisJCXBhc2lkX21hcHBpbmdfbmVlZGVkID0gdHJ1ZTsKKwlt dXRleF91bmxvY2soJmlkX21nci0+bG9jayk7CisKIAlnZHNfc3dpdGNoX25lZWRlZCAmPSAhIXJp bmctPmZ1bmNzLT5lbWl0X2dkc19zd2l0Y2g7CiAJdm1fZmx1c2hfbmVlZGVkICY9ICEhcmluZy0+ ZnVuY3MtPmVtaXRfdm1fZmx1c2ggICYmCiAJCQlqb2ItPnZtX3BkX2FkZHIgIT0gQU1ER1BVX0JP X0lOVkFMSURfT0ZGU0VUOwpAQCAtNzUyLDkgKzc1NiwxMSBAQCBpbnQgYW1kZ3B1X3ZtX2ZsdXNo KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3RydWN0IGFtZGdwdV9qb2IgKmpvYiwgYm9vbCBu ZWVkXwogCX0KIAogCWlmIChwYXNpZF9tYXBwaW5nX25lZWRlZCkgeworCQltdXRleF9sb2NrKCZp ZF9tZ3ItPmxvY2spOwogCQlpZC0+cGFzaWQgPSBqb2ItPnBhc2lkOwogCQlkbWFfZmVuY2VfcHV0 KGlkLT5wYXNpZF9tYXBwaW5nKTsKIAkJaWQtPnBhc2lkX21hcHBpbmcgPSBkbWFfZmVuY2VfZ2V0 KGZlbmNlKTsKKwkJbXV0ZXhfdW5sb2NrKCZpZF9tZ3ItPmxvY2spOwogCX0KIAlkbWFfZmVuY2Vf cHV0KGZlbmNlKTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK 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.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 2F1C8C43603 for ; Tue, 10 Dec 2019 21:32:36 +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 F3F51208C3 for ; Tue, 10 Dec 2019 21:32:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="pEOY8vLb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3F51208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22B826E98A; Tue, 10 Dec 2019 21:32:30 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBE166E991; Tue, 10 Dec 2019 21:32:28 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA08A21556; Tue, 10 Dec 2019 21:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013548; bh=rnAF06ciDbzbqruYIqLqTiLgbm5Tt/iFKd+qYBb1bHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pEOY8vLbeXgtzELfETrcZzO6FzgqXaoL8rF6yS2bbvupOPC2CQRwlr27EFrVJqmz+ TjGD1KY+UNb9o58Y777yFNqrnhJlL+kOCLR4sZU3iBly1TuLkPcNlP4QGUg45mkuQv 5e5ozPgyR7RMqyKm/La/qVdStd/U0X2PfAm4108c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 005/177] drm/amdgpu: grab the id mgr lock while accessing passid_mapping Date: Tue, 10 Dec 2019 16:29:29 -0500 Message-Id: <20191210213221.11921-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Chunming Zhou , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKWyBVcHN0 cmVhbSBjb21taXQgNjgxN2JmMjgzYjJiODUxMDk1ODI1ZWM3ZjBlOWYxMDM5OGUwOTEyNSBdCgpO ZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IHdlIGFjdHVhbGx5IGRyb3BwaW5nIHRoZSByaWdodCBmZW5j ZS4KQ291bGQgYmUgZG9uZSB3aXRoIFJDVSBhcyB3ZWxsLCBidXQgdG8gY29tcGxpY2F0ZWQgZm9y IGEgZml4LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5p Z0BhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2h1bm1pbmcgWmhvdSA8ZGF2aWQxLnpob3VAYW1kLmNv bT4KU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29t PgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgfCAxMiArKysrKysrKystLS0KIDEg ZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCA0OWZlNTA4NGM1M2RkLi42OWZiOTBkOWM0 ODU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpAQCAtNzAwLDEwICs3 MDAsOCBAQCBpbnQgYW1kZ3B1X3ZtX2ZsdXNoKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3Ry dWN0IGFtZGdwdV9qb2IgKmpvYiwgYm9vbCBuZWVkXwogCQlpZC0+b2FfYmFzZSAhPSBqb2ItPm9h X2Jhc2UgfHwKIAkJaWQtPm9hX3NpemUgIT0gam9iLT5vYV9zaXplKTsKIAlib29sIHZtX2ZsdXNo X25lZWRlZCA9IGpvYi0+dm1fbmVlZHNfZmx1c2g7Ci0JYm9vbCBwYXNpZF9tYXBwaW5nX25lZWRl ZCA9IGlkLT5wYXNpZCAhPSBqb2ItPnBhc2lkIHx8Ci0JCSFpZC0+cGFzaWRfbWFwcGluZyB8fAot CQkhZG1hX2ZlbmNlX2lzX3NpZ25hbGVkKGlkLT5wYXNpZF9tYXBwaW5nKTsKIAlzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZSA9IE5VTEw7CisJYm9vbCBwYXNpZF9tYXBwaW5nX25lZWRlZDsKIAl1bnNp Z25lZCBwYXRjaF9vZmZzZXQgPSAwOwogCWludCByOwogCkBAIC03MTMsNiArNzExLDEyIEBAIGlu dCBhbWRncHVfdm1fZmx1c2goc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBzdHJ1Y3QgYW1kZ3B1 X2pvYiAqam9iLCBib29sIG5lZWRfCiAJCXBhc2lkX21hcHBpbmdfbmVlZGVkID0gdHJ1ZTsKIAl9 CiAKKwltdXRleF9sb2NrKCZpZF9tZ3ItPmxvY2spOworCWlmIChpZC0+cGFzaWQgIT0gam9iLT5w YXNpZCB8fCAhaWQtPnBhc2lkX21hcHBpbmcgfHwKKwkgICAgIWRtYV9mZW5jZV9pc19zaWduYWxl ZChpZC0+cGFzaWRfbWFwcGluZykpCisJCXBhc2lkX21hcHBpbmdfbmVlZGVkID0gdHJ1ZTsKKwlt dXRleF91bmxvY2soJmlkX21nci0+bG9jayk7CisKIAlnZHNfc3dpdGNoX25lZWRlZCAmPSAhIXJp bmctPmZ1bmNzLT5lbWl0X2dkc19zd2l0Y2g7CiAJdm1fZmx1c2hfbmVlZGVkICY9ICEhcmluZy0+ ZnVuY3MtPmVtaXRfdm1fZmx1c2ggICYmCiAJCQlqb2ItPnZtX3BkX2FkZHIgIT0gQU1ER1BVX0JP X0lOVkFMSURfT0ZGU0VUOwpAQCAtNzUyLDkgKzc1NiwxMSBAQCBpbnQgYW1kZ3B1X3ZtX2ZsdXNo KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3RydWN0IGFtZGdwdV9qb2IgKmpvYiwgYm9vbCBu ZWVkXwogCX0KIAogCWlmIChwYXNpZF9tYXBwaW5nX25lZWRlZCkgeworCQltdXRleF9sb2NrKCZp ZF9tZ3ItPmxvY2spOwogCQlpZC0+cGFzaWQgPSBqb2ItPnBhc2lkOwogCQlkbWFfZmVuY2VfcHV0 KGlkLT5wYXNpZF9tYXBwaW5nKTsKIAkJaWQtPnBhc2lkX21hcHBpbmcgPSBkbWFfZmVuY2VfZ2V0 KGZlbmNlKTsKKwkJbXV0ZXhfdW5sb2NrKCZpZF9tZ3ItPmxvY2spOwogCX0KIAlkbWFfZmVuY2Vf cHV0KGZlbmNlKTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2FtZC1nZngK