Received-SPF: pass (google.com: domain of linux-kernel+bounces-142982-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <19d69960-e548-a2e6-87d9-c463f2851613@amd.com>
Date: Fri, 12 Apr 2024 10:52:40 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH v3 13/14] x86/sev: Hide SVSM attestation entries if not
 running under an SVSM
Content-Language: en-US
To: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>,
 linux-kernel@vger.kernel.org, x86@kernel.org, linux-coco@lists.linux.dev,
 svsm-devel@coconut-svsm.dev
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
 Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>,
 "H. Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>,
 Peter Zijlstra <peterz@infradead.org>,
 Dan Williams <dan.j.williams@intel.com>, Michael Roth
 <michael.roth@amd.com>, Ashish Kalra <ashish.kalra@amd.com>,
 Joel Becker <jlbec@evilplan.org>, Christoph Hellwig <hch@lst.de>
References: <cover.1711405593.git.thomas.lendacky@amd.com>
 <67893f352bc54de61160bfe251cba0bdf0431f37.1711405593.git.thomas.lendacky@amd.com>
 <1f6f4477-0f2a-434a-8c89-3b5d51d61581@linux.intel.com>
From: Tom Lendacky <thomas.lendacky@amd.com>
In-Reply-To: <1f6f4477-0f2a-434a-8c89-3b5d51d61581@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?WEZEM0pNY1QvcDhoVnJXVFBUUGh5OVg2K1Fwak13U1RSb0hUWXlBUFZtaW1m?=
 =?utf-8?B?TWhoby83K1BvWGZNVXQ0NkUvM2ZvYmcxVjg2TXFuOHY5cmZBdnl2QWwwRXM4?=
 =?utf-8?B?OVI3ODZCTnBRVmRmQUZ0bjljSmo3b21ucXJXYkthRzRybGtHYkpiekhBNGtU?=
 =?utf-8?B?ZC9lUmxGNEcvRTVnYTdiVGt6ZE00SG1kT3YwQi9MTkZTbStjZWExVGloYkl2?=
 =?utf-8?B?RE9uaUVzdk1NZkdwTkdjcWVQcGl3eFN1RE54anZYcGk0d3E0cDIvRDljUzYx?=
 =?utf-8?B?M1g0OGJNWE5KTHFMdnVKQy92Z1JxakFmbVBsT043Z0tuTHpJaXloZ1pIUVRQ?=
 =?utf-8?B?bkRGVlVRUmgrN2N5cDZyVmo1RzRqQVhUWm5Qd29JSkdvZGREb2haK2dSV251?=
 =?utf-8?B?Vmplc0RzZ2x2WHdFODY4S3NqM0RRSmhuMm1xNnltaTJzZTI4RDRaS0FDRzN4?=
 =?utf-8?B?NVF1S2lOSk5MSlFib0lSSnBpYkxMUmxoQUpHcGRwUlllVlNpSkF1aWtUWTNI?=
 =?utf-8?B?enJzbXV1eEU0aHVGcHgzN1BaQm1BVVBCMEhpdkZDSDRHK0JwSEErTkk4WVN3?=
 =?utf-8?B?NUVOcW56aGxCZXdQRTVJV3VVajFsYWx3dm14RitDdU4yUVVUcitJVU9vZUFZ?=
 =?utf-8?B?Ylo1Z2hjV2ZqQ2hqUzVQRzg0cjRaY2hVUDE5SERrMVBjdk9FeWhCN0JxQ09H?=
 =?utf-8?B?cStqYjF0RFFqWlV3bHUvc0Q1MXFhQ3kzcVNWWjhOSG5BV1U5OW9IVnFIR0Ns?=
 =?utf-8?B?SEgxSHY1OHZyWVlKa1VmcVcrV2kyQVQ3dVNOTlhmMTZpM2QxajdxZEQvajZT?=
 =?utf-8?B?M0ErcXo1TVpSR0VtL0s5RjZNcnN4NlNxK09FZDJ5bWtZMXhVSkJWNS9DTUcr?=
 =?utf-8?B?d2IxMXhvNmxuYWRUSGlsdHkwVnhCVjZYZmV5dTNuLzhaU2Ura2EzaENYQkxq?=
 =?utf-8?B?akF0MGdXWnVkTmR1eVdOL1pXZW40YXE2bWViN2wxRlErZWpTUlo2RmxRRVpB?=
 =?utf-8?B?MkMzNzAzM2w4cDNXMHA4ekhPcnhLQldKUUFCeVpHb0pYZ01qWTJ4Wk9mZng0?=
 =?utf-8?B?SEwwalhQalUzYWJyOWlVcjdoa3M0My9ZVDg4cTFVMVNZS1NyTVppVmRrWDU1?=
 =?utf-8?B?MVBrQzRTSk1QWUJBaTRrL0U1NDBGZ250V1hPaDJoN2ZPc0trUmhhaytPWG8w?=
 =?utf-8?B?QS9hUkxnQkdZRXVDNUl6enpXUkgxemlpT3Q1NmpHczBMeFZyckNldmk0NFpQ?=
 =?utf-8?B?Tm42YzNyUU5WMUdqa3JaNlk3QXdUZVRjZWpiS2JEdm1QNjlCQ043Z0hNMXI3?=
 =?utf-8?B?cDRuRVl2OEsvNThxbzJkRk5tVExtekJoWk5mWlNxL0tad0d6S0FQRSt5enU3?=
 =?utf-8?B?aEdkdHVxYnBieWpoLy9jOS9EUU90bGZiNVhaeHFkR0ZuN2RQa0oycGZUUG5r?=
 =?utf-8?B?VEtCelVYZnJodlo4K3ZzcnpFVUEySnhGTFNhZkZqMXVXellRUHNwYjRucjVj?=
 =?utf-8?B?VmlKdlc2SmJ4UzNlblRxZlhTZVhYZEdjT3FXV1RUZnNZRmcrK09ZRStzWVhU?=
 =?utf-8?B?OGdhOSszVXFZektlUjJ2Ty9NNStvYzh0T3BNOGpoVElweGU1amdOSmhxTFV3?=
 =?utf-8?B?M0JMelBSQjVTQnlWZlpjS015dFRPMXNMOUhwYVZ6ZWFHbmVtVHBmcytuZEFt?=
 =?utf-8?B?ZWtWOHR3YnYrcGlGMm1UUTVmYU1ZSnVpdTV2cW5hbDNKZUxHZzhUdjBmSkJX?=
 =?utf-8?B?eGNUUkRqZU8ydDBYY1BJWEw5em5LQmxQbGtHa0ZMNDBlcGZOcWNuc0tnTGJV?=
 =?utf-8?B?ajJ5dUU2R0ZxY3dqTDVVZXg0cTBDeElheHRiRnRraEloRkZnWHJxdkdKbmRn?=
 =?utf-8?B?OW8vMFd6WnBydUkwQ0VFcVNKem9hSjFWQTA2LzVIMFRhWkViSWlVQ21QS1M2?=
 =?utf-8?B?eWt2dFlLeURFSXJVazBEMXhlKzhQb05LbDNHcmw0SG1SK2l4UzZLbkYxMGlq?=
 =?utf-8?B?RjJ4UlB3NXkrLzdsNHJCV3NnS24xMndwNEdLZ1BwOWNVYTJKUFVwVTVzbnFa?=
 =?utf-8?B?TTMvRi9QN29aWm4yMlpOcVFiUkx4Qko0MWxWbmZjWW1SVU9CZk9nalFWR0xa?=
 =?utf-8?Q?Ut3PB+7GTtJxY9T09RqNdz1hb?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 95100450-afe0-4003-a556-08dc5b089712
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 15:52:43.4060
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: TJ297CwTXkljKOCc54y9mJufJicdu5U34EWoDhYlEgvijDzrXiWNi1e8rE1OZu+RFt7bwPP9jy05FfHCdj6PwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5851

