From nobody Sat May 4 04:43:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1503880510703743.4209235843217; Sun, 27 Aug 2017 17:35:10 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 756CF21E47D67; Sun, 27 Aug 2017 17:32:27 -0700 (PDT) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0084.outbound.protection.outlook.com [104.47.38.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5E63721E47D58 for ; Sun, 27 Aug 2017 17:32:25 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Mon, 28 Aug 2017 00:35:00 +0000 X-Original-To: edk2-devel@lists.01.org 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; bh=3kKQidZ603+thjiE+LTjT18yhcsMXrpW8XGgap3AgG0=; b=UC7qKoOuff9ZSpUUPKOBV6KSCnscDR2JCTsQkU0hvTQ887My9ue64QdA2TKyQ2LnHOZFsXtgkCKNEjbq/GD9Xowbgtt/cwRaIA9eXkzSS+T/UcQAAeLufo94yWeSzC+wD2IrWLrj+fWbzx7Ctq6DBoS8COcmFsdcOamO2JD02IM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Sun, 27 Aug 2017 20:34:27 -0400 Message-Id: <1503880469-15999-2-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> References: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR2001CA0024.namprd20.prod.outlook.com (10.172.112.162) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ef78601-fb26-49e7-6b5a-08d4edac9e94 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 3:tNPQDrVUDzHm9NRnooUPbFkLVDkwAQ+W7jxN5RYZuect1BCZCxYdr0QpTJaPH+aDgRK6vC5OmPwT65qsttghc06F9fhPNGUqtOZCtboBdcZzda5NSulWu92SzkXkbFZ22ZvtuBHUIyiPe27ppaV3Bj/b8FsiPYo47DXoN3BZwqIMX5ClVQtwfGRlWBRRuyJ5qfixmQeAoUw59ESURX2usUJwOloYIT/xqmMzUqZfhhMnbg8gI69ac1yJjgUMbI8s; 25:00q6bIgQwdr2pMQY1qaAHDTbyE+2l+nwRnMU743LKkhXp4DIY1qdchz/3xXj2GWserw+XCOGgWrZBUH5SJXr1XphIu2SGnJDCV/afaf/Ak9JgokLaT8SVC8quWW0+sc3OKZM9xQjxCbF60GSdcuEiQuWMybIDPH3b4gzbeAtAMiMPwp5KJzoHQ+yT/IgZ0yH77AJhbrj6XausYu/I/Iwp9sfaoUkTG8BPoid7KJ1nmEoCOItXFfYdnMTfT1EKGd7Mi82edv7jphtcmsvUpEVlC7i/Wqdzq8Bf0NKxCtzRDdv6I8MUQ0yfsaKjJcfP5zJyj8vbXHmPJ8+m4lcb5ZOJA==; 31:L0FODRUm2jphGqMfnICwWDRbU5Gj5BhI31CpiXcWYCW7N2B3YUSgTsWYm3g35D5V1aK6yLePrwMmBX6/u0bMrDiye6rz7PXAJdKJbTXrhVmaN21HhiPs7r1JbrHN5RHba48ZSwjDOo2sq76OpXEB0In1NsBrRf9r2UFkgofqvD4EVmRHRMZdVswTLRFVKtusvUKSxj/NdHwTA6Oy9ZHH4qlA+9CA6Bifi5gk7u5TRSU= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:r9QIknCeV5mw8IzsXfaAdkwH9BGxXP3vJ/JF/A3+hBS9xW34/1QH68XgMBUaNM8JBcqKIBvQVDE+iUZR50dE5LFmuJe/wt0qqq2+4abIxl6JLZ+xjiDJx7RM/hLqyFXJSsiBZNTP7l65uLDj4GS4uwg1opqnCpyrcFzl/CZe8kt3ZZe9pNNk+/pTEggbjcVYDuO6TQIesCw26IuSMc8h+Eq7YWcRIFlIb5dO+kO7ujJcGpo21kohP1uIQtkKFH2N/5Io1canRnRNPmf0WwIx2MBAQ1zweHtpjxnQRg9u815J+97iY4OeuE3w98tHZMpeIzOIGDPflLNr9Ku5nAtIeV6/hlJT9Wjo1mXhjeVyiEXLyiZbixEGtVAb3uCt4VZ/ogfqBrVtNQmJ3ciBi1ct/OfeLP2AWfNoWPPl2Nz3i4g/GCC211m52iopfIEZXuBi82KBgzeaQ+yybwnTml6uJ9HlzkXlSkSWbYhVuPwCI3l9W9+moS1irOsqTgr9D+U7; 4:sNMxwWvivExQPXxDtpc9TVKrQ7L+HYPb8AZzDs54RBuDlARiDveNJhNBI/hZuGChFisGcwsEfYtbRCEvrLgIJ9kXp8AhmTWu3253WJUmY11mO80eM3ZVX/6XZOwXI/2+cxVpFgcC31TWjJndBcXlw64C7jFwXXzgg4+G+94PSnbuZMywT+w7aCWsA4UHxBUqE0JNT2vNcJlK5lDu061aiIfodWJUqUUhqcsZrv3WIjqVsDGIzpB7mMLcZlkAlTMtpRFsyx11KExXqQTSnIXQx83B3b0S43yC3ivaCBfERQEHSQxUo3pe/2X2EP60T0eS51fMQbAI/IyCqG7m2dJ0lA== X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR12MB0152; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR12MB0152; X-Forefront-PRVS: 0413C9F1ED X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(51234002)(199003)(2906002)(53936002)(6666003)(25786009)(7350300001)(478600001)(36756003)(2950100002)(76176999)(66066001)(47776003)(6116002)(97736004)(4326008)(6486002)(81166006)(8676002)(54906002)(81156014)(48376002)(110136004)(5003940100001)(50466002)(305945005)(6916009)(53416004)(68736007)(42186005)(2351001)(575784001)(189998001)(7736002)(2361001)(50986999)(86362001)(3846002)(33646002)(105586002)(101416001)(50226002)(106356001)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0152; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0152; 23:aZULCmRIRkeRi75zkJPEk/HB5z5Emi+iyvxlKqKyi?= =?us-ascii?Q?MIjIYUBKg51iY0DsoF8GbFYF1pbKxKxhDY2cqlVJMgqxjIrpU2NIgA2LkuWl?= =?us-ascii?Q?tly6qNvRHS5H0GV0QlV9L+Twb5xJxMqWCTdUkSG842HUA237nfOExALJaCAm?= =?us-ascii?Q?tme2u7sm6HOb7mlIE/HsLpTahnN69iC/NTLA71CxRob9D5roQcC1azArki2s?= =?us-ascii?Q?noQlBGreg1uieGcX3oDLdGhZe4KkPFQS4h/yTSuNg4ddnUsl08tTI/RO9+fi?= =?us-ascii?Q?hRtGRxb3HBuPrwONuMODjOl6lE9/NsNWnUlSFJCBLDZcmQfaJhJM8eTbNmpu?= =?us-ascii?Q?0roS4vqw7jBehGLxofyR/t4BqLqqoVsa/R1RCVBFPqWsUPhneM5oJZxZfoUg?= =?us-ascii?Q?G8HCTWA6lWHhrWhfu+tfK6gz2dBzLB6ZpZOvNr/fryyi6n36eJ/fYn9aNsAy?= =?us-ascii?Q?AMo1qYFaawcBDfr+ngcbdU2nDRMqXxAc4VvE5BniTN2MlUsXb9vPmPOfVYhT?= =?us-ascii?Q?0Fl9RQ7onpLxTq6XmMJ+AQP3y1tuhheM2bH4CjDcpW12z2KLKrikuYcv87Qw?= =?us-ascii?Q?V5YXAOAWaco2ik8YWp2uoYsNCLImZgBuGSgKYTU0QZ5b/auYsBAPFiRHw7xZ?= =?us-ascii?Q?nM3MAbYVdrFjQcyme06KdF1AGVJ4K4XFEE7EPD4PKmL5jItKuyVp7ROAqItC?= =?us-ascii?Q?5FAFT2ytpm/LKd2jeNTwOf9+FNPg8jMC6wroQBTAI7mYS4QBEGPMVtBcbwZ1?= =?us-ascii?Q?AibfF+iaItwnUIMqOqhC7tfhQIV6Cv3/z9MrNnBpivynHy25Ee/LCvHpqWvn?= =?us-ascii?Q?XZCKgxpX+PZloE0TfMjR77p0MznbBYVpRIB0qbC7xyg3OUJS7csOkSENQktJ?= =?us-ascii?Q?hsnV6Tb4nT4Af6ox2tPwJnk19hvBL3TknUXfb/NAehqfo1WOKVLp6h+smiSk?= =?us-ascii?Q?Xm39ReDpEyS4PDK3/pCoVSEfkyZ2lNEnfZF9r8QS0d/t9IQ3Ep/DWcZ/qHyv?= =?us-ascii?Q?LHKlRPXOkVdzOX9a79ZgAFntMmu205uMAVvqMw4QdeIrnKU4CQ2aoc/pKdTV?= =?us-ascii?Q?snFckwI9Y2x0QhK++BsOEBmwzxO4rHjH20iY0qFFumjHoS1T7NYddHrZuDyy?= =?us-ascii?Q?Eq/sh13+X1aZirH59EvOpm/Irhf5xk+bf7cOtdaA2jTlV0y11g1wnsfA094W?= =?us-ascii?Q?ElY5PLbly5eIfH1u8kjNNyPiqs0UUQphS0B?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 6:iZPLOQAPTPrHy6/cRL1ifB7LNDEfFjLAsw8JLlRt4Jitkid73NcEuWQS8fFPcEmzWsegM9UWeD/7+0dny6B+Mk3AyNhguTVrKW+iKSM0CU8w4K3CA6SxmE0gnWerqlJeKmDn3perjPSL1bedfbJAbrutPUlI/FgAoLyjRB0aOhTsE6HfXH6sNrHlqdpntgpRhInmIhSQx/rbxBCldZXYwfKyezZiLdL8AJfG6DJ6PFTsIcZwp8/ygePy4sJ+MZS5RctJIiByuCTFXI5j0M556dw2STSCbH/AAsDCMrzXCfj4wAxGUA3IQ0jvuSwbdgMADPz0KicIsb8w8DT+i1NvQA==; 5:s7bRAcd1ZqfrhkuokO22ZYWii75Ng2kDWi/J2m1xRteiZfD//qvact8dZUt0W2Y560isOmzZj67TtGQcQfMSeY4hLD6+9e1YSH0IWQergxOvy5/tsI7bMdw9R/ygzP1NGDVFwFya9xdV+4ggy03i2Q==; 24:CzVIxlAbzy/Xo2flKgfMTMvMl/JpHUF95DV/l/DbTCd2PD2MKI6mEax2RfpS3x3hciRh6drGXVRa1CTYAvsH+DQ4xI7ac2pr65TP3q0uZAQ=; 7:i92Lg5JZJRwOi6g54faE8uOgHCR0/ZOZv0y8qK/MIsBhiukm1y3/qtVYE5LkrdHsEGihjlIVmnlc1zF9Rnt9jK96/zk1h167X8zJhOyZUwDLIMn+9yPhGUGPtDZFHxiiDKWLtHqRLADRM4iSePoK6wP3leLgfNGTZNPHYkmNHwRSYEsgGD4Ext22bOECm6LOjA3nzC1L9BejDS5N48FJKFLJ3/j/3iCTokPMKh/e6L8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:zx5E3/Tic+E3tZtdh5iXNopVW+Zfs81nt4xYX5Jilp2t3XGtRTDwr3a+3IWJqQyXknurRU4LaJjc/oslZlaUZfVu7zpz6yjy1W1bpNzJ8l/uXgkj5+M68ytTNznJjTNAmCYncniDMYqoNJ590d/XruOHzlF7QL74hfi5g0VQU0R5ZN2ldKTIE/eNRZmUVHuG28xpQo/6FIBfyXRxK97IpGLBBCeklnXc5F6ZWYuqIQRtpUeLKSkBDM7ajrfeFwxA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2017 00:35:00.9579 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 Subject: [edk2] [PATCH v2 1/3] OvmfPkg/VirtioBlkDxe: map VRING using VirtioRingMap() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Tom Lendacky , Laszlo Ersek , Ard Biesheuvel Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When device is behind the IOMMU then driver need to pass the device address when programing the bus master. The patch uses VirtioRingMap() to map the VRING system physical address to device address. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Tom Lendacky Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/VirtioBlkDxe/VirtioBlk.h | 1 + OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 45 ++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.h b/OvmfPkg/VirtioBlkDxe/Virtio= Blk.h index 6c402ca88ea4..9ec0b956b818 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.h +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.h @@ -41,6 +41,7 @@ typedef struct { VRING Ring; // VirtioRingInit 2 EFI_BLOCK_IO_PROTOCOL BlockIo; // VirtioBlkInit 1 EFI_BLOCK_IO_MEDIA BlockIoMedia; // VirtioBlkInit 1 + VOID *RingMap; // VirtioRingMap 2 } VBLK_DEV; =20 #define VIRTIO_BLK_FROM_BLOCK_IO(BlockIoPointer) \ diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/Virtio= Blk.c index bff15fe3add1..663ba281ab73 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -580,7 +580,8 @@ VirtioBlkDriverBindingSupported ( virtio-blk attributes the host provides. =20 @return Error codes from VirtioRingInit() or - VIRTIO_CFG_READ() / VIRTIO_CFG_WRITE(). + VIRTIO_CFG_READ() / VIRTIO_CFG_WRITE or + VirtioRingMap(). =20 **/ =20 @@ -601,6 +602,7 @@ VirtioBlkInit ( UINT8 AlignmentOffset; UINT32 OptIoSize; UINT16 QueueSize; + UINT64 RingBaseShift; =20 PhysicalBlockExp =3D 0; AlignmentOffset =3D 0; @@ -729,25 +731,42 @@ VirtioBlkInit ( } =20 // + // If anything fails from here on, we must release the ring resources + // + Status =3D VirtioRingMap ( + Dev->VirtIo, + &Dev->Ring, + &RingBaseShift, + &Dev->RingMap + ); + if (EFI_ERROR (Status)) { + goto ReleaseQueue; + } + + // // Additional steps for MMIO: align the queue appropriately, and set the - // size. If anything fails from here on, we must release the ring resour= ces. + // size. If anything fails from here on, we must unmap the ring resource= s. // Status =3D Dev->VirtIo->SetQueueNum (Dev->VirtIo, QueueSize); if (EFI_ERROR (Status)) { - goto ReleaseQueue; + goto UnmapQueue; } =20 Status =3D Dev->VirtIo->SetQueueAlign (Dev->VirtIo, EFI_PAGE_SIZE); if (EFI_ERROR (Status)) { - goto ReleaseQueue; + goto UnmapQueue; } =20 // // step 4c -- Report GPFN (guest-physical frame number) of queue. // - Status =3D Dev->VirtIo->SetQueueAddress (Dev->VirtIo, &Dev->Ring, 0); + Status =3D Dev->VirtIo->SetQueueAddress ( + Dev->VirtIo, + &Dev->Ring, + RingBaseShift + ); if (EFI_ERROR (Status)) { - goto ReleaseQueue; + goto UnmapQueue; } =20 =20 @@ -758,7 +777,7 @@ VirtioBlkInit ( Features &=3D ~(UINT64)VIRTIO_F_VERSION_1; Status =3D Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features); if (EFI_ERROR (Status)) { - goto ReleaseQueue; + goto UnmapQueue; } } =20 @@ -768,7 +787,7 @@ VirtioBlkInit ( NextDevStat |=3D VSTAT_DRIVER_OK; Status =3D Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat); if (EFI_ERROR (Status)) { - goto ReleaseQueue; + goto UnmapQueue; } =20 // @@ -811,6 +830,9 @@ VirtioBlkInit ( } return EFI_SUCCESS; =20 +UnmapQueue: + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RingMap); + ReleaseQueue: VirtioRingUninit (Dev->VirtIo, &Dev->Ring); =20 @@ -849,6 +871,7 @@ VirtioBlkUninit ( // Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0); =20 + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RingMap); VirtioRingUninit (Dev->VirtIo, &Dev->Ring); =20 SetMem (&Dev->BlockIo, sizeof Dev->BlockIo, 0x00); @@ -885,6 +908,12 @@ VirtioBlkExitBoot ( // Dev =3D Context; Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0); + + // + // Unmap the ring buffer so that hypervisor will not be able to get + // readable data after device is reset. + // + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RingMap); } =20 /** --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 04:43:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1503880512688131.17923962703117; Sun, 27 Aug 2017 17:35:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AF9EF21E47D6B; Sun, 27 Aug 2017 17:32:27 -0700 (PDT) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0084.outbound.protection.outlook.com [104.47.38.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B8D5621E47D5B for ; Sun, 27 Aug 2017 17:32:25 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Mon, 28 Aug 2017 00:35:02 +0000 X-Original-To: edk2-devel@lists.01.org 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; bh=lQ0+Hfnqb3MVS8fhJ9NyuODZqnshESI5S0ihmR1bZrc=; b=m6V77gz6NttQM6G36N0Lglzkki8zmv1RPEXoztNvmvdF6cwnCpw2qO31OhsvtyRLjlg5MpjC+CLxjPYNTRXBAp2t8hYZoaeo++E5INIZJb82diwyraMxAW3PsmXTxxuid/x8NRnFRN9hNuX6VANBrICYff2jhZZgd8lJIoYWhKM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Sun, 27 Aug 2017 20:34:28 -0400 Message-Id: <1503880469-15999-3-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> References: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR2001CA0024.namprd20.prod.outlook.com (10.172.112.162) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd50dd21-00e8-4ba6-b40d-08d4edac9f3d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 3:OreU0PmADjVw8smOcLOstRJ2upz5leW7gJJ1BAIKcsZGgbi1fCRFfOJhsjZCK0r4hCCJnwoz1mfiFdwPcmGDAPBLipjOgtjAtDAI0CRVi8ncpJYMIu6HvSA10le0OGrTevewN0Ylfk+o0aRWWXNcz3cRG3as5gGj6WHiOPWEZYbnlAUrPJvemSiLgkwL4yJt5aZJ7JbyXntB1GPtPWsfWfOCxBeR9wfyDTUWJQkqCA46pllDTD/YdJqqoGl73Xhe; 25:RUxcqQu1iVBxELhPT6IdSgG6MaIukxT3hFjEpMGFdH3oSP4ISqCfDHdiJIfSm4qTSvpi0STt0vy3N/PMxGPLXcn8yO8GpMOFmuoQsG8QeMZIG4URbzshuMJzQAlE6yUYJIzMOn3Lt65uKKNogzpGc7xR76WQLkTlanziywmHb+jnJVl394RIAF2qRD1iwGKpBLsFjtRbvtbK7mi3XyRF4aZX9T1PcyWwn1BaYKrvJU5/S32fWaxcvqkaIf/BByr7WSczURuV9wuPt0ucSs1Sm+hF6vwslxrmKpol+NthWO1TOf9SyqR7YbgklabuwI1XNL7OjHZHu+U7vw7le9xCzQ==; 31:HHN8z8JjKcOuxDtvYkzMFKAE3mwHGX4EUFgRiG8rXFRCIFanUAFNu6gJ9dOw9SiZ6+9P1pRT2gZpPRS4z1IptdzHZg1DeZDCewTcYTotZtJR1lNq6iLG3vXbXhtCcIlsep1IgDL6R11tZqdGyzHZlIxagnpcLFSVsyMJ5mnp6ERmvcLGZCK6VRtWdxhD6F6TcIAHIfizjDXP8pRordlvVPw0Zlb03ka+fN1OXECbX28= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:mpD83QHKUtnRCatRMMT93I/O/wYRsA1mXQoja4sYGm2JSFRvyAHWijh7Rwj7Us/yFL0oTdeuVpr9NRyHCxSJJvVsEteoqWNlwzyaX5VOqxS5rkxMSF8GwmDP/j4U1sWjMjm0N2jID7AkSLR3bU4UIbDvHsfIlzX7LPyKaFjyP+sdGAS6WeKndeKCzfufIKJsfrgooZxjOdMEOnhY22LI2AZzgtyZLsNH2hl4r6YZk/zYs2kOWSPNsLCcZpinzaSTklxMoElIQDCYSEQuPTAVBsnGL1cnLNARxUrpTPqKnPKkZobbHWJlzYXbNnRoSJTHzLbvUEkOLypXblRCUSXSzG2bOiuY+M10nAC2EUvnuKVabzWzTnfrzJkG98fBzOjR1JpcsPSGpm51CvRKAIyzk/vLAfXTqRBTQTNLVrJKavS8KPpEW8wGrGQEohxQIcCuXrxSUl9YVvowH99vo2jn3706h8+kVQZduaB7pLjF9JKrwmwAxK9Z/23GkexZWnLw; 4:UkpdItb9ZiErMSWNHEFCnIrmSyYMGHYwK6VTp3ByDtHOAHKId5iMnIqxo/jTxyzR0x4zcAqhRwjnE/bcAqwvE48NvRV3eLHivQ4xt2acaYkZ9Fs6l1mc5vHyQmigHzgJYmY6mVyWB3ny7RhXxFs9FQ43Z9q7UnUftNDOXdHj11rYh9lGQ9evsLT0o+DQtRuGHcgNMRHf6eLZ5CCE6Y55B1njH2WP7QZgkjR0+gF+5IoqSA72SP8mdqrgW86fJt2yGS2Bi1DCqmh6H1EruHn9NSy2oRc+yhW6je1dZNeeNhkDE/bMMtCdI9yEAk3iZluTs0bjlxPaBUp7wFwMtcQDbQ== X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR12MB0152; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR12MB0152; X-Forefront-PRVS: 0413C9F1ED X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(199003)(2906002)(53936002)(6666003)(25786009)(7350300001)(478600001)(36756003)(2950100002)(76176999)(66066001)(47776003)(6116002)(97736004)(4326008)(6486002)(81166006)(8676002)(54906002)(81156014)(48376002)(110136004)(5003940100001)(50466002)(305945005)(6916009)(53416004)(68736007)(42186005)(2351001)(189998001)(7736002)(2361001)(50986999)(86362001)(3846002)(33646002)(105586002)(101416001)(50226002)(106356001)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0152; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0152; 23:EySw0EJw9c5h+bBLB04DvdQGIPbhd+HbEp38a4DBC?= =?us-ascii?Q?eRYhcPakigau6ICBn2jyZVwJWk6MVRim44oe7rlnMz0Z0S0ZGlMpA4NloDBa?= =?us-ascii?Q?VTybFVW2hSMbHetAzuhBSvFr+byBUjhQLz37swJmP8UrkWOesLPDBdsGWsAu?= =?us-ascii?Q?fnqN4QiHYcAaIJjRgJRRqhfnPZot/79QUq/qKRSF7R3w64jojNO2OfQbvgM7?= =?us-ascii?Q?OjMTcmGWT+zU2zxOPG03PkhuIbiGBJqeALHB6iCz+Q6Hb11tyyZWRZwJSLNu?= =?us-ascii?Q?C6QHBqo8jp0moN0BKslPzsjmg9C3GLoD+rs4hDXk5t9Lpvbx1xYOWiOV/hcR?= =?us-ascii?Q?us1ioOlsvjTtvDMbkUKzESzoM11SiJaesvWr6VzoE/fGyOfsrOBoqeiM6TJT?= =?us-ascii?Q?Pwg/ZgacWMVAYunHEv/63SX8ek6rzYOV7KuaDZbbd/lPRHzo4xUHQ/ySo8T4?= =?us-ascii?Q?tdvJTGWtLklpLKoliwP6TAh6M3oFcc85vZ2XGoccQAo92JFfaWvsiJSRVyEv?= =?us-ascii?Q?tzAJqnmosXklewCueCVmclPwDv06efwFYY+F8cRyqOKg3GKPf31A8fH6ifwR?= =?us-ascii?Q?O8nWoWqAqMBa4GaGDmTklCS1QgRRQfDZJ9qYdmPJi5ZFAASB8BjgarPI47eO?= =?us-ascii?Q?5WUR3kPfIBqtogbYj4cw7ScU5Y/3li4hvYf+if7hDsopHlMnLW+cgBFw7y4d?= =?us-ascii?Q?YmeAqDdmml5AlI0Of1LSrAXttCkFDvUBrv35TsDjjEneTAp/ees1gTSQww/i?= =?us-ascii?Q?UPTpdHifYafnKSdkmn8cXDY5nu4z2aiKBRU8l3JoksS0cxIFoRbk6h80XIDT?= =?us-ascii?Q?gK/tddbiqGbPLu3o3Gbo4YUiKqDGiduMJ4btWYGPD/i+fssRfLZmubEal2Rs?= =?us-ascii?Q?SWSsBPYJI+/8Oqt0qwqlEg1ecYmhqdXxpttqC16CXx8pxgRmH5yme5v/anhX?= =?us-ascii?Q?fuygkB4fdadBvG8m833QT3jsUA7LQkGqVsDZUCrfFyJwwjUWLaAbGkjyfWWR?= =?us-ascii?Q?8wtNw6HIabMLJqWwuNomJlsXASNpDP2Bzc2UaXESQbb/iyN7zFQKlLx6Oj1O?= =?us-ascii?Q?//Nf+ypGA9YKhnYLcG5N+/NQ45+E+SuAmuvoLAgNNnOiUDggyXnE3R8doXsb?= =?us-ascii?Q?U90rPxHT30GQUonR1V9fMji1wCuh8sB?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 6:vRnFNFcNCSiseeChh/iRSJO1gEYPbA9N1fkVKQuiXoLEyoOgWPyFsrXzlR3sVEq+T2jMAOEJBpXUQ1O74Gcux+q80ThA2JIZgPkdp4hEkHEmFzkokM/TSYR6iYWe9R7VpMERegF4NH0eaJw1Cmq1906TsXPwQwMpm2vj/y0f9y7oOZokOfzdSgTDcu9JpBfGdwQZZNZbBt48uCjMAON0Bz/AgdJfq9ex7h2vfAheoyx9bBkQvJZo2DyfEc7GrxYCx4arBiT1MIf4ODwdKZgKRHNuByyApLzSGCS5bVur7bwKQGEX6C85gnAq/mFlIMx4nWy5osFlxG28SHu9tc4Oxw==; 5:/ZWVtbeINaAxscAOBYVqNoLyasBQFpNSUrNDLne89g2ai0SZ2x5Zx3L6d55952KGQXnPg6XEtnMYaiKNN4OhQFuVq395BmCA5tajbJLXocC9CSKFvz0D0Sc4yenpL28OiXnVFKj/jOTbDRNRA/X8mA==; 24:oZ+YQzgWHehWHqjZD/tZApF1Vze65P5qqMtz20VFIgJ0JAMCRjCS/CavQiGNE/g5WY+/737gAMtjtGwN9r1tahNLLupbFzj5Dt8OLasHEuE=; 7:oc3jqgnAz80fJCdGZjdFRaDhl3b5MBwXVkgZq5k4EBbzfS34QoLASof33Js2aATZ9vSITNQZ9qljHngxXFqttPuAh8Jk8AxqNJ/4OAaSgsBxPU4loBWDnS40tFJA8wVB4JKL+BA4N9vInHONjskj76pYSz3Tk1DrG8gSH2wcBuSUNanNsMS3J3iY46+1jmKjMTnCEKqwJ6SLNzyNEvh4l4QmfP9Misn1KXWYUfdaRbU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:agYlRMEM/AE8XoJlzKrhLSueJVRwEOUTb9oH+kyIXgawAzXPaw4NLLyK8h2ubhn4HRBaI2U+XF6Z4gNMt1LQ1NOzPKcRDkBWoNrhosqqDdW68RTAVC+QjUBY15KRj4W7QHIO7rgvD8rgA6ln6x+qY3ke2r7nk1imAneQQxceSXMz14Eur0wI/VofXfr7hd/chcXIkTDai26ZQQVc0yW+rLG3IYzN3MG6w2sYfmlkzXInShCbe88FXzn46qqPlsRF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2017 00:35:02.0673 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 Subject: [edk2] [PATCH v2 2/3] Ovmfpkg/VirtioBlkDxe: map virtio-blk request and response buffers X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Tom Lendacky , Laszlo Ersek , Ard Biesheuvel Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When device is behind the IOMMU, driver is require to pass the device address of virtio request, response and any memory referenced by those request/response to the bus master. The patch uses IOMMU-like member functions from VIRTIO_DEVICE_PROTOCOL to map request and response buffers system physical address to the device address. - If the buffer need to be accessed by both the processor and a bus master then map with BusMasterCommonBuffer. - If the buffer need to be accessed for a write operation by a bus master then map with BusMasterWrite. - If the buffer need to be accessed for a read operation by a bus master then map with BusMasterRead. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Tom Lendacky Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 138 ++++++++++++++++++-- 1 file changed, 125 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/Virtio= Blk.c index 663ba281ab73..c9c42aa41243 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -232,7 +232,8 @@ VerifyReadWriteRequest ( =20 @retval EFI_DEVICE_ERROR Failed to notify host side via VirtIo write= , or unable to parse host response, or host resp= onse - is not VIRTIO_BLK_S_OK. + is not VIRTIO_BLK_S_OK or failed to map Buf= fer + for a bus master operation. =20 **/ =20 @@ -249,8 +250,16 @@ SynchronousRequest ( { UINT32 BlockSize; volatile VIRTIO_BLK_REQ Request; - volatile UINT8 HostStatus; + volatile UINT8 *HostStatus; + VOID *HostStatusBuffer; DESC_INDICES Indices; + VOID *RequestMapping; + VOID *StatusMapping; + VOID *BufferMapping; + EFI_PHYSICAL_ADDRESS BufferDeviceAddress; + EFI_PHYSICAL_ADDRESS HostStatusDeviceAddress; + EFI_PHYSICAL_ADDRESS RequestDeviceAddress; + EFI_STATUS Status; =20 BlockSize =3D Dev->BlockIoMedia.BlockSize; =20 @@ -275,12 +284,82 @@ SynchronousRequest ( Request.IoPrio =3D 0; Request.Sector =3D MultU64x32(Lba, BlockSize / 512); =20 - VirtioPrepare (&Dev->Ring, &Indices); + // + // Host status is bi-directional (we preset with a value and expect the + // device to update it). Allocate a host status buffer which can be mapp= ed + // to access equally by both processor and the device. + // + Status =3D Dev->VirtIo->AllocateSharedPages ( + Dev->VirtIo, + EFI_SIZE_TO_PAGES (sizeof *HostStatus), + &HostStatusBuffer + ); + if (EFI_ERROR (Status)) { + return EFI_DEVICE_ERROR; + } + + HostStatus =3D HostStatusBuffer; + + // + // Map virtio-blk request header (must be done after request header is + // populated) + // + Status =3D VirtioMapAllBytesInSharedBuffer ( + Dev->VirtIo, + VirtioOperationBusMasterRead, + (VOID *) &Request, + sizeof Request, + &RequestDeviceAddress, + &RequestMapping + ); + if (EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + goto FreeHostStatusBuffer; + } + + // + // Map data buffer + // + if (BufferSize > 0) { + Status =3D VirtioMapAllBytesInSharedBuffer ( + Dev->VirtIo, + (RequestIsWrite ? + VirtioOperationBusMasterRead : + VirtioOperationBusMasterWrite), + (VOID *) Buffer, + BufferSize, + &BufferDeviceAddress, + &BufferMapping + ); + if (EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + goto UnmapRequestBuffer; + } + } =20 // // preset a host status for ourselves that we do not accept as success // - HostStatus =3D VIRTIO_BLK_S_IOERR; + *HostStatus =3D VIRTIO_BLK_S_IOERR; + + // + // Map the Status Buffer with VirtioOperationBusMasterCommonBuffer so th= at + // both processor and device can access it. + // + Status =3D VirtioMapAllBytesInSharedBuffer ( + Dev->VirtIo, + VirtioOperationBusMasterCommonBuffer, + HostStatusBuffer, + sizeof *HostStatus, + &HostStatusDeviceAddress, + &StatusMapping + ); + if (EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + goto UnmapDataBuffer; + } + + VirtioPrepare (&Dev->Ring, &Indices); =20 // // ensured by VirtioBlkInit() -- this predicate, in combination with the @@ -291,8 +370,13 @@ SynchronousRequest ( // // virtio-blk header in first desc // - VirtioAppendDesc (&Dev->Ring, (UINTN) &Request, sizeof Request, - VRING_DESC_F_NEXT, &Indices); + VirtioAppendDesc ( + &Dev->Ring, + RequestDeviceAddress, + sizeof Request, + VRING_DESC_F_NEXT, + &Indices + ); =20 // // data buffer for read/write in second desc @@ -311,27 +395,55 @@ SynchronousRequest ( // // VRING_DESC_F_WRITE is interpreted from the host's point of view. // - VirtioAppendDesc (&Dev->Ring, (UINTN) Buffer, (UINT32) BufferSize, + VirtioAppendDesc ( + &Dev->Ring, + BufferDeviceAddress, + (UINT32) BufferSize, VRING_DESC_F_NEXT | (RequestIsWrite ? 0 : VRING_DESC_F_WRITE), - &Indices); + &Indices + ); } =20 // // host status in last (second or third) desc // - VirtioAppendDesc (&Dev->Ring, (UINTN) &HostStatus, sizeof HostStatus, - VRING_DESC_F_WRITE, &Indices); + VirtioAppendDesc ( + &Dev->Ring, + HostStatusDeviceAddress, + sizeof *HostStatus, + VRING_DESC_F_WRITE, + &Indices + ); =20 // // virtio-blk's only virtqueue is #0, called "requestq" (see Appendix D). // if (VirtioFlush (Dev->VirtIo, 0, &Dev->Ring, &Indices, NULL) =3D=3D EFI_SUCCESS && - HostStatus =3D=3D VIRTIO_BLK_S_OK) { - return EFI_SUCCESS; + *HostStatus =3D=3D VIRTIO_BLK_S_OK) { + Status =3D EFI_SUCCESS; + } else { + Status =3D EFI_DEVICE_ERROR; } =20 - return EFI_DEVICE_ERROR; + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, StatusMapping); + +UnmapDataBuffer: + if (BufferSize > 0) { + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, BufferMapping); + } + +UnmapRequestBuffer: + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, RequestMapping); + +FreeHostStatusBuffer: + Dev->VirtIo->FreeSharedPages ( + Dev->VirtIo, + EFI_SIZE_TO_PAGES (sizeof *HostStatus), + HostStatusBuffer + ); + + return Status; } =20 =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 04:43:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1503880515654560.4405589035292; Sun, 27 Aug 2017 17:35:15 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EBF4A21E47D6E; Sun, 27 Aug 2017 17:32:27 -0700 (PDT) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0084.outbound.protection.outlook.com [104.47.38.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1F74C21E47D58 for ; Sun, 27 Aug 2017 17:32:26 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Mon, 28 Aug 2017 00:35:03 +0000 X-Original-To: edk2-devel@lists.01.org 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; bh=6dMVwUYIBx0sePBt0cptpYiiOO77nm1TNeYX7dPdlhw=; b=MOSYbEyL8J2k5YcCZkysVEU7JVXXuw637949s73fvIOSI91IQbTbu2RDgWssPixIjRuQxsdOYSoHODLOIz0z3HdUGce0YxdGo/EtXwhhI+vLMFRa9S3Qd6Y5HDnbStNqaSJnhuNAefFtmxFNBPi1Y6BuBIyFVqED8K1KI8Pmr5Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Sun, 27 Aug 2017 20:34:29 -0400 Message-Id: <1503880469-15999-4-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> References: <1503880469-15999-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR2001CA0024.namprd20.prod.outlook.com (10.172.112.162) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0130931-948d-4a48-fcba-08d4edac9fe6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(48565401081)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 3:MF9oQy24W0zFmz9/ql01jku2u9D7W87rPgXCAU6U04rbxe5CiWLsfwLE9JQTclLOb93PJNC+BkPrAglL1zFWHnHUZ3Y32JJKh8TfLEVDUz4vTf9TByuKIQYPqn8bO+BjSbcFr0b24m8eZ8KJPdzL/BpGZmhuFSZo9XcCJU8YFHKTQAYeW8bfLjMR1IRlIzeCcTw5z13q+a4UUXcgbTspnS+RF4jkQKZaYv9dRbb5J8n6CHv5hYQoBP2QAOgnmpUW; 25:WSfL8YuXjXLcmpjgJtQnL4LMsPltx0Hx54fHXtnXqN/2WZ17qpqSS+3Oo5O6XCSLfqcftwihPGAdTr84rJbn7ZGtwYKzYwwG9dRVaXXXSChtCBO7HFxbpb/eKLTlPZKK7RlNI6/5R4xB4aXz9wquK/OX7SGhGwssMX1WqrUbbvZcBUISobjI/6n+us1MJg1LyMgOTAMGfhOBzrzxyjY5Y6H8rSxfRca21HnsUhnnwMe3AxfgrKeaF0+D3Ljw7uetP+BUdcPfGgMhrnQI0o3M7TpQkR3NtJQw1/HCrKfNt1SG3m1t8zukNg2o12wNX9wvU2oMuVZP95EKlRsXioUysg==; 31:AY0zKmNhFF4KyDqGiWUjfLWAI61YhkDUl485j+3fYfVHlWnD8yX0MxUTXk0yaMEeMZGR7D1g/UqJu5F/5oD0F6PKp4UvyUCOQxqcSOW4v9aYjDeEl+jL3sInElgsOSwzrJdU2HZHi+vQb/Ki8IcSB23G6cc7RgY135q6ppYxYv4Ng0zDQdMuU35WuM1OnMze7H3xpxdqyHB/7QSywJjL2bEXmJ6ng1Xu9P8fOEwKghM= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:yzVM6iKXIOkj6U8NBpEfL8PLpMNSFDZJx8F2mfKixL0MFUWUaMJ4WpRTLuzWLUjpEtfmo8AkcHy3H5Ubq4SN++AkBbOQr4D/F3PQjZw2XfgkF2ioV0ha7/5N6WnMuLjRuyv8pOrR6CFv66vOUpioTEYeUhJWW7Tj7kbYoQLYIwx/IpEfCsG1jp6UHR41yYON2/0QIHViE76ADomskLmwYN+jXbposqB4noO50wTRqkqOqdtsffSQjcrNZO63dfVQJinaxdjAMLl2Ajo04C2k0yMP2cK+6Ou0VD9lrVS4qHLyNoDqmLgmNXoUwsfNbMAJp6uA+pAApz2dy2FMfRH3VL5sFxf86jUU9qdFx4Oua09xA1vUeS2LO/XMkcOkhvHxgFGGxzKEXRD/xJWbEMybY3K8SCyVZVR7zTo7xgj9BK11hNOSajAGqSkIHE9QDTybYA3pq7cNx0Sw2TcJZ1nXi4wOba3qlxVsSSMwKYuKb+VMe6H7Ip97FueovAkhr+rj; 4:bBTC4iZBEwBCVUpr8ZfXYgOi/3YFSNAKp2GY5LJqZ5VaZRi0Znvf8593UcBHcBZC/DeLXY0/DmpBDTcGEk8elBaoRUBXChuMjp8TFopSmYm8Enm1dtJI09POD2frH4WseVjSbGM8OEzPuwVgnkgnnz9h64FgN2XEBAsnI5gHGfzjEnivH8e4htMiJmdyLIn4ZyaiW3nvssqU1yAXJL31O1aUagaM17aBvPFMU+84GG8aydU/I5p0JtKcE6YgPtYwJP+kRGT0V/rixDqnqYytTQDiKZFQ3+r8QNm3dQZnY7k80cse8+MIi7sx8bvxUZa7HzJjifKmnSKriemXTugfNg== X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR12MB0152; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR12MB0152; X-Forefront-PRVS: 0413C9F1ED X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(199003)(2906002)(53936002)(6666003)(25786009)(7350300001)(478600001)(36756003)(2950100002)(76176999)(66066001)(47776003)(6116002)(97736004)(4326008)(6486002)(81166006)(8676002)(54906002)(81156014)(48376002)(110136004)(5003940100001)(50466002)(305945005)(6916009)(53416004)(68736007)(42186005)(2351001)(189998001)(7736002)(2361001)(50986999)(86362001)(3846002)(33646002)(105586002)(101416001)(50226002)(106356001)(5660300001)(344415003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0152; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0152; 23:vyVhh/KPSOcrBkzlZUR44hdRB8xwQuqK03q4Y0GjD?= =?us-ascii?Q?x2swhgxii21MLvS3m6g0KzdLZDAtsjeXHRmRvM4vkBvoy2KOduXBtdPRLXPW?= =?us-ascii?Q?z1SnkLlk+ReupMqtYhkLtbB4IhNqD6N7ZG8AK/QG4kZP3K1QK+ZMsqlRzMP8?= =?us-ascii?Q?juoah4M0DF6Ne0pMYowgb9UJLEn2uAXP5wAoYwX24PSIQDDHjUNI4NgHVwJq?= =?us-ascii?Q?k2bfla6bVMROHQNhZL08pTgl4gPkhWzSG9nuqcYJkvJIL/NRDriM8Hn6lob/?= =?us-ascii?Q?vXE164K5lDtfRVTDXQk1N9KqUbdnGWPwP83UuSs5bj+Y3S2zhbYQKS7ElafJ?= =?us-ascii?Q?naaSfNScFKpZI7mCOrTH5dq6wT3xmKCfvOthvf6hGdkYtnShG99B0qCm5GLc?= =?us-ascii?Q?5DgtdMVsSbSXcrjP0a4aCx0cPf00QCOhvQp2Lf8SKPw5jUbeK4y7LHcVccui?= =?us-ascii?Q?pufk9SCOOuQjV9uwntnKU/ZR/tbpSGu3LwGdIggnGKcoFqTM/RLZQr0gY/UV?= =?us-ascii?Q?amWvyzpOO1ynEQP2VAjA1A7ri5J0u+enpdI9MIgU3JKZfLRHV/zmHX6RtIsN?= =?us-ascii?Q?t+fJGx9G5Aw6TJnTpcIHcwds+9j9al7cmIQKvFuG4EwQVM4cT1L5piKMQ40F?= =?us-ascii?Q?birPXkMKhwVajjlqIMjbvQ5IX3SiCwlAES2DMJEoEUBCrUDI2ekEGDlenTYu?= =?us-ascii?Q?vKxrIcerJ+9afxuiZssK2RxuVHmhmy7KKng8ddcOvkdnG9DTIYnh+3UfjM+l?= =?us-ascii?Q?B808Z9sEkKd1xfQ3J4EXut7O9clGGehP0gBqkPIMSOsV+6cAXCXu3Gvl3yYr?= =?us-ascii?Q?qwce76OIvOYJw9AIxPAJNnDwuMcZH5k5l8NgvO+oEgkvymbEWa3ogWxEnK4F?= =?us-ascii?Q?3FMst0Jd0Eb0oV1HeIrfBFCdj8Ds0zHL9hDW0GNcIDCRoyw/g3ZXIS8Z4Dt0?= =?us-ascii?Q?aUKo6dr0G40wuyrd+nO8Nthouj2c8aioHOf+6m7VZeQmT8D0/t2QLatRWG2n?= =?us-ascii?Q?GkAJQfVk3RzgiiSDK4B1381tFRBDkil0YGJVUfzGmVO1Hn+dDFpEQEbVJhf7?= =?us-ascii?Q?6/dyuxf85OspI9/AFIqIDt/W2dsakVflVUuODIBa1Qm5IZRMi05BSk57RRXa?= =?us-ascii?Q?IwfbqiSeOwZqw/6GOXz0W1LjUJq41C8Jp/V67yltEWw6iBo9BJkXmpF25Deh?= =?us-ascii?Q?uOmHxtYFM/p7FI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 6:sn7nzuI7CMaIAJQ3KO2DfluVDi6InO6dFtBB+DGxIAw/or2PqVOwwNsJsyI14F9OA369VYaXUDIRzB6yNIZwiL4Osf2HwGxCCMCM8G0Ixw8uHNuszSglEywWR+j1l316oIuwj4mapelTriLfbDwdvLLg8k0ZQgSvxziJZftlM9FbmIhCJFoTqldBsii/lw/YqUjm8v7515Nq65UxxmsOxFLYOXsvtthuo0QNJNGQFD15O/zUhLkI+rqnkAEmuhazP+K1h8avKAMPyk6Yg2CyWt/PBxDH8pZfFEnhwzxRS9CZFVsYS82PqIIfKXXYXbzSJ1zcpdLUB2tRtxGX+KgjoQ==; 5:R60OlKIEfWWDaafnCDgLC8HIFV2ZSLW19tLHH+GUCuNZuLVxlYEheUkvl+997H/+IYG5EWS7G/IHyudfd2Y1jg2bHx29N+V57Ow3jBwCzItncRwCWeZJu/9EyUm7Nlljbnu2DiomfzLPEbtDDrMh9Q==; 24:qpJycXL01Kzn2Peq685zNny8sIX9msHoyEkPd8lNqzgR5Xd+9GBQcU7leleQBpvauaxLvRnI0gitqR97n6z8obZwwQEzG/mO3Xvmk5s3Pxs=; 7:WLG1re0DXy75gDEya9BFFM+lGzkHdrSLNAW0sZhSz4dlkNSK3ncRMqh7qRWmD9pmrRgTUhuI+viEyvqN5d9plwi4crcgYcgOJwr2CbUisZtupc73BsL4wtQhj6xgPyluB+kLfnWer4I/wIo1CX6pVctkzWoONPhqMtx1RZxAvxAfWv1hZ1Gokgp/DLlFQU6XsnAPJsoqJQqdu58/vQH8Tu8OQBJNmZ8WR8NJjZCZFb8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:nf5MHq/KyNJwjeHsYYNSnftutKhZE85VEBeceUoJcda8+0PCbK3mo0r5ZMvjhxHSroTODmnUGZvqXB2c5uttBmlqXT6Xi1sW+GZ4pstZsZzs1v8cH0G4iH+yLJlNg/jax5ftPBKLMTc1nKg/w6DYAJAYOT4+ApMRI7c6u+0yUmQouG+gzYNLKHtJmKtvZusmw0Gb/MBmcKYWDwGCKbzKhtL1vS66+70Q9QOchQ4hcK+hcxvIk6kCNyxcykgDaTQ2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2017 00:35:03.1767 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 Subject: [edk2] [PATCH v2 3/3] OvmfPkg/VirtioBlkDxe: negotiate VIRTIO_F_IOMMU_PLATFORM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Tom Lendacky , Laszlo Ersek , Ard Biesheuvel Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" VirtioBlkDxe driver has been updated to use IOMMU-like member functions from VIRTIO_DEVICE_PROTOCOL to translate the system physical address to device address. We do not need to do anything special when VIRTIO_F_IOMMU_PLATFORM bit is present hence treat it in parallel with VIRTIO_F_VERSION_1. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Tom Lendacky Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/Virtio= Blk.c index c9c42aa41243..6abd937f86c6 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -808,7 +808,8 @@ VirtioBlkInit ( } =20 Features &=3D VIRTIO_BLK_F_BLK_SIZE | VIRTIO_BLK_F_TOPOLOGY | VIRTIO_BLK= _F_RO | - VIRTIO_BLK_F_FLUSH | VIRTIO_F_VERSION_1; + VIRTIO_BLK_F_FLUSH | VIRTIO_F_VERSION_1 | + VIRTIO_F_IOMMU_PLATFORM; =20 // // In virtio-1.0, feature negotiation is expected to complete before que= ue @@ -886,7 +887,7 @@ VirtioBlkInit ( // step 5 -- Report understood features. // if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) { - Features &=3D ~(UINT64)VIRTIO_F_VERSION_1; + Features &=3D ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM); Status =3D Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features); if (EFI_ERROR (Status)) { goto UnmapQueue; --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel