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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 6943BC04FF3 for ; Mon, 24 May 2021 21:00:31 +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 1BE7D613AD for ; Mon, 24 May 2021 21:00:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BE7D613AD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net 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 C992A6E95A; Mon, 24 May 2021 21:00:27 +0000 (UTC) Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFDC86E95D for ; Mon, 24 May 2021 21:00:11 +0000 (UTC) Received: by mail-pj1-x102f.google.com with SMTP id lx17-20020a17090b4b11b029015f3b32b8dbso10197568pjb.0 for ; Mon, 24 May 2021 14:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6RMxGwprBHBiDYePzeNvL12bDivHZhDbzlXa04U4r4=; b=z4rv8er6THfGjfLdW6bCBb6KeTam5NZ/5VN71oTgdnfH6Cl2MQur6Y0cBXnbMvyuLW 0bBtcuCaozcsKTBXDQIpKKWLFdXZOaECHh/rs3RGrIZhWxA8Q3PH9XZsXRpZBdnLVUa3 ChknxghgGnVhSBq27zeHxlSQRwaerm+w06PK1Plg75rGBFxHIi7dSHlDvOvdUxvUjp5m fDmPSnBH/bQ38ERo8fFaap8WkED4UBStHJi8KJPO5sfWJD9fmK5ntqThzUlvoa5WQPOv ajx9Uxz7la0gy1oQ2lFW107yxXNLZcU+E+nu34IGyWk98hyg1rp2yYI7/9ENlqcIxoUC v/2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/6RMxGwprBHBiDYePzeNvL12bDivHZhDbzlXa04U4r4=; b=L/2lkWKLmlAW7115+YBoVJw5+2+pGw3EQ9e5CL02jc3TSuEKh4Hm00vj21Sjff40kk 9P91548jkUjZ71J0Ynen5U12GzTWl4KtKNyQGcNfJiA5WX/B2eaJcvcXB6JQYQGzMfiz Uv9WOAIcyeNKucr+7skNHu1WOGZh82PfwR6p85jbR81gQv0qq+NaqAqbxxAhF/bHVRqE UEaevhkmg0i1fxYcmpbp7R5ZVCgqpSKCN0s+X2AmZCWYVM9gvq7iVeJbSkuVSKWQwmI/ DGLkcNugxd+rF74L5DObFzV0MNkf8LIRd5rLp+p9jx4Ml+Y4DfbrClf+ae6v7vik9PH6 gWkg== X-Gm-Message-State: AOAM532k6+Jjra2rHX2TMqd1pmbHUoaP4S/n4QWMKHSwOzseTMHUUDUS Q6aYFRSrfYPnTSALun1SdHEgVfFkfKI+cQ== X-Google-Smtp-Source: ABdhPJyP9/32OQaKH60r5hD9d41jYWaOcjndB/4EOHUaoIigjXUwfMbxiHMM/ns4sgXujca80eVPCw== X-Received: by 2002:a17:90a:1b45:: with SMTP id q63mr27165264pjq.195.1621890010821; Mon, 24 May 2021 14:00:10 -0700 (PDT) Received: from omlet.com ([134.134.139.76]) by smtp.gmail.com with ESMTPSA id c195sm12354958pfb.144.2021.05.24.14.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 14:00:10 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 4/6] dma-buf: Add an API for exporting sync files (v9) Date: Mon, 24 May 2021 15:59:52 -0500 Message-Id: <20210524205954.872814-5-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524205954.872814-1-jason@jlekstrand.net> References: <20210524205954.872814-1-jason@jlekstrand.net> 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?Christian=20K=C3=B6nig?= , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Modern userspace APIs like Vulkan are built on an explicit synchronization model. This doesn't always play nicely with the implicit synchronization used in the kernel and assumed by X11 and Wayland. The client -> compositor half of the synchronization isn't too bad, at least on intel, because we can control whether or not i915 synchronizes on the buffer and whether or not it's considered written. The harder part is the compositor -> client synchronization when we get the buffer back from the compositor. We're required to be able to provide the client with a VkSemaphore and VkFence representing the point in time where the window system (compositor and/or display) finished using the buffer. With current APIs, it's very hard to do this in such a way that we don't get confused by the Vulkan driver's access of the buffer. In particular, once we tell the kernel that we're rendering to the buffer again, any CPU waits on the buffer or GPU dependencies will wait on some of the client rendering and not just the compositor. This new IOCTL solves this problem by allowing us to get a snapshot of the implicit synchronization state of a given dma-buf in the form of a sync file. It's effectively the same as a poll() or I915_GEM_WAIT only, instead of CPU waiting directly, it encapsulates the wait operation, at the current moment in time, in a sync_file so we can check/wait on it later. As long as the Vulkan driver does the sync_file export from the dma-buf before we re-introduce it for rendering, it will only contain fences from the compositor or display. This allows to accurately turn it into a VkFence or VkSemaphore without any over- synchronization. v2 (Jason Ekstrand): - Use a wrapper dma_fence_array of all fences including the new one when importing an exclusive fence. v3 (Jason Ekstrand): - Lock around setting shared fences as well as exclusive - Mark SIGNAL_SYNC_FILE as a read-write ioctl. - Initialize ret to 0 in dma_buf_wait_sync_file v4 (Jason Ekstrand): - Use the new dma_resv_get_singleton helper v5 (Jason Ekstrand): - Rename the IOCTLs to import/export rather than wait/signal - Drop the WRITE flag and always get/set the exclusive fence v6 (Jason Ekstrand): - Drop the sync_file import as it was all-around sketchy and not nearly as useful as import. - Re-introduce READ/WRITE flag support for export - Rework the commit message v7 (Jason Ekstrand): - Require at least one sync flag - Fix a refcounting bug: dma_resv_get_excl() doesn't take a reference - Use _rcu helpers since we're accessing the dma_resv read-only v8 (Jason Ekstrand): - Return -ENOMEM if the sync_file_create fails - Predicate support on IS_ENABLED(CONFIG_SYNC_FILE) v9 (Jason Ekstrand): - Add documentation for the new ioctl v10 (Jason Ekstrand): - Go back to dma_buf_sync_file as the ioctl struct name Signed-off-by: Jason Ekstrand Acked-by: Simon Ser Acked-by: Christian König --- drivers/dma-buf/dma-buf.c | 64 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/dma-buf.h | 24 ++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index d4529aa9d1a5a..86efe71c0db96 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -362,6 +363,64 @@ static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf) return ret; } +#if IS_ENABLED(CONFIG_SYNC_FILE) +static long dma_buf_export_sync_file(struct dma_buf *dmabuf, + void __user *user_data) +{ + struct dma_buf_sync_file arg; + struct dma_fence *fence = NULL; + struct sync_file *sync_file; + int fd, ret; + + if (copy_from_user(&arg, user_data, sizeof(arg))) + return -EFAULT; + + if (arg.flags & ~DMA_BUF_SYNC_RW) + return -EINVAL; + + if ((arg.flags & DMA_BUF_SYNC_RW) == 0) + return -EINVAL; + + fd = get_unused_fd_flags(O_CLOEXEC); + if (fd < 0) + return fd; + + if (arg.flags & DMA_BUF_SYNC_WRITE) { + fence = dma_resv_get_singleton_unlocked(dmabuf->resv); + if (IS_ERR(fence)) { + ret = PTR_ERR(fence); + goto err_put_fd; + } + } else if (arg.flags & DMA_BUF_SYNC_READ) { + fence = dma_resv_get_excl_unlocked(dmabuf->resv); + } + + if (!fence) + fence = dma_fence_get_stub(); + + sync_file = sync_file_create(fence); + + dma_fence_put(fence); + + if (!sync_file) { + ret = -ENOMEM; + goto err_put_fd; + } + + fd_install(fd, sync_file->file); + + arg.fd = fd; + if (copy_to_user(user_data, &arg, sizeof(arg))) + return -EFAULT; + + return 0; + +err_put_fd: + put_unused_fd(fd); + return ret; +} +#endif + static long dma_buf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -405,6 +464,11 @@ static long dma_buf_ioctl(struct file *file, case DMA_BUF_SET_NAME_B: return dma_buf_set_name(dmabuf, (const char __user *)arg); +#if IS_ENABLED(CONFIG_SYNC_FILE) + case DMA_BUF_IOCTL_EXPORT_SYNC_FILE: + return dma_buf_export_sync_file(dmabuf, (void __user *)arg); +#endif + default: return -ENOTTY; } diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index 7f30393b92c3b..f902cadcbdb56 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -37,6 +37,29 @@ struct dma_buf_sync { #define DMA_BUF_NAME_LEN 32 +/** + * struct dma_buf_export_sync_file - Get a sync_file from a dma-buf + * + * Userspace can perform a DMA_BUF_IOCTL_EXPORT_SYNC_FILE to retrieve the + * current set of fences on a dma-buf file descriptor as a sync_file. CPU + * waits via poll() or other driver-specific mechanisms typically wait on + * whatever fences are on the dma-buf at the time the wait begins. This + * is similar except that it takes a snapshot of the current fences on the + * dma-buf for waiting later instead of waiting immediately. This is + * useful for modern graphics APIs such as Vulkan which assume an explicit + * synchronization model but still need to inter-operate with dma-buf. + */ +struct dma_buf_sync_file { + /** + * @flags: Read/write flags + * + * Must DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE, or both. + */ + __u32 flags; + /** @fd: Sync file file descriptor */ + __s32 fd; +}; + #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) @@ -46,5 +69,6 @@ struct dma_buf_sync { #define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) #define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) #define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) +#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE _IOWR(DMA_BUF_BASE, 2, struct dma_buf_sync_file) #endif -- 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 204D1C2B9F8 for ; Mon, 24 May 2021 21:00:35 +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 C8E636140F for ; Mon, 24 May 2021 21:00:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8E636140F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net 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 0B04A6E952; Mon, 24 May 2021 21:00:27 +0000 (UTC) Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EFAB6E96A for ; Mon, 24 May 2021 21:00:16 +0000 (UTC) Received: by mail-pl1-x62c.google.com with SMTP id t9so6808289ply.6 for ; Mon, 24 May 2021 14:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6RMxGwprBHBiDYePzeNvL12bDivHZhDbzlXa04U4r4=; b=z4rv8er6THfGjfLdW6bCBb6KeTam5NZ/5VN71oTgdnfH6Cl2MQur6Y0cBXnbMvyuLW 0bBtcuCaozcsKTBXDQIpKKWLFdXZOaECHh/rs3RGrIZhWxA8Q3PH9XZsXRpZBdnLVUa3 ChknxghgGnVhSBq27zeHxlSQRwaerm+w06PK1Plg75rGBFxHIi7dSHlDvOvdUxvUjp5m fDmPSnBH/bQ38ERo8fFaap8WkED4UBStHJi8KJPO5sfWJD9fmK5ntqThzUlvoa5WQPOv ajx9Uxz7la0gy1oQ2lFW107yxXNLZcU+E+nu34IGyWk98hyg1rp2yYI7/9ENlqcIxoUC v/2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/6RMxGwprBHBiDYePzeNvL12bDivHZhDbzlXa04U4r4=; b=fNbFoEK0f2q7ADoypsCOs5oNSwwgQNyPdlKqax7hyH4UDnjjuzCSBP1Oo19gMXc3th ICqQOlgdRMdAHE2doYWD3LwVYNbaaGkfA97LozN8ctItnWiAf6A/yt/6uLd4aNZ2eKjB PpONufFcJu35U2xnlRVCOxvaO4+2hsck7M76TfpVoJNQAjU9eeaoYNB7B3Ga2+VADAR2 DcRZRVfkim/fvERJlueWUTzMrkVbuqluoRNsUToDPiunkqBm8m+DRVevoQq+nvna1b1V 0GJJinjsGQ7p1cSBaW3S/kZnhpUdLPBDvJX9UssCitJoEbPZg+p5ZO868ue3sgjvK6/n 1HEw== X-Gm-Message-State: AOAM5327XCe1qeOlqt0hVpKUuRposS2JCSjZiWBij/4OyxA/MaZ05hlq nTDU/Fx1e0r0jxjbAj88X6zHWw== X-Google-Smtp-Source: ABdhPJyP9/32OQaKH60r5hD9d41jYWaOcjndB/4EOHUaoIigjXUwfMbxiHMM/ns4sgXujca80eVPCw== X-Received: by 2002:a17:90a:1b45:: with SMTP id q63mr27165264pjq.195.1621890010821; Mon, 24 May 2021 14:00:10 -0700 (PDT) Received: from omlet.com ([134.134.139.76]) by smtp.gmail.com with ESMTPSA id c195sm12354958pfb.144.2021.05.24.14.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 14:00:10 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Mon, 24 May 2021 15:59:52 -0500 Message-Id: <20210524205954.872814-5-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524205954.872814-1-jason@jlekstrand.net> References: <20210524205954.872814-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 4/6] dma-buf: Add an API for exporting sync files (v9) 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: Simon Ser , =?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" TW9kZXJuIHVzZXJzcGFjZSBBUElzIGxpa2UgVnVsa2FuIGFyZSBidWlsdCBvbiBhbiBleHBsaWNp dApzeW5jaHJvbml6YXRpb24gbW9kZWwuICBUaGlzIGRvZXNuJ3QgYWx3YXlzIHBsYXkgbmljZWx5 IHdpdGggdGhlCmltcGxpY2l0IHN5bmNocm9uaXphdGlvbiB1c2VkIGluIHRoZSBrZXJuZWwgYW5k IGFzc3VtZWQgYnkgWDExIGFuZApXYXlsYW5kLiAgVGhlIGNsaWVudCAtPiBjb21wb3NpdG9yIGhh bGYgb2YgdGhlIHN5bmNocm9uaXphdGlvbiBpc24ndCB0b28KYmFkLCBhdCBsZWFzdCBvbiBpbnRl bCwgYmVjYXVzZSB3ZSBjYW4gY29udHJvbCB3aGV0aGVyIG9yIG5vdCBpOTE1CnN5bmNocm9uaXpl cyBvbiB0aGUgYnVmZmVyIGFuZCB3aGV0aGVyIG9yIG5vdCBpdCdzIGNvbnNpZGVyZWQgd3JpdHRl bi4KClRoZSBoYXJkZXIgcGFydCBpcyB0aGUgY29tcG9zaXRvciAtPiBjbGllbnQgc3luY2hyb25p emF0aW9uIHdoZW4gd2UgZ2V0CnRoZSBidWZmZXIgYmFjayBmcm9tIHRoZSBjb21wb3NpdG9yLiAg V2UncmUgcmVxdWlyZWQgdG8gYmUgYWJsZSB0bwpwcm92aWRlIHRoZSBjbGllbnQgd2l0aCBhIFZr U2VtYXBob3JlIGFuZCBWa0ZlbmNlIHJlcHJlc2VudGluZyB0aGUgcG9pbnQKaW4gdGltZSB3aGVy ZSB0aGUgd2luZG93IHN5c3RlbSAoY29tcG9zaXRvciBhbmQvb3IgZGlzcGxheSkgZmluaXNoZWQK dXNpbmcgdGhlIGJ1ZmZlci4gIFdpdGggY3VycmVudCBBUElzLCBpdCdzIHZlcnkgaGFyZCB0byBk byB0aGlzIGluIHN1Y2gKYSB3YXkgdGhhdCB3ZSBkb24ndCBnZXQgY29uZnVzZWQgYnkgdGhlIFZ1 bGthbiBkcml2ZXIncyBhY2Nlc3Mgb2YgdGhlCmJ1ZmZlci4gIEluIHBhcnRpY3VsYXIsIG9uY2Ug d2UgdGVsbCB0aGUga2VybmVsIHRoYXQgd2UncmUgcmVuZGVyaW5nIHRvCnRoZSBidWZmZXIgYWdh aW4sIGFueSBDUFUgd2FpdHMgb24gdGhlIGJ1ZmZlciBvciBHUFUgZGVwZW5kZW5jaWVzIHdpbGwK d2FpdCBvbiBzb21lIG9mIHRoZSBjbGllbnQgcmVuZGVyaW5nIGFuZCBub3QganVzdCB0aGUgY29t cG9zaXRvci4KClRoaXMgbmV3IElPQ1RMIHNvbHZlcyB0aGlzIHByb2JsZW0gYnkgYWxsb3dpbmcg dXMgdG8gZ2V0IGEgc25hcHNob3Qgb2YKdGhlIGltcGxpY2l0IHN5bmNocm9uaXphdGlvbiBzdGF0 ZSBvZiBhIGdpdmVuIGRtYS1idWYgaW4gdGhlIGZvcm0gb2YgYQpzeW5jIGZpbGUuICBJdCdzIGVm ZmVjdGl2ZWx5IHRoZSBzYW1lIGFzIGEgcG9sbCgpIG9yIEk5MTVfR0VNX1dBSVQgb25seSwKaW5z dGVhZCBvZiBDUFUgd2FpdGluZyBkaXJlY3RseSwgaXQgZW5jYXBzdWxhdGVzIHRoZSB3YWl0IG9w ZXJhdGlvbiwgYXQKdGhlIGN1cnJlbnQgbW9tZW50IGluIHRpbWUsIGluIGEgc3luY19maWxlIHNv IHdlIGNhbiBjaGVjay93YWl0IG9uIGl0CmxhdGVyLiAgQXMgbG9uZyBhcyB0aGUgVnVsa2FuIGRy aXZlciBkb2VzIHRoZSBzeW5jX2ZpbGUgZXhwb3J0IGZyb20gdGhlCmRtYS1idWYgYmVmb3JlIHdl IHJlLWludHJvZHVjZSBpdCBmb3IgcmVuZGVyaW5nLCBpdCB3aWxsIG9ubHkgY29udGFpbgpmZW5j ZXMgZnJvbSB0aGUgY29tcG9zaXRvciBvciBkaXNwbGF5LiAgVGhpcyBhbGxvd3MgdG8gYWNjdXJh dGVseSB0dXJuCml0IGludG8gYSBWa0ZlbmNlIG9yIFZrU2VtYXBob3JlIHdpdGhvdXQgYW55IG92 ZXItIHN5bmNocm9uaXphdGlvbi4KCnYyIChKYXNvbiBFa3N0cmFuZCk6CiAtIFVzZSBhIHdyYXBw ZXIgZG1hX2ZlbmNlX2FycmF5IG9mIGFsbCBmZW5jZXMgaW5jbHVkaW5nIHRoZSBuZXcgb25lCiAg IHdoZW4gaW1wb3J0aW5nIGFuIGV4Y2x1c2l2ZSBmZW5jZS4KCnYzIChKYXNvbiBFa3N0cmFuZCk6 CiAtIExvY2sgYXJvdW5kIHNldHRpbmcgc2hhcmVkIGZlbmNlcyBhcyB3ZWxsIGFzIGV4Y2x1c2l2 ZQogLSBNYXJrIFNJR05BTF9TWU5DX0ZJTEUgYXMgYSByZWFkLXdyaXRlIGlvY3RsLgogLSBJbml0 aWFsaXplIHJldCB0byAwIGluIGRtYV9idWZfd2FpdF9zeW5jX2ZpbGUKCnY0IChKYXNvbiBFa3N0 cmFuZCk6CiAtIFVzZSB0aGUgbmV3IGRtYV9yZXN2X2dldF9zaW5nbGV0b24gaGVscGVyCgp2NSAo SmFzb24gRWtzdHJhbmQpOgogLSBSZW5hbWUgdGhlIElPQ1RMcyB0byBpbXBvcnQvZXhwb3J0IHJh dGhlciB0aGFuIHdhaXQvc2lnbmFsCiAtIERyb3AgdGhlIFdSSVRFIGZsYWcgYW5kIGFsd2F5cyBn ZXQvc2V0IHRoZSBleGNsdXNpdmUgZmVuY2UKCnY2IChKYXNvbiBFa3N0cmFuZCk6CiAtIERyb3Ag dGhlIHN5bmNfZmlsZSBpbXBvcnQgYXMgaXQgd2FzIGFsbC1hcm91bmQgc2tldGNoeSBhbmQgbm90 IG5lYXJseQogICBhcyB1c2VmdWwgYXMgaW1wb3J0LgogLSBSZS1pbnRyb2R1Y2UgUkVBRC9XUklU RSBmbGFnIHN1cHBvcnQgZm9yIGV4cG9ydAogLSBSZXdvcmsgdGhlIGNvbW1pdCBtZXNzYWdlCgp2 NyAoSmFzb24gRWtzdHJhbmQpOgogLSBSZXF1aXJlIGF0IGxlYXN0IG9uZSBzeW5jIGZsYWcKIC0g Rml4IGEgcmVmY291bnRpbmcgYnVnOiBkbWFfcmVzdl9nZXRfZXhjbCgpIGRvZXNuJ3QgdGFrZSBh IHJlZmVyZW5jZQogLSBVc2UgX3JjdSBoZWxwZXJzIHNpbmNlIHdlJ3JlIGFjY2Vzc2luZyB0aGUg ZG1hX3Jlc3YgcmVhZC1vbmx5Cgp2OCAoSmFzb24gRWtzdHJhbmQpOgogLSBSZXR1cm4gLUVOT01F TSBpZiB0aGUgc3luY19maWxlX2NyZWF0ZSBmYWlscwogLSBQcmVkaWNhdGUgc3VwcG9ydCBvbiBJ U19FTkFCTEVEKENPTkZJR19TWU5DX0ZJTEUpCgp2OSAoSmFzb24gRWtzdHJhbmQpOgogLSBBZGQg ZG9jdW1lbnRhdGlvbiBmb3IgdGhlIG5ldyBpb2N0bAoKdjEwIChKYXNvbiBFa3N0cmFuZCk6CiAt IEdvIGJhY2sgdG8gZG1hX2J1Zl9zeW5jX2ZpbGUgYXMgdGhlIGlvY3RsIHN0cnVjdCBuYW1lCgpT aWduZWQtb2ZmLWJ5OiBKYXNvbiBFa3N0cmFuZCA8amFzb25Aamxla3N0cmFuZC5uZXQ+CkFja2Vk LWJ5OiBTaW1vbiBTZXIgPGNvbnRhY3RAZW1lcnNpb24uZnI+CkFja2VkLWJ5OiBDaHJpc3RpYW4g S8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9kbWEtYnVmL2Rt YS1idWYuYyAgICB8IDY0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaW5j bHVkZS91YXBpL2xpbnV4L2RtYS1idWYuaCB8IDI0ICsrKysrKysrKysrKysrCiAyIGZpbGVzIGNo YW5nZWQsIDg4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvZG1h LWJ1Zi5jIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwppbmRleCBkNDUyOWFhOWQxYTVhLi44 NmVmZTcxYzBkYjk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCisrKyBi L2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMKQEAgLTIwLDYgKzIwLDcgQEAKICNpbmNsdWRlIDxs aW51eC9kZWJ1Z2ZzLmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5jbHVkZSA8bGlu dXgvc2VxX2ZpbGUuaD4KKyNpbmNsdWRlIDxsaW51eC9zeW5jX2ZpbGUuaD4KICNpbmNsdWRlIDxs aW51eC9wb2xsLmg+CiAjaW5jbHVkZSA8bGludXgvZG1hLXJlc3YuaD4KICNpbmNsdWRlIDxsaW51 eC9tbS5oPgpAQCAtMzYyLDYgKzM2Myw2NCBAQCBzdGF0aWMgbG9uZyBkbWFfYnVmX3NldF9uYW1l KHN0cnVjdCBkbWFfYnVmICpkbWFidWYsIGNvbnN0IGNoYXIgX191c2VyICpidWYpCiAJcmV0dXJu IHJldDsKIH0KIAorI2lmIElTX0VOQUJMRUQoQ09ORklHX1NZTkNfRklMRSkKK3N0YXRpYyBsb25n IGRtYV9idWZfZXhwb3J0X3N5bmNfZmlsZShzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmLAorCQkJCSAg ICAgdm9pZCBfX3VzZXIgKnVzZXJfZGF0YSkKK3sKKwlzdHJ1Y3QgZG1hX2J1Zl9zeW5jX2ZpbGUg YXJnOworCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlID0gTlVMTDsKKwlzdHJ1Y3Qgc3luY19maWxl ICpzeW5jX2ZpbGU7CisJaW50IGZkLCByZXQ7CisKKwlpZiAoY29weV9mcm9tX3VzZXIoJmFyZywg dXNlcl9kYXRhLCBzaXplb2YoYXJnKSkpCisJCXJldHVybiAtRUZBVUxUOworCisJaWYgKGFyZy5m bGFncyAmIH5ETUFfQlVGX1NZTkNfUlcpCisJCXJldHVybiAtRUlOVkFMOworCisJaWYgKChhcmcu ZmxhZ3MgJiBETUFfQlVGX1NZTkNfUlcpID09IDApCisJCXJldHVybiAtRUlOVkFMOworCisJZmQg PSBnZXRfdW51c2VkX2ZkX2ZsYWdzKE9fQ0xPRVhFQyk7CisJaWYgKGZkIDwgMCkKKwkJcmV0dXJu IGZkOworCisJaWYgKGFyZy5mbGFncyAmIERNQV9CVUZfU1lOQ19XUklURSkgeworCQlmZW5jZSA9 IGRtYV9yZXN2X2dldF9zaW5nbGV0b25fdW5sb2NrZWQoZG1hYnVmLT5yZXN2KTsKKwkJaWYgKElT X0VSUihmZW5jZSkpIHsKKwkJCXJldCA9IFBUUl9FUlIoZmVuY2UpOworCQkJZ290byBlcnJfcHV0 X2ZkOworCQl9CisJfSBlbHNlIGlmIChhcmcuZmxhZ3MgJiBETUFfQlVGX1NZTkNfUkVBRCkgewor CQlmZW5jZSA9IGRtYV9yZXN2X2dldF9leGNsX3VubG9ja2VkKGRtYWJ1Zi0+cmVzdik7CisJfQor CisJaWYgKCFmZW5jZSkKKwkJZmVuY2UgPSBkbWFfZmVuY2VfZ2V0X3N0dWIoKTsKKworCXN5bmNf ZmlsZSA9IHN5bmNfZmlsZV9jcmVhdGUoZmVuY2UpOworCisJZG1hX2ZlbmNlX3B1dChmZW5jZSk7 CisKKwlpZiAoIXN5bmNfZmlsZSkgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIGVycl9wdXRf ZmQ7CisJfQorCisJZmRfaW5zdGFsbChmZCwgc3luY19maWxlLT5maWxlKTsKKworCWFyZy5mZCA9 IGZkOworCWlmIChjb3B5X3RvX3VzZXIodXNlcl9kYXRhLCAmYXJnLCBzaXplb2YoYXJnKSkpCisJ CXJldHVybiAtRUZBVUxUOworCisJcmV0dXJuIDA7CisKK2Vycl9wdXRfZmQ6CisJcHV0X3VudXNl ZF9mZChmZCk7CisJcmV0dXJuIHJldDsKK30KKyNlbmRpZgorCiBzdGF0aWMgbG9uZyBkbWFfYnVm X2lvY3RsKHN0cnVjdCBmaWxlICpmaWxlLAogCQkJICB1bnNpZ25lZCBpbnQgY21kLCB1bnNpZ25l ZCBsb25nIGFyZykKIHsKQEAgLTQwNSw2ICs0NjQsMTEgQEAgc3RhdGljIGxvbmcgZG1hX2J1Zl9p b2N0bChzdHJ1Y3QgZmlsZSAqZmlsZSwKIAljYXNlIERNQV9CVUZfU0VUX05BTUVfQjoKIAkJcmV0 dXJuIGRtYV9idWZfc2V0X25hbWUoZG1hYnVmLCAoY29uc3QgY2hhciBfX3VzZXIgKilhcmcpOwog CisjaWYgSVNfRU5BQkxFRChDT05GSUdfU1lOQ19GSUxFKQorCWNhc2UgRE1BX0JVRl9JT0NUTF9F WFBPUlRfU1lOQ19GSUxFOgorCQlyZXR1cm4gZG1hX2J1Zl9leHBvcnRfc3luY19maWxlKGRtYWJ1 ZiwgKHZvaWQgX191c2VyICopYXJnKTsKKyNlbmRpZgorCiAJZGVmYXVsdDoKIAkJcmV0dXJuIC1F Tk9UVFk7CiAJfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L2RtYS1idWYuaCBiL2lu Y2x1ZGUvdWFwaS9saW51eC9kbWEtYnVmLmgKaW5kZXggN2YzMDM5M2I5MmMzYi4uZjkwMmNhZGNi ZGI1NiAxMDA2NDQKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L2RtYS1idWYuaAorKysgYi9pbmNs dWRlL3VhcGkvbGludXgvZG1hLWJ1Zi5oCkBAIC0zNyw2ICszNywyOSBAQCBzdHJ1Y3QgZG1hX2J1 Zl9zeW5jIHsKIAogI2RlZmluZSBETUFfQlVGX05BTUVfTEVOCTMyCiAKKy8qKgorICogc3RydWN0 IGRtYV9idWZfZXhwb3J0X3N5bmNfZmlsZSAtIEdldCBhIHN5bmNfZmlsZSBmcm9tIGEgZG1hLWJ1 ZgorICoKKyAqIFVzZXJzcGFjZSBjYW4gcGVyZm9ybSBhIERNQV9CVUZfSU9DVExfRVhQT1JUX1NZ TkNfRklMRSB0byByZXRyaWV2ZSB0aGUKKyAqIGN1cnJlbnQgc2V0IG9mIGZlbmNlcyBvbiBhIGRt YS1idWYgZmlsZSBkZXNjcmlwdG9yIGFzIGEgc3luY19maWxlLiAgQ1BVCisgKiB3YWl0cyB2aWEg cG9sbCgpIG9yIG90aGVyIGRyaXZlci1zcGVjaWZpYyBtZWNoYW5pc21zIHR5cGljYWxseSB3YWl0 IG9uCisgKiB3aGF0ZXZlciBmZW5jZXMgYXJlIG9uIHRoZSBkbWEtYnVmIGF0IHRoZSB0aW1lIHRo ZSB3YWl0IGJlZ2lucy4gIFRoaXMKKyAqIGlzIHNpbWlsYXIgZXhjZXB0IHRoYXQgaXQgdGFrZXMg YSBzbmFwc2hvdCBvZiB0aGUgY3VycmVudCBmZW5jZXMgb24gdGhlCisgKiBkbWEtYnVmIGZvciB3 YWl0aW5nIGxhdGVyIGluc3RlYWQgb2Ygd2FpdGluZyBpbW1lZGlhdGVseS4gIFRoaXMgaXMKKyAq IHVzZWZ1bCBmb3IgbW9kZXJuIGdyYXBoaWNzIEFQSXMgc3VjaCBhcyBWdWxrYW4gd2hpY2ggYXNz dW1lIGFuIGV4cGxpY2l0CisgKiBzeW5jaHJvbml6YXRpb24gbW9kZWwgYnV0IHN0aWxsIG5lZWQg dG8gaW50ZXItb3BlcmF0ZSB3aXRoIGRtYS1idWYuCisgKi8KK3N0cnVjdCBkbWFfYnVmX3N5bmNf ZmlsZSB7CisJLyoqCisJICogQGZsYWdzOiBSZWFkL3dyaXRlIGZsYWdzCisJICoKKwkgKiBNdXN0 IERNQV9CVUZfU1lOQ19SRUFELCBETUFfQlVGX1NZTkNfV1JJVEUsIG9yIGJvdGguCisJICovCisJ X191MzIgZmxhZ3M7CisJLyoqIEBmZDogU3luYyBmaWxlIGZpbGUgZGVzY3JpcHRvciAqLworCV9f czMyIGZkOworfTsKKwogI2RlZmluZSBETUFfQlVGX0JBU0UJCSdiJwogI2RlZmluZSBETUFfQlVG X0lPQ1RMX1NZTkMJX0lPVyhETUFfQlVGX0JBU0UsIDAsIHN0cnVjdCBkbWFfYnVmX3N5bmMpCiAK QEAgLTQ2LDUgKzY5LDYgQEAgc3RydWN0IGRtYV9idWZfc3luYyB7CiAjZGVmaW5lIERNQV9CVUZf U0VUX05BTUUJX0lPVyhETUFfQlVGX0JBU0UsIDEsIGNvbnN0IGNoYXIgKikKICNkZWZpbmUgRE1B X0JVRl9TRVRfTkFNRV9BCV9JT1coRE1BX0JVRl9CQVNFLCAxLCB1MzIpCiAjZGVmaW5lIERNQV9C VUZfU0VUX05BTUVfQglfSU9XKERNQV9CVUZfQkFTRSwgMSwgdTY0KQorI2RlZmluZSBETUFfQlVG X0lPQ1RMX0VYUE9SVF9TWU5DX0ZJTEUJX0lPV1IoRE1BX0JVRl9CQVNFLCAyLCBzdHJ1Y3QgZG1h X2J1Zl9zeW5jX2ZpbGUpCiAKICNlbmRpZgotLSAKMi4zMS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK