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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 4978DC282C3 for ; Thu, 24 Jan 2019 04:08:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F4492184C for ; Thu, 24 Jan 2019 04:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727237AbfAXEID (ORCPT ); Wed, 23 Jan 2019 23:08:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36486 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726313AbfAXEID (ORCPT ); Wed, 23 Jan 2019 23:08:03 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 566C7A4287; Thu, 24 Jan 2019 04:08:02 +0000 (UTC) Received: from [10.72.12.164] (ovpn-12-164.pek2.redhat.com [10.72.12.164]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A748610021B1; Thu, 24 Jan 2019 04:07:56 +0000 (UTC) Subject: Re: [PATCH net-next V4 5/5] vhost: access vq metadata through kernel virtual address To: "Michael S. Tsirkin" Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20190123095557.30168-1-jasowang@redhat.com> <20190123095557.30168-6-jasowang@redhat.com> <20190123085821-mutt-send-email-mst@kernel.org> From: Jason Wang Message-ID: <335ba55b-087f-4b35-6311-540070b9647f@redhat.com> Date: Thu, 24 Jan 2019 12:07:54 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20190123085821-mutt-send-email-mst@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 24 Jan 2019 04:08:02 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/1/23 下午10:08, Michael S. Tsirkin wrote: > On Wed, Jan 23, 2019 at 05:55:57PM +0800, Jason Wang wrote: >> It was noticed that the copy_user() friends that was used to access >> virtqueue metdata tends to be very expensive for dataplane >> implementation like vhost since it involves lots of software checks, >> speculation barrier, hardware feature toggling (e.g SMAP). The >> extra cost will be more obvious when transferring small packets since >> the time spent on metadata accessing become more significant. >> >> This patch tries to eliminate those overheads by accessing them >> through kernel virtual address by vmap(). To make the pages can be >> migrated, instead of pinning them through GUP, we use MMU notifiers to >> invalidate vmaps and re-establish vmaps during each round of metadata >> prefetching if necessary. For devices that doesn't use metadata >> prefetching, the memory accessors fallback to normal copy_user() >> implementation gracefully. The invalidation was synchronized with >> datapath through vq mutex, and in order to avoid hold vq mutex during >> range checking, MMU notifier was teared down when trying to modify vq >> metadata. >> >> Another thing is kernel lacks efficient solution for tracking dirty >> pages by vmap(), this will lead issues if vhost is using file backed >> memory which needs care of writeback. This patch solves this issue by >> just skipping the vma that is file backed and fallback to normal >> copy_user() friends. This might introduce some overheads for file >> backed users but consider this use case is rare we could do >> optimizations on top. >> >> Note that this was only done when device IOTLB is not enabled. We >> could use similar method to optimize it in the future. >> >> Tests shows at most about 22% improvement on TX PPS when using >> virtio-user + vhost_net + xdp1 + TAP on 2.6GHz Broadwell: >> >> SMAP on | SMAP off >> Before: 5.0Mpps | 6.6Mpps >> After: 6.1Mpps | 7.4Mpps >> >> Signed-off-by: Jason Wang > > So this is the bulk of the change. > Threee things that I need to look into > - Are there any security issues with bypassing the speculation barrier > that is normally present after access_ok? If we can make sure the bypassing was only used in a kthread (vhost), it should be fine I think. > - How hard does the special handling for > file backed storage make testing? It's as simple as un-commenting vhost_can_vmap()? Or I can try to hack qemu or dpdk to test this. > On the one hand we could add a module parameter to > force copy to/from user. on the other that's > another configuration we need to support. That sounds sub-optimal since it leave the choice to users. > But iotlb is not using vmap, so maybe that's enough > for testing. > - How hard is it to figure out which mode uses which code. > > > > Meanwhile, could you pls post data comparing this last patch with the > below? This removes the speculation barrier replacing it with a > (useless but at least more lightweight) data dependency. SMAP off Your patch: 7.2MPPs vmap: 7.4Mpps I don't test SMAP on, since it will be much slow for sure. Thanks > > Thanks! > > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > index bac939af8dbb..352ee7e14476 100644 > --- a/drivers/vhost/vhost.c > +++ b/drivers/vhost/vhost.c > @@ -739,7 +739,7 @@ static int vhost_copy_to_user(struct vhost_virtqueue *vq, void __user *to, > int ret; > > if (!vq->iotlb) > - return __copy_to_user(to, from, size); > + return copy_to_user(to, from, size); > else { > /* This function should be called after iotlb > * prefetch, which means we're sure that all vq > @@ -752,7 +752,7 @@ static int vhost_copy_to_user(struct vhost_virtqueue *vq, void __user *to, > VHOST_ADDR_USED); > > if (uaddr) > - return __copy_to_user(uaddr, from, size); > + return copy_to_user(uaddr, from, size); > > ret = translate_desc(vq, (u64)(uintptr_t)to, size, vq->iotlb_iov, > ARRAY_SIZE(vq->iotlb_iov), > @@ -774,7 +774,7 @@ static int vhost_copy_from_user(struct vhost_virtqueue *vq, void *to, > int ret; > > if (!vq->iotlb) > - return __copy_from_user(to, from, size); > + return copy_from_user(to, from, size); > else { > /* This function should be called after iotlb > * prefetch, which means we're sure that vq > @@ -787,7 +787,7 @@ static int vhost_copy_from_user(struct vhost_virtqueue *vq, void *to, > struct iov_iter f; > > if (uaddr) > - return __copy_from_user(to, uaddr, size); > + return copy_from_user(to, uaddr, size); > > ret = translate_desc(vq, (u64)(uintptr_t)from, size, vq->iotlb_iov, > ARRAY_SIZE(vq->iotlb_iov), > @@ -855,13 +855,13 @@ static inline void __user *__vhost_get_user(struct vhost_virtqueue *vq, > ({ \ > int ret = -EFAULT; \ > if (!vq->iotlb) { \ > - ret = __put_user(x, ptr); \ > + ret = put_user(x, ptr); \ > } else { \ > __typeof__(ptr) to = \ > (__typeof__(ptr)) __vhost_get_user(vq, ptr, \ > sizeof(*ptr), VHOST_ADDR_USED); \ > if (to != NULL) \ > - ret = __put_user(x, to); \ > + ret = put_user(x, to); \ > else \ > ret = -EFAULT; \ > } \ > @@ -872,14 +872,14 @@ static inline void __user *__vhost_get_user(struct vhost_virtqueue *vq, > ({ \ > int ret; \ > if (!vq->iotlb) { \ > - ret = __get_user(x, ptr); \ > + ret = get_user(x, ptr); \ > } else { \ > __typeof__(ptr) from = \ > (__typeof__(ptr)) __vhost_get_user(vq, ptr, \ > sizeof(*ptr), \ > type); \ > if (from != NULL) \ > - ret = __get_user(x, from); \ > + ret = get_user(x, from); \ > else \ > ret = -EFAULT; \ > } \ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Wang Subject: Re: [PATCH net-next V4 5/5] vhost: access vq metadata through kernel virtual address Date: Thu, 24 Jan 2019 12:07:54 +0800 Message-ID: <335ba55b-087f-4b35-6311-540070b9647f@redhat.com> References: <20190123095557.30168-1-jasowang@redhat.com> <20190123095557.30168-6-jasowang@redhat.com> <20190123085821-mutt-send-email-mst@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org To: "Michael S. Tsirkin" Return-path: In-Reply-To: <20190123085821-mutt-send-email-mst@kernel.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org List-Id: kvm.vger.kernel.org Ck9uIDIwMTkvMS8yMyDkuIvljYgxMDowOCwgTWljaGFlbCBTLiBUc2lya2luIHdyb3RlOgo+IE9u IFdlZCwgSmFuIDIzLCAyMDE5IGF0IDA1OjU1OjU3UE0gKzA4MDAsIEphc29uIFdhbmcgd3JvdGU6 Cj4+IEl0IHdhcyBub3RpY2VkIHRoYXQgdGhlIGNvcHlfdXNlcigpIGZyaWVuZHMgdGhhdCB3YXMg dXNlZCB0byBhY2Nlc3MKPj4gdmlydHF1ZXVlIG1ldGRhdGEgdGVuZHMgdG8gYmUgdmVyeSBleHBl bnNpdmUgZm9yIGRhdGFwbGFuZQo+PiBpbXBsZW1lbnRhdGlvbiBsaWtlIHZob3N0IHNpbmNlIGl0 IGludm9sdmVzIGxvdHMgb2Ygc29mdHdhcmUgY2hlY2tzLAo+PiBzcGVjdWxhdGlvbiBiYXJyaWVy LCBoYXJkd2FyZSBmZWF0dXJlIHRvZ2dsaW5nIChlLmcgU01BUCkuIFRoZQo+PiBleHRyYSBjb3N0 IHdpbGwgYmUgbW9yZSBvYnZpb3VzIHdoZW4gdHJhbnNmZXJyaW5nIHNtYWxsIHBhY2tldHMgc2lu Y2UKPj4gdGhlIHRpbWUgc3BlbnQgb24gbWV0YWRhdGEgYWNjZXNzaW5nIGJlY29tZSBtb3JlIHNp Z25pZmljYW50Lgo+Pgo+PiBUaGlzIHBhdGNoIHRyaWVzIHRvIGVsaW1pbmF0ZSB0aG9zZSBvdmVy aGVhZHMgYnkgYWNjZXNzaW5nIHRoZW0KPj4gdGhyb3VnaCBrZXJuZWwgdmlydHVhbCBhZGRyZXNz IGJ5IHZtYXAoKS4gVG8gbWFrZSB0aGUgcGFnZXMgY2FuIGJlCj4+IG1pZ3JhdGVkLCBpbnN0ZWFk IG9mIHBpbm5pbmcgdGhlbSB0aHJvdWdoIEdVUCwgd2UgdXNlIE1NVSBub3RpZmllcnMgdG8KPj4g aW52YWxpZGF0ZSB2bWFwcyBhbmQgcmUtZXN0YWJsaXNoIHZtYXBzIGR1cmluZyBlYWNoIHJvdW5k IG9mIG1ldGFkYXRhCj4+IHByZWZldGNoaW5nIGlmIG5lY2Vzc2FyeS4gRm9yIGRldmljZXMgdGhh dCBkb2Vzbid0IHVzZSBtZXRhZGF0YQo+PiBwcmVmZXRjaGluZywgdGhlIG1lbW9yeSBhY2Nlc3Nv cnMgZmFsbGJhY2sgdG8gbm9ybWFsIGNvcHlfdXNlcigpCj4+IGltcGxlbWVudGF0aW9uIGdyYWNl ZnVsbHkuIFRoZSBpbnZhbGlkYXRpb24gd2FzIHN5bmNocm9uaXplZCB3aXRoCj4+IGRhdGFwYXRo IHRocm91Z2ggdnEgbXV0ZXgsIGFuZCBpbiBvcmRlciB0byBhdm9pZCBob2xkIHZxIG11dGV4IGR1 cmluZwo+PiByYW5nZSBjaGVja2luZywgTU1VIG5vdGlmaWVyIHdhcyB0ZWFyZWQgZG93biB3aGVu IHRyeWluZyB0byBtb2RpZnkgdnEKPj4gbWV0YWRhdGEuCj4+Cj4+IEFub3RoZXIgdGhpbmcgaXMg a2VybmVsIGxhY2tzIGVmZmljaWVudCBzb2x1dGlvbiBmb3IgdHJhY2tpbmcgZGlydHkKPj4gcGFn ZXMgYnkgdm1hcCgpLCB0aGlzIHdpbGwgbGVhZCBpc3N1ZXMgaWYgdmhvc3QgaXMgdXNpbmcgZmls ZSBiYWNrZWQKPj4gbWVtb3J5IHdoaWNoIG5lZWRzIGNhcmUgb2Ygd3JpdGViYWNrLiBUaGlzIHBh dGNoIHNvbHZlcyB0aGlzIGlzc3VlIGJ5Cj4+IGp1c3Qgc2tpcHBpbmcgdGhlIHZtYSB0aGF0IGlz IGZpbGUgYmFja2VkIGFuZCBmYWxsYmFjayB0byBub3JtYWwKPj4gY29weV91c2VyKCkgZnJpZW5k cy4gVGhpcyBtaWdodCBpbnRyb2R1Y2Ugc29tZSBvdmVyaGVhZHMgZm9yIGZpbGUKPj4gYmFja2Vk IHVzZXJzIGJ1dCBjb25zaWRlciB0aGlzIHVzZSBjYXNlIGlzIHJhcmUgd2UgY291bGQgZG8KPj4g b3B0aW1pemF0aW9ucyBvbiB0b3AuCj4+Cj4+IE5vdGUgdGhhdCB0aGlzIHdhcyBvbmx5IGRvbmUg d2hlbiBkZXZpY2UgSU9UTEIgaXMgbm90IGVuYWJsZWQuIFdlCj4+IGNvdWxkIHVzZSBzaW1pbGFy IG1ldGhvZCB0byBvcHRpbWl6ZSBpdCBpbiB0aGUgZnV0dXJlLgo+Pgo+PiBUZXN0cyBzaG93cyBh dCBtb3N0IGFib3V0IDIyJSBpbXByb3ZlbWVudCBvbiBUWCBQUFMgd2hlbiB1c2luZwo+PiB2aXJ0 aW8tdXNlciArIHZob3N0X25ldCArIHhkcDEgKyBUQVAgb24gMi42R0h6IEJyb2Fkd2VsbDoKPj4K Pj4gICAgICAgICAgU01BUCBvbiB8IFNNQVAgb2ZmCj4+IEJlZm9yZTogNS4wTXBwcyB8IDYuNk1w cHMKPj4gQWZ0ZXI6ICA2LjFNcHBzIHwgNy40TXBwcwo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBKYXNv biBXYW5nIDxqYXNvd2FuZ0ByZWRoYXQuY29tPgo+Cj4gU28gdGhpcyBpcyB0aGUgYnVsayBvZiB0 aGUgY2hhbmdlLgo+IFRocmVlZSB0aGluZ3MgdGhhdCBJIG5lZWQgdG8gbG9vayBpbnRvCj4gLSBB cmUgdGhlcmUgYW55IHNlY3VyaXR5IGlzc3VlcyB3aXRoIGJ5cGFzc2luZyB0aGUgc3BlY3VsYXRp b24gYmFycmllcgo+ICAgIHRoYXQgaXMgbm9ybWFsbHkgcHJlc2VudCBhZnRlciBhY2Nlc3Nfb2s/ CgoKSWYgd2UgY2FuIG1ha2Ugc3VyZSB0aGUgYnlwYXNzaW5nIHdhcyBvbmx5IHVzZWQgaW4gYSBr dGhyZWFkICh2aG9zdCksIGl0IApzaG91bGQgYmUgZmluZSBJIHRoaW5rLgoKCj4gLSBIb3cgaGFy ZCBkb2VzIHRoZSBzcGVjaWFsIGhhbmRsaW5nIGZvcgo+ICAgIGZpbGUgYmFja2VkIHN0b3JhZ2Ug bWFrZSB0ZXN0aW5nPwoKCkl0J3MgYXMgc2ltcGxlIGFzIHVuLWNvbW1lbnRpbmcgdmhvc3RfY2Fu X3ZtYXAoKT8gT3IgSSBjYW4gdHJ5IHRvIGhhY2sgCnFlbXUgb3IgZHBkayB0byB0ZXN0IHRoaXMu CgoKPiAgICBPbiB0aGUgb25lIGhhbmQgd2UgY291bGQgYWRkIGEgbW9kdWxlIHBhcmFtZXRlciB0 bwo+ICAgIGZvcmNlIGNvcHkgdG8vZnJvbSB1c2VyLiBvbiB0aGUgb3RoZXIgdGhhdCdzCj4gICAg YW5vdGhlciBjb25maWd1cmF0aW9uIHdlIG5lZWQgdG8gc3VwcG9ydC4KCgpUaGF0IHNvdW5kcyBz dWItb3B0aW1hbCBzaW5jZSBpdCBsZWF2ZSB0aGUgY2hvaWNlIHRvIHVzZXJzLgoKCj4gICAgQnV0 IGlvdGxiIGlzIG5vdCB1c2luZyB2bWFwLCBzbyBtYXliZSB0aGF0J3MgZW5vdWdoCj4gICAgZm9y IHRlc3RpbmcuCj4gLSBIb3cgaGFyZCBpcyBpdCB0byBmaWd1cmUgb3V0IHdoaWNoIG1vZGUgdXNl cyB3aGljaCBjb2RlLgo+Cj4KPgo+IE1lYW53aGlsZSwgY291bGQgeW91IHBscyBwb3N0IGRhdGEg Y29tcGFyaW5nIHRoaXMgbGFzdCBwYXRjaCB3aXRoIHRoZQo+IGJlbG93PyAgVGhpcyByZW1vdmVz IHRoZSBzcGVjdWxhdGlvbiBiYXJyaWVyIHJlcGxhY2luZyBpdCB3aXRoIGEKPiAodXNlbGVzcyBi dXQgYXQgbGVhc3QgbW9yZSBsaWdodHdlaWdodCkgZGF0YSBkZXBlbmRlbmN5LgoKClNNQVAgb2Zm CgpZb3VyIHBhdGNoOiA3LjJNUFBzCgp2bWFwOiA3LjRNcHBzCgpJIGRvbid0IHRlc3QgU01BUCBv biwgc2luY2UgaXQgd2lsbCBiZSBtdWNoIHNsb3cgZm9yIHN1cmUuCgpUaGFua3MKCgo+Cj4gVGhh bmtzIQo+Cj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92aG9zdC92aG9zdC5jIGIvZHJpdmVycy92 aG9zdC92aG9zdC5jCj4gaW5kZXggYmFjOTM5YWY4ZGJiLi4zNTJlZTdlMTQ0NzYgMTAwNjQ0Cj4g LS0tIGEvZHJpdmVycy92aG9zdC92aG9zdC5jCj4gKysrIGIvZHJpdmVycy92aG9zdC92aG9zdC5j Cj4gQEAgLTczOSw3ICs3MzksNyBAQCBzdGF0aWMgaW50IHZob3N0X2NvcHlfdG9fdXNlcihzdHJ1 Y3Qgdmhvc3RfdmlydHF1ZXVlICp2cSwgdm9pZCBfX3VzZXIgKnRvLAo+ICAgCWludCByZXQ7Cj4g ICAKPiAgIAlpZiAoIXZxLT5pb3RsYikKPiAtCQlyZXR1cm4gX19jb3B5X3RvX3VzZXIodG8sIGZy b20sIHNpemUpOwo+ICsJCXJldHVybiBjb3B5X3RvX3VzZXIodG8sIGZyb20sIHNpemUpOwo+ICAg CWVsc2Ugewo+ICAgCQkvKiBUaGlzIGZ1bmN0aW9uIHNob3VsZCBiZSBjYWxsZWQgYWZ0ZXIgaW90 bGIKPiAgIAkJICogcHJlZmV0Y2gsIHdoaWNoIG1lYW5zIHdlJ3JlIHN1cmUgdGhhdCBhbGwgdnEK PiBAQCAtNzUyLDcgKzc1Miw3IEBAIHN0YXRpYyBpbnQgdmhvc3RfY29weV90b191c2VyKHN0cnVj dCB2aG9zdF92aXJ0cXVldWUgKnZxLCB2b2lkIF9fdXNlciAqdG8sCj4gICAJCQkJICAgICBWSE9T VF9BRERSX1VTRUQpOwo+ICAgCj4gICAJCWlmICh1YWRkcikKPiAtCQkJcmV0dXJuIF9fY29weV90 b191c2VyKHVhZGRyLCBmcm9tLCBzaXplKTsKPiArCQkJcmV0dXJuIGNvcHlfdG9fdXNlcih1YWRk ciwgZnJvbSwgc2l6ZSk7Cj4gICAKPiAgIAkJcmV0ID0gdHJhbnNsYXRlX2Rlc2ModnEsICh1NjQp KHVpbnRwdHJfdCl0bywgc2l6ZSwgdnEtPmlvdGxiX2lvdiwKPiAgIAkJCQkgICAgIEFSUkFZX1NJ WkUodnEtPmlvdGxiX2lvdiksCj4gQEAgLTc3NCw3ICs3NzQsNyBAQCBzdGF0aWMgaW50IHZob3N0 X2NvcHlfZnJvbV91c2VyKHN0cnVjdCB2aG9zdF92aXJ0cXVldWUgKnZxLCB2b2lkICp0bywKPiAg IAlpbnQgcmV0Owo+ICAgCj4gICAJaWYgKCF2cS0+aW90bGIpCj4gLQkJcmV0dXJuIF9fY29weV9m cm9tX3VzZXIodG8sIGZyb20sIHNpemUpOwo+ICsJCXJldHVybiBjb3B5X2Zyb21fdXNlcih0bywg ZnJvbSwgc2l6ZSk7Cj4gICAJZWxzZSB7Cj4gICAJCS8qIFRoaXMgZnVuY3Rpb24gc2hvdWxkIGJl IGNhbGxlZCBhZnRlciBpb3RsYgo+ICAgCQkgKiBwcmVmZXRjaCwgd2hpY2ggbWVhbnMgd2UncmUg c3VyZSB0aGF0IHZxCj4gQEAgLTc4Nyw3ICs3ODcsNyBAQCBzdGF0aWMgaW50IHZob3N0X2NvcHlf ZnJvbV91c2VyKHN0cnVjdCB2aG9zdF92aXJ0cXVldWUgKnZxLCB2b2lkICp0bywKPiAgIAkJc3Ry dWN0IGlvdl9pdGVyIGY7Cj4gICAKPiAgIAkJaWYgKHVhZGRyKQo+IC0JCQlyZXR1cm4gX19jb3B5 X2Zyb21fdXNlcih0bywgdWFkZHIsIHNpemUpOwo+ICsJCQlyZXR1cm4gY29weV9mcm9tX3VzZXIo dG8sIHVhZGRyLCBzaXplKTsKPiAgIAo+ICAgCQlyZXQgPSB0cmFuc2xhdGVfZGVzYyh2cSwgKHU2 NCkodWludHB0cl90KWZyb20sIHNpemUsIHZxLT5pb3RsYl9pb3YsCj4gICAJCQkJICAgICBBUlJB WV9TSVpFKHZxLT5pb3RsYl9pb3YpLAo+IEBAIC04NTUsMTMgKzg1NSwxMyBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgX191c2VyICpfX3Zob3N0X2dldF91c2VyKHN0cnVjdCB2aG9zdF92aXJ0cXVldWUg KnZxLAo+ICAgKHsgXAo+ICAgCWludCByZXQgPSAtRUZBVUxUOyBcCj4gICAJaWYgKCF2cS0+aW90 bGIpIHsgXAo+IC0JCXJldCA9IF9fcHV0X3VzZXIoeCwgcHRyKTsgXAo+ICsJCXJldCA9IHB1dF91 c2VyKHgsIHB0cik7IFwKPiAgIAl9IGVsc2UgeyBcCj4gICAJCV9fdHlwZW9mX18ocHRyKSB0byA9 IFwKPiAgIAkJCShfX3R5cGVvZl9fKHB0cikpIF9fdmhvc3RfZ2V0X3VzZXIodnEsIHB0ciwJXAo+ ICAgCQkJCQkgIHNpemVvZigqcHRyKSwgVkhPU1RfQUREUl9VU0VEKTsgXAo+ICAgCQlpZiAodG8g IT0gTlVMTCkgXAo+IC0JCQlyZXQgPSBfX3B1dF91c2VyKHgsIHRvKTsgXAo+ICsJCQlyZXQgPSBw dXRfdXNlcih4LCB0byk7IFwKPiAgIAkJZWxzZSBcCj4gICAJCQlyZXQgPSAtRUZBVUxUOwlcCj4g ICAJfSBcCj4gQEAgLTg3MiwxNCArODcyLDE0IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBfX3VzZXIg Kl9fdmhvc3RfZ2V0X3VzZXIoc3RydWN0IHZob3N0X3ZpcnRxdWV1ZSAqdnEsCj4gICAoeyBcCj4g ICAJaW50IHJldDsgXAo+ICAgCWlmICghdnEtPmlvdGxiKSB7IFwKPiAtCQlyZXQgPSBfX2dldF91 c2VyKHgsIHB0cik7IFwKPiArCQlyZXQgPSBnZXRfdXNlcih4LCBwdHIpOyBcCj4gICAJfSBlbHNl IHsgXAo+ICAgCQlfX3R5cGVvZl9fKHB0cikgZnJvbSA9IFwKPiAgIAkJCShfX3R5cGVvZl9fKHB0 cikpIF9fdmhvc3RfZ2V0X3VzZXIodnEsIHB0ciwgXAo+ICAgCQkJCQkJCSAgIHNpemVvZigqcHRy KSwgXAo+ICAgCQkJCQkJCSAgIHR5cGUpOyBcCj4gICAJCWlmIChmcm9tICE9IE5VTEwpIFwKPiAt CQkJcmV0ID0gX19nZXRfdXNlcih4LCBmcm9tKTsgXAo+ICsJCQlyZXQgPSBnZXRfdXNlcih4LCBm cm9tKTsgXAo+ICAgCQllbHNlIFwKPiAgIAkJCXJldCA9IC1FRkFVTFQ7IFwKPiAgIAl9IFwKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRp b24gbWFpbGluZyBsaXN0ClZpcnR1YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3Jn Cmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1 YWxpemF0aW9u