From patchwork Tue Dec 12 20:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Shahar X-Patchwork-Id: 13489868 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 700ECC4167D for ; Tue, 12 Dec 2023 20:47:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9179B6B0374; Tue, 12 Dec 2023 15:47:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A12B6B0376; Tue, 12 Dec 2023 15:47:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A6F06B0377; Tue, 12 Dec 2023 15:47:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 52D556B0374 for ; Tue, 12 Dec 2023 15:47:16 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 35299160AA5 for ; Tue, 12 Dec 2023 20:47:16 +0000 (UTC) X-FDA: 81559351272.28.CA1A165 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf27.hostedemail.com (Postfix) with ESMTP id 6952540018 for ; Tue, 12 Dec 2023 20:47:14 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iVyADVwg; spf=pass (imf27.hostedemail.com: domain of 30cZ4ZQUKCHQkSYakYggYdW.Ugedafmp-eecnSUc.gjY@flex--sagis.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=30cZ4ZQUKCHQkSYakYggYdW.Ugedafmp-eecnSUc.gjY@flex--sagis.bounces.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=1702414034; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+oFTGXJSfXzvmAiUKHB1pxE3R2ft6C/AFFmYxuAN1SU=; b=UMmHVLbYszqJxYdeQe+/rJ299FUra/u06Jb5J9crZU8IMe+Kk2bYEzW6dHbR0R/+Q8GZb/ e5Rc/lfX5E+u/b9raOtubn1VWxJmDAA9X0YDG8Fi3GepMgu0r9TkUBb8gveQS266MNDlje OwIgv0ZXxYhVSFpdDRbb5/UXzvuhT/8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414034; a=rsa-sha256; cv=none; b=n5xDIA73DQYS3K75mHZKIhL8GBjkYGXExjrno8+i9OQ6o1c4k+bphROaJ9S+vZ7+7FrwnU knYe2bVuYV/NGy1vRccsNMyMCmHv7O9AqDHsU0U5/QvhriTDXyM1F6iImzIgXU4j8ss0KB N2WHNJxoeqD9rpIVBQdBUd29wGCyMzc= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iVyADVwg; spf=pass (imf27.hostedemail.com: domain of 30cZ4ZQUKCHQkSYakYggYdW.Ugedafmp-eecnSUc.gjY@flex--sagis.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=30cZ4ZQUKCHQkSYakYggYdW.Ugedafmp-eecnSUc.gjY@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5e19414f714so21992957b3.0 for ; Tue, 12 Dec 2023 12:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414033; x=1703018833; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+oFTGXJSfXzvmAiUKHB1pxE3R2ft6C/AFFmYxuAN1SU=; b=iVyADVwgFO2YTyoHqHzTxcqiamqvFatPDGOLzCSWX+dS97PuVcw/h3GhZvIARsWu8Y H7FcOUQvCcIZDzAvRPh8hzTCA5Dtn+5lwYao6yxpS0STILGPllzeSTwjKb7S7fySlwgF 2/HNCtZyh1w3aISSEcQSryA3qTZGFLpJO+jRK7OIrs5LQhaP/kGeQjxrVcUYTbN5x/Hl YVo2HjU03q7MtOSUADnD6iWhpptkO8zvVAS8ydYkiNuEr8UzPzA+xv6xQZIG0wCJ7451 HxxFDIajCtBj6vJImIPh8R5PVOffe07ZdQAh8iOnM/nhIf6PcwL0eRLbYeQxVYqnSTau 9t/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414033; x=1703018833; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+oFTGXJSfXzvmAiUKHB1pxE3R2ft6C/AFFmYxuAN1SU=; b=Iu0/X+fisUpq/Az5mGoey+l8LEuMaeND1s3xAID+9ZF6NYDMZG7ghq+EpKLJgRrf3a 19Rg8oug/D3YIE3ERwFANUIiWC99xZQfingocqRnqBjW8Yacr5r/8/NbGv1bUQD2yaCN tI+s1bEb0HHpkAMkHBXoEkIHXiJQzOPEPlJ1Gnd0iR9kwlEesnqS0bP9aNNCmyoUixg/ s1rHknQ6If/xq46mKLGqpdyE7IHZX+ubu3xBRdtNiDZ4KYKXF1H61P75qWb39Gz/Xled 7u76lVL/YC70o8qLpmJSwxtqypqh/1rs/36IKUCrq9rap4RfVMIOnmdnRZNAp7R7cUhS EOhw== X-Gm-Message-State: AOJu0YzI7+7tQXJ2awVDMr0xUmBTHQwMNE3wiZUNnWWBemU0tQGcVXiR ETP+M961HLFRLce+gdmw3NwgDrjGCg== X-Google-Smtp-Source: AGHT+IH1CLpwDkXuT03kJZbZTidbw2/KYLzIyeXPtVSMdlpNxfO/0gpo4qDYnGFJLOXAxqIBuWzxiNFWcQ== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a05:6902:534:b0:db4:6936:48b7 with SMTP id y20-20020a056902053400b00db4693648b7mr58935ybs.2.1702414033563; Tue, 12 Dec 2023 12:47:13 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:24 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212204647.2170650-10-sagis@google.com> Subject: [RFC PATCH v5 09/29] KVM: selftests: TDX: Add report_fatal_error test From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Sagi Shahar , Isaku Yamahata Cc: 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 X-Stat-Signature: 855tqe1dkitkgjxurjh3gwjfzdxe7nia X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6952540018 X-Rspam-User: X-HE-Tag: 1702414034-526731 X-HE-Meta: U2FsdGVkX19ijOrX14d/m2ZycXjDAMu9N3pINII43XOK/bQ1WcqJvDPqCpas9e/ro4+UVLDqWD59agAg6Lip6zqLv0XbseDcpkxenJHjy4zXn/37TAkmLUaOqutI79LIuLImoDq8rYFFu+bgcJ0lnyYq4YSTbTjIxjyFOuWmIFcUZxRy3CDpWqqbi1myPRm4/zaFUqMX5s0euow6JBJtSjwdHmAig4MnxmDgJAxnrJ9k26wCSkJFgiHLXazsfXZBzoqCFxvCI/KrnE0yXQ0tjX4dDNzLf0NopdNxTVzsBR0ixyv4sjeA+1G1EGtSstXDR9vCaMuBot2ciDiNW+IH5W2tx8NrT+O4usLOTzIWANbtqjKC/a6nRo9UPIrbgG6Nb64wz8zhwUESriSk4p2E6N3sb+I88a0BLz4iP7SNX3mMkfTJoxXs8nYvUoRPneZ+f7EKfGd7NVwdHSDZFB7BoR1SeI40myPaU5mT5Lv3S1zJyGImJnTGmlOP/Xe673IkSgO/u+uokdz7C4eQQ4QhLCwkeNu7JNF0wNXbVRR7AQPK/zhVEzJoee8erlQYwBPzosW3RHpctv/xagrIkmUAjjxVa0BoLjRlF7IX75IpD2TCRAZZ7KwOmFZeykswKSO05T5YOE2m1Z4huugG3SaVXZQ/709RS71T780+/XuBOqzfeIHjg+YSOS9yP3CSs/SN66A49BPrwq1VNEOsOVxZoqrnM4TtVyiaQXFO8qDLVXkdueekWc0jSS9oP4tkr+1xPGmmIRrI8k0YbEupIaFwjl4YEIYcwy8iZTIavS5LhyQyNo4h1/ZrqRqa0r9ZArc5KKN/djiAXFGHcLxx4O0WlzP3bfPZN29aO5J7A+y0aWnMEOqJuZV6yuHMgHwGW5X5lVcT8njdjSR3s8ykc5pctaw4WLSZa2KYw9i93NU0wkJGvWZvzx/xB8vKRL0AqrUxkt7wx+cJe5AftVWGFjK kbp1lRnh +kprNh0gAKT/hHoD+jWOQ49x++lOOssMqk6xqWZHUbod3J8yD4deScRs+uu75maZzRe2/DL9gRbn4nNvSvKGca5K5xmEY02gfoEoF6RWzCQqqn/0A8Pem2O39nQV1WApFVcICk3P+SLMzw3spPMpytrAmHK8ms+NlyqXTh6FP9NSoD5A7Tac0ghTVodH3i3Gnx4EFT302l7LdSLWiV8e5TLo6xCwrQfGkiueN8XMRvXt64fNtQnmJYj/MfRtiu86qbKAKYKpfmq0BOY8BGp/EQ+7ikxEVXq4Vik7vIY+mvzN+kMqPO+v+Hho3zKaPELHBQ408ddBAFM/nKTOPfuQ3Gvn8oXfG9pE5LrZwpPjILblpJcOFymg56ixxD3sCxGGzgcxWqSDJZ05N+cbvpr1DDl0Iqa3c03/kaH+gHY6jyJT38cbSBc7ZxWjnyvKVoGLGfkYfDfbESxKKHk0QD4dD7IrJI70gO1/0GfZLwuG9OeeaYXGe9eHb77eouWRjfrQrTjva7veOXpvfzrrONJQFeEOOVqnpVnCWmSHaO0A50w5e9kMAEJ1mf1OANQd1xXb7m1r66PEXTkBLWeGH1F/aydD4bWxSUtgoUaZr6y7xsDhOU9Ay7LCBSwng72CYgkOUSuCn9VpY/O7wX1ehHb/LqkKW2A== 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: 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); + + 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; }