From nobody Sun Feb 8 12:40:06 2026 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) (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 D831212B81; Mon, 22 Jan 2024 05:48:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=134.134.136.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705902531; cv=none; b=J6586bXwUa14Zn/ZsondOnof2cRiU20thzAyRZK/xsqDe7v1VXhKofE9dUD0ceb3mXrqxf7YwwtteJwJR8OtzSkWruHeS/yBNS07aAd+NaD94YK9/U9bQLW9m4fTh/0pCZZrI3bDN7r5eap6nq1vKthYM2Gbpe6YEvw32eln2qo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705902531; c=relaxed/simple; bh=nE6xApojdFQgPTaGSMZ7QO17Rd89ee+LGPVx97lP71o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YZRTw4w4F/1KMB66xtEjyAoy83f4wEq3fZw+Vk5rB/heDt83PJnTOTYVfyLCv+dqGUhum8HQbXquqrceXFUBEpiy92GDchvxam+mzyTNeIia/TvEQbgVlL1j7DN3M66aGvYBl1s4vj38znSKFi9Ie6U2El4mn0ao0ocDSb3lS/8= 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=BtMTVGuW; arc=none smtp.client-ip=134.134.136.100 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="BtMTVGuW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705902529; x=1737438529; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nE6xApojdFQgPTaGSMZ7QO17Rd89ee+LGPVx97lP71o=; b=BtMTVGuW/SzUk3ptYp2zdRLfBwft/pxJaKAZ+xV1ExyhRJ7HdyNcin0P 6fhORQK9lQgFzmzFOiM6sE383j1p6Em4+Z1VJNVBGQsH8lXOpr/v00H78 tSEV5KwAP/0Y6lFe1cBqDS4f/7a6ML+gpGMQq5wASaRawbCiNi9rqnw+7 5QGfqiewIohzx4AJ1SnV9x6DbFvoIDrxp252RwXppQOKhWfYCCcsMRy8+ 79C6oBICe2/QDhabTxesMdCqSbQAp66HfO98/Msk/J8ykAUEJ9AKz/wcX QsW7JDSHe51XGC+n/u1VniNohdB53gwCTozCGeN67sf9VB/4IOYg1S/gV A==; X-IronPort-AV: E=McAfee;i="6600,9927,10960"; a="467487090" X-IronPort-AV: E=Sophos;i="6.05,211,1701158400"; d="scan'208";a="467487090" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2024 21:48:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10960"; a="1116763905" X-IronPort-AV: E=Sophos;i="6.05,211,1701158400"; d="scan'208";a="1116763905" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmsmga005.fm.intel.com with ESMTP; 21 Jan 2024 21:48:45 -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 , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH v10 04/16] iommu: Cleanup iopf data structure definitions Date: Mon, 22 Jan 2024 13:42:56 +0800 Message-Id: <20240122054308.23901-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122054308.23901-1-baolu.lu@linux.intel.com> References: <20240122054308.23901-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" 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 Reviewed-by: Yi Liu Tested-by: Yan Zhao Tested-by: Longfang Liu --- 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 c960c4fae3bc..829bcb5a8e23 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -71,12 +71,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 /** @@ -85,7 +85,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 @@ -106,8 +106,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 @@ -115,14 +113,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 68e648b55767..b88dc3e0595c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1494,10 +1494,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