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 F03FCC19F2D for ; Tue, 9 Aug 2022 07:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235914AbiHIHVx (ORCPT ); Tue, 9 Aug 2022 03:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbiHIHVu (ORCPT ); Tue, 9 Aug 2022 03:21:50 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6610F20F5F for ; Tue, 9 Aug 2022 00:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660029708; 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=hpHwiiGJDXhhzsylxfzcS8XfTxzEqI3OfBK8Nyzl7Tk=; b=JZiIQxfxyWPDlCm29SAa2L7pzjahHSweGDKPmY8hjZdBEMP0v2E9zn2NWIdeHurC0pf47Z lJNGS4NArspQu+JdAnvK2p5qRd6sTYyoB8OYiGwb+EehOCYi9UuppCwfhNpOfoR/PdalzU VpyYNL4+TbcTyysV/eDtJEXHhEjcYpc= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-215-jdT145SRPOmmuDarTx6WkA-1; Tue, 09 Aug 2022 03:21:44 -0400 X-MC-Unique: jdT145SRPOmmuDarTx6WkA-1 Received: by mail-lf1-f71.google.com with SMTP id p12-20020a05651211ec00b0048a43993b48so2530657lfs.2 for ; Tue, 09 Aug 2022 00:21:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=hpHwiiGJDXhhzsylxfzcS8XfTxzEqI3OfBK8Nyzl7Tk=; b=tdFSc4J+6HMMDSiK0RrdF5hUZNMwCd4gNJWcACDDuwdQ+NIsrwe3UYbEDr/fqAuCjH I4P92YR2NNhQjA9TUsNJaJIwaFZdre4JWQfg5o3P1mBHrZU6b85dLiKT0ZQDGrkGszVC FIO6ygtvzc/VDuwkNVSMak9BqRgWzjTLdABmOpYkZozdB0B9mXp2ZntpF4+P6lQQcdji J1bKrblhJdCIO6tfmdPy3Jcgox53VJnomYCmG5AL14bhbKo7v4kO6sW/J5EfJKCQqkU5 kTNQogLkrB9q+5VSEX+dUOGvPvNU5JhnDqfMaI/zJEAFjvPO7i8IMjBBicbZbOngUrov 3mig== X-Gm-Message-State: ACgBeo1NaE3Hdy1x9uEnAPSmMZCGedYDrPWCCuP9HWrYPLnkEkTSRsGB khY1D1jjZSfpgE803WoisZgLAZi4zJtmQxkTMh/3VvoN06HoaGMcqwzCI5s8hZPAl6QwcviYZU1 6YAl0fPRja36Y5tK9LvV85y0Wq4Uw X-Received: by 2002:a05:6512:308a:b0:48b:4dd:5362 with SMTP id z10-20020a056512308a00b0048b04dd5362mr7780060lfd.575.1660029703090; Tue, 09 Aug 2022 00:21:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR64cvDY87cATE+F2diph1IbfR3Dw71OJHhWMW3QlXDQFuaY+jdQ+527iYGr2kTJYTidxa/rkA2tHl4p2BDHYr8= X-Received: by 2002:a05:6512:308a:b0:48b:4dd:5362 with SMTP id z10-20020a056512308a00b0048b04dd5362mr7780054lfd.575.1660029702745; Tue, 09 Aug 2022 00:21:42 -0700 (PDT) MIME-Version: 1.0 References: <20220805163909.872646-1-eperezma@redhat.com> <20220805163909.872646-5-eperezma@redhat.com> In-Reply-To: <20220805163909.872646-5-eperezma@redhat.com> From: Jason Wang Date: Tue, 9 Aug 2022 15:21:31 +0800 Message-ID: Subject: Re: [PATCH v4 4/6] vdpa: Add asid parameter to vhost_vdpa_dma_map/unmap To: =?UTF-8?Q?Eugenio_P=C3=A9rez?= Cc: qemu-devel , Stefan Hajnoczi , Eli Cohen , Zhu Lingshan , "Michael S. Tsirkin" , Gautam Dawar , Stefano Garzarella , Parav Pandit , Cindy Lu , "Gonglei (Arei)" , Cornelia Huck , kvm , Paolo Bonzini , Liuxiangdong , Laurent Vivier , Harpreet Singh Anand Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Sat, Aug 6, 2022 at 12:39 AM Eugenio P=C3=A9rez wr= ote: > > So the caller can choose which ASID is destined. > > No need to update the batch functions as they will always be called from > memory listener updates at the moment. Memory listener updates will > always update ASID 0, as it's the passthrough ASID. > > All vhost devices's ASID are 0 at this moment. > > Signed-off-by: Eugenio P=C3=A9rez > --- > v4: Add comment specifying behavior if device does not support _F_ASID > > v3: Deleted unneeded space > --- > include/hw/virtio/vhost-vdpa.h | 8 +++++--- > hw/virtio/vhost-vdpa.c | 25 +++++++++++++++---------- > net/vhost-vdpa.c | 6 +++--- > hw/virtio/trace-events | 4 ++-- > 4 files changed, 25 insertions(+), 18 deletions(-) > > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdp= a.h > index 1111d85643..6560bb9d78 100644 > --- a/include/hw/virtio/vhost-vdpa.h > +++ b/include/hw/virtio/vhost-vdpa.h > @@ -29,6 +29,7 @@ typedef struct vhost_vdpa { > int index; > uint32_t msg_type; > bool iotlb_batch_begin_sent; > + uint32_t address_space_id; > MemoryListener listener; > struct vhost_vdpa_iova_range iova_range; > uint64_t acked_features; > @@ -42,8 +43,9 @@ typedef struct vhost_vdpa { > VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX]; > } VhostVDPA; > > -int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size, > - void *vaddr, bool readonly); > -int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size)= ; > +int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asid, hwaddr iova, > + hwaddr size, void *vaddr, bool readonly); > +int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, uint32_t asid, hwaddr iov= a, > + hwaddr size); > > #endif > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 34922ec20d..3eb67b27b7 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -72,22 +72,24 @@ static bool vhost_vdpa_listener_skipped_section(Memor= yRegionSection *section, > return false; > } > > -int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size, > - void *vaddr, bool readonly) > +int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asid, hwaddr iova, > + hwaddr size, void *vaddr, bool readonly) > { > struct vhost_msg_v2 msg =3D {}; > int fd =3D v->device_fd; > int ret =3D 0; > > msg.type =3D v->msg_type; > + msg.asid =3D asid; /* 0 if vdpa device does not support asid */ So this comment is still kind of confusing. Does it mean the caller can guarantee that asid is 0 when ASID is not supported? Even if this is true, does it silently depend on the behaviour that the asid field is extended from the reserved field of the ABI? (I still wonder if it's better to avoid using msg.asid if the kernel doesn't support that). Thanks > msg.iotlb.iova =3D iova; > msg.iotlb.size =3D size; > msg.iotlb.uaddr =3D (uint64_t)(uintptr_t)vaddr; > msg.iotlb.perm =3D readonly ? VHOST_ACCESS_RO : VHOST_ACCESS_RW; > msg.iotlb.type =3D VHOST_IOTLB_UPDATE; > > - trace_vhost_vdpa_dma_map(v, fd, msg.type, msg.iotlb.iova, msg.iotlb.s= ize, > - msg.iotlb.uaddr, msg.iotlb.perm, msg.iotlb.t= ype); > + trace_vhost_vdpa_dma_map(v, fd, msg.type, msg.asid, msg.iotlb.iova, > + msg.iotlb.size, msg.iotlb.uaddr, msg.iotlb.= perm, > + msg.iotlb.type); > > if (write(fd, &msg, sizeof(msg)) !=3D sizeof(msg)) { > error_report("failed to write, fd=3D%d, errno=3D%d (%s)", > @@ -98,18 +100,20 @@ int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr = iova, hwaddr size, > return ret; > } > > -int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size) > +int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, uint32_t asid, hwaddr iov= a, > + hwaddr size) > { > struct vhost_msg_v2 msg =3D {}; > int fd =3D v->device_fd; > int ret =3D 0; > > msg.type =3D v->msg_type; > + msg.asid =3D asid; /* 0 if vdpa device does not support asid */ > msg.iotlb.iova =3D iova; > msg.iotlb.size =3D size; > msg.iotlb.type =3D VHOST_IOTLB_INVALIDATE; > > - trace_vhost_vdpa_dma_unmap(v, fd, msg.type, msg.iotlb.iova, > + trace_vhost_vdpa_dma_unmap(v, fd, msg.type, msg.asid, msg.iotlb.iova= , > msg.iotlb.size, msg.iotlb.type); > > if (write(fd, &msg, sizeof(msg)) !=3D sizeof(msg)) { > @@ -229,7 +233,7 @@ static void vhost_vdpa_listener_region_add(MemoryList= ener *listener, > } > > vhost_vdpa_iotlb_batch_begin_once(v); > - ret =3D vhost_vdpa_dma_map(v, iova, int128_get64(llsize), > + ret =3D vhost_vdpa_dma_map(v, 0, iova, int128_get64(llsize), > vaddr, section->readonly); > if (ret) { > error_report("vhost vdpa map fail!"); > @@ -303,7 +307,7 @@ static void vhost_vdpa_listener_region_del(MemoryList= ener *listener, > vhost_iova_tree_remove(v->iova_tree, result); > } > vhost_vdpa_iotlb_batch_begin_once(v); > - ret =3D vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); > + ret =3D vhost_vdpa_dma_unmap(v, 0, iova, int128_get64(llsize)); > if (ret) { > error_report("vhost_vdpa dma unmap error!"); > } > @@ -894,7 +898,7 @@ static bool vhost_vdpa_svq_unmap_ring(struct vhost_vd= pa *v, > } > > size =3D ROUND_UP(result->size, qemu_real_host_page_size()); > - r =3D vhost_vdpa_dma_unmap(v, result->iova, size); > + r =3D vhost_vdpa_dma_unmap(v, v->address_space_id, result->iova, siz= e); > return r =3D=3D 0; > } > > @@ -936,7 +940,8 @@ static bool vhost_vdpa_svq_map_ring(struct vhost_vdpa= *v, DMAMap *needle, > return false; > } > > - r =3D vhost_vdpa_dma_map(v, needle->iova, needle->size + 1, > + r =3D vhost_vdpa_dma_map(v, v->address_space_id, needle->iova, > + needle->size + 1, > (void *)(uintptr_t)needle->translated_addr, > needle->perm =3D=3D IOMMU_RO); > if (unlikely(r !=3D 0)) { > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 7c0d600aea..9b932442f0 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -239,7 +239,7 @@ static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdp= a *v, void *addr) > return; > } > > - r =3D vhost_vdpa_dma_unmap(v, map->iova, map->size + 1); > + r =3D vhost_vdpa_dma_unmap(v, v->address_space_id, map->iova, map->s= ize + 1); > if (unlikely(r !=3D 0)) { > error_report("Device cannot unmap: %s(%d)", g_strerror(r), r); > } > @@ -279,8 +279,8 @@ static int vhost_vdpa_cvq_map_buf(struct vhost_vdpa *= v, void *buf, size_t size, > return r; > } > > - r =3D vhost_vdpa_dma_map(v, map.iova, vhost_vdpa_net_cvq_cmd_page_le= n(), buf, > - !write); > + r =3D vhost_vdpa_dma_map(v, v->address_space_id, map.iova, > + vhost_vdpa_net_cvq_cmd_page_len(), buf, !writ= e); > if (unlikely(r < 0)) { > goto dma_map_err; > } > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 20af2e7ebd..36e5ae75f6 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -26,8 +26,8 @@ vhost_user_write(uint32_t req, uint32_t flags) "req:%d = flags:0x%"PRIx32"" > vhost_user_create_notifier(int idx, void *n) "idx:%d n:%p" > > # vhost-vdpa.c > -vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova,= uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d= msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64"= perm: 0x%"PRIx8" type: %"PRIu8 > -vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iov= a, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0= x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 > +vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint32_t asid,= uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) = "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" iova: 0x%"PRIx64" size:= 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8 > +vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint32_t asi= d, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"= PRIu32" asid: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 > vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint= 8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 > vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t t= ype) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 > vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend= , void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" = vaddr: %p read-only: %d" > -- > 2.31.1 >