From nobody Fri May 3 13:58:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 1512456002812157.9582226691; Mon, 4 Dec 2017 22:40:02 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E0EDE2035625A; Mon, 4 Dec 2017 22:35:30 -0800 (PST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A226A20356240 for ; Mon, 4 Dec 2017 22:35:28 -0800 (PST) Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2017 22:39:58 -0800 Received: from sfu5-mobl.ccr.corp.intel.com ([10.239.193.28]) by fmsmga008.fm.intel.com with ESMTP; 04 Dec 2017 22:32:57 -0800 X-Original-To: edk2-devel@lists.01.org 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: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,363,1508828400"; d="scan'208";a="202486" From: Fu Siyuan To: edk2-devel@lists.01.org Date: Tue, 5 Dec 2017 14:32:55 +0800 Message-Id: <20171205063255.6652-1-siyuan.fu@intel.com> X-Mailer: git-send-email 2.13.0.windows.1 Subject: [edk2] [Patch] MdeModulePkg/TcpIoLib: Check input Timeout before calling CheckEvent() service. 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: Ye Ting , Wu Jiaxin MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" For TcpIoConnect() and TcpIoAccept(), this patch adds the check for Timeout= event before calling CheckEvent() service so as to avoid the unnecessary function= call. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan Cc: Wu Jiaxin Cc: Ye Ting Reviewed-by: Wu Jiaxin Reviewed-by: Ye Ting =20 --- MdeModulePkg/Include/Library/TcpIoLib.h | 14 +++++++------- MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MdeModulePkg/Include/Library/TcpIoLib.h b/MdeModulePkg/Include= /Library/TcpIoLib.h index 2871f6747e..22629dbcd5 100644 --- a/MdeModulePkg/Include/Library/TcpIoLib.h +++ b/MdeModulePkg/Include/Library/TcpIoLib.h @@ -2,7 +2,7 @@ This library is used to share code between UEFI network stack modules. It provides the helper routines to access TCP service. =20 -Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at
@@ -144,7 +144,7 @@ TcpIoDestroySocket ( Connect to the other endpoint of the TCP socket. =20 @param[in, out] TcpIo The TcpIo wrapping the TCP socket. - @param[in] Timeout The time to wait for connection done. + @param[in] Timeout The time to wait for connection done. Set to = NULL for infinite wait. =20 @retval EFI_SUCCESS Connect to the other endpoint of the TCP = socket successfully. @@ -160,14 +160,14 @@ EFI_STATUS EFIAPI TcpIoConnect ( IN OUT TCP_IO *TcpIo, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ); =20 /** Accept the incomding request from the other endpoint of the TCP socket. =20 @param[in, out] TcpIo The TcpIo wrapping the TCP socket. - @param[in] Timeout The time to wait for connection done. + @param[in] Timeout The time to wait for connection done. Set to = NULL for infinite wait. =20 =20 @retval EFI_SUCCESS Connect to the other endpoint of the TCP = socket @@ -185,7 +185,7 @@ EFI_STATUS EFIAPI TcpIoAccept ( IN OUT TCP_IO *TcpIo, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ); =20 /** @@ -229,7 +229,7 @@ TcpIoTransmit ( @param[in] Packet The buffer to hold the data copy from the s= ocket rx buffer. @param[in] AsyncMode Is this receive asyncronous or not. @param[in] Timeout The time to wait for receiving the amount o= f data the Packet - can hold. + can hold. Set to NULL for infinite wait. =20 @retval EFI_SUCCESS The required amount of data is received f= rom the socket. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @@ -246,7 +246,7 @@ TcpIoReceive ( IN OUT TCP_IO *TcpIo, IN NET_BUF *Packet, IN BOOLEAN AsyncMode, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ); =20 #endif diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c b/MdeModulePkg/= Library/DxeTcpIoLib/DxeTcpIoLib.c index 17183e1a6c..a7637579f2 100644 --- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c +++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c @@ -2,7 +2,7 @@ This library is used to share code between UEFI network stack modules. It provides the helper routines to access TCP service. =20 -Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at
@@ -530,7 +530,7 @@ TcpIoDestroySocket ( Connect to the other endpoint of the TCP socket. =20 @param[in, out] TcpIo The TcpIo wrapping the TCP socket. - @param[in] Timeout The time to wait for connection done. + @param[in] Timeout The time to wait for connection done. Set to = NULL for infinite wait. =20 @retval EFI_SUCCESS Connect to the other endpoint of the TCP = socket successfully. @@ -546,7 +546,7 @@ EFI_STATUS EFIAPI TcpIoConnect ( IN OUT TCP_IO *TcpIo, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ) { EFI_TCP4_PROTOCOL *Tcp4; @@ -576,7 +576,7 @@ TcpIoConnect ( return Status; } =20 - while (!TcpIo->IsConnDone && EFI_ERROR (gBS->CheckEvent (Timeout))) { + while (!TcpIo->IsConnDone && ((Timeout =3D=3D NULL) || EFI_ERROR (gBS->C= heckEvent (Timeout)))) { if (TcpIo->TcpVersion =3D=3D TCP_VERSION_4) { Tcp4->Poll (Tcp4); } else { @@ -597,7 +597,7 @@ TcpIoConnect ( Accept the incomding request from the other endpoint of the TCP socket. =20 @param[in, out] TcpIo The TcpIo wrapping the TCP socket. - @param[in] Timeout The time to wait for connection done. + @param[in] Timeout The time to wait for connection done. Set to = NULL for infinite wait. =20 =20 @retval EFI_SUCCESS Connect to the other endpoint of the TCP = socket @@ -607,7 +607,7 @@ TcpIoConnect ( supported in the implementation. =20 @retval EFI_TIMEOUT Failed to connect to the other endpoint o= f the - TCP socket in the specified time period. = =20 + TCP socket in the specified time period. @retval Others Other errors as indicated. =20 **/ @@ -615,7 +615,7 @@ EFI_STATUS EFIAPI TcpIoAccept ( IN OUT TCP_IO *TcpIo, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ) { EFI_STATUS Status; @@ -646,7 +646,7 @@ TcpIoAccept ( return Status; } =20 - while (!TcpIo->IsListenDone && EFI_ERROR (gBS->CheckEvent (Timeout))) { + while (!TcpIo->IsListenDone && ((Timeout =3D=3D NULL) || EFI_ERROR (gBS-= >CheckEvent (Timeout)))) { if (TcpIo->TcpVersion =3D=3D TCP_VERSION_4) { Tcp4->Poll (Tcp4); } else { @@ -860,7 +860,7 @@ ON_EXIT: @param[in] Packet The buffer to hold the data copy from the s= ocket rx buffer. @param[in] AsyncMode Is this receive asyncronous or not. @param[in] Timeout The time to wait for receiving the amount o= f data the Packet - can hold. + can hold. Set to NULL for infinite wait. =20 @retval EFI_SUCCESS The required amount of data is received f= rom the socket. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @@ -877,7 +877,7 @@ TcpIoReceive ( IN OUT TCP_IO *TcpIo, IN NET_BUF *Packet, IN BOOLEAN AsyncMode, - IN EFI_EVENT Timeout + IN EFI_EVENT Timeout OPTIONAL ) { EFI_TCP4_PROTOCOL *Tcp4; --=20 2.13.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel