Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v3 14/14] tpm: Allow locality 2 to be set when
 initializing the TPM for Secure Launch
To:     Jarkko Sakkinen <jarkko@kernel.org>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        iommu@lists.linux-foundation.org, linux-integrity@vger.kernel.org,
        linux-doc@vger.kernel.org, dpsmith@apertussolutions.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        luto@amacapital.net, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
References: <1628527136-2478-1-git-send-email-ross.philipson@oracle.com>
 <1628527136-2478-15-git-send-email-ross.philipson@oracle.com>
 <20210810162119.htk366pmacrnzdmh@kernel.org>
From:   Ross Philipson <ross.philipson@oracle.com>
Message-ID: <86751be8-8f18-41b4-763d-ac981f53f7ed@oracle.com>
Date:   Mon, 16 Aug 2021 10:18:10 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
In-Reply-To: <20210810162119.htk366pmacrnzdmh@kernel.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from [IPv6:2601:191:8500:cff0::40e4] (2601:191:8500:cff0::40e4) by MN2PR18CA0024.namprd18.prod.outlook.com (2603:10b6:208:23c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Mon, 16 Aug 2021 14:18:11 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 28ecb8db-bdca-4aa3-cf52-08d960c0aed7
X-MS-TrafficTypeDiagnostic: SJ0PR10MB4589:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <SJ0PR10MB458964A26ADF6CC98DBC1883E6FD9@SJ0PR10MB4589.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:8882;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: lQB2PQvvpMhFxauVS+lwQ3PDCpERB+Ds4++44gvRnOVxoXhbAiBM5SIU5p0P6+NRTkx9iNiDpFwf+YGMR4zOnaQvb3k8ksh0FpWEgL1eTXp3ijMHxacWrk0eGIziB1nFfRA0y6RwCkdSngEFo/IqQ4Hm3yJUv9yj8I+3Xa0bYgaQHm817R30HgOAb0Gq+Lwkgj1kWregvSg3HevkJJO+oDdGh9xRBlSAq0ezE+wdmNyTgj2jonqEV80j1CH55Z6J7tRkRG2bv7gNKGgc7tYM30Y4KcxiauxrAvwhTmfAYLhvzqZycxxFOA8VqB9YjMJk08cSQGIsGv2znYTbwM6cGKgNE3Q4xjSAY7gxG1FBI6k1bw+t3wtAzJ8rmCQPq8Sf1+jFxqOLLmI93ZOOxfR8amjDb2kZiFI49GSilUu+FhQNUTwopsgd0nZk0Uok7prFDijfbXOlyl+6WmAao7Qg8VB2gQRUPpYHYkcy+7QPsiC0Uc2xHU36hTlb556MuSh5y4kGC6r8w/mNVXantdv09x9Z7R/j2f+b8alOd1iqcQjBN1qduZmDEbnVDuX2NAo3T9BGO8M0Nts3cMaz6dr5gVVTyTud+dvWmYs8G2artcxDnxqQ4paTytkIoowG3Bb5VgPuJuXl77NlQpwZSXUhFI10Q2ZFFwGSWbSXfCSHg1+bZf8+MCKjC+Rz+8QNDubypoBuq86j/6NO2dagzhEIzbS7XMqXjYV3Q9sy5NjjJBQ=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3793.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(39860400002)(136003)(346002)(366004)(376002)(8676002)(8936002)(66476007)(478600001)(53546011)(31686004)(6486002)(86362001)(66556008)(83380400001)(31696002)(2906002)(4326008)(66946007)(2616005)(5660300002)(316002)(44832011)(6916009)(186003)(36756003)(7416002)(38100700002)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TnRxTDl6SnlRb1c4TFZHNllBdjJ0UTJYcGZLakVzYlhpVnRGZ1Z2K2puZ2M2?=
 =?utf-8?B?TThQY1BIUURnQTRnVTVGUENuMzc1VGFNVTc4WmVIVXRvNkdwVVY1QmQ3UGJC?=
 =?utf-8?B?b3BCMjN5UWkzZTVMdk5tUC9IZmxlNzBadWtFT0lwS3J1VVhCNVhicVBKWGZi?=
 =?utf-8?B?ZDRHMGRKTjVlOEhUWVVwb281RG1saGUwYWJPUDRoaGVkYlI0MUwxRk1leFRo?=
 =?utf-8?B?a0RXUTRCRFc1NEJscXNlM2VJU1lYdHVlRzUxNGtEWU9BS2l2UVFqSmtGUHIx?=
 =?utf-8?B?TWx2VlRYVWcrbVBEcDNXajNhNFJybDdIQ3RhREZraDJ4bHZCbytvaHM1TC9Y?=
 =?utf-8?B?Yk1UWFBFRG8xWCsrN01OeitwblNzckZ1bDM3dVNuVXd5TVpUSmVzNUFoQjlU?=
 =?utf-8?B?dzFRSVAwV1gyZlVYZUFVSytpMDU0TFUwNjg0b1k1ZE1PaWp2Y0w0aUN5dVp4?=
 =?utf-8?B?Q2dQSVN1Kzc4U1ZOMExsTm43NlVucmtFSFRZdnZ2UHgzR0lvL05CcXplTE1B?=
 =?utf-8?B?YmYxWkxQQVkraXowR0pBdUZNSEFoTENyenFIaWNVQytWYTN5RGRScjZMVzR2?=
 =?utf-8?B?NFNmNndUSkErMGFYdWV2TkNheTYwUm9JN3BrbDlET1luQ1R6Mld6WVVxa0Jl?=
 =?utf-8?B?ZG44YkRvVUUrSmY0SnkrWVBCVHNaemhZWFdCTEs0b0RMYlphcTlmQmREOU5q?=
 =?utf-8?B?RE5lb3hZM01PZlVrTjVwYkJBdUpoRGp2cFBuUUJIbHBKQ09uSW9Lb2dWRkRa?=
 =?utf-8?B?S2toaEJmNzVrNmFlRXd5QXpvUklzaytWeCtQRENMckhvc2doZld6bnJmSGRJ?=
 =?utf-8?B?dk5jWEVHZ0NpelE3VjZWUk84Zjd0NEkyQm44bG5tOFFMdjBVMkRwSVhnMzN2?=
 =?utf-8?B?SzJ3akpRYjl4Sm9SYzRqaGRsQjZrK3c1K2dLUXJ2S00vTkxLZEFUNTUrdXl2?=
 =?utf-8?B?NVluanpyZlZudFZsNzk3cFdwVVE1dmZKUk0rdVg3c2RybVBqb2JRY1lDWXh6?=
 =?utf-8?B?cUdIUFRTNk4xakVjRXd2cUptWmhHMUlmRnptcHJzYVgzQVpNOWtpc1Z6R0Fa?=
 =?utf-8?B?WHJVZkZOczB1SERmbkYxRndCZFlkNXdYeFE0WjlYdWxQMUxtRnBrVzd3d3Rm?=
 =?utf-8?B?SWsvMVk0V3RnWUVHaGJBb2tiYUcyN2dZWXlRQlc2QzJnT1ozT3pZRmpYb3BV?=
 =?utf-8?B?VkVBTjR1UHZqT1Jjd3FuNDNxdWMrMW82TkZsc2g3OGJFakw2YWtHeDUxdkpH?=
 =?utf-8?B?ZnllNS95U1NweVFPZjYvb2hMTGpHMjdpdG9BNmM1ems4bzcrSytZemI5bEVM?=
 =?utf-8?B?NUppTGIvdndLdVUwbHlEOHUrb0h1S3FDTGh0TStML3cyVjE0KzdWVzlVYkFE?=
 =?utf-8?B?RjlER1NiS2ZTMGtkS0Z0eG1yY1lVM0pBWTA5NVJhZXNxbGRhYnNMWjZUVGFZ?=
 =?utf-8?B?SUM3YVY4TmpkWFBtQkZmM0RxTk04WE1sei84SU1WbDFNY1E0TEZOMDhUQWZH?=
 =?utf-8?B?SjlkS0lqSnBKdXJ1Y0JTckpFWGozOUZpY1ExK2NsSHNidXN4cC93SmJRdDln?=
 =?utf-8?B?LzlpLzhIQ09NS2VxK0xLKytwek14dWRUamtCNXBpOFYvVDJyVmxJbVlpemFC?=
 =?utf-8?B?REZ4WXBpczJpZWpOZ1Z5VVlpMlN6R1pxY1E0bk5jSDRZOFVsTmkwY2s2bXIy?=
 =?utf-8?B?eHo4OE9Zb1E2OW5VRGtzNkVnUWQ5elVBclo5Z2VTa0ZydUxPNXJSWW9TZ2Jy?=
 =?utf-8?B?VDc0THVOaE5Oc056YmNWajZmajhpMjl0WjRaa0dpWnlPUXJndEl6elg3eHUr?=
 =?utf-8?B?L0FJSHY3NEVZZGdEMzZXUT09?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 28ecb8db-bdca-4aa3-cf52-08d960c0aed7
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2021 14:18:13.5770
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fJ1FSAh7yNQdx2mefY67XKpv9aU0CAItfvU5YeGjlSlGg+d8nnOF6t/yqk6yu9+n19CFY5VEEylLU2leLBU6lVtFcj5RxHAlq70UMxta+8w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4589
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10077 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 bulkscore=0
 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108160091
X-Proofpoint-GUID: QNqkqJb2Gx1nPRDV9qFOdNFAk1az6_9Y
X-Proofpoint-ORIG-GUID: QNqkqJb2Gx1nPRDV9qFOdNFAk1az6_9Y
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 8/10/21 12:21 PM, Jarkko Sakkinen wrote:
> On Mon, Aug 09, 2021 at 12:38:56PM -0400, Ross Philipson wrote:
>> The Secure Launch MLE environment uses PCRs that are only accessible from
>> the DRTM locality 2. By default the TPM drivers always initialize the
>> locality to 0. When a Secure Launch is in progress, initialize the
>> locality to 2.
>>
>> Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
>> ---
>>   drivers/char/tpm/tpm-chip.c | 13 +++++++++++--
>>   1 file changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
>> index ddaeceb..48b9351 100644
>> --- a/drivers/char/tpm/tpm-chip.c
>> +++ b/drivers/char/tpm/tpm-chip.c
>> @@ -23,6 +23,7 @@
>>   #include <linux/major.h>
>>   #include <linux/tpm_eventlog.h>
>>   #include <linux/hw_random.h>
>> +#include <linux/slaunch.h>
>>   #include "tpm.h"
>>   
>>   DEFINE_IDR(dev_nums_idr);
>> @@ -34,12 +35,20 @@
>>   
>>   static int tpm_request_locality(struct tpm_chip *chip)
>>   {
>> -	int rc;
>> +	int rc, locality;
> 
>          int locality;
>          int rc;

Will do.

> 
>>   
>>   	if (!chip->ops->request_locality)
>>   		return 0;
>>   
>> -	rc = chip->ops->request_locality(chip, 0);
>> +	if (slaunch_get_flags() & SL_FLAG_ACTIVE) {
>> +		dev_dbg(&chip->dev, "setting TPM locality to 2 for MLE\n");
>> +		locality = 2;
>> +	} else {
>> +		dev_dbg(&chip->dev, "setting TPM locality to 0\n");
>> +		locality = 0;
>> +	}
> 
> Please, remove dev_dbg()'s.

Will do.

Thanks
Ross

> 
>> +
>> +	rc = chip->ops->request_locality(chip, locality);
>>   	if (rc < 0)
>>   		return rc;
>>   
>> -- 
>> 1.8.3.1
> 
> /Jarkko
>