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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 79E40C433E6 for ; Sun, 14 Mar 2021 10:45:11 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A70F64E27 for ; Sun, 14 Mar 2021 10:45:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A70F64E27 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D24EE83D2D; Sun, 14 Mar 2021 10:45:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 GS04td9yWPuS; Sun, 14 Mar 2021 10:45:09 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTP id 5847683A89; Sun, 14 Mar 2021 10:45:09 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3A828C000B; Sun, 14 Mar 2021 10:45:09 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2A3A5C0001 for ; Sun, 14 Mar 2021 10:45:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0F4C449DB8 for ; Sun, 14 Mar 2021 10:45:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com 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 c4AM7l4IiwcH for ; Sun, 14 Mar 2021 10:45:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 51259499F3 for ; Sun, 14 Mar 2021 10:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615718704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eHpIhrioLYh4eORQxM4GKdpIFT9gzCBjG8gZQYhgxOo=; b=BNUEqBol45kseqvzTBOR54Pa24zEZS7K0LHZJOcLZawURXZFJ++X02vp/Mr7+KHvbs2VQ+ Nmknh3AklVZHLktuJD2zGCU5jMEkMLa8beYxspqCSwPRcslWHlx3ez+WWJVBpu8oUUqvMk vF8WXUnfszzlfWaqtbLWbIWe2iKMKp8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-503-E9yVcn_5PrqLH04e4dxJbg-1; Sun, 14 Mar 2021 06:45:02 -0400 X-MC-Unique: E9yVcn_5PrqLH04e4dxJbg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82E7E800C78; Sun, 14 Mar 2021 10:44:59 +0000 (UTC) Received: from [10.36.112.254] (ovpn-112-254.ams2.redhat.com [10.36.112.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED7A9620DE; Sun, 14 Mar 2021 10:44:54 +0000 (UTC) Subject: Re: [PATCH 15/17] iommu: remove DOMAIN_ATTR_NESTING To: Christoph Hellwig , Joerg Roedel , Will Deacon , Li Yang References: <20210301084257.945454-1-hch@lst.de> <20210301084257.945454-16-hch@lst.de> From: Auger Eric Message-ID: <3e8f1078-9222-0017-3fa8-4d884dbc848e@redhat.com> Date: Sun, 14 Mar 2021 11:44:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210301084257.945454-16-hch@lst.de> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Cc: kvm@vger.kernel.org, Michael Ellerman , linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, iommu@lists.linux-foundation.org, netdev@vger.kernel.org, freedreno@lists.freedesktop.org, David Woodhouse , linux-arm-kernel@lists.infradead.org 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi Christoph, On 3/1/21 9:42 AM, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 40 ++++++--------------- > drivers/iommu/arm/arm-smmu/arm-smmu.c | 30 ++++++++++------ > drivers/iommu/intel/iommu.c | 28 +++++---------- > drivers/iommu/iommu.c | 8 +++++ > drivers/vfio/vfio_iommu_type1.c | 5 +-- > include/linux/iommu.h | 4 ++- > 6 files changed, 50 insertions(+), 65 deletions(-) As mentionned by Robin, there are series planning to use DOMAIN_ATTR_NESTING to get info about the nested caps of the iommu (ARM and Intel): [Patch v8 00/10] vfio: expose virtual Shared Virtual Addressing to VMs patches 1, 2, 3 Is the plan to introduce a new domain_get_nesting_info ops then? Thanks Eric > > 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 bf96172e8c1f71..8e6fee3ea454d3 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -2466,41 +2466,21 @@ static void arm_smmu_dma_enable_flush_queue(struct iommu_domain *domain) > to_smmu_domain(domain)->non_strict = true; > } > > -static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > - enum iommu_attr attr, void *data) > +static int arm_smmu_domain_enable_nesting(struct iommu_domain *domain) > { > - int ret = 0; > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > + int ret = -EPERM; > > - mutex_lock(&smmu_domain->init_mutex); > + if (domain->type != IOMMU_DOMAIN_UNMANAGED) > + return -EINVAL; > > - switch (domain->type) { > - case IOMMU_DOMAIN_UNMANAGED: > - switch (attr) { > - case DOMAIN_ATTR_NESTING: > - if (smmu_domain->smmu) { > - ret = -EPERM; > - goto out_unlock; > - } > - > - if (*(int *)data) > - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > - else > - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; > - break; > - default: > - ret = -ENODEV; > - } > - break; > - case IOMMU_DOMAIN_DMA: > - ret = -ENODEV; > - break; > - default: > - ret = -EINVAL; > + mutex_lock(&smmu_domain->init_mutex); > + if (!smmu_domain->smmu) { > + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > + ret = 0; > } > - > -out_unlock: > mutex_unlock(&smmu_domain->init_mutex); > + > return ret; > } > > @@ -2603,7 +2583,7 @@ static struct iommu_ops arm_smmu_ops = { > .device_group = arm_smmu_device_group, > .dma_use_flush_queue = arm_smmu_dma_use_flush_queue, > .dma_enable_flush_queue = arm_smmu_dma_enable_flush_queue, > - .domain_set_attr = arm_smmu_domain_set_attr, > + .domain_enable_nesting = arm_smmu_domain_enable_nesting, > .of_xlate = arm_smmu_of_xlate, > .get_resv_regions = arm_smmu_get_resv_regions, > .put_resv_regions = generic_iommu_put_resv_regions, > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c > index e7893e96f5177a..2e17d990d04481 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c > @@ -1497,6 +1497,24 @@ static void arm_smmu_dma_enable_flush_queue(struct iommu_domain *domain) > to_smmu_domain(domain)->pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; > } > > +static int arm_smmu_domain_enable_nesting(struct iommu_domain *domain) > +{ > + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > + int ret = -EPERM; > + > + if (domain->type != IOMMU_DOMAIN_UNMANAGED) > + return -EINVAL; > + > + mutex_lock(&smmu_domain->init_mutex); > + if (!smmu_domain->smmu) { > + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > + ret = 0; > + } > + mutex_unlock(&smmu_domain->init_mutex); > + > + return ret; > +} > + > static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > enum iommu_attr attr, void *data) > { > @@ -1508,17 +1526,6 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > switch(domain->type) { > case IOMMU_DOMAIN_UNMANAGED: > switch (attr) { > - case DOMAIN_ATTR_NESTING: > - if (smmu_domain->smmu) { > - ret = -EPERM; > - goto out_unlock; > - } > - > - if (*(int *)data) > - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > - else > - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; > - break; > case DOMAIN_ATTR_IO_PGTABLE_CFG: { > struct io_pgtable_domain_attr *pgtbl_cfg = data; > > @@ -1603,6 +1610,7 @@ static struct iommu_ops arm_smmu_ops = { > .dma_use_flush_queue = arm_smmu_dma_use_flush_queue, > .dma_enable_flush_queue = arm_smmu_dma_enable_flush_queue, > .domain_set_attr = arm_smmu_domain_set_attr, > + .domain_enable_nesting = arm_smmu_domain_enable_nesting, > .of_xlate = arm_smmu_of_xlate, > .get_resv_regions = arm_smmu_get_resv_regions, > .put_resv_regions = generic_iommu_put_resv_regions, > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index eaa80c33f4bc91..0f1374d6612a60 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5423,32 +5423,22 @@ static bool intel_iommu_is_attach_deferred(struct iommu_domain *domain, > } > > static int > -intel_iommu_domain_set_attr(struct iommu_domain *domain, > - enum iommu_attr attr, void *data) > +intel_iommu_domain_enable_nesting(struct iommu_domain *domain) > { > struct dmar_domain *dmar_domain = to_dmar_domain(domain); > unsigned long flags; > - int ret = 0; > + int ret = -ENODEV; > > if (domain->type != IOMMU_DOMAIN_UNMANAGED) > return -EINVAL; > > - switch (attr) { > - case DOMAIN_ATTR_NESTING: > - spin_lock_irqsave(&device_domain_lock, flags); > - if (nested_mode_support() && > - list_empty(&dmar_domain->devices)) { > - dmar_domain->flags |= DOMAIN_FLAG_NESTING_MODE; > - dmar_domain->flags &= ~DOMAIN_FLAG_USE_FIRST_LEVEL; > - } else { > - ret = -ENODEV; > - } > - spin_unlock_irqrestore(&device_domain_lock, flags); > - break; > - default: > - ret = -EINVAL; > - break; > + spin_lock_irqsave(&device_domain_lock, flags); > + if (nested_mode_support() && list_empty(&dmar_domain->devices)) { > + dmar_domain->flags |= DOMAIN_FLAG_NESTING_MODE; > + dmar_domain->flags &= ~DOMAIN_FLAG_USE_FIRST_LEVEL; > + ret = 0; > } > + spin_unlock_irqrestore(&device_domain_lock, flags); > > return ret; > } > @@ -5556,7 +5546,7 @@ const struct iommu_ops intel_iommu_ops = { > .domain_alloc = intel_iommu_domain_alloc, > .domain_free = intel_iommu_domain_free, > .dma_use_flush_queue = intel_iommu_dma_use_flush_queue, > - .domain_set_attr = intel_iommu_domain_set_attr, > + .domain_enable_nesting = intel_iommu_domain_enable_nesting, > .attach_dev = intel_iommu_attach_device, > .detach_dev = intel_iommu_detach_device, > .aux_attach_dev = intel_iommu_aux_attach_device, > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index 0f12c4d58cdc42..2e9e058501a953 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -2685,6 +2685,14 @@ int iommu_domain_set_attr(struct iommu_domain *domain, > } > EXPORT_SYMBOL_GPL(iommu_domain_set_attr); > > +int iommu_domain_enable_nesting(struct iommu_domain *domain) > +{ > + if (!domain->ops->domain_enable_nesting) > + return -EINVAL; > + return domain->ops->domain_enable_nesting(domain); > +} > +EXPORT_SYMBOL_GPL(iommu_domain_enable_nesting); > + > void iommu_get_resv_regions(struct device *dev, struct list_head *list) > { > const struct iommu_ops *ops = dev->bus->iommu_ops; > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index c8e57f22f421c5..9cea4d80dd66ed 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -2320,10 +2320,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, > } > > if (iommu->nesting) { > - int attr = 1; > - > - ret = iommu_domain_set_attr(domain->domain, DOMAIN_ATTR_NESTING, > - &attr); > + ret = iommu_domain_enable_nesting(domain->domain); > if (ret) > goto out_domain; > } > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index f30de33c6ff56e..aed88aa3bd3edf 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -107,7 +107,6 @@ enum iommu_cap { > */ > > enum iommu_attr { > - DOMAIN_ATTR_NESTING, /* two stages of translation */ > DOMAIN_ATTR_IO_PGTABLE_CFG, > DOMAIN_ATTR_MAX, > }; > @@ -196,6 +195,7 @@ struct iommu_iotlb_gather { > * @dma_use_flush_queue: Returns %true if a DMA flush queue is used > * @dma_enable_flush_queue: Try to enable the DMA flush queue > * @domain_set_attr: Change domain attributes > + * @domain_enable_nesting: Enable nesting > * @get_resv_regions: Request list of reserved regions for a device > * @put_resv_regions: Free list of reserved regions for a device > * @apply_resv_region: Temporary helper call-back for iova reserved ranges > @@ -248,6 +248,7 @@ struct iommu_ops { > void (*dma_enable_flush_queue)(struct iommu_domain *domain); > int (*domain_set_attr)(struct iommu_domain *domain, > enum iommu_attr attr, void *data); > + int (*domain_enable_nesting)(struct iommu_domain *domain); > > /* Request/Free a list of reserved regions for a device */ > void (*get_resv_regions)(struct device *dev, struct list_head *list); > @@ -494,6 +495,7 @@ extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *); > bool iommu_dma_use_flush_queue(struct iommu_domain *domain); > extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr, > void *data); > +int iommu_domain_enable_nesting(struct iommu_domain *domain); > > extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev, > unsigned long iova, int flags); > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu