From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA3DDC54E41 for ; Thu, 29 Feb 2024 12:31:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 753D56B00A8; Thu, 29 Feb 2024 07:31:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DD3B6B00C6; Thu, 29 Feb 2024 07:31:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 508286B00E2; Thu, 29 Feb 2024 07:31:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C9DA66B00E0 for ; Thu, 29 Feb 2024 07:31:34 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3EAE4A15A7 for ; Thu, 29 Feb 2024 12:31:34 +0000 (UTC) X-FDA: 81844777308.05.3017D1E Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf19.hostedemail.com (Postfix) with ESMTP id A6D941A000B for ; Thu, 29 Feb 2024 12:31:31 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=gDaoPswl; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf19.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 198.175.65.11) smtp.mailfrom=binbin.wu@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709209892; a=rsa-sha256; cv=none; b=zEjJ20TL2eHqy0f/AxK7IjOIoNDPhKdEX5SVNGcl4XKUkAf7VA1HbnDHAvA0LMshplfGVh eE0CiDkoEKQsc7+Mc7BHqkM/amZ9ZGv2K2bNVJ2CG4qOTWjetFSwK8FVmD3st+mflIs0mi ac6BN5DyYCPqAcWE40qKwX9S6hj1qxk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=gDaoPswl; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf19.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 198.175.65.11) smtp.mailfrom=binbin.wu@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709209892; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ntG0o43+x0hjOsGyv0TYahvdlNOw4yE3YM40VBHJpZo=; b=IJhn/yxYaZIxnMyuLAknJD96aLy1556HhIzb+Lr++NA4iVY9nOgd+Cg/vxLFsybDmBzzPN wW3eBni+VKnpALvpGOXWODoO1+Ypi0AcekVA6j7eZ74blUJnFBMbpqI+9EbYCxf0aHAbdt ksSdxBH4gwPJSPfCwbTnrOEWL6OlrM4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709209892; x=1740745892; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=YD/qzrBFsXrNIMjIfkkmyedNh06jyG8HwGCWFaCQIEo=; b=gDaoPswlxaXfHo7giQXg5lwH7WzqGusRq9+JXXc/z2TcjTmS515MNHQk BAAD5CvNQl+ru3vTis274dwX3vrkxBQtM/22qOgWRHwUA71XQ/F19FCrN g8G9XrDU+/zJyFDvjHYJ9RHJxtS7MIH4tVEVePERhUkT+Pwmqbf1iQ2wX qo+c0kf9/mL2wjfaIl4Pa9bduS6TU7djK7W5+FeubGq4TLmQDd8vv7p4z LRYERDBjw8OSH5WHUvXVp9gkF15qxiHOxUMm6ur05P6REah6kd/sqcP5L Y5xk+GvZfBlk7PcKRb5+TBNiFd5W4pzuaQQfv3YqA0YRDBCj0xy7ZHJU8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="14243022" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14243022" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 04:31:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="38845679" Received: from binbinwu-mobl.ccr.corp.intel.com (HELO [10.124.225.159]) ([10.124.225.159]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 04:31:14 -0800 Message-ID: <1b3ebbdb-ac7c-47f5-8556-2ea9f397ab60@linux.intel.com> Date: Thu, 29 Feb 2024 20:31:11 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH v5 09/29] KVM: selftests: TDX: Add report_fatal_error test To: Sagi Shahar Cc: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Isaku Yamahata , Sean Christopherson , Paolo Bonzini , Shuah Khan , Peter Gonda , Haibo Xu , Chao Peng , Vishal Annapurve , Roger Wang , Vipin Sharma , jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org References: <20231212204647.2170650-1-sagis@google.com> <20231212204647.2170650-10-sagis@google.com> From: Binbin Wu In-Reply-To: <20231212204647.2170650-10-sagis@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A6D941A000B X-Stat-Signature: 4wsc4b864f5n7ptoj1epc1phm6itz8xw X-HE-Tag: 1709209891-893246 X-HE-Meta: U2FsdGVkX18QZjTT2zRag1u6FGImu4e3YXLzQ+7ivHfabSkGGLpN3u53zfHWPXWbDzolkHc0qzSC2tPJ6i9q6+mGCZVKqExtkoOkKjWNeABugih0bpmAv1l+fdJCK9vO3JVSpS7N3wFzkmUTRzM6XrQxoUDXxAUC8B7xNZE4RBMSVOqD82HF4KBg34E41pFJ3mRnZNzt/PM52IbyuNe8n3E8gXJn2HHLE9DIPzeM43wsSkMIBRIp9/71UhFJK0ifdts/wt8w6xVJk1+WqfmOSwiWGZRn5MB3Xos2B40ql7FrbgJ3UGvTfMADoo5tMn3/GAdX0lIGPOtiRl/e1lUWzAO4qyxCHT7t3w+TCLAOhgmxFuIiavJcqnDZQ4GyPB5Vy54Lp92fisy95BYikQsPCQBVycuB0KW6NV5ADBsLQP8oQpKpEsntb9tz+BRLhm40UyzGM927X2vQQ722zLWTbNMO6eiCz2T5Y40FZn0zcx45o3rHf0/bqjxn976GBWRPKF3xnd6abg3BjoLIHMhFr/Upp44O3AaHQ2SRl44unUzsg/Drih29tShjgc9CVK+/n3KqiPgPUCFS7Kd3tiSRdidCewyLc5p3spXfasJGxuRvF4sAmA1pTAr28MBi5cdK0r983IuTzOP4yunSpuCzSyKw1GWW4BI85UCLDTnFwS5ekQCRnzHJ8qTtYxbMjCZn9MKZoLsBUP4epnkeWoK6BuN6+8Czl1JMpHSi6rmeVwWeupNxGGjHeSqpoBZ+AH1vS6viw4o0Z/Hqe7sCwqQN2Yak8uRLbKfmJqNo4lJkwneLrqW0jeJi4R93aq/poPlQ6I112L0tm8tUmyiDlxYtHqfv9Q2tkGnzDakFkebKmSwZ+Jtz646jdIYj2zpl3ILW0NzHvR3vdf1Y7jC7mDDvv44W4YyWzk4+xOICGbwNh0VwGHMAwmscUI6EC6XUhHPfvfv+Ig75ih7E7iut0f8 tCwH0oEe eUz51tJKVSDduQ9TGuKl0fVlUEpdXQ1kyOCGTr4ZDfVfvi/sXpb5obUf8ai6hOv/VeVuuCBkfhH1wuj+qxqPCyuazsF4dMmwhKbttGbWCTD6puOBu0vWENH7D/yX8BB3IoZ2fuspsyV4sUiYaW2QB7d9OwVku6GhtXWDk3FbBuGWgYafPFiuC6ce6PQKqlHCLb3X8eTF7+4Urotm370WDD474VR1uZj85AO+X2WdH6AvznXA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 12/13/2023 4:46 AM, Sagi Shahar wrote: > The test checks report_fatal_error functionality. > > Signed-off-by: Sagi Shahar > Signed-off-by: Ackerley Tng > Signed-off-by: Ryan Afranji > --- > .../selftests/kvm/include/x86_64/tdx/tdx.h | 6 ++- > .../kvm/include/x86_64/tdx/tdx_util.h | 1 + > .../kvm/include/x86_64/tdx/test_util.h | 19 ++++++++ > .../selftests/kvm/lib/x86_64/tdx/tdx.c | 39 ++++++++++++++++ > .../selftests/kvm/lib/x86_64/tdx/tdx_util.c | 12 +++++ > .../selftests/kvm/lib/x86_64/tdx/test_util.c | 10 +++++ > .../selftests/kvm/x86_64/tdx_vm_tests.c | 45 +++++++++++++++++++ > 7 files changed, 131 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/include/x86_64/tdx/tdx.h b/tools/testing/selftests/kvm/include/x86_64/tdx/tdx.h > index a7161efe4ee2..1340c1070002 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/tdx/tdx.h > +++ b/tools/testing/selftests/kvm/include/x86_64/tdx/tdx.h > @@ -3,10 +3,14 @@ > #define SELFTEST_TDX_TDX_H > > #include > +#include "kvm_util_base.h" > > -#define TDG_VP_VMCALL_INSTRUCTION_IO 30 > +#define TDG_VP_VMCALL_REPORT_FATAL_ERROR 0x10003 > > +#define TDG_VP_VMCALL_INSTRUCTION_IO 30 > +void handle_userspace_tdg_vp_vmcall_exit(struct kvm_vcpu *vcpu); > uint64_t tdg_vp_vmcall_instruction_io(uint64_t port, uint64_t size, > uint64_t write, uint64_t *data); > +void tdg_vp_vmcall_report_fatal_error(uint64_t error_code, uint64_t data_gpa); > > #endif // SELFTEST_TDX_TDX_H > diff --git a/tools/testing/selftests/kvm/include/x86_64/tdx/tdx_util.h b/tools/testing/selftests/kvm/include/x86_64/tdx/tdx_util.h > index 274b245f200b..32dd6b8fda46 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/tdx/tdx_util.h > +++ b/tools/testing/selftests/kvm/include/x86_64/tdx/tdx_util.h > @@ -12,5 +12,6 @@ struct kvm_vm *td_create(void); > void td_initialize(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, > uint64_t attributes); > void td_finalize(struct kvm_vm *vm); > +void td_vcpu_run(struct kvm_vcpu *vcpu); > > #endif // SELFTESTS_TDX_KVM_UTIL_H > 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); > + > #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 > + > #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; > + > + 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 > #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); Nit: Since the error code is a constant, no need to use if statement. Or even save the variable? > + > + 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; > }