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 smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 3C273C433F5 for ; Mon, 23 May 2022 03:07:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C083441853; Mon, 23 May 2022 03:07:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KivoDmbtrL0s; Mon, 23 May 2022 03:07:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1C5FC4172F; Mon, 23 May 2022 03:07:47 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D4ADEC0039; Mon, 23 May 2022 03:07:46 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 99348C002D for ; Mon, 23 May 2022 03:07:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8070883F16 for ; Mon, 23 May 2022 03:07:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=intel.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6-_kSIGEsoN9 for ; Mon, 23 May 2022 03:07:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4502083EF9 for ; Mon, 23 May 2022 03:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653275264; x=1684811264; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=cud34Huotn8SDaPIoxRDAoxNvr8ULjV7tp01yDrBhHU=; b=JbRGkLmGTuZIpOAf2pJwigumfjMVKkzzhG9MFKK+7DyQgt40GcodChEe Wai/ii9ImsJSNjM7P+8lwbysZIJrKayJb4SHct9THb4nH748N91UUKFkx i12R9rEv0zJMhBinXAWfVGpxjLI/zYTfF+ljCCPFyWwV+gLZFPjPj3pu0 Ay4LWBya7UfxnV2hKLWTrsmA3VTuohKTHDNVMV0/NlZWQlHyeISBZyhgR QMvdsaSpOAbzWr/PW8EehjX4SCDH/JwNNkXTHxedC5hzbxJgCCijqmYge OGVfswmVSKl5n6nb317khRmYWryjd/MRbVphbYzaiAJ+fmb0szXxhvENL g==; X-IronPort-AV: E=McAfee;i="6400,9594,10355"; a="271902025" X-IronPort-AV: E=Sophos;i="5.91,245,1647327600"; d="scan'208";a="271902025" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2022 20:07:42 -0700 X-IronPort-AV: E=Sophos;i="5.91,245,1647327600"; d="scan'208";a="571854693" Received: from jsun39-mobl.ccr.corp.intel.com (HELO [10.255.28.225]) ([10.255.28.225]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2022 20:07:37 -0700 Message-ID: Date: Mon, 23 May 2022 11:07:32 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH v7 06/10] iommu/sva: Refactoring iommu_sva_bind/unbind_device() Content-Language: en-US To: Jean-Philippe Brucker References: <20220519072047.2996983-1-baolu.lu@linux.intel.com> <20220519072047.2996983-7-baolu.lu@linux.intel.com> <3636ac5e-4f52-26a9-db73-5858a27f61b8@linux.intel.com> From: Baolu Lu In-Reply-To: Cc: Kevin Tian , Dave Jiang , Ashok Raj , Robin Murphy , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Jean-Philippe Brucker , Vinod Koul , Jacob jun Pan , Jason Gunthorpe , Will Deacon X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 2022/5/20 19:28, Jean-Philippe Brucker wrote: > On Fri, May 20, 2022 at 02:38:12PM +0800, Baolu Lu wrote: >> On 2022/5/20 00:39, Jean-Philippe Brucker wrote: >>>> +struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm) >>>> +{ >>>> + struct iommu_sva_domain *sva_domain; >>>> + struct iommu_domain *domain; >>>> + ioasid_t max_pasid = 0; >>>> + int ret = -EINVAL; >>>> + >>>> + /* Allocate mm->pasid if necessary. */ >>>> + if (!dev->iommu->iommu_dev->pasids) >>>> + return ERR_PTR(-EOPNOTSUPP); >>>> + >>>> + if (dev_is_pci(dev)) { >>>> + max_pasid = pci_max_pasids(to_pci_dev(dev)); >>>> + if (max_pasid < 0) >>>> + return ERR_PTR(max_pasid); >>>> + } else { >>>> + ret = device_property_read_u32(dev, "pasid-num-bits", >>>> + &max_pasid); >>>> + if (ret) >>>> + return ERR_PTR(ret); >>>> + max_pasid = (1UL << max_pasid); >>>> + } >>> The IOMMU driver needs this PASID width information earlier, when creating >>> the PASID table (in .probe_device(), .attach_dev()). Since we're moving it >>> to the IOMMU core to avoid code duplication, it should be done earlier and >>> stored in dev->iommu >> Yes, really. How about below changes? >> >> From f1382579e8a15ca49acdf758d38fd36451ea174d Mon Sep 17 00:00:00 2001 >> From: Lu Baolu >> Date: Mon, 28 Feb 2022 15:01:35 +0800 >> Subject: [PATCH 1/1] iommu: Add pasids field in struct dev_iommu >> >> Use this field to save the number of PASIDs that a device is able to >> consume. It is a generic attribute of a device and lifting it into the >> per-device dev_iommu struct could help to avoid the boilerplate code >> in various IOMMU drivers. >> >> Signed-off-by: Lu Baolu >> --- >> drivers/iommu/iommu.c | 15 +++++++++++++++ >> include/linux/iommu.h | 2 ++ >> 2 files changed, 17 insertions(+) >> >> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c >> index e49c5a5b8cc1..6b731171d42f 100644 >> --- a/drivers/iommu/iommu.c >> +++ b/drivers/iommu/iommu.c >> @@ -20,6 +20,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -194,6 +195,8 @@ EXPORT_SYMBOL_GPL(iommu_device_unregister); >> static struct dev_iommu *dev_iommu_get(struct device *dev) >> { >> struct dev_iommu *param = dev->iommu; >> + u32 max_pasids = 0; >> + int ret; >> >> if (param) >> return param; >> @@ -202,6 +205,18 @@ static struct dev_iommu *dev_iommu_get(struct device >> *dev) >> if (!param) >> return NULL; >> >> + if (dev_is_pci(dev)) { >> + ret = pci_max_pasids(to_pci_dev(dev)); >> + if (ret > 0) >> + max_pasids = ret; >> + } else { >> + ret = device_property_read_u32(dev, "pasid-num-bits", >> + &max_pasids); >> + if (!ret) >> + max_pasids = (1UL << max_pasids); >> + } >> + param->pasids = max_pasids; >> + > we could also do a min() with the IOMMU PASID size here > >> mutex_init(¶m->lock); >> dev->iommu = param; >> return param; >> diff --git a/include/linux/iommu.h b/include/linux/iommu.h >> index 45f274b2640d..d4296136ba75 100644 >> --- a/include/linux/iommu.h >> +++ b/include/linux/iommu.h >> @@ -371,6 +371,7 @@ struct iommu_fault_param { >> * @fwspec: IOMMU fwspec data >> * @iommu_dev: IOMMU device this device is linked to >> * @priv: IOMMU Driver private data >> + * @pasids: number of supported PASIDs > 'max_pasids' to stay consistent? Both done. How about below changes? From 008c73b9c0ad51a4a70a18d60361a76c28a63342 Mon Sep 17 00:00:00 2001 From: Lu Baolu Date: Mon, 28 Feb 2022 15:01:35 +0800 Subject: [PATCH 1/1] iommu: Add max_pasids field in struct dev_iommu Use this field to save the number of PASIDs that a device is able to consume. It is a generic attribute of a device and lifting it into the per-device dev_iommu struct could help to avoid the boilerplate code in various IOMMU drivers. Signed-off-by: Lu Baolu --- drivers/iommu/iommu.c | 26 ++++++++++++++++++++++++++ include/linux/iommu.h | 2 ++ 2 files changed, 28 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 847ad47a2dfd..365d0f2b7f55 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -218,6 +219,30 @@ static void dev_iommu_free(struct device *dev) kfree(param); } +static u32 dev_iommu_get_max_pasids(struct device *dev) +{ + u32 max_pasids = dev->iommu->iommu_dev->max_pasids; + u32 num_bits; + int ret; + + if (!max_pasids) + return 0; + + if (dev_is_pci(dev)) { + ret = pci_max_pasids(to_pci_dev(dev)); + if (ret < 0) + return 0; + + return min_t(u32, max_pasids, ret); + } + + ret = device_property_read_u32(dev, "pasid-num-bits", &num_bits); + if (ret) + return 0; + + return min_t(u32, max_pasids, 1UL << num_bits); +} + static int __iommu_probe_device(struct device *dev, struct list_head *group_list) { const struct iommu_ops *ops = dev->bus->iommu_ops; @@ -242,6 +267,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list goto out_module_put; } + iommu_dev->max_pasids = dev_iommu_get_max_pasids(dev); dev->iommu->iommu_dev = iommu_dev; group = iommu_group_get_for_dev(dev); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 03fbb1b71536..d50afb2c9a09 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -364,6 +364,7 @@ struct iommu_fault_param { * @fwspec: IOMMU fwspec data * @iommu_dev: IOMMU device this device is linked to * @priv: IOMMU Driver private data + * @max_pasids: number of PASIDs device can consume * * TODO: migrate other per device data pointers under iommu_dev_data, e.g. * struct iommu_group *iommu_group; @@ -375,6 +376,7 @@ struct dev_iommu { struct iommu_fwspec *fwspec; struct iommu_device *iommu_dev; void *priv; + u32 max_pasids; }; int iommu_device_register(struct iommu_device *iommu, Best regards, baolu _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu