From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7A04EC8303D for ; Sat, 5 Jul 2025 01:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=30m8au6V9OAekCzf4Jfhm4oIKOya7STtwhrPVoNu1Js=; b=kDbf+V2TSMue2739g9BbKdpNjW o7ksqtkTzNH7btu4rpZZmCZZPvKZi2PkJnghx1xWCUwdKUupzFyEz98gjpamh2SleG9Sxg1RJTIz8 3qC5aorjt64JKoaUdt9OM5Vt4NzGSAQhFrgYnX0/CYTbaYZioIEe+7rfEo5iq9DDt0MSrKHX8/CfL XESINEOEjUIxEdB8cvS//VCBt3ILoE9glKyjigDpWp1Wspxdy0n/R0GEPr/luNpI3VSGKuL+S2l08 2NubBlXJqgcfVyN23cV/TUw02kt0qU2BFyLiHmVBgI6TjszpBg52A2smaHG0KrXcZbF16y5666n4x Q6sKU6Vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uXrfT-0000000FoIY-18W3; Sat, 05 Jul 2025 01:26:15 +0000 Received: from mail-bn8nam11on2061e.outbound.protection.outlook.com ([2a01:111:f403:2414::61e] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uXrTm-0000000FlLr-2rGi for linux-arm-kernel@lists.infradead.org; Sat, 05 Jul 2025 01:14:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u/FypPZp7LH3WSvRaQETOn7WUCj4ohSB0wmDm5Gs9fzTvtm/HQvSzpAw2+7n/7BRUmBAAUZpCro1cHYRx/cM1Z394sh9bgMPw9N0FPiOWOWHE65zYIe+fWlLnlVkij+BvwttanpCfN6PO/YCQpDgyvTAY/2sKNa9XaqE60tdWzENti5y57Or+/2dMGRSD/4HJtDPZ7k/hLye9b17FrZ9V4vvFZmLX9ofAXBbz1ZyP4xKMgA//onF8wcYtMKEXFd6We0LaJ6o/Ils4jkz9ODgN4d/KTKaUE+xzbmblq4fsnfriHdgoQE4mTed+vMv9SELkm93URzz61gAHuLRkK3UOA== 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=30m8au6V9OAekCzf4Jfhm4oIKOya7STtwhrPVoNu1Js=; b=FQyotPQW85lmwRGH+cjDrRnmn7zKqz9cjpO6T0NSzNijgEGdwhbJGNXBOCGGNgzVwkiEvUM8VuGjggwjtL08fjrXa3PwQRvgxwUQDFpt1/pqgq1KouKq3QuvdoEmkEZSExiIeWLDioqGO4wl9rdN8MnPqInAzz1A1M8tFv5Fv094JjRwgt/4fk7FwBjhEIV89Dq7pw/hF45idob9qUxyJ11y35GgYNJT49+Ue4ejyrknF+K9PfxcCuTz3qrxg2SS5dcIz/IGhbInpDvaZVvLY3y3Y7Ujzkm2HSzQN2WqQRH7RPaZd5oBOTgFP2gyGZo8dXkxHm/esNpoMSHZO8VIHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=amd.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=30m8au6V9OAekCzf4Jfhm4oIKOya7STtwhrPVoNu1Js=; b=P0c9galQTG5fxghp25W4iM4762ziXoMIXVyMG5BezcIL2Usu8BJDY9q1iheOKiQo+GgsFJ7gun4mF/2pAz4u+bWpxRhT9Ov0R2qGn5PF6cFRspENfUwsKS3c088oADQrbKKp5g7t7j/fQtuizzwfNO2essiazFwaArgJKcema3Ifw/tNjf6P+WJLH/lUdQr6nCU5K0s2OCG8SrEoxtFQXizbjhRtGN/OmkvNhyu/aANIcd0ckh+4X4IOQCxizOEOyjyRmMT15K/eBqjUBNjCuDihkCiM2GBrvFQvDAGEZ3ujgrspAw6uFUI5329x0BO9t25/FK70lqMC70vByBedfw== Received: from MN2PR15CA0062.namprd15.prod.outlook.com (2603:10b6:208:237::31) by CH1PPF2C6B99E0C.namprd12.prod.outlook.com (2603:10b6:61f:fc00::609) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.25; Sat, 5 Jul 2025 01:14:04 +0000 Received: from BL6PEPF0001AB4B.namprd04.prod.outlook.com (2603:10b6:208:237:cafe::1) by MN2PR15CA0062.outlook.office365.com (2603:10b6:208:237::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.23 via Frontend Transport; Sat, 5 Jul 2025 01:14:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BL6PEPF0001AB4B.mail.protection.outlook.com (10.167.242.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.15 via Frontend Transport; Sat, 5 Jul 2025 01:14:03 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 4 Jul 2025 18:14:00 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Fri, 4 Jul 2025 18:13:59 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Fri, 4 Jul 2025 18:13:58 -0700 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v8 03/29] iommufd/viommu: Explicitly define vdev->virt_id Date: Fri, 4 Jul 2025 18:13:19 -0700 Message-ID: <146f91d9e1974cfdbbed3418373645295ce0cca1.1751677708.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB4B:EE_|CH1PPF2C6B99E0C:EE_ X-MS-Office365-Filtering-Correlation-Id: 6331a2b6-e0f3-487f-1e65-08ddbb613b3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uxxLG7LpirPYhStZjSFb1dIzzXNlS4ynSM7AAr4/uzTLYJL12QzBadYFFgGR?= =?us-ascii?Q?yhSxze4XwAzM8xOGCKlbkiukPJJLb4Ul/jL3QMMpNB6D56v5pv6dO68ywBOX?= =?us-ascii?Q?hU9EpByn4ExZm+0/btr9cmlknWUp8p7oPVNU0eE1On26PzY1xoqKGXEA8tXZ?= =?us-ascii?Q?cYxvM7tJMuEOFVrli4imp4u7q4UEzkf6CDTbjFXiG2kKnPRN5HmCF/+ghjPf?= =?us-ascii?Q?jNBx6otyM48hALwlu3LBDEER0PyBdkRBJgLdH+I5vjAsFNhS45kT+XKNYdFD?= =?us-ascii?Q?gMHKaZPdyi3meC+hSl5yZuXJhUBOJcNQiwJtnT4BMyHjFUiyvlD3aomHx1Z0?= =?us-ascii?Q?BuD42tllMRjeUohqvro++31YnvbuNa1fAO9Di5og5ZIgD4IsHf9HlW5X271F?= =?us-ascii?Q?hwnBven4hNUFyDAYnHjO1PrDb8SRdvECM3JqoCgFwjYTO5KjHP+Np5Wv76xa?= =?us-ascii?Q?28phOzBBlrl4p6ojxLo3Vf9uI1F4ww36vNdUm0K4uzWBSoiZ9uLCtTYmIflt?= =?us-ascii?Q?4CfosK4olYCpUuW3XDiLDeOLIK82FHV+UqRkxl6QRMa9Fdjch9mRdDZNWE2n?= =?us-ascii?Q?pmAz1+MBl+gnxN1G9RyjlHcwgfoLisaq1ekAcVRhXRbv8i2011X1Tjt2wEW8?= =?us-ascii?Q?z8eTz6d1k9AzOwYB6XAp10vzf4rccwqWp14rkBJ3aFERXAaxa1Dye5R53qDE?= =?us-ascii?Q?IBd7k7b3zUJBKSa3l8nj1B2a7JBC6aYin2GyNa37VcEnoi3+6yaP3kmI+0tG?= =?us-ascii?Q?JhltmOwE5STDPfRlGqjP9hOZtzgVYD3JRub+Kh6FTsCkdYcZ88oB0wPQ25pa?= =?us-ascii?Q?sDS2ggBbOUrt4VVFDfkbIkYrjZZC9Myn4jy16Tpo+B2fnajxbHi7bYTph3dE?= =?us-ascii?Q?5fvYOSnXz88l8Ou6GaclLLGERrSD/5Xr0Wizmn7R7STnEx3FvIjDeLCcgbpu?= =?us-ascii?Q?0w26TrOugmkQHiXp5mIgEyF6X764mjjwkNkIuN5OjufziQOXJ6zolOWQM9zO?= =?us-ascii?Q?mYfeOBcbOnPTmqTFZe8/1VDbMtOA7nAuzvaP8+YIFGuYzmuhVS/lMOoab9nt?= =?us-ascii?Q?Lmb6OyVgtFx03R8AdjiBVBpgGHZOn1ipbUbQp79+zuIGIDh+KH8LN5RdyM3S?= =?us-ascii?Q?SvmDCVpzbCqQY0e2oevx4yqq4uyiK9W81kBnZlXNzywgbEI3tLGdAtbrxKul?= =?us-ascii?Q?gQ1MaS/XJRzS690vFRl63PaCwS/ZTHErY+PJl2fpBjdkF2A/qBOF4ATzOSvc?= =?us-ascii?Q?2Ed7El/q2u1v38y9LvXsxv8Xo+DUODuIg9FD0rEI9vpOzBsOE2Duh0IeRICK?= =?us-ascii?Q?0bSa4OtqzqkjvY6baglvnejd54ZoZa1YZetNGeZgqiFuQS8EAdfjESknj4cp?= =?us-ascii?Q?zoTJsQ6GZbccShYi653iN8tZDtAjLM3gQY59zMD9Wl/3SrFrHGN4drvsFx+N?= =?us-ascii?Q?n6TCKly0IjzvT8xyLMgLSxiUD777NT3hEl7yLus5igbIET4LXu4Edc4Xn40R?= =?us-ascii?Q?rx4TwP0KAqpgDB5zlorbC//UnQQKudw8w7K8?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2025 01:14:03.4859 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6331a2b6-e0f3-487f-1e65-08ddbb613b3e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB4B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PPF2C6B99E0C X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250704_181410_738048_A6932ACD X-CRM114-Status: GOOD ( 12.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The "id" is too genernal to get its meaning easily. Rename it explicitly to "virt_id" and update the kdocs for readability. No functional changes. Reviewed-by: Kevin Tian Reviewed-by: Pranjal Shrivastava Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/iommufd_private.h | 7 ++++++- drivers/iommu/iommufd/driver.c | 2 +- drivers/iommu/iommufd/viommu.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h index 4f5e8cd99c96..320635a177b7 100644 --- a/drivers/iommu/iommufd/iommufd_private.h +++ b/drivers/iommu/iommufd/iommufd_private.h @@ -634,7 +634,12 @@ struct iommufd_vdevice { struct iommufd_object obj; struct iommufd_viommu *viommu; struct device *dev; - u64 id; /* per-vIOMMU virtual ID */ + + /* + * Virtual device ID per vIOMMU, e.g. vSID of ARM SMMUv3, vDeviceID of + * AMD IOMMU, and vRID of Intel VT-d + */ + u64 virt_id; }; #ifdef CONFIG_IOMMUFD_TEST diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c index 2fee399a148e..887719016804 100644 --- a/drivers/iommu/iommufd/driver.c +++ b/drivers/iommu/iommufd/driver.c @@ -30,7 +30,7 @@ int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, xa_lock(&viommu->vdevs); xa_for_each(&viommu->vdevs, index, vdev) { if (vdev->dev == dev) { - *vdev_id = vdev->id; + *vdev_id = vdev->virt_id; rc = 0; break; } diff --git a/drivers/iommu/iommufd/viommu.c b/drivers/iommu/iommufd/viommu.c index 25ac08fbb52a..bc8796e6684e 100644 --- a/drivers/iommu/iommufd/viommu.c +++ b/drivers/iommu/iommufd/viommu.c @@ -111,7 +111,7 @@ void iommufd_vdevice_destroy(struct iommufd_object *obj) struct iommufd_viommu *viommu = vdev->viommu; /* xa_cmpxchg is okay to fail if alloc failed xa_cmpxchg previously */ - xa_cmpxchg(&viommu->vdevs, vdev->id, vdev, NULL, GFP_KERNEL); + xa_cmpxchg(&viommu->vdevs, vdev->virt_id, vdev, NULL, GFP_KERNEL); refcount_dec(&viommu->obj.users); put_device(vdev->dev); } @@ -150,7 +150,7 @@ int iommufd_vdevice_alloc_ioctl(struct iommufd_ucmd *ucmd) goto out_put_idev; } - vdev->id = virt_id; + vdev->virt_id = virt_id; vdev->dev = idev->dev; get_device(idev->dev); vdev->viommu = viommu; -- 2.43.0