Received-SPF: pass (google.com: domain of linux-kernel+bounces-88407-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 1 Mar 2024 20:09:58 +0800
From: Yan Zhao <yan.y.zhao@intel.com>
To: Sagi Shahar <sagis@google.com>
CC: <linux-kselftest@vger.kernel.org>, Ackerley Tng <ackerleytng@google.com>,
	Ryan Afranji <afranji@google.com>, Erdem Aktas <erdemaktas@google.com>,
	"Isaku Yamahata" <isaku.yamahata@intel.com>, Sean Christopherson
	<seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com>, Shuah Khan
	<shuah@kernel.org>, "Peter Gonda" <pgonda@google.com>, Haibo Xu
	<haibo1.xu@intel.com>, Chao Peng <chao.p.peng@linux.intel.com>, Vishal
 Annapurve <vannapurve@google.com>, Roger Wang <runanwang@google.com>, Vipin
 Sharma <vipinsh@google.com>, <jmattson@google.com>, <dmatlack@google.com>,
	<linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>, <linux-mm@kvack.org>
Subject: Re: [RFC PATCH v5 09/29] KVM: selftests: TDX: Add report_fatal_error
 test
Message-ID: <ZeHFlsrBKWR6bfRZ@yzhao56-desk.sh.intel.com>
Reply-To: Yan Zhao <yan.y.zhao@intel.com>
References: <20231212204647.2170650-1-sagis@google.com>
 <20231212204647.2170650-10-sagis@google.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20231212204647.2170650-10-sagis@google.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?n2TOOaS0gSwWZdcGeAp8XwHpt6Gx/KzOdNesOQVjbKesGmjy0SutK4xVD7sY?=
 =?us-ascii?Q?QQU5aXn5sX6wNlsiFM0t8BVQ0vDjWxqNzygmKwMwiaOB4q6cWPXXr2tqrtS9?=
 =?us-ascii?Q?jWpPQIXy3MBt+DkfUoehPdGt1OFlff30Qr6NdAPNqCbEFRBOwPJXRAZGAkgL?=
 =?us-ascii?Q?qGIY1lDv/lHs2ueDcgS6PaqHUmqrrXeuKRBSrasCIDOEmK54xLxqxn7G6Vl+?=
 =?us-ascii?Q?iXUJOMcG/8Mfd09IWtZXVN3MvX/eCE/UVG38Pz1wYjHszaJ76p3mK03JqROF?=
 =?us-ascii?Q?O/keV1KPSe643HylLlszp6iP73xKDvrUiCMv7NkrTy26f6kG86OMALzpyXQk?=
 =?us-ascii?Q?rtyE7GNCP/c3KP/3BnkuRu39kj0p/6eNJiX6wzsYfRaHi7Rl1J65gB/o/Q/Y?=
 =?us-ascii?Q?JZsSiEYE625CxKXHXJR5C5pBli8V6CABpKfljoVNq/eAcHUJNPvm/ZOjZwOx?=
 =?us-ascii?Q?SW4EDq0FJi0SkPR4JE19Vs4AyAqeB/T8TFnj608Co0RgKKpaExfyBXRMXSoB?=
 =?us-ascii?Q?YXQxz87Qh2c28Qgy+YpW8PUimVEhQSYyJd3PJcNhbVTjiiQi7Y/F1Q+PVaXx?=
 =?us-ascii?Q?k9KZ5nGb2amx97V3qvtxcCpMrUHBJiyGe1gazXNU2/0biEpJ0+ys3/20RSwQ?=
 =?us-ascii?Q?27aryulyruHG6HY2NoKj9eu6wo4G8m44rtuQgjnpnuL/ppDLFeu35E2MUdy6?=
 =?us-ascii?Q?8GruBnoEUl/tjV/gZ/4IwAqXM2tDKB1eGFAZEspvbL0XGRWRNANh1iyFqZzV?=
 =?us-ascii?Q?paWub5zYAVwY+sIo5yNdrIS/qlxFEXLZY6bcqL/iLBbqnDTod+7vDXe+sMeE?=
 =?us-ascii?Q?Sl6z6ng7i+OV6Olwenxry9ZWma6EROldsBLL+i0MPsqtA4ganJHbeqJd3S0H?=
 =?us-ascii?Q?t3HzgGS7n/5t+GjngpIo0WIc9/7xtHvdUb8JjO3zH5rLy5p/Cy7KBxC/BwxK?=
 =?us-ascii?Q?UNiQIzUOhBL0/eWMFNEKuvzXkjzzrha2oT3dV8dfgyg/h0cYvGr/XmtsJvBr?=
 =?us-ascii?Q?W66n1tN84qxsj2/acHTIFb63RYsy1Ff1iQF9USOkb5joAT8/hfI4VbAdOlVU?=
 =?us-ascii?Q?wI31uBUcnJdcXZz+mm/3StK1bL/50e+Fir5qiv5kPzx7kJR6eEcCq2WR6EaU?=
 =?us-ascii?Q?b/BcrbPju2bW4EdQWEu+kzSCQr9RR0/8Lw+5C+9e8pZ/hcM0VPfTW1QJTY69?=
 =?us-ascii?Q?IlmN65wYQrA4y1Od5y7wFdO0dJIXa5lEEo1GrJZg+t99HoymKNarS5lNctbO?=
 =?us-ascii?Q?BqYCMLActQvO8ek9QSPl3ijkvZXzcc8LS+Z4CZ6JkxRkjwnnSb3dP0nQ6YkE?=
 =?us-ascii?Q?knScFGZHQS2Zyr6PMqg0mTVvbd08HJNZvs812k71vnlDX3ssvoXe1WKk3tMf?=
 =?us-ascii?Q?7x+Z69exn0rryFd1MdS0DYGsefRMxIxyUvY22uPq6nkOYrwdCwCjDchH/zTx?=
 =?us-ascii?Q?dOAEPWqZxIyINQwBw2vqtaCsV22xOZeOj5hC2cz9zzitVxE01ZKIDdHbHqzL?=
 =?us-ascii?Q?BUx5+RVw0V184wvQKl1cA6AxzmlEZ7SoLgpEQ0gaWVC3n5ktZS/uVHDG4NcE?=
 =?us-ascii?Q?VaY/abSe6BUbIygj18+BtsoXs7g/rToOzii2Qn0G?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 55ed82be-420b-495e-ba7c-08dc39ecae6f
X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB5966.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2024 12:39:48.4753
 (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: ME9CDsXLOUEfe7sJpeztBBPuw3TtrzEd9RZ1CJ/MlUipCwWNfICl7fMYeAQWyICMNtq+UIek5WtbFuAKxqXpDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5056
X-OriginatorOrg: intel.com

..
> diff --git a/tools/testing/selftests/kvm/include/x86_64/tdx/test_util.h b/tools/testing/selftests/kvm/include/x86_64/tdx/test_util.h
> index b570b6d978ff..6d69921136bd 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/tdx/test_util.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/tdx/test_util.h
> @@ -49,4 +49,23 @@ bool is_tdx_enabled(void);
>   */
>  void tdx_test_success(void);
>  
> +/**
> + * Report an error with @error_code to userspace.
> + *
> + * Return value from tdg_vp_vmcall_report_fatal_error is ignored since execution
> + * is not expected to continue beyond this point.
> + */
> +void tdx_test_fatal(uint64_t error_code);
> +
> +/**
> + * Report an error with @error_code to userspace.
> + *
> + * @data_gpa may point to an optional shared guest memory holding the error
> + * string.
> + *
> + * Return value from tdg_vp_vmcall_report_fatal_error is ignored since execution
> + * is not expected to continue beyond this point.
> + */
> +void tdx_test_fatal_with_data(uint64_t error_code, uint64_t data_gpa);
I found nowhere is using "data_gpa" as a gpa, even in patch 23, it's
usage is to pass a line number ("tdx_test_fatal_with_data(ret, __LINE__)").


>  #endif // SELFTEST_TDX_TEST_UTIL_H
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx.c b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx.c
> index c2414523487a..b854c3aa34ff 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx.c
> @@ -1,8 +1,31 @@
>  // SPDX-License-Identifier: GPL-2.0-only
>  
> +#include <string.h>
> +
>  #include "tdx/tdcall.h"
>  #include "tdx/tdx.h"
>  
> +void handle_userspace_tdg_vp_vmcall_exit(struct kvm_vcpu *vcpu)
> +{
> +	struct kvm_tdx_vmcall *vmcall_info = &vcpu->run->tdx.u.vmcall;
> +	uint64_t vmcall_subfunction = vmcall_info->subfunction;
> +
> +	switch (vmcall_subfunction) {
> +	case TDG_VP_VMCALL_REPORT_FATAL_ERROR:
> +		vcpu->run->exit_reason = KVM_EXIT_SYSTEM_EVENT;
> +		vcpu->run->system_event.ndata = 3;
> +		vcpu->run->system_event.data[0] =
> +			TDG_VP_VMCALL_REPORT_FATAL_ERROR;
> +		vcpu->run->system_event.data[1] = vmcall_info->in_r12;
> +		vcpu->run->system_event.data[2] = vmcall_info->in_r13;
> +		vmcall_info->status_code = 0;
> +		break;
> +	default:
> +		TEST_FAIL("TD VMCALL subfunction %lu is unsupported.\n",
> +			  vmcall_subfunction);
> +	}
> +}
> +
>  uint64_t tdg_vp_vmcall_instruction_io(uint64_t port, uint64_t size,
>  				      uint64_t write, uint64_t *data)
>  {
> @@ -25,3 +48,19 @@ uint64_t tdg_vp_vmcall_instruction_io(uint64_t port, uint64_t size,
>  
>  	return ret;
>  }
> +
> +void tdg_vp_vmcall_report_fatal_error(uint64_t error_code, uint64_t data_gpa)
> +{
> +	struct tdx_hypercall_args args;
> +
> +	memset(&args, 0, sizeof(struct tdx_hypercall_args));
> +
> +	if (data_gpa)
> +		error_code |= 0x8000000000000000;
> 
So, why this error_code needs to set bit 63?


> +	args.r11 = TDG_VP_VMCALL_REPORT_FATAL_ERROR;
> +	args.r12 = error_code;
> +	args.r13 = data_gpa;
> +
> +	__tdx_hypercall(&args, 0);
> +}
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c
> index b302060049d5..d745bb6287c1 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c
> @@ -10,6 +10,7 @@
>  
>  #include "kvm_util.h"
>  #include "test_util.h"
> +#include "tdx/tdx.h"
>  #include "tdx/td_boot.h"
>  #include "kvm_util_base.h"
>  #include "processor.h"
> @@ -519,3 +520,14 @@ void td_finalize(struct kvm_vm *vm)
>  
>  	tdx_td_finalizemr(vm);
>  }
> +
> +void td_vcpu_run(struct kvm_vcpu *vcpu)
> +{
> +	vcpu_run(vcpu);
> +
> +	/* Handle TD VMCALLs that require userspace handling. */
> +	if (vcpu->run->exit_reason == KVM_EXIT_TDX &&
> +	    vcpu->run->tdx.type == KVM_EXIT_TDX_VMCALL) {
> +		handle_userspace_tdg_vp_vmcall_exit(vcpu);
> +	}
> +}
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/tdx/test_util.c b/tools/testing/selftests/kvm/lib/x86_64/tdx/test_util.c
> index 6905d0ca3877..7f3cd8089cea 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/tdx/test_util.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/tdx/test_util.c
> @@ -32,3 +32,13 @@ void tdx_test_success(void)
>  				     TDX_TEST_SUCCESS_SIZE,
>  				     TDG_VP_VMCALL_INSTRUCTION_IO_WRITE, &code);
>  }
> +
> +void tdx_test_fatal_with_data(uint64_t error_code, uint64_t data_gpa)
> +{
> +	tdg_vp_vmcall_report_fatal_error(error_code, data_gpa);
> +}
> +
> +void tdx_test_fatal(uint64_t error_code)
> +{
> +	tdx_test_fatal_with_data(error_code, 0);
> +}
> diff --git a/tools/testing/selftests/kvm/x86_64/tdx_vm_tests.c b/tools/testing/selftests/kvm/x86_64/tdx_vm_tests.c
> index a18d1c9d6026..8638c7bbedaa 100644
> --- a/tools/testing/selftests/kvm/x86_64/tdx_vm_tests.c
> +++ b/tools/testing/selftests/kvm/x86_64/tdx_vm_tests.c
> @@ -2,6 +2,7 @@
>  
>  #include <signal.h>
>  #include "kvm_util_base.h"
> +#include "tdx/tdx.h"
>  #include "tdx/tdx_util.h"
>  #include "tdx/test_util.h"
>  #include "test_util.h"
> @@ -30,6 +31,49 @@ void verify_td_lifecycle(void)
>  	printf("\t ... PASSED\n");
>  }
>  
> +void guest_code_report_fatal_error(void)
> +{
> +	uint64_t err;
> +
> +	/*
> +	 * Note: err should follow the GHCI spec definition:
> +	 * bits 31:0 should be set to 0.
> +	 * bits 62:32 are used for TD-specific extended error code.
> +	 * bit 63 is used to mark additional information in shared memory.
> +	 */
> +	err = 0x0BAAAAAD00000000;
> +	if (err)
> +		tdx_test_fatal(err);
> +
> +	tdx_test_success();
> +}
> +void verify_report_fatal_error(void)
> +{
> +	struct kvm_vm *vm;
> +	struct kvm_vcpu *vcpu;
> +
> +	vm = td_create();
> +	td_initialize(vm, VM_MEM_SRC_ANONYMOUS, 0);
> +	vcpu = td_vcpu_add(vm, 0, guest_code_report_fatal_error);
> +	td_finalize(vm);
> +
> +	printf("Verifying report_fatal_error:\n");
> +
> +	td_vcpu_run(vcpu);
> +
> +	TEST_ASSERT_EQ(vcpu->run->exit_reason, KVM_EXIT_SYSTEM_EVENT);
> +	TEST_ASSERT_EQ(vcpu->run->system_event.ndata, 3);
> +	TEST_ASSERT_EQ(vcpu->run->system_event.data[0], TDG_VP_VMCALL_REPORT_FATAL_ERROR);
> +	TEST_ASSERT_EQ(vcpu->run->system_event.data[1], 0x0BAAAAAD00000000);
> +	TEST_ASSERT_EQ(vcpu->run->system_event.data[2], 0);
> +
> +	vcpu_run(vcpu);
> +	TDX_TEST_ASSERT_SUCCESS(vcpu);
> +
> +	kvm_vm_free(vm);
> +	printf("\t ... PASSED\n");
> +}
> +
>  int main(int argc, char **argv)
>  {
>  	setbuf(stdout, NULL);
> @@ -40,6 +84,7 @@ int main(int argc, char **argv)
>  	}
>  
>  	run_in_new_process(&verify_td_lifecycle);
> +	run_in_new_process(&verify_report_fatal_error);
>  
>  	return 0;
>  }
> -- 
> 2.43.0.472.g3155946c3a-goog
> 
>