From patchwork Tue Apr 19 16:56:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 8881801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ABE23BF29F for ; Tue, 19 Apr 2016 16:58:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC26A2024D for ; Tue, 19 Apr 2016 16:58:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E788E200D9 for ; Tue, 19 Apr 2016 16:58:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1asYxu-0001Gv-Ht; Tue, 19 Apr 2016 16:57:30 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1asYxb-000133-8i for linux-arm-kernel@lists.infradead.org; Tue, 19 Apr 2016 16:57:12 +0000 Received: by mail-wm0-x22f.google.com with SMTP id u206so40292530wme.1 for ; Tue, 19 Apr 2016 09:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wqswzIzVoH/gPL4845WoxP14baIBf3Sl2XEFAN7vq+c=; b=hnHR3ADUO67rQnSLpFIWtU57k/IxW+Z6kPKZiC+pYCQ3GjcdecbVlhQ4QGy/RsFpwz X2Vpb1w50sP+bi+yjG71DwhOR/75QJxiIlbAzq6F1imcTS6uvJ7Dt3xqRcq4lzR3kqdU /rfMJzUlMHL5hR8GaShgfIB69SQRRmEW4rT+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wqswzIzVoH/gPL4845WoxP14baIBf3Sl2XEFAN7vq+c=; b=Wc9xym8agw1soF5ZpHRbcS69HeG6L/ZqxKmp0hr6OTBROZMawKeldux5AdpeC3/oxI WHlDR90f8fIdAyVL3CHDu3tCHF17mHTtXcjLuxazjWcfHm5C9ja7tU4Ma5+xoGGvlVi4 nVaFwSQRcLmQWn1Oc5SECqZ8B3SPIrI1+aHBHQEp+VNk2WjLc5lOBJaukGB+WHp6LloH BmmRDFRcoqSsLQus1QJMUwKe1MmcDJLfidZm4jIyfjYTJEXjBbTZsdrG6a5HvDZbug9r g1Epb8LmriCHuabnDXkEpkS+kerWqanj9o2YB2igbXzLEYBtp/WgwYcGJy6Mki7pEcCn tieQ== X-Gm-Message-State: AOPr4FUPcipF1aaU50KJQ+HsWlilnEjGhHOr5S7hKWakh5tEDIq4pFzuQgcP1n3FZVP+DQGF X-Received: by 10.28.127.80 with SMTP id a77mr4887053wmd.84.1461085008843; Tue, 19 Apr 2016 09:56:48 -0700 (PDT) Received: from new-host-34.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id x2sm1169329wjr.33.2016.04.19.09.56.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 09:56:47 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 03/10] iommu: introduce a reserved iova cookie Date: Tue, 19 Apr 2016 16:56:27 +0000 Message-Id: <1461084994-2355-4-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461084994-2355-1-git-send-email-eric.auger@linaro.org> References: <1461084994-2355-1-git-send-email-eric.auger@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160419_095711_477852_C2030B89 X-CRM114-Status: GOOD ( 14.04 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: julien.grall@arm.com, patches@linaro.org, Jean-Philippe.Brucker@arm.com, p.fedin@samsung.com, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, iommu@lists.linux-foundation.org, pranav.sawargaonkar@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch introduces some new fields in the iommu_domain struct, dedicated to reserved iova management. In a similar way as DMA mapping IOVA window, we need to store information related to a reserved IOVA window. The reserved_iova_cookie will store the reserved iova_domain handle. An RB tree indexed by physical address is introduced to store the host physical addresses bound to reserved IOVAs. Those physical addresses will correspond to MSI frame base addresses, also referred to as doorbells. Their number should be quite limited per domain. Also a spin_lock is introduced to protect accesses to the iova_domain and RB tree. The choice of a spin_lock is driven by the fact the RB tree will need to be accessed in MSI controller code not allowed to sleep. Signed-off-by: Eric Auger --- v5 -> v6: - initialize reserved_binding_list - use a spinlock instead of a mutex --- drivers/iommu/iommu.c | 2 ++ include/linux/iommu.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index b9df141..f70ef3b 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1073,6 +1073,8 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, domain->ops = bus->iommu_ops; domain->type = type; + spin_lock_init(&domain->reserved_lock); + domain->reserved_binding_list = RB_ROOT; return domain; } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b3e8c5b..60999db 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #define IOMMU_READ (1 << 0) @@ -83,6 +84,11 @@ struct iommu_domain { void *handler_token; struct iommu_domain_geometry geometry; void *iova_cookie; + void *reserved_iova_cookie; + /* rb tree indexed by PA, for reserved bindings only */ + struct rb_root reserved_binding_list; + /* protects reserved cookie and rbtree manipulation */ + spinlock_t reserved_lock; }; enum iommu_cap {