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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60981C433E4 for ; Mon, 29 Jun 2020 19:05:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E93C2053B for ; Mon, 29 Jun 2020 19:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730680AbgF2TFC (ORCPT ); Mon, 29 Jun 2020 15:05:02 -0400 Received: from foss.arm.com ([217.140.110.172]:37928 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730521AbgF2TEz (ORCPT ); Mon, 29 Jun 2020 15:04:55 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C7DD1143D; Mon, 29 Jun 2020 04:56:48 -0700 (PDT) Received: from [10.57.21.32] (unknown [10.57.21.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 509373F73C; Mon, 29 Jun 2020 04:56:47 -0700 (PDT) Subject: Re: [PATCH 1/2] iommu: Add iommu_group_get/set_domain() To: Lu Baolu , Joerg Roedel , Alex Williamson Cc: Kevin Tian , Dave Jiang , Ashok Raj , kvm@vger.kernel.org, Cornelia Huck , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org References: <20200627031532.28046-1-baolu.lu@linux.intel.com> From: Robin Murphy Message-ID: Date: Mon, 29 Jun 2020 12:56:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200627031532.28046-1-baolu.lu@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-06-27 04:15, Lu Baolu wrote: > The hardware assistant vfio mediated device is a use case of iommu > aux-domain. The interactions between vfio/mdev and iommu during mdev > creation and passthr are: > > - Create a group for mdev with iommu_group_alloc(); > - Add the device to the group with > group = iommu_group_alloc(); > if (IS_ERR(group)) > return PTR_ERR(group); > > ret = iommu_group_add_device(group, &mdev->dev); > if (!ret) > dev_info(&mdev->dev, "MDEV: group_id = %d\n", > iommu_group_id(group)); > - Allocate an aux-domain > iommu_domain_alloc() > - Attach the aux-domain to the physical device from which the mdev is > created. > iommu_aux_attach_device() > > In the whole process, an iommu group was allocated for the mdev and an > iommu domain was attached to the group, but the group->domain leaves > NULL. As the result, iommu_get_domain_for_dev() doesn't work anymore. > > This adds iommu_group_get/set_domain() so that group->domain could be > managed whenever a domain is attached or detached through the aux-domain > api's. Letting external callers poke around directly in the internals of iommu_group doesn't look right to me. If a regular device is attached to one or more aux domains for PASID use, iommu_get_domain_for_dev() is still going to return the primary domain, so why should it be expected to behave differently for mediated devices? AFAICS it's perfectly legitimate to have no primary domain if traffic-without-PASID is invalid. Robin. > Fixes: 7bd50f0cd2fd5 ("vfio/type1: Add domain at(de)taching group helpers") > Signed-off-by: Lu Baolu > --- > drivers/iommu/iommu.c | 28 ++++++++++++++++++++++++++++ > include/linux/iommu.h | 14 ++++++++++++++ > 2 files changed, 42 insertions(+) > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index d43120eb1dc5..e2b665303d70 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -715,6 +715,34 @@ int iommu_group_set_name(struct iommu_group *group, const char *name) > } > EXPORT_SYMBOL_GPL(iommu_group_set_name); > > +/** > + * iommu_group_get_domain - get domain of a group > + * @group: the group > + * > + * This is called to get the domain of a group. > + */ > +struct iommu_domain *iommu_group_get_domain(struct iommu_group *group) > +{ > + return group->domain; > +} > +EXPORT_SYMBOL_GPL(iommu_group_get_domain); > + > +/** > + * iommu_group_set_domain - set domain for a group > + * @group: the group > + * @domain: iommu domain > + * > + * This is called to set the domain for a group. In aux-domain case, a domain > + * might attach or detach to an iommu group through the aux-domain apis, but > + * the group->domain doesn't get a chance to be updated there. > + */ > +void iommu_group_set_domain(struct iommu_group *group, > + struct iommu_domain *domain) > +{ > + group->domain = domain; > +} > +EXPORT_SYMBOL_GPL(iommu_group_set_domain); > + > static int iommu_create_device_direct_mappings(struct iommu_group *group, > struct device *dev) > { > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 5f0b7859d2eb..ff88d548a870 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -496,6 +496,9 @@ extern void iommu_group_set_iommudata(struct iommu_group *group, > void *iommu_data, > void (*release)(void *iommu_data)); > extern int iommu_group_set_name(struct iommu_group *group, const char *name); > +extern struct iommu_domain *iommu_group_get_domain(struct iommu_group *group); > +extern void iommu_group_set_domain(struct iommu_group *group, > + struct iommu_domain *domain); > extern int iommu_group_add_device(struct iommu_group *group, > struct device *dev); > extern void iommu_group_remove_device(struct device *dev); > @@ -840,6 +843,17 @@ static inline int iommu_group_set_name(struct iommu_group *group, > return -ENODEV; > } > > +static inline > +struct iommu_domain *iommu_group_get_domain(struct iommu_group *group) > +{ > + return NULL; > +} > + > +static inline void iommu_group_set_domain(struct iommu_group *group, > + struct iommu_domain *domain) > +{ > +} > + > static inline int iommu_group_add_device(struct iommu_group *group, > struct device *dev) > { >