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: Auger Eric X-Patchwork-Id: 66114 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1968697qge; Tue, 19 Apr 2016 09:56:51 -0700 (PDT) X-Received: by 10.194.62.145 with SMTP id y17mr4471369wjr.109.1461085009149; Tue, 19 Apr 2016 09:56:49 -0700 (PDT) Return-Path: Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com. [2a00:1450:400c:c09::236]) by mx.google.com with ESMTPS id 63si5132492wmo.92.2016.04.19.09.56.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2016 09:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::236 as permitted sender) client-ip=2a00:1450:400c:c09::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::236 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x236.google.com with SMTP id 127so6184983wmz.0 for ; Tue, 19 Apr 2016 09:56:49 -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=E2rxTv0DitJLdsCBvEx6PQ7d7E0hyHhOPyJ3O1T7xyGd/o+uA9bFQa5cFlWzrr1U74 C1g5hZUHLKjHY1/6imA0BaQp/5rlrd8mwLceSMgpboubFwoHmEpkWSUaAouxkHWojPPj F+mCiuh4R1aaihfbw6SaH6/pJ013vEAG1x3Qr9ZW9J/S6PEewuuaVV2Othydf8NTrVsr c1TdMLcloZL2DJtNbNVTMXVJlE3lLfycxszG6CG8b8T0xk6Zwul+qZM4KSUI3/5e9nTm dRqhX6VtxscDxD0FnPNxW73VLNNA5XR7XbfQEnb620gq5y9d6s8MP3AWER7NaANa7YWS rezA== X-Gm-Message-State: AOPr4FUprYDlLC7k58ZdhlrISXrgo69rTjFByZKLYn5MsAdVgYVQEq0sNOqHSwrxh6zexA0R/V4= X-Received: by 10.28.127.80 with SMTP id a77mr4887053wmd.84.1461085008843; Tue, 19 Apr 2016 09:56:48 -0700 (PDT) Return-Path: 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 Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com 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> 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(+) -- 1.9.1 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 {