From patchwork Fri Sep 14 18:26:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10601149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 193F814BD for ; Fri, 14 Sep 2018 18:33:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0566B2B700 for ; Fri, 14 Sep 2018 18:33:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED9AB2B733; Fri, 14 Sep 2018 18:33:11 +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=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,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 444832B701 for ; Fri, 14 Sep 2018 18:33:11 +0000 (UTC) Received: from localhost ([::1]:52891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0sty-0003h3-8R for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Sep 2018 14:33:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0soV-0008MS-DW for qemu-devel@nongnu.org; Fri, 14 Sep 2018 14:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g0soS-0003ew-Kk for qemu-devel@nongnu.org; Fri, 14 Sep 2018 14:27:31 -0400 Received: from mail-eopbgr690075.outbound.protection.outlook.com ([40.107.69.75]:22016 helo=NAM04-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g0soS-0003bD-C8 for qemu-devel@nongnu.org; Fri, 14 Sep 2018 14:27:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1Sk/esyBt66bDnbvUHoVqnQWmQ9mf7dTFePI/xwnSEY=; b=VUg5GbSoW42p2C7V0gnEQ4E+Que9VYSRF0dX6qK6I4ne4npY1a7fXF29VbT8CBrim53PctEwY5m3fjRirQ/QiV8SvM4Ypzmboimu+6CLL5LOobI5KPJvBq+61efJSoa5lhMbCeOfTKTAAwpugOXiwha8ngb92VIK4lZINXmb32w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from sbrijesh-desktop.amd.com (165.204.77.1) by DM6PR12MB2684.namprd12.prod.outlook.com (2603:10b6:5:4a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.16; Fri, 14 Sep 2018 18:27:25 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Fri, 14 Sep 2018 13:26:58 -0500 Message-Id: <1536949623-23564-4-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536949623-23564-1-git-send-email-brijesh.singh@amd.com> References: <1536949623-23564-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BYAPR01CA0001.prod.exchangelabs.com (2603:10b6:a02:80::14) To DM6PR12MB2684.namprd12.prod.outlook.com (2603:10b6:5:4a::33) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c27b150-04c5-4e6e-5f67-08d61a6fb8df X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DM6PR12MB2684; X-Microsoft-Exchange-Diagnostics: 1; DM6PR12MB2684; 3:qfSNVfbr1HtlZ1fRqlFXQlGFEFMmnrnjxLdqVT6+3NhLAS+eRxpwVj7D+V2MKnW3alNDBhB+4ZLqaLb7zH7xD2LK/6HPlunw67JA4PqfrkbM9KO7p8T3J4HrmjLaBn7+TTNoSzYfDgQQqXBH8qu+dwLU2oqx4qx2+ADDDePNDtW7+QAHhQPOckBLXktkxnvNBqZ60BAIlypFH+tkJ8LkrIQOrVLt8YYdJh0lX7cNs3S0NnGHHQFuZ+WQvzhk/smL; 25:d+UVfhVTcLWJmyvaz+195l6XzFnxEHgj7jMK2zIvTPvyT9HYrPy2iXh6o4xgwhWYd5DVwCXgNmnvHzddRYeQ36UrUyw2aDIWvizGLpORuG93jTGq717Ft31spkkhQnPcKoiCtnUHgglmLAxQqZFqefSqlEmcWfPoIi2FD/sLZtQ3dfeNxEakDwSERyYT/l827Ml9Ksay1vjaXl/EBtAnodQ8NIiEGCEkLVUDIjU05sZqq1xLdLBZSu9xhhFauttsSOkeDjZ8Mhboa8TFRmAKOCktdOBzAtPZX1OQfF/Nvt3Zo4LgBR6fLrVKArjEMTGwohUNx1TQYUl5PtY34feSvQ==; 31:qwDyvx+MP39HWGqme3sEC34XXEc68vAlVxNdmYMonmcYJ9BHmkgPB5boxZvnrIo0SvTVxZ52Oi8l+5EuBByUvXUGcnUHkQ1ymjHAuQlT53fOXN1bJtRkD3isMZSMX798gG2XETm2Pv+Zu6j4G1AXZVeNR+DtPnvprC6QwwVn7afs14tfzb3oqz6mBAI3eeq1ezmToJwjWn3x4+4mMAljCwLgOJsveK1GQNnq+tl11ao= X-MS-TrafficTypeDiagnostic: DM6PR12MB2684: X-Microsoft-Exchange-Diagnostics: 1; DM6PR12MB2684; 20:qNhOk87BByYVB2usVyPnGuCjb/lrsIxdAkw36CyKglBneMxLhQABNiu0imeMOsMeR6LPO7DaUWitbPmCF1DS9tvg03d+90MWEa1CYgl2BlzKUKKbidQLY+aSPzbT8jfcnfWGpCdjDzu4ZST6wxyLH/O4cadgnK3xStSZ9Za7spfaRsOSOC4fhePairQdA10sA8eeLx3mETScHxECnUswE8KJ+hMVLd5og7Ol8wVIjXrSh31eOPmq7QCHHhQy9nS07qecsXgInsCfSiqoyFMG7CBuEopq8Ub1SzNBUdtpzNYHFOVLybfIN3YSU1P81E072W9BbMoDSXXHn/IYqOBwkkTukfqpYiNkgAQIaIMGiegQkjzn1/tUAvSZ95FbG2xpZjFGXROEkLhuHXwmsFEMWfgpu05s9pC20ZHEdYD6Xo+EGxm8kTFhT/of/tF9hXDL/6Ttw4Zfm4hDB8yaoK1E4+cdxHYBnFYMlqjoGSUxyD6Fr053rON2mOGKjMtX+r3Q; 4:tPkUXMTiQqnI/RBMxf0iGaL/IyaFsDOijWFkJuGLBd04Z0svBN/IwWqykk8ZuRYtrRMSWuzcnu/ylN4N5Dbhpv50r36/e+Kw3El6PUZLRjyONKkgGJX+YegwW7zRCeM4Vn3UJTVH2K04uFBaFCd1r+N2vDjikmqbleZX/5LHcFfo+l44xVmf/HgQEefIv0Zil2pNfpUxEiJeu8dmMxLKs6ZOCv3y7OGDEI6lbQez7gb+BPCG+361pf0W9Qspwm9lFRvPR+UNSUb5zD5lzO3LZ9Ksf7yrL8PKNM70meaik/G+7rYUessLARpGbVe60PS0OMXoUEJ+ez53OyMDk26InYLcWLNBYNQsiew2YEk4iUoQ5aw8iZG40YNKI/p6gng0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(767451399110)(163750095850); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:DM6PR12MB2684; BCL:0; PCL:0; RULEID:; SRVR:DM6PR12MB2684; X-Forefront-PRVS: 07954CC105 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(136003)(39860400002)(346002)(376002)(366004)(189003)(199004)(50466002)(66066001)(48376002)(2906002)(25786009)(446003)(16586007)(6486002)(76176011)(39060400002)(7736002)(68736007)(51416003)(7696005)(305945005)(316002)(6666003)(6916009)(47776003)(53936002)(52116002)(386003)(956004)(486006)(11346002)(5660300001)(54906003)(2616005)(8676002)(478600001)(36756003)(476003)(186003)(44832011)(105586002)(2361001)(3846002)(106356001)(26005)(81166006)(14444005)(81156014)(8936002)(2351001)(53416004)(16526019)(50226002)(4326008)(97736004)(6116002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB2684; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM6PR12MB2684; 23:Y1dpCOFPQJR33UggafXM+QdSaTfnfFDmpEeiFW489?= sW47zSRbhxGK7E5srp9cwy/g/9oaGVef0IJO5dtQElFtm5f4weH32yrEc2Cuj/S5phs6UHRp6fyKtviTdl05RWXFz03DAcWeBZbQ90EMxmO/zwzZJo74ohyq4EoFSnJa0eXZ2TRiW5d41c0QjFdLzA65abThTYR9DaXLGup2Hfg6ax5qPCxcykmm7gRl0KOCsHM+FznBNCJGP7IoDMAA3xRKhqBKlh25SyETXso+mJLVQdcphINlkI4M7JW0RJJQjygzrBXGLUB6SJGdxC0341kGv3jdtLhUjNnTI3/ZQt1xYW8Zu9EU/b83s8QkJ8e3PDot1bkBxdYoBkIEkz7y8KwdT+Z3SbDW1TcFqkpPro1GE2c70KcFdak/BEFchxg0QJeuUJVJfTVeVSYpFtYYzuhuHXm3aSYvNzCh73/XjuuQZoIJLOZXLdH9mwIRV83a8wCPofcK/DYGqkYBKp0zGRXSur+nQ7yvG/vzwnOU8SEHFvWDPXXw/iOuj04lPYm64gk+0WETZAyAw+HkqOZt4LcMpjUM4kf0wHdGY7bVAoZJSLPeXCveWdBdUzQPcTgl18kvU/zYJZWI7F5hkj1BDpJBiEYNSwhftwbg/gDGadh93sGHq0rQ9DMMYpCg0iymwwNEW5G3XauSEyyncNme5dH6hNvWMY9IBmDaCcQy/SY48k3q3r+ED2yT6yFCDbUk3R58wNSCLRkuREi01kY/iuX4p4tYU4svR9VHUxtS19eua8BNwyEhU/wmC9JvCS5yo+edqP90iALNlTt13PVWjenS0PdCjCvZMDIPcG0KDpsG0qlsPgBaBoPU6o3AAG7L9MEfR3hdioOiHmUVvx8sxGhEA9V2M1zj6dCjIKhHZmkZmQuql+LF2jYQFroJ2/TuNctvwgtZoBBG68FjvmQUjfF2t5BXKNiQhSFRr9wQ0M1gxD6kFqWLSy3UPb31YRGEs0s0pOdwxxk6oietUbAzNnoK47MBsq7BTF36125BB/gr5LZIhNbpzxAyGuD0/MO83uCVBsToaCo00OoJVAbh9fFSLNZJSFrPhtZExb7CGhzCWaQrbpshrU099ivbQH4nTu43/5J8Q0+GZdjNMSDUdWRwTgNmDqKE2CmybFRYl9Mye1BlLXQMqobfbnTTvx0dwo4aZZYR6ThVlDwfQmXmvTmc26buaYqg6NFmsTnGMit5eJyiDgUJqPnNSfFouwsZgf/yj6X16SvA1ZPDLARtfTUtYIe4lNqspmmAGWAVe2dIQ== X-Microsoft-Antispam-Message-Info: J7TKquvnMSm1BSOhfx9g8ShaG9nHwpfMMle6mTco/YiXQrTu8fRqcdMsbS8pNHrquJCi0nMeptIcDiu6wh9UpPf7OmaQ63sy2wZQXAhS/mktW6EIDLnkRqS8TZDlex/AN8r0u4TRLPfMv3m/hBZJFxkraE2HkdMlPcaXZ8ev7BPheafGD7jY/na/mdpWq1Sm9FikeTobxw7QY/k7HHjVm65Knvh58ShermI1WLtPv75wo7XKsR/AxSwE5bWelF3mov3frRWiOZAVaYqlfVPWN+/o5+V702RyNWIdsOh/T8PVX2qNrF+Zk+1BqiKk6tAp0rE62hGtIhkt37SemP/yJnXrAStH+S2aZkUfJw8UMs0= X-Microsoft-Exchange-Diagnostics: 1; DM6PR12MB2684; 6:sAV34aR2SCI4scDpumnUOoGo9MUtHni9RKyjOtz/svRCBokhomQrHh6U26OFfztcocCv0Muan/oKLPR81KFg8dYxvAY2VljbJVAqzSVX3TaonnlOQSu34nzLNa29cMKVJE27lp03aLc13rJebkXAmgJjR7CVo8ZkTa1zOwIVQnxX+i723Mo3IZM76+DdNDV/jRf2of72QVE2unVaq3BRmrUPyotdp+dla/m6Lpeuc+4u2VaLjrurTvc9enn4er9d+q5zjtwCASMTUmi7ssEoFsZzKyV1aIzfTWmsRmMUnJ9A5mmp05w9xI3weISHWGHqO18m3yBLhBGi+2JV6//b8aH+KR7XmyrZyygBq0BU7r0lP6WqE9zX1gS7f03ArpnX+lMMHk8JqmdAlMfQEvrFvACgsCzAW2T6q+kxA38K90m7psU1goMGa3mlV79s6r8Ig2fYrwobk7fTiBaOL6Es2Q==; 5:kHx9440ygPaYfFiGiKP8oPfVtq5xbysgIFtKJygdCU6a0Cvee/9l6yPfoiSP/EcVj5w5eYFt9YrMwap+W5a1zT41YYedZIUc/lLCRd77dUQu3b5swq1qxdh7b2EemHU5R0iGliDb0bbE2td5FfwFNDC9PYsTghkRe8kuJxFqA0w=; 7:uQi2HcIrTpPieA/l82er9z4PP+Qc7DOdgPShtqUe6MaDTx/Z3rG3iMFEVXfA3yFD1ZRDJFXu0WetgFXyVIAF2tGy2hod+u0UK8R/xU+KXoXDNZL5xuZMrHiljA0APr+bw5Dc8z9LOtGFwAQHTV2OHw0bp3PITo1GvjXkkO6+VV6amGJiQTPoaNa1VOt2Ggi8+GVWZd74Pk5KX6tBZE9g6n6wmiyIYYPQcvzJfAyzM76b6lgSxMOfYlQ2nPXKg2ox SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR12MB2684; 20:wZWe2Y4LaV3ZBfeKUbsXjpSftJJlz7c63LO3C5Ukvv5VTBjU4WBZKEuTC/+QonNbUp/xtLfLviL5GoX2rzCXgS2JQWF8jU07XZu/VCa+tOygk1MOAQ1Qvyggc/fqN4ssLOSwI6uTyJeS9gJLbBNePkiLz+xAZ7S95GzKWvLw1kj/WVRqIv3JyOTZtjiEpkNpZCvTrGI677J8G2z+mNynUWTA7OuhBGac0wtAKfs/kdHfYDj685x7Np71E8PejpE/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2018 18:27:25.2723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c27b150-04c5-4e6e-5f67-08d61a6fb8df X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2684 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.69.75 Subject: [Qemu-devel] [PATCH v2 3/8] x86_iommu/amd: remove V=1 check from amdvi_validate_dte() 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: Tom Lendacky , Brijesh Singh , Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Suravee Suthikulpanit , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently, the amdvi_validate_dte() assumes that a valid DTE will always have V=1. This is not true. The V=1 means that bit[127:1] are valid. A valid DTE can have IV=1 and V=0 (i.e pt=off, intremap=on). Remove the V=1 check from amdvi_validate_dte(), make the caller responsible to check for V or IV bits. Signed-off-by: Brijesh Singh Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: Tom Lendacky Cc: Suravee Suthikulpanit --- hw/i386/amd_iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 1fd669f..225825e 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -807,7 +807,7 @@ static inline uint64_t amdvi_get_perms(uint64_t entry) AMDVI_DEV_PERM_SHIFT; } -/* a valid entry should have V = 1 and reserved bits honoured */ +/* validate that reserved bits are honoured */ static bool amdvi_validate_dte(AMDVIState *s, uint16_t devid, uint64_t *dte) { @@ -820,7 +820,7 @@ static bool amdvi_validate_dte(AMDVIState *s, uint16_t devid, return false; } - return dte[0] & AMDVI_DEV_VALID; + return true; } /* get a device table entry given the devid */ @@ -967,7 +967,8 @@ static void amdvi_do_translate(AMDVIAddressSpace *as, hwaddr addr, } /* devices with V = 0 are not translated */ - if (!amdvi_get_dte(s, devid, entry)) { + if (!amdvi_get_dte(s, devid, entry) && + !(entry[0] & AMDVI_DEV_VALID)) { goto out; }