From patchwork Mon May 10 14:17:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 433159 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2896599jao; Mon, 10 May 2021 07:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzw7wlQzh1+dqlSa0IgdR2KXUfSXYElCUmtYVEmr9hKR+Mxr21kybdJELLkmjKhD0xUofkV X-Received: by 2002:a92:d9c2:: with SMTP id n2mr21646920ilq.284.1620656847662; Mon, 10 May 2021 07:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620656847; cv=none; d=google.com; s=arc-20160816; b=fGXkTIDu92swbZ3ciHgoKsdlj8cOsIu6a4Ycj/HeohWfItYFxXj4kSPz1ipAPSCdzq nyAWqQnbxkth31MpNXVE6NdWW/9qk+fZSairQ/VNgq9y/g00mgxRqqU45KUIoDbr9gKy lqTrJgT3zU1ZsV48NCnLIG+bJlAKGYIz69Y9+cj+ejzyjf1ywvXo1LDiCBpvNTLzDGSC CRbliGKl+p6lF4FsLJnmfKnR1S9g274e2/ColNLlyp+HiIW7W565GoJl9pMDWIUjUH8l vdR/CjEa7l9gXSo8cp37k1jOaQiTlftt8Cf4ibLv32CaDPtM0XsfoTLdpgw9+hANgTqr L/RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=U9BuamBJyLXyQjVveS+7+Phb3KtFTqoN5v75BJsWxqA=; b=N+y/iSBZZadCFKt3sskycfbnbdsi2kV14cLirBMgQOdbz8eTT9JM8viDpjcKAUX885 clFJBcY0buUiu/WH+TUb+SFu58plKyWpsLqP/sGYqH5KL+S26QLoL28rBOePy7LYSH9t VA4c+9ktRb3jwRNhuAsSyauYBCFv1NAbApGp2wXlklQBu8cIyyQi1mfvYf3wRmUjlLv7 3q1svNIVQP6zCWsjse+yeF3xupUpMjnNQKUcrHjTl+UWujAIc+a/muIrthAtRjJxpQUZ GuWFf6Lob15RNQoBLuDpE4wX0I9DNW6xjXZrdhzRcUSaCOJR0+DRsveT3u06f2bA0e9a dxaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a13si13610863ilr.121.2021.05.10.07.27.27 for ; Mon, 10 May 2021 07:27:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242223AbhEJO2Y (ORCPT ); Mon, 10 May 2021 10:28:24 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2679 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238909AbhEJOZr (ORCPT ); Mon, 10 May 2021 10:25:47 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Ff39B5ghvz1BKw7; Mon, 10 May 2021 22:19:58 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Mon, 10 May 2021 22:22:26 +0800 From: John Garry To: , , , , CC: , , , , , , John Garry Subject: [PATCH v2 08/15] dma-iommu: Add iommu_reconfig_dev_group_dma() Date: Mon, 10 May 2021 22:17:22 +0800 Message-ID: <1620656249-68890-9-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1620656249-68890-1-git-send-email-john.garry@huawei.com> References: <1620656249-68890-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Add a function to reconfigure the IOMMU group for a device, if necessary. IOVAs are cached in power-of-2 granules, so there is no point in allocating a new IOMMU domain if the current range is suitable. Signed-off-by: John Garry --- drivers/iommu/dma-iommu.c | 25 +++++++++++++++++++++++++ include/linux/dma-iommu.h | 4 ++++ 2 files changed, 29 insertions(+) -- 2.26.2 diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index f6d3302bb829..4fb82c554ede 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -315,6 +315,31 @@ static bool dev_is_untrusted(struct device *dev) return dev_is_pci(dev) && to_pci_dev(dev)->untrusted; } +void iommu_reconfig_dev_group_dma(struct device *dev) +{ + struct iommu_domain *domain = iommu_get_domain_for_dev(dev); + struct iommu_dma_cookie *cookie = domain->iova_cookie; + unsigned long shift, iova_len; + struct iova_domain *iovad; + size_t max_opt_dma_size; + + if (!cookie || cookie->type != IOMMU_DMA_IOVA_COOKIE) + return; + + max_opt_dma_size = iommu_group_get_max_opt_dma_size(dev->iommu_group); + if (!max_opt_dma_size) + return; + + iovad = &cookie->iovad; + shift = iova_shift(iovad); + iova_len = max_opt_dma_size >> shift; + + if (iova_domain_len_is_cached(iovad, iova_len)) + return; + + iommu_realloc_dev_group(dev); +} + /** * iommu_dma_init_domain - Initialise a DMA mapping domain * @domain: IOMMU domain previously prepared by iommu_get_dma_cookie() diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 6e75a2d689b4..097398b76dcc 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -20,6 +20,7 @@ void iommu_put_dma_cookie(struct iommu_domain *domain); /* Setup call for arch DMA mapping code */ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size); +void iommu_reconfig_dev_group_dma(struct device *dev); /* The DMA API isn't _quite_ the whole story, though... */ /* @@ -53,6 +54,9 @@ static inline void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size) { } +static inline void iommu_reconfig_dev_group_dma(struct device *dev) +{ +} static inline int iommu_get_dma_cookie(struct iommu_domain *domain) {