Received-SPF: pass (google.com: domain of linux-kernel+bounces-110759-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <838fe705-4ebe-43f1-9193-4696baa05aad@intel.com>
Date: Fri, 22 Mar 2024 11:26:17 +1300
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v19 036/130] KVM: TDX: x86: Add ioctl to get TDX
 systemwide parameters
To: "Yamahata, Isaku" <isaku.yamahata@intel.com>, "kvm@vger.kernel.org"
	<kvm@vger.kernel.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
CC: "isaku.yamahata@gmail.com" <isaku.yamahata@gmail.com>, Paolo Bonzini
	<pbonzini@redhat.com>, "Aktas, Erdem" <erdemaktas@google.com>, "Sean
 Christopherson" <seanjc@google.com>, Sagi Shahar <sagis@google.com>, "Chen,
 Bo2" <chen.bo@intel.com>, "Yuan, Hang" <hang.yuan@intel.com>, "Zhang, Tina"
	<tina.zhang@intel.com>, Sean Christopherson <sean.j.christopherson@intel.com>
References: <cover.1708933498.git.isaku.yamahata@intel.com>
 <167f8f7e9b19154d30c7fe8f733f947592eb244c.1708933498.git.isaku.yamahata@intel.com>
Content-Language: en-US
From: "Huang, Kai" <kai.huang@intel.com>
In-Reply-To: <167f8f7e9b19154d30c7fe8f733f947592eb244c.1708933498.git.isaku.yamahata@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?eEUyb0htTDFlRzY1ZFBnQUplaFpjZXppVkJrKzFkN3lVdHB5RlZmUDZtSXJC?=
 =?utf-8?B?MmwrYmI1VWlDSWFNSjBPdzVmdk8vN1A0TmxZMlowWmFldE92SHZrOVgvOVg3?=
 =?utf-8?B?aWl1K081TDB2TTJoblFkd2QwREFHT0hoSjhlV3ZjOW9pcUh5ZzJXaXZvcEgw?=
 =?utf-8?B?d2srNFhjMWYxdFBlYXpYeDdvUStOUXh3a3ZrRjBQc2htS1FUMStSSk1GV1Ns?=
 =?utf-8?B?OGVaYTl0MGtoQ1ZCcGNvZ3kxaGZnbnJVcmRNNWtUa3N1SVFzRCt0R3lDQ3Zu?=
 =?utf-8?B?YmRHT0hyUmhva1RqKzhUcmJhT0JEWHJhUFZVUlVUZ0dLOHo3bVZKL2tiRlNv?=
 =?utf-8?B?aVZPN0F0WWV1Vk5JVnJ3UzMvU0o1U1RaQ1Z0RHljV1IyTjR3dFZPUzBRVDdl?=
 =?utf-8?B?cnZ0bXZ2eGVQN09CcFF2T2pKMzkxbTM3N0QycHRqbVJreitpaUl2UkVPdnB5?=
 =?utf-8?B?S09wSVNreTRzTmhPRVpaSmV1WGRyb0pQQjJKdGVwcXcyZHI4OUFQcmdzQ3Ew?=
 =?utf-8?B?d0d0Sk5XY28rK0VoR0FueVB3enFEeW43b2VtT0cwZlRrVEF5enBGWWRBVnFu?=
 =?utf-8?B?OU1Gb2NPb2g5VDRyd1hESFJLN3hGTTJVNWFaOXdKQnZEY3BxV0s2eWNRZkhk?=
 =?utf-8?B?NjczVFI0U29DOW5wbE94YlBQZklDWHVjV0hzSEpEUGNFS2piRDArVTRmRWZC?=
 =?utf-8?B?RTdkdDhyOGZxVXRzYmhtaXFKVlVMZis5T3pEa1NmSytON2x0VlhsRzZaUzFl?=
 =?utf-8?B?N1kyaHFUSWVaYXlkZGlVTVdHazhiRDhQRm9hcGFRRkVPM0E3WkZXZUdVQngy?=
 =?utf-8?B?T2taRjNVTTZ2ZDZYdklyemY5MUlpLytvS011N3VaVDVCbklLS2FYNktQSVVp?=
 =?utf-8?B?RDU0cWVJSVdBcEoyNU9jN25UM1FpdE5YTDR2b3h3SWd4eW9obGRnV2FBZTJk?=
 =?utf-8?B?R1dydndsU3g1M2IzTy82b1ZmRlRLNjlUa2t0b3NmWSt3aFo3RDhjaHdHdDhO?=
 =?utf-8?B?NFlwSGt5UklFVU0wblhnSFRDM1NCbzA0OFhtK2NGNTBDbnRhbVUrSmNNYVNq?=
 =?utf-8?B?Mm0zSDdGSlY1Um5PRFZTR3E3b1lVaTduUTlSMmpOeW1rd050SWR2bmZ1QURF?=
 =?utf-8?B?S1J1MWY2a001eVFxT01JN2N5aG5sY2E0Wjg3M2FWclNXT1BSalNZYUpqR1I4?=
 =?utf-8?B?RHNvYk5GeFB0LzV5YnR2S0ZNWmt3MGpLRWRQZWdxS3ZYNmIvMEZpdDlpQlNJ?=
 =?utf-8?B?QzZma1Z1dkxmMGF1ZWU1OHhLWThMOFZoRzBrTFhKYTEzWkI5aFppblBqSldx?=
 =?utf-8?B?ZjhrV1hPaWtzYWUvV2cweEkwQVcvc2JSbFRxaDFvaXoxQ1NXcGxlUEhlS00z?=
 =?utf-8?B?aGN2Uk02Qy9QRXFMb0dhRG12WTlYQ3dQdThlZ1l4eDdLWXJxaGdOTHlxdDE5?=
 =?utf-8?B?Ukp0ZlplWDJPZ05hU3NNbmpJd0t3d3YyNGhmWGVkNmovTzA5U29GOG56aXZS?=
 =?utf-8?B?N2cxN1VuZWYxZ2g5TnZsVVIvQkRUYzFTNXRwcjRpRGlXVVQ2STZXYmUzZitE?=
 =?utf-8?B?cDc2dFpmNUFDVm0wRGlPLzQyZjYxeWh1Z3NTWm4zY0NrT09iZ0I5Wk1jdXJP?=
 =?utf-8?B?QTBlc2dCc3VzZHZ1eW9Lc3Q0TDR2WW9uM0cwT0VWdUdIaGNPNWxqbFBVYlNa?=
 =?utf-8?B?SWNYLzV2anN5aDhyRWZCdXZLa0tReEFZTmdER1kxU2NDUCtyR1dkZkNBZldI?=
 =?utf-8?B?Ym8xSW1xMG45Z3VVZ2FjZzVHWktGOE41dGJkdDg3R3FBd2lFMDlTdktGRlNI?=
 =?utf-8?B?MklJN0JoSzNrYThYWkUxbEFvdFZleXl2cWZCZkFnVWZVRFg5cU5na2Y2SURv?=
 =?utf-8?B?VjlvSWIzSmNGUHNJZVZHZHlITEhVQ2lXVHFrd1dhSllvSVZ0OVNOd0JZRGlP?=
 =?utf-8?B?UUdiWk1uUExONUY4VUhuNThGQWJVRDVsVVorL1d2M1ZyOXEvQjVGcmRmbkcx?=
 =?utf-8?B?SWpYOStZOTJIRzUwa2NIZHhVSkJIamtwaG9xNWJXUHU5V3Y2bnBPd3N3Ykp0?=
 =?utf-8?B?V2ovVEVPQzJTMlk4aXhvZEp5STNSU0NyQklJSHRKNk9MT3dxZ0dqN1dPNERu?=
 =?utf-8?Q?bLuJP2Z/2fK59XFYa5Irw0AyR?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7e3e8da3-41df-4cef-1f56-08dc49f5f308
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5978.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2024 22:26:27.4166
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: D4VVNJlCd0qN13eIZD00P9FdMjCfy+JSSubNHS65vP1xykHwm8ZLOBNcEnBf5mvJzhc4CmEDmYZ+65dOSiJTJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7351
X-OriginatorOrg: intel.com


