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=-14.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL 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 B545DC31E4A for ; Thu, 13 Jun 2019 17:15:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 803042063F for ; Thu, 13 Jun 2019 17:15:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EO253Xha" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393650AbfFMRP0 (ORCPT ); Thu, 13 Jun 2019 13:15:26 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37042 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728796AbfFLVtT (ORCPT ); Wed, 12 Jun 2019 17:49:19 -0400 Received: by mail-lj1-f194.google.com with SMTP id 131so16496448ljf.4 for ; Wed, 12 Jun 2019 14:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zoBzDpH5YOdjElv8Qgb2rV6UIQ7orAaJLXcSTUietcc=; b=EO253XhaAHB4yl9Nu24UhOX8GEp/dgQ19qYRVQU5Eg0No8LUH9LaqbGblUqt4wLImf 1VwTuEHlO1ZRZBFEg/K415/Lc2Qx+ox4mKrsMxzs8GdnuCBn2FR1bMiyd+rY+shkKnni 8rx2lhjAhBluDJGhKOqwEfWHARE9U12ZE/vB6HLn3Hyt6S4AqynhaO2F9o6UNs0XNa/5 IhBmjjhs+PuysAuwKsXkojkgUezuIHjd8HN6fXfqwMmSVjOumuXLlAW4jyqSDlVPImRc v4EfWm4kGxWUAhLozRgoRalhVqdNvGbgHxAsbpspF4s7MOI81365UL7oe0smS6bSEawq TpfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=zoBzDpH5YOdjElv8Qgb2rV6UIQ7orAaJLXcSTUietcc=; b=kOhj7qVQsqCcyTNrMSwZaemntSkqFwCe6vlGJdBFywj785IojahrUBgHnA12N+TnUS Ryo4B7HFJ531riqRna9zzjChlNPh2TnkyisuiaozFsqCE9RSldmKhgwqsehg3w9e35t5 g3L+kfEhdkaHKqOWp8nLi9lijJ7Z/RfSEfKcmekQZ4FUrmtKqxzdSVTvlQWKdvL/5g39 BHjBD30ohb45NRykkA01UBHukgrTJof2XkmgoBqFYUbXI3Lk7WI14A16jCf771abWsZ8 3c5vvcutbrxAOa6JSNAvLA/giHmzj2BeT9vS41maZFT8KBJ4jBUH4knISinLNkadeLCr w3Kg== X-Gm-Message-State: APjAAAVXzoMsFgynGf+oArs4z92qTYPuJN7J5owpiR1fICXHh8FTZiLT 794PxATnK8DjwZ8p7kMwBGknc9cZdvUq3yQ6c4EETA== X-Google-Smtp-Source: APXvYqyYEuExjdoeiPYjsaN0wl6N+dMF8R+7Y2wv5oPNHLug9n+hzKrHlKHLYTgjEegWdQStmf5eJQTAcNcKS268iN8= X-Received: by 2002:a2e:5d1:: with SMTP id 200mr26543483ljf.10.1560376155230; Wed, 12 Jun 2019 14:49:15 -0700 (PDT) MIME-Version: 1.0 References: <20190611000230.152670-1-fengc@google.com> <20190611000230.152670-3-fengc@google.com> In-Reply-To: From: Chenbo Feng Date: Wed, 12 Jun 2019 14:49:03 -0700 Message-ID: Subject: Re: [RESEND PATCH v3 2/3] dma-buf: add DMA_BUF_{GET,SET}_NAME ioctls To: Sumit Semwal Cc: LKML , DRI mailing list , Android Kernel Team Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 12, 2019 at 7:43 AM Sumit Semwal wrote: > > Hello Chenbo, > > Thanks very much for your patches. Other than a couple tiny nits > below, I think these look good, and I will merge them before the end > of this week. > On Tue, 11 Jun 2019 at 05:32, Chenbo Feng wrote: > > > > From: Greg Hackmann > > > > This patch adds complimentary DMA_BUF_SET_NAME and DMA_BUF_GET_NAME > > ioctls, which lets userspace processes attach a free-form name to each > > buffer. > This should remove the _GET_NAME bit since it's not there anymore. > > > > This information can be extremely helpful for tracking and accounting > > shared buffers. For example, on Android, we know what each buffer will > > be used for at allocation time: GL, multimedia, camera, etc. The > > userspace allocator can use DMA_BUF_SET_NAME to associate that > > information with the buffer, so we can later give developers a > > breakdown of how much memory they're allocating for graphics, camera, > > etc. > > > > Signed-off-by: Greg Hackmann > > Signed-off-by: Chenbo Feng > > --- > > drivers/dma-buf/dma-buf.c | 49 +++++++++++++++++++++++++++++++++--- > > include/linux/dma-buf.h | 5 +++- > > include/uapi/linux/dma-buf.h | 3 +++ > > 3 files changed, 53 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > > index ffd5a2ad7d6f..c1da5f9ce44d 100644 > > --- a/drivers/dma-buf/dma-buf.c > > +++ b/drivers/dma-buf/dma-buf.c > > @@ -48,8 +48,24 @@ struct dma_buf_list { > > > > static struct dma_buf_list db_list; > > > > +static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) > > +{ > > + struct dma_buf *dmabuf; > > + char name[DMA_BUF_NAME_LEN]; > > + size_t ret = 0; > > + > > + dmabuf = dentry->d_fsdata; > > + mutex_lock(&dmabuf->lock); > > + if (dmabuf->name) > > + ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN); > > + mutex_unlock(&dmabuf->lock); > > + > > + return dynamic_dname(dentry, buffer, buflen, "/%s:%s", > > + dentry->d_name.name, ret > 0 ? name : ""); > > +} > > + > > static const struct dentry_operations dma_buf_dentry_ops = { > > - .d_dname = simple_dname, > > + .d_dname = dmabuffs_dname, > > }; > > > > static struct vfsmount *dma_buf_mnt; > > @@ -297,6 +313,27 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll) > > return events; > > } > > > > +static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf) > > +{ > > + char *name = strndup_user(buf, DMA_BUF_NAME_LEN); > > + long ret = 0; > > + > > + if (IS_ERR(name)) > > + return PTR_ERR(name); > > + > > + mutex_lock(&dmabuf->lock); > > + if (!list_empty(&dmabuf->attachments)) { > > + ret = -EBUSY; > > + goto out_unlock; > > + } > We might also want to document this better - that name change for a > buffer is still allowed if it doesn't have any attached devices after > its usage is done but before it is destroyed? (theoritically it could > be reused with a different name?) > > > + kfree(dmabuf->name); > > + dmabuf->name = name; > > + > > +out_unlock: > > + mutex_unlock(&dmabuf->lock); > > + return ret; > > +} > > + > > static long dma_buf_ioctl(struct file *file, > > unsigned int cmd, unsigned long arg) > > { > > @@ -335,6 +372,10 @@ static long dma_buf_ioctl(struct file *file, > > ret = dma_buf_begin_cpu_access(dmabuf, direction); > > > > return ret; > > + > > + case DMA_BUF_SET_NAME: > > + return dma_buf_set_name(dmabuf, (const char __user *)arg); > > + > > default: > > return -ENOTTY; > > } > > @@ -376,6 +417,7 @@ static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags) > > goto err_alloc_file; > > file->f_flags = flags & (O_ACCMODE | O_NONBLOCK); > > file->private_data = dmabuf; > > + file->f_path.dentry->d_fsdata = dmabuf; > > > > return file; > > > > @@ -1082,12 +1124,13 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) > > continue; > > } > > > > - seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\n", > > + seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\t%s\n", > > buf_obj->size, > > buf_obj->file->f_flags, buf_obj->file->f_mode, > > file_count(buf_obj->file), > > buf_obj->exp_name, > > - file_inode(buf_obj->file)->i_ino); > > + file_inode(buf_obj->file)->i_ino, > > + buf_obj->name ?: ""); > > > > robj = buf_obj->resv; > > while (true) { > > diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h > > index 58725f890b5b..582998e19df6 100644 > > --- a/include/linux/dma-buf.h > > +++ b/include/linux/dma-buf.h > > @@ -255,10 +255,12 @@ struct dma_buf_ops { > > * @file: file pointer used for sharing buffers across, and for refcounting. > > * @attachments: list of dma_buf_attachment that denotes all devices attached. > > * @ops: dma_buf_ops associated with this buffer object. > > - * @lock: used internally to serialize list manipulation, attach/detach and vmap/unmap > > + * @lock: used internally to serialize list manipulation, attach/detach and > > + * vmap/unmap, and accesses to name > > * @vmapping_counter: used internally to refcnt the vmaps > > * @vmap_ptr: the current vmap ptr if vmapping_counter > 0 > > * @exp_name: name of the exporter; useful for debugging. > > + * @name: userspace-provided name; useful for accounting and debugging. > > * @owner: pointer to exporter module; used for refcounting when exporter is a > > * kernel module. > > * @list_node: node for dma_buf accounting and debugging. > > @@ -286,6 +288,7 @@ struct dma_buf { > > unsigned vmapping_counter; > > void *vmap_ptr; > > const char *exp_name; > > + const char *name; > > struct module *owner; > > struct list_head list_node; > > void *priv; > > diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h > > index d75df5210a4a..dbc7092e04b5 100644 > > --- a/include/uapi/linux/dma-buf.h > > +++ b/include/uapi/linux/dma-buf.h > > @@ -35,7 +35,10 @@ struct dma_buf_sync { > > #define DMA_BUF_SYNC_VALID_FLAGS_MASK \ > > (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) > > > > +#define DMA_BUF_NAME_LEN 32 > > + > > #define DMA_BUF_BASE 'b' > > #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) > > +#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) > > > > #endif > > -- > > 2.22.0.rc2.383.gf4fbbf30c2-goog > > > > Best, > Sumit. Thanks for the feedback, I updated the commit message and resent the patch. Chenbo From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chenbo Feng Subject: Re: [RESEND PATCH v3 2/3] dma-buf: add DMA_BUF_{GET,SET}_NAME ioctls Date: Wed, 12 Jun 2019 14:49:03 -0700 Message-ID: References: <20190611000230.152670-1-fengc@google.com> <20190611000230.152670-3-fengc@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6EE0889265 for ; Wed, 12 Jun 2019 21:49:17 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id o13so16487444lji.5 for ; Wed, 12 Jun 2019 14:49:17 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sumit Semwal Cc: Android Kernel Team , LKML , DRI mailing list List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBKdW4gMTIsIDIwMTkgYXQgNzo0MyBBTSBTdW1pdCBTZW13YWwgPHN1bWl0LnNlbXdh bEBsaW5hcm8ub3JnPiB3cm90ZToKPgo+IEhlbGxvIENoZW5ibywKPgo+IFRoYW5rcyB2ZXJ5IG11 Y2ggZm9yIHlvdXIgcGF0Y2hlcy4gT3RoZXIgdGhhbiBhIGNvdXBsZSB0aW55IG5pdHMKPiBiZWxv dywgSSB0aGluayB0aGVzZSBsb29rIGdvb2QsIGFuZCBJIHdpbGwgbWVyZ2UgdGhlbSBiZWZvcmUg dGhlIGVuZAo+IG9mIHRoaXMgd2Vlay4KPiBPbiBUdWUsIDExIEp1biAyMDE5IGF0IDA1OjMyLCBD aGVuYm8gRmVuZyA8ZmVuZ2NAZ29vZ2xlLmNvbT4gd3JvdGU6Cj4gPgo+ID4gRnJvbTogR3JlZyBI YWNrbWFubiA8Z2hhY2ttYW5uQGdvb2dsZS5jb20+Cj4gPgo+ID4gVGhpcyBwYXRjaCBhZGRzIGNv bXBsaW1lbnRhcnkgRE1BX0JVRl9TRVRfTkFNRSBhbmQgRE1BX0JVRl9HRVRfTkFNRQo+ID4gaW9j dGxzLCB3aGljaCBsZXRzIHVzZXJzcGFjZSBwcm9jZXNzZXMgYXR0YWNoIGEgZnJlZS1mb3JtIG5h bWUgdG8gZWFjaAo+ID4gYnVmZmVyLgo+IFRoaXMgc2hvdWxkIHJlbW92ZSB0aGUgX0dFVF9OQU1F IGJpdCBzaW5jZSBpdCdzIG5vdCB0aGVyZSBhbnltb3JlLgo+ID4KPiA+IFRoaXMgaW5mb3JtYXRp b24gY2FuIGJlIGV4dHJlbWVseSBoZWxwZnVsIGZvciB0cmFja2luZyBhbmQgYWNjb3VudGluZwo+ ID4gc2hhcmVkIGJ1ZmZlcnMuICBGb3IgZXhhbXBsZSwgb24gQW5kcm9pZCwgd2Uga25vdyB3aGF0 IGVhY2ggYnVmZmVyIHdpbGwKPiA+IGJlIHVzZWQgZm9yIGF0IGFsbG9jYXRpb24gdGltZTogR0ws IG11bHRpbWVkaWEsIGNhbWVyYSwgZXRjLiAgVGhlCj4gPiB1c2Vyc3BhY2UgYWxsb2NhdG9yIGNh biB1c2UgRE1BX0JVRl9TRVRfTkFNRSB0byBhc3NvY2lhdGUgdGhhdAo+ID4gaW5mb3JtYXRpb24g d2l0aCB0aGUgYnVmZmVyLCBzbyB3ZSBjYW4gbGF0ZXIgZ2l2ZSBkZXZlbG9wZXJzIGEKPiA+IGJy ZWFrZG93biBvZiBob3cgbXVjaCBtZW1vcnkgdGhleSdyZSBhbGxvY2F0aW5nIGZvciBncmFwaGlj cywgY2FtZXJhLAo+ID4gZXRjLgo+ID4KPiA+IFNpZ25lZC1vZmYtYnk6IEdyZWcgSGFja21hbm4g PGdoYWNrbWFubkBnb29nbGUuY29tPgo+ID4gU2lnbmVkLW9mZi1ieTogQ2hlbmJvIEZlbmcgPGZl bmdjQGdvb2dsZS5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jICAg IHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCj4gPiAgaW5jbHVkZS9s aW51eC9kbWEtYnVmLmggICAgICB8ICA1ICsrKy0KPiA+ICBpbmNsdWRlL3VhcGkvbGludXgvZG1h LWJ1Zi5oIHwgIDMgKysrCj4gPiAgMyBmaWxlcyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCA0 IGRlbGV0aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1 Zi5jIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwo+ID4gaW5kZXggZmZkNWEyYWQ3ZDZmLi5j MWRhNWY5Y2U0NGQgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCj4g PiArKysgYi9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCj4gPiBAQCAtNDgsOCArNDgsMjQgQEAg c3RydWN0IGRtYV9idWZfbGlzdCB7Cj4gPgo+ID4gIHN0YXRpYyBzdHJ1Y3QgZG1hX2J1Zl9saXN0 IGRiX2xpc3Q7Cj4gPgo+ID4gK3N0YXRpYyBjaGFyICpkbWFidWZmc19kbmFtZShzdHJ1Y3QgZGVu dHJ5ICpkZW50cnksIGNoYXIgKmJ1ZmZlciwgaW50IGJ1ZmxlbikKPiA+ICt7Cj4gPiArICAgICAg IHN0cnVjdCBkbWFfYnVmICpkbWFidWY7Cj4gPiArICAgICAgIGNoYXIgbmFtZVtETUFfQlVGX05B TUVfTEVOXTsKPiA+ICsgICAgICAgc2l6ZV90IHJldCA9IDA7Cj4gPiArCj4gPiArICAgICAgIGRt YWJ1ZiA9IGRlbnRyeS0+ZF9mc2RhdGE7Cj4gPiArICAgICAgIG11dGV4X2xvY2soJmRtYWJ1Zi0+ bG9jayk7Cj4gPiArICAgICAgIGlmIChkbWFidWYtPm5hbWUpCj4gPiArICAgICAgICAgICAgICAg cmV0ID0gc3RybGNweShuYW1lLCBkbWFidWYtPm5hbWUsIERNQV9CVUZfTkFNRV9MRU4pOwo+ID4g KyAgICAgICBtdXRleF91bmxvY2soJmRtYWJ1Zi0+bG9jayk7Cj4gPiArCj4gPiArICAgICAgIHJl dHVybiBkeW5hbWljX2RuYW1lKGRlbnRyeSwgYnVmZmVyLCBidWZsZW4sICIvJXM6JXMiLAo+ID4g KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZW50cnktPmRfbmFtZS5uYW1lLCByZXQgPiAw ID8gbmFtZSA6ICIiKTsKPiA+ICt9Cj4gPiArCj4gPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZW50 cnlfb3BlcmF0aW9ucyBkbWFfYnVmX2RlbnRyeV9vcHMgPSB7Cj4gPiAtICAgICAgIC5kX2RuYW1l ID0gc2ltcGxlX2RuYW1lLAo+ID4gKyAgICAgICAuZF9kbmFtZSA9IGRtYWJ1ZmZzX2RuYW1lLAo+ ID4gIH07Cj4gPgo+ID4gIHN0YXRpYyBzdHJ1Y3QgdmZzbW91bnQgKmRtYV9idWZfbW50Owo+ID4g QEAgLTI5Nyw2ICszMTMsMjcgQEAgc3RhdGljIF9fcG9sbF90IGRtYV9idWZfcG9sbChzdHJ1Y3Qg ZmlsZSAqZmlsZSwgcG9sbF90YWJsZSAqcG9sbCkKPiA+ICAgICAgICAgcmV0dXJuIGV2ZW50czsK PiA+ICB9Cj4gPgo+ID4gK3N0YXRpYyBsb25nIGRtYV9idWZfc2V0X25hbWUoc3RydWN0IGRtYV9i dWYgKmRtYWJ1ZiwgY29uc3QgY2hhciBfX3VzZXIgKmJ1ZikKPiA+ICt7Cj4gPiArICAgICAgIGNo YXIgKm5hbWUgPSBzdHJuZHVwX3VzZXIoYnVmLCBETUFfQlVGX05BTUVfTEVOKTsKPiA+ICsgICAg ICAgbG9uZyByZXQgPSAwOwo+ID4gKwo+ID4gKyAgICAgICBpZiAoSVNfRVJSKG5hbWUpKQo+ID4g KyAgICAgICAgICAgICAgIHJldHVybiBQVFJfRVJSKG5hbWUpOwo+ID4gKwo+ID4gKyAgICAgICBt dXRleF9sb2NrKCZkbWFidWYtPmxvY2spOwo+ID4gKyAgICAgICBpZiAoIWxpc3RfZW1wdHkoJmRt YWJ1Zi0+YXR0YWNobWVudHMpKSB7Cj4gPiArICAgICAgICAgICAgICAgcmV0ID0gLUVCVVNZOwo+ ID4gKyAgICAgICAgICAgICAgIGdvdG8gb3V0X3VubG9jazsKPiA+ICsgICAgICAgfQo+IFdlIG1p Z2h0IGFsc28gd2FudCB0byBkb2N1bWVudCB0aGlzIGJldHRlciAtIHRoYXQgbmFtZSBjaGFuZ2Ug Zm9yIGEKPiBidWZmZXIgaXMgc3RpbGwgYWxsb3dlZCBpZiBpdCBkb2Vzbid0IGhhdmUgYW55IGF0 dGFjaGVkIGRldmljZXMgYWZ0ZXIKPiBpdHMgdXNhZ2UgaXMgZG9uZSBidXQgYmVmb3JlIGl0IGlz IGRlc3Ryb3llZD8gKHRoZW9yaXRpY2FsbHkgaXQgY291bGQKPiBiZSByZXVzZWQgd2l0aCBhIGRp ZmZlcmVudCBuYW1lPykKPgo+ID4gKyAgICAgICBrZnJlZShkbWFidWYtPm5hbWUpOwo+ID4gKyAg ICAgICBkbWFidWYtPm5hbWUgPSBuYW1lOwo+ID4gKwo+ID4gK291dF91bmxvY2s6Cj4gPiArICAg ICAgIG11dGV4X3VubG9jaygmZG1hYnVmLT5sb2NrKTsKPiA+ICsgICAgICAgcmV0dXJuIHJldDsK PiA+ICt9Cj4gPiArCj4gPiAgc3RhdGljIGxvbmcgZG1hX2J1Zl9pb2N0bChzdHJ1Y3QgZmlsZSAq ZmlsZSwKPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGNtZCwgdW5z aWduZWQgbG9uZyBhcmcpCj4gPiAgewo+ID4gQEAgLTMzNSw2ICszNzIsMTAgQEAgc3RhdGljIGxv bmcgZG1hX2J1Zl9pb2N0bChzdHJ1Y3QgZmlsZSAqZmlsZSwKPiA+ICAgICAgICAgICAgICAgICAg ICAgICAgIHJldCA9IGRtYV9idWZfYmVnaW5fY3B1X2FjY2VzcyhkbWFidWYsIGRpcmVjdGlvbik7 Cj4gPgo+ID4gICAgICAgICAgICAgICAgIHJldHVybiByZXQ7Cj4gPiArCj4gPiArICAgICAgIGNh c2UgRE1BX0JVRl9TRVRfTkFNRToKPiA+ICsgICAgICAgICAgICAgICByZXR1cm4gZG1hX2J1Zl9z ZXRfbmFtZShkbWFidWYsIChjb25zdCBjaGFyIF9fdXNlciAqKWFyZyk7Cj4gPiArCj4gPiAgICAg ICAgIGRlZmF1bHQ6Cj4gPiAgICAgICAgICAgICAgICAgcmV0dXJuIC1FTk9UVFk7Cj4gPiAgICAg ICAgIH0KPiA+IEBAIC0zNzYsNiArNDE3LDcgQEAgc3RhdGljIHN0cnVjdCBmaWxlICpkbWFfYnVm X2dldGZpbGUoc3RydWN0IGRtYV9idWYgKmRtYWJ1ZiwgaW50IGZsYWdzKQo+ID4gICAgICAgICAg ICAgICAgIGdvdG8gZXJyX2FsbG9jX2ZpbGU7Cj4gPiAgICAgICAgIGZpbGUtPmZfZmxhZ3MgPSBm bGFncyAmIChPX0FDQ01PREUgfCBPX05PTkJMT0NLKTsKPiA+ICAgICAgICAgZmlsZS0+cHJpdmF0 ZV9kYXRhID0gZG1hYnVmOwo+ID4gKyAgICAgICBmaWxlLT5mX3BhdGguZGVudHJ5LT5kX2ZzZGF0 YSA9IGRtYWJ1ZjsKPiA+Cj4gPiAgICAgICAgIHJldHVybiBmaWxlOwo+ID4KPiA+IEBAIC0xMDgy LDEyICsxMTI0LDEzIEBAIHN0YXRpYyBpbnQgZG1hX2J1Zl9kZWJ1Z19zaG93KHN0cnVjdCBzZXFf ZmlsZSAqcywgdm9pZCAqdW51c2VkKQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgY29udGlu dWU7Cj4gPiAgICAgICAgICAgICAgICAgfQo+ID4KPiA+IC0gICAgICAgICAgICAgICBzZXFfcHJp bnRmKHMsICIlMDh6dVx0JTA4eFx0JTA4eFx0JTA4bGRcdCVzXHQlMDhsdVxuIiwKPiA+ICsgICAg ICAgICAgICAgICBzZXFfcHJpbnRmKHMsICIlMDh6dVx0JTA4eFx0JTA4eFx0JTA4bGRcdCVzXHQl MDhsdVx0JXNcbiIsCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1Zl9vYmot PnNpemUsCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1Zl9vYmotPmZpbGUt PmZfZmxhZ3MsIGJ1Zl9vYmotPmZpbGUtPmZfbW9kZSwKPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmlsZV9jb3VudChidWZfb2JqLT5maWxlKSwKPiA+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYnVmX29iai0+ZXhwX25hbWUsCj4gPiAtICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGZpbGVfaW5vZGUoYnVmX29iai0+ZmlsZSktPmlfaW5vKTsKPiA+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZV9pbm9kZShidWZfb2JqLT5maWxlKS0+ aV9pbm8sCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1Zl9vYmotPm5hbWUg PzogIiIpOwo+ID4KPiA+ICAgICAgICAgICAgICAgICByb2JqID0gYnVmX29iai0+cmVzdjsKPiA+ ICAgICAgICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewo+ID4gZGlmZiAtLWdpdCBhL2luY2x1ZGUv bGludXgvZG1hLWJ1Zi5oIGIvaW5jbHVkZS9saW51eC9kbWEtYnVmLmgKPiA+IGluZGV4IDU4NzI1 Zjg5MGI1Yi4uNTgyOTk4ZTE5ZGY2IDEwMDY0NAo+ID4gLS0tIGEvaW5jbHVkZS9saW51eC9kbWEt YnVmLmgKPiA+ICsrKyBiL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5oCj4gPiBAQCAtMjU1LDEwICsy NTUsMTIgQEAgc3RydWN0IGRtYV9idWZfb3BzIHsKPiA+ICAgKiBAZmlsZTogZmlsZSBwb2ludGVy IHVzZWQgZm9yIHNoYXJpbmcgYnVmZmVycyBhY3Jvc3MsIGFuZCBmb3IgcmVmY291bnRpbmcuCj4g PiAgICogQGF0dGFjaG1lbnRzOiBsaXN0IG9mIGRtYV9idWZfYXR0YWNobWVudCB0aGF0IGRlbm90 ZXMgYWxsIGRldmljZXMgYXR0YWNoZWQuCj4gPiAgICogQG9wczogZG1hX2J1Zl9vcHMgYXNzb2Np YXRlZCB3aXRoIHRoaXMgYnVmZmVyIG9iamVjdC4KPiA+IC0gKiBAbG9jazogdXNlZCBpbnRlcm5h bGx5IHRvIHNlcmlhbGl6ZSBsaXN0IG1hbmlwdWxhdGlvbiwgYXR0YWNoL2RldGFjaCBhbmQgdm1h cC91bm1hcAo+ID4gKyAqIEBsb2NrOiB1c2VkIGludGVybmFsbHkgdG8gc2VyaWFsaXplIGxpc3Qg bWFuaXB1bGF0aW9uLCBhdHRhY2gvZGV0YWNoIGFuZAo+ID4gKyAqICAgICAgICB2bWFwL3VubWFw LCBhbmQgYWNjZXNzZXMgdG8gbmFtZQo+ID4gICAqIEB2bWFwcGluZ19jb3VudGVyOiB1c2VkIGlu dGVybmFsbHkgdG8gcmVmY250IHRoZSB2bWFwcwo+ID4gICAqIEB2bWFwX3B0cjogdGhlIGN1cnJl bnQgdm1hcCBwdHIgaWYgdm1hcHBpbmdfY291bnRlciA+IDAKPiA+ICAgKiBAZXhwX25hbWU6IG5h bWUgb2YgdGhlIGV4cG9ydGVyOyB1c2VmdWwgZm9yIGRlYnVnZ2luZy4KPiA+ICsgKiBAbmFtZTog dXNlcnNwYWNlLXByb3ZpZGVkIG5hbWU7IHVzZWZ1bCBmb3IgYWNjb3VudGluZyBhbmQgZGVidWdn aW5nLgo+ID4gICAqIEBvd25lcjogcG9pbnRlciB0byBleHBvcnRlciBtb2R1bGU7IHVzZWQgZm9y IHJlZmNvdW50aW5nIHdoZW4gZXhwb3J0ZXIgaXMgYQo+ID4gICAqICAgICAgICAga2VybmVsIG1v ZHVsZS4KPiA+ICAgKiBAbGlzdF9ub2RlOiBub2RlIGZvciBkbWFfYnVmIGFjY291bnRpbmcgYW5k IGRlYnVnZ2luZy4KPiA+IEBAIC0yODYsNiArMjg4LDcgQEAgc3RydWN0IGRtYV9idWYgewo+ID4g ICAgICAgICB1bnNpZ25lZCB2bWFwcGluZ19jb3VudGVyOwo+ID4gICAgICAgICB2b2lkICp2bWFw X3B0cjsKPiA+ICAgICAgICAgY29uc3QgY2hhciAqZXhwX25hbWU7Cj4gPiArICAgICAgIGNvbnN0 IGNoYXIgKm5hbWU7Cj4gPiAgICAgICAgIHN0cnVjdCBtb2R1bGUgKm93bmVyOwo+ID4gICAgICAg ICBzdHJ1Y3QgbGlzdF9oZWFkIGxpc3Rfbm9kZTsKPiA+ICAgICAgICAgdm9pZCAqcHJpdjsKPiA+ IGRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvZG1hLWJ1Zi5oIGIvaW5jbHVkZS91YXBp L2xpbnV4L2RtYS1idWYuaAo+ID4gaW5kZXggZDc1ZGY1MjEwYTRhLi5kYmM3MDkyZTA0YjUgMTAw NjQ0Cj4gPiAtLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvZG1hLWJ1Zi5oCj4gPiArKysgYi9pbmNs dWRlL3VhcGkvbGludXgvZG1hLWJ1Zi5oCj4gPiBAQCAtMzUsNyArMzUsMTAgQEAgc3RydWN0IGRt YV9idWZfc3luYyB7Cj4gPiAgI2RlZmluZSBETUFfQlVGX1NZTkNfVkFMSURfRkxBR1NfTUFTSyBc Cj4gPiAgICAgICAgIChETUFfQlVGX1NZTkNfUlcgfCBETUFfQlVGX1NZTkNfRU5EKQo+ID4KPiA+ ICsjZGVmaW5lIERNQV9CVUZfTkFNRV9MRU4gICAgICAgMzIKPiA+ICsKPiA+ICAjZGVmaW5lIERN QV9CVUZfQkFTRSAgICAgICAgICAgJ2InCj4gPiAgI2RlZmluZSBETUFfQlVGX0lPQ1RMX1NZTkMg ICAgIF9JT1coRE1BX0JVRl9CQVNFLCAwLCBzdHJ1Y3QgZG1hX2J1Zl9zeW5jKQo+ID4gKyNkZWZp bmUgRE1BX0JVRl9TRVRfTkFNRSAgICAgICBfSU9XKERNQV9CVUZfQkFTRSwgMSwgY29uc3QgY2hh ciAqKQo+ID4KPiA+ICAjZW5kaWYKPiA+IC0tCj4gPiAyLjIyLjAucmMyLjM4My5nZjRmYmJmMzBj Mi1nb29nCj4gPgo+Cj4gQmVzdCwKPiBTdW1pdC4KClRoYW5rcyBmb3IgdGhlIGZlZWRiYWNrLCBJ IHVwZGF0ZWQgdGhlIGNvbW1pdCBtZXNzYWdlIGFuZCByZXNlbnQgdGhlIHBhdGNoLgoKQ2hlbmJv Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==