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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A05F4C433FE for ; Thu, 10 Mar 2022 16:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244032AbiCJQre (ORCPT ); Thu, 10 Mar 2022 11:47:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243782AbiCJQrD (ORCPT ); Thu, 10 Mar 2022 11:47:03 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82B0C166E18 for ; Thu, 10 Mar 2022 08:46:00 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id mm2-20020a17090b358200b001bf529127dfso3587216pjb.6 for ; Thu, 10 Mar 2022 08:46:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=HE/O3qBQQfnPa9lv9g/YI8j6lgpbZMJt6yutRPg7j9Q=; b=gjhVEZBWgspIP5DNAIFWgNX2IvJP8JGW6Yct9xx1sK/5MdGUB4jGY92bvVLTZN1y5/ y2qddS+NrTMk2I8fBC5P0IM0qmEkxgHyiXeSz0NjvBxa/CyY5LDaV/ixSOgel/gy242A fmzJqK6XATiUeGaaQNnNhn0e7vFQzhuM9l7KUcz6nkqzfB9+T1WRYr+HWeVZWD/ARc6P Nixg/hw6f18RKJceYFF+iha5C+WICFcj3ZTuOFJ6hwqLrNg8Fs4VIs3uoRymkWHv20H7 5ppVl1COVwNvGfSaHO/AEKOxciOnn3wN7P2wIlsM93lmJ0z0QB0NsxyiFU9z51BHA+MF cb/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=HE/O3qBQQfnPa9lv9g/YI8j6lgpbZMJt6yutRPg7j9Q=; b=Pe+wTBeUeWTGfk7wngBoUk58taC+5FfR19RWKeNYDjhbZdHCMc9DszM/Ha67yjzFsq LVYjmcFdgrScZNR6ypYTBbaSMtSaVk1mGK53GSDUSzPTYNKTG23gajQy3W7i3jjCYXd5 rCMqLQKXnUxuQ56XmseePbpUQALrBoQ8iP21Xs9wr0sHSe6B/psAB4T8Gl9Re35HyyB9 8V5/FJ1wG4Hh31wHGbZCsPIDE4DGPeE5wrRqmUYMDlcu9PxmN2kd968KcL0bSOOE3aGU 0gJSJ5CrbUVkKslRdS2ZVbeZ/WXYCakv3/kgl39odU0RfExLtFDaRwlvjhrMgsQUO+9g Ib2g== X-Gm-Message-State: AOAM533VVGVnzVP9DyoKpdBf+E6x/ty+FxBy6CNdqFWWlZYGVJS7iiqg 45P5aZPq0TCsTvefD1FjXlVACaul/aQzkWnUaC575/ZTE7zXvYtJGsV764rYZTPhGv4Z4XfNP2j nppGJxWS67pFN6JQd/+zrlsTymhTsFLDapVKTy6Sw9uyPCGdKGyIatH0cqvjHkgqWE2u2szwO X-Google-Smtp-Source: ABdhPJyP2U6eXcpKoU609bxDuH9KIVdIW7MM6n5M6Llu2IiV8JWI/DEzXvpus840lRSgOzEOBsPWl1gFn32c X-Received: from bgardon.sea.corp.google.com ([2620:15c:100:202:2d58:733f:1853:8e86]) (user=bgardon job=sendgmr) by 2002:a62:5251:0:b0:4f6:ff68:50c2 with SMTP id g78-20020a625251000000b004f6ff6850c2mr5592924pfb.63.1646930759610; Thu, 10 Mar 2022 08:45:59 -0800 (PST) Date: Thu, 10 Mar 2022 08:45:24 -0800 In-Reply-To: <20220310164532.1821490-1-bgardon@google.com> Message-Id: <20220310164532.1821490-6-bgardon@google.com> Mime-Version: 1.0 References: <20220310164532.1821490-1-bgardon@google.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog Subject: [PATCH 05/13] selftests: KVM: Add memslot parameter to elf_load From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , David Matlack , Jim Mattson , David Dunn , Jing Zhang , Junaid Shahid , Ben Gardon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently elf_load loads code into memslot 0. Add a parameter to allow loading code into any memslot. This will be useful for backing code pages with huge pages in future commits. No functional change intended. Signed-off-by: Ben Gardon --- tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/hardware_disable_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util_base.h | 3 ++- tools/testing/selftests/kvm/lib/elf.c | 4 ++-- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c index 4c5f6814030f..c3d5227a740e 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c @@ -77,7 +77,7 @@ int main(void) struct ucall uc; vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR); - kvm_vm_elf_load(vm, program_invocation_name); + kvm_vm_elf_load(vm, program_invocation_name, MEMSLOT(0)); ucall_init(vm, NULL); vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init); diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index 1241c9a2729c..fe1054897ee2 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -686,7 +686,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid, pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode)); vm = vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR); - kvm_vm_elf_load(vm, program_invocation_name); + kvm_vm_elf_load(vm, program_invocation_name, MEMSLOT(0)); #ifdef __x86_64__ vm_create_irqchip(vm); #endif diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c index b21c69a56daa..4f699781e065 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -105,7 +105,7 @@ static void run_test(uint32_t run) CPU_SET(i, &cpu_set); vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR); - kvm_vm_elf_load(vm, program_invocation_name); + kvm_vm_elf_load(vm, program_invocation_name, MEMSLOT(0)); vm_create_irqchip(vm); pr_debug("%s: [%d] start vcpus\n", __func__, run); diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index f70dfa3e1202..530b5272fae2 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -131,7 +131,8 @@ uint32_t kvm_vm_reset_dirty_ring(struct kvm_vm *vm); int kvm_memcmp_hva_gva(void *hva, struct kvm_vm *vm, const vm_vaddr_t gva, size_t len); -void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename); +void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename, + struct kvm_memslot memslot); int kvm_memfd_alloc(size_t size, bool hugepages); void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent); diff --git a/tools/testing/selftests/kvm/lib/elf.c b/tools/testing/selftests/kvm/lib/elf.c index 88d03cb80423..763f489492f1 100644 --- a/tools/testing/selftests/kvm/lib/elf.c +++ b/tools/testing/selftests/kvm/lib/elf.c @@ -111,7 +111,7 @@ static void elfhdr_get(const char *filename, Elf64_Ehdr *hdrp) * by the image and it needs to have sufficient available physical pages, to * back the virtual pages used to load the image. */ -void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename) +void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename, struct kvm_memslot memslot) { off_t offset, offset_rv; Elf64_Ehdr hdr; @@ -163,7 +163,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename) size_t seg_size = seg_vend - seg_vstart + 1; vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart, - MEMSLOT(0)); + memslot); TEST_ASSERT(vaddr == seg_vstart, "Unable to allocate " "virtual memory for segment at requested min addr,\n" " segment idx: %u\n" diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 04abfc7e6b5c..a10bee651191 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -368,7 +368,7 @@ struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) vm = vm_create(mode, pages, O_RDWR); - kvm_vm_elf_load(vm, program_invocation_name); + kvm_vm_elf_load(vm, program_invocation_name, MEMSLOT(0)); #ifdef __x86_64__ vm_create_irqchip(vm); diff --git a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c index ae76436af0cc..3a7783046895 100644 --- a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +++ b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c @@ -90,7 +90,7 @@ static struct kvm_vm *create_vm(void) pages = vm_adjust_num_guest_pages(VM_MODE_DEFAULT, pages); vm = vm_create(VM_MODE_DEFAULT, pages, O_RDWR); - kvm_vm_elf_load(vm, program_invocation_name); + kvm_vm_elf_load(vm, program_invocation_name, MEMSLOT(0)); vm_create_irqchip(vm); return vm; -- 2.35.1.616.g0bdcbb4464-goog