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 0CA59C3DA49 for ; Thu, 25 Jul 2024 20:38:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0EA66B0096; Thu, 25 Jul 2024 16:38:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BDFD6B0098; Thu, 25 Jul 2024 16:38:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 885F06B0099; Thu, 25 Jul 2024 16:38:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 68FAF6B0096 for ; Thu, 25 Jul 2024 16:38:11 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0C0DF4132B for ; Thu, 25 Jul 2024 20:38:11 +0000 (UTC) X-FDA: 82379437182.25.F5A775E Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by imf06.hostedemail.com (Postfix) with ESMTP id 3A94E180014 for ; Thu, 25 Jul 2024 20:38:09 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ETKOhwSP; spf=pass (imf06.hostedemail.com: domain of sagis@google.com designates 209.85.219.181 as permitted sender) smtp.mailfrom=sagis@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721939850; 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=bhDuWj6ZXurQbOQDj2UH91qYn2GVJzMpZPE8P+8BWcg=; b=oRFrNTJWkdMPPdjB0ddxY40I2LEU4U3p5rJX7c3dh8QD/JeS26ZnjCcYTla2hJnMgKhh/q O3XWBETovYWgbUxh91pA1oM5e1EW8SzbeHzWY0oDlJqZnsjSIBn6oYN9oiPavAJpeY+njY n07GFEbR0eUk1Cb/iKDD+LgQMxlzu+g= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ETKOhwSP; spf=pass (imf06.hostedemail.com: domain of sagis@google.com designates 209.85.219.181 as permitted sender) smtp.mailfrom=sagis@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721939850; a=rsa-sha256; cv=none; b=A1rIKyuZpv9dERlsEE7azNlzZWQC44+yeH7IyMj1eVms5ykTYUydF+ortyH84YGlYkL5su xaixbVpygKdYzx8WmJz3R4z6J8PS59PRQidySYP4xyIQcFnDSwaC+2K3TNz1obXcGyMol2 6on5/YDqlyhUibtSuPmeMzuXU7VV3Lw= Received: by mail-yb1-f181.google.com with SMTP id 3f1490d57ef6-e0875778facso1321375276.3 for ; Thu, 25 Jul 2024 13:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721939888; x=1722544688; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bhDuWj6ZXurQbOQDj2UH91qYn2GVJzMpZPE8P+8BWcg=; b=ETKOhwSPJSX/EHKzxbdDH4kw+sXjh/5rR026H/l/hvSOK19VIBDpocWwnsCkW4J0Mq IUDQDJUPtm0SKvWbcHOola+m10l353V/O3qAwgSKbWwMicJyU1bO4mGr1cHQkVuK+CIp Och8OQAx6s7anzATiRuqWBNGY/BV5OWkTBLbnBB0HMcB4uWBCyv3+BMvOY2yQ5B5bCe+ M19IMLgaC4KXO4RmD1Xc0sD7CxzTBc7pWn3M5/oCKDZmSABC/pbCByW0uIHbajb1y48n Cp3BhaMQ9+zMFPaJ4y1/FU6W9MAeELfdFRYQHQPjPtrC46ce0/eR25yDd6Z1lO2Xah62 mT6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721939888; x=1722544688; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bhDuWj6ZXurQbOQDj2UH91qYn2GVJzMpZPE8P+8BWcg=; b=W8PONkjCnaRBEOaCHN4YB9mGTbfXYjSJ5p7nWe/bAFtcLMD0pNG2NAbbo4tnlDOw4V UjoAzD3IgzDkdiKfLTm3JiLO0/0w/YSbgIOtjMYbY0uM9BxCthak/T6BOTyex8TyIPZ4 0FmiH14PTlDSZzBMhv+sBehBTi13Bl1R3wsjemWZkWLDTA8PunsDMFnaPwrMHiJ35LSw s/XUC6aDwd9+fGDtMcn6Io2gi2DHFThLIzo1m00gCaxNB3Zn24e0SjSuLLNEMkmMCF/Z QrjYwX560UieJmeT35fcMxMG19SeNcdLFJWd5DtmtpSOA9R9wYqTZ8Ry3I4Nt/o+0eu8 hL4A== X-Forwarded-Encrypted: i=1; AJvYcCXSMWOL2838gqzCgT/hLONiWnI634SbneKYv919Ksik9FDDB2CINnazLoLIFm1yZLAZ4RgSzmoFrV8npCgLotlMGmc= X-Gm-Message-State: AOJu0YwX/cMyQvOn3s1w2P4MLJl/5toqj9ElvaiTquWC/zW5OF6Tb5m3 l6aArRygFzcSpOvEiXwJ1iAfr67F7oT0KxPD+weLJE1I6RLp+TWv5x9O/MaoB/F1Zp/O+OrvJIm bCjHNHPkghIYTKZhlhQBtmg1Kd0QxXmg7INMz X-Google-Smtp-Source: AGHT+IECJdrU9brW0ZyCTY/l6qgMisIePUGJZ8CcYE7ptc9Vv+SM3KuDh9EzO3I07knxhTk+6U9Hm2yXCqceGYuDafY= X-Received: by 2002:a05:6902:e10:b0:e0b:314a:14f9 with SMTP id 3f1490d57ef6-e0b314a15demr3494865276.28.1721939887993; Thu, 25 Jul 2024 13:38:07 -0700 (PDT) MIME-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> <20231212204647.2170650-10-sagis@google.com> <704b58a8-2893-4fdb-8171-395bcd7166a7@linux.intel.com> In-Reply-To: <704b58a8-2893-4fdb-8171-395bcd7166a7@linux.intel.com> From: Sagi Shahar Date: Thu, 25 Jul 2024 15:37:55 -0500 Message-ID: Subject: Re: [RFC PATCH v5 09/29] KVM: selftests: TDX: Add report_fatal_error test To: Binbin Wu 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: qcdz5x7eomku15nm381oquyczugabugr X-Rspam-User: X-Rspamd-Queue-Id: 3A94E180014 X-Rspamd-Server: rspam02 X-HE-Tag: 1721939889-286525 X-HE-Meta: U2FsdGVkX18t/uyKwpIrvqI0Plc/e4Zmoz206B/+7L0VZRrXdHvagRyWwhk60zkDX2o/Mh99NN2+/ZzrtRP2wyVsI704dSZW+j4rpHZwrJ8Ln4mQb1hZwXKIj9lT779+w///7Th1WRnnP36sWlyUlxAmqIeUAIxPu3WNdx6ARGAvDWRtqOeVW8qCXzVBPzBtcijIykEtlOeUiVx+qfqvhOgyrETCx4SqM0BuqqZef2wxw4/LkoGQUzKWm2EoB3bDUstzxpCUF+78gnVQ2O/jWhiQNBFjjcDfqzy+6lps5cDwzwsE0blWt+I1ticbuwaPcwsv1ZFkLt4ywTYadFjGe8Jjm5bgkKQB4DOVb9oJLZjKd/8i0aHhcikA9/MWLdK/TpRcMsPqUT6NGK9qA7TJM0AAOXhfkyrl3g7O65CU0MDPNwQ1+cXZlUTHYSA528X/lt8AesZjlbw8QnXShKh2K/3dg96xt14JXcAke3yKG9DF0zk1BRO5c4b+mWsMR4vq0Uee+F8GHmku/1C3zQ+Do1OeRWghQ5fNnNFu8gPwH+2dLgtWf4F+xWL+NVHubPh9vjXeVYQADlfBKBX35lgtaI3G8geFUF01rOdwOTrg9nusnA5vwS1K2tg/hbuzA8Qb0RauiUeMwGrj0vBe+s4BNo08956M/3GXTYwvSoVit1Op0aeRyHYlhFGphp5lU/vhVrKPMAI9MmCEeMr4tbB7pwKqMt4EQHZLSN4EvJQcgE6sWlRjiRxqFicbv8wU0wzsUocbJJpdN/CAG9AqBqKQko0XpJlTxB1csgM6M/BfrDYRQsSozB4GnOTAc3LGmEOHpmdQ3RHV/l9xjcvUhtkzzK0QbQHf7PkHSK7ral/eZU1H1itw6xIEr/WrCW6xuk+zfk+Wg2k6hSJTwDYRDiOzwzjtfu49AMpQgLfY27VIMeORRKNOWwGJgIxRXOz/OZcHp+9sZ+GJaP4+/EviZD3 x4EjVLRt rPEZyynh+5C2fNy7oxLZPqo1HXGF837Lfv8VOV4WwAsrKHZ1jDUkNDbm2VaSSUZnUYANxfduEFcoECvew5/Hh6mgOC16+Fy6vxi11bZnMCF4dBKLaaO2RM5hZelReYOKN2pODtyPKmjlrSUgHdnBtY1AbkACN2X8KbW0gzdXSvtynYXfAtqoiY/r0hlebCZpY13XhfD36uZNPL0PSq06a2uokRjx+mJqU1o9RC3kWGjHFSYqK1sAmCbUH6iPyHPtRCFUV+ZCEP/98rY8= 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 Fri, Mar 1, 2024 at 12:52=E2=80=AFAM Binbin Wu wrote: > > > > 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/too= ls/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 da= ta_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 sr= c_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/t= esting/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 =3D &vcpu->run->tdx.u.vmcall; > > + uint64_t vmcall_subfunction =3D vmcall_info->subfunction; > > + > > + switch (vmcall_subfunction) { > > + case TDG_VP_VMCALL_REPORT_FATAL_ERROR: > > + vcpu->run->exit_reason =3D KVM_EXIT_SYSTEM_EVENT; > > + vcpu->run->system_event.ndata =3D 3; > > + vcpu->run->system_event.data[0] =3D > > + TDG_VP_VMCALL_REPORT_FATAL_ERROR; > > + vcpu->run->system_event.data[1] =3D vmcall_info->in_r12; > > + vcpu->run->system_event.data[2] =3D vmcall_info->in_r13; > > + vmcall_info->status_code =3D 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 da= ta_gpa) > > +{ > > + struct tdx_hypercall_args args; > > + > > + memset(&args, 0, sizeof(struct tdx_hypercall_args)); > > + > > + if (data_gpa) > > + error_code |=3D 0x8000000000000000; > > + > > + args.r11 =3D TDG_VP_VMCALL_REPORT_FATAL_ERROR; > > + args.r12 =3D error_code; > > + args.r13 =3D data_gpa; > > + > > + __tdx_hypercall(&args, 0); > > +} > > diff --git a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c b/to= ols/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 =3D=3D KVM_EXIT_TDX && > > + vcpu->run->tdx.type =3D=3D 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/t= ools/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 =3D 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_fatal is used for more cases than just testing error code but we can add another higher level helper. Maybe tdx_assert_error. > > > + > > + tdx_test_success(); > > +} > > +void verify_report_fatal_error(void) > > +{ > > + struct kvm_vm *vm; > > + struct kvm_vcpu *vcpu; > > + > > + vm =3D td_create(); > > + td_initialize(vm, VM_MEM_SRC_ANONYMOUS, 0); > > + vcpu =3D 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_REP= ORT_FATAL_ERROR); > > + TEST_ASSERT_EQ(vcpu->run->system_event.data[1], 0x0BAAAAAD0000000= 0); > > + 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; > > } >