From nobody Sun Feb 8 05:41:19 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF0FBC71132 for ; Thu, 17 Aug 2023 23:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356272AbjHQXoe (ORCPT ); Thu, 17 Aug 2023 19:44:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356236AbjHQXoI (ORCPT ); Thu, 17 Aug 2023 19:44:08 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF55D35A7; Thu, 17 Aug 2023 16:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692315846; x=1723851846; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=a2Oz3cqp853jtT58PGinIwy9pSzC9pK0QZip//vzJxw=; b=Owb+56a+xlJa6Rfmjww1wP0MnNEqrAOLmmIoQmcMks40a6IpJFgtrWuG eGEchnBSHM040r+AkPeBoyEgWKxnk7AQXaq1uiNDlLbGs9sXFBSrcdCpT +lrsL3qv57+//gSr9vpkY9DMlZ1hX9RtD3qr2FcxGeWUw+p8pfzMAH/CQ /ueN+AGqC8T+hcArJCQChg0a9pifFl3Zc5VvqfhTb7lhIPpA0CAaHCIQ2 hGiazOtiEVl7uLb0kjxwRPcsTSjMnEuGitO39kIFgKKdKVzpqSQ+V5Jcx P72JcezWjmb7+NNdZEd3J5y2Wd+KOGu4t3D2g+YODOeVFdfBUS4PHnopG A==; X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="352552113" X-IronPort-AV: E=Sophos;i="6.01,181,1684825200"; d="scan'208";a="352552113" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2023 16:44:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="849051925" X-IronPort-AV: E=Sophos;i="6.01,181,1684825200"; d="scan'208";a="849051925" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmsmga002.fm.intel.com with ESMTP; 17 Aug 2023 16:44:01 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Jean-Philippe Brucker , Nicolin Chen Cc: Yi Liu , Jacob Pan , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 09/11] iommu: Make iommu_queue_iopf() more generic Date: Fri, 18 Aug 2023 07:40:45 +0800 Message-Id: <20230817234047.195194-10-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230817234047.195194-1-baolu.lu@linux.intel.com> References: <20230817234047.195194-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This completely separates the IO page fault handling framework from the SVA implementation. Previously, the SVA implementation was tightly coupled with the IO page fault handling framework. This makes SVA a "customer" of the IO page fault handling framework by converting domain's page fault handler to handle a group of faults and calling it directly from iommu_queue_iopf(). Signed-off-by: Lu Baolu --- include/linux/iommu.h | 5 +++-- drivers/iommu/iommu-sva.h | 8 -------- drivers/iommu/io-pgfault.c | 16 +++++++++++++--- drivers/iommu/iommu-sva.c | 14 ++++---------- drivers/iommu/iommu.c | 4 ++-- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ff292eea9d31..cf1cb0bb46af 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -41,6 +41,7 @@ struct iommu_sva; struct iommu_fault_event; struct iommu_dma_cookie; struct iopf_queue; +struct iopf_group; =20 #define IOMMU_FAULT_PERM_READ (1 << 0) /* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1) /* write */ @@ -175,8 +176,7 @@ struct iommu_domain { unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */ struct iommu_domain_geometry geometry; struct iommu_dma_cookie *iova_cookie; - enum iommu_page_response_code (*iopf_handler)(struct iommu_fault *fault, - void *data); + int (*iopf_handler)(struct iopf_group *group); void *fault_data; union { struct { @@ -526,6 +526,7 @@ struct iopf_group { struct list_head faults; struct work_struct work; struct device *dev; + void *data; }; =20 int iommu_device_register(struct iommu_device *iommu, diff --git a/drivers/iommu/iommu-sva.h b/drivers/iommu/iommu-sva.h index 510a7df23fba..cf41e88fac17 100644 --- a/drivers/iommu/iommu-sva.h +++ b/drivers/iommu/iommu-sva.h @@ -22,8 +22,6 @@ int iopf_queue_flush_dev(struct device *dev); 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); -enum iommu_page_response_code -iommu_sva_handle_iopf(struct iommu_fault *fault, void *data); void iopf_free_group(struct iopf_group *group); int iopf_queue_work(struct iopf_group *group, work_func_t func); int iommu_sva_handle_iopf_group(struct iopf_group *group); @@ -65,12 +63,6 @@ static inline int iopf_queue_discard_partial(struct iopf= _queue *queue) return -ENODEV; } =20 -static inline enum iommu_page_response_code -iommu_sva_handle_iopf(struct iommu_fault *fault, void *data) -{ - return IOMMU_PAGE_RESP_INVALID; -} - static inline void iopf_free_group(struct iopf_group *group) { } diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c index 00c2e447b740..a61c2aabd1b8 100644 --- a/drivers/iommu/io-pgfault.c +++ b/drivers/iommu/io-pgfault.c @@ -11,8 +11,6 @@ #include #include =20 -#include "iommu-sva.h" - /** * struct iopf_queue - IO Page Fault queue * @wq: the fault workqueue @@ -93,6 +91,7 @@ int iommu_queue_iopf(struct iommu_fault *fault, struct de= vice *dev) { int ret; struct iopf_group *group; + struct iommu_domain *domain; struct iopf_fault *iopf, *next; struct iommu_fault_param *iopf_param; struct dev_iommu *param =3D dev->iommu; @@ -124,6 +123,16 @@ int iommu_queue_iopf(struct iommu_fault *fault, struct= device *dev) return 0; } =20 + if (fault->prm.flags & IOMMU_FAULT_PAGE_REQUEST_PASID_VALID) + domain =3D iommu_get_domain_for_dev_pasid(dev, fault->prm.pasid, 0); + else + domain =3D iommu_get_domain_for_dev(dev); + + if (!domain || !domain->iopf_handler) { + ret =3D -ENODEV; + goto cleanup_partial; + } + group =3D kzalloc(sizeof(*group), GFP_KERNEL); if (!group) { /* @@ -137,6 +146,7 @@ int iommu_queue_iopf(struct iommu_fault *fault, struct = device *dev) =20 group->dev =3D dev; group->last_fault.fault =3D *fault; + group->data =3D domain->fault_data; INIT_LIST_HEAD(&group->faults); list_add(&group->last_fault.list, &group->faults); =20 @@ -147,7 +157,7 @@ int iommu_queue_iopf(struct iommu_fault *fault, struct = device *dev) list_move(&iopf->list, &group->faults); } =20 - ret =3D iommu_sva_handle_iopf_group(group); + ret =3D domain->iopf_handler(group); if (ret) iopf_free_group(group); =20 diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index df8734b6ec00..2811f34947ab 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -148,13 +148,14 @@ EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); /* * I/O page fault handler for SVA */ -enum iommu_page_response_code +static enum iommu_page_response_code iommu_sva_handle_iopf(struct iommu_fault *fault, void *data) { vm_fault_t ret; struct vm_area_struct *vma; - struct mm_struct *mm =3D data; unsigned int access_flags =3D 0; + struct iommu_domain *domain =3D data; + struct mm_struct *mm =3D domain->mm; unsigned int fault_flags =3D FAULT_FLAG_REMOTE; struct iommu_fault_page_request *prm =3D &fault->prm; enum iommu_page_response_code status =3D IOMMU_PAGE_RESP_INVALID; @@ -231,23 +232,16 @@ static void iommu_sva_iopf_handler(struct work_struct= *work) { struct iopf_fault *iopf; struct iopf_group *group; - struct iommu_domain *domain; enum iommu_page_response_code status =3D IOMMU_PAGE_RESP_SUCCESS; =20 group =3D container_of(work, struct iopf_group, work); - domain =3D iommu_get_domain_for_dev_pasid(group->dev, - group->last_fault.fault.prm.pasid, 0); - if (!domain || !domain->iopf_handler) - status =3D IOMMU_PAGE_RESP_INVALID; - list_for_each_entry(iopf, &group->faults, list) { /* * For the moment, errors are sticky: don't handle subsequent * faults in the group if there is an error. */ if (status =3D=3D IOMMU_PAGE_RESP_SUCCESS) - status =3D domain->iopf_handler(&iopf->fault, - domain->fault_data); + status =3D iommu_sva_handle_iopf(&iopf->fault, group->data); } =20 iommu_sva_complete_iopf(group->dev, &group->last_fault, status); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index b280b9f4d8b4..9b622088c741 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3395,8 +3395,8 @@ struct iommu_domain *iommu_sva_domain_alloc(struct de= vice *dev, domain->type =3D IOMMU_DOMAIN_SVA; mmgrab(mm); domain->mm =3D mm; - domain->iopf_handler =3D iommu_sva_handle_iopf; - domain->fault_data =3D mm; + domain->iopf_handler =3D iommu_sva_handle_iopf_group; + domain->fault_data =3D domain; =20 return domain; } --=20 2.34.1