From nobody Wed Feb 11 02:09:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1693392877; cv=none; d=zohomail.com; s=zohoarc; b=nANapldVkv8nOT+3RbagYHFL/86xVrqBkPn+aAMbv3o5LJII4gkgfIE9cuHJUAIumhaNrvepVp//RkqJPv/iBGtM2kJ/77YH10N6Bp6jK8CmBYhAanWTbzvwMeh7JyI4214wBZmVTEIzi0C1FL1hgeVWbGagPt9vtqkK1Bxt+Ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693392877; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lyCj/h3cc/1i/jn2ZwwJQiCYBmEXvRhhTLlZ6xoEEi0=; b=kdHPHYR+m3B46oSGsXlIz+zDz265v5iii4COltWGwSSNr0wVQKdo4YcAfwrTq37fU6nsA0tLLb/ZZVT1wtdDb2/Crj7/h0Iwhti0HVpVklUk/SyrMEon0wwsJR5my5yo+5hLMU/WJEU7irdfMl9Dbdgh3O8NUa9F1VF5k/43eK8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693392877209200.12178296812863; Wed, 30 Aug 2023 03:54:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbIpM-0004O8-4N; Wed, 30 Aug 2023 06:53:36 -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 1qbIpJ-0004Mw-ND; Wed, 30 Aug 2023 06:53:33 -0400 Received: from mgamail.intel.com ([192.55.52.93]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbIpH-0007fH-4Y; Wed, 30 Aug 2023 06:53:33 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 03:53:19 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 03:53:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693392811; x=1724928811; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sMYo/7cpo6pQSEDRVcxQXWkRt9bc8yQALxYISmMeMZY=; b=fH0rcSL0vXO1dZmkjH3fonWR/tALJbR7t6SK7vARdp3GHzs+5cyUd4Pu DGoeCT2JGqICO/78bj8v0sb+CBTHAkrelKLMpKc3AEazNh4b0zjyMgJx1 w7Z6Wo3LVpZg7i4KgBgmzIGkSPXf4tjVqPbGXj9btdTk+vGX2KxXMNShc QasUkIQbzAU1DQboZi/DBDp5a4z2GHYUxQEm7SXb+6ftg27lt+zTm0TF2 0PGKC6imc+In/q/2Fau+PPjptZ6yWJXpYHsK5rTeMcZJOeb1jCbMTV1W1 0agQuIsZ+yJTUSReYClYiuEYQONGipJZTxoqD7KVhi/XSu7+tXO05CQjU A==; X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="373016597" X-IronPort-AV: E=Sophos;i="6.02,213,1688454000"; d="scan'208";a="373016597" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="715866153" X-IronPort-AV: E=Sophos;i="6.02,213,1688454000"; d="scan'208";a="715866153" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , Tony Krowiak , Halil Pasic , Jason Herne , Thomas Huth , qemu-s390x@nongnu.org (open list:vfio-ap) Subject: [PATCH v1 11/22] vfio/ap: Use vfio_[attach/detach]_device Date: Wed, 30 Aug 2023 18:37:43 +0800 Message-Id: <20230830103754.36461-12-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230830103754.36461-1-zhenzhong.duan@intel.com> References: <20230830103754.36461-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.93; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1693392877975100001 Content-Type: text/plain; charset="utf-8" From: Eric Auger Let the vfio-ap device use vfio_attach_device() and vfio_detach_device(), hence hiding the details of the used IOMMU backend. Signed-off-by: Eric Auger Signed-off-by: Yi Liu Signed-off-by: Zhenzhong Duan --- hw/vfio/ap.c | 68 +++++++++------------------------------------------- 1 file changed, 11 insertions(+), 57 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 6e21d1da5a..16ea7fb3c2 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -53,40 +53,6 @@ struct VFIODeviceOps vfio_ap_ops =3D { .vfio_compute_needs_reset =3D vfio_ap_compute_needs_reset, }; =20 -static void vfio_ap_put_device(VFIOAPDevice *vapdev) -{ - g_free(vapdev->vdev.name); - vfio_put_base_device(&vapdev->vdev); -} - -static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp) -{ - GError *gerror =3D NULL; - char *symlink, *group_path; - int groupid; - - symlink =3D g_strdup_printf("%s/iommu_group", vapdev->vdev.sysfsdev); - group_path =3D g_file_read_link(symlink, &gerror); - g_free(symlink); - - if (!group_path) { - error_setg(errp, "%s: no iommu_group found for %s: %s", - TYPE_VFIO_AP_DEVICE, vapdev->vdev.sysfsdev, gerror->mes= sage); - g_error_free(gerror); - return NULL; - } - - if (sscanf(basename(group_path), "%d", &groupid) !=3D 1) { - error_setg(errp, "vfio: failed to read %s", group_path); - g_free(group_path); - return NULL; - } - - g_free(group_path); - - return vfio_get_group(groupid, &address_space_memory, errp); -} - static void vfio_ap_req_notifier_handler(void *opaque) { VFIOAPDevice *vapdev =3D opaque; @@ -189,22 +155,15 @@ static void vfio_ap_unregister_irq_notifier(VFIOAPDev= ice *vapdev, static void vfio_ap_realize(DeviceState *dev, Error **errp) { int ret; - char *mdevid; Error *err =3D NULL; - VFIOGroup *vfio_group; APDevice *apdev =3D AP_DEVICE(dev); VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); + VFIODevice *vbasedev =3D &vapdev->vdev; =20 - vfio_group =3D vfio_ap_get_group(vapdev, errp); - if (!vfio_group) { - return; - } - - vapdev->vdev.ops =3D &vfio_ap_ops; - vapdev->vdev.type =3D VFIO_DEVICE_TYPE_AP; - mdevid =3D basename(vapdev->vdev.sysfsdev); - vapdev->vdev.name =3D g_strdup_printf("%s", mdevid); - vapdev->vdev.dev =3D dev; + vbasedev->name =3D g_path_get_basename(vbasedev->sysfsdev); + vbasedev->ops =3D &vfio_ap_ops; + vbasedev->type =3D VFIO_DEVICE_TYPE_AP; + vbasedev->dev =3D dev; =20 /* * vfio-ap devices operate in a way compatible with discarding of @@ -214,9 +173,11 @@ static void vfio_ap_realize(DeviceState *dev, Error **= errp) */ vapdev->vdev.ram_block_discard_allowed =3D true; =20 - ret =3D vfio_get_device(vfio_group, mdevid, &vapdev->vdev, errp); + ret =3D vfio_attach_device(vbasedev->name, vbasedev, + &address_space_memory, errp); if (ret) { - goto out_get_dev_err; + g_free(vbasedev->name); + return; } =20 vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err); @@ -227,23 +188,16 @@ static void vfio_ap_realize(DeviceState *dev, Error *= *errp) */ error_report_err(err); } - - return; - -out_get_dev_err: - vfio_ap_put_device(vapdev); - vfio_put_group(vfio_group); } =20 static void vfio_ap_unrealize(DeviceState *dev) { APDevice *apdev =3D AP_DEVICE(dev); VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); - VFIOGroup *group =3D vapdev->vdev.group; =20 vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX); - vfio_ap_put_device(vapdev); - vfio_put_group(group); + vfio_detach_device(&vapdev->vdev); + g_free(vapdev->vdev.name); } =20 static Property vfio_ap_properties[] =3D { --=20 2.34.1