From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mx.groups.io with SMTP id smtpd.web11.239.1626723452803049226 for ; Mon, 19 Jul 2021 12:37:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=k1Gr7wdb; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: dovmurik@linux.ibm.com) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16JJaJWr048197; Mon, 19 Jul 2021 15:37:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=htcRYaOycjcjMYC2hPhuGJ0qLfW1z5Rp0upOEoF9G60=; b=k1Gr7wdbYy3pX5dT2LfDS3EEYdlX1Kc2CgGoUCj2+A+3+P5IF6Q6888CMQu+VAyPrNMz zpPcCEYlSU2pOucnAqcVGMaM43yE2GyQ38ZTBOfqvYqOYmQlTfoh1U5h7v8uz+gbXD3a nm5haj5MqwpewI9LMa0gvuTKqEXvHiITRCEUvddwZtOw9/NbmAxoWBTqWzqvg15LSKBs 3wQ4HZsv3dUlUfhkSYgliaC+ldvQB/FnJwCia2QXNIRrcx42MBBhycINL92Hrwenv6LB ynxQ2l0yRi30kxQ4d4XPht4UqgZBhATUIqjWA9vI2K+auH9DMQC5ElSE1FXb+1qR3Fpq hA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 39wdkyuxwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Jul 2021 15:37:30 -0400 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16JJbLdv052335; Mon, 19 Jul 2021 15:37:30 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 39wdkyuxvw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Jul 2021 15:37:29 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16JJSLEw017721; Mon, 19 Jul 2021 19:37:29 GMT Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by ppma01dal.us.ibm.com with ESMTP id 39upubgdgn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Jul 2021 19:37:29 +0000 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16JJbSn823462248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Jul 2021 19:37:28 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E6C2412405A; Mon, 19 Jul 2021 19:37:27 +0000 (GMT) Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EC707124058; Mon, 19 Jul 2021 19:37:24 +0000 (GMT) Received: from [9.65.195.237] (unknown [9.65.195.237]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 19 Jul 2021 19:37:24 +0000 (GMT) Subject: Re: [PATCH v2 08/11] OvmfPkg/AmdSev/SecretPei: build hob for full page To: Tom Lendacky , devel@edk2.groups.io Cc: Tobin Feldman-Fitzthum , Tobin Feldman-Fitzthum , Jim Cadden , James Bottomley , Hubertus Franke , Laszlo Ersek , Ard Biesheuvel , Jordan Justen , Ashish Kalra , Brijesh Singh , Erdem Aktas , Jiewen Yao , Min Xu , Dov Murik References: <20210706085501.1260662-1-dovmurik@linux.ibm.com> <20210706085501.1260662-9-dovmurik@linux.ibm.com> From: "Dov Murik" Message-ID: <5cdf225a-1550-da10-dde1-6f4c155b6494@linux.ibm.com> Date: Mon, 19 Jul 2021 22:37:23 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 In-Reply-To: X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Y2brdmH7SCLtYXiN5kwGXFFJScmAlUGt X-Proofpoint-ORIG-GUID: hiWGbk0a8PQOMBeHlmZaq0biX21oGGHU X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-19_10:2021-07-19,2021-07-19 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 impostorscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107190111 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 19/07/2021 19:19, Tom Lendacky wrote: > On 7/6/21 3:54 AM, Dov Murik wrote: >> Round up the size of the SEV launch secret area to a whole page, as >> required by BuildMemoryAllocationHob. This will allow the secret >> area defined in the MEMFD to take less than a whole 4KB page. >> >> Cc: Laszlo Ersek >> Cc: Ard Biesheuvel >> Cc: Jordan Justen >> Cc: Ashish Kalra >> Cc: Brijesh Singh >> Cc: Erdem Aktas >> Cc: James Bottomley >> Cc: Jiewen Yao >> Cc: Min Xu >> Cc: Tom Lendacky >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3457 >> Signed-off-by: Dov Murik >> --- >> OvmfPkg/AmdSev/SecretPei/SecretPei.c | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/OvmfPkg/AmdSev/SecretPei/SecretPei.c b/OvmfPkg/AmdSev/SecretPei/SecretPei.c >> index ad491515dd5d..db4267428e5a 100644 >> --- a/OvmfPkg/AmdSev/SecretPei/SecretPei.c >> +++ b/OvmfPkg/AmdSev/SecretPei/SecretPei.c >> @@ -15,9 +15,16 @@ InitializeSecretPei ( >> IN CONST EFI_PEI_SERVICES **PeiServices >> ) >> { >> + UINT64 RoundedSize; >> + >> + RoundedSize = PcdGet32 (PcdSevLaunchSecretSize); > > Can you just unconditionally perform: > > RoundedSize = ALIGN_VALUE (RoundedSize, EFI_PAGE_SIZE); > > Or use ALIGN_VALUE () in the if statement if you don't want to do it > unconditionally? > > Or even use ALIGN_VALUE on size value in the BuildMemoryAllocationHob() > call below. Yes, that's much better. Thanks for introducing me to this macro. -Dov > > Thanks, > Tom > >> + if (RoundedSize % EFI_PAGE_SIZE != 0) { >> + RoundedSize = (RoundedSize / EFI_PAGE_SIZE + 1) * EFI_PAGE_SIZE; >> + } >> + >> BuildMemoryAllocationHob ( >> PcdGet32 (PcdSevLaunchSecretBase), >> - PcdGet32 (PcdSevLaunchSecretSize), >> + RoundedSize, >> EfiBootServicesData >> ); >> >>