From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 5765F211B76A1 for ; Mon, 14 Jan 2019 02:15:26 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D39967EBB7; Mon, 14 Jan 2019 10:15:25 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-239.rdu2.redhat.com [10.10.120.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0B7B5D962; Mon, 14 Jan 2019 10:15:24 +0000 (UTC) To: Star Zeng , edk2-devel@lists.01.org Cc: Hao Wu References: <1547393875-37188-1-git-send-email-star.zeng@intel.com> <1547393875-37188-2-git-send-email-star.zeng@intel.com> From: Laszlo Ersek Message-ID: <279a5141-e843-2ee9-94bd-239c17a13975@redhat.com> Date: Mon, 14 Jan 2019 11:15:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1547393875-37188-2-git-send-email-star.zeng@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 14 Jan 2019 10:15:25 +0000 (UTC) Subject: Re: [PATCH 01/12] MdeModulePkg Variable: Add some missing changes for 9b18845 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 10:15:26 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Star, On 01/13/19 16:37, Star Zeng wrote: > 9b18845a4b4cd1d2cf004cbc1cadf8a93ccb37ea changed the code > which read from physical MMIO address to read from memory cache. > > The patch adds some missing changes for it. > > I found them when updating code for > https://bugzilla.tianocore.org/show_bug.cgi?id=1323 > Merge EmuVariable and Real variable driver. > > Cc: Jian J Wang > Cc: Hao Wu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Star Zeng > --- > MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 12 +++++------- > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c | 6 +++--- > 2 files changed, 8 insertions(+), 10 deletions(-) Please update the commit message to clarify the change. Commit 9b18845a4b4c ("MdeModulePkg Variable: Enhance variable performance by reading from existed memory cache.", 2015-10-23) was a performance optimization. Therefore, there can be two issues with it: (a) it may have missed another opportunity for performance improvement, (b) it may have introduced a regression. Can you please clarify the issue? The explanation should be part of the commit message. Dependent on (a) vs. (b), the impact of this change could differ greatly. Thanks! Laszlo > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > index 443cf07144a1..99d487adac9e 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > @@ -16,7 +16,7 @@ > VariableServiceSetVariable() should also check authenticate data to avoid buffer overflow, > integer overflow. It should also check attribute to avoid authentication bypass. > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD License > @@ -262,13 +262,12 @@ UpdateVariableStore ( > UINT8 *CurrBuffer; > EFI_LBA LbaNumber; > UINTN Size; > - EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; > VARIABLE_STORE_HEADER *VolatileBase; > EFI_PHYSICAL_ADDRESS FvVolHdr; > EFI_PHYSICAL_ADDRESS DataPtr; > EFI_STATUS Status; > > - FwVolHeader = NULL; > + FvVolHdr = 0; > DataPtr = DataPtrIndex; > > // > @@ -281,7 +280,6 @@ UpdateVariableStore ( > Status = Fvb->GetPhysicalAddress(Fvb, &FvVolHdr); > ASSERT_EFI_ERROR (Status); > > - FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvVolHdr); > // > // Data Pointer should point to the actual Address where data is to be > // written. > @@ -290,7 +288,7 @@ UpdateVariableStore ( > DataPtr += mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase; > } > > - if ((DataPtr + DataSize) > ((EFI_PHYSICAL_ADDRESS) (UINTN) ((UINT8 *) FwVolHeader + FwVolHeader->FvLength))) { > + if ((DataPtr + DataSize) > (FvVolHdr + mNvFvHeaderCache->FvLength)) { > return EFI_OUT_OF_RESOURCES; > } > } else { > @@ -317,7 +315,7 @@ UpdateVariableStore ( > // > // If we are here we are dealing with Non-Volatile Variables. > // > - LinearOffset = (UINTN) FwVolHeader; > + LinearOffset = (UINTN) FvVolHdr; > CurrWritePtr = (UINTN) DataPtr; > CurrWriteSize = DataSize; > CurrBuffer = Buffer; > @@ -2739,7 +2737,7 @@ UpdateVariable ( > } > } > > - State = Variable->CurrPtr->State; > + State = CacheVariable->CurrPtr->State; > State &= VAR_DELETED; > > Status = UpdateVariableStore ( > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > index 23186176be75..f7185df3a7eb 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > @@ -3,7 +3,7 @@ > and volatile storage space and install variable architecture protocol. > > Copyright (C) 2013, Red Hat, Inc. > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> (C) Copyright 2015 Hewlett Packard Enterprise Development LP
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD License > @@ -402,8 +402,8 @@ FtwNotificationEvent ( > // > // Mark the variable storage region of the FLASH as RUNTIME. > // > - VariableStoreBase = NvStorageVariableBase + (((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(NvStorageVariableBase))->HeaderLength); > - VariableStoreLength = ((VARIABLE_STORE_HEADER *)(UINTN)VariableStoreBase)->Size; > + VariableStoreBase = NvStorageVariableBase + mNvFvHeaderCache->HeaderLength; > + VariableStoreLength = mNvVariableCache->Size; > BaseAddress = VariableStoreBase & (~EFI_PAGE_MASK); > Length = VariableStoreLength + (VariableStoreBase - BaseAddress); > Length = (Length + EFI_PAGE_SIZE - 1) & (~EFI_PAGE_MASK); >