From patchwork Wed Feb 7 01:33:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 197793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2090100dyb; Wed, 7 Feb 2024 00:46:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX7g0CaN7JkjKsy56goDDn6m8XRpRpfTtHqFRuKTwP7QJYv0l1v/QJFozXORIzMqfUt8uQh1/P9P0abfNighgRurjuaYg== X-Google-Smtp-Source: AGHT+IGIY+h3gjQO3pa5L0RJRvAZ4/BdNupCAm/ZgNACKHI9AVvdJTYqhWR08joGWcKLWiRZS80c X-Received: by 2002:a05:6402:717:b0:560:c835:88f1 with SMTP id w23-20020a056402071700b00560c83588f1mr1218919edx.42.1707295583498; Wed, 07 Feb 2024 00:46:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707295583; cv=pass; d=google.com; s=arc-20160816; b=B5vGUle23w2J7G/lyVU2kTnE8PYZ4nIIMmnzFPZVjAydS/fGq9jReo3KkcAVX8AYKu qZzqcHmoDXqxA20yUdM2Kz0E1ke6D7B/7sq4uOh3nkAEWjKXcQWhRE5a7skM8gdJEz4W y6lOCfjMYXEaRLmBCI2iuCu7t1lcGmNgO2dn2FewlmdIG/zlsGuVrLeVjI002R9mBykl YPgTfwH6jiAYQ6q2iNXzabq0mq0DO90nzbTfcvf7aVsvBaY2QB5y95QFBPCwpSBogSMJ YK+oCaIqcRMqniG8JRibUfU1rACq0boHZGqOha/A8cDZrpV8TyyzpbHQAgeClFkSMRwe 5E9g== 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=6K7NjLVtHkMVMFTHo/Tu1OLd/RFE4RPv0Ec1XVJ0iTs=; fh=3gUGUmYzIC/26p6m7Ff3t0gSD3YOVTZNzu7ITunmxu8=; b=LHeOx+frs1thWPO/7kbkPP6DcIra9Qw7znnbZTVYzulQdfX+JFGcKr6fe784ippzeh tuxoamDCsflZry9tGFoCJIEhD+ATDiwp+6cykosBw9B1x6kfhGmqbT7kh8QG1DHyIrgl S/LRJRD+PCTWTcyVIg7rp8HJTy+wP1T+9qeX7eLf4pnrQtOBA+scmxI4HX508KPrtqoN TH0/zvuyfoYOcODZyTMTgyjlB6FmqYUCo6X/eLUbzf9BEz27nmv+/5ZtxqYtf18TKc4q nEQTLoDK54weJXC5XqOyiO3YM4n1TXHLJagn567dMb05yOwwfnAsQwuCg9fJ5oT+jRPu VsIw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fzJ0XlDN; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-55806-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55806-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCXVaumyVQw1fYwAveaaF8aSlzM7jG3f7/kZLo9OO5quhxqt5MFIhY0agLk3WhRC5yHs3xxXT352N9AhAeDhVT99ut6WVQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id s2-20020a056402036200b0055f889c2846si618747edw.676.2024.02.07.00.46.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 00:46:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55806-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fzJ0XlDN; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-55806-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55806-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 2304F1F26E1C for ; Wed, 7 Feb 2024 01:41:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9B6341B95B; Wed, 7 Feb 2024 01:39:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fzJ0XlDN" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 15E5711718; Wed, 7 Feb 2024 01:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707269971; cv=none; b=P01fT8LZNTeT1ZPD0/NpOGszIVx/L6Z2naEDMRI889RGJtxJhj0Y+K+THU4x01RJWP3wO5OvJcY/STjlDNum/2qFlWIfucB/y1Kf4MC6f3it7IZl8IRYtbLmw6uyrhGLM7RZxxEtqq1SVk8ngqZVeRH4Hja2Pm+qb0pWfTJYq/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707269971; c=relaxed/simple; bh=xL8pjHdaGxPkR2/g4/ri8cXR4C1q58Lorji2uwOVwNg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=daHAjHxZ3IXnc7wHdQ/Y1vq7cIVc63xsvwIojKp+y3i/JyVjCU7PMxnrKUVFpTGjwpqKFeZ+or1djLf9W5qEaDvqSS7NW+TZLNMQwRxOGz+lcG8qMD5NR2qQ4Ufwp3oaLzW1x+mtr2kpS26XMhZD3oNjDDgeNwbLH9BGFLulgAg= 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=fzJ0XlDN; arc=none smtp.client-ip=192.198.163.11 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=1707269970; x=1738805970; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xL8pjHdaGxPkR2/g4/ri8cXR4C1q58Lorji2uwOVwNg=; b=fzJ0XlDNZx75oXUCyi3gWvmi+SSMYrGaWnjdyWJbgRBO52OY8LFdu5o2 DIiMlQWevcCGV5wRiTimu9gcZnDsYjw5zprbN4vgAM0PK07rrv2asyuwL V0IjOtRVAPbcUyG/Q7SDiJp2JPoIEEW3wwVV81qoJheNg/g/jN3f9YNh2 5YXDHvRPcpd6kwE5OhCuOhfvfUD9XpXCWRmQQUM1iiZZqVzDpJFAljRl6 Cn64T8lC3vQYBX/nLKlSClGFZgjXgPH4tUJ2zkqQ0qZYn47pBVAh2G15m ZWd//WXisPHVj9yxwqY0lV5SSWqq4hhD2mRjN2zaEna7P/NDQy/kaGsqt w==; X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="11534039" X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="11534039" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 17:39:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="1190611" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmviesa010.fm.intel.com with ESMTP; 06 Feb 2024 17:39: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 v12 04/16] iommu: Cleanup iopf data structure definitions Date: Wed, 7 Feb 2024 09:33:13 +0800 Message-Id: <20240207013325.95182-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207013325.95182-1-baolu.lu@linux.intel.com> References: <20240207013325.95182-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: 1790229173712094617 X-GMAIL-MSGID: 1790229173712094617 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 d14413916f93..6a4d9bc0641d 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)) {