From patchwork Tue Jan 30 08:08:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 194013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1144541dyb; Tue, 30 Jan 2024 03:20:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHO6Ui6E5CpdrnsbE/LFe/N0HcCVJmEoXp3RaTiMHejHvwc7Qtmz5HDLK9btVzHBHQ/aRqV X-Received: by 2002:ac8:7dc6:0:b0:42b:194c:24ec with SMTP id c6-20020ac87dc6000000b0042b194c24ecmr764081qte.27.1706613657889; Tue, 30 Jan 2024 03:20:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706613657; cv=pass; d=google.com; s=arc-20160816; b=uJ1Jf8Jwc65IVcCEd/ceRwe3Gjaugbv99stoywz4ZBxjy9+Ba8CqLFHwtE0Ua32099 OZ9wAy5DTXq44AR7SmrTG812JcYzuhXbTH9HtvwovC9kPsZZ7/NjNNZMSYagaY4qSEgC ooRNoLPgyKc6UlGsOZRTI/yqSopsZ5puPALVRr1N6+Es69IURjxPsjgZQ+3/Q7d5MfnJ ZStFodXwD4uqy6xUXKgfk1oIS+suIYM8abHu5eQ9m3rioXHk2jAsYNeSc4XbQNWTjs/V 0BB/3/49M8tg/H4hQLk0f2XMF2k6JnlbZeDNh/O9ZRVfdhLJxzCcVedrDm6u9lnpHmKa 3DJg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BNpyMcpJyQs5FcKh4Yvr4WlsPV1KxTj1/QSBrdtCIb8=; fh=oaHNS1xUSnQss3sOwgE3xgF1EHmYE8WzykuHrV1+rzg=; b=WdbhJdQNnBcVN0pXHtiszquUJIAOyrfbNOMFTcVcp+ldi8DJwwt44jEQNgbywXgBcJ 3Fg3AwcQ4CTpgipJMrVP1eQNJXgNGYRZGjGjA6go0z9VceeqnQ85FJhpCvXz71r7W9fx kNQMpKBascMN6UP+oyP5eS5HGGb63DMV4lUkurumTnTqrAoZW/VDOGozkRwY1z9r2m4A evn+5ot7CX9XXjW5GrxJ0ACN0Uew85haM7ydx3Z/+VUu1QlvaMiuZ+ybBAZAO/hKj6Vq sBf6WehO1b3NDIDUlmudBOsnVGZYmBW5C1N6Rn0VSJ7+wPBmgU9AqjZZ8njgM1ArxYSd gXtQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LDZLtm5d; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44106-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44106-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id o15-20020a05622a138f00b0042bb00c959bsi457279qtk.767.2024.01.30.03.20.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 03:20:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44106-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LDZLtm5d; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44106-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44106-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id BF9CD1C2654C for ; Tue, 30 Jan 2024 08:16:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8A60F60861; Tue, 30 Jan 2024 08:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LDZLtm5d" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 5E4B45FEE4; Tue, 30 Jan 2024 08:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706602468; cv=none; b=cUIgSvHJPTN98eTZr9jqS9cnrEGlC1lSa7/GxYek/uUezrBaUaZddE9p1E9ogVWLUqqcyVNdSIXGPtEXQcx0O05Qp8C3t4O5bz/4XRnAwYmarOMTgk5aHc5oQDn0XrPyTg+oIVKXhTlb3HWSa9gojcV1Heq4c/aAUtVK6ArUqOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706602468; c=relaxed/simple; bh=nE6xApojdFQgPTaGSMZ7QO17Rd89ee+LGPVx97lP71o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l+5dgExOXnEzPanF4VABe31D+XK3E5kGaVK3Rp2OEEjEQZ5XYZ+OH8N6lKHtMR+QvTEFrcXwSOWtUPzfzd0zbq7O9Zj03dcuxzQr4aaiB23xkorzTlnYBea27b90oBNJqN1W/TzrzzPvmYk2lylHDjkSusO3yAlwxD9sir9yOvs= 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=LDZLtm5d; arc=none smtp.client-ip=198.175.65.12 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706602468; x=1738138468; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nE6xApojdFQgPTaGSMZ7QO17Rd89ee+LGPVx97lP71o=; b=LDZLtm5dDf86Ty4g3QtNfsC+7pcSnwcaOEjACx2ojBSq+r8fH+Ashs6T 37u9hAKyMl3RIMUKCY65Zwd15vTVwUDkVLwwdDAdiwkEwog3nDnsqd2aU 4hjgLfAawaA36mewoMADdpVb2zMoO3vLoK6DA8RcQT1RpYEbCKahx9FHG Jl6mE+aMulO5k4NCqsE/3qE2iL+hzcjrvC+OsfjKnT72hujl7mtWYn7ac e6gUSCe6/aJpo6d6vaelqk6BJmfMtkgHkkkSAmWA4ZeWT5FbkRE23FhYw h1/7JBbPL9b8knDOuzc3Uwr5Il1O7Ct0ufwJl2BVvbCazAsAkw/k0Ixmo A==; X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="10588270" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="10588270" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2024 00:14:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="3633746" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmviesa003.fm.intel.com with ESMTP; 30 Jan 2024 00:14:23 -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 v11 04/16] iommu: Cleanup iopf data structure definitions Date: Tue, 30 Jan 2024 16:08:23 +0800 Message-Id: <20240130080835.58921-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240130080835.58921-1-baolu.lu@linux.intel.com> References: <20240130080835.58921-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789514122723064269 X-GMAIL-MSGID: 1789514122723064269 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]; }; /** @@ -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; }; @@ -106,8 +106,6 @@ enum iommu_page_response_code { /** * 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; }; 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 = { - .version = IOMMU_PAGE_RESP_VERSION_1, .pasid = iopf->fault.prm.pasid, .grpid = iopf->fault.prm.grpid, .code = 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; - if (msg->version != 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)) {