From nobody Fri Dec 19 15:47:53 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 DD49718AEA; Mon, 12 Feb 2024 01:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707701362; cv=none; b=gCj1qnb+z4AijsXcndSDrDSu8w3uJlk95IMqINQg+wzN6FzdxCRfdaom7R1j1o4YNVorsAo6A80BSOmGnSq5al7DdbXDGfXPXCiQC5cRRWRhN4NlDusHOJo57StaD1ZvJK2LU5GYd/fE2nvKWE5cWfKzo/6D3tn+oHTNDg2iSh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707701362; c=relaxed/simple; bh=XBlWfviHQ2r7aBjkRLrI3TMQKAtXtxPcTjG5M5Y798c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CCZu6hA+v6EcdCxlwn9r9tl9guCwfJCCuHgACs4bal3P/ibNhtr0LWQRE/3NSyfMc7nQrv/xr3H0jN4BwvKwKVPyUgWMuTfEzy+cqB2MtVmUotSHnYUYV3S+s59TfETDxPyxQfPAu4uTlqkbJ53C8vP2NkfhBt42A6fFErjr3a0= 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=G2/d7jz7; arc=none smtp.client-ip=198.175.65.15 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="G2/d7jz7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707701362; x=1739237362; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XBlWfviHQ2r7aBjkRLrI3TMQKAtXtxPcTjG5M5Y798c=; b=G2/d7jz795ci048Sz+ih2tE7OE6++9Leu1iyDLvzNA2Aga/X4ZjtKlf3 dLXsqY5SVoRF7s3ohfPUynbylIWr5zEW651qcOrlU3Ai2X6aPY331Ozre bwK+b/mp/JEfMpXK+5jh+xgh9aEivCR485UuWaSjACaGtDO4kltyzFerg M+MoXYoDZCDDUy6h5TF/Uy8umeHj3v2mUCbeNb1lUdfCMzhAxybDW6qU4 ANeUZCiKbbsahTiuGSVQNs61LfhGl62dHGCZHdQe9odNkjmsX5j09axFG UX4WPlDCxcvkEwjJtTwM5Fm0NaUmJ8ZrzNEhPp4s+FbZyvbPsd9z7d59c w==; X-IronPort-AV: E=McAfee;i="6600,9927,10981"; a="5502222" X-IronPort-AV: E=Sophos;i="6.05,261,1701158400"; d="scan'208";a="5502222" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2024 17:29:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,261,1701158400"; d="scan'208";a="7132268" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orviesa005.jf.intel.com with ESMTP; 11 Feb 2024 17:29:17 -0800 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Jean-Philippe Brucker , Nicolin Chen Cc: Yi Liu , Jacob Pan , Longfang Liu , Yan Zhao , Joel Granados , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH v13 16/16] iommu: Make iommu_report_device_fault() return void Date: Mon, 12 Feb 2024 09:22:27 +0800 Message-Id: <20240212012227.119381-17-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240212012227.119381-1-baolu.lu@linux.intel.com> References: <20240212012227.119381-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As the iommu_report_device_fault() has been converted to auto-respond a page fault if it fails to enqueue it, there's no need to return a code in any case. Make it return void. Suggested-by: Jason Gunthorpe Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian --- include/linux/iommu.h | 5 ++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/intel/svm.c | 19 ++++++---------- drivers/iommu/io-pgfault.c | 25 +++++++-------------- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 326aae1ab3a2..de839fd01bb8 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1569,7 +1569,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name); void iopf_queue_free(struct iopf_queue *queue); int iopf_queue_discard_partial(struct iopf_queue *queue); void iopf_free_group(struct iopf_group *group); -int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt); +void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt); void iopf_group_response(struct iopf_group *group, enum iommu_page_response_code status); #else @@ -1607,10 +1607,9 @@ static inline void iopf_free_group(struct iopf_group= *group) { } =20 -static inline int +static inline void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) { - return -ENODEV; } =20 static inline void iopf_group_response(struct iopf_group *group, diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/ar= m/arm-smmu-v3/arm-smmu-v3.c index 42eb59cb99f4..02580364acda 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1455,7 +1455,7 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u3= 2 sid) /* IRQ and event handlers */ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) { - int ret; + int ret =3D 0; u32 perm =3D 0; struct arm_smmu_master *master; bool ssid_valid =3D evt[0] & EVTQ_0_SSV; @@ -1511,7 +1511,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device= *smmu, u64 *evt) goto out_unlock; } =20 - ret =3D iommu_report_device_fault(master->dev, &fault_evt); + iommu_report_device_fault(master->dev, &fault_evt); out_unlock: mutex_unlock(&smmu->streams_mutex); return ret; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 2f8716636dbb..b644d57da841 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -561,14 +561,11 @@ static int prq_to_iommu_prot(struct page_req_dsc *req) return prot; } =20 -static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *= dev, - struct page_req_dsc *desc) +static void intel_svm_prq_report(struct intel_iommu *iommu, struct device = *dev, + struct page_req_dsc *desc) { struct iopf_fault event =3D { }; =20 - if (!dev || !dev_is_pci(dev)) - return -ENODEV; - /* Fill in event data for device specific processing */ event.fault.type =3D IOMMU_FAULT_PAGE_REQ; event.fault.prm.addr =3D (u64)desc->addr << VTD_PAGE_SHIFT; @@ -601,7 +598,7 @@ static int intel_svm_prq_report(struct intel_iommu *iom= mu, struct device *dev, event.fault.prm.private_data[0] =3D ktime_to_ns(ktime_get()); } =20 - return iommu_report_device_fault(dev, &event); + iommu_report_device_fault(dev, &event); } =20 static void handle_bad_prq_event(struct intel_iommu *iommu, @@ -704,12 +701,10 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (!pdev) goto bad_req; =20 - if (intel_svm_prq_report(iommu, &pdev->dev, req)) - handle_bad_prq_event(iommu, req, QI_RESP_INVALID); - else - trace_prq_report(iommu, &pdev->dev, req->qw_0, req->qw_1, - req->priv_data[0], req->priv_data[1], - iommu->prq_seq_number++); + intel_svm_prq_report(iommu, &pdev->dev, req); + trace_prq_report(iommu, &pdev->dev, req->qw_0, req->qw_1, + req->priv_data[0], req->priv_data[1], + iommu->prq_seq_number++); pci_dev_put(pdev); prq_advance: head =3D (head + sizeof(*req)) & PRQ_RING_MASK; diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c index 6a325bff8164..06d78fcc79fd 100644 --- a/drivers/iommu/io-pgfault.c +++ b/drivers/iommu/io-pgfault.c @@ -176,26 +176,22 @@ static struct iopf_group *iopf_group_alloc(struct iom= mu_fault_param *iopf_param, * freed after the device has stopped generating page faults (or the iommu * hardware has been set to block the page faults) and the pending page fa= ults * have been flushed. - * - * Return: 0 on success and <0 on error. */ -int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) +void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) { struct iommu_fault *fault =3D &evt->fault; struct iommu_fault_param *iopf_param; struct iopf_group abort_group =3D {}; struct iopf_group *group; - int ret; =20 iopf_param =3D iopf_get_dev_fault_param(dev); if (WARN_ON(!iopf_param)) - return -ENODEV; + return; =20 if (!(fault->prm.flags & IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE)) { - ret =3D report_partial_fault(iopf_param, fault); + report_partial_fault(iopf_param, fault); iopf_put_dev_fault_param(iopf_param); /* A request that is not the last does not need to be ack'd */ - return ret; } =20 /* @@ -207,25 +203,21 @@ int iommu_report_device_fault(struct device *dev, str= uct iopf_fault *evt) * leaving, otherwise partial faults will be stuck. */ group =3D iopf_group_alloc(iopf_param, evt, &abort_group); - if (group =3D=3D &abort_group) { - ret =3D -ENOMEM; + if (group =3D=3D &abort_group) goto err_abort; - } =20 group->domain =3D get_domain_for_iopf(dev, fault); - if (!group->domain) { - ret =3D -EINVAL; + if (!group->domain) goto err_abort; - } =20 /* * On success iopf_handler must call iopf_group_response() and * iopf_free_group() */ - ret =3D group->domain->iopf_handler(group); - if (ret) + if (group->domain->iopf_handler(group)) goto err_abort; - return 0; + + return; =20 err_abort: iopf_group_response(group, IOMMU_PAGE_RESP_FAILURE); @@ -233,7 +225,6 @@ int iommu_report_device_fault(struct device *dev, struc= t iopf_fault *evt) __iopf_free_group(group); else iopf_free_group(group); - return ret; } EXPORT_SYMBOL_GPL(iommu_report_device_fault); =20 --=20 2.34.1