From nobody Wed Dec 17 03:02:16 2025 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 1AAAEEE49B3 for ; Fri, 25 Aug 2023 02:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241254AbjHYCd7 (ORCPT ); Thu, 24 Aug 2023 22:33:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232248AbjHYCde (ORCPT ); Thu, 24 Aug 2023 22:33:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086CC1AD; Thu, 24 Aug 2023 19:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692930813; x=1724466813; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MXzdLjmiYp6NAjjbmxbTF5e9ymphgRPSAXoFd1dV6kM=; b=iLuO16XYOeVbiWtKzDbu0grmlc+Y/CG8ADxP4geihq3nMlLmLmtamynq NYp6hxzotekzf6ze/UyNJlwKVE8BVuXUCRbjHV5g7td5diuNGREOSnc08 PSDjK5Zu4JULyzztnraCuwjqgqphiUO3ixoDAGwCs68wLtsUlUA6wg5TJ fPaThHmY5PoF1abGCgBNB3DFmQny7om1mw4Ia661NaA5kpT2pHpCnhwEQ JGrTDx9YBwO47bRhdXjswNBn/isPlpg2LsVVq90UoFCbuhKgSolpFttlK y1OcvR9CdMdkLQoZoytqNiG18Cw2qFGfL8Aqlj9j+NSiUNVXkpsr6IynX A==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="372009461" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="372009461" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 19:33:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="730875048" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="730875048" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orsmga007.jf.intel.com with ESMTP; 24 Aug 2023 19:33:28 -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 , Jason Gunthorpe Subject: [PATCH v4 04/10] iommu: Cleanup iopf data structure definitions Date: Fri, 25 Aug 2023 10:30:20 +0800 Message-Id: <20230825023026.132919-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230825023026.132919-1-baolu.lu@linux.intel.com> References: <20230825023026.132919-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" struct iommu_fault_page_request and struct iommu_page_response are not part of uAPI anymore. Convert them to data structures for kAPI. Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian --- include/linux/iommu.h | 27 +++++++++++---------------- drivers/iommu/io-pgfault.c | 1 - drivers/iommu/iommu.c | 4 ---- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 1c8f33d0a4c1..2dc8017d444c 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -69,12 +69,12 @@ struct iommu_fault_page_request { #define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1) #define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2) #define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) - __u32 flags; - __u32 pasid; - __u32 grpid; - __u32 perm; - __u64 addr; - __u64 private_data[2]; + u32 flags; + u32 pasid; + u32 grpid; + u32 perm; + u64 addr; + u64 private_data[2]; }; =20 /** @@ -83,7 +83,7 @@ struct iommu_fault_page_request { * @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ */ struct iommu_fault { - __u32 type; + u32 type; struct iommu_fault_page_request prm; }; =20 @@ -104,8 +104,6 @@ enum iommu_page_response_code { =20 /** * struct iommu_page_response - Generic page response information - * @argsz: User filled size of this data - * @version: API version of this structure * @flags: encodes whether the corresponding fields are valid * (IOMMU_FAULT_PAGE_RESPONSE_* values) * @pasid: Process Address Space ID @@ -113,14 +111,11 @@ enum iommu_page_response_code { * @code: response code from &enum iommu_page_response_code */ struct iommu_page_response { - __u32 argsz; -#define IOMMU_PAGE_RESP_VERSION_1 1 - __u32 version; #define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) - __u32 flags; - __u32 pasid; - __u32 grpid; - __u32 code; + u32 flags; + u32 pasid; + u32 grpid; + u32 code; }; =20 =20 diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c index e5b8b9110c13..24b5545352ae 100644 --- a/drivers/iommu/io-pgfault.c +++ b/drivers/iommu/io-pgfault.c @@ -56,7 +56,6 @@ static int iopf_complete_group(struct device *dev, struct= iopf_fault *iopf, enum iommu_page_response_code status) { struct iommu_page_response resp =3D { - .version =3D IOMMU_PAGE_RESP_VERSION_1, .pasid =3D iopf->fault.prm.pasid, .grpid =3D iopf->fault.prm.grpid, .code =3D status, diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 39601fbfd0e0..f654fa8ae280 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1414,10 +1414,6 @@ int iommu_page_response(struct device *dev, if (!param || !param->fault_param) return -EINVAL; =20 - if (msg->version !=3D IOMMU_PAGE_RESP_VERSION_1 || - msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID) - return -EINVAL; - /* Only send response if there is a fault report pending */ mutex_lock(¶m->fault_param->lock); if (list_empty(¶m->fault_param->faults)) { --=20 2.34.1