From patchwork Tue Nov 8 11:04:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aviv B.D." X-Patchwork-Id: 9417157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D90F760585 for ; Tue, 8 Nov 2016 11:07:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9D9527E5A for ; Tue, 8 Nov 2016 11:07:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC86428B41; Tue, 8 Nov 2016 11:07:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 49F3E27E5A for ; Tue, 8 Nov 2016 11:07:10 +0000 (UTC) Received: from localhost ([::1]:60157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c44FB-0003kq-Gz for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Nov 2016 06:07:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c44DM-0002jB-Kp for qemu-devel@nongnu.org; Tue, 08 Nov 2016 06:05:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c44DK-00049w-Jq for qemu-devel@nongnu.org; Tue, 08 Nov 2016 06:05:16 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36409) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c44DK-00049f-DY for qemu-devel@nongnu.org; Tue, 08 Nov 2016 06:05:14 -0500 Received: by mail-wm0-x243.google.com with SMTP id c17so21740466wmc.3 for ; Tue, 08 Nov 2016 03:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V10EJEIGsUDdIcVXyq/LZg2AA4qX1SLs2kBHbbqij/w=; b=awFSyHdBQzpBiKeQho1Izj8QZsXwGP9MYuwyJJDPnjvfTd3p7Sq69MQz9NB5EbGZib gUF9CUe8Vd49egwHkJySTUKDwgKvJBbDFHKq9GiaiV//DV1PngXvvyDLBA5p0OOxdqv3 43buMuNwpbwHl7+Rt39OVF3yQVHZdozi/a/Ag9Zxk8bmIxgYTxC7DxCqJ4fQiOwfbqc8 kxON5mpXF4czKrtKn6/PUgsXCtI6JXM84mvZV8+0XB/cNZGAWqacKPGIq2KslBtP92mf HdJS45qOfrA9zlhb/rs54iC+ejglaXihCqyrXRoVIGYqcjG1LSQmL/UmlUFscCoeWgHx Z/pg== 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=V10EJEIGsUDdIcVXyq/LZg2AA4qX1SLs2kBHbbqij/w=; b=cWdG6YeneVsTaOVQJeJwtLvfDZvDR+813VMvhH1ftXEhZfQK1G5V2s5yjtzsU14mPQ 7fvH7XsGO38f6Uwx4pCigMZknXUBAas+YmGsednuIqzjQvIqx5gzAkWFRsSgIAtK/wV8 72mPid6IyFX1NRLxIcmXuudYI6HoLmb7QGTpAHldquqi4+196ptpjMepp1hxcrPNVLcI ULTK6GhizF+H2r2cmCNkdtYvGbGNhMKS2o31QCNNlTP8zaEozYQW+56ypdquo147+xs9 BSQ0Vqvbr6JQv7KAnwzr4YSMNaMznvLiNZE7DZq0PfEjZ9iH3tRBi/5Ddi0RdQvztxqy DJ0Q== X-Gm-Message-State: ABUngvfzFqhZmtQelWeWAFykBM8rdMKgBgD3aPHS4ez7ZCG5QYWetQ05BIbiK/+MXqt64w== X-Received: by 10.28.189.69 with SMTP id n66mr13417190wmf.35.1478603113315; Tue, 08 Nov 2016 03:05:13 -0800 (PST) Received: from tapuz2.cslcs.technion.ac.il (tapuz2.cslcs.technion.ac.il. [132.68.206.212]) by smtp.gmail.com with ESMTPSA id vf8sm36388409wjc.27.2016.11.08.03.05.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 03:05:12 -0800 (PST) From: "Aviv B.D" To: qemu-devel@nongnu.org Date: Tue, 8 Nov 2016 13:04:22 +0200 Message-Id: <1478603064-32562-2-git-send-email-bd.aviv@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478603064-32562-1-git-send-email-bd.aviv@gmail.com> References: <1478603064-32562-1-git-send-email-bd.aviv@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH v6 1/3] IOMMU: add option to enable VTD_CAP_CM to vIOMMU capility exposoed to guest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Kiszka , Alex Williamson , Aviv Ben-David , Peter Xu , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Aviv Ben-David" This capability asks the guest to invalidate cache before each map operation. We can use this invalidation to trap map operations in the hypervisor. Signed-off-by: Aviv Ben-David --- hw/i386/intel_iommu.c | 5 +++++ hw/i386/intel_iommu_internal.h | 1 + include/hw/i386/intel_iommu.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 1655a65..834887f 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2017,6 +2017,7 @@ static Property vtd_properties[] = { DEFINE_PROP_ON_OFF_AUTO("eim", IntelIOMMUState, intr_eim, ON_OFF_AUTO_AUTO), DEFINE_PROP_BOOL("x-buggy-eim", IntelIOMMUState, buggy_eim, false), + DEFINE_PROP_BOOL("cache-mode", IntelIOMMUState, cache_mode_enabled, FALSE), DEFINE_PROP_END_OF_LIST(), }; @@ -2391,6 +2392,10 @@ static void vtd_init(IntelIOMMUState *s) assert(s->intr_eim != ON_OFF_AUTO_AUTO); } + if (s->cache_mode_enabled) { + s->cap |= VTD_CAP_CM; + } + vtd_reset_context_cache(s); vtd_reset_iotlb(s); diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index 0829a50..35d9f3a 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -201,6 +201,7 @@ #define VTD_CAP_MAMV (VTD_MAMV << 48) #define VTD_CAP_PSI (1ULL << 39) #define VTD_CAP_SLLPS ((1ULL << 34) | (1ULL << 35)) +#define VTD_CAP_CM (1ULL << 7) /* Supported Adjusted Guest Address Widths */ #define VTD_CAP_SAGAW_SHIFT 8 diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 1989c1e..42d293f 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -258,6 +258,8 @@ struct IntelIOMMUState { uint8_t womask[DMAR_REG_SIZE]; /* WO (write only - read returns 0) */ uint32_t version; + bool cache_mode_enabled; /* RO - is cap CM enabled? */ + dma_addr_t root; /* Current root table pointer */ bool root_extended; /* Type of root table (extended or not) */ bool dmar_enabled; /* Set if DMA remapping is enabled */