On 4/9/24 13:12, Kuppuswamy Sathyanarayanan wrote:
> 
> On 3/25/24 3:26 PM, Tom Lendacky wrote:
>> Config-fs provides support to hide individual attribute entries. Using
>> this support, base the display of the SVSM related entries on the presence
>> of an SVSM.
>>
>> Cc: Joel Becker <jlbec@evilplan.org>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
>> ---
>>   arch/x86/coco/core.c        |  4 ++++
>>   drivers/virt/coco/tsm.c     | 14 ++++++++++----
>>   include/linux/cc_platform.h |  8 ++++++++
>>   3 files changed, 22 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c
>> index d07be9d05cd0..efa0f648f754 100644
>> --- a/arch/x86/coco/core.c
>> +++ b/arch/x86/coco/core.c
>> @@ -12,6 +12,7 @@
>>   
>>   #include <asm/coco.h>
>>   #include <asm/processor.h>
>> +#include <asm/sev.h>
>>   
>>   enum cc_vendor cc_vendor __ro_after_init = CC_VENDOR_NONE;
>>   u64 cc_mask __ro_after_init;
>> @@ -78,6 +79,9 @@ static bool noinstr amd_cc_platform_has(enum cc_attr attr)
>>   	case CC_ATTR_GUEST_STATE_ENCRYPT:
>>   		return sev_status & MSR_AMD64_SEV_ES_ENABLED;
>>   
>> +	case CC_ATTR_GUEST_SVSM_PRESENT:
>> +		return snp_get_vmpl();
>> +
>>   	/*
>>   	 * With SEV, the rep string I/O instructions need to be unrolled
>>   	 * but SEV-ES supports them through the #VC handler.
>> diff --git a/drivers/virt/coco/tsm.c b/drivers/virt/coco/tsm.c
>> index 46f230bf13ac..d30471874e87 100644
>> --- a/drivers/virt/coco/tsm.c
>> +++ b/drivers/virt/coco/tsm.c
>> @@ -64,6 +64,12 @@ static struct tsm_report_state *to_state(struct tsm_report *report)
>>   	return container_of(report, struct tsm_report_state, report);
>>   }
>>   
>> +static bool provider_visibility(const struct config_item *item,
>> +				const struct configfs_attribute *attr)
>> +{
>> +	return cc_platform_has(CC_ATTR_GUEST_SVSM_PRESENT);
>> +}
>> +
> 
> Any comment about the following query? I think introducing a CC flag for this use
> case is over kill.
> 
> https://lore.kernel.org/lkml/6b90b223-46e0-4e6d-a17c-5caf72e3c949@linux.intel.com/

If you don't think TDX will be able to make use of the SVSM attribute I 
can look at adding a callback. But I was waiting to see if anyone else had 
comments, for or against, before re-doing it all.

Thanks,
Tom

> 
>>   static int try_advance_write_generation(struct tsm_report *report)
>>   {
>>   	struct tsm_report_state *state = to_state(report);
>> @@ -144,7 +150,7 @@ static ssize_t tsm_report_service_provider_store(struct config_item *cfg,
>>   
>>   	return len;
>>   }
>> -CONFIGFS_ATTR_WO(tsm_report_, service_provider);
>> +CONFIGFS_ATTR_VISIBLE_WO(tsm_report_, service_provider, provider_visibility);
>>   
>>   static ssize_t tsm_report_service_guid_store(struct config_item *cfg,
>>   					     const char *buf, size_t len)
>> @@ -165,7 +171,7 @@ static ssize_t tsm_report_service_guid_store(struct config_item *cfg,
>>   
>>   	return len;
>>   }
>> -CONFIGFS_ATTR_WO(tsm_report_, service_guid);
>> +CONFIGFS_ATTR_VISIBLE_WO(tsm_report_, service_guid, provider_visibility);
>>   
>>   static ssize_t tsm_report_service_manifest_version_store(struct config_item *cfg,
>>   							 const char *buf, size_t len)
>> @@ -186,7 +192,7 @@ static ssize_t tsm_report_service_manifest_version_store(struct config_item *cfg
>>   
>>   	return len;
>>   }
>> -CONFIGFS_ATTR_WO(tsm_report_, service_manifest_version);
>> +CONFIGFS_ATTR_VISIBLE_WO(tsm_report_, service_manifest_version, provider_visibility);
>>   
>>   static ssize_t tsm_report_inblob_write(struct config_item *cfg,
>>   				       const void *buf, size_t count)
>> @@ -333,7 +339,7 @@ static ssize_t tsm_report_manifestblob_read(struct config_item *cfg, void *buf,
>>   
>>   	return tsm_report_read(report, buf, count, TSM_MANIFEST);
>>   }
>> -CONFIGFS_BIN_ATTR_RO(tsm_report_, manifestblob, NULL, TSM_OUTBLOB_MAX);
>> +CONFIGFS_BIN_ATTR_VISIBLE_RO(tsm_report_, manifestblob, NULL, TSM_OUTBLOB_MAX, provider_visibility);
>>   
>>   #define TSM_DEFAULT_ATTRS() \
>>   	&tsm_report_attr_generation, \
>> diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h
>> index cb0d6cd1c12f..f1b4266c1484 100644
>> --- a/include/linux/cc_platform.h
>> +++ b/include/linux/cc_platform.h
>> @@ -90,6 +90,14 @@ enum cc_attr {
>>   	 * Examples include TDX Guest.
>>   	 */
>>   	CC_ATTR_HOTPLUG_DISABLED,
>> +
>> +	/**
>> +	 * @CC_ATTR_GUEST_SVSM_PRESENT: Guest is running under an SVSM
>> +	 *
>> +	 * The platform/OS is running as a guest/virtual machine and is
>> +	 * running under a Secure VM Service Module (SVSM).
>> +	 */
>> +	CC_ATTR_GUEST_SVSM_PRESENT,
>>   };
>>   
>>   #ifdef CONFIG_ARCH_HAS_CC_PLATFORM
>