From patchwork Mon May 9 12:16:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9045921 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1CC989F1C3 for ; Mon, 9 May 2016 12:20:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39D3F200F0 for ; Mon, 9 May 2016 12:20:51 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 4A862200ED for ; Mon, 9 May 2016 12:20:49 +0000 (UTC) Received: from localhost ([::1]:40954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azkB6-000182-0T for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 May 2016 08:20:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azk72-00024g-Bd for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azk6r-0006C1-TK for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:35 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:37958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azk6r-0006Bi-J1 for qemu-devel@nongnu.org; Mon, 09 May 2016 08:16:25 -0400 Received: by mail-wm0-x229.google.com with SMTP id g17so183367990wme.1 for ; Mon, 09 May 2016 05:16:25 -0700 (PDT) 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=0qdsgs5lyl/w582SwYzA+HouFTRozpEYvuU6v0azkhU=; b=RTbg5FY7yCHAHUlTASSVPdjY3xxG/hw8GVs5Izsa6D8rbq8LqiZe9ytKothHYNgtvj XhGnr4NYfDuywqILv58DL7q+0+qayuqKExTqyywHyHKHqqV3Hkta2AG7RvCzJJgafHgv mfEx6CnJggwut92+mwZ9zmEn0dEOT9lf+s8ZFRSVkbdyQ58CRuBmUKlsrsn2dG9TePCP ZDfGTphjM5cEL8CfM1/0J8sI8u51mHZav8ZsjXwYqd++7sJwzQqmS8ZaPHwiUnqD3oJ+ lM9TbcW0fqoqxlHiMp+a+N1mcg7QbRiQFU5sCgFeV/ITmrS3Kl/rW1XLVJSkWBkEaFbC dBIQ== 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=0qdsgs5lyl/w582SwYzA+HouFTRozpEYvuU6v0azkhU=; b=KJBztUeiVbAY/LFZ2Za37yRFmpZ6fsVlBScD6Y29HgZOil702dfPJtoZKBPOscV8SG KnNOvKWidhvuaGclPImxe4HdWkIeuO4hboRKTPn5DI7To4OsmPkf77LqbUkA33c/AvWI vqijT+xH2wr2Ij9+09Jn/0cefiWo/QQwdh97GtCoTvkwiEajqQYEC0bsdlxz3D4uzy+4 szn6ivIXLUvva0UauLxvuPwWClBwfsB7O0vWQAJWXRZC80KUkjxK1vAsK78cFYzFsvIm 70TmSPmf9ryXC5EkY0jw6e56n5+10b1w2N2g8uOf8uxtJDXbe0mqmX0ZNv/qwO+GGnvM 7fkw== X-Gm-Message-State: AOPr4FU8EIhKGQZUSEgb3K2F84PhHu2xEB1cQhFH3B/CrO0hvrucRYbhYcr4yyGgoV0/+Q== X-Received: by 10.28.167.193 with SMTP id q184mr11412885wme.63.1462796185017; Mon, 09 May 2016 05:16:25 -0700 (PDT) Received: from debian.flybox.orange ([154.122.80.149]) by smtp.googlemail.com with ESMTPSA id xt9sm30777323wjb.17.2016.05.09.05.16.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 May 2016 05:16:24 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Mon, 9 May 2016 15:16:01 +0300 Message-Id: <1462796162-13375-4-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462796162-13375-1-git-send-email-davidkiarie4@gmail.com> References: <1462796162-13375-1-git-send-email-davidkiarie4@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::229 Subject: [Qemu-devel] [V10 3/4] hw/core: provision for overriding emulated IOMMU 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: mst@redhat.com, peterx@redhat.com, valentine.sinitsyn@gmail.com, jan.kiszka@web.de, marcel@redhat.com, David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Added an enum, subject to review, to machine properties which it used to override iommu emulated from Intel to AMD. Signed-off-by: David Kiarie --- hw/core/machine.c | 29 ++++++++++++++++++++++++++--- include/hw/boards.h | 1 + include/hw/i386/intel_iommu.h | 1 + qemu-options.hx | 7 +++++-- util/qemu-config.c | 8 ++++++-- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 6dbbc85..fe44e25 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -15,6 +15,8 @@ #include "qapi/error.h" #include "qapi-visit.h" #include "qapi/visitor.h" +#include "hw/i386/amd_iommu.h" +#include "hw/i386/intel_iommu.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" @@ -297,9 +299,26 @@ static void machine_set_iommu(Object *obj, bool value, Error **errp) { MachineState *ms = MACHINE(obj); + ms->iommu_type = TYPE_INTEL; ms->iommu = value; } +static void machine_set_iommu_override(Object *obj, const char *value, + Error **errp) +{ + MachineState *ms = MACHINE(obj); + + /* ensure a valid iommu type */ + if (g_strcmp0(value, AMD_IOMMU_STR) == 0) { + ms->iommu_type = TYPE_AMD; + } else if (g_strcmp0(value, INTEL_IOMMU_STR) == 0) { + ms->iommu_type = TYPE_INTEL; + } else { + error_setg(errp, "Invalid IOMMU type %s", value); + return; + } +} + static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp) { MachineState *ms = MACHINE(obj); @@ -473,10 +492,14 @@ static void machine_initfn(Object *obj) "Firmware image", NULL); object_property_add_bool(obj, "iommu", - machine_get_iommu, - machine_set_iommu, NULL); + machine_get_iommu, machine_set_iommu, NULL); object_property_set_description(obj, "iommu", - "Set on/off to enable/disable Intel IOMMU (VT-d)", + "Set on to enable IOMMU emulation", + NULL); + object_property_add_str(obj, "x-iommu-type", + NULL, machine_set_iommu_override, NULL); + object_property_set_description(obj, "x-iommu-type", + "Set on to override emulated IOMMU to AMD IOMMU", NULL); object_property_add_bool(obj, "suppress-vmdesc", machine_get_suppress_vmdesc, diff --git a/include/hw/boards.h b/include/hw/boards.h index dbe6745..5b7eeda 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -158,6 +158,7 @@ struct MachineState { bool igd_gfx_passthru; char *firmware; bool iommu; + IommuType iommu_type; bool suppress_vmdesc; bool enforce_config_section; diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index b024ffa..539530c 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -27,6 +27,7 @@ #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" #define INTEL_IOMMU_DEVICE(obj) \ OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) +#define INTEL_IOMMU_STR "intel" /* DMAR Hardware Unit Definition address (IOMMU unit) */ #define Q35_HOST_BRIDGE_IOMMU_ADDR 0xfed90000ULL diff --git a/qemu-options.hx b/qemu-options.hx index 6106520..81217d3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,7 +38,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " kvm_shadow_mem=size of KVM shadow MMU\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" - " iommu=on|off controls emulated Intel IOMMU (VT-d) support (default=off)\n" + " iommu=on|off controls emulated IOMMU support(default: off)\n" + " x-iommu-type=amd|intel overrides emulated IOMMU to AMD IOMMU (default: intel)\n" " igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n" " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" @@ -74,7 +75,9 @@ Enables or disables memory merge support. This feature, when supported by the host, de-duplicates identical memory pages among VMs instances (enabled by default). @item iommu=on|off -Enables or disables emulated Intel IOMMU (VT-d) support. The default is off. +Enables and disables IOMMU emulation. The default is off. +@item x-iommu-type=on|off +Overrides emulated IOMMU from AMD IOMMU. By default Intel IOMMU is emulated. @item aes-key-wrap=on|off Enables or disables AES key wrapping support on s390-ccw hosts. This feature controls whether AES wrapping keys will be created to allow diff --git a/util/qemu-config.c b/util/qemu-config.c index fb97307..8886abf 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -213,8 +213,12 @@ static QemuOptsList machine_opts = { .help = "firmware image", },{ .name = "iommu", - .type = QEMU_OPT_BOOL, - .help = "Set on/off to enable/disable Intel IOMMU (VT-d)", + .type = QEMU_OPT_BOOL, + .help = "Set on/off to enable iommu", + },{ + .name = "x-iommu-type", + .type = QEMU_OPT_STRING, + .help = "Overrides emulated IOMMU from Intel to AMD", },{ .name = "suppress-vmdesc", .type = QEMU_OPT_BOOL,