From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp308903lfm; Fri, 26 Jun 2020 03:35:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx47UExKG9nwcs/UKAD/yZYSL3BdjOr918H0Qxv8JHNk+tjfVTFa4QG8B2a7fEFZAmQWXMB X-Received: by 2002:a25:3bd8:: with SMTP id i207mr3848665yba.167.1593167707147; Fri, 26 Jun 2020 03:35:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593167707; cv=none; d=google.com; s=arc-20160816; b=kxdkr3ixbQWWBeZ616dLSi6CatKhFHZ0JOVa44isP7Hq3qCLlcKIJPmgGbC+2fRL2C 1iBPJRYxrD/bU/+P1xIwkJJrIIDwc2c/2j2jzTdb3RSUZQbrWoaN0s7ck+/VSTQlSoUs Hxpxi1fABLA3tPWjbYay8OLyc3+x6H3tjtowW4u+pAXcRjxpwlBOxb0AThDefLozGfMT p4kADFWh7GZjbtgpmP044xkJJPlFKYW5qV3G593BmYE6pULkEbWjrtPljOFakUMpp/Ct e7rZBWZrCYg3kMLT+R6KBF9EO9/Yt6gGaEY3q4WUpTEVO2jDTl3VmTTAz7z2+ljKTiTa Jt4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oYVFAVqYGf5neJ3Wr0VtiQUIg29jzhHrC/alVMqoehE=; b=Dq3XZqztSmq6Fm1B/kDBjiONRGmbR/BP66s8SLUuCnkfqTd2zcYiMPvJ7gvxQPmeCW d7G2GqtMhkSd7xoZi1JtdOBgBNEDhj3vFxDj6JXPLimVhbTo3QiAM/9928qnYJrbT/X2 jPBBNKz1vyfC5UvuzbdUwMO0aL+wwdt5FT/0yfQqExR2G5aNA/TLSylt1EjGJi96WQ74 KXd6OgQBwqJCMRWIe826asSq00CY8d0lz7eFZoIi3ENzlHU3iGaEu5c2DekdE6QbaAVR UjXhRJJr8Mwx2m4ktGbhixcZJHYVZn7gbfMkjOyWd6zIC7buf8uMPpLYIjRvW7JBHZ1w 485A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=azdGvDOI; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (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 83si23256038ybd.42.2020.06.26.03.35.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 03:35:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=azdGvDOI; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:33602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jolhK-00070c-F2 for alex.bennee@linaro.org; Fri, 26 Jun 2020 06:35:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joldp-00026p-Ed for qemu-devel@nongnu.org; Fri, 26 Jun 2020 06:31:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50429 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joldn-0003G7-N4 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 06:31:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593167487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oYVFAVqYGf5neJ3Wr0VtiQUIg29jzhHrC/alVMqoehE=; b=azdGvDOIKHwCKt9lTyc6CILGls8H09AXU4IbRJhUtI+l6N3fjogVWuCg4gMe7nb0GpAAXY 7hPvXVCRahTlGE9u9ccqdg4/mQIaCgSoPARm39UnfM6gJGN3gH3esZKHCnXA2k77zyW9hk NY/99vGB4HGR7P56g5FlTbMqwGS8Tns= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-76-fd_208t-M4WH4m7eLJ7wsA-1; Fri, 26 Jun 2020 06:31:25 -0400 X-MC-Unique: fd_208t-M4WH4m7eLJ7wsA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46DB010059A0; Fri, 26 Jun 2020 10:31:24 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2482610F3; Fri, 26 Jun 2020 10:31:20 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, mst@redhat.com, armbru@redhat.com, pbonzini@redhat.com, jean-philippe@linaro.org, bbhushan2@marvell.com, peterx@redhat.com Subject: [PATCH v6 3/5] virtio-iommu: Handle reserved regions in the translation process Date: Fri, 26 Jun 2020 12:30:55 +0200 Message-Id: <20200626103057.11263-4-eric.auger@redhat.com> In-Reply-To: <20200626103057.11263-1-eric.auger@redhat.com> References: <20200626103057.11263-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=eric.auger@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/26 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: ClDjS8t53LKt When translating an address we need to check if it belongs to a reserved virtual address range. If it does, there are 2 cases: - it belongs to a RESERVED region: the guest should neither use this address in a MAP not instruct the end-point to DMA on them. We report an error - It belongs to an MSI region: we bypass the translation. Signed-off-by: Eric Auger Reviewed-by: Peter Xu Reviewed-by: Jean-Philippe Brucker Reviewed-by: Michael S. Tsirkin --- v1 -> v2: - use addr when testing addr belongs to the reserved region and use a block local variable --- hw/virtio/virtio-iommu.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 5e72fd53a1..4a50e24d21 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -603,6 +603,7 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr, uint32_t sid, flags; bool bypass_allowed; bool found; + int i; interval.low = addr; interval.high = addr + 1; @@ -636,6 +637,25 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto unlock; } + for (i = 0; i < s->nb_reserved_regions; i++) { + ReservedRegion *reg = &s->reserved_regions[i]; + + if (addr >= reg->low && addr <= reg->high) { + switch (reg->type) { + case VIRTIO_IOMMU_RESV_MEM_T_MSI: + entry.perm = flag; + break; + case VIRTIO_IOMMU_RESV_MEM_T_RESERVED: + default: + virtio_iommu_report_fault(s, VIRTIO_IOMMU_FAULT_R_MAPPING, + VIRTIO_IOMMU_FAULT_F_ADDRESS, + sid, addr); + break; + } + goto unlock; + } + } + if (!ep->domain) { if (!bypass_allowed) { error_report_once("%s %02x:%02x.%01x not attached to any domain", -- 2.20.1