From patchwork Fri Jul 3 16:53:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 231228 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2560347ilg; Fri, 3 Jul 2020 09:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymk/ooLcrUjFWqPDUtSQnobeJ3I5NarczUkb5MgxP85zPp2JpSXUHdGi1UIWeEtnCYYqer X-Received: by 2002:a25:bf8c:: with SMTP id l12mr64452438ybk.447.1593795383456; Fri, 03 Jul 2020 09:56:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593795383; cv=none; d=google.com; s=arc-20160816; b=jNAu0Rcm+hIA8U8Lqeo4sH8JvhAkAqMlJdjKzp2cwO+PfzL5y3eycZs2dGITtgmeUH UNyH6ycQmElTgqOIv71Oe1gBi4UzBHzgeMX1OidNqrWlc7kh6HbID3RokH0/avIzNzDA pNpJdedswH8Hn2ImW79Tb2+Tqnxe1lfdETBellnYE3r5Nle5rmZ9wpSqeCd/N0/IDbHY AZ7KjK6g/jbt933WhNqSVce91ryeViXIcgGygNWUh1W+I7gCPEJJZSpevzOvAEkXhhqH sQJAGoCxTkUEMtiSQfLreoa2uCqdmnQ1HxPUxiYMQGgP7UbFAmNoUYc43TFucG+eeEbz V3aQ== 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=295eK5ijKQ0QsX4O3HxBkZyowFWTTmfTtCLGUV8KWHM=; b=C94VKyLg/akKYUHnHF3A7DEH5AJhl5KAQILuQQkk+Q2KjMpxbycF71bn6L2E7DsmE0 dzPF3l1wJSAzfKIaRyv2MU0w6yuM9TTOVlYMufIKT9wGOdN0jh5MUyEjvVq0VOE08SsP lRbLNbsPcdUS/VhMiWVM/HRmtBHgiqI71Kr/vrht5GFtSTB2pgJhdJt+m6Bh05I6pqQH YqRjgAZ+TvfdsS7jw5iFVPVJRvQvdAwoixYWx6hQsbOOPL4ngAghooB2jeCXFjA0LorG mOZujDYatjyA67gfjhske/rkYSPieiWCvkepQ1OW+rkssdZ6ngsYl/xa9ABlLJMUZJr/ i5Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qybWWgB8; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 124si1948040ybb.302.2020.07.03.09.56.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Jul 2020 09:56:23 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=qybWWgB8; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrOz8-0008QS-Sp for patch@linaro.org; Fri, 03 Jul 2020 12:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrOx7-0004aM-Nm for qemu-devel@nongnu.org; Fri, 03 Jul 2020 12:54:17 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrOx5-0005en-QS for qemu-devel@nongnu.org; Fri, 03 Jul 2020 12:54:17 -0400 Received: by mail-wr1-x42e.google.com with SMTP id z15so22143991wrl.8 for ; Fri, 03 Jul 2020 09:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=295eK5ijKQ0QsX4O3HxBkZyowFWTTmfTtCLGUV8KWHM=; b=qybWWgB86TqW4QOm8y+5eXTZA46C91bZTu64AVBPwyZIN/m7O1vqmvpJ3baou6DAGp jteupGK1EpJeAbpYE8cWX3qSajs7nafmeZj37jFpTf9IzIGMRVnuGqdHM8i1dgwegiPk 0bnbeqg2lFtr8Yc6ObgJlmZ7Z5TRmx0MEkXNxiDhxl4Fk+X9KQMF+CATlMaQhtzAaoBg t3XI/nRv4dKwOOTbvDxGo27UosGWNf5AaFX4JSRNERIiH1uKI4F9axKC+z2uh6wfJAhm ZjZUWGYTfnxeuEcHt64wrUsbIIlHGD2U7FL/DgLj6enirg+9+MKgQTYWhybSWkaBDWD1 LgZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=295eK5ijKQ0QsX4O3HxBkZyowFWTTmfTtCLGUV8KWHM=; b=VUyojpHAqYfW0cuJ7dA4IncsSvQZnkwrOqyDBxeBl5PBNNtViywSoP16oPJVDBmcft 4YEjNcPgUjEKDGv2+NM/lrGvhUTborj0exF79i7b/atxZRjNAK+5ENrLke1ITVVUnWW5 9e0k2h3Cy3OXBR7U+UhzysEKiEHH+tXPn9aUjNfjzmiA00MRC/n9PUq8Vupz9isAo/dt +6KYXwU1N8pffLoP1G6loe9jhHLaHw30nMcyXVK5vCHGnXcqMcDDkmnRsYfXW9Nh+VHF 3k24DH1Q02EUduvwJK0KRqSoX+YRv9wGTv5eDMKsavQN8ZQVZiqqPcpc77L/UnrPMk9L +1JQ== X-Gm-Message-State: AOAM531b/2dvxaJxUwjynMaZB8/J69rISXt0yoPw43fWku2uMjeCVwTi VDD2hd6NiJsErBn+Q8PF2u6Jso9E2dRwig== X-Received: by 2002:adf:8444:: with SMTP id 62mr35980364wrf.278.1593795254148; Fri, 03 Jul 2020 09:54:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j15sm5574224wrx.69.2020.07.03.09.54.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2020 09:54:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/34] virtio-iommu: Handle reserved regions in the translation process Date: Fri, 3 Jul 2020 17:53:37 +0100 Message-Id: <20200703165405.17672-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200703165405.17672-1-peter.maydell@linaro.org> References: <20200703165405.17672-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger 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 Message-id: 20200629070404.10969-4-eric.auger@redhat.com Signed-off-by: Peter Maydell --- hw/virtio/virtio-iommu.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -- 2.20.1 diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 2cdaa1969bb..b39e836181e 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -607,6 +607,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; @@ -640,6 +641,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",