From patchwork Tue Dec 12 20:46:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Shahar X-Patchwork-Id: 13489934 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 023DEC4167B for ; Tue, 12 Dec 2023 20:48:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C743D6B039C; Tue, 12 Dec 2023 15:47:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C23D56B039E; Tue, 12 Dec 2023 15:47:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC6F16B039F; Tue, 12 Dec 2023 15:47:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 95B386B039C for ; Tue, 12 Dec 2023 15:47:53 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6FF56C0AA6 for ; Tue, 12 Dec 2023 20:47:53 +0000 (UTC) X-FDA: 81559352826.24.731D30A Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf27.hostedemail.com (Postfix) with ESMTP id A76B540019 for ; Tue, 12 Dec 2023 20:47:51 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Nkr6vQxS; spf=pass (imf27.hostedemail.com: domain of 39sZ4ZQUKCJkL39BL9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--sagis.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=39sZ4ZQUKCJkL39BL9HH9E7.5HFEBGNQ-FFDO35D.HK9@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=1702414071; 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=9b8Rem1AmPjfYzBNcLPCGf0Ya+tJ/F2me7CGYJ1U7yY=; b=EuudmeCd3t9ZpfbgZA3Bedtxp2t6CGBrzAgqeAfkK0Qx0ImKFZpQydonSxp1jymjB4BoWm siSzuGmcKZssfGjeNgkJqYKj5nov6r3ebixCSt3IV4HUQJmuYHeFhiAIVLTQzk94nN4dBg RHJCu2JWI+1Dp53mEtNRFH8baH6IbT0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414071; a=rsa-sha256; cv=none; b=j5Oz6K4IWLQsqs/JdNNmzwKGjGLup352lmc75Nyr5Xo4riPWT7Oe+ul4TaFYzcp7VNFxvl lZhwfqRpXtosu1vJ5QcBcfabMjYcRNXyMM/GKhhRMyqvTZ1FbtICRBptUE+fISLLcHJvEX 42Tv7pMJ188+MpjfrKVT2AAavnis254= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Nkr6vQxS; spf=pass (imf27.hostedemail.com: domain of 39sZ4ZQUKCJkL39BL9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--sagis.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=39sZ4ZQUKCJkL39BL9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5e183c40a91so23077997b3.2 for ; Tue, 12 Dec 2023 12:47:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414071; x=1703018871; 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=9b8Rem1AmPjfYzBNcLPCGf0Ya+tJ/F2me7CGYJ1U7yY=; b=Nkr6vQxSriEnS8hDzCVXoeY4m0y8eTBWqzhKHehbaCEj3qeWMk0pVcQYoXFHlyLnTC P2CfcW9OAmx3ll59gXxkDH6rbgcqmDEscGFLoU2D5DqNSb8xZETUU02ugZ/FoVIl/SfJ rgy1CbtTt+bVP2TmqHCHT2S2cB0Z3/H0jgWVQnS+bEQcK7asrJyUJw/yWcdgs8XymAnP JcSV59EHyPtEzVzmKh6/fFJ1ZU+ZRuYfAl23mwQpObgXgykeMTIJrOEZ0cBn/iViK5xy XQHWABsQ7R+kGh2tfxmBNzCgjqJ5j7ClNwCnZUDG5IEvI3MSnwDW0OiCtNzNt30rHKnI pAZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414071; x=1703018871; 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=9b8Rem1AmPjfYzBNcLPCGf0Ya+tJ/F2me7CGYJ1U7yY=; b=hMoI3emzAZT3AQk4QF6vx220vjq55QXFVhuP/+k+U57pmhT8ERiMetw8r+rZY+FLFG BMZXlZuhevc0lyGqpZwWZORhmqSplUqtMqPwD2ptlf0DBVUvrvCWQ1nfYwzX+o8ulYix nMjTyCloRssR6mQCRq1goUQmvbqyJdaN2+fEPjrR/vskkXertsVVmu0rDy4g4hvPrAzK V5QNGdStTeWII4Nx+rvLnRXsY0ULh7oK6M50Qzuwm9MKkgxCvjXdIDQpMhGXhPe75ijv x+GAfPigSAIgv6sKyCfraNQh45M9T2/D3GXk+ltSsGDF/qav4AFvq8463Oc/zeA46mlJ i/+g== X-Gm-Message-State: AOJu0YzscZdi3ZholXMmMMvytETQQP6N22DFK+Xl7A3H3Kn/MbzHbjOR Mo9r5dfEsLNQXJP4x9M3sdk6EVrrbQ== X-Google-Smtp-Source: AGHT+IFxV+KrDYmcwmn1PDxvzNdlpDP4pWeOD1xeuiQDvWiuL5pZVy4R12KnOvAQ3fLYUpwzgPkXIIMt+Q== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a05:690c:891:b0:5d8:eec5:f57c with SMTP id cd17-20020a05690c089100b005d8eec5f57cmr64746ywb.4.1702414070805; Tue, 12 Dec 2023 12:47:50 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:44 -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-30-sagis@google.com> Subject: [RFC PATCH v5 29/29] KVM: selftests: TDX: Add TDX UPM selftests for implicit conversion 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-Rspamd-Queue-Id: A76B540019 X-Rspam-User: X-Stat-Signature: k89hi1uk7roxszwz6bs7pa3ras6sdwgm X-Rspamd-Server: rspam03 X-HE-Tag: 1702414071-348574 X-HE-Meta: U2FsdGVkX18lQlUQsW4CTthqc7w2gfhPljsKdb3xLg3MlPmYZFRPdCVkw8EfAC29Ku173pA3bx1dCDe+VlIp9A4+0a5g74GaFlN/iQ6ilAA7DIANx7IDNKn9us4UnlYRGO0QpYMi/KXzpQ9QxItSpDnymUwF+iCUwUYThAntxhQutljB8w4bYye/Q77RmFitmst5CPF7InYE9Y+spHuEWJLPRvC5sxtr7iqY3IFxmTqyYLpKbJ82BWMDIOGcB70xhEZQzvhlMi3GB4fxSx4aj7AO4wMmz/wSlaJcnaMsfAyL9yQfOt5ktcRp1UgTais2CT697RlRMN2dALKNQR4iIelBx9nG8PdSS47yLbG/545hsAaaWoqFr3WAXtbyUO/tjFNmQZOEJan3eEoUnEw9PV0itTEhXqXO4VTU/VgfYpACHKcafA6HcXU0oBYBN5GnyYyAEfwTRFqQshAAF5HeeVy5ItPNR2LNr32VWfS9cJBWEIHXArcK9GNVFtxpXNT1Ek0G8ip7n2BezIeIBx/KoNHZr7XJloQ6rGp1kEM277fXwwJHmvB4yXXf0doHSHYzpLzZd2mAfGJH6EybNJD4UujxmDurx7xezhwaFi4lNlZUec0H8g1sxI3XH5vyP6JerX8gFny2hf7S7sGBrxllO/yNPH/WL/zu1fMnZE+4tHKBS2pQS7naqF+pTB5pHcFRFYVHhbTbAGImcVWSY3fO1WtvqZlyyAJ2CbhtIpUXw+uQgr/ZFVCa5LdU3xx/QIGLV6VasyR9fkEJ6UB2x/UxAYKhK17s4r4rKt2/1St5NdTQ8NKe0P5rAEgFPBHSga1Y/yBvPGZqo1qpQeF/t4S5psB10sZxe6Ut7q8s0M3YEvKfCKthWU3FvItm3yH/NxhCA7TqDp96uon9hs2k6BGlQqFt3a2F9uTzt2dcn5twXJmEYWktglBhWjhyv8OUkNp+NhdpK0pgEKy2dqFLHjv /Ymy3jaD zGtip/y65Ffv9LbGP1O6twDRYX3ZF0gZ9/uiDa9vlkmhz0wSKJvvHMxcshSwtiljntgYGruQ9q++K2MQtGgVcSw5WEmKHL5qA7k/w42bpJGOYCRpW2sOXPub/l7EcmfrXNppl+h2DsKPaTG/QRCAd7+aLoRD/9bG5iPeliXav9WSWBymLBPjo0eQOLuwCE44XcDKom5n1HSi18DKF/IvA64K4CFU7Bw8QxkEgxH8j5VdfNfqZjsJwSINAE/jf+yGHl6gxOeyq3YbCf1NWiTbMrelijVBeIBPQ5ev+AeTwFiVchq2hlRYo6nbzEsN294vPoLbqD3nw4KEtbnUYSKJhYNelF8F5dkFDqxbZXiaMNXzX4f2Dmf7U3JmqXt8F1SV3rmZUPgdQMTIpLarg2mJZi8vWLsYheCz4GcW9d1Eusg7hFasULat4QWI7jnhXVjqqNmwze/twHrIkYBpWZfVY0v0KXM1rBBl3d4XixTJrkV5fMIi2T4NgM6OMdiN10OOj55nRHUv0QSrYDOn99cCrQUonILzgPvrnfqHyFi1+zP1eiTNFZ3sPJH2IpYIvoBruSTnakfFjSNlVyIR7KNwngtIp+g== 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: From: Ackerley Tng This tests the use of guest memory without explicit MapGPA calls. Signed-off-by: Ackerley Tng Signed-off-by: Ryan Afranji Signed-off-by: Sagi Shahar --- .../selftests/kvm/x86_64/tdx_upm_test.c | 86 +++++++++++++++++-- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/tdx_upm_test.c b/tools/testing/selftests/kvm/x86_64/tdx_upm_test.c index 44671874a4f1..bfa921f125a0 100644 --- a/tools/testing/selftests/kvm/x86_64/tdx_upm_test.c +++ b/tools/testing/selftests/kvm/x86_64/tdx_upm_test.c @@ -149,7 +149,7 @@ enum { * Does vcpu_run, and also manages memory conversions if requested by the TD. */ void vcpu_run_and_manage_memory_conversions(struct kvm_vm *vm, - struct kvm_vcpu *vcpu) + struct kvm_vcpu *vcpu, bool handle_conversions) { for (;;) { vcpu_run(vcpu); @@ -163,6 +163,13 @@ void vcpu_run_and_manage_memory_conversions(struct kvm_vm *vm, !(vm->arch.s_bit & vmcall_info->in_r12)); vmcall_info->status_code = 0; continue; + } else if (handle_conversions && + vcpu->run->exit_reason == KVM_EXIT_MEMORY_FAULT) { + handle_memory_conversion( + vm, vcpu->run->memory_fault.gpa, + vcpu->run->memory_fault.size, + vcpu->run->memory_fault.flags == KVM_MEMORY_EXIT_FLAG_PRIVATE); + continue; } else if ( vcpu->run->exit_reason == KVM_EXIT_IO && vcpu->run->io.port == TDX_UPM_TEST_ACCEPT_PRINT_PORT) { @@ -243,8 +250,53 @@ static void guest_upm_explicit(void) tdx_test_success(); } +static void guest_upm_implicit(void) +{ + struct tdx_upm_test_area *test_area_gva_private = + (struct tdx_upm_test_area *)TDX_UPM_TEST_AREA_GVA_PRIVATE; + struct tdx_upm_test_area *test_area_gva_shared = + (struct tdx_upm_test_area *)TDX_UPM_TEST_AREA_GVA_SHARED; + + /* Check: host reading private memory does not modify guest's view */ + fill_test_area(test_area_gva_private, PATTERN_GUEST_GENERAL); + + tdx_test_report_to_user_space(SYNC_CHECK_READ_PRIVATE_MEMORY_FROM_HOST); + + TDX_UPM_TEST_ASSERT( + check_test_area(test_area_gva_private, PATTERN_GUEST_GENERAL)); + + /* Use focus area as shared */ + fill_focus_area(test_area_gva_shared, PATTERN_GUEST_FOCUS); + + /* General areas should not be affected */ + TDX_UPM_TEST_ASSERT( + check_general_areas(test_area_gva_private, PATTERN_GUEST_GENERAL)); + + tdx_test_report_to_user_space(SYNC_CHECK_READ_SHARED_MEMORY_FROM_HOST); + + /* Check that guest has the same view of shared memory */ + TDX_UPM_TEST_ASSERT( + check_focus_area(test_area_gva_shared, PATTERN_HOST_FOCUS)); + + /* Use focus area as private */ + fill_focus_area(test_area_gva_private, PATTERN_GUEST_FOCUS); + + /* General areas should be unaffected by remapping */ + TDX_UPM_TEST_ASSERT( + check_general_areas(test_area_gva_private, PATTERN_GUEST_GENERAL)); + + tdx_test_report_to_user_space(SYNC_CHECK_READ_PRIVATE_MEMORY_FROM_HOST_AGAIN); + + /* Check that guest can use private memory after focus area is remapped as private */ + TDX_UPM_TEST_ASSERT( + fill_and_check(test_area_gva_private, PATTERN_GUEST_GENERAL)); + + tdx_test_success(); +} + static void run_selftest(struct kvm_vm *vm, struct kvm_vcpu *vcpu, - struct tdx_upm_test_area *test_area_base_hva) + struct tdx_upm_test_area *test_area_base_hva, + bool implicit) { vcpu_run(vcpu); TDX_TEST_CHECK_GUEST_FAILURE(vcpu); @@ -263,7 +315,7 @@ static void run_selftest(struct kvm_vm *vm, struct kvm_vcpu *vcpu, TEST_ASSERT(check_test_area(test_area_base_hva, PATTERN_CONFIDENCE_CHECK), "Host should read PATTERN_CONFIDENCE_CHECK from guest's private memory."); - vcpu_run_and_manage_memory_conversions(vm, vcpu); + vcpu_run_and_manage_memory_conversions(vm, vcpu, implicit); TDX_TEST_CHECK_GUEST_FAILURE(vcpu); TDX_TEST_ASSERT_IO(vcpu, TDX_TEST_REPORT_PORT, TDX_TEST_REPORT_SIZE, TDG_VP_VMCALL_INSTRUCTION_IO_WRITE); @@ -280,7 +332,7 @@ static void run_selftest(struct kvm_vm *vm, struct kvm_vcpu *vcpu, TEST_ASSERT(check_focus_area(test_area_base_hva, PATTERN_HOST_FOCUS), "Host should be able to use shared memory."); - vcpu_run_and_manage_memory_conversions(vm, vcpu); + vcpu_run_and_manage_memory_conversions(vm, vcpu, implicit); TDX_TEST_CHECK_GUEST_FAILURE(vcpu); TDX_TEST_ASSERT_IO(vcpu, TDX_TEST_REPORT_PORT, TDX_TEST_REPORT_SIZE, TDG_VP_VMCALL_INSTRUCTION_IO_WRITE); @@ -329,18 +381,20 @@ static void guest_ve_handler(struct ex_regs *regs) TDX_UPM_TEST_ASSERT(!ret); } -static void verify_upm_test(void) +static void verify_upm_test(bool implicit) { struct kvm_vm *vm; struct kvm_vcpu *vcpu; + void *guest_code; vm_vaddr_t test_area_gva_private; struct tdx_upm_test_area *test_area_base_hva; uint64_t test_area_npages; vm = td_create(); td_initialize(vm, VM_MEM_SRC_ANONYMOUS, 0); - vcpu = td_vcpu_add(vm, 0, guest_upm_explicit); + guest_code = implicit ? guest_upm_implicit : guest_upm_explicit; + vcpu = td_vcpu_add(vm, 0, guest_code); vm_install_exception_handler(vm, VE_VECTOR, guest_ve_handler); @@ -379,13 +433,26 @@ static void verify_upm_test(void) td_finalize(vm); - printf("Verifying UPM functionality: explicit MapGPA\n"); + if (implicit) + printf("Verifying UPM functionality: implicit conversion\n"); + else + printf("Verifying UPM functionality: explicit MapGPA\n"); - run_selftest(vm, vcpu, test_area_base_hva); + run_selftest(vm, vcpu, test_area_base_hva, implicit); kvm_vm_free(vm); } +void verify_upm_test_explicit(void) +{ + verify_upm_test(false); +} + +void verify_upm_test_implicit(void) +{ + verify_upm_test(true); +} + int main(int argc, char **argv) { /* Disable stdout buffering */ @@ -397,5 +464,6 @@ int main(int argc, char **argv) return 0; } - run_in_new_process(&verify_upm_test); + run_in_new_process(&verify_upm_test_explicit); + run_in_new_process(&verify_upm_test_implicit); }