On 26/02/2024 9:25 pm, Yamahata, Isaku wrote:
> From: Sean Christopherson <sean.j.christopherson@intel.com>
> 
> Implement an ioctl to get system-wide parameters for TDX.  Although the
> function is systemwide, vm scoped mem_enc ioctl works for userspace VMM
> like qemu and device scoped version is not define, re-use vm scoped
> mem_enc.

-EPARSE for the part starting from "and device scoped ...".

Grammar check please.

> 
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> ---
> v18:
> - drop the use of tdhsysinfo_struct and TDH.SYS.INFO, use TDH.SYS.RD().
>    For that, dynamically allocate/free tdx_info.
> - drop the change of tools/arch/x86/include/uapi/asm/kvm.h.
> 
> v14 -> v15:
> - ABI change: added supported_gpaw and reserved area.
> 
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> ---
>   arch/x86/include/uapi/asm/kvm.h | 17 ++++++++++
>   arch/x86/kvm/vmx/tdx.c          | 56 +++++++++++++++++++++++++++++++++
>   arch/x86/kvm/vmx/tdx.h          |  3 ++
>   3 files changed, 76 insertions(+)
> 
> diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h
> index 9ea46d143bef..e28189c81691 100644
> --- a/arch/x86/include/uapi/asm/kvm.h
> +++ b/arch/x86/include/uapi/asm/kvm.h
> @@ -604,4 +604,21 @@ struct kvm_tdx_cpuid_config {
>   	__u32 edx;
>   };
>   
> +/* supported_gpaw */
> +#define TDX_CAP_GPAW_48	(1 << 0)
> +#define TDX_CAP_GPAW_52	(1 << 1)
> +
> +struct kvm_tdx_capabilities {
> +	__u64 attrs_fixed0;
> +	__u64 attrs_fixed1;
> +	__u64 xfam_fixed0;
> +	__u64 xfam_fixed1;
> +	__u32 supported_gpaw;
> +	__u32 padding;
> +	__u64 reserved[251];
> +
> +	__u32 nr_cpuid_configs;
> +	struct kvm_tdx_cpuid_config cpuid_configs[];
> +};
> +

