From patchwork Wed Nov 13 13:46:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13873765 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 4F3041FF605 for ; Wed, 13 Nov 2024 13:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731505579; cv=none; b=ajEnt2A1q+3Lu+c88CB/qDIz6wVEUu3RVabqSlCxY/sedPDpH95ILHmpzkrIwomJzFxIhj4tIy6iRNAEid70L3kEeyjUhgBH+vNJjzOFb0eKlfxXVHyuch89RQUQ/TaKynslrrqYdlCPmaWyCJD8gDJArKfd0B/9dLVvhUExJEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731505579; c=relaxed/simple; bh=CQNBEu2JwavCGSEpJSQqW92hh61UdmjmKwLxFCOoolw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cpwvNjABCH0T/5F1O2JHQfOiUWn5sYQnaOM159lD4rWoOQf79cGHz57eZJ3l6mORSRU8DCip24GyaEvCPcjle+YK4Nzmo+xPrqrSahl36AubKRtbMaysp6J+aDEcKEJtmoE/bwagmkwpcTfmjbXAjSVm+RcDJDFjq5zMRuBe0ks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=UTj7O8e1; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UTj7O8e1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731505578; x=1763041578; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CQNBEu2JwavCGSEpJSQqW92hh61UdmjmKwLxFCOoolw=; b=UTj7O8e1z5MwNhByKLnK8bl7Yg/OY5IiWrLzg4xJJQTNDdpGt76y7LoH lox09XbIUmh9qKYYuvi0QDGxJfgMsxgWGg1MivALBfKlxHfMFHGayVv2F Sv1ZT6UQkcbd4XCfiCQijJmOKYBcYpOglX+/+drTqQWuE0l2eac6iipVK OZCcKQnHBNIiMwva2e4l5MfQiu1y9beuM7lRkYOb/mP1fglCtjd0HE2sx zwGcbchP48BOf2mqwr0bbGL+s33mzwq2KDoIaBhQILFuOq6hKVANSGJ1+ DE/OtEyvUxcN1vkBSCNz4BLUErO0WUMypV9ygPw/xDNAzouzj7ZbBuhnK g==; X-CSE-ConnectionGUID: hWhZ1oW+SFyQam2Hw0NDDQ== X-CSE-MsgGUID: ZjdT+1KoS2ei2+l5a4An0Q== X-IronPort-AV: E=McAfee;i="6700,10204,11254"; a="42025711" X-IronPort-AV: E=Sophos;i="6.12,151,1728975600"; d="scan'208";a="42025711" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2024 05:46:17 -0800 X-CSE-ConnectionGUID: X9t7aTfzTRmvl5Q51QwOqQ== X-CSE-MsgGUID: lAhf9qYGQXKB1BRsoo04FQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,151,1728975600"; d="scan'208";a="87445598" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa006.fm.intel.com with ESMTP; 13 Nov 2024 05:46:16 -0800 From: Yi Liu To: joro@8bytes.org, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org Subject: [PATCH v5 4/7] iommu/arm-smmu-v3: Make the blocked domain support PASID Date: Wed, 13 Nov 2024 05:46:10 -0800 Message-Id: <20241113134613.7173-5-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241113134613.7173-1-yi.l.liu@intel.com> References: <20241113134613.7173-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Jason Gunthorpe The blocked domain is used to park RID to be blocking DMA state. This can be extended to PASID as well. By this, the remove_dev_pasid() op of ARM SMMUv3 can be dropped. Signed-off-by: Jason Gunthorpe Reviewed-by: Kevin Tian Reviewed-by: Nicolin Chen Signed-off-by: Yi Liu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 7ee3cbbe3744..276738d047e7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2979,13 +2979,12 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master, return ret; } -static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid, - struct iommu_domain *domain) +static int arm_smmu_blocking_set_dev_pasid(struct iommu_domain *new_domain, + struct device *dev, ioasid_t pasid, + struct iommu_domain *old_domain) { + struct arm_smmu_domain *smmu_domain = to_smmu_domain(old_domain); struct arm_smmu_master *master = dev_iommu_priv_get(dev); - struct arm_smmu_domain *smmu_domain; - - smmu_domain = to_smmu_domain(domain); mutex_lock(&arm_smmu_asid_lock); arm_smmu_clear_cd(master, pasid); @@ -3006,6 +3005,7 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid, sid_domain->type == IOMMU_DOMAIN_BLOCKED) sid_domain->ops->attach_dev(sid_domain, dev); } + return 0; } static void arm_smmu_attach_dev_ste(struct iommu_domain *domain, @@ -3087,6 +3087,7 @@ static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain, static const struct iommu_domain_ops arm_smmu_blocked_ops = { .attach_dev = arm_smmu_attach_dev_blocked, + .set_dev_pasid = arm_smmu_blocking_set_dev_pasid, }; static struct iommu_domain arm_smmu_blocked_domain = { @@ -3514,7 +3515,6 @@ static struct iommu_ops arm_smmu_ops = { .device_group = arm_smmu_device_group, .of_xlate = arm_smmu_of_xlate, .get_resv_regions = arm_smmu_get_resv_regions, - .remove_dev_pasid = arm_smmu_remove_dev_pasid, .dev_enable_feat = arm_smmu_dev_enable_feature, .dev_disable_feat = arm_smmu_dev_disable_feature, .page_response = arm_smmu_page_response,