From patchwork Wed Nov 4 04:51:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 320512 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp5159115ilc; Tue, 3 Nov 2020 21:11:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyduO86My0EKz+0CnYqZEU5b2ntqJ7Gtgai0WF41UX3UPTxOTvgZRIMoPskL91reOu5vLuq X-Received: by 2002:a25:40c5:: with SMTP id n188mr32238004yba.514.1604466717136; Tue, 03 Nov 2020 21:11:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604466717; cv=none; d=google.com; s=arc-20160816; b=epXPqeqTIzM6npXEKfWSxclBBQSSxsbiC+A/NH1pzIIEvtSbEEl80g3NdBdfSNm32W LLSDkEhSXFfpKINpiDb0oE20npiZR6eeR33gpma5OeZ/hqXc3nJIrO9LBLTaWf9QTsyt dOYijJ1hzy8Wt7GBNKpp+NjG/LPZdULTEI+b3G7hu/kpE62J1ii8wpMxYUcoTwmYCw1c LHlix0i/XPuu3J2Fobfu2UhTdlt5zTdgC9IdjPRROowkpZBEkr45CYy2JMLJKsw3INmG SnFwV1EzZA8JJ46iNuszKCWuL+HU5PNv/YXOXdABL5ru7l7wD2gKEsurkSbTl7xU+5lB Cjfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=tvJ0s3bSV9g9bsoYugn7fOSbhCEdSfwOqB79D2kkBqw=; b=Z3pPHzVvgzodhu2vPHAR1jw0xRmKpJs5hD0Ab3Ig5SCDnCbtkew5eo6aQKFpyE8Tvq t+ae1b5bahQlLUXTd/LwyY4PPFtUX6Oz474x6GCMmlqoZ0FbTILLKXBvLZ+FIqkkUnJH 3F/rUehXZAunJ0ZE02Dg5jlpTYqqlvYUeOfF56de+Kt1P0cwFSfSN1sdbSqdyykxDrlN jK+m8F9V044SRgQSHbS5GP/OgTVryCDFwK5j/9bPOD3YO/TG2vyYVifAPZ2xiZgN3vwZ 5oIj0xfKw0xeF4TFxKj7qIoPf6O1AnRslsDk+5Yi7WipIxsZIjCPN3/fYhDXMDekzMIZ 6hJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="TRfWf/GV"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x5si1277374ybs.248.2020.11.03.21.11.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Nov 2020 21:11:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="TRfWf/GV"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:49972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaB5Q-0002OL-Hx for patch@linaro.org; Wed, 04 Nov 2020 00:11:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaAmR-0007MZ-8x for qemu-devel@nongnu.org; Tue, 03 Nov 2020 23:52:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaAmO-0004ra-LT for qemu-devel@nongnu.org; Tue, 03 Nov 2020 23:52:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604465535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tvJ0s3bSV9g9bsoYugn7fOSbhCEdSfwOqB79D2kkBqw=; b=TRfWf/GVv5nWE4XMD5WGwt+C/uN7MQd5EhyCDN0nxc2vkJ4vIkrXn5vb0lkc7h4XciDFq5 o1Q5m9RsUbyY6dhDn8Im+g2y/rMHN6eoMXNm8QFJpDEymSHegccamhEMwhXjbpi4zvImW5 tdoKT3kWuzzpvMnQ7XiKl9B01aCHHIo= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-363-3Ds83iu1MEq-Ii9swDu7qQ-1; Tue, 03 Nov 2020 23:51:24 -0500 X-MC-Unique: 3Ds83iu1MEq-Ii9swDu7qQ-1 Received: by mail-wr1-f69.google.com with SMTP id w3so6590919wrt.11 for ; Tue, 03 Nov 2020 20:51:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tvJ0s3bSV9g9bsoYugn7fOSbhCEdSfwOqB79D2kkBqw=; b=gKcErJ+8xhNrwWR/u/v42mlQ5+AB8oQJSAOZFQwbiAiiFcAgaTakgQ3XF5b4JYPdn0 0P9zhGBvlQypvX+L8vd/S1zAfWNHzaztVd9I3bryejaQwR1hJiIHPs32O2vf7z1GuZIb bZ/f64WRVIgZG9z614jX5XU+nKXn5F0ET6tvpNdtGQPU5nzq23ZCYpQZglrdJP+aoZaD w1naFOn3rb3yc3pNYgBLVPc2rWLPrem4QUEh0lE+fFaY4yeYqfHa2foI1fz3OLBvfqyo zcrm/muUDB2trHgwCwKTLTpdndGXEC3ixbkT1RUdseTuw+kPeNGpi9SNATxzIP5hiBqW BMwA== X-Gm-Message-State: AOAM531xVfehDaxP9y65wmsz2UyQthgoyVvhdlKJXfZDcUCfy/OoohUr tnWv/dEpRa3bloIk61Qtn4NvXmA3tiJqXrR/Q2ae2jzDPc0V/qSwAtQXdWs6tsSMzI4TRTleVhl kX2zHZm64t766vZY= X-Received: by 2002:adf:db44:: with SMTP id f4mr3881025wrj.168.1604465482931; Tue, 03 Nov 2020 20:51:22 -0800 (PST) X-Received: by 2002:adf:db44:: with SMTP id f4mr3881011wrj.168.1604465482822; Tue, 03 Nov 2020 20:51:22 -0800 (PST) Received: from redhat.com (bzq-79-176-118-93.red.bezeqint.net. [79.176.118.93]) by smtp.gmail.com with ESMTPSA id y187sm813239wmg.33.2020.11.03.20.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 20:51:22 -0800 (PST) Date: Tue, 3 Nov 2020 23:51:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 14/38] virtio-iommu: Store memory region in endpoint struct Message-ID: <20201104044937.226370-15-mst@redhat.com> References: <20201104044937.226370-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201104044937.226370-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eric Auger , Jean-Philippe Brucker Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker Store the memory region associated to each endpoint into the endpoint structure, to allow efficient memory notification on map/unmap. Acked-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Message-Id: <20201030180510.747225-3-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-iommu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- MST diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 4c8f3909b7..a5c2d69aad 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -49,6 +49,7 @@ typedef struct VirtIOIOMMUDomain { typedef struct VirtIOIOMMUEndpoint { uint32_t id; VirtIOIOMMUDomain *domain; + IOMMUMemoryRegion *iommu_mr; QLIST_ENTRY(VirtIOIOMMUEndpoint) next; } VirtIOIOMMUEndpoint; @@ -137,16 +138,19 @@ static VirtIOIOMMUEndpoint *virtio_iommu_get_endpoint(VirtIOIOMMU *s, uint32_t ep_id) { VirtIOIOMMUEndpoint *ep; + IOMMUMemoryRegion *mr; ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(ep_id)); if (ep) { return ep; } - if (!virtio_iommu_mr(s, ep_id)) { + mr = virtio_iommu_mr(s, ep_id); + if (!mr) { return NULL; } ep = g_malloc0(sizeof(*ep)); ep->id = ep_id; + ep->iommu_mr = mr; trace_virtio_iommu_get_endpoint(ep_id); g_tree_insert(s->endpoints, GUINT_TO_POINTER(ep_id), ep); return ep; @@ -910,9 +914,14 @@ static gboolean reconstruct_endpoints(gpointer key, gpointer value, VirtIOIOMMU *s = (VirtIOIOMMU *)data; VirtIOIOMMUDomain *d = (VirtIOIOMMUDomain *)value; VirtIOIOMMUEndpoint *iter; + IOMMUMemoryRegion *mr; QLIST_FOREACH(iter, &d->endpoint_list, next) { + mr = virtio_iommu_mr(s, iter->id); + assert(mr); + iter->domain = d; + iter->iommu_mr = mr; g_tree_insert(s->endpoints, GUINT_TO_POINTER(iter->id), iter); } return false; /* continue the domain traversal */