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 F0A0BC3DA49 for ; Tue, 23 Jul 2024 08:08:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sWAZM-00010N-Hf; Tue, 23 Jul 2024 04:08:24 -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 1sWAZK-0000zm-2m for qemu-devel@nongnu.org; Tue, 23 Jul 2024 04:08:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sWAZH-0005Yf-Vh for qemu-devel@nongnu.org; Tue, 23 Jul 2024 04:08:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721722098; 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=SEQuBO1UdFjsR6lairi9tvjntY/oXU67T8RWCYIPMyk=; b=b30RI0eds12I8AUW354aoJO+YOSM4oQmr5+SedD/00aWSiqfPw7x31tdDGhBseg7T7djO6 I+wXovp4IcP8Dhs3gNKudJ4BpTLTYcV+FCTY2icdAJ7tuSlQkgh7WnE0PA1NIe4TLoHfCH 3CBPraHW85duv79uc4BQgdStpGe1BJU= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-58-e0Rb3JPLP7CBsijns2PUuQ-1; Tue, 23 Jul 2024 04:08:14 -0400 X-MC-Unique: e0Rb3JPLP7CBsijns2PUuQ-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-52efc9f2035so1869686e87.1 for ; Tue, 23 Jul 2024 01:08:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721722092; x=1722326892; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SEQuBO1UdFjsR6lairi9tvjntY/oXU67T8RWCYIPMyk=; b=CPg7VeXW9uz0VldLqUbKnHZMV51TbS7UvQcHfAG0wOdEJuAwzIXH34I82aJyaxXzaY 6I3ax1H8bPsVvNOI04u8IuBUDhCg0rrO0tyagAaDM6iNY4EMC3eLKS0QoS+CspsqZPtE SaK1yjb0LmUmgsEWeUw7TPe0MGIm2sWC9dFqivq4M0gWTIBCMj5w6XSlrSaJ6stXNrjn 3gDKtP126PKzUADRr6HkJGgwcMCue7LuhPl/Gh64tDRp4L4n+vyzMMvCuaZuiPujUC22 WBH8u/tVzTz7bhcn3YByBchLhVKV7ZQhlnVTh0wISRbQjOTjOQMDq0FyOl3nZ2H9HZLs lAgg== X-Forwarded-Encrypted: i=1; AJvYcCWmPsU4aMFcStw5YXfaFGOYb96EB7leBz9yzYzfJUvrwObcnyhCwPTC3LTbzEoiece+s1Cu+DxeLGK28q0uSTyIr5A1L6c= X-Gm-Message-State: AOJu0YwiHgvllEue8xKrhsDAzCdFQNUq4qaoTHQOk9XqWc39RqJzutZB NNDs3zFfBrzSP15NCj9nNhNrjXmR8FEFlIJ89ji7X3cw0FINkc3wQEHqQJBxS4xIX4YDdEbr3SM XOjJxQfHDOBPMHc1mZuMwObrprewwyX3yNgiUipzzuEF416q71SuA X-Received: by 2002:a05:6512:2309:b0:52e:7448:e137 with SMTP id 2adb3069b0e04-52efb52387fmr6210138e87.6.1721722092615; Tue, 23 Jul 2024 01:08:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFejrvV1s+azx4wjKQ0+NbVYz1sgr+Olut1DlwrEqwgXhD5eoB13Ra309fVHlF2iIYPPrfHyQ== X-Received: by 2002:a05:6512:2309:b0:52e:7448:e137 with SMTP id 2adb3069b0e04-52efb52387fmr6210123e87.6.1721722092182; Tue, 23 Jul 2024 01:08:12 -0700 (PDT) Received: from ?IPV6:2a01:e0a:9e2:9000:bed7:42c6:fb19:d12e? ([2a01:e0a:9e2:9000:bed7:42c6:fb19:d12e]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7a9b5d9288sm34016066b.25.2024.07.23.01.08.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Jul 2024 01:08:11 -0700 (PDT) Message-ID: Date: Tue, 23 Jul 2024 10:08:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 4/9] vfio/{iommufd,container}: Invoke HostIOMMUDevice::realize() during attach_device() To: Joao Martins , eric.auger@redhat.com, qemu-devel@nongnu.org Cc: Yi Liu , Zhenzhong Duan , Alex Williamson , Jason Gunthorpe , Avihai Horon References: <20240722211326.70162-1-joao.m.martins@oracle.com> <20240722211326.70162-5-joao.m.martins@oracle.com> <8405600f-ffa2-43c2-8e51-7b6674de11ae@redhat.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.133, 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_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.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 7/23/24 10:05, Joao Martins wrote: > On 23/07/2024 08:55, Eric Auger wrote: >> >> >> On 7/23/24 09:44, Cédric Le Goater wrote: >>> On 7/23/24 09:38, Eric Auger wrote: >>>> Hi Joao, >>>> >>>> On 7/22/24 23:13, Joao Martins wrote: >>>>> Move the HostIOMMUDevice::realize() to be invoked during the attach >>>>> of the device >>>>> before we allocate IOMMUFD hardware pagetable objects (HWPT). This >>>>> allows the use >>>>> of the hw_caps obtained by IOMMU_GET_HW_INFO that essentially tell >>>>> if the IOMMU >>>>> behind the device supports dirty tracking. >>>>> >>>>> Note: The HostIOMMUDevice data from legacy backend is static and >>>>> doesn't >>>>> need any information from the (type1-iommu) backend to be initialized. >>>>> In contrast however, the IOMMUFD HostIOMMUDevice data requires the >>>>> iommufd FD to be connected and having a devid to be able to >>>>> successfully >>>> Nit: maybe this comment shall be also added in iommufd.c before the call >>>> to vfio_device_hiod_realize() to avoid someone else to move that call >>>> earlier at some point >>>>> GET_HW_INFO. This means vfio_device_hiod_realize() is called in >>>>> different places within the backend .attach_device() implementation. >>>>> >>>>> Suggested-by: Cédric Le Goater >>>>> Signed-off-by: Joao Martins >>>>> Reviewed-by: Zhenzhong Duan >>>>> --- >>>>>   include/hw/vfio/vfio-common.h |  1 + >>>>>   hw/vfio/common.c              | 16 ++++++---------- >>>>>   hw/vfio/container.c           |  4 ++++ >>>>>   hw/vfio/helpers.c             | 11 +++++++++++ >>>>>   hw/vfio/iommufd.c             |  4 ++++ >>>>>   5 files changed, 26 insertions(+), 10 deletions(-) >>>>> >>>>> diff --git a/include/hw/vfio/vfio-common.h >>>>> b/include/hw/vfio/vfio-common.h >>>>> index 1a96678f8c38..4e44b26d3c45 100644 >>>>> --- a/include/hw/vfio/vfio-common.h >>>>> +++ b/include/hw/vfio/vfio-common.h >>>>> @@ -242,6 +242,7 @@ void vfio_region_finalize(VFIORegion *region); >>>>>   void vfio_reset_handler(void *opaque); >>>>>   struct vfio_device_info *vfio_get_device_info(int fd); >>>>>   bool vfio_device_is_mdev(VFIODevice *vbasedev); >>>>> +bool vfio_device_hiod_realize(VFIODevice *vbasedev, Error **errp); >>>>>   bool vfio_attach_device(char *name, VFIODevice *vbasedev, >>>>>                           AddressSpace *as, Error **errp); >>>>>   void vfio_detach_device(VFIODevice *vbasedev); >>>>> diff --git a/hw/vfio/common.c b/hw/vfio/common.c >>>>> index 784e266e6aab..da12cbd56408 100644 >>>>> --- a/hw/vfio/common.c >>>>> +++ b/hw/vfio/common.c >>>>> @@ -1537,7 +1537,7 @@ bool vfio_attach_device(char *name, VFIODevice >>>>> *vbasedev, >>>>>   { >>>>>       const VFIOIOMMUClass *ops = >>>>> >>>>> VFIO_IOMMU_CLASS(object_class_by_name(TYPE_VFIO_IOMMU_LEGACY)); >>>>> -    HostIOMMUDevice *hiod; >>>>> +    HostIOMMUDevice *hiod = NULL; >>>>>         if (vbasedev->iommufd) { >>>>>           ops = >>>>> VFIO_IOMMU_CLASS(object_class_by_name(TYPE_VFIO_IOMMU_IOMMUFD)); >>>>> @@ -1545,21 +1545,17 @@ bool vfio_attach_device(char *name, >>>>> VFIODevice *vbasedev, >>>>>         assert(ops); >>>>>   -    if (!ops->attach_device(name, vbasedev, as, errp)) { >>>>> -        return false; >>>>> -    } >>>>>   -    if (vbasedev->mdev) { >>>>> -        return true; >>>>> +    if (!vbasedev->mdev) { >>>>> +        hiod = HOST_IOMMU_DEVICE(object_new(ops->hiod_typename)); >>>>> +        vbasedev->hiod = hiod; >>>>>       } >>>>>   -    hiod = HOST_IOMMU_DEVICE(object_new(ops->hiod_typename)); >>>>> -    if (!HOST_IOMMU_DEVICE_GET_CLASS(hiod)->realize(hiod, vbasedev, >>>>> errp)) { >>>>> +    if (!ops->attach_device(name, vbasedev, as, errp)) { >>>>>           object_unref(hiod); >>>>> -        ops->detach_device(vbasedev); >>>>> +        vbasedev->hiod = NULL; >>>>>           return false; >>>>>       } >>>>> -    vbasedev->hiod = hiod; >>>>>         return true; >>>>>   } >>>>> diff --git a/hw/vfio/container.c b/hw/vfio/container.c >>>>> index 10cb4b4320ac..9ccdb639ac84 100644 >>>>> --- a/hw/vfio/container.c >>>>> +++ b/hw/vfio/container.c >>>>> @@ -914,6 +914,10 @@ static bool vfio_legacy_attach_device(const >>>>> char *name, VFIODevice *vbasedev, >>>>>         trace_vfio_attach_device(vbasedev->name, groupid); >>>>>   +    if (!vfio_device_hiod_realize(vbasedev, errp)) { >>>>> +        return false; >>>> don't you want to go to err_alloc_ioas instead? >>> >>> hmm, the err_alloc_ioas label is in a different function >>> iommufd_cdev_attach(). >>> >>> may be you meant the comment for routine iommufd_cdev_attach() and >>> label err_connect_bind ? >>> >>> >>> Thanks, >>> >>> C. >>> >>> >>>>> +    } >>>>> + >>>>>       group = vfio_get_group(groupid, as, errp); >>>>>       if (!group) { >>>>>           return false; >>>>> diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c >>>>> index 7e23e9080c9d..ea15c79db0a3 100644 >>>>> --- a/hw/vfio/helpers.c >>>>> +++ b/hw/vfio/helpers.c >>>>> @@ -689,3 +689,14 @@ bool vfio_device_is_mdev(VFIODevice *vbasedev) >>>>>       subsys = realpath(tmp, NULL); >>>>>       return subsys && (strcmp(subsys, "/sys/bus/mdev") == 0); >>>>>   } >>>>> + >>>>> +bool vfio_device_hiod_realize(VFIODevice *vbasedev, Error **errp) >>>>> +{ >>>>> +    HostIOMMUDevice *hiod = vbasedev->hiod; >>>>> + >>>>> +    if (!hiod) { >>>>> +        return true; >>>>> +    } >>>>> + >>>>> +    return HOST_IOMMU_DEVICE_GET_CLASS(hiod)->realize(hiod, >>>>> vbasedev, errp); >>>>> +} >>>>> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c >>>>> index 5e2fc1ce089d..2324bf892c56 100644 >>>>> --- a/hw/vfio/iommufd.c >>>>> +++ b/hw/vfio/iommufd.c >>>>> @@ -403,6 +403,10 @@ static bool iommufd_cdev_attach(const char >>>>> *name, VFIODevice *vbasedev, >>>>>         space = vfio_get_address_space(as); >>>>>   +    if (!vfio_device_hiod_realize(vbasedev, errp)) { >>>>> +        return false; >> Hum sorry my previous comment was targetting that place. I think >> unrolling is needed up to put_address_space >> >> so effectively this does not match err_alloc_ioas but I guess we would >> need another label >> > > You're right. We haven't yet attached rthe device and that's what err_alloc_ioas > would do. Adding another label not sure would make things cleaner given the > ordering requirement. So maybe this instead? > > @@ -482,7 +483,8 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice > *vbasedev, > space = vfio_get_address_space(as); > > if (!vfio_device_hiod_realize(vbasedev, errp)) { > - return false; > + vfio_put_address_space(space); > + goto err_connect_bind; > } > > /* try to attach to an existing container in this space */ > LGTM. Thanks, C.