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,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 796C6C47086 for ; Tue, 25 May 2021 21:18:29 +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 44C206141C for ; Tue, 25 May 2021 21:18:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44C206141C 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 319C789700; Tue, 25 May 2021 21:18:20 +0000 (UTC) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A0616EB46 for ; Tue, 25 May 2021 21:18:14 +0000 (UTC) Received: by mail-pj1-x1033.google.com with SMTP id n6-20020a17090ac686b029015d2f7aeea8so14023825pjt.1 for ; Tue, 25 May 2021 14:18:14 -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=2Zomxth+WuiC0IHgmdncpOPr5o6JQyY+ikQtNjEMgrQ=; b=qJIec8BequFpbl+oVYyw7tmxYT3paf9hpAqm3gLAv1n/WrVrei8i5XHXMiKCPxPj3f btJElvhCBVGPqEQiOtssRGm/9bcf9N8StvYzJ6FdTHTdE4wkQqUXiuYCd3o/N3LV6NBK PwmkJZ+vK+dbGRgdbCOCG/rWqPrVFdvwnyyq1jQ+CVIvsB8wNzN+TsfryoDtebZxIQ4R QOpDA6qqC4f9+SZn5tugi236CXyFwKMo5PkzXOgew8TwjINaA8I79EryRchAzhFpHYKs Gk8FvGFE3dijjxDVT6B/KzdD0R/0myjEOXxfbnzTcSaQcmLfYYQtXTzRGruhG5Hy4tIP WZog== 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=2Zomxth+WuiC0IHgmdncpOPr5o6JQyY+ikQtNjEMgrQ=; b=i54SRyoxFoeku/s6l5c9yGvdl1G11GGzUcXk10vpSkw+NIgbo3QyzJnlw4+1s+S9dC VrxOSZ2XFfGw1nmAwcaSxAiepcX7m0kL10mgWaSbbJRZXSL6jZHB60efLffpXFqdzsCi nXEzPs/YdtdTp7WYKPmd1sFIICXhuob4MCxS3JS3IgXsQaXpl6aUQSnt+fRQ0Buj9ndZ IkWc4VgNDLx2LrnvSM4boqj0N5M38eZ9id+E/lsa2ht96IKAci/gMk+P1X2KghV06cN4 unA56g/+qU68aQkiYjeBHH++oibHbZr2iaHqB5MeNO69ZvauN6qaEyskzFhO/erZpuUC 2jtg== X-Gm-Message-State: AOAM530Npc8VDTgpdT9uJMfKL8pzV1QGgTwCEB+Mlmp8vEwh9+lDQgr8 Y/QY+Bp3L8xJnmlsf/FC5b8/56/BgKH7Qw== X-Google-Smtp-Source: ABdhPJzAPXz0yewfnqZlrDIupak3VBLdb4uKxv8DCVTUymb0HjVcU6+d0kC+y+rSxM53sVsqH18pnQ== X-Received: by 2002:a17:90a:880c:: with SMTP id s12mr32796620pjn.66.1621977493521; Tue, 25 May 2021 14:18:13 -0700 (PDT) Received: from omlet.lan ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id e186sm14342278pfa.145.2021.05.25.14.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 14:18:13 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 7/7] RFC: dma-buf: Add an API for importing sync files (v7) Date: Tue, 25 May 2021 16:17:53 -0500 Message-Id: <20210525211753.1086069-8-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210525211753.1086069-1-jason@jlekstrand.net> References: <20210525211753.1086069-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: Daniel Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This patch is analogous to the previous sync file export patch in that it allows you to import a sync_file into a dma-buf. Unlike the previous patch, however, this does add genuinely new functionality to dma-buf. Without this, the only way to attach a sync_file to a dma-buf is to submit a batch to your driver of choice which waits on the sync_file and claims to write to the dma-buf. Even if said batch is a no-op, a submit is typically way more overhead than just attaching a fence. A submit may also imply extra synchronization with other work because it happens on a hardware queue. In the Vulkan world, this is useful for dealing with the out-fence from vkQueuePresent. Current Linux window-systems (X11, Wayland, etc.) all rely on dma-buf implicit sync. Since Vulkan is an explicit sync API, we get a set of fences (VkSemaphores) in vkQueuePresent and have to stash those as an exclusive (write) fence on the dma-buf. We handle it in Mesa today with the above mentioned dummy submit trick. This ioctl would allow us to set it directly without the dummy submit. This may also open up possibilities for GPU drivers to move away from implicit sync for their kernel driver uAPI and instead provide sync files and rely on dma-buf import/export for communicating with other implicit sync clients. We make the explicit choice here to only allow setting RW fences which translates to an exclusive fence on the dma_resv. There's no use for read-only fences for communicating with other implicit sync userspace and any such attempts are likely to be racy at best. When we got to insert the RW fence, the actual fence we set as the new exclusive fence is a combination of the sync_file provided by the user and all the other fences on the dma_resv. This ensures that the newly added exclusive fence will never signal before the old one would have and ensures that we don't break any dma_resv contracts. We require userspace to specify RW in the flags for symmetry with the export ioctl and in case we ever want to support read fences in the future. There is one downside here that's worth documenting: If two clients writing to the same dma-buf using this API race with each other, their actions on the dma-buf may happen in parallel or in an undefined order. Both with and without this API, the pattern is the same: Collect all the fences on dma-buf, submit work which depends on said fences, and then set a new exclusive (write) fence on the dma-buf which depends on said work. The difference is that, when it's all handled by the GPU driver's submit ioctl, the three operations happen atomically under the dma_resv lock. If two userspace submits race, one will happen before the other. You aren't guaranteed which but you are guaranteed that they're strictly ordered. If userspace manages the fences itself, then these three operations happen separately and the two render operations may happen genuinely in parallel or get interleaved. However, this is a case of userspace racing with itself. As long as we ensure userspace can't back the kernel into a corner, it should be fine. 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): - Split import and export into separate patches - New commit message v7 (Daniel Vetter): - Fix the uapi header to use the right struct in the ioctl - Use a separate dma_buf_import_sync_file struct - Add kerneldoc for dma_buf_import_sync_file Signed-off-by: Jason Ekstrand Cc: Christian König Cc: Daniel Vetter Cc: Sumit Semwal Cc: Maarten Lankhorst --- drivers/dma-buf/dma-buf.c | 36 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/dma-buf.h | 22 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index ea117de962903..098340222662b 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -422,6 +422,40 @@ static long dma_buf_export_sync_file(struct dma_buf *dmabuf, put_unused_fd(fd); return ret; } + +static long dma_buf_import_sync_file(struct dma_buf *dmabuf, + const void __user *user_data) +{ + struct dma_buf_import_sync_file arg; + struct dma_fence *fence, *singleton = NULL; + int ret = 0; + + if (copy_from_user(&arg, user_data, sizeof(arg))) + return -EFAULT; + + if (arg.flags != DMA_BUF_SYNC_RW) + return -EINVAL; + + fence = sync_file_get_fence(arg.fd); + if (!fence) + return -EINVAL; + + dma_resv_lock(dmabuf->resv, NULL); + + singleton = dma_resv_get_singleton_unlocked(dmabuf->resv, fence); + if (IS_ERR(singleton)) { + ret = PTR_ERR(singleton); + } else if (singleton) { + dma_resv_add_excl_fence(dmabuf->resv, singleton); + dma_resv_add_shared_fence(dmabuf->resv, singleton); + } + + dma_resv_unlock(dmabuf->resv); + + dma_fence_put(fence); + + return ret; +} #endif static long dma_buf_ioctl(struct file *file, @@ -470,6 +504,8 @@ static long dma_buf_ioctl(struct file *file, #if IS_ENABLED(CONFIG_SYNC_FILE) case DMA_BUF_IOCTL_EXPORT_SYNC_FILE: return dma_buf_export_sync_file(dmabuf, (void __user *)arg); + case DMA_BUF_IOCTL_IMPORT_SYNC_FILE: + return dma_buf_import_sync_file(dmabuf, (const void __user *)arg); #endif default: diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index aeba45180b028..af53987db24be 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -101,6 +101,27 @@ struct dma_buf_export_sync_file { __s32 fd; }; +/** + * struct dma_buf_import_sync_file - Insert a sync_file into a dma-buf + * + * Userspace can perform a DMA_BUF_IOCTL_IMPORT_SYNC_FILE to insert a + * sync_file into a dma-buf for the purposes of implicit synchronization + * with other dma-buf consumers. This allows clients using explicitly + * synchronized APIs such as Vulkan to inter-op with dma-buf consumers + * which expect implicit synchronization such as OpenGL or most media + * drivers/video. + */ +struct dma_buf_import_sync_file { + /** + * @flags: Read/write flags + * + * Must be DMA_BUF_SYNC_RW. + */ + __u32 flags; + /** @fd: Sync file descriptor */ + __s32 fd; +}; + #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) @@ -111,5 +132,6 @@ struct dma_buf_export_sync_file { #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_export_sync_file) +#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_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,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 9E447C47088 for ; Tue, 25 May 2021 21:18:30 +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 6AE52611BE for ; Tue, 25 May 2021 21:18:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AE52611BE 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 C44BE89A4B; Tue, 25 May 2021 21:18:23 +0000 (UTC) Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by gabe.freedesktop.org (Postfix) with ESMTPS id 120AB6EB46 for ; Tue, 25 May 2021 21:18:14 +0000 (UTC) Received: by mail-pl1-x631.google.com with SMTP id s4so15474056plg.12 for ; Tue, 25 May 2021 14:18:14 -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=2Zomxth+WuiC0IHgmdncpOPr5o6JQyY+ikQtNjEMgrQ=; b=qJIec8BequFpbl+oVYyw7tmxYT3paf9hpAqm3gLAv1n/WrVrei8i5XHXMiKCPxPj3f btJElvhCBVGPqEQiOtssRGm/9bcf9N8StvYzJ6FdTHTdE4wkQqUXiuYCd3o/N3LV6NBK PwmkJZ+vK+dbGRgdbCOCG/rWqPrVFdvwnyyq1jQ+CVIvsB8wNzN+TsfryoDtebZxIQ4R QOpDA6qqC4f9+SZn5tugi236CXyFwKMo5PkzXOgew8TwjINaA8I79EryRchAzhFpHYKs Gk8FvGFE3dijjxDVT6B/KzdD0R/0myjEOXxfbnzTcSaQcmLfYYQtXTzRGruhG5Hy4tIP WZog== 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=2Zomxth+WuiC0IHgmdncpOPr5o6JQyY+ikQtNjEMgrQ=; b=r7EXp2HRGEccmJAjOPgBKJEoStNchxZVznOjY9uHziH03oIDTMwmSk9YdwxZUAqECp I0azpqdswc1ynuMsk6O52cg56urflJ10YMff97zwhjW4WElIkEuf6WQV2A7Mt3MwtzT3 zeBkQQQYMW3boxS7nJ2twYp5Ta5QV3WG8ouG0Gg0eHvSdbPxnWcokFqA0sGvcOAIkMxs XbqUcqyyp93/gpmIxURMcRHDdxdTVLlnpqvsP/ENta0FVQPfGV6GH5UJ3r2eHIC8piuY jhHJHBJa35WEra+9++Cbr+NbMQZb37yY6pQyD0YNxTLYtbnFtpdtkVC74LPHljMjs2o2 RyDQ== X-Gm-Message-State: AOAM5310oBefDhETe/MNXVINyB9zWYzKrxddpgl0Zit3pEPWbasXz09D lhmSClLbCFi63fECIs11rXtwYw== X-Google-Smtp-Source: ABdhPJzAPXz0yewfnqZlrDIupak3VBLdb4uKxv8DCVTUymb0HjVcU6+d0kC+y+rSxM53sVsqH18pnQ== X-Received: by 2002:a17:90a:880c:: with SMTP id s12mr32796620pjn.66.1621977493521; Tue, 25 May 2021 14:18:13 -0700 (PDT) Received: from omlet.lan ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id e186sm14342278pfa.145.2021.05.25.14.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 14:18:13 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Tue, 25 May 2021 16:17:53 -0500 Message-Id: <20210525211753.1086069-8-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210525211753.1086069-1-jason@jlekstrand.net> References: <20210525211753.1086069-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 7/7] RFC: dma-buf: Add an API for importing sync files (v7) 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: Daniel Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sumit Semwal Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" VGhpcyBwYXRjaCBpcyBhbmFsb2dvdXMgdG8gdGhlIHByZXZpb3VzIHN5bmMgZmlsZSBleHBvcnQg cGF0Y2ggaW4gdGhhdAppdCBhbGxvd3MgeW91IHRvIGltcG9ydCBhIHN5bmNfZmlsZSBpbnRvIGEg ZG1hLWJ1Zi4gIFVubGlrZSB0aGUgcHJldmlvdXMKcGF0Y2gsIGhvd2V2ZXIsIHRoaXMgZG9lcyBh ZGQgZ2VudWluZWx5IG5ldyBmdW5jdGlvbmFsaXR5IHRvIGRtYS1idWYuCldpdGhvdXQgdGhpcywg dGhlIG9ubHkgd2F5IHRvIGF0dGFjaCBhIHN5bmNfZmlsZSB0byBhIGRtYS1idWYgaXMgdG8Kc3Vi bWl0IGEgYmF0Y2ggdG8geW91ciBkcml2ZXIgb2YgY2hvaWNlIHdoaWNoIHdhaXRzIG9uIHRoZSBz eW5jX2ZpbGUgYW5kCmNsYWltcyB0byB3cml0ZSB0byB0aGUgZG1hLWJ1Zi4gIEV2ZW4gaWYgc2Fp ZCBiYXRjaCBpcyBhIG5vLW9wLCBhIHN1Ym1pdAppcyB0eXBpY2FsbHkgd2F5IG1vcmUgb3Zlcmhl YWQgdGhhbiBqdXN0IGF0dGFjaGluZyBhIGZlbmNlLiAgQSBzdWJtaXQKbWF5IGFsc28gaW1wbHkg ZXh0cmEgc3luY2hyb25pemF0aW9uIHdpdGggb3RoZXIgd29yayBiZWNhdXNlIGl0IGhhcHBlbnMK b24gYSBoYXJkd2FyZSBxdWV1ZS4KCkluIHRoZSBWdWxrYW4gd29ybGQsIHRoaXMgaXMgdXNlZnVs IGZvciBkZWFsaW5nIHdpdGggdGhlIG91dC1mZW5jZSBmcm9tCnZrUXVldWVQcmVzZW50LiAgQ3Vy cmVudCBMaW51eCB3aW5kb3ctc3lzdGVtcyAoWDExLCBXYXlsYW5kLCBldGMuKSBhbGwKcmVseSBv biBkbWEtYnVmIGltcGxpY2l0IHN5bmMuICBTaW5jZSBWdWxrYW4gaXMgYW4gZXhwbGljaXQgc3lu YyBBUEksIHdlCmdldCBhIHNldCBvZiBmZW5jZXMgKFZrU2VtYXBob3JlcykgaW4gdmtRdWV1ZVBy ZXNlbnQgYW5kIGhhdmUgdG8gc3Rhc2gKdGhvc2UgYXMgYW4gZXhjbHVzaXZlICh3cml0ZSkgZmVu Y2Ugb24gdGhlIGRtYS1idWYuICBXZSBoYW5kbGUgaXQgaW4KTWVzYSB0b2RheSB3aXRoIHRoZSBh Ym92ZSBtZW50aW9uZWQgZHVtbXkgc3VibWl0IHRyaWNrLiAgVGhpcyBpb2N0bAp3b3VsZCBhbGxv dyB1cyB0byBzZXQgaXQgZGlyZWN0bHkgd2l0aG91dCB0aGUgZHVtbXkgc3VibWl0LgoKVGhpcyBt YXkgYWxzbyBvcGVuIHVwIHBvc3NpYmlsaXRpZXMgZm9yIEdQVSBkcml2ZXJzIHRvIG1vdmUgYXdh eSBmcm9tCmltcGxpY2l0IHN5bmMgZm9yIHRoZWlyIGtlcm5lbCBkcml2ZXIgdUFQSSBhbmQgaW5z dGVhZCBwcm92aWRlIHN5bmMKZmlsZXMgYW5kIHJlbHkgb24gZG1hLWJ1ZiBpbXBvcnQvZXhwb3J0 IGZvciBjb21tdW5pY2F0aW5nIHdpdGggb3RoZXIKaW1wbGljaXQgc3luYyBjbGllbnRzLgoKV2Ug bWFrZSB0aGUgZXhwbGljaXQgY2hvaWNlIGhlcmUgdG8gb25seSBhbGxvdyBzZXR0aW5nIFJXIGZl bmNlcyB3aGljaAp0cmFuc2xhdGVzIHRvIGFuIGV4Y2x1c2l2ZSBmZW5jZSBvbiB0aGUgZG1hX3Jl c3YuICBUaGVyZSdzIG5vIHVzZSBmb3IKcmVhZC1vbmx5IGZlbmNlcyBmb3IgY29tbXVuaWNhdGlu ZyB3aXRoIG90aGVyIGltcGxpY2l0IHN5bmMgdXNlcnNwYWNlCmFuZCBhbnkgc3VjaCBhdHRlbXB0 cyBhcmUgbGlrZWx5IHRvIGJlIHJhY3kgYXQgYmVzdC4gIFdoZW4gd2UgZ290IHRvCmluc2VydCB0 aGUgUlcgZmVuY2UsIHRoZSBhY3R1YWwgZmVuY2Ugd2Ugc2V0IGFzIHRoZSBuZXcgZXhjbHVzaXZl IGZlbmNlCmlzIGEgY29tYmluYXRpb24gb2YgdGhlIHN5bmNfZmlsZSBwcm92aWRlZCBieSB0aGUg dXNlciBhbmQgYWxsIHRoZSBvdGhlcgpmZW5jZXMgb24gdGhlIGRtYV9yZXN2LiAgVGhpcyBlbnN1 cmVzIHRoYXQgdGhlIG5ld2x5IGFkZGVkIGV4Y2x1c2l2ZQpmZW5jZSB3aWxsIG5ldmVyIHNpZ25h bCBiZWZvcmUgdGhlIG9sZCBvbmUgd291bGQgaGF2ZSBhbmQgZW5zdXJlcyB0aGF0CndlIGRvbid0 IGJyZWFrIGFueSBkbWFfcmVzdiBjb250cmFjdHMuICBXZSByZXF1aXJlIHVzZXJzcGFjZSB0byBz cGVjaWZ5ClJXIGluIHRoZSBmbGFncyBmb3Igc3ltbWV0cnkgd2l0aCB0aGUgZXhwb3J0IGlvY3Rs IGFuZCBpbiBjYXNlIHdlIGV2ZXIKd2FudCB0byBzdXBwb3J0IHJlYWQgZmVuY2VzIGluIHRoZSBm dXR1cmUuCgpUaGVyZSBpcyBvbmUgZG93bnNpZGUgaGVyZSB0aGF0J3Mgd29ydGggZG9jdW1lbnRp bmc6ICBJZiB0d28gY2xpZW50cwp3cml0aW5nIHRvIHRoZSBzYW1lIGRtYS1idWYgdXNpbmcgdGhp cyBBUEkgcmFjZSB3aXRoIGVhY2ggb3RoZXIsIHRoZWlyCmFjdGlvbnMgb24gdGhlIGRtYS1idWYg bWF5IGhhcHBlbiBpbiBwYXJhbGxlbCBvciBpbiBhbiB1bmRlZmluZWQgb3JkZXIuCkJvdGggd2l0 aCBhbmQgd2l0aG91dCB0aGlzIEFQSSwgdGhlIHBhdHRlcm4gaXMgdGhlIHNhbWU6ICBDb2xsZWN0 IGFsbAp0aGUgZmVuY2VzIG9uIGRtYS1idWYsIHN1Ym1pdCB3b3JrIHdoaWNoIGRlcGVuZHMgb24g c2FpZCBmZW5jZXMsIGFuZAp0aGVuIHNldCBhIG5ldyBleGNsdXNpdmUgKHdyaXRlKSBmZW5jZSBv biB0aGUgZG1hLWJ1ZiB3aGljaCBkZXBlbmRzIG9uCnNhaWQgd29yay4gIFRoZSBkaWZmZXJlbmNl IGlzIHRoYXQsIHdoZW4gaXQncyBhbGwgaGFuZGxlZCBieSB0aGUgR1BVCmRyaXZlcidzIHN1Ym1p dCBpb2N0bCwgdGhlIHRocmVlIG9wZXJhdGlvbnMgaGFwcGVuIGF0b21pY2FsbHkgdW5kZXIgdGhl CmRtYV9yZXN2IGxvY2suICBJZiB0d28gdXNlcnNwYWNlIHN1Ym1pdHMgcmFjZSwgb25lIHdpbGwg aGFwcGVuIGJlZm9yZQp0aGUgb3RoZXIuICBZb3UgYXJlbid0IGd1YXJhbnRlZWQgd2hpY2ggYnV0 IHlvdSBhcmUgZ3VhcmFudGVlZCB0aGF0CnRoZXkncmUgc3RyaWN0bHkgb3JkZXJlZC4gIElmIHVz ZXJzcGFjZSBtYW5hZ2VzIHRoZSBmZW5jZXMgaXRzZWxmLCB0aGVuCnRoZXNlIHRocmVlIG9wZXJh dGlvbnMgaGFwcGVuIHNlcGFyYXRlbHkgYW5kIHRoZSB0d28gcmVuZGVyIG9wZXJhdGlvbnMKbWF5 IGhhcHBlbiBnZW51aW5lbHkgaW4gcGFyYWxsZWwgb3IgZ2V0IGludGVybGVhdmVkLiAgSG93ZXZl ciwgdGhpcyBpcyBhCmNhc2Ugb2YgdXNlcnNwYWNlIHJhY2luZyB3aXRoIGl0c2VsZi4gIEFzIGxv bmcgYXMgd2UgZW5zdXJlIHVzZXJzcGFjZQpjYW4ndCBiYWNrIHRoZSBrZXJuZWwgaW50byBhIGNv cm5lciwgaXQgc2hvdWxkIGJlIGZpbmUuCgp2MiAoSmFzb24gRWtzdHJhbmQpOgogLSBVc2UgYSB3 cmFwcGVyIGRtYV9mZW5jZV9hcnJheSBvZiBhbGwgZmVuY2VzIGluY2x1ZGluZyB0aGUgbmV3IG9u ZQogICB3aGVuIGltcG9ydGluZyBhbiBleGNsdXNpdmUgZmVuY2UuCgp2MyAoSmFzb24gRWtzdHJh bmQpOgogLSBMb2NrIGFyb3VuZCBzZXR0aW5nIHNoYXJlZCBmZW5jZXMgYXMgd2VsbCBhcyBleGNs dXNpdmUKIC0gTWFyayBTSUdOQUxfU1lOQ19GSUxFIGFzIGEgcmVhZC13cml0ZSBpb2N0bC4KIC0g SW5pdGlhbGl6ZSByZXQgdG8gMCBpbiBkbWFfYnVmX3dhaXRfc3luY19maWxlCgp2NCAoSmFzb24g RWtzdHJhbmQpOgogLSBVc2UgdGhlIG5ldyBkbWFfcmVzdl9nZXRfc2luZ2xldG9uIGhlbHBlcgoK djUgKEphc29uIEVrc3RyYW5kKToKIC0gUmVuYW1lIHRoZSBJT0NUTHMgdG8gaW1wb3J0L2V4cG9y dCByYXRoZXIgdGhhbiB3YWl0L3NpZ25hbAogLSBEcm9wIHRoZSBXUklURSBmbGFnIGFuZCBhbHdh eXMgZ2V0L3NldCB0aGUgZXhjbHVzaXZlIGZlbmNlCgp2NiAoSmFzb24gRWtzdHJhbmQpOgogLSBT cGxpdCBpbXBvcnQgYW5kIGV4cG9ydCBpbnRvIHNlcGFyYXRlIHBhdGNoZXMKIC0gTmV3IGNvbW1p dCBtZXNzYWdlCgp2NyAoRGFuaWVsIFZldHRlcik6CiAtIEZpeCB0aGUgdWFwaSBoZWFkZXIgdG8g dXNlIHRoZSByaWdodCBzdHJ1Y3QgaW4gdGhlIGlvY3RsCiAtIFVzZSBhIHNlcGFyYXRlIGRtYV9i dWZfaW1wb3J0X3N5bmNfZmlsZSBzdHJ1Y3QKIC0gQWRkIGtlcm5lbGRvYyBmb3IgZG1hX2J1Zl9p bXBvcnRfc3luY19maWxlCgpTaWduZWQtb2ZmLWJ5OiBKYXNvbiBFa3N0cmFuZCA8amFzb25Aamxl a3N0cmFuZC5uZXQ+CkNjOiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5j b20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogU3VtaXQg U2Vtd2FsIDxzdW1pdC5zZW13YWxAbGluYXJvLm9yZz4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9kbWEtYnVmL2Rt YS1idWYuYyAgICB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaW5j bHVkZS91YXBpL2xpbnV4L2RtYS1idWYuaCB8IDIyICsrKysrKysrKysrKysrKysrKysrKysKIDIg ZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1h LWJ1Zi9kbWEtYnVmLmMgYi9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCmluZGV4IGVhMTE3ZGU5 NjI5MDMuLjA5ODM0MDIyMjY2MmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVm LmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwpAQCAtNDIyLDYgKzQyMiw0MCBAQCBz dGF0aWMgbG9uZyBkbWFfYnVmX2V4cG9ydF9zeW5jX2ZpbGUoc3RydWN0IGRtYV9idWYgKmRtYWJ1 ZiwKIAlwdXRfdW51c2VkX2ZkKGZkKTsKIAlyZXR1cm4gcmV0OwogfQorCitzdGF0aWMgbG9uZyBk bWFfYnVmX2ltcG9ydF9zeW5jX2ZpbGUoc3RydWN0IGRtYV9idWYgKmRtYWJ1ZiwKKwkJCQkgICAg IGNvbnN0IHZvaWQgX191c2VyICp1c2VyX2RhdGEpCit7CisJc3RydWN0IGRtYV9idWZfaW1wb3J0 X3N5bmNfZmlsZSBhcmc7CisJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UsICpzaW5nbGV0b24gPSBO VUxMOworCWludCByZXQgPSAwOworCisJaWYgKGNvcHlfZnJvbV91c2VyKCZhcmcsIHVzZXJfZGF0 YSwgc2l6ZW9mKGFyZykpKQorCQlyZXR1cm4gLUVGQVVMVDsKKworCWlmIChhcmcuZmxhZ3MgIT0g RE1BX0JVRl9TWU5DX1JXKQorCQlyZXR1cm4gLUVJTlZBTDsKKworCWZlbmNlID0gc3luY19maWxl X2dldF9mZW5jZShhcmcuZmQpOworCWlmICghZmVuY2UpCisJCXJldHVybiAtRUlOVkFMOworCisJ ZG1hX3Jlc3ZfbG9jayhkbWFidWYtPnJlc3YsIE5VTEwpOworCisJc2luZ2xldG9uID0gZG1hX3Jl c3ZfZ2V0X3NpbmdsZXRvbl91bmxvY2tlZChkbWFidWYtPnJlc3YsIGZlbmNlKTsKKwlpZiAoSVNf RVJSKHNpbmdsZXRvbikpIHsKKwkJcmV0ID0gUFRSX0VSUihzaW5nbGV0b24pOworCX0gZWxzZSBp ZiAoc2luZ2xldG9uKSB7CisJCWRtYV9yZXN2X2FkZF9leGNsX2ZlbmNlKGRtYWJ1Zi0+cmVzdiwg c2luZ2xldG9uKTsKKwkJZG1hX3Jlc3ZfYWRkX3NoYXJlZF9mZW5jZShkbWFidWYtPnJlc3YsIHNp bmdsZXRvbik7CisJfQorCisJZG1hX3Jlc3ZfdW5sb2NrKGRtYWJ1Zi0+cmVzdik7CisKKwlkbWFf ZmVuY2VfcHV0KGZlbmNlKTsKKworCXJldHVybiByZXQ7Cit9CiAjZW5kaWYKIAogc3RhdGljIGxv bmcgZG1hX2J1Zl9pb2N0bChzdHJ1Y3QgZmlsZSAqZmlsZSwKQEAgLTQ3MCw2ICs1MDQsOCBAQCBz dGF0aWMgbG9uZyBkbWFfYnVmX2lvY3RsKHN0cnVjdCBmaWxlICpmaWxlLAogI2lmIElTX0VOQUJM RUQoQ09ORklHX1NZTkNfRklMRSkKIAljYXNlIERNQV9CVUZfSU9DVExfRVhQT1JUX1NZTkNfRklM RToKIAkJcmV0dXJuIGRtYV9idWZfZXhwb3J0X3N5bmNfZmlsZShkbWFidWYsICh2b2lkIF9fdXNl ciAqKWFyZyk7CisJY2FzZSBETUFfQlVGX0lPQ1RMX0lNUE9SVF9TWU5DX0ZJTEU6CisJCXJldHVy biBkbWFfYnVmX2ltcG9ydF9zeW5jX2ZpbGUoZG1hYnVmLCAoY29uc3Qgdm9pZCBfX3VzZXIgKilh cmcpOwogI2VuZGlmCiAKIAlkZWZhdWx0OgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4 L2RtYS1idWYuaCBiL2luY2x1ZGUvdWFwaS9saW51eC9kbWEtYnVmLmgKaW5kZXggYWViYTQ1MTgw YjAyOC4uYWY1Mzk4N2RiMjRiZSAxMDA2NDQKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L2RtYS1i dWYuaAorKysgYi9pbmNsdWRlL3VhcGkvbGludXgvZG1hLWJ1Zi5oCkBAIC0xMDEsNiArMTAxLDI3 IEBAIHN0cnVjdCBkbWFfYnVmX2V4cG9ydF9zeW5jX2ZpbGUgewogCV9fczMyIGZkOwogfTsKIAor LyoqCisgKiBzdHJ1Y3QgZG1hX2J1Zl9pbXBvcnRfc3luY19maWxlIC0gSW5zZXJ0IGEgc3luY19m aWxlIGludG8gYSBkbWEtYnVmCisgKgorICogVXNlcnNwYWNlIGNhbiBwZXJmb3JtIGEgRE1BX0JV Rl9JT0NUTF9JTVBPUlRfU1lOQ19GSUxFIHRvIGluc2VydCBhCisgKiBzeW5jX2ZpbGUgaW50byBh IGRtYS1idWYgZm9yIHRoZSBwdXJwb3NlcyBvZiBpbXBsaWNpdCBzeW5jaHJvbml6YXRpb24KKyAq IHdpdGggb3RoZXIgZG1hLWJ1ZiBjb25zdW1lcnMuICBUaGlzIGFsbG93cyBjbGllbnRzIHVzaW5n IGV4cGxpY2l0bHkKKyAqIHN5bmNocm9uaXplZCBBUElzIHN1Y2ggYXMgVnVsa2FuIHRvIGludGVy LW9wIHdpdGggZG1hLWJ1ZiBjb25zdW1lcnMKKyAqIHdoaWNoIGV4cGVjdCBpbXBsaWNpdCBzeW5j aHJvbml6YXRpb24gc3VjaCBhcyBPcGVuR0wgb3IgbW9zdCBtZWRpYQorICogZHJpdmVycy92aWRl by4KKyAqLworc3RydWN0IGRtYV9idWZfaW1wb3J0X3N5bmNfZmlsZSB7CisJLyoqCisJICogQGZs YWdzOiBSZWFkL3dyaXRlIGZsYWdzCisJICoKKwkgKiBNdXN0IGJlIERNQV9CVUZfU1lOQ19SVy4K KwkgKi8KKwlfX3UzMiBmbGFnczsKKwkvKiogQGZkOiBTeW5jIGZpbGUgZGVzY3JpcHRvciAqLwor CV9fczMyIGZkOworfTsKKwogI2RlZmluZSBETUFfQlVGX0JBU0UJCSdiJwogI2RlZmluZSBETUFf QlVGX0lPQ1RMX1NZTkMJX0lPVyhETUFfQlVGX0JBU0UsIDAsIHN0cnVjdCBkbWFfYnVmX3N5bmMp CiAKQEAgLTExMSw1ICsxMzIsNiBAQCBzdHJ1Y3QgZG1hX2J1Zl9leHBvcnRfc3luY19maWxlIHsK ICNkZWZpbmUgRE1BX0JVRl9TRVRfTkFNRV9BCV9JT1coRE1BX0JVRl9CQVNFLCAxLCB1MzIpCiAj ZGVmaW5lIERNQV9CVUZfU0VUX05BTUVfQglfSU9XKERNQV9CVUZfQkFTRSwgMSwgdTY0KQogI2Rl ZmluZSBETUFfQlVGX0lPQ1RMX0VYUE9SVF9TWU5DX0ZJTEUJX0lPV1IoRE1BX0JVRl9CQVNFLCAy LCBzdHJ1Y3QgZG1hX2J1Zl9leHBvcnRfc3luY19maWxlKQorI2RlZmluZSBETUFfQlVGX0lPQ1RM X0lNUE9SVF9TWU5DX0ZJTEUJX0lPVyhETUFfQlVGX0JBU0UsIDMsIHN0cnVjdCBkbWFfYnVmX2lt cG9ydF9zeW5jX2ZpbGUpCiAKICNlbmRpZgotLSAKMi4zMS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK