From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0052.outbound.protection.outlook.com [104.47.40.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5BF7221DFE91B for ; Mon, 14 Aug 2017 04:35:05 -0700 (PDT) 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=6a+koTsBzvw4AqRrbSYGW9aqPzE0gVbxslLGe+Ph+ts=; b=l3otnNKrRYSH7kho3ZyJH4hvZ13ylOzK6GpaXbcPR+gI4fMun0xH3lWwq62uDCTul9GYEUifSMQCRfEjS9q05sJU377y3eIHkn107fJCIa19Ll2hFD2dHpVEJC2MGoMVHO65d/0VGkxvGP1KxcGO72JlJBHDVKi4PcEgZK+S7ok= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from brijesh-build-machine.amd.com (165.204.77.1) by BY2PR12MB0145.namprd12.prod.outlook.com (10.162.82.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Mon, 14 Aug 2017 11:37:26 +0000 From: Brijesh Singh To: edk2-devel@lists.01.org Cc: Brijesh Singh , Ard Biesheuvel , Jordan Justen , Tom Lendacky , Laszlo Ersek Date: Mon, 14 Aug 2017 07:36:43 -0400 Message-Id: <1502710605-8058-22-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502710605-8058-1-git-send-email-brijesh.singh@amd.com> References: <1502710605-8058-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR15CA0043.namprd15.prod.outlook.com (10.173.226.157) To BY2PR12MB0145.namprd12.prod.outlook.com (10.162.82.18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60ab2009-4ed1-46a6-6b4e-08d4e308d6b0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY2PR12MB0145; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 3:1dFHaWeOLxe2KnFLEZiiifuVUJYwxguSQwxE9pxoahlkZsPBJof9+mzrdJH0dRzy9m/bXIP4+q3s+WiaZD8AwWLnXdqP9NN1wAvZO5YY2Kpm9HGw6TsM4lQSHwAemE2Som+Yu7suxSHAnuEnGd+JKJHo5T7CjK/jZ3IoTPnA724FmHFOEIcUBcyCEQ1qQ5KCRwOP03Ot+EYZRn1XHqhRl5mvOmTlXb3qx7TIMLZXAV9zjMIRhfcSuOqFvT92m0hG; 25:sSWiVZ5pE2ug0424yGqc9+DFXKxEMIjMMptZEUYlGybrTeBOdGNvJLOtuqNmfx+HUuMDKz6Qu6c61VM7pFLH3SfpJXGWOnDmeCGHugyZpYOs6TqrNHbWhvRdEayY3sNhh251l4xxz45KfYDx/Ofe5Wo66argArvmkEFcxQ+xC8O/fZFMH6BSbcVLsskBwSNbiaPYeHAejton6+zFjuI6adnyopyCQLpqKnUDNzeA2M17x0a4WiVqGsjmYYn7cXkLedL2KEs6tzrxOYiHLw2kygwnj4x6zCs+Jc4auOBB8t1mrO3LIXd2ENQCJOJzUvQ7xY6BZO9U2qU51ZRwzofILA==; 31:OTS5wcCPMNz8EPRl7gtLqlmVsvwXEoszRzIGVVGy0ot/WWeGAteTBHzjN3XvlyLjsHddJp696jObDcBuXPKNaH2jQUCmHm2RKVr6HQT3xRBYrXdsBskobMcvqSP4s2H1/GMkE99S/8E4VreaaN1zrd8vSC87TNZkZXbe/ek0llXcLbvthlADSzztuzqMfUZCaxDRfPjl2xBlMXOvzwE21ceJGKm/x2czjTp68uBLFuw= X-MS-TrafficTypeDiagnostic: BY2PR12MB0145: X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 20:1irngg7dqf6UgPrqRhT2HjS2EVuYj/Bpv6e+NbpC/gFGZ93GbPmKkcKm7iYNdInOdMM9+eAGkhm2jol6i3gKqq63t18bIYO2h3hiiCWHRVqUDk5h6T/kOos26QP37Qjqtf62XtahToRfeC8vzXg9PFjX6xRPcniV3302iZpk2Uw0RRI+Kuu6xZvJFn2R4JCiq8WpAgVU+pSy41vsiZNbmY9b11xsyv6HVi8+j2tjspx6nJdg0I7DPgb3oi4paHzSVjbCQN1p8uWIK7UMkDqF/nkQYJKG+GNry2RkQ0nk4ty04EVuBZcaYDwuqRk1IoPeOw4X9p+2E0K3kbXLV3ps/iOErVGGtok/Ozjid809p552S6sFa5ixYIxAbRk1u22un2Qbf5h3QQ0LSvf3f3vb1YPjeMnuK/UfdvRWXhZB1SiekTv24sVC2Y4TYHeLH14afuXIcybyBmWsCZiX/t/YXhrxpdk6FeHc90RZ+XSPBIpFHJ+BLuvK4kCW0goCm3OY; 4:7iWu6iO8HHCaVo+CVPrHQrzPW5Gy+49ia9D+3c3ctFVncWginTXnYzNUPIWddW2xt7SABJckOWD+hjctyZ/fevrkQEs8hWhX3XXKvHotjqdcc1qETSpEqX6YVnyGW0yypIao26UYvkflPDxWkptxIpJYCfuCITfC1YQo4ptqXUl1NKDpfDKXqYZZS1dLT+HNp+GM/gYXUa0wnqVME7J2HI0wMSgBdF9pNg0USDiHdA3le/qCR4VO1OouDfI2EMBRf3WohX4Am5Mq31yDpnpo7TRfJbxCQE3tfuEnUKLj2Ek0JAmTPnVu+DSgPS/3qpmrPPpV8DI/6BjozpgHFj8rKA== 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)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR12MB0145; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR12MB0145; X-Forefront-PRVS: 039975700A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(199003)(189002)(54906002)(5003940100001)(6116002)(3846002)(53936002)(97736004)(86362001)(36756003)(81156014)(81166006)(110136004)(8676002)(189998001)(50986999)(76176999)(5660300001)(2361001)(25786009)(2351001)(50226002)(4326008)(7350300001)(33646002)(478600001)(53416004)(42186005)(2906002)(105586002)(7736002)(305945005)(106356001)(48376002)(50466002)(47776003)(66066001)(6486002)(6916009)(2950100002)(6666003)(68736007)(101416001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR12MB0145; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR12MB0145; 23:VOZtuj5BVgsUbn0DGJu9KiEcbtd81wy4irx4XPYTW?= =?us-ascii?Q?XbL3fOVYWmCAbdo7vi/XGKxwfSFk/gviJrUXC7qKIouJoWbHDCxFYdp45RDf?= =?us-ascii?Q?TzZEOn5IrIEktLoDmrlVBeli/jRvWaDd5lzthUUA4qoLDuNlliRAbBljfkEu?= =?us-ascii?Q?irwrpBUAVD/BIRW3Yr615ZoFnwp+/j5eDpCt7cpmc8tqiKBcgdTCo7KGdWOA?= =?us-ascii?Q?RwSs48DL6EAmdNmz5xdZpCdVBWfKAp6CArNIHDKVU60nR6z8P1gSEHZK5my6?= =?us-ascii?Q?VF0P+VOdqVsVGy5qrO8B/+O2hzW7QXJshEMBHNYlzaBLJA5ksqibbL2cm1Wc?= =?us-ascii?Q?W4A7O8FuNnh1gIvLZacbGSz6Fn5uWUpc5ZD5j/3MiXwbdg/HrJtnwmAK6lLO?= =?us-ascii?Q?Y73AEVsafTaTaXsBVG3pP60QxRxbOyJr6pFzIa/fDyS8ze+8qf4KuCnCykUg?= =?us-ascii?Q?61F+BX2X+3NFuskM8XLRG/uwP6x54gfhDfYpxxV44qtQFP15L++8sXE4qHfZ?= =?us-ascii?Q?LcePknXqOESY2t0/1kBsQPysm2MzXhuvhqaF5iLlXwrPltIZeNnTj7B/ZKeK?= =?us-ascii?Q?2CTOm9payXfUadLOD5Utx1Gt3wAwDfLX+vdtCt+jxwOBYAjIB616YQvhqCk8?= =?us-ascii?Q?iDbewefCYrcxgCMrVYvPAquvSO3nZP3yibixvJAANoFu8lp2s/bmirjxfNS7?= =?us-ascii?Q?gyDxYXQ2S8y4qclxL9oNVsN9o0LxalC5lSt4JsLtm5/dbp4wsVzynelRm2yc?= =?us-ascii?Q?0k4pLZI1RdW/N3ci/3h8zV6lBN/0tDMNRhYfmeeXDhm77NhcAd6XWhYqEViz?= =?us-ascii?Q?9K/xyNpyfOlnJr25Cwc9b81pt0R5ol1o99Y29vDPrS3/7i9UKrRp7OYymouT?= =?us-ascii?Q?d+QJiin3MlWWLAMzqXbO3U1sOk7W4Ja7p4KebpfWlYbFKI1BWoXg16t82Jn8?= =?us-ascii?Q?bkAuhZZcFYgMq4s5Kv5shs2nl1JJ11NAOi1wUPAIXcTpmhsrQ9edixBPO7cP?= =?us-ascii?Q?pzRtybsXhYM0xxs+pVO/L21EREM6h/qe1IWHGylv3j7wE5Noviev0IdWXG1U?= =?us-ascii?Q?GwxequT0nm7ZlTITaxj3rl7owhoERBm2dyjvySby/8Cz0mH3sFtbxwnSGjOJ?= =?us-ascii?Q?eyMSkXfo5htJlBc51lDzwe5pWQOtAQk?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 6:YvgN+5pExk+ZWksd+FwpXfxM0eOlj0ZWT7+5LqAr8oAGx6gUXQcOVNQ5Zt/GOVxLOArIAgCZFuiy+1ugKGmYHcQuVj9L3V/6XDbQTRFN7QTzJ6RlGYfDoRBUwkSCAgw7rtpnJxfvRGMuviI11P2WZXqMbp4UJzJs4ovce6OqoZLXQwPkxOT93YDzwrPr5gRYqPkA50LGhOsC1gIO7qvLYVK9CX4ehfSD1WPzCxckJ5gFUvjmwERsck6DkOSJ+ipCatJNzZZkUumyha1rOEnjbNspo6UlmzobC7s0kwyFMwF77gINrH7qW2rQLilin4IsCkViQWXXed5qvxHGpvF63Q==; 5:zbiAZfPgIfP+LHNLfcnAliD19+uVPbcKIHz55iJJwgyf1XwEgEIlf/AJPG7MEYqW8usN7+++4f/MF74hHOKTQ6lDrVYknMUzlwjli/oOUxnxMGrWrZvdqas3LHKuuOOtao3CYxQ3Chib8+FdmWBwhQ==; 24:kOAC0fv+sgsL29uxB42NZ8+6w83GsGDcxxdEp3ewswbSP9DHBGDVAbV/pCYDVvN03jG0QzNe2Mi2EdPMANP/YCugxwisQzrf/ZOawBq7yyY=; 7:AWNs4ZdthRVwokiGcHow5OW7+AdWzVSGZQru1nAjE9QBsM5/bm+Qv9P8+GEwPvFRltI6OuM+6cWhllS6eKoryOHbZVtFHI5QEPNV4Q3JAidCDtotbsHHtfLz9evYVLXGLrDOjZtAMnesbTUwB+K0kLWcphnFYLJkUri8dZFdrz3sMHRihWjCTl1FgBPWoO6Edzwu3WQSfX7uvKKKjFLG4pk0UaesnsQTymdA/2jwNGw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 20:0Bnjs5bcoFgEiUkFyLkRcihxs6i1f1kSr9iRdzGWLwBN5I7eE/pdBwMve4Mwg2PfPMpFaT0pwU+3Uc5u7Jhh2VUzQHMFwqWRPSMlpHiRgDH66b6zQ6pQEsl2VJ4YHf/XaTpWZNqwmIpfPdNqwi1025ShYCtItomBy7v5Ijw4ElyprqzD21GYohAIpLl4YBlY8C3U/DMGPOOeDxKtC1uEC9eS0FfRZh4fOv8jFCYP+NaK4e2euOt9wQbG/7fVthJb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2017 11:37:26.1118 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0145 Subject: [PATCH v2 21/23] OvmfPkg/VirtioNetDxe: dynamically alloc transmit header 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: , X-List-Received-Date: Mon, 14 Aug 2017 11:35:05 -0000 Content-Type: text/plain A network packets are transmitted by placing then into a transmit queue, each packet is preceded by a VIRTIO_1_0_NET_REQ header. VirtioNetInitTx(), builds the header once and fills the vring descriptors with the system physical address of header. The patch uses VirtIo->AllocateSharedPages() to allocate the header buffer and map it with BusMasterCommonBuffer so that it can be equally accessed by both processor and device. We could map it with BusMasterRead but since the header pointer is used after it was added into vring hence I choose to dynamically allocate it and map it with BusMasterCommonBuffer to avoid the code complexity. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Tom Lendacky Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh --- OvmfPkg/VirtioNetDxe/VirtioNet.h | 3 +- OvmfPkg/VirtioNetDxe/Events.c | 6 ++ OvmfPkg/VirtioNetDxe/SnpInitialize.c | 60 +++++++++++++++++--- OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c | 6 ++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.h b/OvmfPkg/VirtioNetDxe/VirtioNet.h index a4661bd5d2fe..873069e9de82 100644 --- a/OvmfPkg/VirtioNetDxe/VirtioNet.h +++ b/OvmfPkg/VirtioNetDxe/VirtioNet.h @@ -94,7 +94,8 @@ typedef struct { UINT16 TxMaxPending; // VirtioNetInitTx UINT16 TxCurPending; // VirtioNetInitTx UINT16 *TxFreeStack; // VirtioNetInitTx - VIRTIO_1_0_NET_REQ TxSharedReq; // VirtioNetInitTx + VIRTIO_1_0_NET_REQ *TxSharedReq; // VirtioNetInitTx + VOID *TxSharedReqMap; // VirtioNetInitTx UINT16 TxLastUsed; // VirtioNetInitTx } VNET_DEV; diff --git a/OvmfPkg/VirtioNetDxe/Events.c b/OvmfPkg/VirtioNetDxe/Events.c index 2f61da6aece4..21468f44a3f0 100644 --- a/OvmfPkg/VirtioNetDxe/Events.c +++ b/OvmfPkg/VirtioNetDxe/Events.c @@ -101,4 +101,10 @@ VirtioNetExitBoot ( // device is reset. // Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RxBufMap); + + // + // Unmap shared Tx request mapping so that hypervisor can not get readable + // data after device is reset. + // + Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->TxSharedReqMap); } diff --git a/OvmfPkg/VirtioNetDxe/SnpInitialize.c b/OvmfPkg/VirtioNetDxe/SnpInitialize.c index db2314446bbb..9bac19f8e3d1 100644 --- a/OvmfPkg/VirtioNetDxe/SnpInitialize.c +++ b/OvmfPkg/VirtioNetDxe/SnpInitialize.c @@ -18,6 +18,7 @@ **/ #include +#include #include #include @@ -149,8 +150,11 @@ VirtioNetInitTx ( IN OUT VNET_DEV *Dev ) { - UINTN TxSharedReqSize; - UINTN PktIdx; + UINTN TxSharedReqSize; + UINTN PktIdx; + EFI_STATUS Status; + EFI_PHYSICAL_ADDRESS DeviceAddress; + UINT64 BufBaseShift; Dev->TxMaxPending = (UINT16) MIN (Dev->TxRing.QueueSize / 2, VNET_MAX_PENDING); @@ -162,24 +166,57 @@ VirtioNetInitTx ( } // + // Allocate TxSharedReq header and map with BusMasterCommonBuffer so that it + // can be accessed equally by both processor and device. + // + Status = Dev->VirtIo->AllocateSharedPages ( + Dev->VirtIo, + EFI_SIZE_TO_PAGES (sizeof *(Dev->TxSharedReq)), + (VOID *) &Dev->TxSharedReq + ); + if (EFI_ERROR (Status)) { + return Status; + } + + Status = VirtioMapAllBytesInSharedBuffer ( + Dev->VirtIo, + VirtioOperationBusMasterCommonBuffer, + (VOID *) Dev->TxSharedReq, + sizeof *(Dev->TxSharedReq), + &DeviceAddress, + &Dev->TxSharedReqMap + ); + if (EFI_ERROR (Status)) { + goto FreeBuffer; + } + + BufBaseShift = (UINT64) (UINTN)Dev->TxSharedReq - (UINT64) DeviceAddress; + + ZeroMem ((VOID *) Dev->TxSharedReq, sizeof *(Dev->TxSharedReq)); + + // // In VirtIo 1.0, the NumBuffers field is mandatory. In 0.9.5, it depends on // VIRTIO_NET_F_MRG_RXBUF, which we never negotiate. // TxSharedReqSize = (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) ? - sizeof Dev->TxSharedReq.V0_9_5 : - sizeof Dev->TxSharedReq; + sizeof ((Dev->TxSharedReq)->V0_9_5) : + sizeof *(Dev->TxSharedReq); for (PktIdx = 0; PktIdx < Dev->TxMaxPending; ++PktIdx) { UINT16 DescIdx; + UINT64 Address; DescIdx = (UINT16) (2 * PktIdx); Dev->TxFreeStack[PktIdx] = DescIdx; + Address = (UINTN) Dev->TxSharedReq; + Address += BufBaseShift; + // // For each possibly pending packet, lay out the descriptor for the common // (unmodified by the host) virtio-net request header. // - Dev->TxRing.Desc[DescIdx].Addr = (UINTN) &Dev->TxSharedReq; + Dev->TxRing.Desc[DescIdx].Addr = (UINTN) Address; Dev->TxRing.Desc[DescIdx].Len = (UINT32) TxSharedReqSize; Dev->TxRing.Desc[DescIdx].Flags = VRING_DESC_F_NEXT; Dev->TxRing.Desc[DescIdx].Next = (UINT16) (DescIdx + 1); @@ -194,13 +231,13 @@ VirtioNetInitTx ( // // virtio-0.9.5, Appendix C, Packet Transmission // - Dev->TxSharedReq.V0_9_5.Flags = 0; - Dev->TxSharedReq.V0_9_5.GsoType = VIRTIO_NET_HDR_GSO_NONE; + Dev->TxSharedReq->V0_9_5.Flags = 0; + Dev->TxSharedReq->V0_9_5.GsoType = VIRTIO_NET_HDR_GSO_NONE; // // For VirtIo 1.0 only -- the field exists, but it is unused // - Dev->TxSharedReq.NumBuffers = 0; + Dev->TxSharedReq->NumBuffers = 0; // // virtio-0.9.5, 2.4.2 Receiving Used Buffers From the Device @@ -215,6 +252,13 @@ VirtioNetInitTx ( *Dev->TxRing.Avail.Flags = (UINT16) VRING_AVAIL_F_NO_INTERRUPT; return EFI_SUCCESS; +FreeBuffer: + Dev->VirtIo->FreeSharedPages ( + Dev->VirtIo, + EFI_SIZE_TO_PAGES (sizeof *(Dev->TxSharedReq)), + (VOID *) Dev->TxSharedReq + ); + return Status; } diff --git a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c index ec8e63ebdc32..6e7166144f2d 100644 --- a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c +++ b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c @@ -53,5 +53,11 @@ VirtioNetShutdownTx ( IN OUT VNET_DEV *Dev ) { + Dev->VirtIo->FreeSharedPages ( + Dev->VirtIo, + EFI_SIZE_TO_PAGES (sizeof *(Dev->TxSharedReq)), + (VOID *) Dev->TxSharedReq + ); + FreePool (Dev->TxFreeStack); } -- 2.7.4