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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80D6AC46467 for ; Tue, 10 Jan 2023 17:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238160AbjAJREV (ORCPT ); Tue, 10 Jan 2023 12:04:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238731AbjAJREI (ORCPT ); Tue, 10 Jan 2023 12:04:08 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F27E479F9 for ; Tue, 10 Jan 2023 09:04:05 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id w185-20020a6382c2000000b004b1fcf39c18so3339400pgd.13 for ; Tue, 10 Jan 2023 09:04:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=y8Ws5IUpXIyeNK/XDOwuvqUqUTKu8gu/OI2LdlzUr+E=; b=gZVxF/BfVlRdNYXvJyQ6RaZ7II5GGqwItg0GdnKWPUevuCVgZ/ywpOqZEqAAFHm4Hk OfVySUb20PeRm7NOIK/I+bP79UQh0VALmRZCKjEwkdO54WkeN2ZdRZN/lO3WYiPBZ7+Q uaiHd4zj8VWaHvnApQJRLuqwWvzVE7BfBaW3AgPvI7UD36ykM3bruVohqF6ECmymNNBW KmWESbetIQUGBAAZ2JE04V2CFWQVu3aRI4/SiRxxawxqZLf7SoduCXd0Lrx4vARkHWF/ FbU1WDw+j029R0MvUn6L2QEPPS9oFEKKyE0g38r+Lwv4ZZmIbk0mEqdZL67vYjVpC6Om PGWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=y8Ws5IUpXIyeNK/XDOwuvqUqUTKu8gu/OI2LdlzUr+E=; b=ZSQFK74JP9aswgsqzoIhL76z5Qa1bO4N0ctI+stWQMx0c7ZnW2Ayew1nK1qs/PZ8nt xgBCI5fdKRZ7wExpvO4c4nconRWzspLtQ2xI4mzfEOvFBkF+V+pH01JJUw93wVJJiChU uoDwPtGw2jjS1t+3vYhIZFRFq19esWGCI7wiuPVNKT+mNZmTlmKZWvsrE881oB2qA4S/ rqPtH/mtnu3wSbaSkOpeAUEyyfiIk3JmTz/nNyHmHmFxAreOG+vA39ektuys3LNeWy5V PnrpXcOX3prlA5SokumQ6kArDD8i+i2yWpFRUD2u4vRNhQM2Nkv8nm2ixgO1QX8rFtfW tNLg== X-Gm-Message-State: AFqh2krCX81TBCDnMJ21P64b92UoaO8g1Innh6LajmahoxDQdUJqq9yv G7IWCqG0zRiRlywuld4oSMZKW7n7ljcExbHxiYBOWbcH9JJ73wYlkqKFhfWrYdnvbY8Bh8cWV46 bJVhx0JuHmSNa/WW/s1vZUvTaSvA+yxPiAPoJ1xX3jSJ90doQxXlOcORyWw== X-Google-Smtp-Source: AMrXdXvlZhL3goSDj1HZohFk5h5owOCC5IfcErxsRF65ck1Qw/ngnjeT3pk3EYcQEglM12ywX+MaqQxBr40= X-Received: from pgonda1.kir.corp.google.com ([2620:0:1008:11:8358:4c2a:eae1:4752]) (user=pgonda job=sendgmr) by 2002:a17:902:704a:b0:189:f708:9b6e with SMTP id h10-20020a170902704a00b00189f7089b6emr4156140plt.20.1673370244904; Tue, 10 Jan 2023 09:04:04 -0800 (PST) Date: Tue, 10 Jan 2023 09:03:53 -0800 In-Reply-To: <20230110170358.633793-1-pgonda@google.com> Message-Id: <20230110170358.633793-3-pgonda@google.com> Mime-Version: 1.0 References: <20230110170358.633793-1-pgonda@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH V6 2/7] KVM: selftests: add hooks for managing protected guest memory From: Peter Gonda To: kvm@vger.kernel.org Cc: Peter Gonda , Paolo Bonzini , Sean Christopherson , Vishal Annapurve , Ackerly Tng , Andrew Jones , Michael Roth Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add kvm_vm.protected metadata. Protected VMs memory, potentially register and other state may not be accessible to KVM. This combined with a new protected_phy_pages bitmap will allow the selftests to check if a given pages is accessible. Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Vishal Annapurve Cc: Ackerly Tng cc: Andrew Jones Originally-by: Michael Roth Signed-off-by: Peter Gonda --- .../selftests/kvm/include/kvm_util_base.h | 14 ++++++++++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index fbc2a79369b8..015b59a0b80e 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -45,6 +45,7 @@ typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */ struct userspace_mem_region { struct kvm_userspace_memory_region region; struct sparsebit *unused_phy_pages; + struct sparsebit *protected_phy_pages; int fd; off_t offset; enum vm_mem_backing_src_type backing_src_type; @@ -111,6 +112,9 @@ struct kvm_vm { vm_vaddr_t handlers; uint32_t dirty_ring_size; + /* VM protection enabled: SEV, etc*/ + bool protected; + /* Cache of information for binary stats interface */ int stats_fd; struct kvm_stats_header stats_header; @@ -679,10 +683,16 @@ const char *exit_reason_str(unsigned int exit_reason); vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min, uint32_t memslot); -vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, - vm_paddr_t paddr_min, uint32_t memslot); +vm_paddr_t _vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, + vm_paddr_t paddr_min, uint32_t memslot, bool protected); vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm); +static inline vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, + vm_paddr_t paddr_min, uint32_t memslot) +{ + return _vm_phy_pages_alloc(vm, num, paddr_min, memslot, vm->protected); +} + /* * ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also * loads the test binary into guest memory and creates an IRQ chip (x86 only). diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 56d5ea949cbb..63913b219b42 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -663,6 +663,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm, vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->region); sparsebit_free(®ion->unused_phy_pages); + sparsebit_free(®ion->protected_phy_pages); ret = munmap(region->mmap_start, region->mmap_size); TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret)); if (region->fd >= 0) { @@ -1010,6 +1011,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->backing_src_type = src_type; region->unused_phy_pages = sparsebit_alloc(); + region->protected_phy_pages = sparsebit_alloc(); sparsebit_set_num(region->unused_phy_pages, guest_paddr >> vm->page_shift, npages); region->region.slot = slot; @@ -1799,6 +1801,10 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) region->host_mem); fprintf(stream, "%*sunused_phy_pages: ", indent + 2, ""); sparsebit_dump(stream, region->unused_phy_pages, 0); + if (vm->protected) { + fprintf(stream, "%*sprotected_phy_pages: ", indent + 2, ""); + sparsebit_dump(stream, region->protected_phy_pages, 0); + } } fprintf(stream, "%*sMapped Virtual Pages:\n", indent, ""); sparsebit_dump(stream, vm->vpages_mapped, indent + 2); @@ -1895,8 +1901,9 @@ const char *exit_reason_str(unsigned int exit_reason) * and their base address is returned. A TEST_ASSERT failure occurs if * not enough pages are available at or above paddr_min. */ -vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, - vm_paddr_t paddr_min, uint32_t memslot) +vm_paddr_t _vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, + vm_paddr_t paddr_min, uint32_t memslot, + bool protected) { struct userspace_mem_region *region; sparsebit_idx_t pg, base; @@ -1929,8 +1936,11 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, abort(); } - for (pg = base; pg < base + num; ++pg) + for (pg = base; pg < base + num; ++pg) { sparsebit_clear(region->unused_phy_pages, pg); + if (protected) + sparsebit_set(region->protected_phy_pages, pg); + } return base * vm->page_size; } -- 2.39.0.314.g84b9a713c41-goog