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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66BC2C6FD1F for ; Thu, 23 Mar 2023 03:37:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbjCWDh2 (ORCPT ); Wed, 22 Mar 2023 23:37:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbjCWDh0 (ORCPT ); Wed, 22 Mar 2023 23:37:26 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A65C1737 for ; Wed, 22 Mar 2023 20:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679542605; 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=DYWL/gT2cHjHsxDtXChuzSZbhQ4WI0HpSX8QiGBjdWk=; b=PVgvFC/Wrts0F9ixTo8pDz/sW8kwLmyL6K5QdasLtdB5cKt1zOgDTAlnVO3XvQMTXAtwjc gkSMhAQgHre++FQI6jocLglJb3TEw9Br4MO46Xd8NMm7Vg63MLdtq7yJY9dr1R08o7f3hI iKUgQHACYC1coKBkTfYf1TBX432Pnfc= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-C6a44IhgN0We2OQaequxXw-1; Wed, 22 Mar 2023 23:36:41 -0400 X-MC-Unique: C6a44IhgN0We2OQaequxXw-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-176249fbc56so10756804fac.6 for ; Wed, 22 Mar 2023 20:36:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679542600; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DYWL/gT2cHjHsxDtXChuzSZbhQ4WI0HpSX8QiGBjdWk=; b=DRW7fsxhpUIkOXuGYKVFiv00FykZMSTphBfQ8C+HWcb32A9QcnXbwzTTpA7E5Nf+sJ 4pTxmAAdtWIx5EsHpibliryf6NMJLpTXDGLfW+fak5wnMg+PeWqajcxGjRq/I/pMeyZ+ 2p8q0Z33h9LORXu4vcUEPOhscGFNynSNS7LbXeVHp/v6J0StJbgTpS2Lg72xiUpuaIrg w0eH7S/cteaDN0MmJeyo4VZlGgrXGaAvHeg21cBNegTl3UihygwlBl5DKJDHzzrhRwJB pCTN0CoN/wFj+KZL0ckIr1fp4cLwES1wzDrOGhb6SIgDXkuEdyLzJhfITvKh/mYq1HZ+ mqiw== X-Gm-Message-State: AAQBX9dfmVX1IM6v5uVU9IGGf/9mbp/EKkcumjI0NS8tDxViJhw0IVK8 pcsBSndaeZCOn/FA4G4gav00zN5SWCTKw2EE2UKBVYRCbSJdDSK7XltSTEfCCRwH+Y/dkmGMlBy 5LoRrntKdr7Mrx4EywlDD7Ps/HNXkuHOFLUWkz0nK X-Received: by 2002:a05:6871:6c97:b0:17e:7674:8df0 with SMTP id zj23-20020a0568716c9700b0017e76748df0mr651029oab.9.1679542600547; Wed, 22 Mar 2023 20:36:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9aTQ5oDLn0xB1QcdTM8TBhuwxleMPdT5m0AWpwVQHYGY0hcMC2Ce9UPuXDZHCAuSVkI4e12QEot/hncqsMqGU= X-Received: by 2002:a05:6871:6c97:b0:17e:7674:8df0 with SMTP id zj23-20020a0568716c9700b0017e76748df0mr651023oab.9.1679542600062; Wed, 22 Mar 2023 20:36:40 -0700 (PDT) MIME-Version: 1.0 References: <20230321154228.182769-1-sgarzare@redhat.com> <20230321154228.182769-5-sgarzare@redhat.com> In-Reply-To: <20230321154228.182769-5-sgarzare@redhat.com> From: Jason Wang Date: Thu, 23 Mar 2023 11:36:28 +0800 Message-ID: Subject: Re: [PATCH v3 4/8] vringh: support VA with iotlb To: Stefano Garzarella Cc: virtualization@lists.linux-foundation.org, stefanha@redhat.com, "Michael S. Tsirkin" , Andrey Zhadchenko , eperezma@redhat.com, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 21, 2023 at 11:43=E2=80=AFPM Stefano Garzarella wrote: > > vDPA supports the possibility to use user VA in the iotlb messages. > So, let's add support for user VA in vringh to use it in the vDPA > simulators. > > Signed-off-by: Stefano Garzarella > --- > > Notes: > v3: > - refactored avoiding code duplication [Eugenio] > v2: > - replace kmap_atomic() with kmap_local_page() [see previous patch] > - fix cast warnings when build with W=3D1 C=3D1 > > include/linux/vringh.h | 5 +- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- > drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +- > drivers/vhost/vringh.c | 153 +++++++++++++++++++++++------- > 4 files changed, 127 insertions(+), 37 deletions(-) > > diff --git a/include/linux/vringh.h b/include/linux/vringh.h > index 1991a02c6431..d39b9f2dcba0 100644 > --- a/include/linux/vringh.h > +++ b/include/linux/vringh.h > @@ -32,6 +32,9 @@ struct vringh { > /* Can we get away with weak barriers? */ > bool weak_barriers; > > + /* Use user's VA */ > + bool use_va; > + > /* Last available index we saw (ie. where we're up to). */ > u16 last_avail_idx; > > @@ -279,7 +282,7 @@ void vringh_set_iotlb(struct vringh *vrh, struct vhos= t_iotlb *iotlb, > spinlock_t *iotlb_lock); > > int vringh_init_iotlb(struct vringh *vrh, u64 features, > - unsigned int num, bool weak_barriers, > + unsigned int num, bool weak_barriers, bool use_va, > struct vring_desc *desc, > struct vring_avail *avail, > struct vring_used *used); > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/ml= x5_vnet.c > index 520646ae7fa0..dfd0e000217b 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -2537,7 +2537,7 @@ static int setup_cvq_vring(struct mlx5_vdpa_dev *mv= dev) > > if (mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ)) > err =3D vringh_init_iotlb(&cvq->vring, mvdev->actual_feat= ures, > - MLX5_CVQ_MAX_ENT, false, > + MLX5_CVQ_MAX_ENT, false, false, To avoid those changes, would it be better to introduce vringh_init_iotlb_va() so vringh_init_iotlb() can stick to pa. > (struct vring_desc *)(uintptr_t)c= vq->desc_addr, > (struct vring_avail *)(uintptr_t)= cvq->driver_addr, > (struct vring_used *)(uintptr_t)c= vq->device_addr); > diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdp= a_sim.c > index eea23c630f7c..47cdf2a1f5b8 100644 > --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c > +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c > @@ -60,7 +60,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim= , unsigned int idx) > struct vdpasim_virtqueue *vq =3D &vdpasim->vqs[idx]; > uint16_t last_avail_idx =3D vq->vring.last_avail_idx; > > - vringh_init_iotlb(&vq->vring, vdpasim->features, vq->num, true, > + vringh_init_iotlb(&vq->vring, vdpasim->features, vq->num, true, f= alse, > (struct vring_desc *)(uintptr_t)vq->desc_addr, > (struct vring_avail *) > (uintptr_t)vq->driver_addr, > @@ -92,7 +92,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim, > vq->cb =3D NULL; > vq->private =3D NULL; > vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_feature= s, > - VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL); > + VDPASIM_QUEUE_MAX, false, false, NULL, NULL, NU= LL); > > vq->vring.notify =3D NULL; > } > diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c > index 0ba3ef809e48..72c88519329a 100644 > --- a/drivers/vhost/vringh.c > +++ b/drivers/vhost/vringh.c > @@ -1094,10 +1094,18 @@ EXPORT_SYMBOL(vringh_need_notify_kern); > > #if IS_REACHABLE(CONFIG_VHOST_IOTLB) > > +struct iotlb_vec { > + union { > + struct iovec *iovec; > + struct bio_vec *bvec; > + } iov; > + size_t count; > + bool is_iovec; I wonder if this is needed (if vringh is passed to every iotlb_vec helper). > +}; > + > static int iotlb_translate(const struct vringh *vrh, > u64 addr, u64 len, u64 *translated, > - struct bio_vec iov[], > - int iov_size, u32 perm) > + struct iotlb_vec *ivec, u32 perm) > { > struct vhost_iotlb_map *map; > struct vhost_iotlb *iotlb =3D vrh->iotlb; > @@ -1107,9 +1115,9 @@ static int iotlb_translate(const struct vringh *vrh= , > spin_lock(vrh->iotlb_lock); > > while (len > s) { > - u64 size, pa, pfn; > + u64 size; > > - if (unlikely(ret >=3D iov_size)) { > + if (unlikely(ret >=3D ivec->count)) { > ret =3D -ENOBUFS; > break; > } > @@ -1124,10 +1132,22 @@ static int iotlb_translate(const struct vringh *v= rh, > } > > size =3D map->size - addr + map->start; > - pa =3D map->addr + addr - map->start; > - pfn =3D pa >> PAGE_SHIFT; > - bvec_set_page(&iov[ret], pfn_to_page(pfn), min(len - s, s= ize), > - pa & (PAGE_SIZE - 1)); > + if (ivec->is_iovec) { > + struct iovec *iovec =3D ivec->iov.iovec; > + > + iovec[ret].iov_len =3D min(len - s, size); > + iovec[ret].iov_base =3D (void __user *)(unsigned = long) > + (map->addr + addr - map->st= art); map->addr - map->start to avoid overflow? > + } else { > + u64 pa =3D map->addr + addr - map->start; > + u64 pfn =3D pa >> PAGE_SHIFT; > + struct bio_vec *bvec =3D ivec->iov.bvec; > + > + bvec_set_page(&bvec[ret], pfn_to_page(pfn), > + min(len - s, size), > + pa & (PAGE_SIZE - 1)); > + } > + > s +=3D size; > addr +=3D size; > ++ret; > @@ -1141,26 +1161,42 @@ static int iotlb_translate(const struct vringh *v= rh, > return ret; > } > > +#define IOTLB_IOV_SIZE 16 > + > static inline int copy_from_iotlb(const struct vringh *vrh, void *dst, > void *src, size_t len) > { > + struct iotlb_vec ivec; > + union { > + struct iovec iovec[IOTLB_IOV_SIZE]; > + struct bio_vec bvec[IOTLB_IOV_SIZE]; > + } iov; > u64 total_translated =3D 0; > > + ivec.iov.iovec =3D iov.iovec; ivc.iov =3D iov ? Others look good. Thanks > + ivec.count =3D IOTLB_IOV_SIZE; > + ivec.is_iovec =3D vrh->use_va; > + > while (total_translated < len) { > - struct bio_vec iov[16]; > struct iov_iter iter; > u64 translated; > int ret; > > ret =3D iotlb_translate(vrh, (u64)(uintptr_t)src, > len - total_translated, &translated= , > - iov, ARRAY_SIZE(iov), VHOST_MAP_RO)= ; > + &ivec, VHOST_MAP_RO); > if (ret =3D=3D -ENOBUFS) > - ret =3D ARRAY_SIZE(iov); > + ret =3D IOTLB_IOV_SIZE; > else if (ret < 0) > return ret; > > - iov_iter_bvec(&iter, ITER_SOURCE, iov, ret, translated); > + if (ivec.is_iovec) { > + iov_iter_init(&iter, ITER_SOURCE, ivec.iov.iovec,= ret, > + translated); > + } else { > + iov_iter_bvec(&iter, ITER_SOURCE, ivec.iov.bvec, = ret, > + translated); > + } > > ret =3D copy_from_iter(dst, translated, &iter); > if (ret < 0) > @@ -1177,23 +1213,37 @@ static inline int copy_from_iotlb(const struct vr= ingh *vrh, void *dst, > static inline int copy_to_iotlb(const struct vringh *vrh, void *dst, > void *src, size_t len) > { > + struct iotlb_vec ivec; > + union { > + struct iovec iovec[IOTLB_IOV_SIZE]; > + struct bio_vec bvec[IOTLB_IOV_SIZE]; > + } iov; > u64 total_translated =3D 0; > > + ivec.iov.iovec =3D iov.iovec; > + ivec.count =3D IOTLB_IOV_SIZE; > + ivec.is_iovec =3D vrh->use_va; > + > while (total_translated < len) { > - struct bio_vec iov[16]; > struct iov_iter iter; > u64 translated; > int ret; > > ret =3D iotlb_translate(vrh, (u64)(uintptr_t)dst, > len - total_translated, &translated= , > - iov, ARRAY_SIZE(iov), VHOST_MAP_WO)= ; > + &ivec, VHOST_MAP_WO); > if (ret =3D=3D -ENOBUFS) > - ret =3D ARRAY_SIZE(iov); > + ret =3D IOTLB_IOV_SIZE; > else if (ret < 0) > return ret; > > - iov_iter_bvec(&iter, ITER_DEST, iov, ret, translated); > + if (ivec.is_iovec) { > + iov_iter_init(&iter, ITER_DEST, ivec.iov.iovec, r= et, > + translated); > + } else { > + iov_iter_bvec(&iter, ITER_DEST, ivec.iov.bvec, re= t, > + translated); > + } > > ret =3D copy_to_iter(src, translated, &iter); > if (ret < 0) > @@ -1210,20 +1260,37 @@ static inline int copy_to_iotlb(const struct vrin= gh *vrh, void *dst, > static inline int getu16_iotlb(const struct vringh *vrh, > u16 *val, const __virtio16 *p) > { > - struct bio_vec iov; > - void *kaddr, *from; > + struct iotlb_vec ivec; > + union { > + struct iovec iovec[1]; > + struct bio_vec bvec[1]; > + } iov; > + __virtio16 tmp; > int ret; > > + ivec.iov.iovec =3D iov.iovec; > + ivec.count =3D 1; > + ivec.is_iovec =3D vrh->use_va; > + > /* Atomic read is needed for getu16 */ > - ret =3D iotlb_translate(vrh, (u64)(uintptr_t)p, sizeof(*p), NULL, > - &iov, 1, VHOST_MAP_RO); > + ret =3D iotlb_translate(vrh, (u64)(uintptr_t)p, sizeof(*p), > + NULL, &ivec, VHOST_MAP_RO); > if (ret < 0) > return ret; > > - kaddr =3D kmap_local_page(iov.bv_page); > - from =3D kaddr + iov.bv_offset; > - *val =3D vringh16_to_cpu(vrh, READ_ONCE(*(__virtio16 *)from)); > - kunmap_local(kaddr); > + if (ivec.is_iovec) { > + ret =3D __get_user(tmp, (__virtio16 __user *)ivec.iov.iov= ec[0].iov_base); > + if (ret) > + return ret; > + } else { > + void *kaddr =3D kmap_local_page(ivec.iov.bvec[0].bv_page)= ; > + void *from =3D kaddr + ivec.iov.bvec[0].bv_offset; > + > + tmp =3D READ_ONCE(*(__virtio16 *)from); > + kunmap_local(kaddr); > + } > + > + *val =3D vringh16_to_cpu(vrh, tmp); > > return 0; > } > @@ -1231,20 +1298,37 @@ static inline int getu16_iotlb(const struct vring= h *vrh, > static inline int putu16_iotlb(const struct vringh *vrh, > __virtio16 *p, u16 val) > { > - struct bio_vec iov; > - void *kaddr, *to; > + struct iotlb_vec ivec; > + union { > + struct iovec iovec; > + struct bio_vec bvec; > + } iov; > + __virtio16 tmp; > int ret; > > + ivec.iov.iovec =3D &iov.iovec; > + ivec.count =3D 1; > + ivec.is_iovec =3D vrh->use_va; > + > /* Atomic write is needed for putu16 */ > - ret =3D iotlb_translate(vrh, (u64)(uintptr_t)p, sizeof(*p), NULL, > - &iov, 1, VHOST_MAP_WO); > + ret =3D iotlb_translate(vrh, (u64)(uintptr_t)p, sizeof(*p), > + NULL, &ivec, VHOST_MAP_RO); > if (ret < 0) > return ret; > > - kaddr =3D kmap_local_page(iov.bv_page); > - to =3D kaddr + iov.bv_offset; > - WRITE_ONCE(*(__virtio16 *)to, cpu_to_vringh16(vrh, val)); > - kunmap_local(kaddr); > + tmp =3D cpu_to_vringh16(vrh, val); > + > + if (ivec.is_iovec) { > + ret =3D __put_user(tmp, (__virtio16 __user *)ivec.iov.iov= ec[0].iov_base); > + if (ret) > + return ret; > + } else { > + void *kaddr =3D kmap_local_page(ivec.iov.bvec[0].bv_page)= ; > + void *to =3D kaddr + ivec.iov.bvec[0].bv_offset; > + > + WRITE_ONCE(*(__virtio16 *)to, tmp); > + kunmap_local(kaddr); > + } > > return 0; > } > @@ -1306,6 +1390,7 @@ static inline int putused_iotlb(const struct vringh= *vrh, > * @features: the feature bits for this ring. > * @num: the number of elements. > * @weak_barriers: true if we only need memory barriers, not I/O. > + * @use_va: true if IOTLB contains user VA > * @desc: the userpace descriptor pointer. > * @avail: the userpace avail pointer. > * @used: the userpace used pointer. > @@ -1313,11 +1398,13 @@ static inline int putused_iotlb(const struct vrin= gh *vrh, > * Returns an error if num is invalid. > */ > int vringh_init_iotlb(struct vringh *vrh, u64 features, > - unsigned int num, bool weak_barriers, > + unsigned int num, bool weak_barriers, bool use_va, > struct vring_desc *desc, > struct vring_avail *avail, > struct vring_used *used) > { > + vrh->use_va =3D use_va; > + > return vringh_init_kern(vrh, features, num, weak_barriers, > desc, avail, used); > } > -- > 2.39.2 > 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 498F3C6FD1C for ; Thu, 23 Mar 2023 03:36:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C9D2440C39; Thu, 23 Mar 2023 03:36:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C9D2440C39 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aDo8t37I 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 VodAZFlEuEI1; Thu, 23 Mar 2023 03:36:50 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id EB9E040612; Thu, 23 Mar 2023 03:36:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EB9E040612 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CC9FBC0035; Thu, 23 Mar 2023 03:36:49 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8A13CC0032 for ; Thu, 23 Mar 2023 03:36:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 50AB76143B for ; Thu, 23 Mar 2023 03:36:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 50AB76143B Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aDo8t37I X-Virus-Scanned: amavisd-new at osuosl.org 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 85rZFUnvIO56 for ; Thu, 23 Mar 2023 03:36:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8F07B60E1B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 8F07B60E1B for ; Thu, 23 Mar 2023 03:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679542603; 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=DYWL/gT2cHjHsxDtXChuzSZbhQ4WI0HpSX8QiGBjdWk=; b=aDo8t37I5aTw/9aQhMu6+i7CCnErMmYyVTF0XUcQa2xrIQ+VHYKA+72V9HBCOVAK9lFSfx ZDy6oQ8i9SttJUTWiOpb1KY6Co5vTWqIznDB7QxBYMbUfZ2KKTkr08OQRnrcgI9o903FwK 4o1UoYtC9ZnkrPbnWfTyWPTO854cweI= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-I2NYJW8sOPGaf6lN8xBQdw-1; Wed, 22 Mar 2023 23:36:42 -0400 X-MC-Unique: I2NYJW8sOPGaf6lN8xBQdw-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-17270774b8fso10821698fac.3 for ; Wed, 22 Mar 2023 20:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679542600; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DYWL/gT2cHjHsxDtXChuzSZbhQ4WI0HpSX8QiGBjdWk=; b=JfzjcyRtdhKE0sEL/Ry7FQm3ELpTseWenRPV03A2XfqbI93QpYhbvGNhOZkFEEsDou ZQ9+pjEPH4+4nncAf6DXl8JfX9ja8CzGvQw5Zvxg9cdAg2/6KhqiaGFbKGRKX0+rGK4a Gdm8XddMh/A8DLr/CjQ9MkptJbw7du5NI9MmN4+TO+onSkpTILA1gSBCYKny8RfWd7d7 L6hbgsVahJv+b6tpJBON2iVuOO5h/nbIXuUJXCgvJWwfTOmZgUm7tceYpKYd5+7VqU22 OxLcIZmbL3OBkWaWUjcxwQgJjro9e5CP32wmgEDIB7k9m9r51+7NDFmA7Tds5xipMfWE eClA== X-Gm-Message-State: AAQBX9eTCCvj4KRfQz17z2r3msr+VauWkv45KksI1g0GZhapT97GEpTd tlMBXDD1VdTSEgjw0X+XyePsDOYlyQ+uhivs6yFrraUUkLcQ/93dGphGZmMhLolA0Fq6CTc5VIe NJzajCqJwN0Swv/TyTy/JIjfh3NuchBTvms660BIlGIvPG0a7WXKwIxwl1A== X-Received: by 2002:a05:6871:6c97:b0:17e:7674:8df0 with SMTP id zj23-20020a0568716c9700b0017e76748df0mr651034oab.9.1679542600548; Wed, 22 Mar 2023 20:36:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9aTQ5oDLn0xB1QcdTM8TBhuwxleMPdT5m0AWpwVQHYGY0hcMC2Ce9UPuXDZHCAuSVkI4e12QEot/hncqsMqGU= X-Received: by 2002:a05:6871:6c97:b0:17e:7674:8df0 with SMTP id zj23-20020a0568716c9700b0017e76748df0mr651023oab.9.1679542600062; Wed, 22 Mar 2023 20:36:40 -0700 (PDT) MIME-Version: 1.0 References: <20230321154228.182769-1-sgarzare@redhat.com> <20230321154228.182769-5-sgarzare@redhat.com> In-Reply-To: <20230321154228.182769-5-sgarzare@redhat.com> From: Jason Wang Date: Thu, 23 Mar 2023 11:36:28 +0800 Message-ID: Subject: Re: [PATCH v3 4/8] vringh: support VA with iotlb To: Stefano Garzarella X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Andrey Zhadchenko , kvm@vger.kernel.org, "Michael S. Tsirkin" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, eperezma@redhat.com, stefanha@redhat.com 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" T24gVHVlLCBNYXIgMjEsIDIwMjMgYXQgMTE6NDPigK9QTSBTdGVmYW5vIEdhcnphcmVsbGEgPHNn YXJ6YXJlQHJlZGhhdC5jb20+IHdyb3RlOgo+Cj4gdkRQQSBzdXBwb3J0cyB0aGUgcG9zc2liaWxp dHkgdG8gdXNlIHVzZXIgVkEgaW4gdGhlIGlvdGxiIG1lc3NhZ2VzLgo+IFNvLCBsZXQncyBhZGQg c3VwcG9ydCBmb3IgdXNlciBWQSBpbiB2cmluZ2ggdG8gdXNlIGl0IGluIHRoZSB2RFBBCj4gc2lt dWxhdG9ycy4KPgo+IFNpZ25lZC1vZmYtYnk6IFN0ZWZhbm8gR2FyemFyZWxsYSA8c2dhcnphcmVA cmVkaGF0LmNvbT4KPiAtLS0KPgo+IE5vdGVzOgo+ICAgICB2MzoKPiAgICAgLSByZWZhY3RvcmVk IGF2b2lkaW5nIGNvZGUgZHVwbGljYXRpb24gW0V1Z2VuaW9dCj4gICAgIHYyOgo+ICAgICAtIHJl cGxhY2Uga21hcF9hdG9taWMoKSB3aXRoIGttYXBfbG9jYWxfcGFnZSgpIFtzZWUgcHJldmlvdXMg cGF0Y2hdCj4gICAgIC0gZml4IGNhc3Qgd2FybmluZ3Mgd2hlbiBidWlsZCB3aXRoIFc9MSBDPTEK Pgo+ICBpbmNsdWRlL2xpbnV4L3ZyaW5naC5oICAgICAgICAgICAgfCAgIDUgKy0KPiAgZHJpdmVy cy92ZHBhL21seDUvbmV0L21seDVfdm5ldC5jIHwgICAyICstCj4gIGRyaXZlcnMvdmRwYS92ZHBh X3NpbS92ZHBhX3NpbS5jICB8ICAgNCArLQo+ICBkcml2ZXJzL3Zob3N0L3ZyaW5naC5jICAgICAg ICAgICAgfCAxNTMgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCj4gIDQgZmlsZXMgY2hh bmdlZCwgMTI3IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBh L2luY2x1ZGUvbGludXgvdnJpbmdoLmggYi9pbmNsdWRlL2xpbnV4L3ZyaW5naC5oCj4gaW5kZXgg MTk5MWEwMmM2NDMxLi5kMzliOWYyZGNiYTAgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9saW51eC92 cmluZ2guaAo+ICsrKyBiL2luY2x1ZGUvbGludXgvdnJpbmdoLmgKPiBAQCAtMzIsNiArMzIsOSBA QCBzdHJ1Y3QgdnJpbmdoIHsKPiAgICAgICAgIC8qIENhbiB3ZSBnZXQgYXdheSB3aXRoIHdlYWsg YmFycmllcnM/ICovCj4gICAgICAgICBib29sIHdlYWtfYmFycmllcnM7Cj4KPiArICAgICAgIC8q IFVzZSB1c2VyJ3MgVkEgKi8KPiArICAgICAgIGJvb2wgdXNlX3ZhOwo+ICsKPiAgICAgICAgIC8q IExhc3QgYXZhaWxhYmxlIGluZGV4IHdlIHNhdyAoaWUuIHdoZXJlIHdlJ3JlIHVwIHRvKS4gKi8K PiAgICAgICAgIHUxNiBsYXN0X2F2YWlsX2lkeDsKPgo+IEBAIC0yNzksNyArMjgyLDcgQEAgdm9p ZCB2cmluZ2hfc2V0X2lvdGxiKHN0cnVjdCB2cmluZ2ggKnZyaCwgc3RydWN0IHZob3N0X2lvdGxi ICppb3RsYiwKPiAgICAgICAgICAgICAgICAgICAgICAgc3BpbmxvY2tfdCAqaW90bGJfbG9jayk7 Cj4KPiAgaW50IHZyaW5naF9pbml0X2lvdGxiKHN0cnVjdCB2cmluZ2ggKnZyaCwgdTY0IGZlYXR1 cmVzLAo+IC0gICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbnVtLCBib29sIHdlYWtf YmFycmllcnMsCj4gKyAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBudW0sIGJvb2wg d2Vha19iYXJyaWVycywgYm9vbCB1c2VfdmEsCj4gICAgICAgICAgICAgICAgICAgICAgIHN0cnVj dCB2cmluZ19kZXNjICpkZXNjLAo+ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgdnJpbmdf YXZhaWwgKmF2YWlsLAo+ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgdnJpbmdfdXNlZCAq dXNlZCk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmRwYS9tbHg1L25ldC9tbHg1X3ZuZXQuYyBi L2RyaXZlcnMvdmRwYS9tbHg1L25ldC9tbHg1X3ZuZXQuYwo+IGluZGV4IDUyMDY0NmFlN2ZhMC4u ZGZkMGUwMDAyMTdiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmRwYS9tbHg1L25ldC9tbHg1X3Zu ZXQuYwo+ICsrKyBiL2RyaXZlcnMvdmRwYS9tbHg1L25ldC9tbHg1X3ZuZXQuYwo+IEBAIC0yNTM3 LDcgKzI1MzcsNyBAQCBzdGF0aWMgaW50IHNldHVwX2N2cV92cmluZyhzdHJ1Y3QgbWx4NV92ZHBh X2RldiAqbXZkZXYpCj4KPiAgICAgICAgIGlmIChtdmRldi0+YWN0dWFsX2ZlYXR1cmVzICYgQklU X1VMTChWSVJUSU9fTkVUX0ZfQ1RSTF9WUSkpCj4gICAgICAgICAgICAgICAgIGVyciA9IHZyaW5n aF9pbml0X2lvdGxiKCZjdnEtPnZyaW5nLCBtdmRldi0+YWN0dWFsX2ZlYXR1cmVzLAo+IC0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNTFg1X0NWUV9NQVhfRU5ULCBmYWxz ZSwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUxYNV9DVlFfTUFY X0VOVCwgZmFsc2UsIGZhbHNlLAoKVG8gYXZvaWQgdGhvc2UgY2hhbmdlcywgd291bGQgaXQgYmUg YmV0dGVyIHRvIGludHJvZHVjZQp2cmluZ2hfaW5pdF9pb3RsYl92YSgpIHNvIHZyaW5naF9pbml0 X2lvdGxiKCkgY2FuIHN0aWNrIHRvIHBhLgoKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKHN0cnVjdCB2cmluZ19kZXNjICopKHVpbnRwdHJfdCljdnEtPmRlc2NfYWRk ciwKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cnVjdCB2cmlu Z19hdmFpbCAqKSh1aW50cHRyX3QpY3ZxLT5kcml2ZXJfYWRkciwKPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKHN0cnVjdCB2cmluZ191c2VkICopKHVpbnRwdHJfdClj dnEtPmRldmljZV9hZGRyKTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92ZHBhL3ZkcGFfc2ltL3Zk cGFfc2ltLmMgYi9kcml2ZXJzL3ZkcGEvdmRwYV9zaW0vdmRwYV9zaW0uYwo+IGluZGV4IGVlYTIz YzYzMGY3Yy4uNDdjZGYyYTFmNWI4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmRwYS92ZHBhX3Np bS92ZHBhX3NpbS5jCj4gKysrIGIvZHJpdmVycy92ZHBhL3ZkcGFfc2ltL3ZkcGFfc2ltLmMKPiBA QCAtNjAsNyArNjAsNyBAQCBzdGF0aWMgdm9pZCB2ZHBhc2ltX3F1ZXVlX3JlYWR5KHN0cnVjdCB2 ZHBhc2ltICp2ZHBhc2ltLCB1bnNpZ25lZCBpbnQgaWR4KQo+ICAgICAgICAgc3RydWN0IHZkcGFz aW1fdmlydHF1ZXVlICp2cSA9ICZ2ZHBhc2ltLT52cXNbaWR4XTsKPiAgICAgICAgIHVpbnQxNl90 IGxhc3RfYXZhaWxfaWR4ID0gdnEtPnZyaW5nLmxhc3RfYXZhaWxfaWR4Owo+Cj4gLSAgICAgICB2 cmluZ2hfaW5pdF9pb3RsYigmdnEtPnZyaW5nLCB2ZHBhc2ltLT5mZWF0dXJlcywgdnEtPm51bSwg dHJ1ZSwKPiArICAgICAgIHZyaW5naF9pbml0X2lvdGxiKCZ2cS0+dnJpbmcsIHZkcGFzaW0tPmZl YXR1cmVzLCB2cS0+bnVtLCB0cnVlLCBmYWxzZSwKPiAgICAgICAgICAgICAgICAgICAgICAgICAg IChzdHJ1Y3QgdnJpbmdfZGVzYyAqKSh1aW50cHRyX3QpdnEtPmRlc2NfYWRkciwKPiAgICAgICAg ICAgICAgICAgICAgICAgICAgIChzdHJ1Y3QgdnJpbmdfYXZhaWwgKikKPiAgICAgICAgICAgICAg ICAgICAgICAgICAgICh1aW50cHRyX3QpdnEtPmRyaXZlcl9hZGRyLAo+IEBAIC05Miw3ICs5Miw3 IEBAIHN0YXRpYyB2b2lkIHZkcGFzaW1fdnFfcmVzZXQoc3RydWN0IHZkcGFzaW0gKnZkcGFzaW0s Cj4gICAgICAgICB2cS0+Y2IgPSBOVUxMOwo+ICAgICAgICAgdnEtPnByaXZhdGUgPSBOVUxMOwo+ ICAgICAgICAgdnJpbmdoX2luaXRfaW90bGIoJnZxLT52cmluZywgdmRwYXNpbS0+ZGV2X2F0dHIu c3VwcG9ydGVkX2ZlYXR1cmVzLAo+IC0gICAgICAgICAgICAgICAgICAgICAgICAgVkRQQVNJTV9R VUVVRV9NQVgsIGZhbHNlLCBOVUxMLCBOVUxMLCBOVUxMKTsKPiArICAgICAgICAgICAgICAgICAg ICAgICAgIFZEUEFTSU1fUVVFVUVfTUFYLCBmYWxzZSwgZmFsc2UsIE5VTEwsIE5VTEwsIE5VTEwp Owo+Cj4gICAgICAgICB2cS0+dnJpbmcubm90aWZ5ID0gTlVMTDsKPiAgfQo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3Zob3N0L3ZyaW5naC5jIGIvZHJpdmVycy92aG9zdC92cmluZ2guYwo+IGluZGV4 IDBiYTNlZjgwOWU0OC4uNzJjODg1MTkzMjlhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmhvc3Qv dnJpbmdoLmMKPiArKysgYi9kcml2ZXJzL3Zob3N0L3ZyaW5naC5jCj4gQEAgLTEwOTQsMTAgKzEw OTQsMTggQEAgRVhQT1JUX1NZTUJPTCh2cmluZ2hfbmVlZF9ub3RpZnlfa2Vybik7Cj4KPiAgI2lm IElTX1JFQUNIQUJMRShDT05GSUdfVkhPU1RfSU9UTEIpCj4KPiArc3RydWN0IGlvdGxiX3ZlYyB7 Cj4gKyAgICAgICB1bmlvbiB7Cj4gKyAgICAgICAgICAgICAgIHN0cnVjdCBpb3ZlYyAqaW92ZWM7 Cj4gKyAgICAgICAgICAgICAgIHN0cnVjdCBiaW9fdmVjICpidmVjOwo+ICsgICAgICAgfSBpb3Y7 Cj4gKyAgICAgICBzaXplX3QgY291bnQ7Cj4gKyAgICAgICBib29sIGlzX2lvdmVjOwoKSSB3b25k ZXIgaWYgdGhpcyBpcyBuZWVkZWQgKGlmIHZyaW5naCBpcyBwYXNzZWQgdG8gZXZlcnkgaW90bGJf dmVjIGhlbHBlcikuCgo+ICt9Owo+ICsKPiAgc3RhdGljIGludCBpb3RsYl90cmFuc2xhdGUoY29u c3Qgc3RydWN0IHZyaW5naCAqdnJoLAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHU2NCBh ZGRyLCB1NjQgbGVuLCB1NjQgKnRyYW5zbGF0ZWQsCj4gLSAgICAgICAgICAgICAgICAgICAgICAg ICAgc3RydWN0IGJpb192ZWMgaW92W10sCj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 IGlvdl9zaXplLCB1MzIgcGVybSkKPiArICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qg aW90bGJfdmVjICppdmVjLCB1MzIgcGVybSkKPiAgewo+ICAgICAgICAgc3RydWN0IHZob3N0X2lv dGxiX21hcCAqbWFwOwo+ICAgICAgICAgc3RydWN0IHZob3N0X2lvdGxiICppb3RsYiA9IHZyaC0+ aW90bGI7Cj4gQEAgLTExMDcsOSArMTExNSw5IEBAIHN0YXRpYyBpbnQgaW90bGJfdHJhbnNsYXRl KGNvbnN0IHN0cnVjdCB2cmluZ2ggKnZyaCwKPiAgICAgICAgIHNwaW5fbG9jayh2cmgtPmlvdGxi X2xvY2spOwo+Cj4gICAgICAgICB3aGlsZSAobGVuID4gcykgewo+IC0gICAgICAgICAgICAgICB1 NjQgc2l6ZSwgcGEsIHBmbjsKPiArICAgICAgICAgICAgICAgdTY0IHNpemU7Cj4KPiAtICAgICAg ICAgICAgICAgaWYgKHVubGlrZWx5KHJldCA+PSBpb3Zfc2l6ZSkpIHsKPiArICAgICAgICAgICAg ICAgaWYgKHVubGlrZWx5KHJldCA+PSBpdmVjLT5jb3VudCkpIHsKPiAgICAgICAgICAgICAgICAg ICAgICAgICByZXQgPSAtRU5PQlVGUzsKPiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK PiAgICAgICAgICAgICAgICAgfQo+IEBAIC0xMTI0LDEwICsxMTMyLDIyIEBAIHN0YXRpYyBpbnQg aW90bGJfdHJhbnNsYXRlKGNvbnN0IHN0cnVjdCB2cmluZ2ggKnZyaCwKPiAgICAgICAgICAgICAg ICAgfQo+Cj4gICAgICAgICAgICAgICAgIHNpemUgPSBtYXAtPnNpemUgLSBhZGRyICsgbWFwLT5z dGFydDsKPiAtICAgICAgICAgICAgICAgcGEgPSBtYXAtPmFkZHIgKyBhZGRyIC0gbWFwLT5zdGFy dDsKPiAtICAgICAgICAgICAgICAgcGZuID0gcGEgPj4gUEFHRV9TSElGVDsKPiAtICAgICAgICAg ICAgICAgYnZlY19zZXRfcGFnZSgmaW92W3JldF0sIHBmbl90b19wYWdlKHBmbiksIG1pbihsZW4g LSBzLCBzaXplKSwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYSAmIChQQUdFX1NJ WkUgLSAxKSk7Cj4gKyAgICAgICAgICAgICAgIGlmIChpdmVjLT5pc19pb3ZlYykgewo+ICsgICAg ICAgICAgICAgICAgICAgICAgIHN0cnVjdCBpb3ZlYyAqaW92ZWMgPSBpdmVjLT5pb3YuaW92ZWM7 Cj4gKwo+ICsgICAgICAgICAgICAgICAgICAgICAgIGlvdmVjW3JldF0uaW92X2xlbiA9IG1pbihs ZW4gLSBzLCBzaXplKTsKPiArICAgICAgICAgICAgICAgICAgICAgICBpb3ZlY1tyZXRdLmlvdl9i YXNlID0gKHZvaWQgX191c2VyICopKHVuc2lnbmVkIGxvbmcpCj4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtYXAtPmFkZHIgKyBhZGRyIC0gbWFwLT5zdGFy dCk7CgptYXAtPmFkZHIgLSBtYXAtPnN0YXJ0IHRvIGF2b2lkIG92ZXJmbG93PwoKPiArICAgICAg ICAgICAgICAgfSBlbHNlIHsKPiArICAgICAgICAgICAgICAgICAgICAgICB1NjQgcGEgPSBtYXAt PmFkZHIgKyBhZGRyIC0gbWFwLT5zdGFydDsKPiArICAgICAgICAgICAgICAgICAgICAgICB1NjQg cGZuID0gcGEgPj4gUEFHRV9TSElGVDsKPiArICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qg YmlvX3ZlYyAqYnZlYyA9IGl2ZWMtPmlvdi5idmVjOwo+ICsKPiArICAgICAgICAgICAgICAgICAg ICAgICBidmVjX3NldF9wYWdlKCZidmVjW3JldF0sIHBmbl90b19wYWdlKHBmbiksCj4gKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtaW4obGVuIC0gcywgc2l6ZSksCj4gKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYSAmIChQQUdFX1NJWkUgLSAxKSk7 Cj4gKyAgICAgICAgICAgICAgIH0KPiArCj4gICAgICAgICAgICAgICAgIHMgKz0gc2l6ZTsKPiAg ICAgICAgICAgICAgICAgYWRkciArPSBzaXplOwo+ICAgICAgICAgICAgICAgICArK3JldDsKPiBA QCAtMTE0MSwyNiArMTE2MSw0MiBAQCBzdGF0aWMgaW50IGlvdGxiX3RyYW5zbGF0ZShjb25zdCBz dHJ1Y3QgdnJpbmdoICp2cmgsCj4gICAgICAgICByZXR1cm4gcmV0Owo+ICB9Cj4KPiArI2RlZmlu ZSBJT1RMQl9JT1ZfU0laRSAxNgo+ICsKPiAgc3RhdGljIGlubGluZSBpbnQgY29weV9mcm9tX2lv dGxiKGNvbnN0IHN0cnVjdCB2cmluZ2ggKnZyaCwgdm9pZCAqZHN0LAo+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB2b2lkICpzcmMsIHNpemVfdCBsZW4pCj4gIHsKPiArICAgICAg IHN0cnVjdCBpb3RsYl92ZWMgaXZlYzsKPiArICAgICAgIHVuaW9uIHsKPiArICAgICAgICAgICAg ICAgc3RydWN0IGlvdmVjIGlvdmVjW0lPVExCX0lPVl9TSVpFXTsKPiArICAgICAgICAgICAgICAg c3RydWN0IGJpb192ZWMgYnZlY1tJT1RMQl9JT1ZfU0laRV07Cj4gKyAgICAgICB9IGlvdjsKPiAg ICAgICAgIHU2NCB0b3RhbF90cmFuc2xhdGVkID0gMDsKPgo+ICsgICAgICAgaXZlYy5pb3YuaW92 ZWMgPSBpb3YuaW92ZWM7CgppdmMuaW92ID0gaW92ID8KCk90aGVycyBsb29rIGdvb2QuCgpUaGFu a3MKCj4gKyAgICAgICBpdmVjLmNvdW50ID0gSU9UTEJfSU9WX1NJWkU7Cj4gKyAgICAgICBpdmVj LmlzX2lvdmVjID0gdnJoLT51c2VfdmE7Cj4gKwo+ICAgICAgICAgd2hpbGUgKHRvdGFsX3RyYW5z bGF0ZWQgPCBsZW4pIHsKPiAtICAgICAgICAgICAgICAgc3RydWN0IGJpb192ZWMgaW92WzE2XTsK PiAgICAgICAgICAgICAgICAgc3RydWN0IGlvdl9pdGVyIGl0ZXI7Cj4gICAgICAgICAgICAgICAg IHU2NCB0cmFuc2xhdGVkOwo+ICAgICAgICAgICAgICAgICBpbnQgcmV0Owo+Cj4gICAgICAgICAg ICAgICAgIHJldCA9IGlvdGxiX3RyYW5zbGF0ZSh2cmgsICh1NjQpKHVpbnRwdHJfdClzcmMsCj4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZW4gLSB0b3RhbF90cmFuc2xh dGVkLCAmdHJhbnNsYXRlZCwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlvdiwgQVJSQVlfU0laRShpb3YpLCBWSE9TVF9NQVBfUk8pOwo+ICsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJml2ZWMsIFZIT1NUX01BUF9STyk7Cj4gICAgICAgICAgICAg ICAgIGlmIChyZXQgPT0gLUVOT0JVRlMpCj4gLSAgICAgICAgICAgICAgICAgICAgICAgcmV0ID0g QVJSQVlfU0laRShpb3YpOwo+ICsgICAgICAgICAgICAgICAgICAgICAgIHJldCA9IElPVExCX0lP Vl9TSVpFOwo+ICAgICAgICAgICAgICAgICBlbHNlIGlmIChyZXQgPCAwKQo+ICAgICAgICAgICAg ICAgICAgICAgICAgIHJldHVybiByZXQ7Cj4KPiAtICAgICAgICAgICAgICAgaW92X2l0ZXJfYnZl YygmaXRlciwgSVRFUl9TT1VSQ0UsIGlvdiwgcmV0LCB0cmFuc2xhdGVkKTsKPiArICAgICAgICAg ICAgICAgaWYgKGl2ZWMuaXNfaW92ZWMpIHsKPiArICAgICAgICAgICAgICAgICAgICAgICBpb3Zf aXRlcl9pbml0KCZpdGVyLCBJVEVSX1NPVVJDRSwgaXZlYy5pb3YuaW92ZWMsIHJldCwKPiArICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRyYW5zbGF0ZWQpOwo+ICsgICAgICAg ICAgICAgICB9IGVsc2Ugewo+ICsgICAgICAgICAgICAgICAgICAgICAgIGlvdl9pdGVyX2J2ZWMo Jml0ZXIsIElURVJfU09VUkNFLCBpdmVjLmlvdi5idmVjLCByZXQsCj4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0cmFuc2xhdGVkKTsKPiArICAgICAgICAgICAgICAgfQo+ Cj4gICAgICAgICAgICAgICAgIHJldCA9IGNvcHlfZnJvbV9pdGVyKGRzdCwgdHJhbnNsYXRlZCwg Jml0ZXIpOwo+ICAgICAgICAgICAgICAgICBpZiAocmV0IDwgMCkKPiBAQCAtMTE3NywyMyArMTIx MywzNyBAQCBzdGF0aWMgaW5saW5lIGludCBjb3B5X2Zyb21faW90bGIoY29uc3Qgc3RydWN0IHZy aW5naCAqdnJoLCB2b2lkICpkc3QsCj4gIHN0YXRpYyBpbmxpbmUgaW50IGNvcHlfdG9faW90bGIo Y29uc3Qgc3RydWN0IHZyaW5naCAqdnJoLCB2b2lkICpkc3QsCj4gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB2b2lkICpzcmMsIHNpemVfdCBsZW4pCj4gIHsKPiArICAgICAgIHN0cnVj dCBpb3RsYl92ZWMgaXZlYzsKPiArICAgICAgIHVuaW9uIHsKPiArICAgICAgICAgICAgICAgc3Ry dWN0IGlvdmVjIGlvdmVjW0lPVExCX0lPVl9TSVpFXTsKPiArICAgICAgICAgICAgICAgc3RydWN0 IGJpb192ZWMgYnZlY1tJT1RMQl9JT1ZfU0laRV07Cj4gKyAgICAgICB9IGlvdjsKPiAgICAgICAg IHU2NCB0b3RhbF90cmFuc2xhdGVkID0gMDsKPgo+ICsgICAgICAgaXZlYy5pb3YuaW92ZWMgPSBp b3YuaW92ZWM7Cj4gKyAgICAgICBpdmVjLmNvdW50ID0gSU9UTEJfSU9WX1NJWkU7Cj4gKyAgICAg ICBpdmVjLmlzX2lvdmVjID0gdnJoLT51c2VfdmE7Cj4gKwo+ICAgICAgICAgd2hpbGUgKHRvdGFs X3RyYW5zbGF0ZWQgPCBsZW4pIHsKPiAtICAgICAgICAgICAgICAgc3RydWN0IGJpb192ZWMgaW92 WzE2XTsKPiAgICAgICAgICAgICAgICAgc3RydWN0IGlvdl9pdGVyIGl0ZXI7Cj4gICAgICAgICAg ICAgICAgIHU2NCB0cmFuc2xhdGVkOwo+ICAgICAgICAgICAgICAgICBpbnQgcmV0Owo+Cj4gICAg ICAgICAgICAgICAgIHJldCA9IGlvdGxiX3RyYW5zbGF0ZSh2cmgsICh1NjQpKHVpbnRwdHJfdClk c3QsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZW4gLSB0b3RhbF90 cmFuc2xhdGVkLCAmdHJhbnNsYXRlZCwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlvdiwgQVJSQVlfU0laRShpb3YpLCBWSE9TVF9NQVBfV08pOwo+ICsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJml2ZWMsIFZIT1NUX01BUF9XTyk7Cj4gICAgICAg ICAgICAgICAgIGlmIChyZXQgPT0gLUVOT0JVRlMpCj4gLSAgICAgICAgICAgICAgICAgICAgICAg cmV0ID0gQVJSQVlfU0laRShpb3YpOwo+ICsgICAgICAgICAgICAgICAgICAgICAgIHJldCA9IElP VExCX0lPVl9TSVpFOwo+ICAgICAgICAgICAgICAgICBlbHNlIGlmIChyZXQgPCAwKQo+ICAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybiByZXQ7Cj4KPiAtICAgICAgICAgICAgICAgaW92X2l0 ZXJfYnZlYygmaXRlciwgSVRFUl9ERVNULCBpb3YsIHJldCwgdHJhbnNsYXRlZCk7Cj4gKyAgICAg ICAgICAgICAgIGlmIChpdmVjLmlzX2lvdmVjKSB7Cj4gKyAgICAgICAgICAgICAgICAgICAgICAg aW92X2l0ZXJfaW5pdCgmaXRlciwgSVRFUl9ERVNULCBpdmVjLmlvdi5pb3ZlYywgcmV0LAo+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJhbnNsYXRlZCk7Cj4gKyAgICAg ICAgICAgICAgIH0gZWxzZSB7Cj4gKyAgICAgICAgICAgICAgICAgICAgICAgaW92X2l0ZXJfYnZl YygmaXRlciwgSVRFUl9ERVNULCBpdmVjLmlvdi5idmVjLCByZXQsCj4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0cmFuc2xhdGVkKTsKPiArICAgICAgICAgICAgICAgfQo+ Cj4gICAgICAgICAgICAgICAgIHJldCA9IGNvcHlfdG9faXRlcihzcmMsIHRyYW5zbGF0ZWQsICZp dGVyKTsKPiAgICAgICAgICAgICAgICAgaWYgKHJldCA8IDApCj4gQEAgLTEyMTAsMjAgKzEyNjAs MzcgQEAgc3RhdGljIGlubGluZSBpbnQgY29weV90b19pb3RsYihjb25zdCBzdHJ1Y3QgdnJpbmdo ICp2cmgsIHZvaWQgKmRzdCwKPiAgc3RhdGljIGlubGluZSBpbnQgZ2V0dTE2X2lvdGxiKGNvbnN0 IHN0cnVjdCB2cmluZ2ggKnZyaCwKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdTE2 ICp2YWwsIGNvbnN0IF9fdmlydGlvMTYgKnApCj4gIHsKPiAtICAgICAgIHN0cnVjdCBiaW9fdmVj IGlvdjsKPiAtICAgICAgIHZvaWQgKmthZGRyLCAqZnJvbTsKPiArICAgICAgIHN0cnVjdCBpb3Rs Yl92ZWMgaXZlYzsKPiArICAgICAgIHVuaW9uIHsKPiArICAgICAgICAgICAgICAgc3RydWN0IGlv dmVjIGlvdmVjWzFdOwo+ICsgICAgICAgICAgICAgICBzdHJ1Y3QgYmlvX3ZlYyBidmVjWzFdOwo+ ICsgICAgICAgfSBpb3Y7Cj4gKyAgICAgICBfX3ZpcnRpbzE2IHRtcDsKPiAgICAgICAgIGludCBy ZXQ7Cj4KPiArICAgICAgIGl2ZWMuaW92LmlvdmVjID0gaW92LmlvdmVjOwo+ICsgICAgICAgaXZl Yy5jb3VudCA9IDE7Cj4gKyAgICAgICBpdmVjLmlzX2lvdmVjID0gdnJoLT51c2VfdmE7Cj4gKwo+ ICAgICAgICAgLyogQXRvbWljIHJlYWQgaXMgbmVlZGVkIGZvciBnZXR1MTYgKi8KPiAtICAgICAg IHJldCA9IGlvdGxiX3RyYW5zbGF0ZSh2cmgsICh1NjQpKHVpbnRwdHJfdClwLCBzaXplb2YoKnAp LCBOVUxMLAo+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpb3YsIDEsIFZIT1NUX01B UF9STyk7Cj4gKyAgICAgICByZXQgPSBpb3RsYl90cmFuc2xhdGUodnJoLCAodTY0KSh1aW50cHRy X3QpcCwgc2l6ZW9mKCpwKSwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCAm aXZlYywgVkhPU1RfTUFQX1JPKTsKPiAgICAgICAgIGlmIChyZXQgPCAwKQo+ICAgICAgICAgICAg ICAgICByZXR1cm4gcmV0Owo+Cj4gLSAgICAgICBrYWRkciA9IGttYXBfbG9jYWxfcGFnZShpb3Yu YnZfcGFnZSk7Cj4gLSAgICAgICBmcm9tID0ga2FkZHIgKyBpb3YuYnZfb2Zmc2V0Owo+IC0gICAg ICAgKnZhbCA9IHZyaW5naDE2X3RvX2NwdSh2cmgsIFJFQURfT05DRSgqKF9fdmlydGlvMTYgKilm cm9tKSk7Cj4gLSAgICAgICBrdW5tYXBfbG9jYWwoa2FkZHIpOwo+ICsgICAgICAgaWYgKGl2ZWMu aXNfaW92ZWMpIHsKPiArICAgICAgICAgICAgICAgcmV0ID0gX19nZXRfdXNlcih0bXAsIChfX3Zp cnRpbzE2IF9fdXNlciAqKWl2ZWMuaW92LmlvdmVjWzBdLmlvdl9iYXNlKTsKPiArICAgICAgICAg ICAgICAgaWYgKHJldCkKPiArICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmV0Owo+ICsg ICAgICAgfSBlbHNlIHsKPiArICAgICAgICAgICAgICAgdm9pZCAqa2FkZHIgPSBrbWFwX2xvY2Fs X3BhZ2UoaXZlYy5pb3YuYnZlY1swXS5idl9wYWdlKTsKPiArICAgICAgICAgICAgICAgdm9pZCAq ZnJvbSA9IGthZGRyICsgaXZlYy5pb3YuYnZlY1swXS5idl9vZmZzZXQ7Cj4gKwo+ICsgICAgICAg ICAgICAgICB0bXAgPSBSRUFEX09OQ0UoKihfX3ZpcnRpbzE2ICopZnJvbSk7Cj4gKyAgICAgICAg ICAgICAgIGt1bm1hcF9sb2NhbChrYWRkcik7Cj4gKyAgICAgICB9Cj4gKwo+ICsgICAgICAgKnZh bCA9IHZyaW5naDE2X3RvX2NwdSh2cmgsIHRtcCk7Cj4KPiAgICAgICAgIHJldHVybiAwOwo+ICB9 Cj4gQEAgLTEyMzEsMjAgKzEyOTgsMzcgQEAgc3RhdGljIGlubGluZSBpbnQgZ2V0dTE2X2lvdGxi KGNvbnN0IHN0cnVjdCB2cmluZ2ggKnZyaCwKPiAgc3RhdGljIGlubGluZSBpbnQgcHV0dTE2X2lv dGxiKGNvbnN0IHN0cnVjdCB2cmluZ2ggKnZyaCwKPiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgX192aXJ0aW8xNiAqcCwgdTE2IHZhbCkKPiAgewo+IC0gICAgICAgc3RydWN0IGJpb192 ZWMgaW92Owo+IC0gICAgICAgdm9pZCAqa2FkZHIsICp0bzsKPiArICAgICAgIHN0cnVjdCBpb3Rs Yl92ZWMgaXZlYzsKPiArICAgICAgIHVuaW9uIHsKPiArICAgICAgICAgICAgICAgc3RydWN0IGlv dmVjIGlvdmVjOwo+ICsgICAgICAgICAgICAgICBzdHJ1Y3QgYmlvX3ZlYyBidmVjOwo+ICsgICAg ICAgfSBpb3Y7Cj4gKyAgICAgICBfX3ZpcnRpbzE2IHRtcDsKPiAgICAgICAgIGludCByZXQ7Cj4K PiArICAgICAgIGl2ZWMuaW92LmlvdmVjID0gJmlvdi5pb3ZlYzsKPiArICAgICAgIGl2ZWMuY291 bnQgPSAxOwo+ICsgICAgICAgaXZlYy5pc19pb3ZlYyA9IHZyaC0+dXNlX3ZhOwo+ICsKPiAgICAg ICAgIC8qIEF0b21pYyB3cml0ZSBpcyBuZWVkZWQgZm9yIHB1dHUxNiAqLwo+IC0gICAgICAgcmV0 ID0gaW90bGJfdHJhbnNsYXRlKHZyaCwgKHU2NCkodWludHB0cl90KXAsIHNpemVvZigqcCksIE5V TEwsCj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlvdiwgMSwgVkhPU1RfTUFQX1dP KTsKPiArICAgICAgIHJldCA9IGlvdGxiX3RyYW5zbGF0ZSh2cmgsICh1NjQpKHVpbnRwdHJfdClw LCBzaXplb2YoKnApLAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsICZpdmVj LCBWSE9TVF9NQVBfUk8pOwo+ICAgICAgICAgaWYgKHJldCA8IDApCj4gICAgICAgICAgICAgICAg IHJldHVybiByZXQ7Cj4KPiAtICAgICAgIGthZGRyID0ga21hcF9sb2NhbF9wYWdlKGlvdi5idl9w YWdlKTsKPiAtICAgICAgIHRvID0ga2FkZHIgKyBpb3YuYnZfb2Zmc2V0Owo+IC0gICAgICAgV1JJ VEVfT05DRSgqKF9fdmlydGlvMTYgKil0bywgY3B1X3RvX3ZyaW5naDE2KHZyaCwgdmFsKSk7Cj4g LSAgICAgICBrdW5tYXBfbG9jYWwoa2FkZHIpOwo+ICsgICAgICAgdG1wID0gY3B1X3RvX3ZyaW5n aDE2KHZyaCwgdmFsKTsKPiArCj4gKyAgICAgICBpZiAoaXZlYy5pc19pb3ZlYykgewo+ICsgICAg ICAgICAgICAgICByZXQgPSBfX3B1dF91c2VyKHRtcCwgKF9fdmlydGlvMTYgX191c2VyICopaXZl Yy5pb3YuaW92ZWNbMF0uaW92X2Jhc2UpOwo+ICsgICAgICAgICAgICAgICBpZiAocmV0KQo+ICsg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiByZXQ7Cj4gKyAgICAgICB9IGVsc2Ugewo+ICsg ICAgICAgICAgICAgICB2b2lkICprYWRkciA9IGttYXBfbG9jYWxfcGFnZShpdmVjLmlvdi5idmVj WzBdLmJ2X3BhZ2UpOwo+ICsgICAgICAgICAgICAgICB2b2lkICp0byA9IGthZGRyICsgaXZlYy5p b3YuYnZlY1swXS5idl9vZmZzZXQ7Cj4gKwo+ICsgICAgICAgICAgICAgICBXUklURV9PTkNFKCoo X192aXJ0aW8xNiAqKXRvLCB0bXApOwo+ICsgICAgICAgICAgICAgICBrdW5tYXBfbG9jYWwoa2Fk ZHIpOwo+ICsgICAgICAgfQo+Cj4gICAgICAgICByZXR1cm4gMDsKPiAgfQo+IEBAIC0xMzA2LDYg KzEzOTAsNyBAQCBzdGF0aWMgaW5saW5lIGludCBwdXR1c2VkX2lvdGxiKGNvbnN0IHN0cnVjdCB2 cmluZ2ggKnZyaCwKPiAgICogQGZlYXR1cmVzOiB0aGUgZmVhdHVyZSBiaXRzIGZvciB0aGlzIHJp bmcuCj4gICAqIEBudW06IHRoZSBudW1iZXIgb2YgZWxlbWVudHMuCj4gICAqIEB3ZWFrX2JhcnJp ZXJzOiB0cnVlIGlmIHdlIG9ubHkgbmVlZCBtZW1vcnkgYmFycmllcnMsIG5vdCBJL08uCj4gKyAq IEB1c2VfdmE6IHRydWUgaWYgSU9UTEIgY29udGFpbnMgdXNlciBWQQo+ICAgKiBAZGVzYzogdGhl IHVzZXJwYWNlIGRlc2NyaXB0b3IgcG9pbnRlci4KPiAgICogQGF2YWlsOiB0aGUgdXNlcnBhY2Ug YXZhaWwgcG9pbnRlci4KPiAgICogQHVzZWQ6IHRoZSB1c2VycGFjZSB1c2VkIHBvaW50ZXIuCj4g QEAgLTEzMTMsMTEgKzEzOTgsMTMgQEAgc3RhdGljIGlubGluZSBpbnQgcHV0dXNlZF9pb3RsYihj b25zdCBzdHJ1Y3QgdnJpbmdoICp2cmgsCj4gICAqIFJldHVybnMgYW4gZXJyb3IgaWYgbnVtIGlz IGludmFsaWQuCj4gICAqLwo+ICBpbnQgdnJpbmdoX2luaXRfaW90bGIoc3RydWN0IHZyaW5naCAq dnJoLCB1NjQgZmVhdHVyZXMsCj4gLSAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBu dW0sIGJvb2wgd2Vha19iYXJyaWVycywKPiArICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg aW50IG51bSwgYm9vbCB3ZWFrX2JhcnJpZXJzLCBib29sIHVzZV92YSwKPiAgICAgICAgICAgICAg ICAgICAgICAgc3RydWN0IHZyaW5nX2Rlc2MgKmRlc2MsCj4gICAgICAgICAgICAgICAgICAgICAg IHN0cnVjdCB2cmluZ19hdmFpbCAqYXZhaWwsCj4gICAgICAgICAgICAgICAgICAgICAgIHN0cnVj dCB2cmluZ191c2VkICp1c2VkKQo+ICB7Cj4gKyAgICAgICB2cmgtPnVzZV92YSA9IHVzZV92YTsK PiArCj4gICAgICAgICByZXR1cm4gdnJpbmdoX2luaXRfa2Vybih2cmgsIGZlYXR1cmVzLCBudW0s IHdlYWtfYmFycmllcnMsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXNjLCBh dmFpbCwgdXNlZCk7Cj4gIH0KPiAtLQo+IDIuMzkuMgo+CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpWaXJ0dWFsaXphdGlvbiBtYWlsaW5nIGxpc3QKVmly dHVhbGl6YXRpb25AbGlzdHMubGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6Ly9saXN0cy5saW51 eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vdmlydHVhbGl6YXRpb24=