From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FE6D15ECE2 for ; Wed, 29 May 2024 05:36:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716960975; cv=none; b=GTgnawTm9QoG6xOnMCaoPKveOdfDxPbyAadxQ1rqcUqr89QD+Hgn7eBfsGFuffhoYjCy2bWCt0WhnOL5d6tLply+AuFlYiSH+e7sStlA1N3CRaFRLSf8Zm3R+oUJmzh+tPXu0Z6dMfrIkyRATPQ4cc4P/8Re/LKYpR+M0QX0wqg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716960975; c=relaxed/simple; bh=Ku98pK7UgGN8K4Vqi8YCUxqt/MmWDBRD7GnhYQUhVEg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lONaZNz7eliA8ktviOz/46XUH9pkq53a/HqmonghK56TAJNm5+h4ClcPSrf2eIz+YVvcLFjC7Wnc4xrOPkiFu8V0zn3p+olvolu2Dhy3JSXNBUYxK9cGKbPoHDnta4DZCIIkssY3aaBmE6wGG/a3exm1ati9vcG/blotbwALGz4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=X4xShdGV; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="X4xShdGV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716960974; x=1748496974; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ku98pK7UgGN8K4Vqi8YCUxqt/MmWDBRD7GnhYQUhVEg=; b=X4xShdGVvdJ9LDTCe1mgRGQ+NSanMs/Qkoh7dtLtYEIVNAxkmRlHmxJe iO69zMCxVUvllfsKL6mMoBlcYa/lRohF9FbuEfQKM4ShNIfE1whL1Jfzg aIfkgBEa0uoBFvGQ/4WfeQVsr0tKR4IJYyJNX4RZCR4QuTas3DnRlxS5E X3tSOEPb34fU7XGzxfcM0w1mG1t9I+cRdM3eedpgvKm7eNC6P1ATyjpSw cuEMoLWq8mUMEXu3p37b+IqSWONp+OJUL1zy0QJaYuIVXNA3WpWLYCLCq vfdOiqKn+ygiSDKYqfisxjhiaIgZJ4gLEnlHPlwPzz4SsIaaLDQCL73Hn Q==; X-CSE-ConnectionGUID: /B4evDUwReamMlN1fvr0zw== X-CSE-MsgGUID: Hn8KWOdgTYS+CPtIyKevTA== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="13568787" X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="13568787" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 22:35:16 -0700 X-CSE-ConnectionGUID: WiRHsEl4TRC1JXRxiW5i8g== X-CSE-MsgGUID: 4zBoCP3eR6Ce1YRhsCapLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="35257489" Received: from unknown (HELO allen-box.sh.intel.com) ([10.239.159.127]) by fmviesa007.fm.intel.com with ESMTP; 28 May 2024 22:35:11 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: Yi Liu , David Airlie , Daniel Vetter , Kalle Valo , Bjorn Andersson , Mathieu Poirier , Alex Williamson , mst@redhat.com, Jason Wang , Thierry Reding , Jonathan Hunter , Mikko Perttunen , iommu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 03/20] vfio/type1: Use iommu_paging_domain_alloc() Date: Wed, 29 May 2024 13:32:33 +0800 Message-Id: <20240529053250.91284-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240529053250.91284-1-baolu.lu@linux.intel.com> References: <20240529053250.91284-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace iommu_domain_alloc() with iommu_user_domain_alloc(). Signed-off-by: Lu Baolu --- drivers/vfio/vfio_iommu_type1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 3a0218171cfa..1d553f7f7c26 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2135,7 +2135,7 @@ static int vfio_iommu_domain_alloc(struct device *dev, void *data) { struct iommu_domain **domain = data; - *domain = iommu_domain_alloc(dev->bus); + *domain = iommu_user_domain_alloc(dev, 0); return 1; /* Don't iterate */ } @@ -2192,11 +2192,12 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, * us a representative device for the IOMMU API call. We don't actually * want to iterate beyond the first device (if any). */ - ret = -EIO; iommu_group_for_each_dev(iommu_group, &domain->domain, vfio_iommu_domain_alloc); - if (!domain->domain) + if (IS_ERR(domain->domain)) { + ret = PTR_ERR(domain->domain); goto out_free_domain; + } if (iommu->nesting) { ret = iommu_enable_nesting(domain->domain); -- 2.34.1