From patchwork Tue Sep 20 17:40:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9342245 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 93FB06077A for ; Tue, 20 Sep 2016 18:00:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DFCE29878 for ; Tue, 20 Sep 2016 18:00:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82E752996E; Tue, 20 Sep 2016 18:00:38 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 E72B829878 for ; Tue, 20 Sep 2016 18:00:37 +0000 (UTC) Received: from localhost ([::1]:37161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmPLR-0000DO-4S for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Sep 2016 14:00:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmP3g-0002Bh-0O for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:42:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmP3a-0003No-Un for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:42:14 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmP3a-0003NZ-Le for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:42:10 -0400 Received: by mail-wm0-f67.google.com with SMTP id w84so4590986wmg.0 for ; Tue, 20 Sep 2016 10:42:10 -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=wFA49C1muBSk1ybsJcE8p80KFBvZeNi9FMXfUPg2tr8=; b=oYinxN9tm2dkVRnkXwxdx2nsAbx89V9CCueceloXDAGG1E+7qbxXKhxCB4xDv4CZF1 e6rcuq0wzdw9oetq+lE1PFaV4Q/HCvjbMu1x7bXRGRvz2BoAH+fuXmZ0jI//EVFhPfOZ VAWaYy8Sr28wTJgHcJnx6m3Ju/Kc4ShV3TmhSU+drw7f/16gXfTiCyrC9qIIJrZiXQPZ hpFVMMDDC0pAbK9qnBAQyiDs26sSpVMCPHU4IP32+Z7YAcTPVK/jsJl62FYfDP5Y6SIU jo3LKajbGGmUelUTFsJZYfU6Brd5NobpHxb20VnsV5PjDK+G74+dIjshReiMO9QJJ+F2 rcdQ== 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=wFA49C1muBSk1ybsJcE8p80KFBvZeNi9FMXfUPg2tr8=; b=LkbtOVdbjZDPD1OBUiTcfPsdSl1nAKPDGC0RfxAakRHp5ME2QHO8+L6nO6FFrAnpg6 5qPasHyl+Y5nnAdgNYBcmZZRF9rwU4IdiS2DjetXVqO4rv+nj87yFB4UPN0kstDUqn1f bx5sDCDbnzCU38KbIuviBy0Ft3oWt4fiHypvqhYyGUhnNrtiy0L9VbMMXi2FuUDr0aXk F/m3BnmvPvmH/Ti0cODtPygBByeqb1xlExF9Pbf9lSBejOpk7h1gE7d7wnIfZRuSA6YD hM9dPu3lhviwMMABfV3qv8ejTh8r+B8a8iDzSPRd7POfe0w+/yYT6Drv/KyP1pS2KzAa LKFg== X-Gm-Message-State: AE9vXwPH/ZC15KpxrVTpiBEB/qs2eQLOqh2Li8/lGW1YQPbHoKboFw22PjrYjcb+oOFsAA== X-Received: by 10.28.73.138 with SMTP id w132mr4274874wma.92.1474393269999; Tue, 20 Sep 2016 10:41:09 -0700 (PDT) Received: from debian.ameoba ([154.122.91.14]) by smtp.googlemail.com with ESMTPSA id lj2sm29409964wjc.38.2016.09.20.10.41.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Sep 2016 10:41:09 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org, rkrcmar@redhat.com, mst@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, jan.kiszka@web.de, pbonzini@redhat.com Date: Tue, 20 Sep 2016 20:40:42 +0300 Message-Id: <1474393246-29085-3-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474393246-29085-1-git-send-email-davidkiarie4@gmail.com> References: <1474393246-29085-1-git-send-email-davidkiarie4@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.67 Subject: [Qemu-devel] [V5 2/6] hw/i386: enforce SID verification 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: David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Platform devices are now able to make interrupt request with explicit SIDs hence remove unnecesary check for invalid SID. Signed-off-by: David Kiarie --- hw/i386/intel_iommu.c | 72 ++++++++++++++++++++------------------------- include/hw/i386/x86-iommu.h | 1 - 2 files changed, 32 insertions(+), 41 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 496d836..3f6da40 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2043,43 +2043,41 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index, return -VTD_FR_IR_IRTE_RSVD; } - if (sid != X86_IOMMU_SID_INVALID) { - /* Validate IRTE SID */ - source_id = le32_to_cpu(entry->irte.source_id); - switch (entry->irte.sid_vtype) { - case VTD_SVT_NONE: - VTD_DPRINTF(IR, "No SID validation for IRTE index %d", index); - break; - - case VTD_SVT_ALL: - mask = vtd_svt_mask[entry->irte.sid_q]; - if ((source_id & mask) != (sid & mask)) { - VTD_DPRINTF(GENERAL, "SID validation for IRTE index " - "%d failed (reqid 0x%04x sid 0x%04x)", index, - sid, source_id); - return -VTD_FR_IR_SID_ERR; - } - break; + /* Validate IRTE SID */ + source_id = le32_to_cpu(entry->irte.source_id); + switch (entry->irte.sid_vtype) { + case VTD_SVT_NONE: + VTD_DPRINTF(IR, "No SID validation for IRTE index %d", index); + break; - case VTD_SVT_BUS: - bus_max = source_id >> 8; - bus_min = source_id & 0xff; - bus = sid >> 8; - if (bus > bus_max || bus < bus_min) { - VTD_DPRINTF(GENERAL, "SID validation for IRTE index %d " - "failed (bus %d outside %d-%d)", index, bus, - bus_min, bus_max); - return -VTD_FR_IR_SID_ERR; - } - break; + case VTD_SVT_ALL: + mask = vtd_svt_mask[entry->irte.sid_q]; + if ((source_id & mask) != (sid & mask)) { + VTD_DPRINTF(GENERAL, "SID validation for IRTE index " + "%d failed (reqid 0x%04x sid 0x%04x)", index, + sid, source_id); + return -VTD_FR_IR_SID_ERR; + } + break; - default: - VTD_DPRINTF(GENERAL, "Invalid SVT bits (0x%x) in IRTE index " - "%d", entry->irte.sid_vtype, index); - /* Take this as verification failure. */ + case VTD_SVT_BUS: + bus_max = source_id >> 8; + bus_min = source_id & 0xff; + bus = sid >> 8; + if (bus > bus_max || bus < bus_min) { + VTD_DPRINTF(GENERAL, "SID validation for IRTE index %d " + "failed (bus %d outside %d-%d)", index, bus, + bus_min, bus_max); return -VTD_FR_IR_SID_ERR; - break; } + break; + + default: + VTD_DPRINTF(GENERAL, "Invalid SVT bits (0x%x) in IRTE index " + "%d", entry->irte.sid_vtype, index); + /* Take this as verification failure. */ + return -VTD_FR_IR_SID_ERR; + break; } return 0; @@ -2252,17 +2250,11 @@ static MemTxResult vtd_mem_ir_write(void *opaque, hwaddr addr, { int ret = 0; MSIMessage from = {}, to = {}; - uint16_t sid = X86_IOMMU_SID_INVALID; from.address = (uint64_t) addr + VTD_INTERRUPT_ADDR_FIRST; from.data = (uint32_t) value; - if (!attrs.unspecified) { - /* We have explicit Source ID */ - sid = attrs.requester_id; - } - - ret = vtd_interrupt_remap_msi(opaque, &from, &to, sid); + ret = vtd_interrupt_remap_msi(opaque, &from, &to, attrs.requester_id); if (ret) { /* TODO: report error */ VTD_DPRINTF(GENERAL, "int remap fail for addr 0x%"PRIx64 diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index 5d05865..af869ab 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -32,7 +32,6 @@ OBJECT_GET_CLASS(X86IOMMUClass, obj, TYPE_X86_IOMMU_DEVICE) #define X86_IOMMU_PCI_DEVFN_MAX 256 -#define X86_IOMMU_SID_INVALID (0xffff) typedef struct X86IOMMUState X86IOMMUState; typedef struct X86IOMMUClass X86IOMMUClass;