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 mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52180ECAAD8 for ; Tue, 20 Sep 2022 04:25:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id BC7934B64C; Tue, 20 Sep 2022 00:25:57 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22o80q0PiB80; Tue, 20 Sep 2022 00:25:56 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 8EA494B649; Tue, 20 Sep 2022 00:25:56 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 21C544B645 for ; Tue, 20 Sep 2022 00:25:56 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rm1wNvqQvkGW for ; Tue, 20 Sep 2022 00:25:54 -0400 (EDT) Received: from mail-ot1-f73.google.com (mail-ot1-f73.google.com [209.85.210.73]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id B8CD64B636 for ; Tue, 20 Sep 2022 00:25:54 -0400 (EDT) Received: by mail-ot1-f73.google.com with SMTP id i12-20020a05683033ec00b0065409010fb1so744142otu.14 for ; Mon, 19 Sep 2022 21:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date; bh=itG2ao8v2MUUEvmstjr2ZRfqvTnaq3pX8oeHEmsTjAo=; b=NQQUlgSl3z8EgEAWD4fFENkrAVqJ3NMt/dWXDXVRqEyga66A+c2RxasfDZZpGdq9gO 61kTF0Sod4FNiyv4W0H9+uPyqnmUzBMVMrlp8RlXiTUtVBlTH7budG3m+3iu6rku/wgm CCjsSYSUD+UjYRhAengguGr573CpCULgKGBeEZFN5pz8IB6yprLMt6q6bj3vbSgdPY8F dqzFQr6l8zmRyCMp4Z8CLtWmDU0ziwLMuAA5Ni9FACkxz+5V+rwiXT9VI+ZIk0Jn6Dlu uBZ2MjoNjLqu57wBVchatHimpljTtkZY+8+8ds34M/X+gVQW2kQzE4d6XVzE6SKoPU4B 8jwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date; bh=itG2ao8v2MUUEvmstjr2ZRfqvTnaq3pX8oeHEmsTjAo=; b=sC5YAFML0FhqUH7PwsexLa3INxiNwOIz85mVntjNAvk0vIgsHlSh67IM8g1BfOrluW Nu1cE6OLhwL7CtLDvGqALalk3gfEV8XKFfT186/L/Z4Z/OKY9v84ZLZ6/E3/HXXbYkKe PFrdkcttvf1gBN94JCscocevW7iSeyaD8TzSjO16qW2rpGPm4wC50OimldN1rky08+Vn TgXRoSODmsqO+xkK2/0fHC7A/IgcwlErF2/jqJKC6IFujnTvbai6Uxaq3KpFdZv7IMCu Y6ESJzZxvCECfaiW7RNn4XIPgBWru3CYdRdvYu7kw+Sy5UpOXI45OOKZKB5oOG+Xdd63 g6RA== X-Gm-Message-State: ACrzQf3ijQR/CZ6WPNISjxF1Sxj9Noee5Jdfzd1LF6Fz9n3YKOc7f0Qc Jo2PAVY3woLeQBiWI+0CcofhedQCC79Haw== X-Google-Smtp-Source: AMsMyM7O0cGm6mZtCj1unmwPVKtnh8r8Hsr8XvTWd1lkRnH0s3j77aMnot4UPXSutX3KSeV9OGi2Av7xbdIovw== X-Received: from ricarkol4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:1248]) (user=ricarkol job=sendgmr) by 2002:a05:6870:d6a9:b0:127:fb20:c5c0 with SMTP id z41-20020a056870d6a900b00127fb20c5c0mr950127oap.175.1663647954000; Mon, 19 Sep 2022 21:25:54 -0700 (PDT) Date: Tue, 20 Sep 2022 04:25:38 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog Message-ID: <20220920042551.3154283-1-ricarkol@google.com> Subject: [PATCH v7 00/13] KVM: selftests: Add aarch64/page_fault_test From: Ricardo Koller To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, andrew.jones@linux.dev Cc: maz@kernel.org, bgardon@google.com, pbonzini@redhat.com, axelrasmussen@google.com, dmatlack@google.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu This series adds a new aarch64 selftest for testing stage 2 fault handling for various combinations of guest accesses (e.g., write, S1PTW), backing sources (e.g., anon), and types of faults (e.g., read on hugetlbfs with a hole, write on a readonly memslot). Each test tries a different combination and then checks that the access results in the right behavior (e.g., uffd faults with the right address and write/read flag). Some interesting combinations are: - loading an instruction leads to a stage 1 page-table-walk that misses on stage 2 because the backing memslot for the page table it not in host memory (a hole was punched right there) and the fault is handled using userfaultfd. The expected behavior is that this leads to a userfaultfd fault marked as a write. See commit c4ad98e4b72c ("KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch") for why that's a write. - a cas (compare-and-swap) on a readonly memslot leads to a failed vcpu run. - write-faulting on a memslot that's marked for userfaultfd handling and dirty logging should result in a uffd fault and having the respective bit set in the dirty log. The first 8 commits of this series add library support. The first one adds a new userfaultfd library. Commits 2-5 add some misc library changes that will be used by the new test, like a library function to get the GPA of a PTE. Commits 6-8 breaks the implicit assumption that code and page tables live in memslot memslots should allocators use. This is then used by the new test to place the page tables in a specific memslot. The last 5 commits add the new selftest, one type of test at a time. It first adds core tests, then uffd, then dirty logging, then readonly memslots tests, and finally combinations of the previous ones (like uffd and dirty logging at the same time). v6 -> v7: https://lore.kernel.org/kvmarm/Yyi03sX5hx36M%2FZr@google.com/ - removed struct kvm_vm_mem_params. Changed page_fault_test.c accordingly. [Sean] - applied Oliver's patch to fix page_fault_test compilation warnings. [Oliver] - added R-b's from Oliver and Andrew. Didn't Andrew's R-b on 6/13 as the commit changed afterwards. v5 -> v6: https://lore.kernel.org/kvmarm/20220823234727.621535-1-ricarkol@google.com/ - added "enum memslot_type" and all the related cleanups due to it [Andrew] - default kvm_vm_mem_default with size=0 [Andrew,Sean] - __vm_vaddr_alloc() taking "enum memslot_type" and all the related cleanups due to this change [Andrew] v4 -> v5: https://lore.kernel.org/kvmarm/20220624213257.1504783-1-ricarkol@google.com/ - biggest change: followed suggestion from Sean and Andrew regarding a new arg for vm_create() to specify the guest memory layout. That's taken care of with these two new commits: KVM: selftests: Use the right memslot for code, page-tables, and data allocations KVM: selftests: Change ____vm_create() to take struct kvm_vm_mem_params plus the respective changes in the page_fault_test itself (mostly code reduction). - dropped some commits that are not needed after the above change: KVM: selftests: aarch64: Export _virt_pg_map with a pt_memslot arg KVM: selftests: Add vm_alloc_page_table_in_memslot library function KVM: selftests: Add vm_mem_region_get_src_fd library function - addressed Oliver comments in commit "KVM: selftests: aarch64: Add aarch64/page_fault_test" - collect r-b's from Andrew Ricardo Koller (13): KVM: selftests: Add a userfaultfd library KVM: selftests: aarch64: Add virt_get_pte_hva() library function KVM: selftests: Add missing close and munmap in __vm_mem_region_delete() KVM: selftests: aarch64: Construct DEFAULT_MAIR_EL1 using sysreg.h macros tools: Copy bitfield.h from the kernel sources KVM: selftests: Stash backing_src_type in struct userspace_mem_region KVM: selftests: Add vm->memslots[] and enum kvm_mem_region_type KVM: selftests: Use the right memslot for code, page-tables, and data allocations KVM: selftests: aarch64: Add aarch64/page_fault_test KVM: selftests: aarch64: Add userfaultfd tests into page_fault_test KVM: selftests: aarch64: Add dirty logging tests into page_fault_test KVM: selftests: aarch64: Add readonly memslot tests into page_fault_test KVM: selftests: aarch64: Add mix of tests into page_fault_test tools/include/linux/bitfield.h | 176 +++ tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 2 + .../selftests/kvm/aarch64/page_fault_test.c | 1116 +++++++++++++++++ .../selftests/kvm/demand_paging_test.c | 228 +--- .../selftests/kvm/include/aarch64/processor.h | 35 +- .../selftests/kvm/include/kvm_util_base.h | 29 +- .../selftests/kvm/include/userfaultfd_util.h | 45 + .../selftests/kvm/lib/aarch64/processor.c | 26 +- tools/testing/selftests/kvm/lib/elf.c | 3 +- tools/testing/selftests/kvm/lib/kvm_util.c | 82 +- .../selftests/kvm/lib/riscv/processor.c | 7 +- .../selftests/kvm/lib/s390x/processor.c | 7 +- .../selftests/kvm/lib/userfaultfd_util.c | 186 +++ .../selftests/kvm/lib/x86_64/processor.c | 13 +- 15 files changed, 1698 insertions(+), 258 deletions(-) create mode 100644 tools/include/linux/bitfield.h create mode 100644 tools/testing/selftests/kvm/aarch64/page_fault_test.c create mode 100644 tools/testing/selftests/kvm/include/userfaultfd_util.h create mode 100644 tools/testing/selftests/kvm/lib/userfaultfd_util.c -- 2.37.3.968.ga6b4b080e4-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm