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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5DE9EC76196 for ; Tue, 28 Mar 2023 06:54:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ph3D4-000780-3O; Tue, 28 Mar 2023 02:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ph3D2-00077r-Gz for qemu-devel@nongnu.org; Tue, 28 Mar 2023 02:53:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ph3D0-0000yy-PP for qemu-devel@nongnu.org; Tue, 28 Mar 2023 02:53:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679986409; 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=dEjgSwYlVZ8rI8MSiTmldbWlzI+s6oOMfMB6Tj/JAWo=; b=GeztzwWFcxa365HrOYE2gooJxEFpY1nepweu4Vl7yTJpoCJtgE3cGj//PnphON6AfFC0o6 1aftAiQjP9AFJRrm1uCKCbsv1qwO7rXqg13lsWVyLUd38BqieIJ+Mti/sne2aCj+8/B/hO bUU4GRP+JEn4C+Jzc8G0lRbLg1XvAQo= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-l587BoDnNyuFZoxrW-VY6A-1; Tue, 28 Mar 2023 02:53:26 -0400 X-MC-Unique: l587BoDnNyuFZoxrW-VY6A-1 Received: by mail-oi1-f198.google.com with SMTP id z129-20020aca3387000000b0038710ae0033so2236008oiz.8 for ; Mon, 27 Mar 2023 23:53:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679986405; 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=dEjgSwYlVZ8rI8MSiTmldbWlzI+s6oOMfMB6Tj/JAWo=; b=p8I0d6/hqOZPpKHo7o7uwnpEUZhCF/kjP5T9yFzZHbZBLW8M/gZCssuw+rPj3SpWa/ xpeKTIMeAFwu6RMo4u0Bo8T/Vz9GUa9l9IqomYL/zUfFg+TQk/fxHo2RTxRe4OYIC5X3 TQmnba4jlsqDEOdnRi+ES2QaYxgJQAZPv/MEMWvUETnyL3IauMRlIZQY2+oqfOO8wv17 yYXxslDIaGsZLxhBdiAbds9RT1zesQWrs/QsgeZy/06HM72CJP4NuqXw7aj4BHVpikwE yFA9vMAgkyFQqEMLaH+qJytAd/kAFAgJXampHjE1NVM5AJrCw4DVIV5Y/Hoi/3+Zyzdn lnxQ== X-Gm-Message-State: AAQBX9e1uJ4LKX613PWRISuwOxwziueAMlofiS3bcTUhPFmevk9AW8kx idrYToIyhgYc9ZZlcKp/QiORbrDASXdu7Fj6Bi8kg9IcTz3IEE3ntaiLN0Rge7JgKioa9UM3UoF Mi0qIvaHufaDiJ7BIucKeXmJ6qZ762zs= X-Received: by 2002:a05:6830:39d7:b0:6a1:3fd6:5a0b with SMTP id bt23-20020a05683039d700b006a13fd65a0bmr1942598otb.2.1679986405293; Mon, 27 Mar 2023 23:53:25 -0700 (PDT) X-Google-Smtp-Source: AKy350axJMsSnhH9I17keLLdgXHsbrMi5DuKjV9RjFgGVTeN3iT3KyF7snmklYLllBbp9j67Zj2g2qkB208a+eMHUa4= X-Received: by 2002:a05:6830:39d7:b0:6a1:3fd6:5a0b with SMTP id bt23-20020a05683039d700b006a13fd65a0bmr1942587otb.2.1679986405084; Mon, 27 Mar 2023 23:53:25 -0700 (PDT) MIME-Version: 1.0 References: <20230323195404.1247326-1-eperezma@redhat.com> <20230323195404.1247326-3-eperezma@redhat.com> In-Reply-To: <20230323195404.1247326-3-eperezma@redhat.com> From: Jason Wang Date: Tue, 28 Mar 2023 14:53:13 +0800 Message-ID: Subject: Re: [PATCH for 8.1 v2 2/6] vdpa: add vhost_vdpa_reset_status_fd To: =?UTF-8?Q?Eugenio_P=C3=A9rez?= Cc: qemu-devel@nongnu.org, Liuxiangdong , Gautam Dawar , alvaro.karsz@solid-run.com, "Gonglei (Arei)" , Lei Yang , si-wei.liu@oracle.com, Eli Cohen , Shannon Nelson , Laurent Vivier , "Michael S. Tsirkin" , Stefano Garzarella , Parav Pandit , Zhu Lingshan , Cindy Lu , longpeng2@huawei.com, Harpreet Singh Anand Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Mar 24, 2023 at 3:54=E2=80=AFAM Eugenio P=C3=A9rez wrote: > The title needs some tweak, I think the more appropriate one is "introduce vhost_vdpa_call_fd()" > This allows to reset a vhost-vdpa device from external subsystems like > vhost-net, since it does not have any struct vhost_dev by the time we > need to use it. This part needs some clarification, vhost-net should be initialized after vhost_dev, so it can access its parent vhost_dev structure? > > It is used in subsequent patches to negotiate features > and probe for CVQ ASID isolation. > > Signed-off-by: Eugenio P=C3=A9rez > --- > include/hw/virtio/vhost-vdpa.h | 1 + > hw/virtio/vhost-vdpa.c | 58 +++++++++++++++++++++++----------- > 2 files changed, 41 insertions(+), 18 deletions(-) > > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdp= a.h > index c278a2a8de..28de7da91e 100644 > --- a/include/hw/virtio/vhost-vdpa.h > +++ b/include/hw/virtio/vhost-vdpa.h > @@ -54,6 +54,7 @@ typedef struct vhost_vdpa { > VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX]; > } VhostVDPA; > > +void vhost_vdpa_reset_status_fd(int fd); > int vhost_vdpa_get_iova_range(int fd, struct vhost_vdpa_iova_range *iova= _range); > > int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asid, hwaddr iova, > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index bbabea18f3..7a2053b8d9 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -335,38 +335,45 @@ static const MemoryListener vhost_vdpa_memory_liste= ner =3D { > .region_del =3D vhost_vdpa_listener_region_del, > }; > > -static int vhost_vdpa_call(struct vhost_dev *dev, unsigned long int requ= est, > - void *arg) > +static int vhost_vdpa_dev_fd(const struct vhost_dev *dev) > { > struct vhost_vdpa *v =3D dev->opaque; > - int fd =3D v->device_fd; > - int ret; > > assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_VDPA); > + return v->device_fd; > +} > + > +static int vhost_vdpa_call_fd(int fd, unsigned long int request, void *a= rg) > +{ > + int ret =3D ioctl(fd, request, arg); > > - ret =3D ioctl(fd, request, arg); > return ret < 0 ? -errno : ret; > } > > -static int vhost_vdpa_add_status(struct vhost_dev *dev, uint8_t status) > +static int vhost_vdpa_call(struct vhost_dev *dev, unsigned long int requ= est, > + void *arg) > +{ > + return vhost_vdpa_call_fd(vhost_vdpa_dev_fd(dev), request, arg); > +} > + > +static int vhost_vdpa_add_status_fd(int fd, uint8_t status) > { > uint8_t s; > int ret; > > - trace_vhost_vdpa_add_status(dev, status); > - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_GET_STATUS, &s); We can stick a vhost_vdpa_call() function that calls vhost_vdpa_call_fd() then we can avoid a lot of changes? Thanks > + ret =3D vhost_vdpa_call_fd(fd, VHOST_VDPA_GET_STATUS, &s); > if (ret < 0) { > return ret; > } > > s |=3D status; > > - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &s); > + ret =3D vhost_vdpa_call_fd(fd, VHOST_VDPA_SET_STATUS, &s); > if (ret < 0) { > return ret; > } > > - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_GET_STATUS, &s); > + ret =3D vhost_vdpa_call_fd(fd, VHOST_VDPA_GET_STATUS, &s); > if (ret < 0) { > return ret; > } > @@ -378,6 +385,12 @@ static int vhost_vdpa_add_status(struct vhost_dev *d= ev, uint8_t status) > return 0; > } > > +static int vhost_vdpa_add_status(struct vhost_dev *dev, uint8_t status) > +{ > + trace_vhost_vdpa_add_status(dev, status); > + return vhost_vdpa_add_status_fd(vhost_vdpa_dev_fd(dev), status); > +} > + > int vhost_vdpa_get_iova_range(int fd, struct vhost_vdpa_iova_range *iova= _range) > { > int ret =3D ioctl(fd, VHOST_VDPA_GET_IOVA_RANGE, iova_range); > @@ -709,16 +722,20 @@ static int vhost_vdpa_get_device_id(struct vhost_de= v *dev, > return ret; > } > > +static int vhost_vdpa_reset_device_fd(int fd) > +{ > + uint8_t status =3D 0; > + > + return vhost_vdpa_call_fd(fd, VHOST_VDPA_SET_STATUS, &status); > +} > + > static int vhost_vdpa_reset_device(struct vhost_dev *dev) > { > struct vhost_vdpa *v =3D dev->opaque; > - int ret; > - uint8_t status =3D 0; > > - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status); > - trace_vhost_vdpa_reset_device(dev); > v->suspended =3D false; > - return ret; > + trace_vhost_vdpa_reset_device(dev); > + return vhost_vdpa_reset_device_fd(vhost_vdpa_dev_fd(dev)); > } > > static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx) > @@ -1170,6 +1187,13 @@ static int vhost_vdpa_dev_start(struct vhost_dev *= dev, bool started) > return 0; > } > > +void vhost_vdpa_reset_status_fd(int fd) > +{ > + vhost_vdpa_reset_device_fd(fd); > + vhost_vdpa_add_status_fd(fd, VIRTIO_CONFIG_S_ACKNOWLEDGE | > + VIRTIO_CONFIG_S_DRIVER); > +} > + > static void vhost_vdpa_reset_status(struct vhost_dev *dev) > { > struct vhost_vdpa *v =3D dev->opaque; > @@ -1178,9 +1202,7 @@ static void vhost_vdpa_reset_status(struct vhost_de= v *dev) > return; > } > > - vhost_vdpa_reset_device(dev); > - vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE | > - VIRTIO_CONFIG_S_DRIVER); > + vhost_vdpa_reset_status_fd(vhost_vdpa_dev_fd(dev)); > memory_listener_unregister(&v->listener); > } > > -- > 2.31.1 >