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 2CE33C5478C for ; Fri, 1 Mar 2024 06:52:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A41676B0089; Fri, 1 Mar 2024 01:52:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CA1A6B008C; Fri, 1 Mar 2024 01:52:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86B296B0092; Fri, 1 Mar 2024 01:52:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 722B76B0089 for ; Fri, 1 Mar 2024 01:52:49 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 47D0180E04 for ; Fri, 1 Mar 2024 06:52:49 +0000 (UTC) X-FDA: 81847552458.14.499C940 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by imf29.hostedemail.com (Postfix) with ESMTP id 315C3120004 for ; Fri, 1 Mar 2024 06:52:45 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=HZGJWpkt; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf29.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 192.198.163.14) 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=1709275966; 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=me1//Y5xXSSMKV02b3tUPejrLKrvnBiA7/f6Ud/jSMc=; b=y9Z0dNYTCWo4fKJT+6YU080EO6JYMMyN22nvL9bBNL47AShCnF4Wie3qKzlJ9BPj9UsqOf aE1kkB085Z94kKBEUoCyJ4YkQ5uMjMMQnTSvg4ggIjSW3UihC/M5Jr4GWTH34B2BsKUXwm dYCmIuuaosl48d3DSYwUCfIFzlg9yE0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=HZGJWpkt; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf29.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 192.198.163.14) smtp.mailfrom=binbin.wu@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709275966; a=rsa-sha256; cv=none; b=bjZobgbFEPuvx7W+rZQYIsaZucJr2bQvMyxkO6O5pub37s6exY5HhtEb3+MYHa7ULXXD1t K6kW/6JU0hbqlmLmq+EknTtBBA0V0K3tjJDoNI+LLCu2jTR5WEwHcPZemNrhMmYLTvb0qs S8bHRPGXLE5HhVWIJXrpdPPxY1hJhVE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709275966; x=1740811966; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=PZcAanboKcUp2tLccdXfkXE1+xs/N+nzxRhzAH5IS9w=; b=HZGJWpktQASuvyySSz3O1t8ULxC7Bk/SvaQmy0yDZpou+UTUz9TrNcpD ttz2/CaQXC8cXDDgMUo79tcO5zdvWroLWWzZwQ0uPU+HefUJLqzg8fDj6 9rKwppCOngeKoUOb4rICiFCqkAahTu3HRTYtrsTooEu63CmeNnWfRRTUz VOtUGJljACQYYcgoHRmWgsbtmH+m8a2CxHGOUnpkXjf0gIdK4vVBJQ9Z+ m66lRdFDd4N9tOIjtKuAdIAyWmxrOdSFw71ZIM2qcVeBgMpu+PB6trhJI PBDEq4xDtTD/dYN1Aw2F8Nr1mUa1jozyXg0iiteqgNBF2jyGLWvNMqUou w==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="3957531" X-IronPort-AV: E=Sophos;i="6.06,195,1705392000"; d="scan'208";a="3957531" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 22:52:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,195,1705392000"; d="scan'208";a="8035272" Received: from binbinwu-mobl.ccr.corp.intel.com (HELO [10.125.242.247]) ([10.125.242.247]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 22:52:40 -0800 Message-ID: <704b58a8-2893-4fdb-8171-395bcd7166a7@linux.intel.com> Date: Fri, 1 Mar 2024 14:52:36 +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-Rspamd-Queue-Id: 315C3120004 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: akktny3ijreykkokzyht5e8nrwbtas6y X-HE-Tag: 1709275965-799875 X-HE-Meta: U2FsdGVkX19uhnjaof9KihJr8c/Pg6hDJnRVD7mPv0WqlaJNuVZZUufA05fmIjHRGvGLWwUTzNJOqYweWYXJy2IdKkEtJ4GgsvyNbml3m5NHa8JVDyWszUh/qkiqIytfrXN/qefzoB0VrbDOYVMfQOeaDIlb0XDZwBYGF08DOEyp8N6CUDv8W05+gD0PKbFW0M8c7xQJF5YMJU0QC5SgRLoXbbkZ1fM7NA6sLa1s2U+drT96fGFG3rr63ST9P51dL8FjD1HTCrZVyQDZmiSdJ7cu90K2J8T5T8MJF5lv9Q2sD8YuQBw1oc5SaHNgxVyvpxpXMvCSk3xjLHxcyTWbrVjdXI0XKQ1nqT0pBxhNui3OaqSyw5xo1YtLW6PBIUQTCx0Cqyx837YUoKD+XfTaLX2OdmmGH/VeYEMoZXoamQKFoBY9W9BHYXRb33MCzFHnAFQfiv9M00cAfM/q9mZVZr5S/PtLFs0WQCkaaSnea4TYt5riUtGRhGDuOO9bzpo4ONNmFWrWqf2JVf4oVQqMK+c3TZTwDj9NVrDDwC/0xXbxzesD6HXVJT2g84BhbmqaaUHNL73Zuxaa55qpwysjYV1MkijfH/VtPPfY6dEkjXMhKVku7WBLCMyZcOyGZwaCNsR0W0e+EQMasSYLiTl9PhqliHHHCAOVGtKGc2tEN8U76XTuZU6rU6ETNX5VP+E3br8hFmKKwvGcdpN5i8BcucfWNpYEOYoTLacsSdqPrunR9jv+In/KElSdwULjAPx7mSyoUEJKw1YYWfmvRZL8WMlI1uOy8QcZ/T3XxAqags92T5AYEOw5E80ioky7wCC5B6/BwZXdIHbNFzwC5bzZ1zrdERvJbVMVg6w9LfjZVRAQjpENeUmgmsqf2hKtKPwfEOD4igY0I6JIbGY6+IAo1yS7lRlnGDPxSkCiIxmN5CowsE9njgw7qfdmR+7/6Y557MDYScZAf3aeVXGQHhl xyzlrqlw On/4EGEgC6DWs/XVZJgaDKraCmQPXd4oPVzGxLFY887VbfTqCsyrFwS637di7iFAWVemOPa3vOUkXLTYbSfN1962gNFutTLEkqkHMcxThz7PeCgTK/D2W4qWbRGG0rTpwSU0fAlf90w+P1BmRQhKx+sV0wcQM3svlx2l2+Vo5TnILSm9E2rc4NiZ2HiHKajMju6mf+onMCD0ktbxdySeO0CJmLXrr+fbiqcZG2r6f7WX0uso= 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); I find tdx_test_fatal() is called a lot and each call site checks the err before calling it. Is it simpler to move the check of err inside of tdx_test_fatal() so that the callers just call it without check it every time? > + > + 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; > }