From patchwork Sat Feb 22 15:53:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986686 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) (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 5797B1DDA1B; Sat, 22 Feb 2025 15:54:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239677; cv=fail; b=bTWO/9Wgz4PZzQ+VNIOHqmizithMRyqe0JUNDcPlEOOR9X+OK2NrnNQlLtg5MEywMcg8oc2qvhtMS2Wqh0RyGTjiAysoslImY4I2WMVdEgyq0MCvEZPtyds7mfBHPelVrauMuXu+lgqWBj27EZDYoYz/mgA7W7yJcq391LVclA0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239677; c=relaxed/simple; bh=wTio0yv2gBQ6U/iSzwRqq4uQ62BJLdo0YHTuy/VvcuY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p8yiUoDDdNJZfzt4NsdhPfA16RXXwY8Dh9wNxPAAw7qOOiqtgD3iSuJoVXmxPmRapXpo5WRHiMsuxbxoIcxxB3RkvFO0w4U8onNPBM1l/a10X/4HWbu0SFqZVa9tTBSx45Qb3cEdjmrDNIMtAY9aJWI8ogj3YfMOIm5t6n9e5i8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=lZUu0XuX; arc=fail smtp.client-ip=40.107.92.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="lZUu0XuX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TmxPLJkjA9NafZBACh6vdpXnNJhuSg2lI/aKCcPDKElJ2pbf8zt9yrjzwTRgrGZ1htmmj8E3mfhEsUvbj8lH0lU6tYb9mzr7dz/hO2dHe2LRwdBMefEVho4Z1N6W2G5ZoORG759Yjdp3p3dIWxjEJxRdOrv5qHEzxhQ1N/FMsU2exOd/NvUpPn7v2YFbfMOLF/kCxZX8iVQ/Nx9CdZuSSomerHa2LFjDJgl5LRXBCT0aidy4800Gvunai8S6NRs38PUqsAOakq3k1ePE4AYlSQ7OMolPeML0qe6/bJIwyo8LioIzn6RvtkJf74kU46LEcXbW6zFbWXo1mToQDqm98Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HUNM+8Bv5Nfzbqa7qDebAIwRc+J2TKyqV+0Ykxi7QjI=; b=mIhad3JB2ANzoh+jf0Ri4A/jJxYyu43gp/2b1p/f1z6Tz/IQmkVAw3EfanjHPqreKDf7ZVywXf6dNbJoxRdQ33sXpM6aCdZJub++GVV1vIfHHvJ1kO8pDtBk3IaG7MljgRdCaBADgvk7dNGamrQg0TLXkFgQJQFMgACWIA4OSgde4YdCeYESULy9jyQq5o3GbAalO+lsLThkM3GCSRqMhKUc6JBg3a4tW4rInHrzn8HvkgBtS8KvphdD4fcSKbiNKd/55keqsbXaPzX3ztdj35JNpPeIeWrg8JLuIyl46F8XvWIUcL/Vxq1wOp+Uo54mTJmTwoIimOrDB2SMD869tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HUNM+8Bv5Nfzbqa7qDebAIwRc+J2TKyqV+0Ykxi7QjI=; b=lZUu0XuX+sUo6xzzfoGFHGBZgkSq91ia+WHRFWT/Vq/dSQMa0wV56pDjLrwYkyXI6CELAnVsGxUhfuP7CrJxbig6Gml5QKYWXsahaFIKIoiFm6oilx7+E1Y6UHEQdm+RRrFTf2+pj8NPJMQVdEsw9mXF73EJZoNNfdf2xbZlqMeiaJ3NpnzrI707nxjY7G3lgitqGZzsSYgxNkwR8R1s3nMWhu7Z7iCR5MvvTuMiU2LjYMyTyxxgUNApUuKEwWu1B+r3aiLFQb/YS0JgqNvuiZk69SnzybukmtUgSrXKjcgcLKhKuYZDhrlbR8i03zFMrFSbZWlaTKfsR8vLatC9ww== Received: from DM6PR17CA0010.namprd17.prod.outlook.com (2603:10b6:5:1b3::23) by SA1PR12MB7247.namprd12.prod.outlook.com (2603:10b6:806:2bb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Sat, 22 Feb 2025 15:54:25 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:5:1b3:cafe::f9) by DM6PR17CA0010.outlook.office365.com (2603:10b6:5:1b3::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:24 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:16 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:16 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:14 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 01/14] iommufd/fault: Move two fault functions out of the header Date: Sat, 22 Feb 2025 07:53:58 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|SA1PR12MB7247:EE_ X-MS-Office365-Filtering-Correlation-Id: 8191abdb-da61-4281-507f-08dd53592e53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: M6PSmU9xp3LgCxIuV17O5CcMtn92KB8jfaOtsd0ePq9o/9CGHv5eBoV0g8WjlU4niPDCaPtIHSleFZkh8qqf+LCF2yubW/S6+1TK4t9XEHd1rwmsmJxHCDzhaxYCHvsvI/zg+8giDa5mt0hwWgu8GzVQqZ7t0OEJRs++hxtbO2lAQnHKfzoDQ10PeMcRryliHjAB1XUF++8rkzWebfVYcYgL4WXvmhBXrhNY6XKAHE4nxuu8s/ylxyDHITHfxONvTRZb20qSS7erGxPVrnXvUJZ2msUHBmZuNLGd/napnWwO1oeRPJtRNt9+EQE5VhmcufEU6GVfp1M6tc9T28lXlE5hPgYqyD6OLzqQ781dbCeC7dwrma/z3EjR9cMmGV/vOMebbhb0oRL5GY6XS/ioapqX40fPFIYKc9glQtp/mD6bSn2xPQgQxD4K4vdjBZ+Q1sJLqrvo4nF/JEfB1pY0L61Sz9IfHgbZnv1BYeKI+QfCW1I4mcE3zKh+byYaNes20TqFCOwWZS2NhNuMPVkQGz82k+7ijZrMoSO/RopKAx5aq2pJryzz3USJKvol6MP4nfSC8Rn0xUlZvZNZbS8QsNPsWK5cxUW0z5cKNUG12rktnrsVjpCBBkEKKJsb2Lj9u45kiYKynJKgIBE5AlIYY4wh6bgbrZ+qR3Bjm0+CWYphLGU8DZukr7dI2Tjbmp7LWvH5WBhqjMv83lvxQG690zrZ92Ogoyt3g/FGcn4c2aloe6cWJf8YjhzgIriCnlLS2X3PAs+thNsBV+ub6naLfceml0rCVLkp8JQo+qq1fG8UtxdoJJxDP2Nsv1RJIrpcJbEdITlNiXPKuzmZPO23jjpIs2yYG0K+wGYVPpbIMB3RmTVZtoe8GEhLPsJ9fRVCMSyLwAn1dxGCJDM1L/v2E9H5SvdVYav3P97KERvhxsQqzgoR1xQFGYd1sOJ3AIYhe5g5XpKIh+aAm4KZLe1TB5mk9SE6ZmLEQvruauGqlyS2wewJw8+PIQzYwssNcven6rfg7uuzGw5RZWz0KgoG8iW/wWRtqdwM0qIUxsACzUpZwHygtplVlkeA8WYTncuKvRWuH26GIx7QYqcuIvGzNWaAqwHfbvBx6IuxMkJAv5/XGzps+yxbOAPTvBbaMoKUSa/P/WYUp028nOpBpRo41H9fGu91lCdPVWJvYaIjXX9g61g7OiojW/xV2gI4xpHCN/6g5e8jbVUfj9AOgEge9YY45Sp+iLHh6h331OmyB/b2+obknTaiGfAWyyKKMgwz2CcsEKQKju/Zxg/7rJZl/f/CJd8OpYY0I0qL3NmOcegMoO0/th/IrBtAag1GgLYGSOT5zj8KZu71fFcT1TQoF2mG8cmVZjyzoIBGq6O5xgNLcD7Q+DxH+qFid7NPOTM9hTuF9bhDbh4FbGazyFRLRJCvKU+aOHTzw2SD4qTjZ8Gb5cAMnH9JfZsG1DTv6K0/xi0z2B1+8pW2Wa/yf3sHE2TwUrR2DnQz3mYJy01kIo0= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:24.9478 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8191abdb-da61-4281-507f-08dd53592e53 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7247 There is no need to keep them in the header. The vEVENTQ version of these two functions will turn out to be a different implementation and will not share with this fault version. Thus, move them out of the header. Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/iommufd_private.h | 25 ------------------------- drivers/iommu/iommufd/fault.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h index 246297452a44..1c58f5fe17b4 100644 --- a/drivers/iommu/iommufd/iommufd_private.h +++ b/drivers/iommu/iommufd/iommufd_private.h @@ -472,31 +472,6 @@ struct iommufd_fault { struct wait_queue_head wait_queue; }; -/* Fetch the first node out of the fault->deliver list */ -static inline struct iopf_group * -iommufd_fault_deliver_fetch(struct iommufd_fault *fault) -{ - struct list_head *list = &fault->deliver; - struct iopf_group *group = NULL; - - spin_lock(&fault->lock); - if (!list_empty(list)) { - group = list_first_entry(list, struct iopf_group, node); - list_del(&group->node); - } - spin_unlock(&fault->lock); - return group; -} - -/* Restore a node back to the head of the fault->deliver list */ -static inline void iommufd_fault_deliver_restore(struct iommufd_fault *fault, - struct iopf_group *group) -{ - spin_lock(&fault->lock); - list_add(&group->node, &fault->deliver); - spin_unlock(&fault->lock); -} - struct iommufd_attach_handle { struct iommu_attach_handle handle; struct iommufd_device *idev; diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/fault.c index c48d72c9668c..29e3a97c73c6 100644 --- a/drivers/iommu/iommufd/fault.c +++ b/drivers/iommu/iommufd/fault.c @@ -138,6 +138,31 @@ static void iommufd_compose_fault_message(struct iommu_fault *fault, hwpt_fault->cookie = cookie; } +/* Fetch the first node out of the fault->deliver list */ +static struct iopf_group * +iommufd_fault_deliver_fetch(struct iommufd_fault *fault) +{ + struct list_head *list = &fault->deliver; + struct iopf_group *group = NULL; + + spin_lock(&fault->lock); + if (!list_empty(list)) { + group = list_first_entry(list, struct iopf_group, node); + list_del(&group->node); + } + spin_unlock(&fault->lock); + return group; +} + +/* Restore a node back to the head of the fault->deliver list */ +static void iommufd_fault_deliver_restore(struct iommufd_fault *fault, + struct iopf_group *group) +{ + spin_lock(&fault->lock); + list_add(&group->node, &fault->deliver); + spin_unlock(&fault->lock); +} + static ssize_t iommufd_fault_fops_read(struct file *filep, char __user *buf, size_t count, loff_t *ppos) { From patchwork Sat Feb 22 15:53:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986688 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2078.outbound.protection.outlook.com [40.107.93.78]) (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 A008A2010E8; Sat, 22 Feb 2025 15:54:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239684; cv=fail; b=eWgr/eOvyaFuAI+fjpaYVhy8wwkyt4BwJPpbVehYjBUQFRlWztnE+Jiqvfp4VBOOBc8FUdv04svBSC+p21lAOi0uY6HAgtHX9gMw9dMILZ6OaKfBr+AYhJpiNlQMD65/5UGUx2WN6b9j8elQhW4kbiuT4xVtUlsBWzrkG0IzMQg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239684; c=relaxed/simple; bh=jwmbXWsKHQeOJR3HOFPWBzPFUrQyMWI4MhPF2noMiLU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ihq6v+1QDVKhs1b5KIv8UatVGtBwt/At2smIRVLzdrbRj5wAD/43fOUcqkhPLzsPyukP1cQIGSWJCQGOMoLP48sHjfmS2C2fa02hYaxtQ+SrEjg4m4BtFIbd12fqKbSNzzfcgQpQvhjA1Kr6ZKDZpcQmw6D79tdZy6FTyrxhbog= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=JpylDs+n; arc=fail smtp.client-ip=40.107.93.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="JpylDs+n" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jMbLL5sHMmYCgn0Alj75ZKDyV/ZFApryfVSbuKURZOp2KLX2JtaSmc3YidhDSI+znRDsV9VGD4fj3ruafisw5dmu5ppDFSd/W9mgX0nvctLlOhwfV9IdyQGIapk6zQl0IEVkwvv/rAGO3OltLz3dxu4Bgy0XwiM8qMMxA3vcmrjs2ifOMT/zUQDaRnUJL0T6mqOUcN12qhF0GUHFUr5TOZJfzkb8JyVyo7PWNTIUlceU/I4HAEx/szd96gUnCj1oklYuGZSfQnulC9eAXIZe0dtUA8IiHXXAB6CMeENY4YFPsCGkBPierD5vreuVPzA7NZCiBK4LHrLfFbdBRkCnJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Udh1PVsxB2jdZQ8I8XJZCTTBX3qW8VMd7f89xgxZ7Xo=; b=MkMYX+QnS/LrOJHM55bb1of6Pmktbe5BuTw2s8N5ZA8MMghhfh8LvYjKaO3UO+abKFj5TJAHXUyqwA+HzF7gddz2XRzTJ0uXpz0Tw20oEBpHzagqS4R+s54kedhay+1o8Sf2EoaGp2QADUbiK7ASfj/EsR+SFlzIRJCW0fxObMBeLqIx3rbg1fcnd9PqV9bLbdkL6aMT+jljM63z1pWEVB27i7s1ezvgrm6IqDDe1sVIzDlFJalmt6Ek4YT3rD0OyY9JKIVpJDyHlxldj0919XzcbLhwm9QLBdd2QJ9ZLRwwEaNaBvRpw2RMo+LauXfWsNTsLnggneYuJJk6Wdqk7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Udh1PVsxB2jdZQ8I8XJZCTTBX3qW8VMd7f89xgxZ7Xo=; b=JpylDs+n2U+S1xYM9vXXhMYHJ0hPLaU8oGW1AU9osRKiAaspT79FdsHj8kOz9aM3Wc1A/QFpUdNPHS/Ukj9Mp2rhcGjfRbw7smlZMET1S7emCgBoNAPdSdBCzfY6+YaXFxXU9t63a0aaQp2jCL2vnfGzSUljh+XfiLqpuCn4CDD+TC1vRUEi9ywCAMr4Zg+MYJKx3qnz2dt/vY5NwoIMYKLjSWB/o5Dy+WwFhmAdD/FRHXC0LKe7XRZ7cs+bbIa4WhoorUfmjivswmrr4/v1S0bXWgdEyPaTPUoUmpSM165QzEmQRbHYW+eg7kRPmgW4QHVkSqx4bavb3KsQs+8nDQ== Received: from PH7PR17CA0014.namprd17.prod.outlook.com (2603:10b6:510:324::29) by MW6PR12MB8866.namprd12.prod.outlook.com (2603:10b6:303:24c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:34 +0000 Received: from SN1PEPF000397AE.namprd05.prod.outlook.com (2603:10b6:510:324:cafe::de) by PH7PR17CA0014.outlook.office365.com (2603:10b6:510:324::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397AE.mail.protection.outlook.com (10.167.248.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:33 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:18 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:17 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:16 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 02/14] iommufd/fault: Add an iommufd_fault_init() helper Date: Sat, 22 Feb 2025 07:53:59 -0800 Message-ID: <5907d5a780b83b033b99c4e3b2fda1f5b9f1830c.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AE:EE_|MW6PR12MB8866:EE_ X-MS-Office365-Filtering-Correlation-Id: 45c99cde-34c4-4754-e0b8-08dd53593395 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: aXhoL6uRk5QCGrsuW8OR1T9hpnkAE/VPgkbU/J94zKMELhsVDcfBpQo6pvIfBjBcUboufSF640puf2t8CFz71KZzxhfuPw2l8bZDV+SNzp21j2hJ7CBd+YtRFkUY2OK7Q3Duj09UMzr2/PfLetVlTwlWrvh2k0dli/xX9ohu02GdYH4kwi4sHcKtCsM3cRIzjcZ5z0zqQK+VLfj1FQbxZyBOrgcqrruJyx5L4W55N9mRrFT3SHYzKpnn5QRJL3SYtggQPmQ9TQwOSr6eZ0zT9qx9crFMy4azPKeiP5b+rpjgUzEnh9ns185svcSKkRwt8pdyKLYuALEY94S/nYDLXHoC4BKlX0Sa05KNKO3h+mJ2pfsBQOAr1qUtonyfjZ/8xjr4q2NtFI7DPyrRJ9ay4/tnIMz3tXoF0KbiQ5fDCdZfTtcEMTUhUZXosRdDsc8XSDGQ3ULvVx5y43d/umKxV7f3jogBnZ7jJQWXuILUfmQyGfn2Xf8RrK147FqIT2Jr7fHxmeMalwTuaCNQ3nbvfEOknZYssNMntksdBgKYrkQNaAuNi/Z16pV+N92JEoD+PnhqqY6QQQJQOqQW8KXklAGtUMjYQ74fEJjgS2z8FsEzTgc0qJsaVpOzxVRgEgXCw4rznesQ3u/Im5EUzpq9wVbaueX4rb8lrwNwRKD2FkDnIOIERH6N/Pu46oMWZ8tRge6Q5rBFt1A2WteMCQMWyZMUjdoKDCm8tZk+YsFkvTabXfX0e0hCUnL+mX7ixur3watdFyY7k+hYPvhJM7DpBP35K8+pMUuQ3Ea85Ec4L0WolyQKJfGBSvRA5EErLkiR3zbmSyg4rgyB2yKegU8WOJTuWTa0BXUajsxu9xWmbo9xqjztQpA5jvjxW56GW5/rbJCgDqWMeIiwk2Wfr/jYCWtDL373C0NwQPIW1MPIKbGUKjSn2KjPMOOOABfx3dwOuwz0CmbORNW78Zvb3YOK/Sealu3kJJcxY4qkBDqPM/wUnDt8hqxFyyiarDBzV+M68yvQlNgdLhzah3iy8VtNJXm2QJYk7o5FG8v33aRuVi1UpITZhj3r72Jh9WzPqmKQG0497ZJy6+jK/tRa78eojC1XPFEEZzZGjC/JMOturU/tyzn+QMVfVU7tvwid6KbavQolC2c/l0bQhfzYsgRfMDAZCKi0JyFYTVDRgy9Ni167O0i3NX5nyVmuPAkwBzZdon4DS4QbgHvPt9/bdWqrFjE9I88t3JYZmOqbv/NudCiV5frblD1cMHJgUfwEpNe8oFlpaHlN/etOKMThGfmz/bI5F3FbVxR94yWW2/V+o6FIQ3QGCVncZ8kI9EVxVsXbj0SDH7R70L44M9x9QdvAcxckgGFiB37S2AQ06t5KPyk1wTPyMutJCsSTP58wgTfjkgikA3xG8AWojCLuIL5QDcV+5OMdo9HmN0psbma7Tdx+Yly6/gqTPmghMo20Km/mNRCtmi5TI3y6dxE9BR3IpxnONN5K6ebUfPtOZh7k59M= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:33.7727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45c99cde-34c4-4754-e0b8-08dd53593395 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397AE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8866 The infrastructure of a fault object will be shared with a new vEVENTQ object in a following change. Add an iommufd_fault_init helper and an INIT_EVENTQ_FOPS marco for a vEVENTQ allocator to use too. Reorder the iommufd_ctx_get and refcount_inc, to keep them symmetrical with the iommufd_fault_fops_release(). Since the new vEVENTQ doesn't need "response" and its "mutex", so keep the xa_init_flags and mutex_init in their original locations. Reviewed-by: Kevin Tian Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/fault.c | 70 +++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/fault.c index 29e3a97c73c6..5d8de98732b6 100644 --- a/drivers/iommu/iommufd/fault.c +++ b/drivers/iommu/iommufd/fault.c @@ -280,20 +280,49 @@ static int iommufd_fault_fops_release(struct inode *inode, struct file *filep) return 0; } -static const struct file_operations iommufd_fault_fops = { - .owner = THIS_MODULE, - .open = nonseekable_open, - .read = iommufd_fault_fops_read, - .write = iommufd_fault_fops_write, - .poll = iommufd_fault_fops_poll, - .release = iommufd_fault_fops_release, -}; +#define INIT_FAULT_FOPS(read_op, write_op) \ + ((const struct file_operations){ \ + .owner = THIS_MODULE, \ + .open = nonseekable_open, \ + .read = read_op, \ + .write = write_op, \ + .poll = iommufd_fault_fops_poll, \ + .release = iommufd_fault_fops_release, \ + }) + +static int iommufd_fault_init(struct iommufd_fault *fault, char *name, + struct iommufd_ctx *ictx, + const struct file_operations *fops) +{ + struct file *filep; + int fdno; + + spin_lock_init(&fault->lock); + INIT_LIST_HEAD(&fault->deliver); + init_waitqueue_head(&fault->wait_queue); + + filep = anon_inode_getfile(name, fops, fault, O_RDWR); + if (IS_ERR(filep)) + return PTR_ERR(filep); + + fault->ictx = ictx; + iommufd_ctx_get(fault->ictx); + fault->filep = filep; + refcount_inc(&fault->obj.users); + + fdno = get_unused_fd_flags(O_CLOEXEC); + if (fdno < 0) + fput(filep); + return fdno; +} + +static const struct file_operations iommufd_fault_fops = + INIT_FAULT_FOPS(iommufd_fault_fops_read, iommufd_fault_fops_write); int iommufd_fault_alloc(struct iommufd_ucmd *ucmd) { struct iommu_fault_alloc *cmd = ucmd->cmd; struct iommufd_fault *fault; - struct file *filep; int fdno; int rc; @@ -304,28 +333,14 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd) if (IS_ERR(fault)) return PTR_ERR(fault); - fault->ictx = ucmd->ictx; - INIT_LIST_HEAD(&fault->deliver); xa_init_flags(&fault->response, XA_FLAGS_ALLOC1); mutex_init(&fault->mutex); - spin_lock_init(&fault->lock); - init_waitqueue_head(&fault->wait_queue); - - filep = anon_inode_getfile("[iommufd-pgfault]", &iommufd_fault_fops, - fault, O_RDWR); - if (IS_ERR(filep)) { - rc = PTR_ERR(filep); - goto out_abort; - } - refcount_inc(&fault->obj.users); - iommufd_ctx_get(fault->ictx); - fault->filep = filep; - - fdno = get_unused_fd_flags(O_CLOEXEC); + fdno = iommufd_fault_init(fault, "[iommufd-pgfault]", ucmd->ictx, + &iommufd_fault_fops); if (fdno < 0) { rc = fdno; - goto out_fput; + goto out_abort; } cmd->out_fault_id = fault->obj.id; @@ -341,8 +356,7 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd) return 0; out_put_fdno: put_unused_fd(fdno); -out_fput: - fput(filep); + fput(fault->filep); out_abort: iommufd_object_abort_and_destroy(ucmd->ictx, &fault->obj); From patchwork Sat Feb 22 15:54:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986689 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2053.outbound.protection.outlook.com [40.107.237.53]) (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 2D9DD1CDA3F; Sat, 22 Feb 2025 15:54:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239688; cv=fail; b=aGk6yqgvXkKEuOnMCCCsmzyun5Tg9Ddu5fAN5I/9sv8wQA56pUlotFbErqMJevi4G5otBzaVoHla9+MPvQrTQW2Ac2vDIJj6SEOfk95oLxFF3//1cRVXb9WpmKvLEkuKQk/zu0RHY8T+RZATplZZWkGCJ0QNosAk7J27i7GXh/k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239688; c=relaxed/simple; bh=39IPkdoCZawziROlG3zFClLexU6UBk3J3x6yt3NPQiw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=of46x1Dk5i+KGBr9eqQnAeOyvrsZmH6KZ4PgOlTXlz3b6prNVxmOQn5JI2mtLKuVqGNj5XbxnFzy6Mw8SXsJFJpXx2D/vzY/xVkKFOWRP2F+0mRXVVXsm58CRZvqxhTceSZVDxIFXCYuLWVpO6HTTVHf0p1jNyN0vMHetTxt0Jk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=aJ3VCK6T; arc=fail smtp.client-ip=40.107.237.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="aJ3VCK6T" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZMHMvh8caj7tHFM87LAMSmWR1n+f5kI2vujXjw3v3NwuvM/iATr/QvfE0sjsgcFlaLFDAmKvcEyktnx3aa09z0e2upjMB8NRm46iQMFWHzrdrBBISQOsGyDB6IvsvkP0YQ7P4azRx/RgHvY4/Uv7azxmLIk7HsZPAHlehtczbnVI9XRufXTCOAXSkq+uxiLzm7CAhyl21n+ncCeN8ENdjRqUNcu4aM1kbIlUe21LgJlOkMrCqwHj6QXdw4ShOzJb3PDb31Y9Q1l7ed2Yk9FfU6rWONLmT9QuMddVpED87SNIb2hjfP5/PGusOjMSbWu8qzOWf3LTSsnpqHZOjzCsDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/WsfzoRpBlq7Lc5qCBX33KPwTU3L8nevg8VpC6E4Xxo=; b=apajjLPLj2cfxBNYRKVuhFzSaga+1fmE3UCyAjhEo4CStfv+NrZBB2cLb9s8A2okOgSn11aGdlyOga0fGps6eivjFboaBQBHvUMFLakpxBlO/uUcBiBhDq+CM7iLSTSip16s0YpvlVQkuwD0JjKU57WaCLnJBsvz/gl6b1NnE+4WMDfdF5hHni3NSEr7yp9CLUOm+1AQAuQNcy8QV5bV4PxvPE4RaJ4f+hUNDuxy+Qg9YOR7MTcy8dAIDvrlRS1rjAFMyY8Nuj6ybXeRtLY8kkiquAZ/jpFAd52DlCjd6LsQ6acRbRgLi3BcEjfnV26QPMMAaIQPpPMWdQandrIhew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/WsfzoRpBlq7Lc5qCBX33KPwTU3L8nevg8VpC6E4Xxo=; b=aJ3VCK6TNtI67PIPo9VhOZgJuo6ZuNJ8XWT3AzIQiSlIFdHqpZ+POxzsQR4HnT9omgTVnHDyyR7MRgo6XkoKT6H0ahisCtg1SXe58so+YgsaNSHSuZVsOECTWCFp67dTZqGrWATPlBb2b27u5oE1isfnvYMFJPcrfcX4mZUEV34bqyW1ghYYNg5hlH6ZIcWGy5fO2DVowJedZbVP15NsfSmXCoEb4QYrzxZOpygxJR+WwafOcQhIRPzVLUOgwYlPdMM/51IDhnnaDNMUnXeVmLiBFHhNAz5rYZ8quDwN6JgtKT83cPjaspRf61hpaqjUV7PBgWq7Hv3bQ3NbHaHFVA== Received: from PH7PR17CA0014.namprd17.prod.outlook.com (2603:10b6:510:324::29) by CH0PR12MB8486.namprd12.prod.outlook.com (2603:10b6:610:18a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.17; Sat, 22 Feb 2025 15:54:37 +0000 Received: from SN1PEPF000397AE.namprd05.prod.outlook.com (2603:10b6:510:324:cafe::94) by PH7PR17CA0014.outlook.office365.com (2603:10b6:510:324::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397AE.mail.protection.outlook.com (10.167.248.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:36 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:20 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:19 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:18 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 03/14] iommufd: Abstract an iommufd_eventq from iommufd_fault Date: Sat, 22 Feb 2025 07:54:00 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AE:EE_|CH0PR12MB8486:EE_ X-MS-Office365-Filtering-Correlation-Id: 977f8858-c0fb-4546-3061-08dd5359354a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: ZYD0zgckb+Lqz2sNfHuJEgl0dN28DG36wnicJWMjvCi3VoBNT+pVbzuCmZUOsz8ipJSA3/rMwKvra9cu2xVyDVdaVV2GTT4WyvYZnpRyJHMsqo+d7QzxXxNdKphoef8jgFELPqBweQBOllIVlEnBgG0rpTHLPeIee2DzyWPg8zRh4XUIXHethryLdHiG2uTWCjc01OM0hba2oZUFhpYJdbFHyksZ/9maFBRuWPn/QpUCMu8+htfBMsCM/hgAcoqQ4J7TlDib1+FGxNHLJ3JpsVgGcwU7Qr90xjDa7mytBj7hkxRrA3yjsTrH1UF4NgHlqugUuSglMWuFuvqcwus7dPnqcwRX1/hvf9+eeKF9YXnLomfAUSHwzOTkZn3EaTqdcR7aNw1xipW/Tez2tyhc24PjO1IbgaQRi8qPBb02tcGUPdK+j/RRZf1gVNl3RoY/TEpw12l21Bxd2eko1KFBOI0YpXmB6m3hTEC7MLepr1fWvfOJMQHbdTHbpXYBLKkugr+A8HaTBGw6woFTulGjdhzH920KRedxRIIifBxOpVj0/rospjsz9CbI0ALmMMWR33nm/2qWdfl0xNe8wOIScz1OCW1LExNSh9hY7faljMRlphZ7kxn/Cu7408Lffi4lMDCCHB9urGEMBz3/3t0TJb8wCzQ/kc+ouy48mLDcRwc8Z1KZ0Qfq/z5bp/d1oWyjmefGuTW0hoAAzTxqKo3Q7p04ePwnwvqvQxicKEQTlNhPPyCVTfk8smW1RyIK4TejE1pftfs87/AttHfMO9ZHHh71+dVzaqgdptVfzaiM2JzEik94861Fd6iw0eAfFXaQevpjkJEzNkaoLW95iZujGCigYtIgbZwfVrJkU5iUrOZkp+LuY+9e4z8IdhbXaifyeE16DLE9Ta7tfxNmxnvSfjnQjiokFfZIdmjopiwmetfD2Szxtnmn5cgJabjKcLFhF6J0RtgWRcKogCKHPTH3YWIBlnrKSbm4KqSnS1o8ATsKB4xURmvtVjHILm7TJ0HwHNlVVxmJCLPI1uCTPSYD2/Wa4tyK1FO1dnY33cvVWH8irbhwE5iiVq4hWAdMNtvIFUItBMquAmQhAGeYZMLMoKjora2T/VT75HGV7j8o0rHNClBJKAnlXQ/xPMVSmsC0YUN3KP9wCtWT0g3W2dfDm3I3NZqqmeD+EnaqN8vEPX0qjRqSi82U6CbVTrGV8pocNoiCOw9NLiGozmQnS9X6KdQvTNHff72lYEvhSQq5v43v3qMl18nJ29yYh6PWS3qrClKYD/Hliw2buVhckghCR5vLPnDad152eT7yO2ROjmIUG8vOcGxr1ExaFpdcsAJcEK+j5v5cCMCFvnzCOAKBIPfHZTqDPhkLsqxSAzVJDL+UCQaawEURQZSbOkSjFnVU3bfJttTbS5fal2y1ad7ufRdbV7hl6qv4VD4e18X0CGiXQXUUIyBDlPURAZHszHgwcCYtSU8CsFEkEUtgFmm174vYU5hztRJGrpX4tRjGm4M= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:36.6477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 977f8858-c0fb-4546-3061-08dd5359354a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397AE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8486 The fault object was designed exclusively for hwpt's IO page faults (PRI). But its queue implementation can be reused for other purposes too, such as hardware IRQ and event injections to user space. Meanwhile, a fault object holds a list of faults. So it's more accurate to call it a "fault queue". Combining the reusing idea above, abstract a new iommufd_eventq as a common structure embedded into struct iommufd_fault, similar to hwpt_paging holding a common hwpt. Add a common iommufd_eventq_ops and iommufd_eventq_init to prepare for an IOMMUFD_OBJ_VEVENTQ (vIOMMU Event Queue). Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/iommufd_private.h | 28 ++++-- drivers/iommu/iommufd/fault.c | 111 +++++++++++++----------- drivers/iommu/iommufd/hw_pagetable.c | 6 +- 3 files changed, 82 insertions(+), 63 deletions(-) diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h index 1c58f5fe17b4..44fb30af10b0 100644 --- a/drivers/iommu/iommufd/iommufd_private.h +++ b/drivers/iommu/iommufd/iommufd_private.h @@ -454,20 +454,13 @@ void iopt_remove_access(struct io_pagetable *iopt, u32 iopt_access_list_id); void iommufd_access_destroy_object(struct iommufd_object *obj); -/* - * An iommufd_fault object represents an interface to deliver I/O page faults - * to the user space. These objects are created/destroyed by the user space and - * associated with hardware page table objects during page-table allocation. - */ -struct iommufd_fault { +struct iommufd_eventq { struct iommufd_object obj; struct iommufd_ctx *ictx; struct file *filep; spinlock_t lock; /* protects the deliver list */ struct list_head deliver; - struct mutex mutex; /* serializes response flows */ - struct xarray response; struct wait_queue_head wait_queue; }; @@ -480,12 +473,29 @@ struct iommufd_attach_handle { /* Convert an iommu attach handle to iommufd handle. */ #define to_iommufd_handle(hdl) container_of(hdl, struct iommufd_attach_handle, handle) +/* + * An iommufd_fault object represents an interface to deliver I/O page faults + * to the user space. These objects are created/destroyed by the user space and + * associated with hardware page table objects during page-table allocation. + */ +struct iommufd_fault { + struct iommufd_eventq common; + struct mutex mutex; /* serializes response flows */ + struct xarray response; +}; + +static inline struct iommufd_fault * +eventq_to_fault(struct iommufd_eventq *eventq) +{ + return container_of(eventq, struct iommufd_fault, common); +} + static inline struct iommufd_fault * iommufd_get_fault(struct iommufd_ucmd *ucmd, u32 id) { return container_of(iommufd_get_object(ucmd->ictx, id, IOMMUFD_OBJ_FAULT), - struct iommufd_fault, obj); + struct iommufd_fault, common.obj); } int iommufd_fault_alloc(struct iommufd_ucmd *ucmd); diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/fault.c index 5d8de98732b6..f8e60e5879d1 100644 --- a/drivers/iommu/iommufd/fault.c +++ b/drivers/iommu/iommufd/fault.c @@ -17,6 +17,8 @@ #include "../iommu-priv.h" #include "iommufd_private.h" +/* IOMMUFD_OBJ_FAULT Functions */ + int iommufd_fault_iopf_enable(struct iommufd_device *idev) { struct device *dev = idev->dev; @@ -73,13 +75,13 @@ void iommufd_auto_response_faults(struct iommufd_hw_pagetable *hwpt, INIT_LIST_HEAD(&free_list); mutex_lock(&fault->mutex); - spin_lock(&fault->lock); - list_for_each_entry_safe(group, next, &fault->deliver, node) { + spin_lock(&fault->common.lock); + list_for_each_entry_safe(group, next, &fault->common.deliver, node) { if (group->attach_handle != &handle->handle) continue; list_move(&group->node, &free_list); } - spin_unlock(&fault->lock); + spin_unlock(&fault->common.lock); list_for_each_entry_safe(group, next, &free_list, node) { list_del(&group->node); @@ -99,7 +101,9 @@ void iommufd_auto_response_faults(struct iommufd_hw_pagetable *hwpt, void iommufd_fault_destroy(struct iommufd_object *obj) { - struct iommufd_fault *fault = container_of(obj, struct iommufd_fault, obj); + struct iommufd_eventq *eventq = + container_of(obj, struct iommufd_eventq, obj); + struct iommufd_fault *fault = eventq_to_fault(eventq); struct iopf_group *group, *next; unsigned long index; @@ -109,7 +113,7 @@ void iommufd_fault_destroy(struct iommufd_object *obj) * accessing this pointer. Therefore, acquiring the mutex here * is unnecessary. */ - list_for_each_entry_safe(group, next, &fault->deliver, node) { + list_for_each_entry_safe(group, next, &fault->common.deliver, node) { list_del(&group->node); iopf_group_response(group, IOMMU_PAGE_RESP_INVALID); iopf_free_group(group); @@ -142,15 +146,15 @@ static void iommufd_compose_fault_message(struct iommu_fault *fault, static struct iopf_group * iommufd_fault_deliver_fetch(struct iommufd_fault *fault) { - struct list_head *list = &fault->deliver; + struct list_head *list = &fault->common.deliver; struct iopf_group *group = NULL; - spin_lock(&fault->lock); + spin_lock(&fault->common.lock); if (!list_empty(list)) { group = list_first_entry(list, struct iopf_group, node); list_del(&group->node); } - spin_unlock(&fault->lock); + spin_unlock(&fault->common.lock); return group; } @@ -158,16 +162,17 @@ iommufd_fault_deliver_fetch(struct iommufd_fault *fault) static void iommufd_fault_deliver_restore(struct iommufd_fault *fault, struct iopf_group *group) { - spin_lock(&fault->lock); - list_add(&group->node, &fault->deliver); - spin_unlock(&fault->lock); + spin_lock(&fault->common.lock); + list_add(&group->node, &fault->common.deliver); + spin_unlock(&fault->common.lock); } static ssize_t iommufd_fault_fops_read(struct file *filep, char __user *buf, size_t count, loff_t *ppos) { size_t fault_size = sizeof(struct iommu_hwpt_pgfault); - struct iommufd_fault *fault = filep->private_data; + struct iommufd_eventq *eventq = filep->private_data; + struct iommufd_fault *fault = eventq_to_fault(eventq); struct iommu_hwpt_pgfault data = {}; struct iommufd_device *idev; struct iopf_group *group; @@ -216,7 +221,8 @@ static ssize_t iommufd_fault_fops_write(struct file *filep, const char __user *b size_t count, loff_t *ppos) { size_t response_size = sizeof(struct iommu_hwpt_page_response); - struct iommufd_fault *fault = filep->private_data; + struct iommufd_eventq *eventq = filep->private_data; + struct iommufd_fault *fault = eventq_to_fault(eventq); struct iommu_hwpt_page_response response; struct iopf_group *group; size_t done = 0; @@ -256,59 +262,61 @@ static ssize_t iommufd_fault_fops_write(struct file *filep, const char __user *b return done == 0 ? rc : done; } -static __poll_t iommufd_fault_fops_poll(struct file *filep, - struct poll_table_struct *wait) +/* Common Event Queue Functions */ + +static __poll_t iommufd_eventq_fops_poll(struct file *filep, + struct poll_table_struct *wait) { - struct iommufd_fault *fault = filep->private_data; + struct iommufd_eventq *eventq = filep->private_data; __poll_t pollflags = EPOLLOUT; - poll_wait(filep, &fault->wait_queue, wait); - spin_lock(&fault->lock); - if (!list_empty(&fault->deliver)) + poll_wait(filep, &eventq->wait_queue, wait); + spin_lock(&eventq->lock); + if (!list_empty(&eventq->deliver)) pollflags |= EPOLLIN | EPOLLRDNORM; - spin_unlock(&fault->lock); + spin_unlock(&eventq->lock); return pollflags; } -static int iommufd_fault_fops_release(struct inode *inode, struct file *filep) +static int iommufd_eventq_fops_release(struct inode *inode, struct file *filep) { - struct iommufd_fault *fault = filep->private_data; + struct iommufd_eventq *eventq = filep->private_data; - refcount_dec(&fault->obj.users); - iommufd_ctx_put(fault->ictx); + refcount_dec(&eventq->obj.users); + iommufd_ctx_put(eventq->ictx); return 0; } -#define INIT_FAULT_FOPS(read_op, write_op) \ +#define INIT_EVENTQ_FOPS(read_op, write_op) \ ((const struct file_operations){ \ .owner = THIS_MODULE, \ .open = nonseekable_open, \ .read = read_op, \ .write = write_op, \ - .poll = iommufd_fault_fops_poll, \ - .release = iommufd_fault_fops_release, \ + .poll = iommufd_eventq_fops_poll, \ + .release = iommufd_eventq_fops_release, \ }) -static int iommufd_fault_init(struct iommufd_fault *fault, char *name, - struct iommufd_ctx *ictx, - const struct file_operations *fops) +static int iommufd_eventq_init(struct iommufd_eventq *eventq, char *name, + struct iommufd_ctx *ictx, + const struct file_operations *fops) { struct file *filep; int fdno; - spin_lock_init(&fault->lock); - INIT_LIST_HEAD(&fault->deliver); - init_waitqueue_head(&fault->wait_queue); + spin_lock_init(&eventq->lock); + INIT_LIST_HEAD(&eventq->deliver); + init_waitqueue_head(&eventq->wait_queue); - filep = anon_inode_getfile(name, fops, fault, O_RDWR); + filep = anon_inode_getfile(name, fops, eventq, O_RDWR); if (IS_ERR(filep)) return PTR_ERR(filep); - fault->ictx = ictx; - iommufd_ctx_get(fault->ictx); - fault->filep = filep; - refcount_inc(&fault->obj.users); + eventq->ictx = ictx; + iommufd_ctx_get(eventq->ictx); + eventq->filep = filep; + refcount_inc(&eventq->obj.users); fdno = get_unused_fd_flags(O_CLOEXEC); if (fdno < 0) @@ -317,7 +325,7 @@ static int iommufd_fault_init(struct iommufd_fault *fault, char *name, } static const struct file_operations iommufd_fault_fops = - INIT_FAULT_FOPS(iommufd_fault_fops_read, iommufd_fault_fops_write); + INIT_EVENTQ_FOPS(iommufd_fault_fops_read, iommufd_fault_fops_write); int iommufd_fault_alloc(struct iommufd_ucmd *ucmd) { @@ -329,36 +337,37 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd) if (cmd->flags) return -EOPNOTSUPP; - fault = iommufd_object_alloc(ucmd->ictx, fault, IOMMUFD_OBJ_FAULT); + fault = __iommufd_object_alloc(ucmd->ictx, fault, IOMMUFD_OBJ_FAULT, + common.obj); if (IS_ERR(fault)) return PTR_ERR(fault); xa_init_flags(&fault->response, XA_FLAGS_ALLOC1); mutex_init(&fault->mutex); - fdno = iommufd_fault_init(fault, "[iommufd-pgfault]", ucmd->ictx, - &iommufd_fault_fops); + fdno = iommufd_eventq_init(&fault->common, "[iommufd-pgfault]", + ucmd->ictx, &iommufd_fault_fops); if (fdno < 0) { rc = fdno; goto out_abort; } - cmd->out_fault_id = fault->obj.id; + cmd->out_fault_id = fault->common.obj.id; cmd->out_fault_fd = fdno; rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd)); if (rc) goto out_put_fdno; - iommufd_object_finalize(ucmd->ictx, &fault->obj); + iommufd_object_finalize(ucmd->ictx, &fault->common.obj); - fd_install(fdno, fault->filep); + fd_install(fdno, fault->common.filep); return 0; out_put_fdno: put_unused_fd(fdno); - fput(fault->filep); + fput(fault->common.filep); out_abort: - iommufd_object_abort_and_destroy(ucmd->ictx, &fault->obj); + iommufd_object_abort_and_destroy(ucmd->ictx, &fault->common.obj); return rc; } @@ -371,11 +380,11 @@ int iommufd_fault_iopf_handler(struct iopf_group *group) hwpt = group->attach_handle->domain->iommufd_hwpt; fault = hwpt->fault; - spin_lock(&fault->lock); - list_add_tail(&group->node, &fault->deliver); - spin_unlock(&fault->lock); + spin_lock(&fault->common.lock); + list_add_tail(&group->node, &fault->common.deliver); + spin_unlock(&fault->common.lock); - wake_up_interruptible(&fault->wait_queue); + wake_up_interruptible(&fault->common.wait_queue); return 0; } diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c index 7de6e914232e..006425e7f609 100644 --- a/drivers/iommu/iommufd/hw_pagetable.c +++ b/drivers/iommu/iommufd/hw_pagetable.c @@ -14,7 +14,7 @@ static void __iommufd_hwpt_destroy(struct iommufd_hw_pagetable *hwpt) iommu_domain_free(hwpt->domain); if (hwpt->fault) - refcount_dec(&hwpt->fault->obj.users); + refcount_dec(&hwpt->fault->common.obj.users); } void iommufd_hwpt_paging_destroy(struct iommufd_object *obj) @@ -409,8 +409,8 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) } hwpt->fault = fault; hwpt->domain->iopf_handler = iommufd_fault_iopf_handler; - refcount_inc(&fault->obj.users); - iommufd_put_object(ucmd->ictx, &fault->obj); + refcount_inc(&fault->common.obj.users); + iommufd_put_object(ucmd->ictx, &fault->common.obj); } hwpt->domain->iommufd_hwpt = hwpt; From patchwork Sat Feb 22 15:54:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986687 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2056.outbound.protection.outlook.com [40.107.220.56]) (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 93B4580C02; Sat, 22 Feb 2025 15:54:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239678; cv=fail; b=eW4EPypYfMMhZ8u6T6apd52MKYj/KKKUEl41XITklKj/6pcBm40CiWEjXTsIJcJuAkDwTyhGvSMXRp4v5QUgte9G/heAxg8EW2Bm/V8D770DNtoPaQ2T/RLZ+A8Vbm3JPRh+5pt/x0Z9ldw5V2+zQsDlwa11R0HbNxbHkCSFd6o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239678; c=relaxed/simple; bh=K+5L3HSdgIfiT/YMZGM1NRRJ+WNYbPntlxZb6t9GOh0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i93mTcHIHA39JE9ARXhiZxEh2waBh2mtzCrugFoGQXgWSW1ofvMN7uohAXR3vy63jYo/81C98VGFjj+IjicZ01FH08K04IN6cUz7HkCRqzjXbflfdncf59PC68GOl1RDTu+0zP6VP+58xWyZ14xiKiOXYd4N9snvavbn9hRBHGw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=fhs5MnS8; arc=fail smtp.client-ip=40.107.220.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="fhs5MnS8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ugBRyIgx7cHjqRP1SDfEIwJR8aMaZ7LqztYUKRyYiI3cN2DgUUc8QyX3BdPTaRjYZdKuu65WNLrmfyJEmbsoTtp9za9uOonS4yvW8yWG7s+nsz2o6SWwcBgRIIt5hMLjlX7vBmjZ02P23zWcKbvnNnLjlp5SzS+nKe8DT5Tjw2YmCWFbZj3ptYvmO2PdKASsi+CDr3zg32wTUiHfI2BjfNekEekLQgxtTwKkAh0T8wHo4Wg1+DH6Uwo56vX6wLp2fupMII09/bNC1fpKO3PHSJM7HqeIPIkMrAfOFi9JH/SvtHx7tpWehZTS8xBciGMCC5bw7WHSDs6NTWRWzkM0vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Qhvw+OY5rWzXvgenwxNHj4+yj2zdbIVe/Hrx8rdxbSY=; b=aUkjY4Oo151RRfezWkyEcWan6th+rAvOdFvf8ymNN2EgEzI+DlMwyrUSJLb/hAtVlui2v9WqRc3mFBmsu8mfGnnUmRgWnYhII13XINxs04ALl3Zgmiyx8KwXIeLoenlqHeAIN/Hyd6eHi3+DbDzZ8ydd6zA7Ys/Au8GRo2l42fzUOunKDfKZL0hy2q8f9GBwRZEZydjjfIaTpT3f2iEQX+38CyJyb7R+/vGq4be8zIG3QZaivqDfycQmYDQrwUKM05MuZX9lbPpGg7J3nuadevjOEmNiRR+r4wArGEwXDbQcfbVLw0kCEEoDSKVF8aK6J0NM+owzV2v5h4qG74C1YQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qhvw+OY5rWzXvgenwxNHj4+yj2zdbIVe/Hrx8rdxbSY=; b=fhs5MnS8FmNpiKh0HfAL95fY8r9IXHsZg72dMoRoDD0pavn2kda53zjeESNE6fjgANd+z2mUjSuq2kqDrDdIw8NJiNjk0GXkY8sOcrZfxtoiwqzeF16cAKvP9mY9UhBXuppgepRv/p4aijN8y4wNEMRGLQM0ADO5NzXkx3hc5hcxhkk/grbJ/sUthwRAApyXwOTBFotQ6eQVU501LvoC0MhBh1Ys3H1CX3av+JMcmbRzc2wVpJdJ/Z3hXcrUsef69j9vCdMmJ/ReozjwOqa1SiTaQjOF44w+xZxI4ud2i4hxe9+imxEooaaE3mQtjYfZG4D6NbFnzrnX6WxXzvPFjA== Received: from DM6PR17CA0034.namprd17.prod.outlook.com (2603:10b6:5:1b3::47) by CY8PR12MB7588.namprd12.prod.outlook.com (2603:10b6:930:9b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:30 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:5:1b3:cafe::e1) by DM6PR17CA0034.outlook.office365.com (2603:10b6:5:1b3::47) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Sat, 22 Feb 2025 15:54:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:30 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:21 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:21 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:20 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 04/14] iommufd: Rename fault.c to eventq.c Date: Sat, 22 Feb 2025 07:54:01 -0800 Message-ID: <0455dad035c7eaa1218658377c20c77da2e72e1d.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|CY8PR12MB7588:EE_ X-MS-Office365-Filtering-Correlation-Id: 62656368-a1a5-410c-29d6-08dd53593179 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: GP1SK+rJB/KTOh6FSwBjb4YnasKjtqMAye0/ZUHE3LTTGeUI5QoNjpLaTW3QVmeO24wjrkNKVDUZChS/Cu9TPaVbx1eChWiJi8D96qYtVkgAt330T9D10TI07kJtNrnVbNnNStW7IQ+o73OPIzxSHWrfmEEA/ktzdbl5UV/mgYegbPs5Tjs7x4tqg8VYtRZeaZFm6Zm9KipZtGw42WAQthLvBuTJit+/abus6x33aMmPhXEyPDEP9entnAzp2oBjoQpumJWN0vA5CtnCbQgwK78Q31V2VQj0kwKb28GFJC4BCopqTW1SwC1TSPeRGiBeWJSnzaza4ur+rOyPQaoTrg99AOIXIdyMKxh6Dikhjq3WNK8H9uuRrSLTTsq2Hi2mogwEJbhsSN9fwI2UJkxi+9QHquNDl+CjshzNohwlQzNUJ1mzEQ80kywnhdGcWPnLRiYlCfATYXT+q/MYtK2St+EIJCzq0h+Y7RqfKKP0kdcW+9zoGErQHYdglgcTSs6dgndpLXH3++0KbTk+y+4o7RXYUpwfwCXiR6jxOQckmiJIYx2w3Dl2rTdSDY3I6rm7apAV77RKkpqjGhhIRlgrw0tQHH7TKmg/3tsdhNqSrCGJHy++wuChhHMHAa4a7uBus0e4fOdJbfpT2BSV+8xYYd7DHZOgyGTZMUltwnuBJ7bPydP7ZFtFC6N3wBfrP4h0vfOI3LqZ4H4r/zuvX9/NaYn0Irsfx+kZ9kumSBfSa8CMg+QtqIgDFStwB4+2vb/G2apz/34gTqHpuEUL8jZaCmYcZ8hAIg6ep767hOJ2UcfFS2waWj5VdBsYQCjwBNMiSlxJHmwXzV2b6S5L7l/tLmRHPz1hrg12kP8GFHC02f+7lgWQ/cJ6W4J/CTbXYjlSLguT8jTkpTIXDmr7nIIH4UqnRykKaEu1c29Ww7aEVFp7BKNV5mCcp89NiFTwUgUyfdvur7p+wAf3RaZcwK2xKRFGZQ77OXpsgU3FY0YkQfEYx+LagX5EPALqR4mi82MGue4e6RB98xv6rJu8IB1DP4KM04HJ4WkXvAhERX/VrX02I8Z8x1kdzqk/limBtSxGHo55qi9myAsjedOJ/2pdC3sCJz2FEkdzNbOKK7r+kAokAn39jO8CwYA14vuUazF8NXr9TMZc33UwqMjGsbBvRMr1HTYHrQXuxVYEzK/kVPcKqTvpaC7FJ3ZQmiDiahLzocSk1lXeYEpc6BF8eGwlinZ0Nuo3WEJrySZyRyH+8PUPAwHHglJirvJ1iBZ8ph+JAzepLg2OG4L4zxPhFuC6fCQJdax8gq/Q6EBfsFBaXWhhLf9uyuHbh1QFWHlhfrsfUw5wVBVc33Y9Isi08TxRAs28qiIvlht5vooJ0OT7kIzLhBnik7PnJRkDGqgqshx2i2lHZHcEwxxN83SCSrMztN3IElMFiRH5chTZY32U9P1tRsEaEppDeuUAJP6zqlLuq7k/qrBmJB81KSz1jJdeoxpjfdtBqUhDEWPxJIW9eqk= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:30.2603 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62656368-a1a5-410c-29d6-08dd53593179 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7588 Rename the file, aligning with the new eventq object. Reviewed-by: Kevin Tian Reviewed-by: Lu Baolu Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/Makefile | 2 +- drivers/iommu/iommufd/{fault.c => eventq.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/iommu/iommufd/{fault.c => eventq.c} (100%) diff --git a/drivers/iommu/iommufd/Makefile b/drivers/iommu/iommufd/Makefile index cb784da6cddc..71d692c9a8f4 100644 --- a/drivers/iommu/iommufd/Makefile +++ b/drivers/iommu/iommufd/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only iommufd-y := \ device.o \ - fault.o \ + eventq.o \ hw_pagetable.o \ io_pagetable.o \ ioas.o \ diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/eventq.c similarity index 100% rename from drivers/iommu/iommufd/fault.c rename to drivers/iommu/iommufd/eventq.c From patchwork Sat Feb 22 15:54:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986691 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) (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 CB1931E491B; Sat, 22 Feb 2025 15:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239692; cv=fail; b=SWlA+Wo0OSite0hKqsRfYA3E6uPfcGAA5zB9vSkRKS2R6tjKPqtW28cGlV1mnrgNZ9lr2yN2PtVMgUyd9lBy3Cbt7QjMCiIcTCaADgzgmDa2oEJ638frb9eXRpscQPbQylJPlhrRbwmnsa6BNcfY22QEdxiKNhugxHtKPEoTHts= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239692; c=relaxed/simple; bh=jNXRGUMFtljfkwjSiuX5v0VH8S/GXRVYFqeNnY/A/W0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lg0ocaEvQETfb6loHDcEQN0y7r69FjGLnM3EXcFRtRRyCbqYqGdlWQINTZG05sNl6ptLDl9QtOeuy851L7RJLEf+5ai8w2DfFnNy9Yb7T6IQNKlNt7NFwXnxRX6nk8JZ1xKKo2a0+kIJVhesMPlBXXopzWCf95AzNSjI75cGEw4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=kmM+TMuU; arc=fail smtp.client-ip=40.107.92.82 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="kmM+TMuU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H9cg9xiWJgmYKTjjoIVYFlwDSHlpDqicqymYedb3Mas8sNt0q8r7Org1d3dqnTQlBK9f5J2fXS1JyO7r1MJlUT2Z+IWoOujMdIbKCOUes0uld6lBnZb+DCt/Ed2FFuU0+PHAaAufW1hUrUZHVL5jNnnQ1eZ12rKzwRjKFIOER890hqfKlgqBf+v55lpZvG1NLb4ZapI87nAi3K9AvnzyXMF1QTx0tj6rSxgZAfNOwpQYXX3BXAFG+ULQmE6GrTNdvAulaUOM4lHKYZnA+olEwf4T0x07sJcz3pCKTzJK+J/S3jnuidmnJWlEF+Zrkq3lPHELx2hHVlTGxd+cjXQLOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8Bj49m+yz1gTE0D4kxDXYsIZHvm2UdsEYbs02SBXhG0=; b=xXf3U/k3eKBxAmwBM56QeAHHfGZLLHah35UM1KL6sNMXtbU/sS/TI+8g19yIlhXKUdk0T64oBWqmam8WtsqXnxwoXG8vGIBwC7cPCnjQoYAX6xiQxtQpTh0Yslnzby8a0z1BM9cMCbE3iGLIq1UDRm62sXLSrFU8N8NS7PmDEZNnZXWLr4knjFrJ4UMk7lr48zhwnI/J8HL2EXtEF3OOZg7i36Qa6oLXNz3NBOpD49V/VClM1k2q/isxM9QVOoTfSE22XFNSSay0nphxrU1iw1lCZf41n2Iy7WXev82OAeyb7Rj2yQoGYOoY8HNca4ayHMmeyEwX2SEh/9s4x/+aeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8Bj49m+yz1gTE0D4kxDXYsIZHvm2UdsEYbs02SBXhG0=; b=kmM+TMuUIirgzQPebAI5JnHZX2Uj/g20c0AEpcsmYoeIr6zsOJdk6tppau8GJmvlxflsRY3UMIiTso9PZyiE9iOgcpLddZhpRtD5qyYIDDwMcg52uRRcHmT26yMeaFTvqVOOjXsta5oG07T2cGCJzZ44Qu5JfO0Zv+k7KuLVnFT9ooAseNLT+ZxdYwjKCz230Cy6v4AXc8tei7jbO8G6R8kqsXxYToMNl/Hl3OHen7Q1OkkR4u00kFq1Lgdg0f1dTCdNXr5+vWckwsLfYJhGwwg7FX4IXev7oiq4T/UJCBXhhDeqN+MbUC0v9HIzJ/GSz/bKPQ5wLERKqPQvGtFeoQ== Received: from PH7P220CA0146.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::32) by SJ2PR12MB7919.namprd12.prod.outlook.com (2603:10b6:a03:4cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Sat, 22 Feb 2025 15:54:39 +0000 Received: from SN1PEPF000397B5.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::45) by PH7P220CA0146.outlook.office365.com (2603:10b6:510:327::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.19 via Frontend Transport; Sat, 22 Feb 2025 15:54:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B5.mail.protection.outlook.com (10.167.248.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:38 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:23 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:23 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:21 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 05/14] iommufd: Add IOMMUFD_OBJ_VEVENTQ and IOMMUFD_CMD_VEVENTQ_ALLOC Date: Sat, 22 Feb 2025 07:54:02 -0800 Message-ID: <69b6beab203b3546c066fee5e0c9ebe0ee1988de.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B5:EE_|SJ2PR12MB7919:EE_ X-MS-Office365-Filtering-Correlation-Id: d7664148-185d-420c-4a03-08dd5359369c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: q9bezmqV2wgzU72+epFoZKm8QEkd7864wqbJLXKxrhFMsVBjahPbbR1TatzDViaHT4yeFwwinqOw38b+JLcQxF7XtT/EaY/0aKmeDIX8PPNBLrl/6v/ppBgT6g4Phbz868L7HgjGXlbWIuFxAaFiXvfA3B3XLjwHAPqKtP1Joz01JxFqymZU+9crxz7CSntutw4DoONLIexjMoeeXo0hg8MT2pMVyximr49KWGnHs0/W13uWldic3i4ltLyJ1t1JFR1+vznAWX1P8KVtKB9WQQkh7xyA6nGUeqbSZr0hdhdFsfdaFvI8XyPWDERzqJsA+Hw8iI/rN49/Ay6oQEaOHA7/6lbN7e0aX86kE0Lk+6ANLN+y2WrCz6B6ne7JiEZiRdQzqoQf+2fZdWky51mZelidezJ+uIb/BolQqxtxtlU+Js7Y6J47zfpOI47G0sHRv+oJ7wL6VC76y16yq3LQQyg42AZDKqCnIfiQrCdHPsUb7c+9yIt/9/UwyQzZO6c8YQv1uC2bCfe2tFp/hBDkMMia9UU/UG9biadh0X0Y6/WJSo0+S+xqEnufmDM3XU6iTirbtVMsDhzTRyWqGwK7n5C+Jk75t9UhJcoKUR6tQLi3Vz8TJoK2YLAhSVxrRoQj3SYxxTyK1cS3f72m0FM/QrPAUAzXXEj2bvC6BOkDdmVLQg+SZsYPzifAwJAQdRlE+4Qgmw2Fihzpt1eOqHnfwVj0YhGMZugJwjVf/SfEJlqP1SYnnDenzsBPShE8VPEKVvJS0cEaIi98IhedNQ0WfTJtQCQzeDAPnBiRA6A6DlEkpJhh7qgv/iwaB0ozGFPFxVamPw81kzKo1hi/rY47tR77B4+N++zGRywfNvIhKf9ZzBQEufcfokqFOh3JFDdh5NycsKQNBKbfVk8HPXcWCpIzFiLyfby+p6/azD6/1SUDr02udd2rqZs5iRwoQU1YsMFiBx4xw+s8W1DaVmH0SX2+8C1U2rkjP7UwrBe7/VK3ALdSbRmcdhNV/5x4NC5fPTGwsV4pPF8BFnhfbu/UY7tQbw9ukFeIx2NmHwsxzzuzancYB4H6Z8YuB3iJp7ACZ0Vrni4S2g7SCiGGrhatFiiRecCMHFkC8wcP3R+sPPAj/XsVR1JLmDNAf67+CDpodlwsVY1NQOze0LY7D+26L3uH1X22CV2xuFxh2jZWsGakC8i2wni9jsBn6WukqNe/QLEYlgdf/MM4S6+igKlWAPcYRCF66fTqoGkthlPTropIhFEA7tT/f6NXGp7fhtBewoAXjykjF4T1u89RwpKxaYdBbm95heEZr3QXkp9p6SQGgj51EKS5mI7RMoVxmEL3iFd5ypfOLWvBMllvdYCy0vn+FEqpIJMK0hbeIT9/rPaa9p/jpNmiT+CiuonuDPY6m+KSGMTej/aL5FEN52iKtXn1sA/pTbpMWPJnbp4+NolNSsl/5jQb5QyPStwuF8qc4NkgwT4VUagmZ8HYW2DtpICgwbpcGWYHVZB3HLImfAY= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:38.8322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7664148-185d-420c-4a03-08dd5359369c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7919 Introduce a new IOMMUFD_OBJ_VEVENTQ object for vIOMMU Event Queue that provides user space (VMM) another FD to read the vIOMMU Events. Allow a vIOMMU object to allocate vEVENTQs, with a condition that each vIOMMU can only have one single vEVENTQ per type. Add iommufd_veventq_alloc() with iommufd_veventq_ops for the new ioctl. Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/iommufd_private.h | 82 ++++++++++ include/linux/iommufd.h | 3 + include/uapi/linux/iommufd.h | 82 ++++++++++ drivers/iommu/iommufd/eventq.c | 209 +++++++++++++++++++++++- drivers/iommu/iommufd/main.c | 7 + drivers/iommu/iommufd/viommu.c | 2 + 6 files changed, 384 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h index 44fb30af10b0..8cda9c4672eb 100644 --- a/drivers/iommu/iommufd/iommufd_private.h +++ b/drivers/iommu/iommufd/iommufd_private.h @@ -507,6 +507,74 @@ void iommufd_fault_iopf_disable(struct iommufd_device *idev); void iommufd_auto_response_faults(struct iommufd_hw_pagetable *hwpt, struct iommufd_attach_handle *handle); +/* An iommufd_vevent represents a vIOMMU event in an iommufd_veventq */ +struct iommufd_vevent { + struct iommufd_vevent_header header; + struct list_head node; /* for iommufd_eventq::deliver */ + ssize_t data_len; + u64 event_data[] __counted_by(data_len); +}; + +#define vevent_for_lost_events_header(vevent) \ + (vevent->header.flags & IOMMU_VEVENTQ_FLAG_LOST_EVENTS) + +/* + * An iommufd_veventq object represents an interface to deliver vIOMMU events to + * the user space. It is created/destroyed by the user space and associated with + * a vIOMMU object during the allocations. + */ +struct iommufd_veventq { + struct iommufd_eventq common; + struct iommufd_viommu *viommu; + struct list_head node; /* for iommufd_viommu::veventqs */ + struct iommufd_vevent lost_events_header; + + unsigned int type; + unsigned int depth; + + /* Use common.lock for protection */ + u32 num_events; + u32 sequence; +}; + +static inline struct iommufd_veventq * +eventq_to_veventq(struct iommufd_eventq *eventq) +{ + return container_of(eventq, struct iommufd_veventq, common); +} + +static inline struct iommufd_veventq * +iommufd_get_veventq(struct iommufd_ucmd *ucmd, u32 id) +{ + return container_of(iommufd_get_object(ucmd->ictx, id, + IOMMUFD_OBJ_VEVENTQ), + struct iommufd_veventq, common.obj); +} + +int iommufd_veventq_alloc(struct iommufd_ucmd *ucmd); +void iommufd_veventq_destroy(struct iommufd_object *obj); +void iommufd_veventq_abort(struct iommufd_object *obj); + +static inline void iommufd_vevent_handler(struct iommufd_veventq *veventq, + struct iommufd_vevent *vevent) +{ + struct iommufd_eventq *eventq = &veventq->common; + + lockdep_assert_held(&eventq->lock); + + /* + * Remove the lost_events_header and add the new node at the same time. + * Note the new node can be lost_events_header, for a sequence update. + */ + if (list_is_last(&veventq->lost_events_header.node, &eventq->deliver)) + list_del(&veventq->lost_events_header.node); + list_add_tail(&vevent->node, &eventq->deliver); + vevent->header.sequence = veventq->sequence; + veventq->sequence = (veventq->sequence + 1) & INT_MAX; + + wake_up_interruptible(&eventq->wait_queue); +} + static inline struct iommufd_viommu * iommufd_get_viommu(struct iommufd_ucmd *ucmd, u32 id) { @@ -515,6 +583,20 @@ iommufd_get_viommu(struct iommufd_ucmd *ucmd, u32 id) struct iommufd_viommu, obj); } +static inline struct iommufd_veventq * +iommufd_viommu_find_veventq(struct iommufd_viommu *viommu, u32 type) +{ + struct iommufd_veventq *veventq, *next; + + lockdep_assert_held(&viommu->veventqs_rwsem); + + list_for_each_entry_safe(veventq, next, &viommu->veventqs, node) { + if (veventq->type == type) + return veventq; + } + return NULL; +} + int iommufd_viommu_alloc_ioctl(struct iommufd_ucmd *ucmd); void iommufd_viommu_destroy(struct iommufd_object *obj); int iommufd_vdevice_alloc_ioctl(struct iommufd_ucmd *ucmd); diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h index 11110c749200..8948b1836940 100644 --- a/include/linux/iommufd.h +++ b/include/linux/iommufd.h @@ -34,6 +34,7 @@ enum iommufd_object_type { IOMMUFD_OBJ_FAULT, IOMMUFD_OBJ_VIOMMU, IOMMUFD_OBJ_VDEVICE, + IOMMUFD_OBJ_VEVENTQ, #ifdef CONFIG_IOMMUFD_TEST IOMMUFD_OBJ_SELFTEST, #endif @@ -93,6 +94,8 @@ struct iommufd_viommu { const struct iommufd_viommu_ops *ops; struct xarray vdevs; + struct list_head veventqs; + struct rw_semaphore veventqs_rwsem; unsigned int type; }; diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h index 78747b24bd0f..2ade4839880d 100644 --- a/include/uapi/linux/iommufd.h +++ b/include/uapi/linux/iommufd.h @@ -55,6 +55,7 @@ enum { IOMMUFD_CMD_VIOMMU_ALLOC = 0x90, IOMMUFD_CMD_VDEVICE_ALLOC = 0x91, IOMMUFD_CMD_IOAS_CHANGE_PROCESS = 0x92, + IOMMUFD_CMD_VEVENTQ_ALLOC = 0x93, }; /** @@ -1014,4 +1015,85 @@ struct iommu_ioas_change_process { #define IOMMU_IOAS_CHANGE_PROCESS \ _IO(IOMMUFD_TYPE, IOMMUFD_CMD_IOAS_CHANGE_PROCESS) +/** + * enum iommu_veventq_flag - flag for struct iommufd_vevent_header + * @IOMMU_VEVENTQ_FLAG_OVERFLOW: vEVENTQ has lost vEVENTs + */ +enum iommu_veventq_flag { + IOMMU_VEVENTQ_FLAG_LOST_EVENTS = (1U << 0), +}; + +/** + * struct iommufd_vevent_header - Virtual Event Header for a vEVENTQ Status + * @flags: Combination of enum iommu_veventq_flag + * @sequence: The sequence index of a vEVENT in the vEVENTQ, with a range of + * [0, INT_MAX] where the following index of INT_MAX is 0 + * + * Each iommufd_vevent_header reports a sequence index of the following vEVENT: + * ------------------------------------------------------------------------- + * | header0 {sequence=0} | data0 | header1 {sequence=1} | data1 |...| dataN | + * ------------------------------------------------------------------------- + * And this sequence index is expected to be monotonic to the sequence index of + * the previous vEVENT. If two adjacent sequence indexes has a delta larger than + * 1, it means that delta - 1 number of vEVENTs has lost, e.g. two lost vEVENTs: + * ------------------------------------------------------------------------- + * | ... | header3 {sequence=3} | data3 | header6 {sequence=6} | data6 | ... | + * ------------------------------------------------------------------------- + * If a vEVENT lost at the tail of the vEVENTQ and there is no following vEVENT + * providing the next sequence index, an IOMMU_VEVENTQ_FLAG_LOST_EVENTS header + * would be added to the tail, and no data would follow this header: + * --------------------------------------------------------------------------- + * |..| header3 {sequence=3} | data3 | header4 {flags=LOST_EVENTS, sequence=4} | + * --------------------------------------------------------------------------- + */ +struct iommufd_vevent_header { + __u32 flags; + __u32 sequence; +}; + +/** + * enum iommu_veventq_type - Virtual Event Queue Type + * @IOMMU_VEVENTQ_TYPE_DEFAULT: Reserved for future use + */ +enum iommu_veventq_type { + IOMMU_VEVENTQ_TYPE_DEFAULT = 0, +}; + +/** + * struct iommu_veventq_alloc - ioctl(IOMMU_VEVENTQ_ALLOC) + * @size: sizeof(struct iommu_veventq_alloc) + * @flags: Must be 0 + * @viommu: virtual IOMMU ID to associate the vEVENTQ with + * @type: Type of the vEVENTQ. Must be defined in enum iommu_veventq_type + * @veventq_depth: Maximum number of events in the vEVENTQ + * @out_veventq_id: The ID of the new vEVENTQ + * @out_veventq_fd: The fd of the new vEVENTQ. User space must close the + * successfully returned fd after using it + * @__reserved: Must be 0 + * + * Explicitly allocate a virtual event queue interface for a vIOMMU. A vIOMMU + * can have multiple FDs for different types, but is confined to one per @type. + * User space should open the @out_veventq_fd to read vEVENTs out of a vEVENTQ, + * if there are vEVENTs available. A vEVENTQ will lose events due to overflow, + * if the number of the vEVENTs hits @veventq_depth. + * + * Each vEVENT in a vEVENTQ encloses a struct iommufd_vevent_header followed by + * a type-specific data structure, in a normal case: + * ------------------------------------------------------------- + * || header0 | data0 | header1 | data1 | ... | headerN | dataN || + * ------------------------------------------------------------- + * unless a tailing IOMMU_VEVENTQ_FLAG_LOST_EVENTS header is logged (refer to + * struct iommufd_vevent_header). + */ +struct iommu_veventq_alloc { + __u32 size; + __u32 flags; + __u32 viommu_id; + __u32 type; + __u32 veventq_depth; + __u32 out_veventq_id; + __u32 out_veventq_fd; + __u32 __reserved; +}; +#define IOMMU_VEVENTQ_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_VEVENTQ_ALLOC) #endif diff --git a/drivers/iommu/iommufd/eventq.c b/drivers/iommu/iommufd/eventq.c index f8e60e5879d1..4c43ace8c725 100644 --- a/drivers/iommu/iommufd/eventq.c +++ b/drivers/iommu/iommufd/eventq.c @@ -262,13 +262,148 @@ static ssize_t iommufd_fault_fops_write(struct file *filep, const char __user *b return done == 0 ? rc : done; } +/* IOMMUFD_OBJ_VEVENTQ Functions */ + +void iommufd_veventq_abort(struct iommufd_object *obj) +{ + struct iommufd_eventq *eventq = + container_of(obj, struct iommufd_eventq, obj); + struct iommufd_veventq *veventq = eventq_to_veventq(eventq); + struct iommufd_viommu *viommu = veventq->viommu; + struct iommufd_vevent *cur, *next; + + lockdep_assert_held_write(&viommu->veventqs_rwsem); + + list_for_each_entry_safe(cur, next, &eventq->deliver, node) { + list_del(&cur->node); + if (cur != &veventq->lost_events_header) + kfree(cur); + } + + refcount_dec(&viommu->obj.users); + list_del(&veventq->node); +} + +void iommufd_veventq_destroy(struct iommufd_object *obj) +{ + struct iommufd_veventq *veventq = eventq_to_veventq( + container_of(obj, struct iommufd_eventq, obj)); + + down_write(&veventq->viommu->veventqs_rwsem); + iommufd_veventq_abort(obj); + up_write(&veventq->viommu->veventqs_rwsem); +} + +static struct iommufd_vevent * +iommufd_veventq_deliver_fetch(struct iommufd_veventq *veventq) +{ + struct iommufd_eventq *eventq = &veventq->common; + struct list_head *list = &eventq->deliver; + struct iommufd_vevent *vevent = NULL; + + spin_lock(&eventq->lock); + if (!list_empty(list)) { + struct iommufd_vevent *next; + + next = list_first_entry(list, struct iommufd_vevent, node); + /* Make a copy of the lost_events_header for copy_to_user */ + if (next == &veventq->lost_events_header) { + vevent = kzalloc(sizeof(*vevent), GFP_ATOMIC); + if (!vevent) + goto out_unlock; + } + list_del(&next->node); + if (vevent) + memcpy(vevent, next, sizeof(*vevent)); + else + vevent = next; + } +out_unlock: + spin_unlock(&eventq->lock); + return vevent; +} + +static void iommufd_veventq_deliver_restore(struct iommufd_veventq *veventq, + struct iommufd_vevent *vevent) +{ + struct iommufd_eventq *eventq = &veventq->common; + struct list_head *list = &eventq->deliver; + + spin_lock(&eventq->lock); + if (vevent_for_lost_events_header(vevent)) { + /* Remove the copy of the lost_events_header */ + kfree(vevent); + vevent = NULL; + /* An empty list needs the lost_events_header back */ + if (list_empty(list)) + vevent = &veventq->lost_events_header; + } + if (vevent) + list_add(&vevent->node, list); + spin_unlock(&eventq->lock); +} + +static ssize_t iommufd_veventq_fops_read(struct file *filep, char __user *buf, + size_t count, loff_t *ppos) +{ + struct iommufd_eventq *eventq = filep->private_data; + struct iommufd_veventq *veventq = eventq_to_veventq(eventq); + struct iommufd_vevent_header *hdr; + struct iommufd_vevent *cur; + size_t done = 0; + int rc = 0; + + if (*ppos) + return -ESPIPE; + + while ((cur = iommufd_veventq_deliver_fetch(veventq))) { + /* Validate the remaining bytes against the header size */ + if (done >= count || sizeof(*hdr) > count - done) { + iommufd_veventq_deliver_restore(veventq, cur); + break; + } + hdr = &cur->header; + + /* If being a normal vEVENT, validate against the full size */ + if (!vevent_for_lost_events_header(cur) && + sizeof(hdr) + cur->data_len > count - done) { + iommufd_veventq_deliver_restore(veventq, cur); + break; + } + + if (copy_to_user(buf + done, hdr, sizeof(*hdr))) { + iommufd_veventq_deliver_restore(veventq, cur); + rc = -EFAULT; + break; + } + done += sizeof(*hdr); + + if (cur->data_len && + copy_to_user(buf + done, cur->event_data, cur->data_len)) { + iommufd_veventq_deliver_restore(veventq, cur); + rc = -EFAULT; + break; + } + spin_lock(&eventq->lock); + veventq->num_events--; + spin_unlock(&eventq->lock); + done += cur->data_len; + kfree(cur); + } + + return done == 0 ? rc : done; +} + /* Common Event Queue Functions */ static __poll_t iommufd_eventq_fops_poll(struct file *filep, struct poll_table_struct *wait) { struct iommufd_eventq *eventq = filep->private_data; - __poll_t pollflags = EPOLLOUT; + __poll_t pollflags = 0; + + if (eventq->obj.type == IOMMUFD_OBJ_FAULT) + pollflags |= EPOLLOUT; poll_wait(filep, &eventq->wait_queue, wait); spin_lock(&eventq->lock); @@ -388,3 +523,75 @@ int iommufd_fault_iopf_handler(struct iopf_group *group) return 0; } + +static const struct file_operations iommufd_veventq_fops = + INIT_EVENTQ_FOPS(iommufd_veventq_fops_read, NULL); + +int iommufd_veventq_alloc(struct iommufd_ucmd *ucmd) +{ + struct iommu_veventq_alloc *cmd = ucmd->cmd; + struct iommufd_veventq *veventq; + struct iommufd_viommu *viommu; + int fdno; + int rc; + + if (cmd->flags || cmd->__reserved || + cmd->type == IOMMU_VEVENTQ_TYPE_DEFAULT) + return -EOPNOTSUPP; + if (!cmd->veventq_depth) + return -EINVAL; + + viommu = iommufd_get_viommu(ucmd, cmd->viommu_id); + if (IS_ERR(viommu)) + return PTR_ERR(viommu); + + down_write(&viommu->veventqs_rwsem); + + if (iommufd_viommu_find_veventq(viommu, cmd->type)) { + rc = -EEXIST; + goto out_unlock_veventqs; + } + + veventq = __iommufd_object_alloc(ucmd->ictx, veventq, + IOMMUFD_OBJ_VEVENTQ, common.obj); + if (IS_ERR(veventq)) { + rc = PTR_ERR(veventq); + goto out_unlock_veventqs; + } + + veventq->type = cmd->type; + veventq->viommu = viommu; + refcount_inc(&viommu->obj.users); + veventq->depth = cmd->veventq_depth; + list_add_tail(&veventq->node, &viommu->veventqs); + veventq->lost_events_header.header.flags = + IOMMU_VEVENTQ_FLAG_LOST_EVENTS; + + fdno = iommufd_eventq_init(&veventq->common, "[iommufd-viommu-event]", + ucmd->ictx, &iommufd_veventq_fops); + if (fdno < 0) { + rc = fdno; + goto out_abort; + } + + cmd->out_veventq_id = veventq->common.obj.id; + cmd->out_veventq_fd = fdno; + + rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd)); + if (rc) + goto out_put_fdno; + + iommufd_object_finalize(ucmd->ictx, &veventq->common.obj); + fd_install(fdno, veventq->common.filep); + goto out_unlock_veventqs; + +out_put_fdno: + put_unused_fd(fdno); + fput(veventq->common.filep); +out_abort: + iommufd_object_abort_and_destroy(ucmd->ictx, &veventq->common.obj); +out_unlock_veventqs: + up_write(&viommu->veventqs_rwsem); + iommufd_put_object(ucmd->ictx, &viommu->obj); + return rc; +} diff --git a/drivers/iommu/iommufd/main.c b/drivers/iommu/iommufd/main.c index b6fa9fd11bc1..3df468f64e7d 100644 --- a/drivers/iommu/iommufd/main.c +++ b/drivers/iommu/iommufd/main.c @@ -317,6 +317,7 @@ union ucmd_buffer { struct iommu_ioas_unmap unmap; struct iommu_option option; struct iommu_vdevice_alloc vdev; + struct iommu_veventq_alloc veventq; struct iommu_vfio_ioas vfio_ioas; struct iommu_viommu_alloc viommu; #ifdef CONFIG_IOMMUFD_TEST @@ -372,6 +373,8 @@ static const struct iommufd_ioctl_op iommufd_ioctl_ops[] = { IOCTL_OP(IOMMU_OPTION, iommufd_option, struct iommu_option, val64), IOCTL_OP(IOMMU_VDEVICE_ALLOC, iommufd_vdevice_alloc_ioctl, struct iommu_vdevice_alloc, virt_id), + IOCTL_OP(IOMMU_VEVENTQ_ALLOC, iommufd_veventq_alloc, + struct iommu_veventq_alloc, out_veventq_fd), IOCTL_OP(IOMMU_VFIO_IOAS, iommufd_vfio_ioas, struct iommu_vfio_ioas, __reserved), IOCTL_OP(IOMMU_VIOMMU_ALLOC, iommufd_viommu_alloc_ioctl, @@ -514,6 +517,10 @@ static const struct iommufd_object_ops iommufd_object_ops[] = { [IOMMUFD_OBJ_VDEVICE] = { .destroy = iommufd_vdevice_destroy, }, + [IOMMUFD_OBJ_VEVENTQ] = { + .destroy = iommufd_veventq_destroy, + .abort = iommufd_veventq_abort, + }, [IOMMUFD_OBJ_VIOMMU] = { .destroy = iommufd_viommu_destroy, }, diff --git a/drivers/iommu/iommufd/viommu.c b/drivers/iommu/iommufd/viommu.c index 69b88e8c7c26..01df2b985f02 100644 --- a/drivers/iommu/iommufd/viommu.c +++ b/drivers/iommu/iommufd/viommu.c @@ -59,6 +59,8 @@ int iommufd_viommu_alloc_ioctl(struct iommufd_ucmd *ucmd) viommu->ictx = ucmd->ictx; viommu->hwpt = hwpt_paging; refcount_inc(&viommu->hwpt->common.obj.users); + INIT_LIST_HEAD(&viommu->veventqs); + init_rwsem(&viommu->veventqs_rwsem); /* * It is the most likely case that a physical IOMMU is unpluggable. A * pluggable IOMMU instance (if exists) is responsible for refcounting From patchwork Sat Feb 22 15:54:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986690 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2051.outbound.protection.outlook.com [40.107.237.51]) (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 64F511422D8; Sat, 22 Feb 2025 15:54:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239690; cv=fail; b=mAIKf2fHYUC9k0Aj2ucTd/Q50cFOFlsRucDXrfA8udPwlMLhjyclGeEsUxkNOe7lY3IY8hRNLkwwbrnvqsJbrgU59Sr9fGi4kAvZuplKc3Hiydtv2PhN/8l6SicwxL8M9XQ5T3FcoSAsoABe31zo3k5mR4e5TTdDNx9dWlTdsjc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239690; c=relaxed/simple; bh=iecy4fIFlsJi6mG0vyn2Kzx2uCT5cKHBhUEZhmYTA0Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bQGHPcXlq3bnaqUWA7ODzurIZJktK4Odk9OJWBa5n6d2/guvvJvqH4x9UF4YFE+kTEqVbze6o7+ZOGJ/yeK/gVq4ZSZCDr0TsJ8m9xsTgx2Mi1j8fmn2b0etW+tWwGI4xxANdcSgSg+Fygm3HcYfDTCiI86d9NYWzygUW49Z/jw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=mobNaWDB; arc=fail smtp.client-ip=40.107.237.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="mobNaWDB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xpGKA2HsrXKlWhCwEA2PPjW/vaARYiyEQhZQHsPE9Tq7HPS/D7G9Lmfoanlhi6M+z6Qd/9CMrEtm/3A/aOkpACcZJW0yTib3ye78Hzys7ImBuq6qhKKJr0/1d11/O9kvUqka4exhjPZ2B2hPz8lAtLqDxqHltO7gVHdqvZXAgolUsJJZgRzko0CKFmDRJNirDPu1/e//3tFVH/Ex503vZXtVXSvrgEgA07EQj924t0u35pW71Nz0WO8Owldn8tWa2t2zhJI7HoIhCdaELTFIStyxPVYqVd+9Q1U5xqFk6e8K4XyTwKgDvTNS6XYDMuId0ACtsBBTAGPxGv9wrAk2sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WvhDhdq8BqMWYZAy8VZpGH4FR6q5dbcFBgzSx7Z7lc0=; b=Ye8ZKapU3uZ4FzLjiamvIngLQ867RtSdRmTv9kfmPTF60i2Wym15eS9UKxLR2W76iuEnOfZpn0SY0RRjpzgE71N3JYuh/F2CSSAdRz22d3f9QP7bbyaZnNhjY2qfjvJjM6qJD+Gky/psRt7UDkXF+34PmV/avkQqf2znQ+8TFuZax5oB9hLgc3b7etTIEEiij9uqpmjYxALqEB+f2pESr2inN2LhaKYrt/XeisijkQ1YXltQgUnLW3q7PTFbwz+e5YsJ7bTOYDboAmZlFoiqtmuEk9gR1H9hMgnt6sn6sd4SxFyrUtrDQrP/z4t+4dezhAihiYnXlkmrnCowBTWrsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WvhDhdq8BqMWYZAy8VZpGH4FR6q5dbcFBgzSx7Z7lc0=; b=mobNaWDBJOmhRa0Ccr1DS1g8AHXfZ5R5vUcXMhx4iKu8NGYv0tAZwMa7d4x0xVL6y3t9wnlZ/HnCBfl6A74Aj1pnI3GtL/pSzfvLCSpGP1hu4iKWptZfbMWmmcVp/q4ocz7KzQWQpCqJiThD7/OBcRqI94MREqbfQ+ESURYpIewI8Hj/Byc7qG30GVzZPw8eY9Ne8brX3G5yuBl2BI6RcN7gBMOeUdBfC4AaSdqSS4LplSpluwp2C3qDxXwVfkQoVFhUAcjLN1/5x0hScGl0udZump/ve8S8AF5r4+lQfkNFW73IUdN+/GAmMEdCONNBcEUEBMd7VeN0j6Sn4QkIWw== Received: from PH7P220CA0135.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::35) by LV2PR12MB5942.namprd12.prod.outlook.com (2603:10b6:408:171::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Sat, 22 Feb 2025 15:54:40 +0000 Received: from SN1PEPF000397B5.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::de) by PH7P220CA0135.outlook.office365.com (2603:10b6:510:327::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B5.mail.protection.outlook.com (10.167.248.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:39 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:25 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:24 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:23 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 06/14] iommufd/viommu: Add iommufd_viommu_get_vdev_id helper Date: Sat, 22 Feb 2025 07:54:03 -0800 Message-ID: <7101a2607f98650e105a038a7a80cd8b4d52506b.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B5:EE_|LV2PR12MB5942:EE_ X-MS-Office365-Filtering-Correlation-Id: aa1d6152-9968-4e2a-90bd-08dd53593745 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: Da+G3WlaNFfq9/h8tGrd6AhOCmQRq3ZXE1Eaz4b89XZTVfcbZqjXdSDsD9XVeTtvURo0y7oN43thgszdSWNeITICTy+UD95SaHt3gl407guaHMcB9sGrg8MwrQ6EKZGN213qImsrriw2cwidZvhj7Qit5uwga9n9gXfRX0mfpGUVr96R5g+V7bLcH+eaw9a1YToho/K4e3xMtg+dHRmVLd5JgiYeuNP6JGTr1O49uuFeIRQKdDgIvTkXczyXgUdL6dEEmPe77kZDacyufcMSmx0ysRtX8SeO9deShMxqi1Y0Gw2LuGg9e+CNdY1FjJ8LhBqCqqtF4Xao05s1rFnswUhzgaHZL8eia2eTET+5mmSkwS+9u9qGN5j7+fzcTLGamy3fwj19cL/VYjVcoowcdpARPNbTjlBVRhgwvmDiRwISH60H47W4wo73L+NwrGmpT0pROYPioX2Arpn6cxUlPD7gxHrPN4EgCnOSaKaOZ98tHrggROAjqgl6rIA0yly0wFkV6cZgvjkZdN/Lgat56ARWB6NJOrUx992q7O2w1m829K9qqp8LLE2xiEz8Uz0TLhWR82D1y27sqULDXmQJJDKWlCIb3mSTfkkKJZ4kLCrtOwcacQog1P7JDM2gJ53kgo+A/eVTutY/mPgvcLKXXQO5MFZv40lsmyC04sgGdaMz28ANH6kxryRgWplQmNDVNaR8i6P86cecn7cCOsjly82Lo1cqzvgEHc9eVC+/yzX6xU/5CVTo0rByFvOZpYM0utVYtBrYREG92QMGb2AyU854I1eS0p2DH3qa9gCI3jsjWcJ9OtcW1frKQ8McXDdwHxWBMXcjg2XUm65wlBS/SsPoxchExtpKCAamW10UflxSDSSDOlDPrIbeHFwiUCRQJ6qJ5OkfWTtQk16V51hpkg8bbxiyP+gxF1habRVV+vNKhj60FuTf1DHwOBrcAbDb0iahrRT6SQGauizwoq+01+lAYF2wPEa83MsxKDMh+GQnrmN5Do0OZX2AqrtoQPm/MQ0NoBdN+i0JgiaveixvX2viijuTJc+FHvK9JUifQV4TOhVIsRS6TQbvAe0+ugGtD56uzAg1n9FCXXvcOZE9r6UbRkrN+tUCmStkI3lbp4Z9NMLdpyeVT7KkFV/6ETeLx0z0/DYS265fYYQDTFIWX7yi0LDPT9tvtmiSafJG4R1lcTSaHQCSmqDKx4inPDcfufra2JKMn5lUhLjZcUaPvnVk7sOjwn8JF5pgf5h1u6BJ+0bc3CEoDxy1X47h9pjGtT5Cwl8I6fBp8gAmn7BiFpKjADtNiiA5wFcw/IoVbU0wKXuldDiqvpvjEGhejmBXKy+GgkhCLqMhetXwCijS1j3q7vIwxSL7ND5rgR3VAAoF9W+ukkezvsCThv/5I32gGjNtqr9AvP4CCtSRFlvFRG0u/E3AA7RKMUq+vwa7VNmNa2ZuFCy0ZAX3uwWtSlqE7O/RtfpiWz08WbrWqB9hGBQNyBQdOH/ERPAJUeMVryg= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:39.9885 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa1d6152-9968-4e2a-90bd-08dd53593745 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5942 This is a reverse search v.s. iommufd_viommu_find_dev, as drivers may want to convert a struct device pointer (physical) to its virtual device ID for an event injection to the user space VM. Again, this avoids exposing more core structures to the drivers, than the iommufd_viommu alone. Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- include/linux/iommufd.h | 9 +++++++++ drivers/iommu/iommufd/driver.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h index 8948b1836940..05cb393aff0a 100644 --- a/include/linux/iommufd.h +++ b/include/linux/iommufd.h @@ -190,6 +190,8 @@ struct iommufd_object *_iommufd_object_alloc(struct iommufd_ctx *ictx, enum iommufd_object_type type); struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu, unsigned long vdev_id); +int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, + struct device *dev, unsigned long *vdev_id); #else /* !CONFIG_IOMMUFD_DRIVER_CORE */ static inline struct iommufd_object * _iommufd_object_alloc(struct iommufd_ctx *ictx, size_t size, @@ -203,6 +205,13 @@ iommufd_viommu_find_dev(struct iommufd_viommu *viommu, unsigned long vdev_id) { return NULL; } + +static inline int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, + struct device *dev, + unsigned long *vdev_id) +{ + return -ENOENT; +} #endif /* CONFIG_IOMMUFD_DRIVER_CORE */ /* diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c index 2d98b04ff1cb..f132b98fb899 100644 --- a/drivers/iommu/iommufd/driver.c +++ b/drivers/iommu/iommufd/driver.c @@ -49,5 +49,29 @@ struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu, } EXPORT_SYMBOL_NS_GPL(iommufd_viommu_find_dev, "IOMMUFD"); +/* Return -ENOENT if device is not associated to the vIOMMU */ +int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, + struct device *dev, unsigned long *vdev_id) +{ + struct iommufd_vdevice *vdev; + unsigned long index; + int rc = -ENOENT; + + if (WARN_ON_ONCE(!vdev_id)) + return -EINVAL; + + xa_lock(&viommu->vdevs); + xa_for_each(&viommu->vdevs, index, vdev) { + if (vdev->dev == dev) { + *vdev_id = vdev->id; + rc = 0; + break; + } + } + xa_unlock(&viommu->vdevs); + return rc; +} +EXPORT_SYMBOL_NS_GPL(iommufd_viommu_get_vdev_id, "IOMMUFD"); + MODULE_DESCRIPTION("iommufd code shared with builtin modules"); MODULE_LICENSE("GPL"); From patchwork Sat Feb 22 15:54:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986693 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) (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 C7DBC1EB18D; Sat, 22 Feb 2025 15:54:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239693; cv=fail; b=HZKAyLfs0b0QtPZIP05Wv9TiH7vYkVP38RZEmk1QuUIyq6vXmpQoQgN7IicnH0AZlYxcZ1vRTkFqbSb3axcoaiG+2B02y7fnI/TuL+p4H0tFT8i/Y4z6o7pGOat838Cc5RTYl9ytDctMBsb3PqS6y/igL98NVMJlVvzoo7KiLqk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239693; c=relaxed/simple; bh=kVrz+MvECzAbASkTEFIv8fdMz/RTFXFgVA0aNTTz7vo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l1AQ5obB6eSFWprTxh/5TQLgwS+xfFmsv/nUZ75Omdum5Eq0fKAMc502DOfvfZycpfDmB2jT3p9GeYXDTvKlW4X1JWrS9P+QRzoHZXxtdsGiTaWCioVC6I7/IMTgdGwtQC/SNofl3mOpDkoHOU9AvsusRelMwpMV2rHtBOxyWn8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=pF541rCg; arc=fail smtp.client-ip=40.107.93.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="pF541rCg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QurQlHusOr+z6JojbcS8PM2BYkXdBY3eLjEzWxdw7FptD+FiU2y8h1C5H6f2CrsI4GK8EHoOI66T2n0YBBy5iof4NSVPBbqLUn29DApC/bTLxPrAAGYR0GMZEHbYlMq5WvuAWEdS8F5NEnFecQKOKE+wdIlDdWrpVTq9TPcp9LZXBB8tC1hEJSF05YTEskR8t5k9pwrug9PJNTOzWgVuJiKT2XrLu1SE/yLTAF3E3lxfMt1TZxqnGcWOeujod8pioR3JmAyhKcUgY6Ufs1vhIvIMyPtyGytJ0jykoAibxFU+cYejJ37x+2WCaKEYQa9r//IRZ6FviVLn6COr60OaCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Tw4qgaYTVo7fierWbBA1KTeU3/d+xuBv3gNMSYwFWs0=; b=Y+Wgee3LnxBgdrYP8SrXoOeBWBlKu767olYboW4zr4pRvT5nI4eGAKBlg7aZqXICdvd3qf6JjFlVlAlnCnT0jnaqw95mJEntMAPnCrcSV1TouPmMppLVdZewmuIPZ+dSUnEgzgFtgMMGjAohgn7ZNdgHQHuIxg5VF2mbg3Ui6f+Fi2IYqIPaLbUZ3EUjp7olDgwOaum2pTBNpZNBiTknmvt2VYJORigXv8EN8wuwwAiee2gIzgoBX3lmH3Od6PH6BAwjg8CJP9MNEW8SO9RA75fyNCr+rEu5mE72AcfG1ie+g0qQc/cvF7+OZ75zACXKiX1QlG8fHUGyyz7uN7olnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tw4qgaYTVo7fierWbBA1KTeU3/d+xuBv3gNMSYwFWs0=; b=pF541rCgmRli1x7i5u8IfpBprFApaPZYJLU9UphMKh7ucd5RrgYe20i1Sp6vWo96RXj9PrFDZ6IiLgojqbEquQPURvpJBowGGAtZhNUOQU9Ty+X3Xt3UW1YPZW8GdBTZhmzf7hcjwKINtk0WvuuLcgOdEx3JIHjQFf4ipfCIYQKc2iyhUT5Q3/cNoJdTgj9noQ3yBYTPf5oax5nlI6J8jxXavOTMg2fEOgscBK6cQmpXbrQVFZSPMkLVbtKfoINX6t0VRFPue+HDttbc1k90o9a1CwA5cc2dUhunavZELZbjcD0ip5IbYZXlWT4MYTvzpFIdtkCRUR8tihpP52PA5A== Received: from PH7P220CA0129.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::23) by MN2PR12MB4237.namprd12.prod.outlook.com (2603:10b6:208:1d6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:42 +0000 Received: from SN1PEPF000397B5.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::91) by PH7P220CA0129.outlook.office365.com (2603:10b6:510:327::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B5.mail.protection.outlook.com (10.167.248.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:41 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:26 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:26 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:25 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 07/14] iommufd/viommu: Add iommufd_viommu_report_event helper Date: Sat, 22 Feb 2025 07:54:04 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B5:EE_|MN2PR12MB4237:EE_ X-MS-Office365-Filtering-Correlation-Id: a3dd821d-2726-44b0-e5f4-08dd5359385e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: fFn2E05hw2JQ3tvjOo5fCDRTawmP0DCAW16x7oO0W1MBEfoizjhPgSfBbtY+7gKAkK30+oCXsUy5t+qUt/U/xpagW5XrSIgqFU0qASC9v42ZRnlNk3T6nJLWJjnTXlLKlEyXTGIMlZehGyzfBmKn96DxI7ZgQQ3YjSKDvx9BgiiyRLTltzlnbPdEaYr2AcsBK1emI5Sr4E5Ep4iFnDvByzhfdpnaEF7FnUD7Ch8QDWVdxD1qZEhMPzAL3nBuZEhgnRwAZv6u4dHUlheh4cHly0F3OU/I80TqzWKsh+tNS2rAJWYaOkAgYKbkAjIbkG+/vE4ULQminWv6p4oUrR9oCkzBuMUF0r8PDhxcqe98Og1IrkRSGamgkY9U4bEF6x2E3wNOCAmCn7owy9CT2IzdV6/yy0zbxx4e3Vva4iQafK/fNV7iBfx6CMzEMG01wJ2fEr1XQ22c1CsdinAlhCfurXk0aalE/5qw+Ih7pjEoaj7Hl+/cdAS9smNxqrmyz8ICcvXplXBPAdNsla6leb31v7dQ16PYXDZHlbOPkXJQ1e0iTjtfnrmbkSw+STsmbAReoYyJpQCz61m3tvRh3/dgPdAEkKyqA7NoZ6114muAEa/BNgsezWLJnMFTrwwRdpbQWU+X71f9Sry5GZ2sWpFEBQLCBqj3pV8M1xIXjE39ZDFiGsU4VadPs2Us5J9aqWnTy0DkguwFwrDQwrixa5vORoC1HtVqoBUONIYmSmed0E9W7aJH9PhyxDg1tlRGZ+7P1LqYdBN6OuhtY0ABsr8jk4UypWonyLtZRzKfp74FSDz51SE18bshG/Sv3pdRPZTWnJ82qgtwqJZ/q6Vq124BJYP3DmD7vS0tAQ0xHsXCzFFpIMOZitvK8cJ0hW1anKoyvWE/WRDCUzIjEhCC73hDDr8FCJDkOLSBFCrhApT1f7MOudCCCwbMcjc9ptmtyzoC46CH+YKiLbW5p9mZ9GEH0gtqJqVIrumrPwcufT3TsLxDMCMdCwdl42+JFWtyY6zmr0w87sDtzcCygMH/UDD71eb+pnrQgdjg+3QHTpo53CsDqDh5lOpAmSypFivBDm1PhG4fzcM6LlmWXRu6Z0foR8s7n9JdaZOko7giQKQlqRAhsex0qi7Gy39fY42wv7rW02HNxAT4E+DeI+JZ800QPPaBcvxFkJmyDL1Q0VIj8cAcC19YqRn5WHflu/jI6w7Fbqe+vzHmS/6QHf9ubSAqQ6mF5+a1xN8B4LSpIhWRZTNu1DU4xaipEfaDPDeH1MMAoTJrp5HkO66pqP9QwztZTYOv2u7oSeECc5JvTFf76Xo27UxLUTSz9pwOI9pXcFunGQ2ezq1YRxtz2JJdVsbFH+fWSiaK2KX0MBGF06psZd3BsIhXOvf7XD/n0XIVIlOP15VQRoLbmL8z2/2FFqS6pMPOcV4Glq9OogASv4eF87+sj/gWQ9WsfheUy0TfgvR9DrGeX8i58MJ+PHgBF6mKQfBfN7I/HIbuBdB9EYy1T4A= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:41.8010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3dd821d-2726-44b0-e5f4-08dd5359385e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4237 Similar to iommu_report_device_fault, this allows IOMMU drivers to report vIOMMU events from threaded IRQ handlers to user space hypervisors. Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- include/linux/iommufd.h | 11 ++++++++ drivers/iommu/iommufd/driver.c | 48 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h index 05cb393aff0a..60eff9272551 100644 --- a/include/linux/iommufd.h +++ b/include/linux/iommufd.h @@ -11,6 +11,7 @@ #include #include #include +#include struct device; struct file; @@ -192,6 +193,9 @@ struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu, unsigned long vdev_id); int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, struct device *dev, unsigned long *vdev_id); +int iommufd_viommu_report_event(struct iommufd_viommu *viommu, + enum iommu_veventq_type type, void *event_data, + size_t data_len); #else /* !CONFIG_IOMMUFD_DRIVER_CORE */ static inline struct iommufd_object * _iommufd_object_alloc(struct iommufd_ctx *ictx, size_t size, @@ -212,6 +216,13 @@ static inline int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, { return -ENOENT; } + +static inline int iommufd_viommu_report_event(struct iommufd_viommu *viommu, + enum iommu_veventq_type type, + void *event_data, size_t data_len) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_IOMMUFD_DRIVER_CORE */ /* diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c index f132b98fb899..75b365561c16 100644 --- a/drivers/iommu/iommufd/driver.c +++ b/drivers/iommu/iommufd/driver.c @@ -73,5 +73,53 @@ int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, } EXPORT_SYMBOL_NS_GPL(iommufd_viommu_get_vdev_id, "IOMMUFD"); +/* + * Typically called in driver's threaded IRQ handler. + * The @type and @event_data must be defined in include/uapi/linux/iommufd.h + */ +int iommufd_viommu_report_event(struct iommufd_viommu *viommu, + enum iommu_veventq_type type, void *event_data, + size_t data_len) +{ + struct iommufd_veventq *veventq; + struct iommufd_vevent *vevent; + int rc = 0; + + if (WARN_ON_ONCE(!data_len || !event_data)) + return -EINVAL; + + down_read(&viommu->veventqs_rwsem); + + veventq = iommufd_viommu_find_veventq(viommu, type); + if (!veventq) { + rc = -EOPNOTSUPP; + goto out_unlock_veventqs; + } + + spin_lock(&veventq->common.lock); + if (veventq->num_events == veventq->depth) { + vevent = &veventq->lost_events_header; + goto out_set_header; + } + + vevent = kmalloc(struct_size(vevent, event_data, data_len), GFP_ATOMIC); + if (!vevent) { + rc = -ENOMEM; + vevent = &veventq->lost_events_header; + goto out_set_header; + } + memcpy(vevent->event_data, event_data, data_len); + vevent->data_len = data_len; + veventq->num_events++; + +out_set_header: + iommufd_vevent_handler(veventq, vevent); + spin_unlock(&veventq->common.lock); +out_unlock_veventqs: + up_read(&viommu->veventqs_rwsem); + return rc; +} +EXPORT_SYMBOL_NS_GPL(iommufd_viommu_report_event, "IOMMUFD"); + MODULE_DESCRIPTION("iommufd code shared with builtin modules"); MODULE_LICENSE("GPL"); From patchwork Sat Feb 22 15:54:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986694 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2045.outbound.protection.outlook.com [40.107.92.45]) (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 85C5A207A35; Sat, 22 Feb 2025 15:54:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239694; cv=fail; b=j2Ae4ex7R8ksKhkjjoMYevrlYNFppFW8G74Ytwry52t8lYdhLXp6CjbxtMSjZJU8btV892YXMk+DruuMkUyyfo4a0+beGjXkpE4Cc8rpL6c0HfXTlwu5cTfZQGcmT/3YZgyWM/zYqGP/6YXakOIuR4esPTDxtz/e7MddONHDvjo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239694; c=relaxed/simple; bh=y9EwuhnZ4+htKahcyfG7QKERsMxBHRmJhcDtCf5qHZw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a8AeYqPfZqi/j1og7DYP2aL4ALvFZOXS1CBbEE8yy1QH2hai3/HLp3ZUT2h1JcRrxqhE62bq7kWpapAaKVLuf8vtrPn8TydGM3B5HZaK/uQlukF6h7pumeZW4iZ8fkU5SFeYtbqFOZSlsOId/rFSYC4RWK06+DW5kbZY7zBixR8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=eXxka8i4; arc=fail smtp.client-ip=40.107.92.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="eXxka8i4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PRn8EyLHSlWh6BKT4dpVVo4HzVbgDPYVa+ERBdbtlYcLIzMtpII2VDMXM7NC65agJ2FhlvjAOFORckmO/oy+wd62oEi3N2kchDVoUEDmBWnQsGl6ml4CiF0QsiFWjIkdmiuegS9ljoK340EXCFwpgirHVf0imWozwUcQgKYyGX9X+jinE6Gr2SraNHnmQuNBrjOgLmiT78adEu/kkyGdX+9RtAm9aAxMcykgeuTkYbex8aZrxadmj7IjTCPzpd0giGsZYGTWU7p/cDvCo7mlGlwrvDsKcSwgaG2k5eVEsQEC7mfl75s88UCoxo3wupyjv2NfOcvnOiPz72mbeNc5/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N1PBtA0nWPMf1GqEAuJn+ZSwJlfKukhl+iKUn1Pwuzk=; b=KY964QZuDJV9WuQhOZI0ywpkLjtH/da9Whau3Ytc7dTuLZtbduHfzEp8EcDbYeyEFOROsm49KZVcZgZzK0n5R0fIak93MQs7+wxrdmCbJB2Uqv6Bz1x97dACaHbscFKQ5BSYVMqPkrCpR4rQbE66/dCwIGJr+wp5D4z9jfSj5Eq4/YGUa0DFw3DYwh63xYIhsjfzE46IjE/KY0Obp4jTF355M5Ecop7z8R4j/YTr7hSA0wNNA8Sl/nOuzYA3HMJNVsJ73ic6eVwwBDH4a4HOsVfejhkgRNMBKG0woP4HgpQs85BcAtUJcT0Z85thhygp5RGDQL4il1kmI8VyaXaxpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N1PBtA0nWPMf1GqEAuJn+ZSwJlfKukhl+iKUn1Pwuzk=; b=eXxka8i4mzv1j2zf24IjOBRAwz3LiM0rVozpADteb+RLEI/BJ4UmNOXw+xIhbSY7f/mUWkp5XWDKWXNJBgXl4QMySeWzChR67ujkNwx73v2JJORQwTi+zRjeKxdM6N5Nrt0+CxNvGFQakVd4duWTiRjRoOS0ZfTpwDhHN36GzUEbG//izG8ujSKwG8UhTi1uTUU5yA+x/toUZdSEztBKx6i7ssqRnn2CgpHPHAfIiYNhL1mWtMJxsRKY3Ep7g7PLfTltQKwd4fK6MMSKapTDc4IRXLjwTBuJZ7kP7iiB1E3qg5Cx7UDxWUyFhBqDloBqjrtDDNjUhl6BwTzTrz5dxg== Received: from PH7P220CA0136.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::8) by IA1PR12MB8554.namprd12.prod.outlook.com (2603:10b6:208:450::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Sat, 22 Feb 2025 15:54:44 +0000 Received: from SN1PEPF000397B5.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::ba) by PH7P220CA0136.outlook.office365.com (2603:10b6:510:327::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B5.mail.protection.outlook.com (10.167.248.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:43 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:28 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:28 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:26 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 08/14] iommufd/selftest: Require vdev_id when attaching to a nested domain Date: Sat, 22 Feb 2025 07:54:05 -0800 Message-ID: <295464f7f635a4fde7e772674136901662f74f4b.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B5:EE_|IA1PR12MB8554:EE_ X-MS-Office365-Filtering-Correlation-Id: a2b28863-0889-483c-87de-08dd535939a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|7416014|82310400026; X-Microsoft-Antispam-Message-Info: qcOceyzv/sPR8RIJETX1TK6CuUQwCPBFYRC2voSIpFRZd3IPbXMWlQwu2UGju+6t6xvzXsGIf+jiYrePT2Z/QJNCSBw0hjdErDNPioD+vF3u36vNIFYqtAmoU0zPq6XBfx2xJSyhlyIFBCXZPlep+epbeaW4Om93mNEGL810kaqRYQWtvb335+S3HcsIuf0hATo++FoMg28MrPxfpL6iUdGkn4Xzbl2iO8tvTY7H9mOeIvyw89rh7sm8VC0RXOw1I67ek12dZLNSZsFdYz1d44XgYVTkhe9C7Sl/HSWH/f+fLWKxd7WbbXN3v86jp4PuJ8N/mZHQo+9NIQFsTzYBSjqgu3FTV+2UzKvBNm500SQ53Lyh4bjLGpU/o0s1HexZOjO9TJSM10nMr1wvWiyNYz6dJpgvgfFGferfEWSxjehOZQ8xxokmROR88TM9my4YlBgfHycED79MfTjCqy0k3T9T4haWkIuVYVEhH+DpBI/TuhGqrtSAJOCReuV+Ju48eW8sYr0tCxKhPUCaRzRIO2FUimVPlZX489RahVtGKDxD90fpWJ9V3K232kt7kqM+cMOeWnW2XBpoRhRhG9qEf51iYGI5ipr6qndnF5EInveZi+TULXxaSqtjR7b+xMY1A3Ak8C8fSCXgxAhF8klii2cOQWhcAXR8op/dUrWFEPAZJwm99qd4R2HLOENVveC09i3JEWtjkIJPumNfEcXaAQEjrAiDN2LxpBNDXyqWMxkhK8FoY4KVbnRNP/HX2XeHPxrNhUJzXmLC1FGPsVedQp0yXSawpFwFOYGkt58MuSSOdJG3ZXAmV6PCkBWVlX+HakbMZ8MQ5SvF3OGElZ9nLTQKOkWvt1iOWoL1CeozkhpL7nbl2sp6C7fitfwtt34eTg9zerRWnpuSYw8CheR1/Bxpa+8EZVo7NxeCFuQ3ZGD+GSdLftaK5yYpMGVfSyCzxThdRZVGf71yGVhcbv/2WQmzkS8wqd/5fe3doZn2rzTgzJLntl+Ud7kaLhkW3fR/ljiMiFvJoGudd43ASxmC8HkFsdLhRWWtvLcJaLz8oY0xm5h3yz1E/pKKo89gft5u2ugvOcMkuQK/nIPfEILwP6zXFSfUVPfiQBRgkg5ZiK/oTUeEhUgBSb0752YWI2muROYmfTqBWxnzqQmRBrn47A8rbf5x3T7mURqmZB5UvnFzw4EvEMcQeBCkrQSGET539CVHsWImr7plmcVjs7/vy+Qyj/hSPp9tadJcS07knZU5XsIw16y5uLldPcbhPMkQkgQiepPfOCSld4jU5bBGpRu2VF0vciW6UWDWsGzzHA73DwuvttDWnKk8i0OEpUXAlhPtDb5I7e/WrM+JzP1C4/wqbBwqzL8kL1AHG7Go5ARR2u/m0zhTp3KjXGNIdvyvu/axBSj6pIu94dEy/+fFWXcCRAHkLSwGGQEmSynrSgfRo6o184lxk0KkJXRYJ/GJqyp+YX6Z2XpswEq1DBBx36ojwDayq8FpeL1VrXvOJC4= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:43.9572 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2b28863-0889-483c-87de-08dd535939a5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8554 When attaching a device to a vIOMMU-based nested domain, vdev_id must be present. Add a piece of code hard-requesting it, preparing for a vEVENTQ support in the following patch. Then, update the TEST_F. A HWPT-based nested domain will return a NULL new_viommu, thus no such a vDEVICE requirement. Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/selftest.c | 24 ++++++++++++++++++++++++ tools/testing/selftests/iommu/iommufd.c | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c index d40deb0a4f06..ba84bacbce2e 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -161,7 +161,10 @@ enum selftest_obj_type { struct mock_dev { struct device dev; + struct mock_viommu *viommu; + struct rw_semaphore viommu_rwsem; unsigned long flags; + unsigned long vdev_id; int id; u32 cache[MOCK_DEV_CACHE_NUM]; }; @@ -193,10 +196,30 @@ static int mock_domain_nop_attach(struct iommu_domain *domain, struct device *dev) { struct mock_dev *mdev = to_mock_dev(dev); + struct mock_viommu *new_viommu = NULL; + unsigned long vdev_id = 0; + int rc; if (domain->dirty_ops && (mdev->flags & MOCK_FLAGS_DEVICE_NO_DIRTY)) return -EINVAL; + iommu_group_mutex_assert(dev); + if (domain->type == IOMMU_DOMAIN_NESTED) { + new_viommu = to_mock_nested(domain)->mock_viommu; + if (new_viommu) { + rc = iommufd_viommu_get_vdev_id(&new_viommu->core, dev, + &vdev_id); + if (rc) + return rc; + } + } + if (new_viommu != mdev->viommu) { + down_write(&mdev->viommu_rwsem); + mdev->viommu = new_viommu; + mdev->vdev_id = vdev_id; + up_write(&mdev->viommu_rwsem); + } + return 0; } @@ -850,6 +873,7 @@ static struct mock_dev *mock_dev_create(unsigned long dev_flags) if (!mdev) return ERR_PTR(-ENOMEM); + init_rwsem(&mdev->viommu_rwsem); device_initialize(&mdev->dev); mdev->flags = dev_flags; mdev->dev.release = mock_dev_release; diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c index a1b2b657999d..212e5d62e13d 100644 --- a/tools/testing/selftests/iommu/iommufd.c +++ b/tools/testing/selftests/iommu/iommufd.c @@ -2736,6 +2736,7 @@ TEST_F(iommufd_viommu, viommu_alloc_nested_iopf) uint32_t iopf_hwpt_id; uint32_t fault_id; uint32_t fault_fd; + uint32_t vdev_id; if (self->device_id) { test_ioctl_fault_alloc(&fault_id, &fault_fd); @@ -2752,6 +2753,10 @@ TEST_F(iommufd_viommu, viommu_alloc_nested_iopf) &iopf_hwpt_id, IOMMU_HWPT_DATA_SELFTEST, &data, sizeof(data)); + /* Must allocate vdevice before attaching to a nested hwpt */ + test_err_mock_domain_replace(ENOENT, self->stdev_id, + iopf_hwpt_id); + test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &vdev_id); test_cmd_mock_domain_replace(self->stdev_id, iopf_hwpt_id); EXPECT_ERRNO(EBUSY, _test_ioctl_destroy(self->fd, iopf_hwpt_id)); From patchwork Sat Feb 22 15:54:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986695 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) (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 9277A20AF85; Sat, 22 Feb 2025 15:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239695; cv=fail; b=H7ASRDyMKpjeAH0DGEMgxm0/AptZ5uokZkkzHjcaWeG+7kfKnBhB+7N8M906Y0baYfTQpRhuvQMa27LQ5DeNWNwg+9MXtjMqq3a7NmAwaQGy/O2HD/xV30dKMxXyMi08nQBjqJOmIaxIpdptg0N4ZHDXLsA2FyRzbNMgxe2ZjKo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239695; c=relaxed/simple; bh=RbmqYB3ouXEt01BYZKTJXPb8OVGmtcC88trq8l19SJw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jTixHLTgt14soXUp18sY0j0AHxSBdeL7MAkB75P4Cuit//GgigT9y8+Bv6ue2675bt00ybd/MXoR9ymWLB+kHqgVnw0R7qr+BJ75rNFQ7Pee2tFUFJFuKDspz/au70J448EBiB8t2y6yyRpQf/pv6JlyGpZORdu/qKWTmZz2g+c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=qDKzu3b3; arc=fail smtp.client-ip=40.107.94.85 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="qDKzu3b3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sk6qCovlAWxP9HT7rKaxCzkNrXexhlbIoPfVyNztzIHY0HW0jEaAzOEc4kSMxETCZ9/zCHm0pRmdZpB5LmcVs/WPiae0mMwJu5Jk5I+dfN1lfcoZ+p2BC6+R9XWe4Trdm7Uvp7qr/ivKRpgIz9GUMZSinrnlqpoX9ELkhW3FKIa1bx32Jz3OZKZkgXvOBoUzp88bqyNznvQmZuRFQCX72qWgGbhDbPhIMW9MRtS0vIuoMkw5by38Rdro35v4CPJFaUKrusazlTJDtC8ZoWxXBv5A1A9RWlvDVff4CTcTPK2tiD4SWw04uEanxPFvxFl9be+0QvQlp/bS/IbZIFRBBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H23MZTa9PfhxhiEvruW5o79lf9Zye7dvmLXJYsQIxuw=; b=ld87A5IYB0U5wXP2eNVhk9t3jmRSn1HojCbNmsBA19/C2kkGLvHhGh8tHjPnPupRNIzZyVVlbtvjmAPwXZn4aeUWOr/wA40PrfKswGw+M0rh+4EyEUOs4qmHtFIRk0PK1Wp83/L9HSqKSxSOd2dHUCbrlzbvg+DZzrajQCxPDiDbaC13rxh8xhpFtqU0BLvW7obzgOwmhDe09S2CWjSKs6ayZ0Fp7ixNrZWmiFz184whKXNmz8uWhQd3ys/MMZ0DFks0WZBRMdqO57FSCekve+KX5GM867yEHSN0pZBKVhVBPR3jPWjOExt0PKn+NVu7Eb3aTcCuupphnCQO1z6fcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H23MZTa9PfhxhiEvruW5o79lf9Zye7dvmLXJYsQIxuw=; b=qDKzu3b3BDzadU6C4OVLijoeMIZoZb+e7JjnepmuGDfz2etYOJRzrqeOxI4G7LxeXhEsJG/fqQ/YtH8+nSc15Zh1Nh0QlbHiz6MYxV1f8LLEg4k8q0C2VNyOWOVpD66n/gIyfnYFcjvQHFIDyTVOuqE3qoZzc1Eq4rub1G5a2YLmg7qvGilGWk4nRDVklw0qD7+N+Hzyo6p3ttrlUjTQjE7t6AZ7pvSsFfpMqkIsTlQfNnkUm6blLfNGCl/NAl+OsJKGUba2P4f5RprlQ0eE1GScMoF9GkdK8ik8gygMptTWStUNxpi6zu2ZSFcpMMK2qcGJgngkTb1enbMyWa2uSQ== Received: from SA1P222CA0101.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:35e::9) by CH2PR12MB4040.namprd12.prod.outlook.com (2603:10b6:610:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:45 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:35e:cafe::91) by SA1P222CA0101.outlook.office365.com (2603:10b6:806:35e::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Sat, 22 Feb 2025 15:54:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:45 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:30 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:29 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:28 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 09/14] iommufd/selftest: Add IOMMU_TEST_OP_TRIGGER_VEVENT for vEVENTQ coverage Date: Sat, 22 Feb 2025 07:54:06 -0800 Message-ID: <32f3fd6cf4c4a1cb84eaebc599fd401fd9007be6.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|CH2PR12MB4040:EE_ X-MS-Office365-Filtering-Correlation-Id: 433ab7f6-1972-4287-9227-08dd53593a60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: wVQv5zq7ojvUHBHXRfagm6AyzZ+GbLmpN23mMURJulP3iriwBfXJ5VaJxtXhP2Jd9jGgKn/lufK0AdKFJEbiDvx/J+gm0MAtqYSCR0zLYP14+CI+Y0k5nhd/BKEHIaLtb1Pth+rKHbF+nc6B4He/3QeHFyoU0RVHNouij3xxPlw5blTxM4zHLko5T9W0yBhxF6o/4Vn8j3O/Ot3MUZlB4F8Tz+7MRpBPshkFX5RFLWYSaVwd6doq5wTwxvBQH0CG1/7bpL5gYeT4aG8lZPvz+ti2dFEDY+7QBDSRRjEn1x/LNUh9yhBQ1je53Tnxmq4B+dDsmZUJRXnbpWz02tGAgCqvTc4gXRouUDtzrNwknUE7I+T+R3NcMOPCZDSpwpjq7mSlbkC2sY2PAzCQacWZVkRXSdG+EXtViAGdBpHAudKiw8sWzxc0GeEh6vRV7+HBJhoQIIolwj+LBqCamosYzQ4Gc0ry+lSj4ZmA+LWlZm/HJdL90ddCzr/aEcK7s7ZbH6T+7XU11Li2xeuc0qtJnNzY06R4osS94Z224kDMO0CkBU1jBa9ewkuf+tYTz8Fa6HrYZ2m0CexIe7gMvjPu0mrHd3TY29frRlwrwuKYs+ROlyYurcpNMLzg2PeuLaT6i7OhV1caOWVKZLyaI+/cnmCQ4MtrxsT7wnJ3xiLoH07fwyfMHcN8aqaKkt3GzEP/WLmEGJAGZXRvopWCMGG0N4iYg+zkECuEXzLkuPQ3BLaBmHvlMGJZ3P86sP1Szvbta7CsuUxG9t7reRbRNkECPPb/5d84uAYBxiWGN2/l2FtXH37P0bB8h+UkLKDtsLYMDhs3kr0yQG9RxFR7Ob4x2HL97MixXvSJyJXLhvCq1IOBX/7GVAZKcy48UcmxobQeYCbcwgix45ma74xaOtWsNql+r9hydHxnq0CxOLJWYzGQ8Me9yo4vwXjnvrgOxT0ud0nbAI4/mp1jqztUEnzbBnEf7IzSSvi6MDaTkB2+UJZEjhivs5P7mdC2HulFieoyYh7l6tpG+PgS/+CnA1ZzliJfi1Tv4YzemsiRAUP9yWGwrWAv2WIfnRCZ3YAwm4LBXe0K0mJpIUNGmTwjY88SV7MHzIOT99OIcSTc9i2Pv6nleErZPpABKMprXYOEOeMrbCp6T69f55kbTBir9tnM28ZeYkLahNMxOJ/iIJVVXjRvQEf+qgEcO2R9TJOsqvozYTzzs98xYpdBBOBC/RuD42zLKJNyjFhHeOXSPotC6JNfKrzAui2TMvmmWP3xyyVSYYlVKXFluvrwMjG8ZvvOKWrtTm7XGqQupPZWvJljoToOmYH4dckbN6/YvU9obmDApvClr8oJjWBIdMPttvni7x4zg3wpYNZU60vUW6/hHQ3zLhUGbdaDLmVYtk9OL8ev0Xq6M02IduX8lhZpKx8g4ltTLo+YwLFOiIMA5Zo1C4jv2VU/UwThHFUOi6fqnvr8cX6cElPH0km1ZidCE483cnVAZSjPFNVTJoIu5pc8N6U= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:45.1830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 433ab7f6-1972-4287-9227-08dd53593a60 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4040 The handler will get vDEVICE object from the given mdev and convert it to its per-vIOMMU virtual ID to mimic a real IOMMU driver. Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/iommufd_test.h | 10 ++++++++++ drivers/iommu/iommufd/selftest.c | 30 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h index a6b7a163f636..87e9165cea27 100644 --- a/drivers/iommu/iommufd/iommufd_test.h +++ b/drivers/iommu/iommufd/iommufd_test.h @@ -24,6 +24,7 @@ enum { IOMMU_TEST_OP_MD_CHECK_IOTLB, IOMMU_TEST_OP_TRIGGER_IOPF, IOMMU_TEST_OP_DEV_CHECK_CACHE, + IOMMU_TEST_OP_TRIGGER_VEVENT, }; enum { @@ -145,6 +146,9 @@ struct iommu_test_cmd { __u32 id; __u32 cache; } check_dev_cache; + struct { + __u32 dev_id; + } trigger_vevent; }; __u32 last; }; @@ -212,4 +216,10 @@ struct iommu_viommu_invalidate_selftest { __u32 cache_id; }; +#define IOMMU_VEVENTQ_TYPE_SELFTEST 0xbeefbeef + +struct iommu_viommu_event_selftest { + __u32 virt_id; +}; + #endif diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c index ba84bacbce2e..d55dde28e9bc 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -1621,6 +1621,34 @@ static int iommufd_test_trigger_iopf(struct iommufd_ucmd *ucmd, return 0; } +static int iommufd_test_trigger_vevent(struct iommufd_ucmd *ucmd, + struct iommu_test_cmd *cmd) +{ + struct iommu_viommu_event_selftest test = {}; + struct iommufd_device *idev; + struct mock_dev *mdev; + int rc = -ENOENT; + + idev = iommufd_get_device(ucmd, cmd->trigger_vevent.dev_id); + if (IS_ERR(idev)) + return PTR_ERR(idev); + mdev = to_mock_dev(idev->dev); + + down_read(&mdev->viommu_rwsem); + if (!mdev->viommu || !mdev->vdev_id) + goto out_unlock; + + test.virt_id = mdev->vdev_id; + rc = iommufd_viommu_report_event(&mdev->viommu->core, + IOMMU_VEVENTQ_TYPE_SELFTEST, &test, + sizeof(test)); +out_unlock: + up_read(&mdev->viommu_rwsem); + iommufd_put_object(ucmd->ictx, &idev->obj); + + return rc; +} + void iommufd_selftest_destroy(struct iommufd_object *obj) { struct selftest_obj *sobj = to_selftest_obj(obj); @@ -1702,6 +1730,8 @@ int iommufd_test(struct iommufd_ucmd *ucmd) cmd->dirty.flags); case IOMMU_TEST_OP_TRIGGER_IOPF: return iommufd_test_trigger_iopf(ucmd, cmd); + case IOMMU_TEST_OP_TRIGGER_VEVENT: + return iommufd_test_trigger_vevent(ucmd, cmd); default: return -EOPNOTSUPP; } From patchwork Sat Feb 22 15:54:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986697 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) (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 A00B320B7EF; Sat, 22 Feb 2025 15:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239697; cv=fail; b=ZKENmgLUU4IELXsIZDZIHRuCbfibOvtI4+IU64i6qd1MxTSItpNox+RBDpsF88bbOJUpuETep6MVQBHmBfLZXuyt0sfAtkdmCjGKp17bJJ/5iD+24Ti8AP660+raFm3dEc4gY2EbvBfqthaFzF9/YQ6FiNjN7mGY61vHBKb0+N4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239697; c=relaxed/simple; bh=yJvub6Tg6pAbLvjjlP9rJ+GPjEemqPPrDlsYUpAU7Zw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PxR7uqNXOS/59lwWPomHfNbmcUhdWoEDQXL5q/R47w+/+Nus14SDbjU+2U2W8/n5g9ETx6VO38jQrXnTpyuY/acSnaFowLNZuImZnvlNika9mW8b0DShVaXwN8Op9RXckXgdSzim9RMDP54F643B+pzrUuJ5cq2EKJGg9db9xTk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=R35JsGIl; arc=fail smtp.client-ip=40.107.223.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="R35JsGIl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BjwD4l8rtaDKzurSH4kQl259j0Mb6w+ua5k2wVVT8ljEYS40bFNT9+mtapfHpaAbbpkFiMDcuLqVY3OYIhPKECZ/4+RAL3rba6LEpbd2j56taTOqb2cTxPpAWoQWGZvcjjn2WjdKukDr7Yi0iKaFk2xFRXbSr2IctwKyEgTgaHVOPY1OIVSlfQLA5R4l6q1GgU7XR9UKoqA+9JmHq/H3RMdmbYiOJFnSrJvq9lW3fOaWwaT96o4NsZuOUzVIrZDddg+9QwD+cnl3s/0/4mZlSU9xvcG6b4D+kjajRtjiBJZnZFnsfC2pWVOupiKXP1SXSpdwaiOkKk17B5qn3zAqYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l0kbEzCCBCwfliZYSwakktJXjjge9xvLJvx1Yf2MNKE=; b=CZJijKXlV7O8pwKX8thUXNWmJphYGlGltVNxXbapY9yulo6NVGoN2a5qP34o3ccbq2HYoj4r6sIkl1uWJShA42pkRALWEIKma1lqXX7zlQXKr++aEEGICXHTw0DktkdxqQ4scQ+iuKJ6Rs/uOgvvAqO9sWNg/61Td2c9k8HKDMBsC0UeQqmn/ems4LD4wLHhvuySJyyaSw1h05H/v+kxR8ZZWxs+Nogdrlmd1pNvB0D8vCP8bbqMJFemJr+kiqUfK1XdF+Y4+uxL1o2WxugiKNs6epLEPR1MivQ0JYB+jMgApXxiGhK6D129o8pEM03Ra/RZR3972tw7fizGjUrnPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l0kbEzCCBCwfliZYSwakktJXjjge9xvLJvx1Yf2MNKE=; b=R35JsGIl4VyP4oNZvHK/ZYEnS16ZPpvAoucGYohyekYytG14pfu8+yFYxAjldC30hjkjjzX6EPFH7a98OOnXlTXyUkJuYhzCiJfwhZUTJyCLeBIXwsRJLi2QKJqjbQHD01r/zTL781Y011b/h4oqgRI4WzQholqwJXGBaThxgJg+fmWdFaSjZYGgjoOxrkdayZfQOpe52kGoH3mPv1OfPFnoQMss5+uPBoqgBUsoPuEPCtt82WRyCTmCeKzBiplbw0A69rAXcT93x4TMPveOvgJPuFrTVHwpoJ33x1Rq6msVhjlg4bnxXe0G487jaBB9H52D8nnag/3GI7fq4A+PDA== Received: from SA1P222CA0093.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:35e::18) by SA1PR12MB8917.namprd12.prod.outlook.com (2603:10b6:806:386::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Sat, 22 Feb 2025 15:54:47 +0000 Received: from SN1PEPF000397B2.namprd05.prod.outlook.com (2603:10b6:806:35e:cafe::69) by SA1P222CA0093.outlook.office365.com (2603:10b6:806:35e::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Sat, 22 Feb 2025 15:54:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000397B2.mail.protection.outlook.com (10.167.248.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:46 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:32 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:31 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:30 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 10/14] iommufd/selftest: Add IOMMU_VEVENTQ_ALLOC test coverage Date: Sat, 22 Feb 2025 07:54:07 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B2:EE_|SA1PR12MB8917:EE_ X-MS-Office365-Filtering-Correlation-Id: 9960ee5b-7c5b-4f65-72a1-08dd53593b64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: 62hQaffom4e7DwRPDtn/Gjwih/cA0InP0x/wEGODWTebZNRMP+xpqQqTjvTh/7/tzHkzbs2olyABf/BgQbY2s4SIzPC6hE549nKsmFONVcuv+lYYQ6p3d1ZtZIzIIaOto8ZrllTvYkjn9afBHLgsaCOXXPjAOl/EJfVgnWEekiFaD/3F4nMSOSMu2Ucu7F/ftW8CrZeDR0ogzOvXBzStQ41AdmIet3nZF78mZgaqh0xtEi/BNevstpiceD2AfWJ2GP5FC186vxsHQKbvCDvzpFE/vqHouN4yfoT4BoDv8aZGtxq47ErRwC46h604QM1TwrTHCem4IdXacgwImNNNrIV6odX9L6K5T/RAWY6xW0Aot/3QD3NN41U1GksA19QT8MdYmFG7PAVXwoTDfaxTOLNp15Jn4Ecy3Bv6hVMoiaTbty9JWWzk9/MAUvblKk59kQmHmxn/1I6nqlsFhiteDdmMZ4/8vfa0lAN/5Towz+a4uc/2mBxQJn1fwGLTth+RwFXAakLGfVFtznWFzvso2dDVUQFU8mbNosQK9TOlEG6tOMyQ/I2sLFvLCmUI/0CUM8UiNHyAES5Zr8GT3yztN11O6xqKd7k9KCxLActryduDZvx1QvMRHl62QO5joHhZAF+2XicN3oKahce8nMRHoyN2cq7m5BDSrG1O85pRU6YTcdENrrUGSga59kZOiVcPdfrBbkaNsVNJIU+1tgNKKM6skrwG4/rmMXVQ29FxuiAc6y1DBh9NBI0pqnvMuFn2nsx2nvMF9SCUdokSXbT+eLZl/pCieuyz4xNJGxPNhtzwHiptxYEi3QxxDbpSsSsBCkDhcMtUbI8+8PO1/Ec/SzkpIJV67mPdkC/UQTYiFib+MVfZ4JSGAMBcM0qt98wEsXvfTEbsw1fuQalM2ScXNyirLLm3ierMLMaYyO4nh4C0dxzvr5bG3mlvsv1kkBukzImzDKt+x0wUFcwsrj9TjgxdidTdXkkJ8utzGo/ZW0nstQn8xvWKzPSA3zOfERtes0m4kGSyiltY6IQSeKN5hrC7VVFHG7PDwB8SoIms4tdKSawhcSeJO9iXzpQuS5bTtrAuSy+WTmtjjI96ryinc/ovUGhKMrVLoXI0mnp1VrWPw4nzHEMIcEc46J4V73xBRVmEh/FBV986r5zQ1lz4BA47aBbI6P9HJXU4WFT17khcXzl05b8a5UlDhFOsHP2NsCBAWgxy9bEgdWW/lFDSl17QIyGjXEWtN1PliFLAPqW1Mf1/bhBPnsgbtxSu4HpAdue5Vwc+vnY78FqJ5Mrpc8GDYPlrx6X4cwJHnyIFWZYBGExfERtrUJGmLMWeDKdMMtl5YJ78f6bX/JYZ5A/jPywatEhpO5aJ5AAlRQXkHwhr08dmu2MWiAZylS9ITg5Iq227dnEp6BX+6l6phTSPV+2b2Tll9COzgB8rJ1vOK6zyzkXJyId2Ejjq6U6K1NVD0hmX8XhZJLeA2CQXPOKwql8Xl60+ne9IsJHUtOBshoc= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:46.8861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9960ee5b-7c5b-4f65-72a1-08dd53593b64 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397B2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8917 Trigger vEVENTs by feeding an idev ID and validating the returned output virt_ids whether they equal to the value that was set to the vDEVICE. Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- tools/testing/selftests/iommu/iommufd_utils.h | 115 ++++++++++++++++++ tools/testing/selftests/iommu/iommufd.c | 31 +++++ .../selftests/iommu/iommufd_fail_nth.c | 7 ++ 3 files changed, 153 insertions(+) diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h index d979f5b0efe8..6f2ba2fa8f76 100644 --- a/tools/testing/selftests/iommu/iommufd_utils.h +++ b/tools/testing/selftests/iommu/iommufd_utils.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "../kselftest_harness.h" #include "../../../../drivers/iommu/iommufd/iommufd_test.h" @@ -936,3 +937,117 @@ static int _test_cmd_vdevice_alloc(int fd, __u32 viommu_id, __u32 idev_id, EXPECT_ERRNO(_errno, \ _test_cmd_vdevice_alloc(self->fd, viommu_id, idev_id, \ virt_id, vdev_id)) + +static int _test_cmd_veventq_alloc(int fd, __u32 viommu_id, __u32 type, + __u32 *veventq_id, __u32 *veventq_fd) +{ + struct iommu_veventq_alloc cmd = { + .size = sizeof(cmd), + .type = type, + .veventq_depth = 2, + .viommu_id = viommu_id, + }; + int ret; + + ret = ioctl(fd, IOMMU_VEVENTQ_ALLOC, &cmd); + if (ret) + return ret; + if (veventq_id) + *veventq_id = cmd.out_veventq_id; + if (veventq_fd) + *veventq_fd = cmd.out_veventq_fd; + return 0; +} + +#define test_cmd_veventq_alloc(viommu_id, type, veventq_id, veventq_fd) \ + ASSERT_EQ(0, _test_cmd_veventq_alloc(self->fd, viommu_id, type, \ + veventq_id, veventq_fd)) +#define test_err_veventq_alloc(_errno, viommu_id, type, veventq_id, \ + veventq_fd) \ + EXPECT_ERRNO(_errno, \ + _test_cmd_veventq_alloc(self->fd, viommu_id, type, \ + veventq_id, veventq_fd)) + +static int _test_cmd_trigger_vevents(int fd, __u32 dev_id, __u32 nvevents) +{ + struct iommu_test_cmd trigger_vevent_cmd = { + .size = sizeof(trigger_vevent_cmd), + .op = IOMMU_TEST_OP_TRIGGER_VEVENT, + .trigger_vevent = { + .dev_id = dev_id, + }, + }; + int ret; + + while (nvevents--) { + ret = ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_TRIGGER_VEVENT), + &trigger_vevent_cmd); + if (ret < 0) + return -1; + } + return ret; +} + +#define test_cmd_trigger_vevents(dev_id, nvevents) \ + ASSERT_EQ(0, _test_cmd_trigger_vevents(self->fd, dev_id, nvevents)) + +static int _test_cmd_read_vevents(int fd, __u32 event_fd, __u32 nvevents, + __u32 virt_id, int *prev_seq) +{ + struct pollfd pollfd = { .fd = event_fd, .events = POLLIN }; + struct iommu_viommu_event_selftest *event; + struct iommufd_vevent_header *hdr; + ssize_t bytes; + void *data; + int ret, i; + + ret = poll(&pollfd, 1, 1000); + if (ret < 0) + return -1; + + data = calloc(nvevents, sizeof(*hdr) + sizeof(*event)); + if (!data) { + errno = ENOMEM; + return -1; + } + + bytes = read(event_fd, data, + nvevents * (sizeof(*hdr) + sizeof(*event))); + if (bytes <= 0) { + errno = EFAULT; + ret = -1; + goto out_free; + } + + for (i = 0; i < nvevents; i++) { + hdr = data + i * (sizeof(*hdr) + sizeof(*event)); + + if (hdr->flags & IOMMU_VEVENTQ_FLAG_LOST_EVENTS || + hdr->sequence - *prev_seq > 1) { + *prev_seq = hdr->sequence; + errno = EOVERFLOW; + ret = -1; + goto out_free; + } + *prev_seq = hdr->sequence; + event = data + sizeof(*hdr); + if (event->virt_id != virt_id) { + errno = EINVAL; + ret = -1; + goto out_free; + } + } + + ret = 0; +out_free: + free(data); + return ret; +} + +#define test_cmd_read_vevents(event_fd, nvevents, virt_id, prev_seq) \ + ASSERT_EQ(0, _test_cmd_read_vevents(self->fd, event_fd, nvevents, \ + virt_id, prev_seq)) +#define test_err_read_vevents(_errno, event_fd, nvevents, virt_id, prev_seq) \ + EXPECT_ERRNO(_errno, \ + _test_cmd_read_vevents(self->fd, event_fd, nvevents, \ + virt_id, prev_seq)) diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c index 212e5d62e13d..dd453aae8fed 100644 --- a/tools/testing/selftests/iommu/iommufd.c +++ b/tools/testing/selftests/iommu/iommufd.c @@ -2774,15 +2774,46 @@ TEST_F(iommufd_viommu, vdevice_alloc) uint32_t viommu_id = self->viommu_id; uint32_t dev_id = self->device_id; uint32_t vdev_id = 0; + uint32_t veventq_id; + uint32_t veventq_fd; + int prev_seq = -1; if (dev_id) { + /* Must allocate vdevice before attaching to a nested hwpt */ + test_err_mock_domain_replace(ENOENT, self->stdev_id, + self->nested_hwpt_id); + + /* Allocate a vEVENTQ with veventq_depth=2 */ + test_cmd_veventq_alloc(viommu_id, IOMMU_VEVENTQ_TYPE_SELFTEST, + &veventq_id, &veventq_fd); + test_err_veventq_alloc(EEXIST, viommu_id, + IOMMU_VEVENTQ_TYPE_SELFTEST, NULL, NULL); /* Set vdev_id to 0x99, unset it, and set to 0x88 */ test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &vdev_id); + test_cmd_mock_domain_replace(self->stdev_id, + self->nested_hwpt_id); + test_cmd_trigger_vevents(dev_id, 1); + test_cmd_read_vevents(veventq_fd, 1, 0x99, &prev_seq); test_err_vdevice_alloc(EEXIST, viommu_id, dev_id, 0x99, &vdev_id); + test_cmd_mock_domain_replace(self->stdev_id, self->ioas_id); test_ioctl_destroy(vdev_id); + + /* Try again with 0x88 */ test_cmd_vdevice_alloc(viommu_id, dev_id, 0x88, &vdev_id); + test_cmd_mock_domain_replace(self->stdev_id, + self->nested_hwpt_id); + /* Trigger an overflow with three events */ + test_cmd_trigger_vevents(dev_id, 3); + test_err_read_vevents(EOVERFLOW, veventq_fd, 3, 0x88, + &prev_seq); + /* Overflow must be gone after the previous reads */ + test_cmd_trigger_vevents(dev_id, 1); + test_cmd_read_vevents(veventq_fd, 1, 0x88, &prev_seq); + close(veventq_fd); + test_cmd_mock_domain_replace(self->stdev_id, self->ioas_id); test_ioctl_destroy(vdev_id); + test_ioctl_destroy(veventq_id); } else { test_err_vdevice_alloc(ENOENT, viommu_id, dev_id, 0x99, NULL); } diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c b/tools/testing/selftests/iommu/iommufd_fail_nth.c index 64b1f8e1b0cf..99a7f7897bb2 100644 --- a/tools/testing/selftests/iommu/iommufd_fail_nth.c +++ b/tools/testing/selftests/iommu/iommufd_fail_nth.c @@ -620,6 +620,7 @@ TEST_FAIL_NTH(basic_fail_nth, device) }; struct iommu_test_hw_info info; uint32_t fault_id, fault_fd; + uint32_t veventq_id, veventq_fd; uint32_t fault_hwpt_id; uint32_t ioas_id; uint32_t ioas_id2; @@ -692,6 +693,12 @@ TEST_FAIL_NTH(basic_fail_nth, device) IOMMU_HWPT_DATA_SELFTEST, &data, sizeof(data))) return -1; + if (_test_cmd_veventq_alloc(self->fd, viommu_id, + IOMMU_VEVENTQ_TYPE_SELFTEST, &veventq_id, + &veventq_fd)) + return -1; + close(veventq_fd); + return 0; } From patchwork Sat Feb 22 15:54:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986692 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2044.outbound.protection.outlook.com [40.107.92.44]) (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 029A6207DFB; Sat, 22 Feb 2025 15:54:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239692; cv=fail; b=cAv5alkhZ9JXqQZW0syQWVaY4Lh4jNElwzpPo1IfCd4lu4YH51K2EWXycIv0MIrsLXx6MBFEAMagGrU8+OsoSb99VhY14o3es8ZQ4ColBSMncmMaChOi+1nASNQBIESpsq9wzYGDD1C7/mdc0A5/VmjVInM6DY9ea5xCxGQ0OQQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239692; c=relaxed/simple; bh=2Q+la1Vr7KdS12V/vYxQZgWA60+Htge+0ih7MtG1OTc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NMSN7q+FmlXsE4xC8fshS3wVEM8ShZ0KxFt+LZCGOoEuW+iz9eIv7QCVv7SxTnweB1hC2LVwQrkUQfeZQXbNTmLpNbho0S/jHqLt+QowWkiEbzJzWxrYneFQo42EyvT1YAO8S53F8pS6/nwx1NPXZSNAZHLQ4793DU9919Lp0n8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=JsiYooea; arc=fail smtp.client-ip=40.107.92.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="JsiYooea" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LlWNzZwufwfHY/y7NLECJ3FHIEWtcZXbPZKx6qyBsWHvVjqiFyDRKjybAjg+4WL4EoJD/+b4/733WtTBR5w1I/9pt534JhZvnQMxl7GZnu53Dxc+Cz3eWMrJ7Cm7d/1SZJmTLjL6ZlqIWZDElPpqaJlSXuvCwuSredAariiRgRsiQ4NVfVGd9A3drpJT0rmsffYIb2MloI47sZpBH42vsv6rOvycLrl4Yon6WtfF5EAZ41TZGEP0wJ9n0fHQKaoyVT+07UOYSyHjDj5ERWYyPlTY5DXt0Q178WEa2Ma6FIVvwm/6ivhOEnfbKep7qMaUDDNiSnLkvzH0eEh/ciaLpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6NYHNYHk4Eskt64jA06hjjLb7nD8fIqO7zbe3QJ7OYY=; b=sG4y+QQVAipEjPvzu15zWrV6QUYIJkfglLVRth4flAtn1Z3/y2Z+TJjWXhwa2iUxXQLgvSkF+iBlbvilyfcTuntyIrHtT5XBtoieGT6gv4CYawQjlXJLxihhgr8L1ZvY3IVSrPTjnFaeeaD00QMhQSC+SN7glKccBP7ApNWl/IkQ9FCdIQ96ibr0z2NefoS4d17X/udYK9C3c73QxHKcdED9d0Fcvjd9mv1zbsDy8KyZhl0rVgwAkhqrX5J4I1mUhdIlS2BkpcQAVz0iKojDvm1ZZ/CkTs2JknzV3NhoRbPCjQhp1t3DWd4BAhkBTBNbcAID4xW2F0zMeXqs6Ubz1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6NYHNYHk4Eskt64jA06hjjLb7nD8fIqO7zbe3QJ7OYY=; b=JsiYooeahFcupWKMU/WDEBGgPOIVSw35IMrzpubmkV0Bi2sfmLNQhvpLXWxVl6Ey5BrwHbyqx28z5Earr6FX2u2NV3dnYk5UAAv/l1cAFXSPNuCPw5PW2+HyeSySPL+gfu0QQLO0JWMt/6Ma09c43bh88zk+cuz3OwcFk2dgEEPaYVeCClG4G5V/EmeAyHh7ixuxJ+vIoQMu2MmOyTxiRgdupXQFnk/dOPvaO63A5uBeejAs8K0vurBrdzOCIYxRrsbRFOH9/sOEQRPMTKibiHT3GZnknXVExIbvCM+LY6cTKKuUgHLLz8NAXh/3kLZ+mUDbsJaYxNDGUfZ8MZSR+Q== Received: from DM6PR17CA0011.namprd17.prod.outlook.com (2603:10b6:5:1b3::24) by CY8PR12MB7563.namprd12.prod.outlook.com (2603:10b6:930:96::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:42 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:5:1b3:cafe::16) by DM6PR17CA0011.outlook.office365.com (2603:10b6:5:1b3::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Sat, 22 Feb 2025 15:54:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:33 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:33 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:31 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 11/14] Documentation: userspace-api: iommufd: Update FAULT and VEVENTQ Date: Sat, 22 Feb 2025 07:54:08 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|CY8PR12MB7563:EE_ X-MS-Office365-Filtering-Correlation-Id: 22c72a2b-ffab-430c-bc98-08dd535938c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: +WACB6bGbm+NVljmJfWACJrWFCHTxhkuw1gXWPrURlJi5tCG6FTpYwc/7jQOo9wpsiyW2vXN+e/1+a9XxjQDhEDWa7fA7gygsfxldVUrQzLhq9S6eJX++bf0vAny3oGMwIbaB8520IxqPtio/xKob5XgQN7xfYIwNiOMkZNTsK/kIaC1JvLhTQp/BsFR6gNVWv4FDtO8MWsmaQbYqCFKD6owcva8q3u2UV+5PGBGzLRkvq60eqWgBTjkFN06IHJ/QsB+QaUJFoHdpNpPnkq8cDQhna+sRgwUAcrX93XjuIkznkapw0K89LbErnXTPxo1TOg5e49z0TXFQAKgidExfVbbU7M5mZuDJhcKErPSeVW0WSkvkJ5IYwgvWClU4smDYzkFEd9giJlYUGXNODxjGMR83BzDoTHqdU9xih+b2lS5TWULGd7EAAJliV/cFjYNiMFu/r8cv0XRGah//zThW1SmwfGnrn4T90D3QU/hkjt1gUtVimSEGKt7WPKA2SWoR/anxK+9dnXBpO1IJRs+9aWzlGQZKYkxcGo+gRDavTVHgqYgefkGTJoMIt6sBo+pRxbuT5v9zxhOtk/+Dg1rRKU28ty8LTqe3czfMDOEjiMzu8VusPaqHIjzh6An6EJJOXtT07erbgnbCvRetnhD61e6XowdaIP8JXacr7FH1usd+J/M6Tj6FSFPZIX1r4NCcyB7QIzwCYo4HK7/Rzwy1KyVzu2CL4xcb6QPnXn0taaKJNU9b0fhrk/KUCP5dDZT5q0ObQHjnYzUbmPJJA3ReYsuRjF+5o9Ld9qCRcrnODEvah85kk2XVsm2QSO7E0V2/KGyZRpr9U0IKZNw4Fqp05lAzs4EUklqK65RwBaNyxPr9YGskNb+lHUqWwX37lDxaaPySuzs4YQocRlB8v+/nLAgAvG27bIqVwB4JN9pNJ3R9+dYfR5wTU7h7q0Dy5nCwfdTIsGnbNpIaM3XPmNHZwuSIJFzvE1N46/BJBYGgI4363rBAa4yboadY5tjgOWuQ+4Fl153gpd9wVyRbPAwKEvQTII6zNwIvSx1aLSjhtUkqot9q71nc54gza78HSxLEK4lPTo4Sb+VYX4x3B6T/et2DSNEPaW/q98LNVCIhv1Fb4ddrYUaYCJwa83LUx1wesu7JEzCNV0PSVy9is3fTYEtUls1SZg2AwsshRm9y0RpnNKrufNenkytDIHiB6Gb52Kf8m5Qk1Xy6e1JlAoDlwWyNLKY8MKsF9+jauv+wqaeRLqs3gUTtHS9XK4v60Eny6nQe7Bq/o0BYiBAWmBjfj7AtWoTDTqhEnnS5QJ3Vky9Th8Lm4QHOaJH/pekjXK6YSGKZGCZSzEGIpO/vpY2GdU/Qzxizn+XanuSiGAHYCx3nqL0rwleYilE2brCIqvS90E0R16jCGz9gSEP58fZMzX82YjoWSFxiQtdxLmwLxvTvOpT9lTXTCJBftSBKQ8uI9JaLWf0k26C7/EHaKYQjy/oVIxZ0wcbqktGDvEPmkE= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:42.4790 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22c72a2b-ffab-430c-bc98-08dd535938c8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7563 With the introduction of the new objects, update the doc to reflect that. Reviewed-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Bagas Sanjaya Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- Documentation/userspace-api/iommufd.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/userspace-api/iommufd.rst b/Documentation/userspace-api/iommufd.rst index 70289d6815d2..b0df15865dec 100644 --- a/Documentation/userspace-api/iommufd.rst +++ b/Documentation/userspace-api/iommufd.rst @@ -63,6 +63,13 @@ Following IOMMUFD objects are exposed to userspace: space usually has mappings from guest-level I/O virtual addresses to guest- level physical addresses. +- IOMMUFD_FAULT, representing a software queue for an HWPT reporting IO page + faults using the IOMMU HW's PRI (Page Request Interface). This queue object + provides user space an FD to poll the page fault events and also to respond + to those events. A FAULT object must be created first to get a fault_id that + could be then used to allocate a fault-enabled HWPT via the IOMMU_HWPT_ALLOC + command by setting the IOMMU_HWPT_FAULT_ID_VALID bit in its flags field. + - IOMMUFD_OBJ_VIOMMU, representing a slice of the physical IOMMU instance, passed to or shared with a VM. It may be some HW-accelerated virtualization features and some SW resources used by the VM. For examples: @@ -109,6 +116,14 @@ Following IOMMUFD objects are exposed to userspace: vIOMMU, which is a separate ioctl call from attaching the same device to an HWPT_PAGING that the vIOMMU holds. +- IOMMUFD_OBJ_VEVENTQ, representing a software queue for a vIOMMU to report its + events such as translation faults occurred to a nested stage-1 (excluding I/O + page faults that should go through IOMMUFD_OBJ_FAULT) and HW-specific events. + This queue object provides user space an FD to poll/read the vIOMMU events. A + vIOMMU object must be created first to get its viommu_id, which could be then + used to allocate a vEVENTQ. Each vIOMMU can support multiple types of vEVENTS, + but is confined to one vEVENTQ per vEVENTQ type. + All user-visible objects are destroyed via the IOMMU_DESTROY uAPI. The diagrams below show relationships between user-visible objects and kernel @@ -251,8 +266,10 @@ User visible objects are backed by following datastructures: - iommufd_device for IOMMUFD_OBJ_DEVICE. - iommufd_hwpt_paging for IOMMUFD_OBJ_HWPT_PAGING. - iommufd_hwpt_nested for IOMMUFD_OBJ_HWPT_NESTED. +- iommufd_fault for IOMMUFD_OBJ_FAULT. - iommufd_viommu for IOMMUFD_OBJ_VIOMMU. - iommufd_vdevice for IOMMUFD_OBJ_VDEVICE. +- iommufd_veventq for IOMMUFD_OBJ_VEVENTQ. Several terminologies when looking at these datastructures: From patchwork Sat Feb 22 15:54:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986696 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2073.outbound.protection.outlook.com [40.107.94.73]) (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 8B29820B7EE; Sat, 22 Feb 2025 15:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239697; cv=fail; b=c7QNF969nGATNfxYQK7KBIKVg6rpdd4p8E0+E09oWrhOgH1Ys3aBhHug9K+Gcu6uUsGjmEpPrnmf0bj7yJ+3PDkEGUWLLxPAYC86cYNdWDH383vR0CxEjAsEdO4RQ+8CN3gdhkvU8j5Af/ZYtMLG9xZbuH6oFt7PwjHQvxz7P/w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239697; c=relaxed/simple; bh=bC7jnA0GQgQBdr2wDvP7KrRtON4oviHEA94DhpxkHLk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VmWoitVL/4r3AIUbz253w6lzHiCJkL52/H6LAYM0J3dgMYW1zL2qQtiS8LzcrgchgdaCKGoLmg8tl0xL6VieuTrtYdoqp3ZFWxi53zub/KwTVarYNwpWF710GqXfBIrs3uhie+d4TN8ki786lWQWpz1FCjWIk9D5RLbaH6lQjY0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=q0WCw7Re; arc=fail smtp.client-ip=40.107.94.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="q0WCw7Re" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BrOuQaZ9tIev4IJcTHZxxpTxlyMwLDMf+txoyWY+PCgoBk8kbPmo0cZmnpl1AeVaY1/dwPkCkl057W/YGQgydB+rxuGlr3+26IzIK5Q9fWE6KDYrDbVBznuswoYEwf5JUWEQFhGYF4n59ge/67TSL8WKLBF6t+KHNzerVz2fufQ2UReHaehvMi4Cpsqsx0wiDExPzg7fs4FIsyfLDPGbEQAdgTCM2gQ5ByjbJGBTIaYA0JlNHHSoKipMNVhNNMljuLTwIrR0d3Q4My4YcandoVkFrGo0jCdX1oBorV0c5N9GdSNLG2MEnjBLFiQhHa35gpmDBSiRK1///9yZRyD0RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K4XC1t9uE9d98oCKXv3ySINEv8fP+ET7TRg95FMhJXE=; b=l17GvPHb1Qu7xj+aO2yWsfCDAyKVhZu3+VFLVCLiYtiGSRByuIelShK4jtkvN+16bStK65hdguyRgJ6gnd2LA1e8C8mwyAl+h6hi4g8lbnTeJ9hOTyyaMfMvM9SnOq8FGDIn9w3EURBqnE98/NCzqwDAd23ch5dgGbpg6f0nevp0HM/D9QY97iaarYZ8cyRz2Nw6QA0RZJTCpw6HmOxDyrkqDQVKhOpnMATQjri86D3TL40PH7110SbzvJmc/jFUT7SENJvShTGWvXS1vQK9MtvXgQh+PRgtB1h8EAnO9ZxaiFgzvQ+XRsCgZzsoo23w5wma9rVVIEadGJsXI8wTzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K4XC1t9uE9d98oCKXv3ySINEv8fP+ET7TRg95FMhJXE=; b=q0WCw7ReutA8tUDu958zUvakean67JcTzxIk3S2U5EkqmlzGYeG5qb8lviFEf02CfhEfrHD2elB0KC1SeavzAEfI0tCjc1bNF2D6y7h6yTS+eIiLYe/m0xMLFt+9k/4QyKDDhLHXGdEMzU5MVqnjVu4OsHNPiANqW27u2U0Ak53mgH6nT+g9/gYM1i/8A6L57hkqGogkinGxjlvaHbfJeEA7RhzbQZqYY1lxSpoRRusJHFF9LpUI7if2VjGXOW9TUraNBScX8vbPHQpclKI4PTs7Uks7rafQ4qN46gNB/UD05yCv5bOVyASg9lMgAQmVSPE5YeVtfPrgfRPSIrxFHg== Received: from DM6PR17CA0024.namprd17.prod.outlook.com (2603:10b6:5:1b3::37) by SJ2PR12MB8883.namprd12.prod.outlook.com (2603:10b6:a03:538::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Sat, 22 Feb 2025 15:54:46 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:5:1b3:cafe::ba) by DM6PR17CA0024.outlook.office365.com (2603:10b6:5:1b3::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.16 via Frontend Transport; Sat, 22 Feb 2025 15:54:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:35 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:35 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:33 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 12/14] iommu/arm-smmu-v3: Introduce struct arm_smmu_vmaster Date: Sat, 22 Feb 2025 07:54:09 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|SJ2PR12MB8883:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f45937e-c91a-45b1-7974-08dd53593b0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: fLNbZW7bUKcMjhq2HHsaUnbXxCE4HBvw3Bt8RjwluH65Xaa3sC/sV8XdyZLqMJw7eTKdTct7daOoEttIYfK3iocUio3+d3C2Y4kA7zA7SkriYGSM3XX/1FO33Llu3X3Fmkrmg+E39DhGblPdYcnbR4VTc615kIYktIroTSRoWyVtbpFeiVnkA86w8UTvqAS6J63QC1HuYO/6T21+1Mo6144GaiN7m/Wg/ZkVrHlZ8bpVZKQJXh9YwA9IDjl3kgtb5kZQxAhSdpfnc3SdQRm50SbbsF13AvAI3BEUs1lz97/yPVzVA1RQPfZbW5ZqiteJwTJgvr0e5riLwx7rDKf+HUC33wnknIRKbc2JCP908PAKPRAD4Ml0J6yxZKY6DY6qgQHIm3zvGPGXGubFIVaHXaWfG1CpMZhz5nCNb0PMIPmtPq1hX0xar1CvDvgqjB4z5PO9LLY0ApA4cH43MTt1DtQvJGd1rZHd0e+eAYUGrgXoywXvgLwO+xwwXE21g49IOSddt4iSESwoUHEaL+s2JxUuJLzdhnTUzniUwNu3/QqaZ5Etc2DyaabiE4LL3AD7T70vL73+QzzV3pHO1fiy5cWUvN164wJm+FpBRCZ4/NzCqlMG7U+C/ZGUyiTZq5Ti50fIs2J/YZ0Srfw5CRw4c5xW3e9Xfjh2l9RzXnG26kK+tQBH+2raADcdlnaIjGEPyMiKBL6yjf0yAnOHPZFDQcsiaUp+f8+hESOwefDOyB9gDGPMsRs8pMmvNK83a1L7z8Lj5dALyegPrUqiwzwWl3hc/EBv0V8GpjzAS1E6CsDi1AEnnYSmiRKC/lemVSHb378cBsJXhK2/B8a5M6cCJraqKbaN+LtfYZ4YmExEszAHVfzN/lpTUmD32nF69e8p5EPsjiwh5PZCj/1Xmt810i8vUAmgPrFLsV1I+KgMoSmOXBGDkRr3Am9/hZifRo/7YvIp4kC3wU6sKG5wbu0DtUjh7V98F1XR5F4gVQ6SHRjQNkDc0k79vEzTMb+4U6l8gKtbUHd29xEW0v1OfzMaLAH3oJV3OdbIpCUbw76M/QHu4ohXm0qNbRok9QS/VlpgVY/K7eAVl+sNJXsQTTopZXJJA20VJUnpHvJOsZcUYTvPl7RyGuSEQChme1Jsc998nsOzcbYhMfbh0FUuzqFPqs1Oa4kkJEUsBcfK8RSf41na2ankASmu6XJZ3ZaCZ+hl5OD48YhHnk+cqsrofI51XAFt1bNLNN5IfAfEojp3VMGGYbAkmR2mS0erxLIXC+/jRlgYsF3Y66rDgK05DZa3AxRr54TeBlTP1eFOx8mnNKFgeQFmjyZ9kdtC3VqqUjYVws8uPQ4fTXIJRJ8VL7lc+k3/t5bkDbqHMkEvOnleRZbta7xRmb2cExvoa+g9TpLIZYybJqNyNN0XMTbNuskyvJc2B5F0eLm39bwEeNdhIF8oFD+1JhRzEFWU5G11NSG9koWFAVbHx2nPSY7gdRr7y8CckmqaxmHBV+JXopcWS1M= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:46.3071 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f45937e-c91a-45b1-7974-08dd53593b0e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8883 Use it to store all vSMMU-related data. The vsid (Virtual Stream ID) will be the first use case. Since the vsid reader will be the eventq handler that already holds a streams_mutex, reuse that to fenche the vmaster too. Also add a pair of arm_smmu_attach_prepare/commit_vmaster helpers to set or unset the master->vmaster point. Put these helpers inside the existing arm_smmu_attach_prepare/commit(). For identity/blocked ops that don't call arm_smmu_attach_prepare/commit(), add a simpler arm_smmu_master_clear_vmaster helper to unset the vmaster. Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 27 ++++++++++ .../arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 53 +++++++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 15 +++++- 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index bd9d7c85576a..85352504343b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -799,6 +799,11 @@ struct arm_smmu_stream { struct rb_node node; }; +struct arm_smmu_vmaster { + struct arm_vsmmu *vsmmu; + unsigned long vsid; +}; + struct arm_smmu_event { u8 stall : 1, ssv : 1, @@ -824,6 +829,8 @@ struct arm_smmu_master { struct arm_smmu_device *smmu; struct device *dev; struct arm_smmu_stream *streams; + /* Locked by smmu->streams_mutex */ + struct arm_smmu_vmaster *vmaster; /* Locked by the iommu core using the group mutex */ struct arm_smmu_ctx_desc_cfg cd_table; unsigned int num_streams; @@ -972,6 +979,7 @@ struct arm_smmu_attach_state { bool disable_ats; ioasid_t ssid; /* Resulting state */ + struct arm_smmu_vmaster *vmaster; bool ats_enabled; }; @@ -1055,9 +1063,28 @@ struct iommufd_viommu *arm_vsmmu_alloc(struct device *dev, struct iommu_domain *parent, struct iommufd_ctx *ictx, unsigned int viommu_type); +int arm_smmu_attach_prepare_vmaster(struct arm_smmu_attach_state *state, + struct iommu_domain *domain); +void arm_smmu_attach_commit_vmaster(struct arm_smmu_attach_state *state); +void arm_smmu_master_clear_vmaster(struct arm_smmu_master *master); #else #define arm_smmu_hw_info NULL #define arm_vsmmu_alloc NULL + +static inline int +arm_smmu_attach_prepare_vmaster(struct arm_smmu_attach_state *state, + struct iommu_domain *domain) +{ + return 0; /* NOP */ +} + +static inline void +arm_smmu_attach_commit_vmaster(struct arm_smmu_attach_state *state) +{ +} +static inline void arm_smmu_master_clear_vmaster(struct arm_smmu_master *master) +{ +} #endif /* CONFIG_ARM_SMMU_V3_IOMMUFD */ #endif /* _ARM_SMMU_V3_H */ diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c index 5aa2e7af58b4..364d8469a480 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c @@ -85,6 +85,59 @@ static void arm_smmu_make_nested_domain_ste( } } +int arm_smmu_attach_prepare_vmaster(struct arm_smmu_attach_state *state, + struct iommu_domain *domain) +{ + struct arm_smmu_nested_domain *nested_domain; + struct arm_smmu_vmaster *vmaster; + unsigned long vsid; + int ret; + + iommu_group_mutex_assert(state->master->dev); + + if (domain->type != IOMMU_DOMAIN_NESTED) + return 0; + nested_domain = to_smmu_nested_domain(domain); + + /* Skip invalid vSTE */ + if (!(nested_domain->ste[0] & cpu_to_le64(STRTAB_STE_0_V))) + return 0; + + ret = iommufd_viommu_get_vdev_id(&nested_domain->vsmmu->core, + state->master->dev, &vsid); + if (ret) + return ret; + + vmaster = kzalloc(sizeof(*vmaster), GFP_KERNEL); + if (!vmaster) + return -ENOMEM; + vmaster->vsmmu = nested_domain->vsmmu; + vmaster->vsid = vsid; + state->vmaster = vmaster; + + return 0; +} + +void arm_smmu_attach_commit_vmaster(struct arm_smmu_attach_state *state) +{ + struct arm_smmu_master *master = state->master; + + mutex_lock(&master->smmu->streams_mutex); + if (state->vmaster != master->vmaster) { + kfree(master->vmaster); + master->vmaster = state->vmaster; + } + mutex_unlock(&master->smmu->streams_mutex); +} + +void arm_smmu_master_clear_vmaster(struct arm_smmu_master *master) +{ + mutex_lock(&master->smmu->streams_mutex); + kfree(master->vmaster); + master->vmaster = NULL; + mutex_unlock(&master->smmu->streams_mutex); +} + static int arm_smmu_attach_dev_nested(struct iommu_domain *domain, struct device *dev) { diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 358072b4e293..9e50bcee69d1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2803,6 +2803,7 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, struct arm_smmu_domain *smmu_domain = to_smmu_domain_devices(new_domain); unsigned long flags; + int ret; /* * arm_smmu_share_asid() must not see two domains pointing to the same @@ -2832,9 +2833,15 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, } if (smmu_domain) { + ret = arm_smmu_attach_prepare_vmaster(state, new_domain); + if (ret) + return ret; + master_domain = kzalloc(sizeof(*master_domain), GFP_KERNEL); - if (!master_domain) + if (!master_domain) { + kfree(state->vmaster); return -ENOMEM; + } master_domain->master = master; master_domain->ssid = state->ssid; if (new_domain->type == IOMMU_DOMAIN_NESTED) @@ -2861,6 +2868,7 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); kfree(master_domain); + kfree(state->vmaster); return -EINVAL; } @@ -2893,6 +2901,8 @@ void arm_smmu_attach_commit(struct arm_smmu_attach_state *state) lockdep_assert_held(&arm_smmu_asid_lock); + arm_smmu_attach_commit_vmaster(state); + if (state->ats_enabled && !master->ats_enabled) { arm_smmu_enable_ats(master); } else if (state->ats_enabled && master->ats_enabled) { @@ -3162,6 +3172,7 @@ static int arm_smmu_attach_dev_identity(struct iommu_domain *domain, struct arm_smmu_ste ste; struct arm_smmu_master *master = dev_iommu_priv_get(dev); + arm_smmu_master_clear_vmaster(master); arm_smmu_make_bypass_ste(master->smmu, &ste); arm_smmu_attach_dev_ste(domain, dev, &ste, STRTAB_STE_1_S1DSS_BYPASS); return 0; @@ -3180,7 +3191,9 @@ static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain, struct device *dev) { struct arm_smmu_ste ste; + struct arm_smmu_master *master = dev_iommu_priv_get(dev); + arm_smmu_master_clear_vmaster(master); arm_smmu_make_abort_ste(&ste); arm_smmu_attach_dev_ste(domain, dev, &ste, STRTAB_STE_1_S1DSS_TERMINATE); From patchwork Sat Feb 22 15:54:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986698 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2040.outbound.protection.outlook.com [40.107.244.40]) (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 E2DCA20CCF4; Sat, 22 Feb 2025 15:54:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239700; cv=fail; b=nIFBtJHH7Zkww8r1zg10aZdYpb7DtKhqTHdyJs14OL5HqAcWrSi86Dv4WeWwemOP8jLKvjRyrHMNtaSxCNDecStXOhH4X8McOSnblzRGVSu2qKlWTkgJIP5/INCx8kysK3qZZ7dvQvg6bPZK31dx9T/cL53UpGkmLILEnSKT7KQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239700; c=relaxed/simple; bh=1pxnHPoBJ14AYx2x5nf1rpQZJDgD/CaqSiEnUcK+MGE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ex3fDzzpEDJQy27nFR03PuKwNiX3bjGti375+GYUsbFEO6OiiiEsLwqI+PoHPZWK0+czGphZPTvO8DW1FEYTF8F8lUiFC9b4AQNAuoFABfcMJGuix6KcyW1m7x6lSaY/rlBU7A7W7V7hedN9NssdgrZXeKN7+wI66KQ4JRmu4ho= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=eDTfdZ7M; arc=fail smtp.client-ip=40.107.244.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="eDTfdZ7M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FqGwX/0Lony2UBQQLKZE6XwkYyMTzm+DLKfOisf1SMnAMQE0g0gdLCWUZ2aCNIxCwQsQbVvQ8B9xAya8j5FTC6COJ/E539qnE8r1uoEmhpqHfUfWUsebiI1ufiIOVagu5pi0K0NlHz5cwhjLP8TEnQKsr234Rlu3NmdC1I11HGfd+eQBU8tX1UeNKnSCt6+KWcx+n7d0+c65nbH5IlBaPnIPy9CyZTUlqnFCYzWoXNUosh5Krh3UFGhzpxByjEvG9p6Vzxfjhae6wJ8E6qSkRXSOJmfuZ+IL4t0WYcciDQgndh9jo0fx6gAno9xT8wWpbVdqzEN0qVDyvCTuyI0j/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lrtTbc5CQziED69p9FmcpuzNc3Jz+cizNlIOb2T2l/g=; b=YFo5OTR5NG3s4uAPrbzsjkBAuYT/7HNIp5vu2g5uw6GwXkdjV4cxruizh2lcZHrT6lS84FP2z0YH/9AagejSl2EMOUMNX9RriFDzzs8TY/vOKKp9JB7C+wbrfKoJr8ZjMhlnaMCQGS178vzBX/6IQ6/lCsEKFs7T0eu790yc6DhA386udVfN1JPXDFA7VrSh1iY08ygzT8SpK6lWjyZ3BVCGf3JvYnFa+lMaiK9guDxbuT5LcNIVxub3pOd8Ltc3Hwa/r8ePhi3UvtTQ01bfo2fC48XqkHnvOce9a6Op7BJkknY/3i0Hdm8Iijmuc7DHXdtzIZ2Iiw3R6vq6od9Zqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lrtTbc5CQziED69p9FmcpuzNc3Jz+cizNlIOb2T2l/g=; b=eDTfdZ7MZ+4rfjnfl6NUcN6HGp12EZAjE0qf4OEwkq6Iw9ezPdFB9DVw+dAG8IL/UEnGm0LCRXUKRwyeKkoXtxf+7EN5FJXIsokFSCCIJoZVT1l05LN+YrcHsY6vQURgFSlCuS74f6IKYuApzEDaS6DMZ0DcIQAbjysbC+BV52UuSLiyo6yM92wi0Tl0FMhy1ybOPFbDtlktRBNAYEFajw/PDt7qk7oruytfVELv+xKdb+TVvgfbneYhwCxaM66uFGHizioXpfzbDyQRswW3NftO234wFksl0B9WWflQknN2d3xb+9Y3sGZ+4IdHt+c6hfXmdWFREh8NN43L6DiFpA== Received: from CH2PR15CA0025.namprd15.prod.outlook.com (2603:10b6:610:51::35) by BY5PR12MB4052.namprd12.prod.outlook.com (2603:10b6:a03:209::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:49 +0000 Received: from DS2PEPF0000343A.namprd02.prod.outlook.com (2603:10b6:610:51:cafe::7f) by CH2PR15CA0025.outlook.office365.com (2603:10b6:610:51::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Sat, 22 Feb 2025 15:54:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:49 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:37 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:36 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:35 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 13/14] iommu/arm-smmu-v3: Report events that belong to devices attached to vIOMMU Date: Sat, 22 Feb 2025 07:54:10 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343A:EE_|BY5PR12MB4052:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b83a5fd-a0a6-4e49-2062-08dd53593cb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: bMwEKbcRY7Vqzc7vhC6pw1/QeZ4s/NWuZgDlyO7UoIn1MqYRhQWc/TG/jNvQKk5ECSw2ssuhWFNh3jz7Mjl7w3yRt8deaYF8QTSNnDbj+qnaTqOGN7l2byYFOsLiIXFHH+e2BHEkyzB93Ll9E5kCDL1RwJVNHMWph+wLi3ahRavxRk6ndcvai69BRSsftK5S+kgbeZmNUGQBmOkvc+TaAvsUXncwg5i7YsL2b99oDtT+tMMQR2JX9sHyOSj9n9bxyDbQdGNRi5DS0xD8PozeXMVnqcFDQQS7AaHph91QsjmJUyNB8UPT/kKD5vCIgE4dyOSWJ4R0v8B0SJN7nouM1yscLNpvCMV1Qa5ABQB/3yH59HUvfwqDrvqS9npbTRXj2fj/08womxUTaQopVjX90mb3e6LgY707hnpDtKQDEB0q3xyvGW3IsdiVtxtrdmXj9lpkrvtAitVLPucQbRT1L9OIRQUioQ69zG+v3QJjIGdm7mnGnn2ZB+nfzUVOGj6HK/jlm38oUwWYTn7cCnXlwKMLijIhOF0dbS6fSq4CEUKLe0B75q6OKVxQSzmvkqypLKOAQR7buGlfZBJIX8MHlWwzlgcssjoi/bX4Xuz3nwuixd9XPQ+Mu7FHaKTplosSgximP6E2HRjiZif9rGHR0M43ACO9OcTusAXvr1gFZi5upkNH1Vfm6aY5L8uX44emrf2E1X3BUwiiSmj2FOedElLbtXAOUg/kLOvp76jjQtlrILYi68qXGzCZe9rB0vFIxWby1N1H6OlGzbu9KqNBiXlZwZ2jcYVtXG/BYN6UIlKm1GaHDhE8gDvJBj6F8pAFct2kiPmuzAcPA4Su/IKrBCCvC66T4MQ6UgwI0pys/4lN5pQEs2+Q0euEJ57Rco8B5qwF3af4zNn0a8Y9nj+I0rt79XLWz42PCGu0ndcTqF0zbEhZl/liJ5cM348lv/4cZZwGejd8MaoXEt6j7TVKbSHfB1+0bsTZww/FIQVDeo5zt47a16Zaq5hUwClsbxoHp2gMHJjMaI+ukVmmt7F94ESP5F774xV9bJ7dqIsxNgKU+Nv6DY7fdBYy1D64JWYsLL9EkNBiaftk76K8S/hcDFZ7+TMah9GWGb9dsUZ58acGG1UEKwr3RnCpXI5KVXZ112VPxzbrlKkgcj/EdSrGvl0m391Wi4q88upidAsPyulGLY/NoJZOT3ua91LhUZckTtqy5rHr9WmMtu3Om0/V3EoV4BrtH5adX8DCnGhOGGzN4N72MdK870eJ95kMI6VAo1nfPMF2JPhRVyGcL0EAk1nIDdUnGKJKbdHUdtzC0xc3ZqcA3JJA7RAAYVKJ9xq8RHo3/vQlwCMbdtORv54FQbPLA1MNLHsF0uEsuG91J+yOQqS0ld1XMYfCYS9WH76j1m/aUWY7m3PU/csBlNuHxgSXwe6c4wsmvBYTRrEa1AoG7+GFXZePihGpnTtuh1MfGTST3Hb7HVqsUt3MM4P5PEmvldh/AFGKcXJ4Mz+PlvU= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:49.0966 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b83a5fd-a0a6-4e49-2062-08dd53593cb8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4052 Aside from the IOPF framework, iommufd provides an additional pathway to report hardware events, via the vEVENTQ of vIOMMU infrastructure. Define an iommu_vevent_arm_smmuv3 uAPI structure, and report stage-1 events in the threaded IRQ handler. Also, add another four event record types that can be forwarded to a VM. Reviewed-by: Kevin Tian Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 7 +++ include/uapi/linux/iommufd.h | 23 +++++++ .../arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 17 ++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 60 +++++++++++-------- 4 files changed, 82 insertions(+), 25 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 85352504343b..c8574969e700 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -1067,6 +1067,7 @@ int arm_smmu_attach_prepare_vmaster(struct arm_smmu_attach_state *state, struct iommu_domain *domain); void arm_smmu_attach_commit_vmaster(struct arm_smmu_attach_state *state); void arm_smmu_master_clear_vmaster(struct arm_smmu_master *master); +int arm_vmaster_report_event(struct arm_smmu_vmaster *vmaster, u64 *evt); #else #define arm_smmu_hw_info NULL #define arm_vsmmu_alloc NULL @@ -1085,6 +1086,12 @@ arm_smmu_attach_commit_vmaster(struct arm_smmu_attach_state *state) static inline void arm_smmu_master_clear_vmaster(struct arm_smmu_master *master) { } + +static inline int arm_vmaster_report_event(struct arm_smmu_vmaster *vmaster, + u64 *evt) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_ARM_SMMU_V3_IOMMUFD */ #endif /* _ARM_SMMU_V3_H */ diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h index 2ade4839880d..5fc7e27804b7 100644 --- a/include/uapi/linux/iommufd.h +++ b/include/uapi/linux/iommufd.h @@ -1054,9 +1054,32 @@ struct iommufd_vevent_header { /** * enum iommu_veventq_type - Virtual Event Queue Type * @IOMMU_VEVENTQ_TYPE_DEFAULT: Reserved for future use + * @IOMMU_VEVENTQ_TYPE_ARM_SMMUV3: ARM SMMUv3 Virtual Event Queue */ enum iommu_veventq_type { IOMMU_VEVENTQ_TYPE_DEFAULT = 0, + IOMMU_VEVENTQ_TYPE_ARM_SMMUV3 = 1, +}; + +/** + * struct iommu_vevent_arm_smmuv3 - ARM SMMUv3 Virtual Event + * (IOMMU_VEVENTQ_TYPE_ARM_SMMUV3) + * @evt: 256-bit ARM SMMUv3 Event record, little-endian. + * Reported event records: (Refer to "7.3 Event records" in SMMUv3 HW Spec) + * - 0x04 C_BAD_STE + * - 0x06 F_STREAM_DISABLED + * - 0x08 C_BAD_SUBSTREAMID + * - 0x0a C_BAD_CD + * - 0x10 F_TRANSLATION + * - 0x11 F_ADDR_SIZE + * - 0x12 F_ACCESS + * - 0x13 F_PERMISSION + * + * StreamID field reports a virtual device ID. To receive a virtual event for a + * device, a vDEVICE must be allocated via IOMMU_VDEVICE_ALLOC. + */ +struct iommu_vevent_arm_smmuv3 { + __aligned_le64 evt[4]; }; /** diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c index 364d8469a480..42c7daf4c8c7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c @@ -445,4 +445,21 @@ struct iommufd_viommu *arm_vsmmu_alloc(struct device *dev, return &vsmmu->core; } +int arm_vmaster_report_event(struct arm_smmu_vmaster *vmaster, u64 *evt) +{ + struct iommu_vevent_arm_smmuv3 vevt; + int i; + + lockdep_assert_held(&vmaster->vsmmu->smmu->streams_mutex); + + vevt.evt[0] = cpu_to_le64((evt[0] & ~EVTQ_0_SID) | + FIELD_PREP(EVTQ_0_SID, vmaster->vsid)); + for (i = 1; i < EVTQ_ENT_DWORDS; i++) + vevt.evt[i] = cpu_to_le64(evt[i]); + + return iommufd_viommu_report_event(&vmaster->vsmmu->core, + IOMMU_VEVENTQ_TYPE_ARM_SMMUV3, &vevt, + sizeof(vevt)); +} + MODULE_IMPORT_NS("IOMMUFD"); diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9e50bcee69d1..fdf8bba14303 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1813,8 +1813,8 @@ static void arm_smmu_decode_event(struct arm_smmu_device *smmu, u64 *raw, mutex_unlock(&smmu->streams_mutex); } -static int arm_smmu_handle_event(struct arm_smmu_device *smmu, - struct arm_smmu_event *event) +static int arm_smmu_handle_event(struct arm_smmu_device *smmu, u64 *evt, + struct arm_smmu_event *event) { int ret = 0; u32 perm = 0; @@ -1823,6 +1823,10 @@ static int arm_smmu_handle_event(struct arm_smmu_device *smmu, struct iommu_fault *flt = &fault_evt.fault; switch (event->id) { + case EVT_ID_BAD_STE_CONFIG: + case EVT_ID_STREAM_DISABLED_FAULT: + case EVT_ID_BAD_SUBSTREAMID_CONFIG: + case EVT_ID_BAD_CD_CONFIG: case EVT_ID_TRANSLATION_FAULT: case EVT_ID_ADDR_SIZE_FAULT: case EVT_ID_ACCESS_FAULT: @@ -1832,31 +1836,30 @@ static int arm_smmu_handle_event(struct arm_smmu_device *smmu, return -EOPNOTSUPP; } - if (!event->stall) - return -EOPNOTSUPP; - - if (event->read) - perm |= IOMMU_FAULT_PERM_READ; - else - perm |= IOMMU_FAULT_PERM_WRITE; + if (event->stall) { + if (event->read) + perm |= IOMMU_FAULT_PERM_READ; + else + perm |= IOMMU_FAULT_PERM_WRITE; - if (event->instruction) - perm |= IOMMU_FAULT_PERM_EXEC; + if (event->instruction) + perm |= IOMMU_FAULT_PERM_EXEC; - if (event->privileged) - perm |= IOMMU_FAULT_PERM_PRIV; + if (event->privileged) + perm |= IOMMU_FAULT_PERM_PRIV; - flt->type = IOMMU_FAULT_PAGE_REQ; - flt->prm = (struct iommu_fault_page_request) { - .flags = IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE, - .grpid = event->stag, - .perm = perm, - .addr = event->iova, - }; + flt->type = IOMMU_FAULT_PAGE_REQ; + flt->prm = (struct iommu_fault_page_request){ + .flags = IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE, + .grpid = event->stag, + .perm = perm, + .addr = event->iova, + }; - if (event->ssv) { - flt->prm.flags |= IOMMU_FAULT_PAGE_REQUEST_PASID_VALID; - flt->prm.pasid = event->ssid; + if (event->ssv) { + flt->prm.flags |= IOMMU_FAULT_PAGE_REQUEST_PASID_VALID; + flt->prm.pasid = event->ssid; + } } mutex_lock(&smmu->streams_mutex); @@ -1866,7 +1869,14 @@ static int arm_smmu_handle_event(struct arm_smmu_device *smmu, goto out_unlock; } - ret = iommu_report_device_fault(master->dev, &fault_evt); + if (event->stall) { + ret = iommu_report_device_fault(master->dev, &fault_evt); + } else { + if (master->vmaster && !event->s2) + ret = arm_vmaster_report_event(master->vmaster, evt); + else + ret = -EFAULT; /* Unhandled events should be pinned */ + } out_unlock: mutex_unlock(&smmu->streams_mutex); return ret; @@ -1944,7 +1954,7 @@ static irqreturn_t arm_smmu_evtq_thread(int irq, void *dev) do { while (!queue_remove_raw(q, evt)) { arm_smmu_decode_event(smmu, evt, &event); - if (arm_smmu_handle_event(smmu, &event)) + if (arm_smmu_handle_event(smmu, evt, &event)) arm_smmu_dump_event(smmu, evt, &event, &rs); put_device(event.dev); From patchwork Sat Feb 22 15:54:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13986699 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2073.outbound.protection.outlook.com [40.107.236.73]) (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 4E78920D502; Sat, 22 Feb 2025 15:54:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239702; cv=fail; b=C0If91sbssvf/eHqwAv5qN2lDvA3SepmdoR3NQDkTX8V2q5/grR+2hbaFdwRBtN03+YzN74vaPnz35yFAC0jxlBe+nHjYDKO1kZfaj9u0sbIM1uGLK+XBOzqSGf7ihCR3/mYfeNrgXjII6DfhmFv455mToXJ2AEtj20mqFRVIoc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740239702; c=relaxed/simple; bh=j8fFNDpqD8HnlwDuBPrmm73rYwiTw9liGwRRkfBYLC4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cPqsASW0SvnFoT3IXhv96KVTLZtMiwJYMKhIPfDSU5QlxzBSdjF7oHWFC5OtHID5q/AI3z4/7gTV1VI5G7GfIHQgHqEizG7kaDudOBn9WO1iIgXx/x7OywNLiW5viMOq4DxeoCftQ7rAMV18Bft/iMC0LGswsQcuNvqefPgdw14= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=B9NGFFQd; arc=fail smtp.client-ip=40.107.236.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="B9NGFFQd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C8bqMXoz7QCYD3FdqB6og1rqEWBOpLFmN9LwEDoEGfFiAmNTwMgwieXShNsjXvovp+7fK+He4mp0aO/LfntzlnBLhAnynstUtjuIJy/JCk2mpGHXtw/vCJgPR0dcZVr2yhXDrK6OVCAk3bfzcuvUsDyj+CyfPV+Ux9fOeUL1QSm9gA8Y9ffwZYbslKqO7sT+TqwJQ2Iuwe7sYnzDys4e4H+h3BfnwZmLnbuOk38Wd8kaHT/DVfLIwqwfbIuEGPp5SoVS697pgkzXfAOTrtMNA/75VdGgmVwSBQNOb39cQKNYTPP7u8Dfoj7LIZ4CZQod2fiOOTuBrw04SXcAbgqpCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=T6bDDOzqFTlkM2Q60CEGPKJd0jk/eguA9n4lHVkCc+M=; b=BiZKy1+ch/z1ZB8gLOB0U4gtwdWOMWvyM6423JS2lB95M3nqrBdWI8AmjX58Pt6YkOvegIjBDgVcANM14hgtoSR39XQoTan6sok8aXDDiuTBbDJptjtOJSpWFi4nXc6tvpCCWLfttpwp+GbTylo+K3ME3n0S+sp8smMLTC5/iEc3063hRJr+5CZm9qLyjmz+JOaV4Flwv+ikdNYGLtxPbvVt6qIJ+ADFXURXnVhYRTLuwmHupMZvSpUImF7b7FYD70ybIWb//CshmoUY72jR20OPvQLVfYLnJiVPS7CmeMIogMZCqvMv+iWMPaGqt+H8EcmwlHpwifD1eu4pgODCww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T6bDDOzqFTlkM2Q60CEGPKJd0jk/eguA9n4lHVkCc+M=; b=B9NGFFQdwHK7Uui/b5Kt9zx6sRif4p4OIdS5Uet4kEKR1BfcnZ3e7g8fEiHUTwGrPaZnzp4OP/nlzuja9jAJWT8lrq68vyX9Ide9Us762Q3eIaZrvzfl46yyLcRxGe47ZxxSY1zgIUkY3vg7YZoRLd07vcM7jgoHIt2rUXYHTfgyC0gxBGa7fAeSM6QmCQmROVO7VnakwxLfcNXW00ZSQYOvixa5+wXpsrNvGQVZXVC5f1SGeeaCHm4r7ZzQ9tfgo22iI/2UcoEydkovuQ+i1vu6dSpY3vus3/cTD/evPkwjyXRak8/CqFpsajQz6147VJEXUJB8ptY6fDsdGWCoPw== Received: from CH2PR15CA0009.namprd15.prod.outlook.com (2603:10b6:610:51::19) by SA3PR12MB9131.namprd12.prod.outlook.com (2603:10b6:806:395::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Sat, 22 Feb 2025 15:54:51 +0000 Received: from DS2PEPF0000343A.namprd02.prod.outlook.com (2603:10b6:610:51:cafe::4e) by CH2PR15CA0009.outlook.office365.com (2603:10b6:610:51::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Sat, 22 Feb 2025 15:54:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Sat, 22 Feb 2025 15:54:50 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 22 Feb 2025 07:54:38 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sat, 22 Feb 2025 07:54:38 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sat, 22 Feb 2025 07:54:37 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 14/14] iommu/arm-smmu-v3: Set MEV bit in nested STE for DoS mitigations Date: Sat, 22 Feb 2025 07:54:11 -0800 Message-ID: <2b088fe8d2c7e692426b0d1f58d4f2c12ecb907e.1740238876.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343A:EE_|SA3PR12MB9131:EE_ X-MS-Office365-Filtering-Correlation-Id: d62eb277-7878-4031-3ad7-08dd53593dd6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: ijEeJmY41RSf2/DQvpq8qGhaLVtxEjve1OXm4heuogP9Pbo4FdEgLQcx6nAQlZOYx/k2lB6RDHR2z55+oc+RTYW1FmjYYTfnvL8m4S4nnuJGIoSZeyMeUiYmjbru3F63jTYfRGfq2+bkv8o51OjyABrqMOmVHzbLvzQs+r/mmWp6FeU1UewhemsTlskjfK2SOpbQP2DH03A8ALjP+37ZV06bSrYhlV9Ygxa31QuURex7lbDPqcDjccMFrGbp49/mULWrgVWHq7K/SOKKDxaIsgoOyF8IBY6lFmWy2qFETyAoUPx2OMpjYQxTGATkxCobwYu2nTMSlN1SN+qZbiHDqv9I2jLnl2nYRQC7LcGzlbKvsicxvWnKflSfFUEa7yAjoKde6Cfe0R1MaBwp86zcvHe/u3TVK7zGhtU/KdB0w1nx4qJoRXbEzN91rsqeOxKPvEzvHH7WCRWUacTx1jYDQ0dGJa2GBliIOhXc1MEwRT5lsDaoivZDOI9u4O1k5bDa0hjdVxepWAshSQI8CNl6Y3thegxlKjECrwDxqYbL+KrYmdcWomd3lVvOsTy+9eVGHxLxFOOp3uiPBRYqi0Qv261+p3Ou8z2LSp8Sj8R93Up4O3+HoC1HvgfjzQlHzPmeQuR1pXWykSXkeOPvcOKSZMVVckCXP+m6yQd+YMp3ibGeu2wuDRPEm52CrIOR46xnRvPmi1eqnnTqCCReDajclzExeXPIW0+Ee1MRBwFqalYrdAvQ545L+T+aE/fjN6Vy12GhCwVrqqqEvayvyRBWx+elYG2qC9dBnVFIm6I+Rz4UftjAABa9wJZp2UFBKN8yZWkjAuWNf1C8v+JWY1P7MPhLSN0WKOl+V3gapiTrTeJrupbi+fGnJqezeqSqFsjOtH81iFDeMQ3JbmpoCmh/rj1f0csRXfzX7MVnJNTMZE8/mLxsFRg/Jo1H8ZznanWW0uGgq1kbYQuX89/Y9Q01TjIJWfHWYJhijPR/SFWiEJ0VgTtvo6cW+5bAMGRg4WzwFtxSINCbbonxDD+RkxN+LpI5uoVIld0jeuCqbUAXB+1VK7JwObKF4mnypu8soLpU7KhtO29ZT953HerKaGyA2I6vL/ID3bozInaaKrb/ky+TYN5LjbpBsXv/lukhgThFpz6LWwKZKoxIJ7QrfT5BBagIwNC/AusUVjexujL+apFNJzC9wDDZmF5CCCNDoRWsYGovB6rV9WLexL6llT2kdKUo5Q+DEwLAFEC4YIz0wJOcY5wi6sN/EI7Ff2hqLDgH7Qe88NQM1bPGH++lnAPLaqrPrMHmE9OxeG6qeOlGjVQiIv/8skA0svD+Jeh6jK3HstKn2XUoulZ26K3Q0ML+h+nk65z4d/KsLbPMkTjTOgZnzsD0kIfNfrkXeVK10tEbEZlQJcMGGhtbEAtoSM03VXgmp1CX96CFZD/aItIomV1jGLMNb2DzNPEu7V5YPkgILx/gnTMXhElnrUJtCcqRwkxakLUReAgtqjUNDWTVCCY= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 15:54:50.9716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d62eb277-7878-4031-3ad7-08dd53593dd6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9131 There is a DoS concern on the shared hardware event queue among devices passed through to VMs, that too many translation failures that belong to VMs could overflow the shared hardware event queue if those VMs or their VMMs don't handle/recover the devices properly. The MEV bit in the STE allows to configure the SMMU HW to merge similar event records, though there is no guarantee. Set it in a nested STE for DoS mitigations. In the future, we might want to enable the MEV for non-nested cases too such as domain->type == IOMMU_DOMAIN_UNMANAGED or even IOMMU_DOMAIN_DMA. Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 2 ++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index c8574969e700..a90e115d43bc 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -266,6 +266,7 @@ static inline u32 arm_smmu_strtab_l2_idx(u32 sid) #define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4) #define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) +#define STRTAB_STE_1_MEV (1UL << 19) #define STRTAB_STE_1_S2FWB (1UL << 25) #define STRTAB_STE_1_S1STALLD (1UL << 27) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c index 42c7daf4c8c7..4a2580b53b60 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c @@ -43,6 +43,8 @@ static void arm_smmu_make_nested_cd_table_ste( target->data[0] |= nested_domain->ste[0] & ~cpu_to_le64(STRTAB_STE_0_CFG); target->data[1] |= nested_domain->ste[1]; + /* Merge events for DoS mitigations on eventq */ + target->data[1] |= cpu_to_le64(STRTAB_STE_1_MEV); } /* diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index fdf8bba14303..0a0bc73fa287 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1052,7 +1052,7 @@ void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits) cpu_to_le64(STRTAB_STE_1_S1DSS | STRTAB_STE_1_S1CIR | STRTAB_STE_1_S1COR | STRTAB_STE_1_S1CSH | STRTAB_STE_1_S1STALLD | STRTAB_STE_1_STRW | - STRTAB_STE_1_EATS); + STRTAB_STE_1_EATS | STRTAB_STE_1_MEV); used_bits[2] |= cpu_to_le64(STRTAB_STE_2_S2VMID); /* @@ -1068,7 +1068,7 @@ void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits) if (cfg & BIT(1)) { used_bits[1] |= cpu_to_le64(STRTAB_STE_1_S2FWB | STRTAB_STE_1_EATS | - STRTAB_STE_1_SHCFG); + STRTAB_STE_1_SHCFG | STRTAB_STE_1_MEV); used_bits[2] |= cpu_to_le64(STRTAB_STE_2_S2VMID | STRTAB_STE_2_VTCR | STRTAB_STE_2_S2AA64 | STRTAB_STE_2_S2ENDI |