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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 71738C4338F for ; Mon, 9 Aug 2021 20:02:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 300EF6056B for ; Mon, 9 Aug 2021 20:02:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 300EF6056B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cd7cfosqypu1p3bm6Sp9q9wsKXGDdscbnPZoOLJU7bU=; b=uQOfogiUOA4FNskmBXlTyp9cXu NLpPbGmMN0M2OtZ6WLU84mjieFQsJpTvNdNnJa6IyiEhHEY0a/ZoGy+u7JYiFuzyptvMOW7V9qCEJ +a0bHhue27O8RR/QqlhnIY2/wqz5zliAe1akqy4cX/ZOJe90PJCesItwqwTnyRyUAbfXTc5n+6guF z5pNxVnIP8KsQdYuMEasN23Hj/HLxN3ayo2Uh814W4IKCdQ2redNQHF20tto2dHTyK8EDiBaUs0JV xw06D143KiQ5qtNDL9oAGsrGsp70ckcSp2ck5kD0Ry9yGUwCZeBIPNkuqkh1UmnsfcP8IldmvYR80 AQlKN12w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDBR5-001tUQ-Me; Mon, 09 Aug 2021 19:59:47 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDBR2-001tTb-9s for linux-arm-kernel@lists.infradead.org; Mon, 09 Aug 2021 19:59:45 +0000 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 F19E66D; Mon, 9 Aug 2021 12:59:41 -0700 (PDT) Received: from [10.57.36.146] (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3261C3F40C; Mon, 9 Aug 2021 12:59:40 -0700 (PDT) Subject: Re: [PATCH v3 24/25] iommu/dma: Factor out flush queue init To: Rajat Jain Cc: joro@8bytes.org, will@kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, suravee.suthikulpanit@amd.com, baolu.lu@linux.intel.com, john.garry@huawei.com, dianders@chromium.org, chenxiang66@hisilicon.com References: <3b5284ee394f267ba966839173f874fc9a996bb2.1628094601.git.robin.murphy@arm.com> From: Robin Murphy Message-ID: <00baf83a-5eb3-4d72-309c-5adfd3242c07@arm.com> Date: Mon, 9 Aug 2021 20:59:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_125944_500221_F3A5ADEF X-CRM114-Status: GOOD ( 23.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2021-08-09 20:05, Rajat Jain wrote: > On Wed, Aug 4, 2021 at 10:16 AM Robin Murphy wrote: >> >> Factor out flush queue setup from the initial domain init so that we >> can potentially trigger it from sysfs later on in a domain's lifetime. >> >> Reviewed-by: Lu Baolu >> Reviewed-by: John Garry >> Signed-off-by: Robin Murphy >> --- >> drivers/iommu/dma-iommu.c | 30 ++++++++++++++++++++---------- >> include/linux/dma-iommu.h | 9 ++++++--- >> 2 files changed, 26 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c >> index 2e19505dddf9..f51b8dc99ac6 100644 >> --- a/drivers/iommu/dma-iommu.c >> +++ b/drivers/iommu/dma-iommu.c >> @@ -310,6 +310,25 @@ static bool dev_is_untrusted(struct device *dev) >> return dev_is_pci(dev) && to_pci_dev(dev)->untrusted; >> } >> >> +int iommu_dma_init_fq(struct iommu_domain *domain) >> +{ >> + struct iommu_dma_cookie *cookie = domain->iova_cookie; >> + >> + if (domain->type != IOMMU_DOMAIN_DMA_FQ) >> + return -EINVAL; >> + if (cookie->fq_domain) >> + return 0; >> + >> + if (init_iova_flush_queue(&cookie->iovad, iommu_dma_flush_iotlb_all, >> + iommu_dma_entry_dtor)) { >> + pr_warn("iova flush queue initialization failed\n"); >> + domain->type = IOMMU_DOMAIN_DMA; >> + return -ENODEV; >> + } >> + cookie->fq_domain = domain; >> + return 0; >> +} >> + >> /** >> * iommu_dma_init_domain - Initialise a DMA mapping domain >> * @domain: IOMMU domain previously prepared by iommu_get_dma_cookie() >> @@ -362,16 +381,7 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, >> } >> >> init_iova_domain(iovad, 1UL << order, base_pfn); >> - >> - if (domain->type == IOMMU_DOMAIN_DMA_FQ && !cookie->fq_domain) { >> - if (init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all, >> - iommu_dma_entry_dtor)) { >> - pr_warn("iova flush queue initialization failed\n"); >> - domain->type = IOMMU_DOMAIN_DMA; >> - } else { >> - cookie->fq_domain = domain; >> - } >> - } >> + iommu_dma_init_fq(domain); >> >> return iova_reserve_iommu_regions(dev, domain); >> } >> diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h >> index 758ca4694257..81ab647f1618 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 dma_limit); >> +int iommu_dma_init_fq(struct iommu_domain *domain); >> >> /* The DMA API isn't _quite_ the whole story, though... */ >> /* >> @@ -37,9 +38,6 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc, >> >> void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list); >> >> -void iommu_dma_free_cpu_cached_iovas(unsigned int cpu, >> - struct iommu_domain *domain); >> - > > This looks like an unrelated code cleanup. Should this be a separate patch? Ha, busted! Much of this was done in the "stream of consciousness" style where I made a big sprawling mess then split it up into patches and branches afterwards. TBH it was already feeling pretty tenuous having a separate patch just to move this one function, and it only gets more so with the simplification Will pointed out earlier. I think I'll squash iommu_dma_init_fq() into the next patch then do a thorough header sweep, since I've now spotted some things in iova.h which could probably go as well. Thanks for the poke! Robin. > > Thanks, > > Rajat > > >> extern bool iommu_dma_forcedac; >> >> #else /* CONFIG_IOMMU_DMA */ >> @@ -54,6 +52,11 @@ static inline void iommu_setup_dma_ops(struct device *dev, u64 dma_base, >> { >> } >> >> +static inline int iommu_dma_init_fq(struct iommu_domain *domain) >> +{ >> + return -EINVAL; >> +} >> + >> static inline int iommu_get_dma_cookie(struct iommu_domain *domain) >> { >> return -ENODEV; >> -- >> 2.25.1 >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel