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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 EED5EC433DB for ; Tue, 16 Mar 2021 08:26:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 5192064E45 for ; Tue, 16 Mar 2021 08:26:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5192064E45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM51u-0005PU-AR for qemu-devel@archiver.kernel.org; Tue, 16 Mar 2021 04:26:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4rM-0005oD-BM for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:15:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4rG-0000b8-U5 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:15:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615882517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ejrAMmU3aAoOu1SFxe6Obv7QB6ANg/3KMkIB3e56P2E=; b=RzDbre/uEBKprcxQlpFhclFU8hHK7veNBsY6nHK3W5idRnjFbPOOpulbFcC7CfWAu6Vl6p Ct9KKcQCBgsTMHhIQkDcXWLowV+J2COAL+Sm92w77PAxW7u3WEx79wvBzBAAug5mfI2gOE twEgmXKvjeuN2RKezbPex76H+KKhpOc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-yc4Wx9FvOlqw1-cHpBdqiQ-1; Tue, 16 Mar 2021 04:15:16 -0400 X-MC-Unique: yc4Wx9FvOlqw1-cHpBdqiQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CA1F92503; Tue, 16 Mar 2021 08:15:14 +0000 (UTC) Received: from wangxiaodeMacBook-Air.local (ovpn-12-216.pek2.redhat.com [10.72.12.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3919E6C32E; Tue, 16 Mar 2021 08:15:04 +0000 (UTC) Subject: Re: [RFC v2 11/13] vhost: Shadow virtqueue buffers forwarding To: =?UTF-8?Q?Eugenio_P=c3=a9rez?= , qemu-devel@nongnu.org References: <20210315194842.277740-1-eperezma@redhat.com> <20210315194842.277740-12-eperezma@redhat.com> From: Jason Wang Message-ID: <5fcc5f81-88f7-1c00-c4a6-6ba5ad21ac8b@redhat.com> Date: Tue, 16 Mar 2021 16:15:03 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210315194842.277740-12-eperezma@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Parav Pandit , "Michael S. Tsirkin" , Guru Prasad , Juan Quintela , Markus Armbruster , virtualization@lists.linux-foundation.org, Harpreet Singh Anand , Xiao W Wang , Eli Cohen , Stefano Garzarella , Michael Lilja , Jim Harford , Rob Miller Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 在 2021/3/16 上午3:48, Eugenio Pérez 写道: > Initial version of shadow virtqueue that actually forward buffers. > > It reuses the VirtQueue code for the device part. The driver part is > based on Linux's virtio_ring driver, but with stripped functionality > and optimizations so it's easier to review. > > These will be added in later commits. > > Signed-off-by: Eugenio Pérez > --- > hw/virtio/vhost-shadow-virtqueue.c | 212 +++++++++++++++++++++++++++-- > hw/virtio/vhost.c | 113 ++++++++++++++- > 2 files changed, 312 insertions(+), 13 deletions(-) > > diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c > index 1460d1d5d1..68ed0f2740 100644 > --- a/hw/virtio/vhost-shadow-virtqueue.c > +++ b/hw/virtio/vhost-shadow-virtqueue.c > @@ -9,6 +9,7 @@ > > #include "hw/virtio/vhost-shadow-virtqueue.h" > #include "hw/virtio/vhost.h" > +#include "hw/virtio/virtio-access.h" > > #include "standard-headers/linux/vhost_types.h" > > @@ -55,11 +56,96 @@ typedef struct VhostShadowVirtqueue { > /* Virtio device */ > VirtIODevice *vdev; > > + /* Map for returning guest's descriptors */ > + VirtQueueElement **ring_id_maps; > + > + /* Next head to expose to device */ > + uint16_t avail_idx_shadow; > + > + /* Next free descriptor */ > + uint16_t free_head; > + > + /* Last seen used idx */ > + uint16_t shadow_used_idx; > + > + /* Next head to consume from device */ > + uint16_t used_idx; > + > /* Descriptors copied from guest */ > vring_desc_t descs[]; > } VhostShadowVirtqueue; > > -/* Forward guest notifications */ > +static void vhost_vring_write_descs(VhostShadowVirtqueue *svq, > + const struct iovec *iovec, > + size_t num, bool more_descs, bool write) > +{ > + uint16_t i = svq->free_head, last = svq->free_head; > + unsigned n; > + uint16_t flags = write ? virtio_tswap16(svq->vdev, VRING_DESC_F_WRITE) : 0; > + vring_desc_t *descs = svq->vring.desc; > + > + if (num == 0) { > + return; > + } > + > + for (n = 0; n < num; n++) { > + if (more_descs || (n + 1 < num)) { > + descs[i].flags = flags | virtio_tswap16(svq->vdev, > + VRING_DESC_F_NEXT); > + } else { > + descs[i].flags = flags; > + } > + descs[i].addr = virtio_tswap64(svq->vdev, (hwaddr)iovec[n].iov_base); So unsing virtio_tswap() is probably not correct since we're talking with vhost backends which has its own endiness. For vhost-vDPA, we can assume that it's a 1.0 device. > + descs[i].len = virtio_tswap32(svq->vdev, iovec[n].iov_len); > + > + last = i; > + i = virtio_tswap16(svq->vdev, descs[i].next); > + } > + > + svq->free_head = virtio_tswap16(svq->vdev, descs[last].next); > +} > + > +static unsigned vhost_shadow_vq_add_split(VhostShadowVirtqueue *svq, > + VirtQueueElement *elem) > +{ > + int head; > + unsigned avail_idx; > + vring_avail_t *avail = svq->vring.avail; > + > + head = svq->free_head; > + > + /* We need some descriptors here */ > + assert(elem->out_num || elem->in_num); > + > + vhost_vring_write_descs(svq, elem->out_sg, elem->out_num, > + elem->in_num > 0, false); > + vhost_vring_write_descs(svq, elem->in_sg, elem->in_num, false, true); > + > + /* > + * Put entry in available array (but don't update avail->idx until they > + * do sync). > + */ > + avail_idx = svq->avail_idx_shadow & (svq->vring.num - 1); > + avail->ring[avail_idx] = virtio_tswap16(svq->vdev, head); > + svq->avail_idx_shadow++; > + > + /* Expose descriptors to device */ > + smp_wmb(); > + avail->idx = virtio_tswap16(svq->vdev, svq->avail_idx_shadow); > + > + return head; > + > +} > + > +static void vhost_shadow_vq_add(VhostShadowVirtqueue *svq, > + VirtQueueElement *elem) > +{ > + unsigned qemu_head = vhost_shadow_vq_add_split(svq, elem); > + > + svq->ring_id_maps[qemu_head] = elem; > +} > + > +/* Handle guest->device notifications */ > static void vhost_handle_guest_kick(EventNotifier *n) > { > VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue, > @@ -69,7 +155,72 @@ static void vhost_handle_guest_kick(EventNotifier *n) > return; > } > > - event_notifier_set(&svq->kick_notifier); > + /* Make available as many buffers as possible */ > + do { > + if (virtio_queue_get_notification(svq->vq)) { > + /* No more notifications until process all available */ > + virtio_queue_set_notification(svq->vq, false); > + } > + > + while (true) { > + VirtQueueElement *elem; > + if (virtio_queue_full(svq->vq)) { > + break; So we've disabled guest notification. If buffer has been consumed, we need to retry the handle_guest_kick here. But I didn't find the code? > + } > + > + elem = virtqueue_pop(svq->vq, sizeof(*elem)); > + if (!elem) { > + break; > + } > + > + vhost_shadow_vq_add(svq, elem); > + event_notifier_set(&svq->kick_notifier); > + } > + > + virtio_queue_set_notification(svq->vq, true); > + } while (!virtio_queue_empty(svq->vq)); > +} > + > +static bool vhost_shadow_vq_more_used(VhostShadowVirtqueue *svq) > +{ > + if (svq->used_idx != svq->shadow_used_idx) { > + return true; > + } > + > + /* Get used idx must not be reordered */ > + smp_rmb(); > + svq->shadow_used_idx = virtio_tswap16(svq->vdev, svq->vring.used->idx); > + > + return svq->used_idx != svq->shadow_used_idx; > +} > + > +static VirtQueueElement *vhost_shadow_vq_get_buf(VhostShadowVirtqueue *svq) > +{ > + vring_desc_t *descs = svq->vring.desc; > + const vring_used_t *used = svq->vring.used; > + vring_used_elem_t used_elem; > + uint16_t last_used; > + > + if (!vhost_shadow_vq_more_used(svq)) { > + return NULL; > + } > + > + last_used = svq->used_idx & (svq->vring.num - 1); > + used_elem.id = virtio_tswap32(svq->vdev, used->ring[last_used].id); > + used_elem.len = virtio_tswap32(svq->vdev, used->ring[last_used].len); > + > + if (unlikely(used_elem.id >= svq->vring.num)) { > + error_report("Device %s says index %u is available", svq->vdev->name, > + used_elem.id); > + return NULL; > + } > + > + descs[used_elem.id].next = svq->free_head; > + svq->free_head = used_elem.id; > + > + svq->used_idx++; > + svq->ring_id_maps[used_elem.id]->len = used_elem.len; > + return g_steal_pointer(&svq->ring_id_maps[used_elem.id]); > } > > /* Forward vhost notifications */ > @@ -78,6 +229,7 @@ static void vhost_shadow_vq_handle_call_no_test(EventNotifier *n) > VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue, > call_notifier); > EventNotifier *masked_notifier; > + VirtQueue *vq = svq->vq; > > /* Signal start of using masked notifier */ > qemu_event_reset(&svq->masked_notifier.is_free); > @@ -86,14 +238,29 @@ static void vhost_shadow_vq_handle_call_no_test(EventNotifier *n) > qemu_event_set(&svq->masked_notifier.is_free); > } > > - if (!masked_notifier) { > - unsigned n = virtio_get_queue_index(svq->vq); > - virtio_queue_invalidate_signalled_used(svq->vdev, n); > - virtio_notify_irqfd(svq->vdev, svq->vq); > - } else if (!svq->masked_notifier.signaled) { > - svq->masked_notifier.signaled = true; > - event_notifier_set(svq->masked_notifier.n); > - } > + /* Make as many buffers as possible used. */ > + do { > + unsigned i = 0; > + > + /* TODO: Use VRING_AVAIL_F_NO_INTERRUPT */ > + while (true) { > + g_autofree VirtQueueElement *elem = vhost_shadow_vq_get_buf(svq); > + if (!elem) { > + break; > + } > + > + assert(i < svq->vring.num); > + virtqueue_fill(vq, elem, elem->len, i++); > + } > + > + virtqueue_flush(vq, i); > + if (!masked_notifier) { > + virtio_notify_irqfd(svq->vdev, svq->vq); > + } else if (!svq->masked_notifier.signaled) { > + svq->masked_notifier.signaled = true; > + event_notifier_set(svq->masked_notifier.n); > + } > + } while (vhost_shadow_vq_more_used(svq)); > > if (masked_notifier) { > /* Signal not using it anymore */ > @@ -103,7 +270,6 @@ static void vhost_shadow_vq_handle_call_no_test(EventNotifier *n) > > static void vhost_shadow_vq_handle_call(EventNotifier *n) > { > - > if (likely(event_notifier_test_and_clear(n))) { > vhost_shadow_vq_handle_call_no_test(n); > } > @@ -254,7 +420,11 @@ void vhost_shadow_vq_stop(struct vhost_dev *dev, > unsigned idx, > VhostShadowVirtqueue *svq) > { > + int i; > int r = vhost_shadow_vq_restore_vdev_host_notifier(dev, idx, svq); > + > + assert(!dev->shadow_vqs_enabled); > + > if (unlikely(r < 0)) { > error_report("Couldn't restore vq kick fd: %s", strerror(-r)); > } > @@ -272,6 +442,18 @@ void vhost_shadow_vq_stop(struct vhost_dev *dev, > /* Restore vhost call */ > vhost_virtqueue_mask(dev, dev->vdev, dev->vq_index + idx, > dev->vqs[idx].notifier_is_masked); > + > + > + for (i = 0; i < svq->vring.num; ++i) { > + g_autofree VirtQueueElement *elem = svq->ring_id_maps[i]; > + /* > + * Although the doc says we must unpop in order, it's ok to unpop > + * everything. > + */ > + if (elem) { > + virtqueue_unpop(svq->vq, elem, elem->len); Shouldn't we need to wait until all pending requests to be drained? Or we may end up duplicated requests? Thanks > + } > + } > } > > /* > @@ -284,7 +466,7 @@ VhostShadowVirtqueue *vhost_shadow_vq_new(struct vhost_dev *dev, int idx) > unsigned num = virtio_queue_get_num(dev->vdev, vq_idx); > size_t ring_size = vring_size(num, VRING_DESC_ALIGN_SIZE); > g_autofree VhostShadowVirtqueue *svq = g_malloc0(sizeof(*svq) + ring_size); > - int r; > + int r, i; > > r = event_notifier_init(&svq->kick_notifier, 0); > if (r != 0) { > @@ -303,6 +485,11 @@ VhostShadowVirtqueue *vhost_shadow_vq_new(struct vhost_dev *dev, int idx) > vring_init(&svq->vring, num, svq->descs, VRING_DESC_ALIGN_SIZE); > svq->vq = virtio_get_queue(dev->vdev, vq_idx); > svq->vdev = dev->vdev; > + for (i = 0; i < num - 1; i++) { > + svq->descs[i].next = virtio_tswap16(dev->vdev, i + 1); > + } > + > + svq->ring_id_maps = g_new0(VirtQueueElement *, num); > event_notifier_set_handler(&svq->call_notifier, > vhost_shadow_vq_handle_call); > qemu_event_init(&svq->masked_notifier.is_free, true); > @@ -324,5 +511,6 @@ void vhost_shadow_vq_free(VhostShadowVirtqueue *vq) > event_notifier_cleanup(&vq->kick_notifier); > event_notifier_set_handler(&vq->call_notifier, NULL); > event_notifier_cleanup(&vq->call_notifier); > + g_free(vq->ring_id_maps); > g_free(vq); > } > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index eab3e334f2..a373999bc4 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -1021,6 +1021,19 @@ int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write) > > trace_vhost_iotlb_miss(dev, 1); > > + if (qatomic_load_acquire(&dev->shadow_vqs_enabled)) { > + uaddr = iova; > + len = 4096; > + ret = vhost_backend_update_device_iotlb(dev, iova, uaddr, len, > + IOMMU_RW); > + if (ret) { > + trace_vhost_iotlb_miss(dev, 2); > + error_report("Fail to update device iotlb"); > + } > + > + return ret; > + } > + > iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as, > iova, write, > MEMTXATTRS_UNSPECIFIED); > @@ -1227,8 +1240,28 @@ static int vhost_sw_live_migration_stop(struct vhost_dev *dev) > /* Can be read by vhost_virtqueue_mask, from vm exit */ > qatomic_store_release(&dev->shadow_vqs_enabled, false); > > + dev->vhost_ops->vhost_set_vring_enable(dev, false); > + if (vhost_backend_invalidate_device_iotlb(dev, 0, -1ULL)) { > + error_report("Fail to invalidate device iotlb"); > + } > + > for (idx = 0; idx < dev->nvqs; ++idx) { > + /* > + * Update used ring information for IOTLB to work correctly, > + * vhost-kernel code requires for this. > + */ > + struct vhost_virtqueue *vq = dev->vqs + idx; > + vhost_device_iotlb_miss(dev, vq->used_phys, true); > + > vhost_shadow_vq_stop(dev, idx, dev->shadow_vqs[idx]); > + vhost_virtqueue_start(dev, dev->vdev, &dev->vqs[idx], > + dev->vq_index + idx); > + } > + > + /* Enable guest's vq vring */ > + dev->vhost_ops->vhost_set_vring_enable(dev, true); > + > + for (idx = 0; idx < dev->nvqs; ++idx) { > vhost_shadow_vq_free(dev->shadow_vqs[idx]); > } > > @@ -1237,6 +1270,59 @@ static int vhost_sw_live_migration_stop(struct vhost_dev *dev) > return 0; > } > > +/* > + * Start shadow virtqueue in a given queue. > + * In failure case, this function leaves queue working as regular vhost mode. > + */ > +static bool vhost_sw_live_migration_start_vq(struct vhost_dev *dev, > + unsigned idx) > +{ > + struct vhost_vring_addr addr = { > + .index = idx, > + }; > + struct vhost_vring_state s = { > + .index = idx, > + }; > + int r; > + bool ok; > + > + vhost_virtqueue_stop(dev, dev->vdev, &dev->vqs[idx], dev->vq_index + idx); > + ok = vhost_shadow_vq_start(dev, idx, dev->shadow_vqs[idx]); > + if (unlikely(!ok)) { > + return false; > + } > + > + /* From this point, vhost_virtqueue_start can reset these changes */ > + vhost_shadow_vq_get_vring_addr(dev->shadow_vqs[idx], &addr); > + r = dev->vhost_ops->vhost_set_vring_addr(dev, &addr); > + if (unlikely(r != 0)) { > + VHOST_OPS_DEBUG("vhost_set_vring_addr for shadow vq failed"); > + goto err; > + } > + > + r = dev->vhost_ops->vhost_set_vring_base(dev, &s); > + if (unlikely(r != 0)) { > + VHOST_OPS_DEBUG("vhost_set_vring_base for shadow vq failed"); > + goto err; > + } > + > + /* > + * Update used ring information for IOTLB to work correctly, > + * vhost-kernel code requires for this. > + */ > + r = vhost_device_iotlb_miss(dev, addr.used_user_addr, true); > + if (unlikely(r != 0)) { > + /* Debug message already printed */ > + goto err; > + } > + > + return true; > + > +err: > + vhost_virtqueue_start(dev, dev->vdev, &dev->vqs[idx], dev->vq_index + idx); > + return false; > +} > + > static int vhost_sw_live_migration_start(struct vhost_dev *dev) > { > int idx, stop_idx; > @@ -1249,24 +1335,35 @@ static int vhost_sw_live_migration_start(struct vhost_dev *dev) > } > } > > + dev->vhost_ops->vhost_set_vring_enable(dev, false); > + if (vhost_backend_invalidate_device_iotlb(dev, 0, -1ULL)) { > + error_report("Fail to invalidate device iotlb"); > + } > + > /* Can be read by vhost_virtqueue_mask, from vm exit */ > qatomic_store_release(&dev->shadow_vqs_enabled, true); > for (idx = 0; idx < dev->nvqs; ++idx) { > - bool ok = vhost_shadow_vq_start(dev, idx, dev->shadow_vqs[idx]); > + bool ok = vhost_sw_live_migration_start_vq(dev, idx); > if (unlikely(!ok)) { > goto err_start; > } > } > > + /* Enable shadow vq vring */ > + dev->vhost_ops->vhost_set_vring_enable(dev, true); > return 0; > > err_start: > qatomic_store_release(&dev->shadow_vqs_enabled, false); > for (stop_idx = 0; stop_idx < idx; stop_idx++) { > vhost_shadow_vq_stop(dev, idx, dev->shadow_vqs[stop_idx]); > + vhost_virtqueue_start(dev, dev->vdev, &dev->vqs[idx], > + dev->vq_index + stop_idx); > } > > err_new: > + /* Enable guest's vring */ > + dev->vhost_ops->vhost_set_vring_enable(dev, true); > for (idx = 0; idx < dev->nvqs; ++idx) { > vhost_shadow_vq_free(dev->shadow_vqs[idx]); > } > @@ -1970,6 +2067,20 @@ void qmp_x_vhost_enable_shadow_vq(const char *name, bool enable, Error **errp) > > if (!hdev->started) { > err_cause = "Device is not started"; > + } else if (!vhost_dev_has_iommu(hdev)) { > + err_cause = "Does not support iommu"; > + } else if (hdev->acked_features & BIT_ULL(VIRTIO_F_RING_PACKED)) { > + err_cause = "Is packed"; > + } else if (hdev->acked_features & BIT_ULL(VIRTIO_RING_F_EVENT_IDX)) { > + err_cause = "Have event idx"; > + } else if (hdev->acked_features & > + BIT_ULL(VIRTIO_RING_F_INDIRECT_DESC)) { > + err_cause = "Supports indirect descriptors"; > + } else if (!hdev->vhost_ops->vhost_set_vring_enable) { > + err_cause = "Cannot pause device"; > + } > + > + if (err_cause) { > goto err; > } > 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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 B46B9C433E0 for ; Tue, 16 Mar 2021 08:15:23 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 5222864FD1 for ; Tue, 16 Mar 2021 08:15:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5222864FD1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0A09543011; Tue, 16 Mar 2021 08:15:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yuLpPpuZj7Wt; Tue, 16 Mar 2021 08:15:21 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTP id 528FD400E2; Tue, 16 Mar 2021 08:15:21 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 260A8C000C; Tue, 16 Mar 2021 08:15:21 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4EC22C000A for ; Tue, 16 Mar 2021 08:15:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2F4A260646 for ; Tue, 16 Mar 2021 08:15:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KP_ZHsRYGosl for ; Tue, 16 Mar 2021 08:15:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id C511B60641 for ; Tue, 16 Mar 2021 08:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615882517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ejrAMmU3aAoOu1SFxe6Obv7QB6ANg/3KMkIB3e56P2E=; b=RzDbre/uEBKprcxQlpFhclFU8hHK7veNBsY6nHK3W5idRnjFbPOOpulbFcC7CfWAu6Vl6p Ct9KKcQCBgsTMHhIQkDcXWLowV+J2COAL+Sm92w77PAxW7u3WEx79wvBzBAAug5mfI2gOE twEgmXKvjeuN2RKezbPex76H+KKhpOc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-yc4Wx9FvOlqw1-cHpBdqiQ-1; Tue, 16 Mar 2021 04:15:16 -0400 X-MC-Unique: yc4Wx9FvOlqw1-cHpBdqiQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CA1F92503; Tue, 16 Mar 2021 08:15:14 +0000 (UTC) Received: from wangxiaodeMacBook-Air.local (ovpn-12-216.pek2.redhat.com [10.72.12.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3919E6C32E; Tue, 16 Mar 2021 08:15:04 +0000 (UTC) Subject: Re: [RFC v2 11/13] vhost: Shadow virtqueue buffers forwarding To: =?UTF-8?Q?Eugenio_P=c3=a9rez?= , qemu-devel@nongnu.org References: <20210315194842.277740-1-eperezma@redhat.com> <20210315194842.277740-12-eperezma@redhat.com> From: Jason Wang Message-ID: <5fcc5f81-88f7-1c00-c4a6-6ba5ad21ac8b@redhat.com> Date: Tue, 16 Mar 2021 16:15:03 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210315194842.277740-12-eperezma@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Parav Pandit , "Michael S. Tsirkin" , Guru Prasad , virtualization@lists.linux-foundation.org, Harpreet Singh Anand , Xiao W Wang , Eli Cohen , Eric Blake , Michael Lilja , Jim Harford , Rob Miller X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" CuWcqCAyMDIxLzMvMTYg5LiK5Y2IMzo0OCwgRXVnZW5pbyBQw6lyZXog5YaZ6YGTOgo+IEluaXRp YWwgdmVyc2lvbiBvZiBzaGFkb3cgdmlydHF1ZXVlIHRoYXQgYWN0dWFsbHkgZm9yd2FyZCBidWZm ZXJzLgo+Cj4gSXQgcmV1c2VzIHRoZSBWaXJ0UXVldWUgY29kZSBmb3IgdGhlIGRldmljZSBwYXJ0 LiBUaGUgZHJpdmVyIHBhcnQgaXMKPiBiYXNlZCBvbiBMaW51eCdzIHZpcnRpb19yaW5nIGRyaXZl ciwgYnV0IHdpdGggc3RyaXBwZWQgZnVuY3Rpb25hbGl0eQo+IGFuZCBvcHRpbWl6YXRpb25zIHNv IGl0J3MgZWFzaWVyIHRvIHJldmlldy4KPgo+IFRoZXNlIHdpbGwgYmUgYWRkZWQgaW4gbGF0ZXIg Y29tbWl0cy4KPgo+IFNpZ25lZC1vZmYtYnk6IEV1Z2VuaW8gUMOpcmV6IDxlcGVyZXptYUByZWRo YXQuY29tPgo+IC0tLQo+ICAgaHcvdmlydGlvL3Zob3N0LXNoYWRvdy12aXJ0cXVldWUuYyB8IDIx MiArKysrKysrKysrKysrKysrKysrKysrKysrKystLQo+ICAgaHcvdmlydGlvL3Zob3N0LmMgICAg ICAgICAgICAgICAgICB8IDExMyArKysrKysrKysrKysrKy0KPiAgIDIgZmlsZXMgY2hhbmdlZCwg MzEyIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2h3L3Zp cnRpby92aG9zdC1zaGFkb3ctdmlydHF1ZXVlLmMgYi9ody92aXJ0aW8vdmhvc3Qtc2hhZG93LXZp cnRxdWV1ZS5jCj4gaW5kZXggMTQ2MGQxZDVkMS4uNjhlZDBmMjc0MCAxMDA2NDQKPiAtLS0gYS9o dy92aXJ0aW8vdmhvc3Qtc2hhZG93LXZpcnRxdWV1ZS5jCj4gKysrIGIvaHcvdmlydGlvL3Zob3N0 LXNoYWRvdy12aXJ0cXVldWUuYwo+IEBAIC05LDYgKzksNyBAQAo+ICAgCj4gICAjaW5jbHVkZSAi aHcvdmlydGlvL3Zob3N0LXNoYWRvdy12aXJ0cXVldWUuaCIKPiAgICNpbmNsdWRlICJody92aXJ0 aW8vdmhvc3QuaCIKPiArI2luY2x1ZGUgImh3L3ZpcnRpby92aXJ0aW8tYWNjZXNzLmgiCj4gICAK PiAgICNpbmNsdWRlICJzdGFuZGFyZC1oZWFkZXJzL2xpbnV4L3Zob3N0X3R5cGVzLmgiCj4gICAK PiBAQCAtNTUsMTEgKzU2LDk2IEBAIHR5cGVkZWYgc3RydWN0IFZob3N0U2hhZG93VmlydHF1ZXVl IHsKPiAgICAgICAvKiBWaXJ0aW8gZGV2aWNlICovCj4gICAgICAgVmlydElPRGV2aWNlICp2ZGV2 Owo+ICAgCj4gKyAgICAvKiBNYXAgZm9yIHJldHVybmluZyBndWVzdCdzIGRlc2NyaXB0b3JzICov Cj4gKyAgICBWaXJ0UXVldWVFbGVtZW50ICoqcmluZ19pZF9tYXBzOwo+ICsKPiArICAgIC8qIE5l eHQgaGVhZCB0byBleHBvc2UgdG8gZGV2aWNlICovCj4gKyAgICB1aW50MTZfdCBhdmFpbF9pZHhf c2hhZG93Owo+ICsKPiArICAgIC8qIE5leHQgZnJlZSBkZXNjcmlwdG9yICovCj4gKyAgICB1aW50 MTZfdCBmcmVlX2hlYWQ7Cj4gKwo+ICsgICAgLyogTGFzdCBzZWVuIHVzZWQgaWR4ICovCj4gKyAg ICB1aW50MTZfdCBzaGFkb3dfdXNlZF9pZHg7Cj4gKwo+ICsgICAgLyogTmV4dCBoZWFkIHRvIGNv bnN1bWUgZnJvbSBkZXZpY2UgKi8KPiArICAgIHVpbnQxNl90IHVzZWRfaWR4Owo+ICsKPiAgICAg ICAvKiBEZXNjcmlwdG9ycyBjb3BpZWQgZnJvbSBndWVzdCAqLwo+ICAgICAgIHZyaW5nX2Rlc2Nf dCBkZXNjc1tdOwo+ICAgfSBWaG9zdFNoYWRvd1ZpcnRxdWV1ZTsKPiAgIAo+IC0vKiBGb3J3YXJk IGd1ZXN0IG5vdGlmaWNhdGlvbnMgKi8KPiArc3RhdGljIHZvaWQgdmhvc3RfdnJpbmdfd3JpdGVf ZGVzY3MoVmhvc3RTaGFkb3dWaXJ0cXVldWUgKnN2cSwKPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGlvdmVjICppb3ZlYywKPiArICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IG51bSwgYm9vbCBtb3JlX2Rlc2NzLCBib29s IHdyaXRlKQo+ICt7Cj4gKyAgICB1aW50MTZfdCBpID0gc3ZxLT5mcmVlX2hlYWQsIGxhc3QgPSBz dnEtPmZyZWVfaGVhZDsKPiArICAgIHVuc2lnbmVkIG47Cj4gKyAgICB1aW50MTZfdCBmbGFncyA9 IHdyaXRlID8gdmlydGlvX3Rzd2FwMTYoc3ZxLT52ZGV2LCBWUklOR19ERVNDX0ZfV1JJVEUpIDog MDsKPiArICAgIHZyaW5nX2Rlc2NfdCAqZGVzY3MgPSBzdnEtPnZyaW5nLmRlc2M7Cj4gKwo+ICsg ICAgaWYgKG51bSA9PSAwKSB7Cj4gKyAgICAgICAgcmV0dXJuOwo+ICsgICAgfQo+ICsKPiArICAg IGZvciAobiA9IDA7IG4gPCBudW07IG4rKykgewo+ICsgICAgICAgIGlmIChtb3JlX2Rlc2NzIHx8 IChuICsgMSA8IG51bSkpIHsKPiArICAgICAgICAgICAgZGVzY3NbaV0uZmxhZ3MgPSBmbGFncyB8 IHZpcnRpb190c3dhcDE2KHN2cS0+dmRldiwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFZSSU5HX0RFU0NfRl9ORVhUKTsKPiArICAgICAgICB9 IGVsc2Ugewo+ICsgICAgICAgICAgICBkZXNjc1tpXS5mbGFncyA9IGZsYWdzOwo+ICsgICAgICAg IH0KPiArICAgICAgICBkZXNjc1tpXS5hZGRyID0gdmlydGlvX3Rzd2FwNjQoc3ZxLT52ZGV2LCAo aHdhZGRyKWlvdmVjW25dLmlvdl9iYXNlKTsKCgpTbyB1bnNpbmcgdmlydGlvX3Rzd2FwKCkgaXMg cHJvYmFibHkgbm90IGNvcnJlY3Qgc2luY2Ugd2UncmUgdGFsa2luZyAKd2l0aCB2aG9zdCBiYWNr ZW5kcyB3aGljaCBoYXMgaXRzIG93biBlbmRpbmVzcy4KCkZvciB2aG9zdC12RFBBLCB3ZSBjYW4g YXNzdW1lIHRoYXQgaXQncyBhIDEuMCBkZXZpY2UuCgoKPiArICAgICAgICBkZXNjc1tpXS5sZW4g PSB2aXJ0aW9fdHN3YXAzMihzdnEtPnZkZXYsIGlvdmVjW25dLmlvdl9sZW4pOwo+ICsKPiArICAg ICAgICBsYXN0ID0gaTsKPiArICAgICAgICBpID0gdmlydGlvX3Rzd2FwMTYoc3ZxLT52ZGV2LCBk ZXNjc1tpXS5uZXh0KTsKPiArICAgIH0KPiArCj4gKyAgICBzdnEtPmZyZWVfaGVhZCA9IHZpcnRp b190c3dhcDE2KHN2cS0+dmRldiwgZGVzY3NbbGFzdF0ubmV4dCk7Cj4gK30KPiArCj4gK3N0YXRp YyB1bnNpZ25lZCB2aG9zdF9zaGFkb3dfdnFfYWRkX3NwbGl0KFZob3N0U2hhZG93VmlydHF1ZXVl ICpzdnEsCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZpcnRR dWV1ZUVsZW1lbnQgKmVsZW0pCj4gK3sKPiArICAgIGludCBoZWFkOwo+ICsgICAgdW5zaWduZWQg YXZhaWxfaWR4Owo+ICsgICAgdnJpbmdfYXZhaWxfdCAqYXZhaWwgPSBzdnEtPnZyaW5nLmF2YWls Owo+ICsKPiArICAgIGhlYWQgPSBzdnEtPmZyZWVfaGVhZDsKPiArCj4gKyAgICAvKiBXZSBuZWVk IHNvbWUgZGVzY3JpcHRvcnMgaGVyZSAqLwo+ICsgICAgYXNzZXJ0KGVsZW0tPm91dF9udW0gfHwg ZWxlbS0+aW5fbnVtKTsKPiArCj4gKyAgICB2aG9zdF92cmluZ193cml0ZV9kZXNjcyhzdnEsIGVs ZW0tPm91dF9zZywgZWxlbS0+b3V0X251bSwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAg IGVsZW0tPmluX251bSA+IDAsIGZhbHNlKTsKPiArICAgIHZob3N0X3ZyaW5nX3dyaXRlX2Rlc2Nz KHN2cSwgZWxlbS0+aW5fc2csIGVsZW0tPmluX251bSwgZmFsc2UsIHRydWUpOwo+ICsKPiArICAg IC8qCj4gKyAgICAgKiBQdXQgZW50cnkgaW4gYXZhaWxhYmxlIGFycmF5IChidXQgZG9uJ3QgdXBk YXRlIGF2YWlsLT5pZHggdW50aWwgdGhleQo+ICsgICAgICogZG8gc3luYykuCj4gKyAgICAgKi8K PiArICAgIGF2YWlsX2lkeCA9IHN2cS0+YXZhaWxfaWR4X3NoYWRvdyAmIChzdnEtPnZyaW5nLm51 bSAtIDEpOwo+ICsgICAgYXZhaWwtPnJpbmdbYXZhaWxfaWR4XSA9IHZpcnRpb190c3dhcDE2KHN2 cS0+dmRldiwgaGVhZCk7Cj4gKyAgICBzdnEtPmF2YWlsX2lkeF9zaGFkb3crKzsKPiArCj4gKyAg ICAvKiBFeHBvc2UgZGVzY3JpcHRvcnMgdG8gZGV2aWNlICovCj4gKyAgICBzbXBfd21iKCk7Cj4g KyAgICBhdmFpbC0+aWR4ID0gdmlydGlvX3Rzd2FwMTYoc3ZxLT52ZGV2LCBzdnEtPmF2YWlsX2lk eF9zaGFkb3cpOwo+ICsKPiArICAgIHJldHVybiBoZWFkOwo+ICsKPiArfQo+ICsKPiArc3RhdGlj IHZvaWQgdmhvc3Rfc2hhZG93X3ZxX2FkZChWaG9zdFNoYWRvd1ZpcnRxdWV1ZSAqc3ZxLAo+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZpcnRRdWV1ZUVsZW1lbnQgKmVsZW0pCj4g K3sKPiArICAgIHVuc2lnbmVkIHFlbXVfaGVhZCA9IHZob3N0X3NoYWRvd192cV9hZGRfc3BsaXQo c3ZxLCBlbGVtKTsKPiArCj4gKyAgICBzdnEtPnJpbmdfaWRfbWFwc1txZW11X2hlYWRdID0gZWxl bTsKPiArfQo+ICsKPiArLyogSGFuZGxlIGd1ZXN0LT5kZXZpY2Ugbm90aWZpY2F0aW9ucyAqLwo+ ICAgc3RhdGljIHZvaWQgdmhvc3RfaGFuZGxlX2d1ZXN0X2tpY2soRXZlbnROb3RpZmllciAqbikK PiAgIHsKPiAgICAgICBWaG9zdFNoYWRvd1ZpcnRxdWV1ZSAqc3ZxID0gY29udGFpbmVyX29mKG4s IFZob3N0U2hhZG93VmlydHF1ZXVlLAo+IEBAIC02OSw3ICsxNTUsNzIgQEAgc3RhdGljIHZvaWQg dmhvc3RfaGFuZGxlX2d1ZXN0X2tpY2soRXZlbnROb3RpZmllciAqbikKPiAgICAgICAgICAgcmV0 dXJuOwo+ICAgICAgIH0KPiAgIAo+IC0gICAgZXZlbnRfbm90aWZpZXJfc2V0KCZzdnEtPmtpY2tf bm90aWZpZXIpOwo+ICsgICAgLyogTWFrZSBhdmFpbGFibGUgYXMgbWFueSBidWZmZXJzIGFzIHBv c3NpYmxlICovCj4gKyAgICBkbyB7Cj4gKyAgICAgICAgaWYgKHZpcnRpb19xdWV1ZV9nZXRfbm90 aWZpY2F0aW9uKHN2cS0+dnEpKSB7Cj4gKyAgICAgICAgICAgIC8qIE5vIG1vcmUgbm90aWZpY2F0 aW9ucyB1bnRpbCBwcm9jZXNzIGFsbCBhdmFpbGFibGUgKi8KPiArICAgICAgICAgICAgdmlydGlv X3F1ZXVlX3NldF9ub3RpZmljYXRpb24oc3ZxLT52cSwgZmFsc2UpOwo+ICsgICAgICAgIH0KPiAr Cj4gKyAgICAgICAgd2hpbGUgKHRydWUpIHsKPiArICAgICAgICAgICAgVmlydFF1ZXVlRWxlbWVu dCAqZWxlbTsKPiArICAgICAgICAgICAgaWYgKHZpcnRpb19xdWV1ZV9mdWxsKHN2cS0+dnEpKSB7 Cj4gKyAgICAgICAgICAgICAgICBicmVhazsKCgpTbyB3ZSd2ZSBkaXNhYmxlZCBndWVzdCBub3Rp ZmljYXRpb24uIElmIGJ1ZmZlciBoYXMgYmVlbiBjb25zdW1lZCwgd2UgCm5lZWQgdG8gcmV0cnkg dGhlIGhhbmRsZV9ndWVzdF9raWNrIGhlcmUuIEJ1dCBJIGRpZG4ndCBmaW5kIHRoZSBjb2RlPwoK Cj4gKyAgICAgICAgICAgIH0KPiArCj4gKyAgICAgICAgICAgIGVsZW0gPSB2aXJ0cXVldWVfcG9w KHN2cS0+dnEsIHNpemVvZigqZWxlbSkpOwo+ICsgICAgICAgICAgICBpZiAoIWVsZW0pIHsKPiAr ICAgICAgICAgICAgICAgIGJyZWFrOwo+ICsgICAgICAgICAgICB9Cj4gKwo+ICsgICAgICAgICAg ICB2aG9zdF9zaGFkb3dfdnFfYWRkKHN2cSwgZWxlbSk7Cj4gKyAgICAgICAgICAgIGV2ZW50X25v dGlmaWVyX3NldCgmc3ZxLT5raWNrX25vdGlmaWVyKTsKPiArICAgICAgICB9Cj4gKwo+ICsgICAg ICAgIHZpcnRpb19xdWV1ZV9zZXRfbm90aWZpY2F0aW9uKHN2cS0+dnEsIHRydWUpOwo+ICsgICAg fSB3aGlsZSAoIXZpcnRpb19xdWV1ZV9lbXB0eShzdnEtPnZxKSk7Cj4gK30KPiArCj4gK3N0YXRp YyBib29sIHZob3N0X3NoYWRvd192cV9tb3JlX3VzZWQoVmhvc3RTaGFkb3dWaXJ0cXVldWUgKnN2 cSkKPiArewo+ICsgICAgaWYgKHN2cS0+dXNlZF9pZHggIT0gc3ZxLT5zaGFkb3dfdXNlZF9pZHgp IHsKPiArICAgICAgICByZXR1cm4gdHJ1ZTsKPiArICAgIH0KPiArCj4gKyAgICAvKiBHZXQgdXNl ZCBpZHggbXVzdCBub3QgYmUgcmVvcmRlcmVkICovCj4gKyAgICBzbXBfcm1iKCk7Cj4gKyAgICBz dnEtPnNoYWRvd191c2VkX2lkeCA9IHZpcnRpb190c3dhcDE2KHN2cS0+dmRldiwgc3ZxLT52cmlu Zy51c2VkLT5pZHgpOwo+ICsKPiArICAgIHJldHVybiBzdnEtPnVzZWRfaWR4ICE9IHN2cS0+c2hh ZG93X3VzZWRfaWR4Owo+ICt9Cj4gKwo+ICtzdGF0aWMgVmlydFF1ZXVlRWxlbWVudCAqdmhvc3Rf c2hhZG93X3ZxX2dldF9idWYoVmhvc3RTaGFkb3dWaXJ0cXVldWUgKnN2cSkKPiArewo+ICsgICAg dnJpbmdfZGVzY190ICpkZXNjcyA9IHN2cS0+dnJpbmcuZGVzYzsKPiArICAgIGNvbnN0IHZyaW5n X3VzZWRfdCAqdXNlZCA9IHN2cS0+dnJpbmcudXNlZDsKPiArICAgIHZyaW5nX3VzZWRfZWxlbV90 IHVzZWRfZWxlbTsKPiArICAgIHVpbnQxNl90IGxhc3RfdXNlZDsKPiArCj4gKyAgICBpZiAoIXZo b3N0X3NoYWRvd192cV9tb3JlX3VzZWQoc3ZxKSkgewo+ICsgICAgICAgIHJldHVybiBOVUxMOwo+ ICsgICAgfQo+ICsKPiArICAgIGxhc3RfdXNlZCA9IHN2cS0+dXNlZF9pZHggJiAoc3ZxLT52cmlu Zy5udW0gLSAxKTsKPiArICAgIHVzZWRfZWxlbS5pZCA9IHZpcnRpb190c3dhcDMyKHN2cS0+dmRl diwgdXNlZC0+cmluZ1tsYXN0X3VzZWRdLmlkKTsKPiArICAgIHVzZWRfZWxlbS5sZW4gPSB2aXJ0 aW9fdHN3YXAzMihzdnEtPnZkZXYsIHVzZWQtPnJpbmdbbGFzdF91c2VkXS5sZW4pOwo+ICsKPiAr ICAgIGlmICh1bmxpa2VseSh1c2VkX2VsZW0uaWQgPj0gc3ZxLT52cmluZy5udW0pKSB7Cj4gKyAg ICAgICAgZXJyb3JfcmVwb3J0KCJEZXZpY2UgJXMgc2F5cyBpbmRleCAldSBpcyBhdmFpbGFibGUi LCBzdnEtPnZkZXYtPm5hbWUsCj4gKyAgICAgICAgICAgICAgICAgICAgIHVzZWRfZWxlbS5pZCk7 Cj4gKyAgICAgICAgcmV0dXJuIE5VTEw7Cj4gKyAgICB9Cj4gKwo+ICsgICAgZGVzY3NbdXNlZF9l bGVtLmlkXS5uZXh0ID0gc3ZxLT5mcmVlX2hlYWQ7Cj4gKyAgICBzdnEtPmZyZWVfaGVhZCA9IHVz ZWRfZWxlbS5pZDsKPiArCj4gKyAgICBzdnEtPnVzZWRfaWR4Kys7Cj4gKyAgICBzdnEtPnJpbmdf aWRfbWFwc1t1c2VkX2VsZW0uaWRdLT5sZW4gPSB1c2VkX2VsZW0ubGVuOwo+ICsgICAgcmV0dXJu IGdfc3RlYWxfcG9pbnRlcigmc3ZxLT5yaW5nX2lkX21hcHNbdXNlZF9lbGVtLmlkXSk7Cj4gICB9 Cj4gICAKPiAgIC8qIEZvcndhcmQgdmhvc3Qgbm90aWZpY2F0aW9ucyAqLwo+IEBAIC03OCw2ICsy MjksNyBAQCBzdGF0aWMgdm9pZCB2aG9zdF9zaGFkb3dfdnFfaGFuZGxlX2NhbGxfbm9fdGVzdChF dmVudE5vdGlmaWVyICpuKQo+ICAgICAgIFZob3N0U2hhZG93VmlydHF1ZXVlICpzdnEgPSBjb250 YWluZXJfb2YobiwgVmhvc3RTaGFkb3dWaXJ0cXVldWUsCj4gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjYWxsX25vdGlmaWVyKTsKPiAgICAgICBFdmVudE5v dGlmaWVyICptYXNrZWRfbm90aWZpZXI7Cj4gKyAgICBWaXJ0UXVldWUgKnZxID0gc3ZxLT52cTsK PiAgIAo+ICAgICAgIC8qIFNpZ25hbCBzdGFydCBvZiB1c2luZyBtYXNrZWQgbm90aWZpZXIgKi8K PiAgICAgICBxZW11X2V2ZW50X3Jlc2V0KCZzdnEtPm1hc2tlZF9ub3RpZmllci5pc19mcmVlKTsK PiBAQCAtODYsMTQgKzIzOCwyOSBAQCBzdGF0aWMgdm9pZCB2aG9zdF9zaGFkb3dfdnFfaGFuZGxl X2NhbGxfbm9fdGVzdChFdmVudE5vdGlmaWVyICpuKQo+ICAgICAgICAgICBxZW11X2V2ZW50X3Nl dCgmc3ZxLT5tYXNrZWRfbm90aWZpZXIuaXNfZnJlZSk7Cj4gICAgICAgfQo+ICAgCj4gLSAgICBp ZiAoIW1hc2tlZF9ub3RpZmllcikgewo+IC0gICAgICAgIHVuc2lnbmVkIG4gPSB2aXJ0aW9fZ2V0 X3F1ZXVlX2luZGV4KHN2cS0+dnEpOwo+IC0gICAgICAgIHZpcnRpb19xdWV1ZV9pbnZhbGlkYXRl X3NpZ25hbGxlZF91c2VkKHN2cS0+dmRldiwgbik7Cj4gLSAgICAgICAgdmlydGlvX25vdGlmeV9p cnFmZChzdnEtPnZkZXYsIHN2cS0+dnEpOwo+IC0gICAgfSBlbHNlIGlmICghc3ZxLT5tYXNrZWRf bm90aWZpZXIuc2lnbmFsZWQpIHsKPiAtICAgICAgICBzdnEtPm1hc2tlZF9ub3RpZmllci5zaWdu YWxlZCA9IHRydWU7Cj4gLSAgICAgICAgZXZlbnRfbm90aWZpZXJfc2V0KHN2cS0+bWFza2VkX25v dGlmaWVyLm4pOwo+IC0gICAgfQo+ICsgICAgLyogTWFrZSBhcyBtYW55IGJ1ZmZlcnMgYXMgcG9z c2libGUgdXNlZC4gKi8KPiArICAgIGRvIHsKPiArICAgICAgICB1bnNpZ25lZCBpID0gMDsKPiAr Cj4gKyAgICAgICAgLyogVE9ETzogVXNlIFZSSU5HX0FWQUlMX0ZfTk9fSU5URVJSVVBUICovCj4g KyAgICAgICAgd2hpbGUgKHRydWUpIHsKPiArICAgICAgICAgICAgZ19hdXRvZnJlZSBWaXJ0UXVl dWVFbGVtZW50ICplbGVtID0gdmhvc3Rfc2hhZG93X3ZxX2dldF9idWYoc3ZxKTsKPiArICAgICAg ICAgICAgaWYgKCFlbGVtKSB7Cj4gKyAgICAgICAgICAgICAgICBicmVhazsKPiArICAgICAgICAg ICAgfQo+ICsKPiArICAgICAgICAgICAgYXNzZXJ0KGkgPCBzdnEtPnZyaW5nLm51bSk7Cj4gKyAg ICAgICAgICAgIHZpcnRxdWV1ZV9maWxsKHZxLCBlbGVtLCBlbGVtLT5sZW4sIGkrKyk7Cj4gKyAg ICAgICAgfQo+ICsKPiArICAgICAgICB2aXJ0cXVldWVfZmx1c2godnEsIGkpOwo+ICsgICAgICAg IGlmICghbWFza2VkX25vdGlmaWVyKSB7Cj4gKyAgICAgICAgICAgIHZpcnRpb19ub3RpZnlfaXJx ZmQoc3ZxLT52ZGV2LCBzdnEtPnZxKTsKPiArICAgICAgICB9IGVsc2UgaWYgKCFzdnEtPm1hc2tl ZF9ub3RpZmllci5zaWduYWxlZCkgewo+ICsgICAgICAgICAgICBzdnEtPm1hc2tlZF9ub3RpZmll ci5zaWduYWxlZCA9IHRydWU7Cj4gKyAgICAgICAgICAgIGV2ZW50X25vdGlmaWVyX3NldChzdnEt Pm1hc2tlZF9ub3RpZmllci5uKTsKPiArICAgICAgICB9Cj4gKyAgICB9IHdoaWxlICh2aG9zdF9z aGFkb3dfdnFfbW9yZV91c2VkKHN2cSkpOwo+ICAgCj4gICAgICAgaWYgKG1hc2tlZF9ub3RpZmll cikgewo+ICAgICAgICAgICAvKiBTaWduYWwgbm90IHVzaW5nIGl0IGFueW1vcmUgKi8KPiBAQCAt MTAzLDcgKzI3MCw2IEBAIHN0YXRpYyB2b2lkIHZob3N0X3NoYWRvd192cV9oYW5kbGVfY2FsbF9u b190ZXN0KEV2ZW50Tm90aWZpZXIgKm4pCj4gICAKPiAgIHN0YXRpYyB2b2lkIHZob3N0X3NoYWRv d192cV9oYW5kbGVfY2FsbChFdmVudE5vdGlmaWVyICpuKQo+ICAgewo+IC0KPiAgICAgICBpZiAo bGlrZWx5KGV2ZW50X25vdGlmaWVyX3Rlc3RfYW5kX2NsZWFyKG4pKSkgewo+ICAgICAgICAgICB2 aG9zdF9zaGFkb3dfdnFfaGFuZGxlX2NhbGxfbm9fdGVzdChuKTsKPiAgICAgICB9Cj4gQEAgLTI1 NCw3ICs0MjAsMTEgQEAgdm9pZCB2aG9zdF9zaGFkb3dfdnFfc3RvcChzdHJ1Y3Qgdmhvc3RfZGV2 ICpkZXYsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGlkeCwKPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgVmhvc3RTaGFkb3dWaXJ0cXVldWUgKnN2cSkKPiAgIHsK PiArICAgIGludCBpOwo+ICAgICAgIGludCByID0gdmhvc3Rfc2hhZG93X3ZxX3Jlc3RvcmVfdmRl dl9ob3N0X25vdGlmaWVyKGRldiwgaWR4LCBzdnEpOwo+ICsKPiArICAgIGFzc2VydCghZGV2LT5z aGFkb3dfdnFzX2VuYWJsZWQpOwo+ICsKPiAgICAgICBpZiAodW5saWtlbHkociA8IDApKSB7Cj4g ICAgICAgICAgIGVycm9yX3JlcG9ydCgiQ291bGRuJ3QgcmVzdG9yZSB2cSBraWNrIGZkOiAlcyIs IHN0cmVycm9yKC1yKSk7Cj4gICAgICAgfQo+IEBAIC0yNzIsNiArNDQyLDE4IEBAIHZvaWQgdmhv c3Rfc2hhZG93X3ZxX3N0b3Aoc3RydWN0IHZob3N0X2RldiAqZGV2LAo+ICAgICAgIC8qIFJlc3Rv cmUgdmhvc3QgY2FsbCAqLwo+ICAgICAgIHZob3N0X3ZpcnRxdWV1ZV9tYXNrKGRldiwgZGV2LT52 ZGV2LCBkZXYtPnZxX2luZGV4ICsgaWR4LAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRl di0+dnFzW2lkeF0ubm90aWZpZXJfaXNfbWFza2VkKTsKPiArCj4gKwo+ICsgICAgZm9yIChpID0g MDsgaSA8IHN2cS0+dnJpbmcubnVtOyArK2kpIHsKPiArICAgICAgICBnX2F1dG9mcmVlIFZpcnRR dWV1ZUVsZW1lbnQgKmVsZW0gPSBzdnEtPnJpbmdfaWRfbWFwc1tpXTsKPiArICAgICAgICAvKgo+ ICsgICAgICAgICAqIEFsdGhvdWdoIHRoZSBkb2Mgc2F5cyB3ZSBtdXN0IHVucG9wIGluIG9yZGVy LCBpdCdzIG9rIHRvIHVucG9wCj4gKyAgICAgICAgICogZXZlcnl0aGluZy4KPiArICAgICAgICAg Ki8KPiArICAgICAgICBpZiAoZWxlbSkgewo+ICsgICAgICAgICAgICB2aXJ0cXVldWVfdW5wb3Ao c3ZxLT52cSwgZWxlbSwgZWxlbS0+bGVuKTsKCgpTaG91bGRuJ3Qgd2UgbmVlZCB0byB3YWl0IHVu dGlsIGFsbCBwZW5kaW5nIHJlcXVlc3RzIHRvIGJlIGRyYWluZWQ/IE9yIAp3ZSBtYXkgZW5kIHVw IGR1cGxpY2F0ZWQgcmVxdWVzdHM/CgpUaGFua3MKCgo+ICsgICAgICAgIH0KPiArICAgIH0KPiAg IH0KPiAgIAo+ICAgLyoKPiBAQCAtMjg0LDcgKzQ2Niw3IEBAIFZob3N0U2hhZG93VmlydHF1ZXVl ICp2aG9zdF9zaGFkb3dfdnFfbmV3KHN0cnVjdCB2aG9zdF9kZXYgKmRldiwgaW50IGlkeCkKPiAg ICAgICB1bnNpZ25lZCBudW0gPSB2aXJ0aW9fcXVldWVfZ2V0X251bShkZXYtPnZkZXYsIHZxX2lk eCk7Cj4gICAgICAgc2l6ZV90IHJpbmdfc2l6ZSA9IHZyaW5nX3NpemUobnVtLCBWUklOR19ERVND X0FMSUdOX1NJWkUpOwo+ICAgICAgIGdfYXV0b2ZyZWUgVmhvc3RTaGFkb3dWaXJ0cXVldWUgKnN2 cSA9IGdfbWFsbG9jMChzaXplb2YoKnN2cSkgKyByaW5nX3NpemUpOwo+IC0gICAgaW50IHI7Cj4g KyAgICBpbnQgciwgaTsKPiAgIAo+ICAgICAgIHIgPSBldmVudF9ub3RpZmllcl9pbml0KCZzdnEt PmtpY2tfbm90aWZpZXIsIDApOwo+ICAgICAgIGlmIChyICE9IDApIHsKPiBAQCAtMzAzLDYgKzQ4 NSwxMSBAQCBWaG9zdFNoYWRvd1ZpcnRxdWV1ZSAqdmhvc3Rfc2hhZG93X3ZxX25ldyhzdHJ1Y3Qg dmhvc3RfZGV2ICpkZXYsIGludCBpZHgpCj4gICAgICAgdnJpbmdfaW5pdCgmc3ZxLT52cmluZywg bnVtLCBzdnEtPmRlc2NzLCBWUklOR19ERVNDX0FMSUdOX1NJWkUpOwo+ICAgICAgIHN2cS0+dnEg PSB2aXJ0aW9fZ2V0X3F1ZXVlKGRldi0+dmRldiwgdnFfaWR4KTsKPiAgICAgICBzdnEtPnZkZXYg PSBkZXYtPnZkZXY7Cj4gKyAgICBmb3IgKGkgPSAwOyBpIDwgbnVtIC0gMTsgaSsrKSB7Cj4gKyAg ICAgICAgc3ZxLT5kZXNjc1tpXS5uZXh0ID0gdmlydGlvX3Rzd2FwMTYoZGV2LT52ZGV2LCBpICsg MSk7Cj4gKyAgICB9Cj4gKwo+ICsgICAgc3ZxLT5yaW5nX2lkX21hcHMgPSBnX25ldzAoVmlydFF1 ZXVlRWxlbWVudCAqLCBudW0pOwo+ICAgICAgIGV2ZW50X25vdGlmaWVyX3NldF9oYW5kbGVyKCZz dnEtPmNhbGxfbm90aWZpZXIsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmhv c3Rfc2hhZG93X3ZxX2hhbmRsZV9jYWxsKTsKPiAgICAgICBxZW11X2V2ZW50X2luaXQoJnN2cS0+ bWFza2VkX25vdGlmaWVyLmlzX2ZyZWUsIHRydWUpOwo+IEBAIC0zMjQsNSArNTExLDYgQEAgdm9p ZCB2aG9zdF9zaGFkb3dfdnFfZnJlZShWaG9zdFNoYWRvd1ZpcnRxdWV1ZSAqdnEpCj4gICAgICAg ZXZlbnRfbm90aWZpZXJfY2xlYW51cCgmdnEtPmtpY2tfbm90aWZpZXIpOwo+ICAgICAgIGV2ZW50 X25vdGlmaWVyX3NldF9oYW5kbGVyKCZ2cS0+Y2FsbF9ub3RpZmllciwgTlVMTCk7Cj4gICAgICAg ZXZlbnRfbm90aWZpZXJfY2xlYW51cCgmdnEtPmNhbGxfbm90aWZpZXIpOwo+ICsgICAgZ19mcmVl KHZxLT5yaW5nX2lkX21hcHMpOwo+ICAgICAgIGdfZnJlZSh2cSk7Cj4gICB9Cj4gZGlmZiAtLWdp dCBhL2h3L3ZpcnRpby92aG9zdC5jIGIvaHcvdmlydGlvL3Zob3N0LmMKPiBpbmRleCBlYWIzZTMz NGYyLi5hMzczOTk5YmM0IDEwMDY0NAo+IC0tLSBhL2h3L3ZpcnRpby92aG9zdC5jCj4gKysrIGIv aHcvdmlydGlvL3Zob3N0LmMKPiBAQCAtMTAyMSw2ICsxMDIxLDE5IEBAIGludCB2aG9zdF9kZXZp Y2VfaW90bGJfbWlzcyhzdHJ1Y3Qgdmhvc3RfZGV2ICpkZXYsIHVpbnQ2NF90IGlvdmEsIGludCB3 cml0ZSkKPiAgIAo+ICAgICAgIHRyYWNlX3Zob3N0X2lvdGxiX21pc3MoZGV2LCAxKTsKPiAgIAo+ ICsgICAgaWYgKHFhdG9taWNfbG9hZF9hY3F1aXJlKCZkZXYtPnNoYWRvd192cXNfZW5hYmxlZCkp IHsKPiArICAgICAgICB1YWRkciA9IGlvdmE7Cj4gKyAgICAgICAgbGVuID0gNDA5NjsKPiArICAg ICAgICByZXQgPSB2aG9zdF9iYWNrZW5kX3VwZGF0ZV9kZXZpY2VfaW90bGIoZGV2LCBpb3ZhLCB1 YWRkciwgbGVuLAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBJT01NVV9SVyk7Cj4gKyAgICAgICAgaWYgKHJldCkgewo+ICsgICAgICAgICAgICB0cmFj ZV92aG9zdF9pb3RsYl9taXNzKGRldiwgMik7Cj4gKyAgICAgICAgICAgIGVycm9yX3JlcG9ydCgi RmFpbCB0byB1cGRhdGUgZGV2aWNlIGlvdGxiIik7Cj4gKyAgICAgICAgfQo+ICsKPiArICAgICAg ICByZXR1cm4gcmV0Owo+ICsgICAgfQo+ICsKPiAgICAgICBpb3RsYiA9IGFkZHJlc3Nfc3BhY2Vf Z2V0X2lvdGxiX2VudHJ5KGRldi0+dmRldi0+ZG1hX2FzLAo+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW92YSwgd3JpdGUsCj4gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBNRU1UWEFUVFJTX1VOU1BFQ0lGSUVEKTsKPiBAQCAt MTIyNyw4ICsxMjQwLDI4IEBAIHN0YXRpYyBpbnQgdmhvc3Rfc3dfbGl2ZV9taWdyYXRpb25fc3Rv cChzdHJ1Y3Qgdmhvc3RfZGV2ICpkZXYpCj4gICAgICAgLyogQ2FuIGJlIHJlYWQgYnkgdmhvc3Rf dmlydHF1ZXVlX21hc2ssIGZyb20gdm0gZXhpdCAqLwo+ICAgICAgIHFhdG9taWNfc3RvcmVfcmVs ZWFzZSgmZGV2LT5zaGFkb3dfdnFzX2VuYWJsZWQsIGZhbHNlKTsKPiAgIAo+ICsgICAgZGV2LT52 aG9zdF9vcHMtPnZob3N0X3NldF92cmluZ19lbmFibGUoZGV2LCBmYWxzZSk7Cj4gKyAgICBpZiAo dmhvc3RfYmFja2VuZF9pbnZhbGlkYXRlX2RldmljZV9pb3RsYihkZXYsIDAsIC0xVUxMKSkgewo+ ICsgICAgICAgIGVycm9yX3JlcG9ydCgiRmFpbCB0byBpbnZhbGlkYXRlIGRldmljZSBpb3RsYiIp Owo+ICsgICAgfQo+ICsKPiAgICAgICBmb3IgKGlkeCA9IDA7IGlkeCA8IGRldi0+bnZxczsgKytp ZHgpIHsKPiArICAgICAgICAvKgo+ICsgICAgICAgICAqIFVwZGF0ZSB1c2VkIHJpbmcgaW5mb3Jt YXRpb24gZm9yIElPVExCIHRvIHdvcmsgY29ycmVjdGx5LAo+ICsgICAgICAgICAqIHZob3N0LWtl cm5lbCBjb2RlIHJlcXVpcmVzIGZvciB0aGlzLgo+ICsgICAgICAgICAqLwo+ICsgICAgICAgIHN0 cnVjdCB2aG9zdF92aXJ0cXVldWUgKnZxID0gZGV2LT52cXMgKyBpZHg7Cj4gKyAgICAgICAgdmhv c3RfZGV2aWNlX2lvdGxiX21pc3MoZGV2LCB2cS0+dXNlZF9waHlzLCB0cnVlKTsKPiArCj4gICAg ICAgICAgIHZob3N0X3NoYWRvd192cV9zdG9wKGRldiwgaWR4LCBkZXYtPnNoYWRvd192cXNbaWR4 XSk7Cj4gKyAgICAgICAgdmhvc3RfdmlydHF1ZXVlX3N0YXJ0KGRldiwgZGV2LT52ZGV2LCAmZGV2 LT52cXNbaWR4XSwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGV2LT52cV9pbmRl eCArIGlkeCk7Cj4gKyAgICB9Cj4gKwo+ICsgICAgLyogRW5hYmxlIGd1ZXN0J3MgdnEgdnJpbmcg Ki8KPiArICAgIGRldi0+dmhvc3Rfb3BzLT52aG9zdF9zZXRfdnJpbmdfZW5hYmxlKGRldiwgdHJ1 ZSk7Cj4gKwo+ICsgICAgZm9yIChpZHggPSAwOyBpZHggPCBkZXYtPm52cXM7ICsraWR4KSB7Cj4g ICAgICAgICAgIHZob3N0X3NoYWRvd192cV9mcmVlKGRldi0+c2hhZG93X3Zxc1tpZHhdKTsKPiAg ICAgICB9Cj4gICAKPiBAQCAtMTIzNyw2ICsxMjcwLDU5IEBAIHN0YXRpYyBpbnQgdmhvc3Rfc3df bGl2ZV9taWdyYXRpb25fc3RvcChzdHJ1Y3Qgdmhvc3RfZGV2ICpkZXYpCj4gICAgICAgcmV0dXJu IDA7Cj4gICB9Cj4gICAKPiArLyoKPiArICogU3RhcnQgc2hhZG93IHZpcnRxdWV1ZSBpbiBhIGdp dmVuIHF1ZXVlLgo+ICsgKiBJbiBmYWlsdXJlIGNhc2UsIHRoaXMgZnVuY3Rpb24gbGVhdmVzIHF1 ZXVlIHdvcmtpbmcgYXMgcmVndWxhciB2aG9zdCBtb2RlLgo+ICsgKi8KPiArc3RhdGljIGJvb2wg dmhvc3Rfc3dfbGl2ZV9taWdyYXRpb25fc3RhcnRfdnEoc3RydWN0IHZob3N0X2RldiAqZGV2LAo+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp ZHgpCj4gK3sKPiArICAgIHN0cnVjdCB2aG9zdF92cmluZ19hZGRyIGFkZHIgPSB7Cj4gKyAgICAg ICAgLmluZGV4ID0gaWR4LAo+ICsgICAgfTsKPiArICAgIHN0cnVjdCB2aG9zdF92cmluZ19zdGF0 ZSBzID0gewo+ICsgICAgICAgIC5pbmRleCA9IGlkeCwKPiArICAgIH07Cj4gKyAgICBpbnQgcjsK PiArICAgIGJvb2wgb2s7Cj4gKwo+ICsgICAgdmhvc3RfdmlydHF1ZXVlX3N0b3AoZGV2LCBkZXYt PnZkZXYsICZkZXYtPnZxc1tpZHhdLCBkZXYtPnZxX2luZGV4ICsgaWR4KTsKPiArICAgIG9rID0g dmhvc3Rfc2hhZG93X3ZxX3N0YXJ0KGRldiwgaWR4LCBkZXYtPnNoYWRvd192cXNbaWR4XSk7Cj4g KyAgICBpZiAodW5saWtlbHkoIW9rKSkgewo+ICsgICAgICAgIHJldHVybiBmYWxzZTsKPiArICAg IH0KPiArCj4gKyAgICAvKiBGcm9tIHRoaXMgcG9pbnQsIHZob3N0X3ZpcnRxdWV1ZV9zdGFydCBj YW4gcmVzZXQgdGhlc2UgY2hhbmdlcyAqLwo+ICsgICAgdmhvc3Rfc2hhZG93X3ZxX2dldF92cmlu Z19hZGRyKGRldi0+c2hhZG93X3Zxc1tpZHhdLCAmYWRkcik7Cj4gKyAgICByID0gZGV2LT52aG9z dF9vcHMtPnZob3N0X3NldF92cmluZ19hZGRyKGRldiwgJmFkZHIpOwo+ICsgICAgaWYgKHVubGlr ZWx5KHIgIT0gMCkpIHsKPiArICAgICAgICBWSE9TVF9PUFNfREVCVUcoInZob3N0X3NldF92cmlu Z19hZGRyIGZvciBzaGFkb3cgdnEgZmFpbGVkIik7Cj4gKyAgICAgICAgZ290byBlcnI7Cj4gKyAg ICB9Cj4gKwo+ICsgICAgciA9IGRldi0+dmhvc3Rfb3BzLT52aG9zdF9zZXRfdnJpbmdfYmFzZShk ZXYsICZzKTsKPiArICAgIGlmICh1bmxpa2VseShyICE9IDApKSB7Cj4gKyAgICAgICAgVkhPU1Rf T1BTX0RFQlVHKCJ2aG9zdF9zZXRfdnJpbmdfYmFzZSBmb3Igc2hhZG93IHZxIGZhaWxlZCIpOwo+ ICsgICAgICAgIGdvdG8gZXJyOwo+ICsgICAgfQo+ICsKPiArICAgIC8qCj4gKyAgICAgKiBVcGRh dGUgdXNlZCByaW5nIGluZm9ybWF0aW9uIGZvciBJT1RMQiB0byB3b3JrIGNvcnJlY3RseSwKPiAr ICAgICAqIHZob3N0LWtlcm5lbCBjb2RlIHJlcXVpcmVzIGZvciB0aGlzLgo+ICsgICAgICovCj4g KyAgICByID0gdmhvc3RfZGV2aWNlX2lvdGxiX21pc3MoZGV2LCBhZGRyLnVzZWRfdXNlcl9hZGRy LCB0cnVlKTsKPiArICAgIGlmICh1bmxpa2VseShyICE9IDApKSB7Cj4gKyAgICAgICAgLyogRGVi dWcgbWVzc2FnZSBhbHJlYWR5IHByaW50ZWQgKi8KPiArICAgICAgICBnb3RvIGVycjsKPiArICAg IH0KPiArCj4gKyAgICByZXR1cm4gdHJ1ZTsKPiArCj4gK2VycjoKPiArICAgIHZob3N0X3ZpcnRx dWV1ZV9zdGFydChkZXYsIGRldi0+dmRldiwgJmRldi0+dnFzW2lkeF0sIGRldi0+dnFfaW5kZXgg KyBpZHgpOwo+ICsgICAgcmV0dXJuIGZhbHNlOwo+ICt9Cj4gKwo+ICAgc3RhdGljIGludCB2aG9z dF9zd19saXZlX21pZ3JhdGlvbl9zdGFydChzdHJ1Y3Qgdmhvc3RfZGV2ICpkZXYpCj4gICB7Cj4g ICAgICAgaW50IGlkeCwgc3RvcF9pZHg7Cj4gQEAgLTEyNDksMjQgKzEzMzUsMzUgQEAgc3RhdGlj IGludCB2aG9zdF9zd19saXZlX21pZ3JhdGlvbl9zdGFydChzdHJ1Y3Qgdmhvc3RfZGV2ICpkZXYp Cj4gICAgICAgICAgIH0KPiAgICAgICB9Cj4gICAKPiArICAgIGRldi0+dmhvc3Rfb3BzLT52aG9z dF9zZXRfdnJpbmdfZW5hYmxlKGRldiwgZmFsc2UpOwo+ICsgICAgaWYgKHZob3N0X2JhY2tlbmRf aW52YWxpZGF0ZV9kZXZpY2VfaW90bGIoZGV2LCAwLCAtMVVMTCkpIHsKPiArICAgICAgICBlcnJv cl9yZXBvcnQoIkZhaWwgdG8gaW52YWxpZGF0ZSBkZXZpY2UgaW90bGIiKTsKPiArICAgIH0KPiAr Cj4gICAgICAgLyogQ2FuIGJlIHJlYWQgYnkgdmhvc3RfdmlydHF1ZXVlX21hc2ssIGZyb20gdm0g ZXhpdCAqLwo+ICAgICAgIHFhdG9taWNfc3RvcmVfcmVsZWFzZSgmZGV2LT5zaGFkb3dfdnFzX2Vu YWJsZWQsIHRydWUpOwo+ICAgICAgIGZvciAoaWR4ID0gMDsgaWR4IDwgZGV2LT5udnFzOyArK2lk eCkgewo+IC0gICAgICAgIGJvb2wgb2sgPSB2aG9zdF9zaGFkb3dfdnFfc3RhcnQoZGV2LCBpZHgs IGRldi0+c2hhZG93X3Zxc1tpZHhdKTsKPiArICAgICAgICBib29sIG9rID0gdmhvc3Rfc3dfbGl2 ZV9taWdyYXRpb25fc3RhcnRfdnEoZGV2LCBpZHgpOwo+ICAgICAgICAgICBpZiAodW5saWtlbHko IW9rKSkgewo+ICAgICAgICAgICAgICAgZ290byBlcnJfc3RhcnQ7Cj4gICAgICAgICAgIH0KPiAg ICAgICB9Cj4gICAKPiArICAgIC8qIEVuYWJsZSBzaGFkb3cgdnEgdnJpbmcgKi8KPiArICAgIGRl di0+dmhvc3Rfb3BzLT52aG9zdF9zZXRfdnJpbmdfZW5hYmxlKGRldiwgdHJ1ZSk7Cj4gICAgICAg cmV0dXJuIDA7Cj4gICAKPiAgIGVycl9zdGFydDoKPiAgICAgICBxYXRvbWljX3N0b3JlX3JlbGVh c2UoJmRldi0+c2hhZG93X3Zxc19lbmFibGVkLCBmYWxzZSk7Cj4gICAgICAgZm9yIChzdG9wX2lk eCA9IDA7IHN0b3BfaWR4IDwgaWR4OyBzdG9wX2lkeCsrKSB7Cj4gICAgICAgICAgIHZob3N0X3No YWRvd192cV9zdG9wKGRldiwgaWR4LCBkZXYtPnNoYWRvd192cXNbc3RvcF9pZHhdKTsKPiArICAg ICAgICB2aG9zdF92aXJ0cXVldWVfc3RhcnQoZGV2LCBkZXYtPnZkZXYsICZkZXYtPnZxc1tpZHhd LAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXYtPnZxX2luZGV4ICsgc3RvcF9p ZHgpOwo+ICAgICAgIH0KPiAgIAo+ICAgZXJyX25ldzoKPiArICAgIC8qIEVuYWJsZSBndWVzdCdz IHZyaW5nICovCj4gKyAgICBkZXYtPnZob3N0X29wcy0+dmhvc3Rfc2V0X3ZyaW5nX2VuYWJsZShk ZXYsIHRydWUpOwo+ICAgICAgIGZvciAoaWR4ID0gMDsgaWR4IDwgZGV2LT5udnFzOyArK2lkeCkg ewo+ICAgICAgICAgICB2aG9zdF9zaGFkb3dfdnFfZnJlZShkZXYtPnNoYWRvd192cXNbaWR4XSk7 Cj4gICAgICAgfQo+IEBAIC0xOTcwLDYgKzIwNjcsMjAgQEAgdm9pZCBxbXBfeF92aG9zdF9lbmFi bGVfc2hhZG93X3ZxKGNvbnN0IGNoYXIgKm5hbWUsIGJvb2wgZW5hYmxlLCBFcnJvciAqKmVycnAp Cj4gICAKPiAgICAgICAgICAgaWYgKCFoZGV2LT5zdGFydGVkKSB7Cj4gICAgICAgICAgICAgICBl cnJfY2F1c2UgPSAiRGV2aWNlIGlzIG5vdCBzdGFydGVkIjsKPiArICAgICAgICB9IGVsc2UgaWYg KCF2aG9zdF9kZXZfaGFzX2lvbW11KGhkZXYpKSB7Cj4gKyAgICAgICAgICAgIGVycl9jYXVzZSA9 ICJEb2VzIG5vdCBzdXBwb3J0IGlvbW11IjsKPiArICAgICAgICB9IGVsc2UgaWYgKGhkZXYtPmFj a2VkX2ZlYXR1cmVzICYgQklUX1VMTChWSVJUSU9fRl9SSU5HX1BBQ0tFRCkpIHsKPiArICAgICAg ICAgICAgZXJyX2NhdXNlID0gIklzIHBhY2tlZCI7Cj4gKyAgICAgICAgfSBlbHNlIGlmIChoZGV2 LT5hY2tlZF9mZWF0dXJlcyAmIEJJVF9VTEwoVklSVElPX1JJTkdfRl9FVkVOVF9JRFgpKSB7Cj4g KyAgICAgICAgICAgIGVycl9jYXVzZSA9ICJIYXZlIGV2ZW50IGlkeCI7Cj4gKyAgICAgICAgfSBl bHNlIGlmIChoZGV2LT5hY2tlZF9mZWF0dXJlcyAmCj4gKyAgICAgICAgICAgICAgICAgICBCSVRf VUxMKFZJUlRJT19SSU5HX0ZfSU5ESVJFQ1RfREVTQykpIHsKPiArICAgICAgICAgICAgZXJyX2Nh dXNlID0gIlN1cHBvcnRzIGluZGlyZWN0IGRlc2NyaXB0b3JzIjsKPiArICAgICAgICB9IGVsc2Ug aWYgKCFoZGV2LT52aG9zdF9vcHMtPnZob3N0X3NldF92cmluZ19lbmFibGUpIHsKPiArICAgICAg ICAgICAgZXJyX2NhdXNlID0gIkNhbm5vdCBwYXVzZSBkZXZpY2UiOwo+ICsgICAgICAgIH0KPiAr Cj4gKyAgICAgICAgaWYgKGVycl9jYXVzZSkgewo+ICAgICAgICAgICAgICAgZ290byBlcnI7Cj4g ICAgICAgICAgIH0KPiAgIAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZpcnR1YWxpemF0aW9uQGxpc3Rz LmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9t YWlsbWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u