From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6D40121A16EFA for ; Thu, 18 May 2017 12:40:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D702C81235; Thu, 18 May 2017 19:40:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D702C81235 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D702C81235 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-86.phx2.redhat.com [10.3.116.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 136D6189AE; Thu, 18 May 2017 19:40:30 +0000 (UTC) To: Jordan Justen , edk2-devel-01 References: <20170518151436.16566-1-lersek@redhat.com> <20170518151436.16566-3-lersek@redhat.com> <149513337025.15724.8536347902397365487@jljusten-skl.jf.intel.com> From: Laszlo Ersek Message-ID: <8b42c90a-31fb-d1c5-307c-5bc78760660a@redhat.com> Date: Thu, 18 May 2017 21:40:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <149513337025.15724.8536347902397365487@jljusten-skl.jf.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 18 May 2017 19:40:32 +0000 (UTC) Subject: Re: [PATCH v2 2/5] OvmfPkg/EmuVariableFvbRuntimeDxe: change block size to 4KB 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: Thu, 18 May 2017 19:40:32 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 05/18/17 20:49, Jordan Justen wrote: > On 2017-05-18 08:14:33, Laszlo Ersek wrote: >> diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.h b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.h >> index 4247d21d72f8..beb11e3f9a90 100644 >> --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.h >> +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.h >> @@ -58,8 +58,14 @@ typedef struct { >> // >> // Constants >> // >> -#define EMU_FVB_BLOCK_SIZE (FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)) >> -#define EMU_FVB_SIZE (2 * FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)) >> +#define EMU_FVB_BLOCK_SIZE \ >> + EFI_PAGE_SIZE >> +#define EMU_FVB_NUM_SPARE_BLOCKS \ >> + EFI_SIZE_TO_PAGES ((UINTN)FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)) >> +#define EMU_FVB_NUM_TOTAL_BLOCKS \ >> + (2 * EMU_FVB_NUM_SPARE_BLOCKS) >> +#define EMU_FVB_SIZE \ >> + (EMU_FVB_NUM_TOTAL_BLOCKS * EMU_FVB_BLOCK_SIZE) >> #define FTW_WRITE_QUEUE_SIZE \ >> (FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) - \ >> sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER)) > > In the cases where we don't exceed 80 columns, I don't see the excess > newlines as helping here, style-wise. My first preference would have been #define SHORT_MACRO_NAME replacement text 1 #define ANNOYINGLY_LONG_MACRO_NAME replacement text 2 That is, to keep both the macro names and the replacement texts aligned. However, that way I wouldn't fit into 80 chars on some lines, and then breaking only *some* macro definitions to multiple lines looked horrible. Which is why I opted for the current layout: it is uniform, and it does preserve the alignment for both macro names and replacement texts separately. > > Could you add to the entry-point an assert: > > ASSERT(FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) % > EMU_FVB_BLOCK_SIZE == 0); Should I squash that into this patch? > > We should tweak VERIFY_SIZE_OF to make a STATIC_ASSERT macro, because > I guess this check should be possible at compile time. > >> @@ -458,31 +448,30 @@ FvbProtocolWrite ( >> IN UINT8 *Buffer >> ) >> { >> - >> EFI_FW_VOL_BLOCK_DEVICE *FvbDevice; >> UINT8 *FvbDataPtr; >> + EFI_STATUS Status; >> >> FvbDevice = FVB_DEVICE_FROM_THIS (This); >> >> - if ((Lba > 1) || (Offset > FvbDevice->BlockSize)) { >> + if (Lba >= EMU_FVB_NUM_TOTAL_BLOCKS || >> + Offset > FvbDevice->BlockSize) { >> return EFI_INVALID_PARAMETER; >> } >> >> - if ((Offset + *NumBytes) > FvbDevice->BlockSize) { >> + Status = EFI_SUCCESS; >> + if (*NumBytes > FvbDevice->BlockSize - Offset) { >> *NumBytes = FvbDevice->BlockSize - Offset; >> + Status = EFI_BAD_BUFFER_SIZE; > > Stealth bug fix? :) Sure :) This patch is more or less a rewrite of the FVB member functions. > > With the understanding that we're holding off on the final patch for > now to coordinate with Xen: > > Series Reviewed-by: Jordan Justen > I feel inclined to commit the first four patches now -- with the OvmfPkg patches from the prerequisite series -- and pick up patch #5 only later, when Gary reports the Xen hvmloader fix complete. (I noted this on patch #5.) Are you OK with that, provided that I add / squash the ASSERT()? Thanks! Laszlo