I think you should use __DECLARE_FLEX_ARRAY().

It's already used in existing KVM UAPI header:

struct kvm_nested_state {
	...
         union {
                 __DECLARE_FLEX_ARRAY(struct kvm_vmx_nested_state_data,
					 vmx);
                 __DECLARE_FLEX_ARRAY(struct kvm_svm_nested_state_data,
					 svm);
         } data;
}

>   #endif /* _ASM_X86_KVM_H */
> diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
> index 07a3f0f75f87..816ccdb4bc41 100644
> --- a/arch/x86/kvm/vmx/tdx.c
> +++ b/arch/x86/kvm/vmx/tdx.c
> @@ -6,6 +6,7 @@
>   #include "capabilities.h"
>   #include "x86_ops.h"
>   #include "x86.h"
> +#include "mmu.h"
>   #include "tdx_arch.h"
>   #include "tdx.h"
>   
> @@ -55,6 +56,58 @@ struct tdx_info {
>   /* Info about the TDX module. */
>   static struct tdx_info *tdx_info;
>   
> +static int tdx_get_capabilities(struct kvm_tdx_cmd *cmd)
> +{
> +	struct kvm_tdx_capabilities __user *user_caps;
> +	struct kvm_tdx_capabilities *caps = NULL;
> +	int ret = 0;
> +
> +	if (cmd->flags)
> +		return -EINVAL;

Add a comment?

	/* flags is reserved for future use */

> +
> +	caps = kmalloc(sizeof(*caps), GFP_KERNEL);
> +	if (!caps)
> +		return -ENOMEM;
> +
> +	user_caps = (void __user *)cmd->data;
> +	if (copy_from_user(caps, user_caps, sizeof(*caps))) {
> +		ret = -EFAULT;
> +		goto out;
> +	}
> +
> +	if (caps->nr_cpuid_configs < tdx_info->num_cpuid_config) {
> +		ret = -E2BIG;
> +		goto out;
> +	}
> +
> +	*caps = (struct kvm_tdx_capabilities) {
> +		.attrs_fixed0 = tdx_info->attributes_fixed0,
> +		.attrs_fixed1 = tdx_info->attributes_fixed1,
> +		.xfam_fixed0 = tdx_info->xfam_fixed0,
> +		.xfam_fixed1 = tdx_info->xfam_fixed1,
> +		.supported_gpaw = TDX_CAP_GPAW_48 |
> +		((kvm_get_shadow_phys_bits() >= 52 &&
> +		  cpu_has_vmx_ept_5levels()) ? TDX_CAP_GPAW_52 : 0),
> +		.nr_cpuid_configs = tdx_info->num_cpuid_config,
> +		.padding = 0,
> +	};
> +
> +	if (copy_to_user(user_caps, caps, sizeof(*caps))) {
> +		ret = -EFAULT;
> +		goto out;
> +	}

Add an empty line.

> +	if (copy_to_user(user_caps->cpuid_configs, &tdx_info->cpuid_configs,
> +			 tdx_info->num_cpuid_config *
> +			 sizeof(tdx_info->cpuid_configs[0]))) {
> +		ret = -EFAULT;
> +	}

I think the '{ }' is needed here.

> +
> +out:
> +	/* kfree() accepts NULL. */
> +	kfree(caps);
> +	return ret;
> +}
> +
>   int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
>   {
>   	struct kvm_tdx_cmd tdx_cmd;
> @@ -68,6 +121,9 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
>   	mutex_lock(&kvm->lock);
>   
>   	switch (tdx_cmd.id) {
> +	case KVM_TDX_CAPABILITIES:
> +		r = tdx_get_capabilities(&tdx_cmd);
> +		break;
>   	default:
>   		r = -EINVAL;
>   		goto out;
> diff --git a/arch/x86/kvm/vmx/tdx.h b/arch/x86/kvm/vmx/tdx.h
> index 473013265bd8..22c0b57f69ca 100644
> --- a/arch/x86/kvm/vmx/tdx.h
> +++ b/arch/x86/kvm/vmx/tdx.h
> @@ -3,6 +3,9 @@
>   #define __KVM_X86_TDX_H
>   
>   #ifdef CONFIG_INTEL_TDX_HOST
> +
> +#include "tdx_ops.h"
> +

It appears "tdx_ops.h" is used for making SEAMCALLs.

I don't see this patch uses any SEAMCALL so I am wondering whether this 
chunk is needed here?

>   struct kvm_tdx {
>   	struct kvm kvm;
>   	/* TDX specific members follow. */