Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp256794pxt; Wed, 4 Aug 2021 10:18:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgie130oLFsM38dfHe0DSr3MbCpgTmYL730jS7ZqDfdI4x+ch2zVL+ekNPPZNGBa2w9Oa8 X-Received: by 2002:a5d:8990:: with SMTP id m16mr335288iol.170.1628097491922; Wed, 04 Aug 2021 10:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097491; cv=none; d=google.com; s=arc-20160816; b=CFp8pHYi6VB/48FhrOXgKMU6D4oPOWKja6ghvkV2zkGgCNmIDO90823AdixH7S+BJc uQP/I1GOGZXKnfAkLLKgon6pGyBRi10CKmyQTQZexgjPtDcnre7Q4J2llz6dDLzJSywX YDLr6wg5eruvc+7YlcLcIjG7MH8txUxUd1Ivhw24FiZubMa5NHJUr3wmEIH7CRoUcZWi 3StmB65HTKsd91xSvg0sLWvtPAYlyf/xov4liiY2dxqEO33F13ZZYhpxibLC9/kx6Vvy xub5BKzsiYJySMlPdt5XsqWaPBtj8vBTlmOQ9dcox4g+zRK6sT4j5XLGCj8DXdm9ayen p6kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=9jj1nwNwSzMpTmKYBCFl9cmI3XuH46HWB8lyRcPfGjg=; b=fQmnIEK/8XzozxXeQy7lqhoT9sc5o4H3UefQkW2qrWMqyFLLCZMIGcsJOAPHqfrC5a YofIE4JuNk6JC+/Iga02e3vZ/Qsr5/7zCDv97lDFA1l77luYRAnC9dN8zjpROOv5Tqut 92vvFNSstNyt8JeHTtl/3V52yIVC7BVovRAucxXcu1rFPi+tz0+HmBCXffFddODbdB53 rHRHL9bs+QVbV64rYRkP0SNH5mh6Xmaat/Y1kFR+BjxQC4v8X7pagN8ARImUv8S2DqM3 rU98+v4/kvif9MlzmnkTjePoWHRfvO9V4pk90hqUvXeVIHZhHzR60tm8DrPgt9xH31/U IHlQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k19si2845218jan.39.2021.08.04.10.17.59; Wed, 04 Aug 2021 10:18:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239959AbhHDRQ5 (ORCPT + 99 others); Wed, 4 Aug 2021 13:16:57 -0400 Received: from foss.arm.com ([217.140.110.172]:35010 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239906AbhHDRQo (ORCPT ); Wed, 4 Aug 2021 13:16:44 -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 CF75031B; Wed, 4 Aug 2021 10:16:31 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EDD1B3F66F; Wed, 4 Aug 2021 10:16:29 -0700 (PDT) From: Robin Murphy To: joro@8bytes.org, will@kernel.org Cc: 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, rajatja@google.com, chenxiang66@hisilicon.com, Jean-Philippe Brucker Subject: [PATCH v3 11/25] iommu/virtio: Drop IOVA cookie management Date: Wed, 4 Aug 2021 18:15:39 +0100 Message-Id: <6a2b1638c014db13a64cf5ee0f23c85c2688f3c4.1628094601.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The core code bakes its own cookies now. Reviewed-by: Jean-Philippe Brucker Signed-off-by: Robin Murphy --- drivers/iommu/virtio-iommu.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 6abdcab7273b..80930ce04a16 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -598,12 +598,6 @@ static struct iommu_domain *viommu_domain_alloc(unsigned type) spin_lock_init(&vdomain->mappings_lock); vdomain->mappings = RB_ROOT_CACHED; - if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&vdomain->domain)) { - kfree(vdomain); - return NULL; - } - return &vdomain->domain; } @@ -643,8 +637,6 @@ static void viommu_domain_free(struct iommu_domain *domain) { struct viommu_domain *vdomain = to_viommu_domain(domain); - iommu_put_dma_cookie(domain); - /* Free all remaining mappings (size 2^64) */ viommu_del_mappings(vdomain, 0, 0); -- 2.25.1