From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web12.47703.1598635091261201027 for ; Fri, 28 Aug 2020 10:18:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QjJrz5SN; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598635090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mXJAhHNxk3ZVyeU4bAJ+sqpBNn/CeWUpDq8Jn/mcY0A=; b=QjJrz5SNaxxhwDfSsaCqspqOuJ8+Y2HJOgTb97KeSzsG7D21ocYTnE9xE3APVBJzY4wUhs zFnJ4bGoCBCmIPOs7Dwd0qhO6FfFPNET1fnp+Yxkyah41zPKWFnOsoWdRf2cOA1J7ZlJLX 8NMGWiIupPA4oaoMm0ymCTU9CJDR9+k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-PXAdp4UiPz6CWd4ACWOyPg-1; Fri, 28 Aug 2020 13:18:03 -0400 X-MC-Unique: PXAdp4UiPz6CWd4ACWOyPg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C4A6186F2F7; Fri, 28 Aug 2020 17:18:02 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-96.ams2.redhat.com [10.36.112.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CBAF19C66; Fri, 28 Aug 2020 17:17:59 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Library: change TpmMeasurementLibNull to BASE library. To: devel@edk2.groups.io, qi1.zhang@intel.com Cc: Jian J Wang , Hao A Wu , Jiewen Yao References: <20200828061506.8068-1-qi1.zhang@intel.com> From: "Laszlo Ersek" Message-ID: Date: Fri, 28 Aug 2020 19:17:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200828061506.8068-1-qi1.zhang@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US On 08/28/20 08:15, Qi Zhang wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2940 > > TpmMeasurementLib includes DxeTpmMeasurementLib and PeiTpmMeasurementLib. > So need to change TpmMeasurementLibNull to BASE library to avoid build > error in some platform. > > Signed-off-by: Qi Zhang > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Jiewen Yao > --- > .../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c | 4 +++- > .../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf | 6 +++--- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c > index b9c5b68de8..ee3be62fc6 100644 > --- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c > +++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c > @@ -1,11 +1,13 @@ > /** @file > This library is used by other modules to measure data to TPM. > > -Copyright (c) 2015, Intel Corporation. All rights reserved.
> +Copyright (c) 2015-2020, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > > +#include > + > /** > Tpm measure and log data, and extend the measurement result into a specific PCR. > > diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > index 61abcfa2ec..1db2c0d6a7 100644 > --- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > +++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > @@ -1,7 +1,7 @@ > ## @file > # Provides NULL TPM measurement function. > # > -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
> +# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
> # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > @@ -10,9 +10,9 @@ > INF_VERSION = 0x00010005 > BASE_NAME = TpmMeasurementLibNull > FILE_GUID = 6DFD6E9F-9278-48D8-8F45-B6CFF2C2B69C > - MODULE_TYPE = UEFI_DRIVER > + MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER > + LIBRARY_CLASS = TpmMeasurementLib > MODULE_UNI_FILE = TpmMeasurementLibNull.uni > > # > (1) I agree this is a bugfix, and should be included in the stable tag. (2) The commit message makes zero sense to me, on the other hand. I don't understand how DxeTpmMeasurementLib and PeiTpmMeasurementLib are relevant at all. I also don't understand how TpmMeasurementLib "includes" DxeTpmMeasurementLib and PeiTpmMeasurementLib. I guess the intent is to say that *some* of the known TpmMeasurementLib instances are PeiTpmMeasurementLib and DxeTpmMeasurementLib. I guess that would be a valid statement, but it's still irrelevant here. The issue here is that *all* Null instances (regardless of library class) should have MODULE_TYPE=BASE, so that they can be consumed by the broadest selection of client modules. This specific Null instance breaks that principle, and that's what the patch fixes. The fact that this particular Null instance happens to implement the TpmMeasurementLib class is irrelevant in this regard. Please update the commit message accordingly. (There is time for a repost, this patch certainly qualifies for both review and merging during the hard feature freeze.) Again, the bug we're fixing is that this is a Null instance that currently does not have MODULE_TYPE=BASE. (Removing the client type restrictions from the LIBRARY_CLASS line is correct, of course.) (3) The C file needs more changes. Because we're flipping the module type to BASE, we should replace the EFI_STATUS type and the EFI_xxx return values with RETURN_STATUS and RETURN_xxx, respectively. (4) Consequently, for RETURN_STATUS and RETURN_xxx, we should #include , rather than . Thanks Laszlo