From patchwork Fri Nov 8 12:17:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13868107 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADEB21E7C0B for ; Fri, 8 Nov 2024 12:17:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068271; cv=none; b=rgfbqz8G+6tJuD7F9wFDuoH5uf7t6GnskIfIPbvILAyHVgJhTnM0yxnqULMkDQ4RpNqV1f3p4ACK30BxPT9aNb7F/BJGKbRHzVImhpZkr076YVhsPj7k/7OU6s0rX7LZIZF1o9nAoEnbS0N0GwKVweiA0KZKy7exnE0FTJDkcXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068271; c=relaxed/simple; bh=DPzSxv9vMP7mIpXdsVlzuxzRhKS8p8nA3AZc3wGiDlM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e8pdtU82tdERX//qSvVAK8gKrzzTxZP/w2hXdUddxVUPc3XYx1YtpXVxxrSAcq/sqY9eL0ivpYG6looQaekCH6FNG+VoL87PY+G7+T8lwAna9EUHvwkseEmQZLAPNQtWzXAMojYuz5w8jwuNVq4+/3/78XdFmgjFOGnaEeR0L2g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GHb9wERE; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GHb9wERE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731068269; x=1762604269; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DPzSxv9vMP7mIpXdsVlzuxzRhKS8p8nA3AZc3wGiDlM=; b=GHb9wEREeYO17pskZLu8Xq5SPD/RB1u0AtqX4SeYfl1GOVRXuoi5R4zd 9Abpn/purZ8wQDZY/gmiarAixDpSFaABVI+QZhDtQqtXeLtS3BISE+UGn ZJLtdr941dHW76DnKkLRozm/feK+b6xwkuJA1at8gGwB9nkxn0lXPRDRD 4w/8ctJj/qGhNPkU8IcpfjcyCUlYQXRkupT/cnaMG0j1MxtD0Smjkf+YN MF3QxPoC58ELzAy/z/Tt31QkeX45G5hffy5p9JUvTAPmS29lElY0FQtz7 SPCTj1ekGQWwQgBg7APWh2YSGg9zpRV7JHT+sS1gt+ij9cI0r3PjEul0e Q==; X-CSE-ConnectionGUID: DJZB4VurQciMbJFEUPZARA== X-CSE-MsgGUID: hEUUociwRU+YVEd6QdNY0Q== X-IronPort-AV: E=McAfee;i="6700,10204,11249"; a="41560810" X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="41560810" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2024 04:17:48 -0800 X-CSE-ConnectionGUID: 4klG1wyfTnuqsgts1fGY5g== X-CSE-MsgGUID: RlntINaeTMmT9ko6SrMurw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="85865442" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa010.fm.intel.com with ESMTP; 08 Nov 2024 04:17:47 -0800 From: Yi Liu To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: joro@8bytes.org, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org, Matthew Wilcox Subject: [PATCH v5 1/5] ida: Add ida_find_first_range() Date: Fri, 8 Nov 2024 04:17:38 -0800 Message-Id: <20241108121742.18889-2-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108121742.18889-1-yi.l.liu@intel.com> References: <20241108121742.18889-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There is no helpers for user to check if a given ID is allocated or not, neither a helper to loop all the allocated IDs in an IDA and do something for cleanup. With the two needs, a helper to get the lowest allocated ID of a range and two variants based on it. Caller can check if a given ID is allocated or not by: bool ida_exists(struct ida *ida, unsigned int id) Caller can iterate all allocated IDs by: int id; while ((id = ida_find_first(&pasid_ida)) >= 0) { //anything to do with the allocated ID ida_free(pasid_ida, pasid); } Cc: Matthew Wilcox (Oracle) Suggested-by: Jason Gunthorpe Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Acked-by: Matthew Wilcox (Oracle) Signed-off-by: Yi Liu --- include/linux/idr.h | 11 +++++++ lib/idr.c | 67 +++++++++++++++++++++++++++++++++++++++++++ lib/test_ida.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) diff --git a/include/linux/idr.h b/include/linux/idr.h index da5f5fa4a3a6..718f9b1b91af 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h @@ -257,6 +257,7 @@ struct ida { int ida_alloc_range(struct ida *, unsigned int min, unsigned int max, gfp_t); void ida_free(struct ida *, unsigned int id); void ida_destroy(struct ida *ida); +int ida_find_first_range(struct ida *ida, unsigned int min, unsigned int max); /** * ida_alloc() - Allocate an unused ID. @@ -328,4 +329,14 @@ static inline bool ida_is_empty(const struct ida *ida) { return xa_empty(&ida->xa); } + +static inline bool ida_exists(struct ida *ida, unsigned int id) +{ + return ida_find_first_range(ida, id, id) == id; +} + +static inline int ida_find_first(struct ida *ida) +{ + return ida_find_first_range(ida, 0, ~0); +} #endif /* __IDR_H__ */ diff --git a/lib/idr.c b/lib/idr.c index da36054c3ca0..e2adc457abb4 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -476,6 +476,73 @@ int ida_alloc_range(struct ida *ida, unsigned int min, unsigned int max, } EXPORT_SYMBOL(ida_alloc_range); +/** + * ida_find_first_range - Get the lowest used ID. + * @ida: IDA handle. + * @min: Lowest ID to get. + * @max: Highest ID to get. + * + * Get the lowest used ID between @min and @max, inclusive. The returned + * ID will not exceed %INT_MAX, even if @max is larger. + * + * Context: Any context. Takes and releases the xa_lock. + * Return: The lowest used ID, or errno if no used ID is found. + */ +int ida_find_first_range(struct ida *ida, unsigned int min, unsigned int max) +{ + unsigned long index = min / IDA_BITMAP_BITS; + unsigned int offset = min % IDA_BITMAP_BITS; + unsigned long *addr, size, bit; + unsigned long tmp = 0; + unsigned long flags; + void *entry; + int ret; + + if ((int)min < 0) + return -EINVAL; + if ((int)max < 0) + max = INT_MAX; + + xa_lock_irqsave(&ida->xa, flags); + + entry = xa_find(&ida->xa, &index, max / IDA_BITMAP_BITS, XA_PRESENT); + if (!entry) { + ret = -ENOENT; + goto err_unlock; + } + + if (index > min / IDA_BITMAP_BITS) + offset = 0; + if (index * IDA_BITMAP_BITS + offset > max) { + ret = -ENOENT; + goto err_unlock; + } + + if (xa_is_value(entry)) { + tmp = xa_to_value(entry); + addr = &tmp; + size = BITS_PER_XA_VALUE; + } else { + addr = ((struct ida_bitmap *)entry)->bitmap; + size = IDA_BITMAP_BITS; + } + + bit = find_next_bit(addr, size, offset); + + xa_unlock_irqrestore(&ida->xa, flags); + + if (bit == size || + index * IDA_BITMAP_BITS + bit > max) + return -ENOENT; + + return index * IDA_BITMAP_BITS + bit; + +err_unlock: + xa_unlock_irqrestore(&ida->xa, flags); + return ret; +} +EXPORT_SYMBOL(ida_find_first_range); + /** * ida_free() - Release an allocated ID. * @ida: IDA handle. diff --git a/lib/test_ida.c b/lib/test_ida.c index c80155a1956d..63078f8dc13f 100644 --- a/lib/test_ida.c +++ b/lib/test_ida.c @@ -189,6 +189,75 @@ static void ida_check_bad_free(struct ida *ida) IDA_BUG_ON(ida, !ida_is_empty(ida)); } +/* + * Check ida_find_first_range() and varriants. + */ +static void ida_check_find_first(struct ida *ida) +{ + /* IDA is empty; all of the below should be not exist */ + IDA_BUG_ON(ida, ida_exists(ida, 0)); + IDA_BUG_ON(ida, ida_exists(ida, 3)); + IDA_BUG_ON(ida, ida_exists(ida, 63)); + IDA_BUG_ON(ida, ida_exists(ida, 1023)); + IDA_BUG_ON(ida, ida_exists(ida, (1 << 20) - 1)); + + /* IDA contains a single value entry */ + IDA_BUG_ON(ida, ida_alloc_min(ida, 3, GFP_KERNEL) != 3); + IDA_BUG_ON(ida, ida_exists(ida, 0)); + IDA_BUG_ON(ida, !ida_exists(ida, 3)); + IDA_BUG_ON(ida, ida_exists(ida, 63)); + IDA_BUG_ON(ida, ida_exists(ida, 1023)); + IDA_BUG_ON(ida, ida_exists(ida, (1 << 20) - 1)); + + IDA_BUG_ON(ida, ida_alloc_min(ida, 63, GFP_KERNEL) != 63); + IDA_BUG_ON(ida, ida_exists(ida, 0)); + IDA_BUG_ON(ida, !ida_exists(ida, 3)); + IDA_BUG_ON(ida, !ida_exists(ida, 63)); + IDA_BUG_ON(ida, ida_exists(ida, 1023)); + IDA_BUG_ON(ida, ida_exists(ida, (1 << 20) - 1)); + + /* IDA contains a single bitmap */ + IDA_BUG_ON(ida, ida_alloc_min(ida, 1023, GFP_KERNEL) != 1023); + IDA_BUG_ON(ida, ida_exists(ida, 0)); + IDA_BUG_ON(ida, !ida_exists(ida, 3)); + IDA_BUG_ON(ida, !ida_exists(ida, 63)); + IDA_BUG_ON(ida, !ida_exists(ida, 1023)); + IDA_BUG_ON(ida, ida_exists(ida, (1 << 20) - 1)); + + /* IDA contains a tree */ + IDA_BUG_ON(ida, ida_alloc_min(ida, (1 << 20) - 1, GFP_KERNEL) != (1 << 20) - 1); + IDA_BUG_ON(ida, ida_exists(ida, 0)); + IDA_BUG_ON(ida, !ida_exists(ida, 3)); + IDA_BUG_ON(ida, !ida_exists(ida, 63)); + IDA_BUG_ON(ida, !ida_exists(ida, 1023)); + IDA_BUG_ON(ida, !ida_exists(ida, (1 << 20) - 1)); + + /* Now try to find first */ + IDA_BUG_ON(ida, ida_find_first(ida) != 3); + IDA_BUG_ON(ida, ida_find_first_range(ida, -1, 2) != -EINVAL); + IDA_BUG_ON(ida, ida_find_first_range(ida, 0, 2) != -ENOENT); // no used ID + IDA_BUG_ON(ida, ida_find_first_range(ida, 0, 3) != 3); + IDA_BUG_ON(ida, ida_find_first_range(ida, 1, 3) != 3); + IDA_BUG_ON(ida, ida_find_first_range(ida, 3, 3) != 3); + IDA_BUG_ON(ida, ida_find_first_range(ida, 2, 4) != 3); + IDA_BUG_ON(ida, ida_find_first_range(ida, 4, 3) != -ENOENT); // min > max, fail + IDA_BUG_ON(ida, ida_find_first_range(ida, 4, 60) != -ENOENT); // no used ID + IDA_BUG_ON(ida, ida_find_first_range(ida, 4, 64) != 63); + IDA_BUG_ON(ida, ida_find_first_range(ida, 63, 63) != 63); + IDA_BUG_ON(ida, ida_find_first_range(ida, 64, 1026) != 1023); + IDA_BUG_ON(ida, ida_find_first_range(ida, 1023, 1023) != 1023); + IDA_BUG_ON(ida, ida_find_first_range(ida, 1023, (1 << 20) - 1) != 1023); + IDA_BUG_ON(ida, ida_find_first_range(ida, 1024, (1 << 20) - 1) != (1 << 20) - 1); + IDA_BUG_ON(ida, ida_find_first_range(ida, (1 << 20), INT_MAX) != -ENOENT); + + ida_free(ida, 3); + ida_free(ida, 63); + ida_free(ida, 1023); + ida_free(ida, (1 << 20) - 1); + + IDA_BUG_ON(ida, !ida_is_empty(ida)); +} + static DEFINE_IDA(ida); static int ida_checks(void) @@ -202,6 +271,7 @@ static int ida_checks(void) ida_check_max(&ida); ida_check_conv(&ida); ida_check_bad_free(&ida); + ida_check_find_first(&ida); printk("IDA: %u of %u tests passed\n", tests_passed, tests_run); return (tests_run != tests_passed) ? 0 : -EINVAL; From patchwork Fri Nov 8 12:17:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13868108 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D4031E7C13 for ; Fri, 8 Nov 2024 12:17:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068271; cv=none; b=rb23nsHT3LootBSUmsIc3zyTN+hW09X0NgCZ3vbvEidAU3m+N9SsUiX2L9VYibXTE26kw9adN1dvwcbJ2epFfa1AX/WuAjdR4KqNc5qZf231BNLGjtpl+V/VpPl3TrUoimSrH36/DrvCf/15iKZPQg1CmjHGHGU9tjnzgk8L2X4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068271; c=relaxed/simple; bh=0AE17RqoKgAiRcTE9GKa3HBCcyLWgeaREVzR/lJSCLg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=guP4cAC8SAnAYot7LGTK3+NmctOJdsmNn+vO1hIGEVs7M8VZLEXue0h39jih9mIMngkGo1Zae5Rah/vBvZ/FfOzORqCf5MZAp61rrnPiaONWzOjNFDjCGWGCiW49a5biQi/WVqXJytOjvqEBjtQhdRPXqXmOZAlo6iIOoIP4m70= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=W3rVPHA6; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W3rVPHA6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731068270; x=1762604270; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0AE17RqoKgAiRcTE9GKa3HBCcyLWgeaREVzR/lJSCLg=; b=W3rVPHA6MXoSrIVnBiNh1k4BIcCnLW0zV0q+rmeZg5QPrbPJH273gTrg k3lhocPYkEJR4+9f+jZlxmH6oewToAWrShYpxXtR4z0rmQKfs5Esg9IzX 4+8zEIb69tiUaBC4ZJkgS0REKs5PZsZWqbWs0QbFoZDKnewVkWAWO/OmR oUbA/69hHbDHg9y5YJmmNEtCJaryFAleSpIkVTQO7f9b9YUz5BMJxVIvP IuJ1tf0sb6PB5KPFZsWjw3VFcbECW9GYFpolrMLPmjHi47FzRGMOSX5GP E20V9CRO7Le/9nXD00geaY6L+XZ0mea7eM/CT8JrHBzRwclIgLUZ2nm4O g==; X-CSE-ConnectionGUID: at3o/fOnTfu3sS4rmvcPcw== X-CSE-MsgGUID: lyMz4IsSR5itk/fNDkf3nA== X-IronPort-AV: E=McAfee;i="6700,10204,11249"; a="41560820" X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="41560820" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2024 04:17:48 -0800 X-CSE-ConnectionGUID: Su5J+SG3TrWJ5kTCl0Ve/w== X-CSE-MsgGUID: 5hjKFy75RrygqtuO2Ya7kA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="85865447" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa010.fm.intel.com with ESMTP; 08 Nov 2024 04:17:48 -0800 From: Yi Liu To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: joro@8bytes.org, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org Subject: [PATCH v5 2/5] vfio-iommufd: Support pasid [at|de]tach for physical VFIO devices Date: Fri, 8 Nov 2024 04:17:39 -0800 Message-Id: <20241108121742.18889-3-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108121742.18889-1-yi.l.liu@intel.com> References: <20241108121742.18889-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This adds pasid_at|de]tach_ioas ops for attaching hwpt to pasid of a device and the helpers for it. For now, only vfio-pci supports pasid attach/detach. Signed-off-by: Kevin Tian Reviewed-by: Jason Gunthorpe Signed-off-by: Yi Liu --- drivers/vfio/iommufd.c | 50 +++++++++++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci.c | 2 ++ include/linux/vfio.h | 11 ++++++++ 3 files changed, 63 insertions(+) diff --git a/drivers/vfio/iommufd.c b/drivers/vfio/iommufd.c index 82eba6966fa5..039c0157ac1c 100644 --- a/drivers/vfio/iommufd.c +++ b/drivers/vfio/iommufd.c @@ -119,14 +119,22 @@ int vfio_iommufd_physical_bind(struct vfio_device *vdev, if (IS_ERR(idev)) return PTR_ERR(idev); vdev->iommufd_device = idev; + ida_init(&vdev->pasids); return 0; } EXPORT_SYMBOL_GPL(vfio_iommufd_physical_bind); void vfio_iommufd_physical_unbind(struct vfio_device *vdev) { + int pasid; + lockdep_assert_held(&vdev->dev_set->lock); + while ((pasid = ida_find_first(&vdev->pasids)) >= 0) { + iommufd_device_pasid_detach(vdev->iommufd_device, pasid); + ida_free(&vdev->pasids, pasid); + } + if (vdev->iommufd_attached) { iommufd_device_detach(vdev->iommufd_device); vdev->iommufd_attached = false; @@ -168,6 +176,48 @@ void vfio_iommufd_physical_detach_ioas(struct vfio_device *vdev) } EXPORT_SYMBOL_GPL(vfio_iommufd_physical_detach_ioas); +int vfio_iommufd_physical_pasid_attach_ioas(struct vfio_device *vdev, + u32 pasid, u32 *pt_id) +{ + int rc; + + lockdep_assert_held(&vdev->dev_set->lock); + + if (WARN_ON(!vdev->iommufd_device)) + return -EINVAL; + + if (ida_exists(&vdev->pasids, pasid)) + return iommufd_device_pasid_replace(vdev->iommufd_device, + pasid, pt_id); + + rc = ida_alloc_range(&vdev->pasids, pasid, pasid, GFP_KERNEL); + if (rc < 0) + return rc; + + rc = iommufd_device_pasid_attach(vdev->iommufd_device, pasid, pt_id); + if (rc) + ida_free(&vdev->pasids, pasid); + + return rc; +} +EXPORT_SYMBOL_GPL(vfio_iommufd_physical_pasid_attach_ioas); + +void vfio_iommufd_physical_pasid_detach_ioas(struct vfio_device *vdev, + u32 pasid) +{ + lockdep_assert_held(&vdev->dev_set->lock); + + if (WARN_ON(!vdev->iommufd_device)) + return; + + if (!ida_exists(&vdev->pasids, pasid)) + return; + + iommufd_device_pasid_detach(vdev->iommufd_device, pasid); + ida_free(&vdev->pasids, pasid); +} +EXPORT_SYMBOL_GPL(vfio_iommufd_physical_pasid_detach_ioas); + /* * The emulated standard ops mean that vfio_device is going to use the * "mdev path" and will call vfio_pin_pages()/vfio_dma_rw(). Drivers using this diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index e727941f589d..6f7ae7e5b7b0 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -144,6 +144,8 @@ static const struct vfio_device_ops vfio_pci_ops = { .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas, .detach_ioas = vfio_iommufd_physical_detach_ioas, + .pasid_attach_ioas = vfio_iommufd_physical_pasid_attach_ioas, + .pasid_detach_ioas = vfio_iommufd_physical_pasid_detach_ioas, }; static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 000a6cab2d31..11b3b453752e 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -67,6 +67,7 @@ struct vfio_device { struct inode *inode; #if IS_ENABLED(CONFIG_IOMMUFD) struct iommufd_device *iommufd_device; + struct ida pasids; u8 iommufd_attached:1; #endif u8 cdev_opened:1; @@ -91,6 +92,8 @@ struct vfio_device { * bound iommufd. Undo in unbind_iommufd if @detach_ioas is not * called. * @detach_ioas: Opposite of attach_ioas + * @pasid_attach_ioas: The pasid variation of attach_ioas + * @pasid_detach_ioas: Opposite of pasid_attach_ioas * @open_device: Called when the first file descriptor is opened for this device * @close_device: Opposite of open_device * @read: Perform read(2) on device file descriptor @@ -115,6 +118,8 @@ struct vfio_device_ops { void (*unbind_iommufd)(struct vfio_device *vdev); int (*attach_ioas)(struct vfio_device *vdev, u32 *pt_id); void (*detach_ioas)(struct vfio_device *vdev); + int (*pasid_attach_ioas)(struct vfio_device *vdev, u32 pasid, u32 *pt_id); + void (*pasid_detach_ioas)(struct vfio_device *vdev, u32 pasid); int (*open_device)(struct vfio_device *vdev); void (*close_device)(struct vfio_device *vdev); ssize_t (*read)(struct vfio_device *vdev, char __user *buf, @@ -139,6 +144,8 @@ int vfio_iommufd_physical_bind(struct vfio_device *vdev, void vfio_iommufd_physical_unbind(struct vfio_device *vdev); int vfio_iommufd_physical_attach_ioas(struct vfio_device *vdev, u32 *pt_id); void vfio_iommufd_physical_detach_ioas(struct vfio_device *vdev); +int vfio_iommufd_physical_pasid_attach_ioas(struct vfio_device *vdev, u32 pasid, u32 *pt_id); +void vfio_iommufd_physical_pasid_detach_ioas(struct vfio_device *vdev, u32 pasid); int vfio_iommufd_emulated_bind(struct vfio_device *vdev, struct iommufd_ctx *ictx, u32 *out_device_id); void vfio_iommufd_emulated_unbind(struct vfio_device *vdev); @@ -166,6 +173,10 @@ vfio_iommufd_get_dev_id(struct vfio_device *vdev, struct iommufd_ctx *ictx) ((int (*)(struct vfio_device *vdev, u32 *pt_id)) NULL) #define vfio_iommufd_physical_detach_ioas \ ((void (*)(struct vfio_device *vdev)) NULL) +#define vfio_iommufd_physical_pasid_attach_ioas \ + ((int (*)(struct vfio_device *vdev, u32 pasid, u32 *pt_id)) NULL) +#define vfio_iommufd_physical_pasid_detach_ioas \ + ((void (*)(struct vfio_device *vdev, u32 pasid)) NULL) #define vfio_iommufd_emulated_bind \ ((int (*)(struct vfio_device *vdev, struct iommufd_ctx *ictx, \ u32 *out_device_id)) NULL) From patchwork Fri Nov 8 12:17:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13868109 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B7201E7648 for ; Fri, 8 Nov 2024 12:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068273; cv=none; b=KdCenaXY8Lbqena6c4gb5stYAg57vZAUb56hCNQ/n2L7bAchP5jfcRVtKwTQE13d7COTIdcBIeziuJMCH5pCv86pwpKcmHccELKtp3gguGEdODoI99IloAI9QqczUFI1upTbwwIrCZaUU4oyuNnU2FiVVtlI6M88cqRkmPKXb54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068273; c=relaxed/simple; bh=cTLLqq2ykU/HGdHB6WcOnjF2xGCXptzhaEq48UUFTBA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GFr8Hp4Z3hMwEtL6XUdMh0EWpT/4DUFw+I6hYN8CGmacpAt2JOD4cNta5w1Zzn9nK4kvW5PiJ+9uitzr7DrVf5KFAYqWHkCcaB5m79YiDta3TLqeCzgPO/O5bXanQW0TyrnvgdnnOcoWxiAjkhTGoLcEurLvALilCAOy9SOyu0c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=I/uygt5f; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="I/uygt5f" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731068271; x=1762604271; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cTLLqq2ykU/HGdHB6WcOnjF2xGCXptzhaEq48UUFTBA=; b=I/uygt5fn+ftOAYsLK/fiTy20ivOrKz/TqQF3e0iahAORD5TK57mF6ky 31wTHxQWnFOuqk5q3rTH3UlOVBZprBk+SVB3+ELEuK/DfMPg31VNvtpk0 4AA6e8vQKIPtcxHZKnVLVU6h28Bq9eIal1wMkb3KsXZVdar7Y4zreU/c6 /7oviALEQD7EjI/hNuwdxBFOuEjX67gSE0u+O0BSVZeAkugXd4DxCDUB/ Qx/UgucPm0s1o69GqdDCe0Ley6MQzkrrUFo5m6sv/uigbtq1SMc0D9oEa KJd6xIwJehMZp4He+EmHll2wxcjwP41H8Qu9uTEkoZzPKuu8DO5pv4Olw A==; X-CSE-ConnectionGUID: hZYr8JxnSi+2WiciGiLY3Q== X-CSE-MsgGUID: wWjxgMI/QZ+AqQ/xjl0fyQ== X-IronPort-AV: E=McAfee;i="6700,10204,11249"; a="41560827" X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="41560827" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2024 04:17:49 -0800 X-CSE-ConnectionGUID: Wu0vrP9zQjWuu1Z71XJK0A== X-CSE-MsgGUID: +jKBSp0GQByhH/dFnqd8eg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="85865452" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa010.fm.intel.com with ESMTP; 08 Nov 2024 04:17:48 -0800 From: Yi Liu To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: joro@8bytes.org, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org Subject: [PATCH v5 3/5] vfio: VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT support pasid Date: Fri, 8 Nov 2024 04:17:40 -0800 Message-Id: <20241108121742.18889-4-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108121742.18889-1-yi.l.liu@intel.com> References: <20241108121742.18889-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This extends the VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT ioctls to attach/detach a given pasid of a vfio device to/from an IOAS/HWPT. Signed-off-by: Yi Liu --- drivers/vfio/device_cdev.c | 69 +++++++++++++++++++++++++++++++++----- include/uapi/linux/vfio.h | 29 ++++++++++------ 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c index bb1817bd4ff3..4519f482e212 100644 --- a/drivers/vfio/device_cdev.c +++ b/drivers/vfio/device_cdev.c @@ -162,9 +162,9 @@ void vfio_df_unbind_iommufd(struct vfio_device_file *df) int vfio_df_ioctl_attach_pt(struct vfio_device_file *df, struct vfio_device_attach_iommufd_pt __user *arg) { - struct vfio_device *device = df->device; struct vfio_device_attach_iommufd_pt attach; - unsigned long minsz; + struct vfio_device *device = df->device; + unsigned long minsz, xend = 0; int ret; minsz = offsetofend(struct vfio_device_attach_iommufd_pt, pt_id); @@ -172,11 +172,38 @@ int vfio_df_ioctl_attach_pt(struct vfio_device_file *df, if (copy_from_user(&attach, arg, minsz)) return -EFAULT; - if (attach.argsz < minsz || attach.flags) + if (attach.argsz < minsz) return -EINVAL; + if (attach.flags & (~VFIO_DEVICE_ATTACH_PASID)) + return -EINVAL; + + if (attach.flags & VFIO_DEVICE_ATTACH_PASID) + xend = offsetofend(struct vfio_device_attach_iommufd_pt, pasid); + + /* + * xend may be equal to minsz if a flag is defined for reusing a + * reserved field or a special usage of an existing field. + */ + if (xend > minsz) { + if (attach.argsz < xend) + return -EINVAL; + + if (copy_from_user((void *)&attach + minsz, + (void __user *)arg + minsz, xend - minsz)) + return -EFAULT; + } + + if ((attach.flags & VFIO_DEVICE_ATTACH_PASID) && + !device->ops->pasid_attach_ioas) + return -EOPNOTSUPP; + mutex_lock(&device->dev_set->lock); - ret = device->ops->attach_ioas(device, &attach.pt_id); + if (attach.flags & VFIO_DEVICE_ATTACH_PASID) + ret = device->ops->pasid_attach_ioas(device, attach.pasid, + &attach.pt_id); + else + ret = device->ops->attach_ioas(device, &attach.pt_id); if (ret) goto out_unlock; @@ -198,20 +225,46 @@ int vfio_df_ioctl_attach_pt(struct vfio_device_file *df, int vfio_df_ioctl_detach_pt(struct vfio_device_file *df, struct vfio_device_detach_iommufd_pt __user *arg) { - struct vfio_device *device = df->device; struct vfio_device_detach_iommufd_pt detach; - unsigned long minsz; + struct vfio_device *device = df->device; + unsigned long minsz, xend = 0; minsz = offsetofend(struct vfio_device_detach_iommufd_pt, flags); if (copy_from_user(&detach, arg, minsz)) return -EFAULT; - if (detach.argsz < minsz || detach.flags) + if (detach.argsz < minsz) + return -EINVAL; + + if (detach.flags & (~VFIO_DEVICE_DETACH_PASID)) return -EINVAL; + if (detach.flags & VFIO_DEVICE_DETACH_PASID) + xend = offsetofend(struct vfio_device_detach_iommufd_pt, pasid); + + /* + * xend may be equal to minsz if a flag is defined for reusing a + * reserved field or a special usage of an existing field. + */ + if (xend > minsz) { + if (detach.argsz < xend) + return -EINVAL; + + if (copy_from_user((void *)&detach + minsz, + (void __user *)arg + minsz, xend - minsz)) + return -EFAULT; + } + + if ((detach.flags & VFIO_DEVICE_DETACH_PASID) && + !device->ops->pasid_detach_ioas) + return -EOPNOTSUPP; + mutex_lock(&device->dev_set->lock); - device->ops->detach_ioas(device); + if (detach.flags & VFIO_DEVICE_DETACH_PASID) + device->ops->pasid_detach_ioas(device, detach.pasid); + else + device->ops->detach_ioas(device); mutex_unlock(&device->dev_set->lock); return 0; diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index c8dbf8219c4f..6899da70b929 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -931,29 +931,34 @@ struct vfio_device_bind_iommufd { * VFIO_DEVICE_ATTACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 19, * struct vfio_device_attach_iommufd_pt) * @argsz: User filled size of this data. - * @flags: Must be 0. + * @flags: Flags for attach. * @pt_id: Input the target id which can represent an ioas or a hwpt * allocated via iommufd subsystem. * Output the input ioas id or the attached hwpt id which could * be the specified hwpt itself or a hwpt automatically created * for the specified ioas by kernel during the attachment. + * @pasid: The pasid to be attached, only meaningful when + * VFIO_DEVICE_ATTACH_PASID is set in @flags * * Associate the device with an address space within the bound iommufd. * Undo by VFIO_DEVICE_DETACH_IOMMUFD_PT or device fd close. This is only * allowed on cdev fds. * - * If a vfio device is currently attached to a valid hw_pagetable, without doing - * a VFIO_DEVICE_DETACH_IOMMUFD_PT, a second VFIO_DEVICE_ATTACH_IOMMUFD_PT ioctl - * passing in another hw_pagetable (hwpt) id is allowed. This action, also known - * as a hw_pagetable replacement, will replace the device's currently attached - * hw_pagetable with a new hw_pagetable corresponding to the given pt_id. + * If a vfio device or a pasid of this device is currently attached to a valid + * hw_pagetable (hwpt), without doing a VFIO_DEVICE_DETACH_IOMMUFD_PT, a second + * VFIO_DEVICE_ATTACH_IOMMUFD_PT ioctl passing in another hwpt id is allowed. + * This action, also known as a hw_pagetable replacement, will replace the + * currently attached hwpt of the device or the pasid of this device with a new + * hwpt corresponding to the given pt_id. * * Return: 0 on success, -errno on failure. */ struct vfio_device_attach_iommufd_pt { __u32 argsz; __u32 flags; +#define VFIO_DEVICE_ATTACH_PASID (1 << 0) __u32 pt_id; + __u32 pasid; }; #define VFIO_DEVICE_ATTACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 19) @@ -962,17 +967,21 @@ struct vfio_device_attach_iommufd_pt { * VFIO_DEVICE_DETACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 20, * struct vfio_device_detach_iommufd_pt) * @argsz: User filled size of this data. - * @flags: Must be 0. + * @flags: Flags for detach. + * @pasid: The pasid to be detached, only meaningful when + * VFIO_DEVICE_DETACH_PASID is set in @flags * - * Remove the association of the device and its current associated address - * space. After it, the device should be in a blocking DMA state. This is only - * allowed on cdev fds. + * Remove the association of the device or a pasid of the device and its current + * associated address space. After it, the device or the pasid should be in a + * blocking DMA state. This is only allowed on cdev fds. * * Return: 0 on success, -errno on failure. */ struct vfio_device_detach_iommufd_pt { __u32 argsz; __u32 flags; +#define VFIO_DEVICE_DETACH_PASID (1 << 0) + __u32 pasid; }; #define VFIO_DEVICE_DETACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 20) From patchwork Fri Nov 8 12:17:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13868111 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C82431E883D for ; Fri, 8 Nov 2024 12:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068275; cv=none; b=I3o1Um5FdQNdq7zE08PGxmvdvyIBvyXqJ7pBBEufEMdrmDqfE0ScDglTzdRIxK40lukYKiTaQqNAb8Y4VHc9SMv2loUD30aCrcVCFnAnfv3Wj5iEt9I4kS/3WXj0e6tOx5Gwb6pY3yksvCSqTeSNOoOff47LsWHqFnzfruYA7ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068275; c=relaxed/simple; bh=rbnYdbmwhGJ1udSVXhSJ1PK4TnSQVX5UBIcjXa2TZ7s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ba/AgPSiVCRMms7y8AZeWBrbRbKOTkcn+E0nTyJVI6xYDfl5EF3PubLvAg+EZU99YS+RIDmqyVZB4NGJjkO+jI56MJbET6bifglwS0EwOkDOECztTebxxCca3s8JaShaH4fPm5h6rBaYtLwv1Hv9LOhu9gRCilXYAKdhPtjX4XA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=RqnN23+o; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="RqnN23+o" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731068272; x=1762604272; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rbnYdbmwhGJ1udSVXhSJ1PK4TnSQVX5UBIcjXa2TZ7s=; b=RqnN23+orYMKxraG8xHS0D+UlkSvRe1YRBcw+A+iJxWvDMw4loWDtZyZ fTK42zZnbdjuOzyDxKmsXGzgNAEfp+IUcK5nxWRPigJegSuOHNEUSVB/L 4nXAwE7n8Dls/b6iBwPMipu5asTf0+CdWy9BwIhxHHb1FLHqWvz9sQ3Zq 1qOJzhKDz9uzHPMPyLCCUotbgLqsggRPimcfw2UygXoucVZ7av1TrUR1r 0OLOLWsG6OJfPgyLcE1aZfan/c85QNUDCNgKmj4bUYSgW8ujI/kys9vvo P0yV7hyYxpA2BZbedgJT8u3VncbBKGGOvPYNOe2xo0DhFbfNJaC3+EP7z A==; X-CSE-ConnectionGUID: 2J1ANiQXQam0nzh9KaHB3g== X-CSE-MsgGUID: BdCghSfFT12iGFR+gUDG+A== X-IronPort-AV: E=McAfee;i="6700,10204,11249"; a="41560834" X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="41560834" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2024 04:17:49 -0800 X-CSE-ConnectionGUID: ZEV8d+mVT1KsDtegPGUvyg== X-CSE-MsgGUID: IzpUrl8xQtyg7Qg/maQb4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="85865456" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa010.fm.intel.com with ESMTP; 08 Nov 2024 04:17:49 -0800 From: Yi Liu To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: joro@8bytes.org, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org Subject: [PATCH v5 4/5] vfio: Add vfio_copy_user_data() Date: Fri, 8 Nov 2024 04:17:41 -0800 Message-Id: <20241108121742.18889-5-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108121742.18889-1-yi.l.liu@intel.com> References: <20241108121742.18889-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This generalizes the logic of copying user data when the user struct Have new fields introduced. The helpers can be used by the vfio uapis that have the argsz and flags fields in the beginning 8 bytes. As an example, the vfio_device_{at|de}tach_iommufd_pt paths are updated to use the helpers. The flags may be defined to mark a new field in the structure, reuse reserved fields, or special handling of an existing field. The extended size would differ for different flags. Each user API that wants to use the generalized helpers should define an array to store the corresponding extended sizes for each defined flag. For example, we start out with the below, minsz is 12. struct vfio_foo_struct { __u32 argsz; __u32 flags; __u32 pt_id; }; And then here it becomes: struct vfio_foo_struct { __u32 argsz; __u32 flags; #define VFIO_FOO_STRUCT_PASID (1 << 0) __u32 pt_id; __u32 pasid; }; The array is { 16 }. If the next flag is simply related to the processing of @pt_id and doesn't require @pasid, then the extended size of the new flag is 12. The array become { 16, 12 } struct vfio_foo_struct { __u32 argsz; __u32 flags; #define VFIO_FOO_STRUCT_PASID (1 << 0) #define VFIO_FOO_STRUCT_SPECICAL_PTID (1 << 1) __u32 pt_id; __u32 pasid; }; Similarly, rather than adding new field, we might have reused a previously reserved field, for instance what if we already expanded the structure as the below, array is already { 24 }. struct vfio_foo_struct { __u32 argsz; __u32 flags; #define VFIO_FOO_STRUCT_XXX (1 << 0) __u32 pt_id; __u32 reserved; __u64 xxx; }; If we then want to add @pasid, we might really prefer to take advantage of that reserved field and the array becomes { 24, 16 }. struct vfio_foo_struct { __u32 argsz; __u32 flags; #define VFIO_FOO_STRUCT_XXX (1 << 0) #define VFIO_FOO_STRUCT_PASID (1 << 1) __u32 pt_id; __u32 reserved; __u64 xxx; }; Suggested-by: Alex Williamson Signed-off-by: Yi Liu --- drivers/vfio/device_cdev.c | 81 +++++++++++++------------------------- drivers/vfio/vfio.h | 18 +++++++++ drivers/vfio/vfio_main.c | 55 ++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 54 deletions(-) diff --git a/drivers/vfio/device_cdev.c b/drivers/vfio/device_cdev.c index 4519f482e212..35c7664b9a97 100644 --- a/drivers/vfio/device_cdev.c +++ b/drivers/vfio/device_cdev.c @@ -159,40 +159,33 @@ void vfio_df_unbind_iommufd(struct vfio_device_file *df) vfio_device_unblock_group(device); } +#define VFIO_ATTACH_FLAGS_MASK VFIO_DEVICE_ATTACH_PASID +static unsigned long +vfio_attach_xends[ilog2(VFIO_ATTACH_FLAGS_MASK) + 1] = { + XEND_SIZE(VFIO_DEVICE_ATTACH_PASID, + struct vfio_device_attach_iommufd_pt, pasid), +}; + +#define VFIO_DETACH_FLAGS_MASK VFIO_DEVICE_DETACH_PASID +static unsigned long +vfio_detach_xends[ilog2(VFIO_DETACH_FLAGS_MASK) + 1] = { + XEND_SIZE(VFIO_DEVICE_DETACH_PASID, + struct vfio_device_detach_iommufd_pt, pasid), +}; + int vfio_df_ioctl_attach_pt(struct vfio_device_file *df, struct vfio_device_attach_iommufd_pt __user *arg) { struct vfio_device_attach_iommufd_pt attach; struct vfio_device *device = df->device; - unsigned long minsz, xend = 0; int ret; - minsz = offsetofend(struct vfio_device_attach_iommufd_pt, pt_id); - - if (copy_from_user(&attach, arg, minsz)) - return -EFAULT; - - if (attach.argsz < minsz) - return -EINVAL; - - if (attach.flags & (~VFIO_DEVICE_ATTACH_PASID)) - return -EINVAL; - - if (attach.flags & VFIO_DEVICE_ATTACH_PASID) - xend = offsetofend(struct vfio_device_attach_iommufd_pt, pasid); - - /* - * xend may be equal to minsz if a flag is defined for reusing a - * reserved field or a special usage of an existing field. - */ - if (xend > minsz) { - if (attach.argsz < xend) - return -EINVAL; - - if (copy_from_user((void *)&attach + minsz, - (void __user *)arg + minsz, xend - minsz)) - return -EFAULT; - } + ret = vfio_copy_user_data((void __user *)arg, &attach, + struct vfio_device_attach_iommufd_pt, + pt_id, VFIO_ATTACH_FLAGS_MASK, + vfio_attach_xends); + if (ret) + return ret; if ((attach.flags & VFIO_DEVICE_ATTACH_PASID) && !device->ops->pasid_attach_ioas) @@ -227,34 +220,14 @@ int vfio_df_ioctl_detach_pt(struct vfio_device_file *df, { struct vfio_device_detach_iommufd_pt detach; struct vfio_device *device = df->device; - unsigned long minsz, xend = 0; - - minsz = offsetofend(struct vfio_device_detach_iommufd_pt, flags); - - if (copy_from_user(&detach, arg, minsz)) - return -EFAULT; - - if (detach.argsz < minsz) - return -EINVAL; - - if (detach.flags & (~VFIO_DEVICE_DETACH_PASID)) - return -EINVAL; - - if (detach.flags & VFIO_DEVICE_DETACH_PASID) - xend = offsetofend(struct vfio_device_detach_iommufd_pt, pasid); - - /* - * xend may be equal to minsz if a flag is defined for reusing a - * reserved field or a special usage of an existing field. - */ - if (xend > minsz) { - if (detach.argsz < xend) - return -EINVAL; + int ret; - if (copy_from_user((void *)&detach + minsz, - (void __user *)arg + minsz, xend - minsz)) - return -EFAULT; - } + ret = vfio_copy_user_data((void __user *)arg, &detach, + struct vfio_device_detach_iommufd_pt, + flags, VFIO_DETACH_FLAGS_MASK, + vfio_detach_xends); + if (ret) + return ret; if ((detach.flags & VFIO_DEVICE_DETACH_PASID) && !device->ops->pasid_detach_ioas) diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h index 50128da18bca..87bed550c46e 100644 --- a/drivers/vfio/vfio.h +++ b/drivers/vfio/vfio.h @@ -34,6 +34,24 @@ void vfio_df_close(struct vfio_device_file *df); struct vfio_device_file * vfio_allocate_device_file(struct vfio_device *device); +int vfio_copy_from_user(void *buffer, void __user *arg, + unsigned long minsz, u32 flags_mask, + unsigned long *xend_array); + +#define vfio_copy_user_data(_arg, _local_buffer, _struct, _min_last, \ + _flags_mask, _xend_array) \ + vfio_copy_from_user(_local_buffer, _arg, \ + offsetofend(_struct, _min_last) + \ + BUILD_BUG_ON_ZERO(offsetof(_struct, argsz) != \ + 0) + \ + BUILD_BUG_ON_ZERO(offsetof(_struct, flags) != \ + sizeof(u32)), \ + _flags_mask, _xend_array) + +#define XEND_SIZE(_flag, _struct, _xlast) \ + [ilog2(_flag)] = offsetofend(_struct, _xlast) + \ + BUILD_BUG_ON_ZERO(_flag == 0) \ + extern const struct file_operations vfio_device_fops; #ifdef CONFIG_VFIO_NOIOMMU diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index a5a62d9d963f..c61336ea5123 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -1694,6 +1694,61 @@ int vfio_dma_rw(struct vfio_device *device, dma_addr_t iova, void *data, } EXPORT_SYMBOL(vfio_dma_rw); +/** + * vfio_copy_from_user - Copy the user struct that may have extended fields + * + * @buffer: The local buffer to store the data copied from user + * @arg: The user buffer pointer + * @minsz: The minimum size of the user struct + * @flags_mask: The combination of all the falgs defined + * @xend_array: The array that stores the xend size for set flags. + * + * This helper requires the user struct put the argsz and flags fields in + * the first 8 bytes. + * + * Return 0 for success, otherwise -errno + */ +int vfio_copy_from_user(void *buffer, void __user *arg, + unsigned long minsz, u32 flags_mask, + unsigned long *xend_array) +{ + unsigned long xend = minsz; + struct user_header { + u32 argsz; + u32 flags; + } *header; + unsigned long flags; + u32 flag; + + if (copy_from_user(buffer, arg, minsz)) + return -EFAULT; + + header = (struct user_header *)buffer; + if (header->argsz < minsz) + return -EINVAL; + + if (header->flags & ~flags_mask) + return -EINVAL; + + /* Loop each set flag to decide the xend */ + flags = header->flags; + for_each_set_bit(flag, &flags, BITS_PER_TYPE(u32)) { + if (xend_array[flag] > xend) + xend = xend_array[flag]; + } + + if (xend > minsz) { + if (header->argsz < xend) + return -EINVAL; + + if (copy_from_user(buffer + minsz, + arg + minsz, xend - minsz)) + return -EFAULT; + } + + return 0; +} + /* * Module/class support */ From patchwork Fri Nov 8 12:17:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 13868110 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD02B1E8842 for ; Fri, 8 Nov 2024 12:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068273; cv=none; b=fambQE132K1iWnmtZSgzI4dB4ec05oSlme8dNykiZi0OPYkN18b/g2ggBrkpwfIvjSQaO2YQUdtykAR36HTWgX7EX9YKUDnizCrk9Csc14e599G7nVK3F83Y8KV8p5iIluB5UuQQ8uGS+OTVXrcYApagq1ULSQYVkhBEgzRN4X0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731068273; c=relaxed/simple; bh=eg6PD3CuAltZOvrslb8O1BllOcumlzSeflErh+2dj4U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rhruZ2+0aERNw1fiTfadRkOgIOSbpEmoLXqox7qEKbLZc7rWerkK62Cv4yGLEs2bINRN0mSzOt8ol2DRpYK1krrcKojBs3jdimQxGyCXzl3sA4bu6M1PUjykP/8GxmQM5NvzSzM/O/NKHW3rQ8fMkHvF+SjHZ2iz7dbhAalX0q4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=c7esiEQu; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="c7esiEQu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731068272; x=1762604272; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eg6PD3CuAltZOvrslb8O1BllOcumlzSeflErh+2dj4U=; b=c7esiEQu57LwUVfchfvWQF4VrQvWgfdw4hV58kXflkGgTowsC/4Iitj0 fi/bw5bBkLiJNM5pj3dNd6K7phssina2ASNR31rSDtWQmJk6NBPbiWaq/ rxaeyCZ75cuKKaV8c53nnrvNvSUt8TZUtsonh9dKLW02UCZcMWmOIBYXh 8LHl89T/1XKZ3RTEvrX4FjieJGhAFmN8CNu///2Uz7okPop/igdZE5lcu uGRBOkLhmB+fB4m1wsXqiYq22PhRLzVgmdirhXaAO1mvO1zJEZz4Nq+V+ v9fhpMUfNlixRtLgyvyMat4SHvzpZrnPSO/GCB721NRBz0PfxEwD9kmUi g==; X-CSE-ConnectionGUID: vEHE9JqfThS+68nh9i5kEA== X-CSE-MsgGUID: fXFbiZOMToaZ0apiekAYFw== X-IronPort-AV: E=McAfee;i="6700,10204,11249"; a="41560841" X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="41560841" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2024 04:17:50 -0800 X-CSE-ConnectionGUID: UOskUehgQ7ShGTgC2rwYQg== X-CSE-MsgGUID: su3n60svQCWS/BodfBcoVg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,137,1728975600"; d="scan'208";a="85865460" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmviesa010.fm.intel.com with ESMTP; 08 Nov 2024 04:17:49 -0800 From: Yi Liu To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: joro@8bytes.org, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, vasant.hegde@amd.com, will@kernel.org, Zhangfei Gao Subject: [PATCH v5 5/5] iommufd: Extend IOMMU_GET_HW_INFO to report PASID capability Date: Fri, 8 Nov 2024 04:17:42 -0800 Message-Id: <20241108121742.18889-6-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108121742.18889-1-yi.l.liu@intel.com> References: <20241108121742.18889-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 PASID usage requires PASID support in both device and IOMMU. Since the iommu drivers always enable the PASID capability for the device if it is supported, so it is reasonable to extend the IOMMU_GET_HW_INFO to report the PASID capability to userspace. Reviewed-by: Kevin Tian Reviewed-by: Jason Gunthorpe Tested-by: Zhangfei Gao #aarch64 platform Signed-off-by: Yi Liu --- drivers/iommu/iommufd/device.c | 24 +++++++++++++++++++++++- drivers/pci/ats.c | 33 +++++++++++++++++++++++++++++++++ include/linux/pci-ats.h | 3 +++ include/uapi/linux/iommufd.h | 14 +++++++++++++- 4 files changed, 72 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c index a52937fba366..3620a039d3fa 100644 --- a/drivers/iommu/iommufd/device.c +++ b/drivers/iommu/iommufd/device.c @@ -3,6 +3,8 @@ */ #include #include +#include +#include #include #include @@ -1248,7 +1250,8 @@ int iommufd_get_hw_info(struct iommufd_ucmd *ucmd) void *data; int rc; - if (cmd->flags || cmd->__reserved) + if (cmd->flags || cmd->__reserved[0] || cmd->__reserved[1] || + cmd->__reserved[2]) return -EOPNOTSUPP; idev = iommufd_get_device(ucmd, cmd->dev_id); @@ -1305,6 +1308,25 @@ int iommufd_get_hw_info(struct iommufd_ucmd *ucmd) if (device_iommu_capable(idev->dev, IOMMU_CAP_DIRTY_TRACKING)) cmd->out_capabilities |= IOMMU_HW_CAP_DIRTY_TRACKING; + cmd->out_max_pasid_log2 = 0; + + if (dev_is_pci(idev->dev)) { + struct pci_dev *pdev = to_pci_dev(idev->dev); + int ctrl; + + ctrl = pci_pasid_ctrl_status(pdev); + if (ctrl >= 0 && (ctrl & PCI_PASID_CTRL_ENABLE)) { + cmd->out_max_pasid_log2 = + ilog2(idev->dev->iommu->max_pasids); + if (ctrl & PCI_PASID_CTRL_EXEC) + cmd->out_capabilities |= + IOMMU_HW_CAP_PCI_PASID_EXEC; + if (ctrl & PCI_PASID_CTRL_PRIV) + cmd->out_capabilities |= + IOMMU_HW_CAP_PCI_PASID_PRIV; + } + } + rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd)); out_free: kfree(data); diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index 6afff1f1b143..c35465120329 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -538,4 +538,37 @@ int pci_max_pasids(struct pci_dev *pdev) return (1 << FIELD_GET(PCI_PASID_CAP_WIDTH, supported)); } EXPORT_SYMBOL_GPL(pci_max_pasids); + +/** + * pci_pasid_ctrl_status - Check the PASID status + * @pdev: PCI device structure + * + * Returns a negative value when no PASID capability is present. + * Otherwise the value of the control register is returned. + * Status reported are: + * + * PCI_PASID_CTRL_ENABLE - PASID enabled + * PCI_PASID_CTRL_EXEC - Execute permission enabled + * PCI_PASID_CTRL_PRIV - Privileged mode enabled + */ +int pci_pasid_ctrl_status(struct pci_dev *pdev) +{ + int pasid; + u16 ctrl; + + if (pdev->is_virtfn) + pdev = pci_physfn(pdev); + + pasid = pdev->pasid_cap; + if (!pasid) + return -EINVAL; + + pci_read_config_word(pdev, pasid + PCI_PASID_CTRL, &ctrl); + + ctrl &= PCI_PASID_CTRL_ENABLE | PCI_PASID_CTRL_EXEC | + PCI_PASID_CTRL_PRIV; + + return ctrl; +} +EXPORT_SYMBOL_GPL(pci_pasid_ctrl_status); #endif /* CONFIG_PCI_PASID */ diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 0e8b74e63767..f4e1d2010287 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -42,6 +42,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features); void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); +int pci_pasid_ctrl_status(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ static inline int pci_enable_pasid(struct pci_dev *pdev, int features) { return -EINVAL; } @@ -50,6 +51,8 @@ static inline int pci_pasid_features(struct pci_dev *pdev) { return -EINVAL; } static inline int pci_max_pasids(struct pci_dev *pdev) { return -EINVAL; } +static inline int pci_pasid_ctrl_status(struct pci_dev *pdev) +{ return -EINVAL; } #endif /* CONFIG_PCI_PASID */ #endif /* LINUX_PCI_ATS_H */ diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h index cc1b94f43538..e5709502d8e4 100644 --- a/include/uapi/linux/iommufd.h +++ b/include/uapi/linux/iommufd.h @@ -547,9 +547,17 @@ enum iommu_hw_info_type { * IOMMU_HWPT_GET_DIRTY_BITMAP * IOMMU_HWPT_SET_DIRTY_TRACKING * + * @IOMMU_HW_CAP_PASID_EXEC: Execute Permission Supported, user ignores it + * when the struct iommu_hw_info::out_max_pasid_log2 + * is zero. + * @IOMMU_HW_CAP_PASID_PRIV: Privileged Mode Supported, user ignores it + * when the struct iommu_hw_info::out_max_pasid_log2 + * is zero. */ enum iommufd_hw_capabilities { IOMMU_HW_CAP_DIRTY_TRACKING = 1 << 0, + IOMMU_HW_CAP_PCI_PASID_EXEC = 1 << 1, + IOMMU_HW_CAP_PCI_PASID_PRIV = 1 << 2, }; /** @@ -565,6 +573,9 @@ enum iommufd_hw_capabilities { * iommu_hw_info_type. * @out_capabilities: Output the generic iommu capability info type as defined * in the enum iommu_hw_capabilities. + * @out_max_pasid_log2: Output the width of PASIDs. 0 means no PASID support. + * PCI devices turn to out_capabilities to check if the + * specific capabilities is supported or not. * @__reserved: Must be 0 * * Query an iommu type specific hardware information data from an iommu behind @@ -588,7 +599,8 @@ struct iommu_hw_info { __u32 data_len; __aligned_u64 data_uptr; __u32 out_data_type; - __u32 __reserved; + __u8 out_max_pasid_log2; + __u8 __reserved[3]; __aligned_u64 out_capabilities; }; #define IOMMU_GET_HW_INFO _IO(IOMMUFD_TYPE, IOMMUFD_CMD_GET_HW_INFO)