From patchwork Tue Jul 18 23:45:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13317890 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 1A2E2C04A6A for ; Tue, 18 Jul 2023 23:49:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87C96280013; Tue, 18 Jul 2023 19:49:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8059E8D0012; Tue, 18 Jul 2023 19:49:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67B9A280013; Tue, 18 Jul 2023 19:49:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 54A3B8D0012 for ; Tue, 18 Jul 2023 19:49:15 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2C5721A042D for ; Tue, 18 Jul 2023 23:49:15 +0000 (UTC) X-FDA: 81026376270.10.A68D201 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf11.hostedemail.com (Postfix) with ESMTP id 446C740007 for ; Tue, 18 Jul 2023 23:49:13 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=2IP+YPfx; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3-CS3ZAYKCEs5rn0wpt11tyr.p1zyv07A-zzx8npx.14t@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3-CS3ZAYKCEs5rn0wpt11tyr.p1zyv07A-zzx8npx.14t@flex--seanjc.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689724153; h=from:from:sender:reply-to: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=pGQ5gVRuMnBz+jdxpSwzxuVc9EOZlP96OVaeomtmpkk=; b=5fg0nBEiP1xjsnqZr7EL/RJ7QgOP7xxqIpse6GLKeWfdufFQEx7trx5t8BsO2nbSNYGlQd Ddr6EF0xRQ2dYmIf9x21OYKtbpZBE/e1Dfi5PlAKEkM257E3jAufc3NEW68zWEwH7nTQcy vTTRYWDrFevxfLlYNO05vTtgjHTeDEE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=2IP+YPfx; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3-CS3ZAYKCEs5rn0wpt11tyr.p1zyv07A-zzx8npx.14t@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3-CS3ZAYKCEs5rn0wpt11tyr.p1zyv07A-zzx8npx.14t@flex--seanjc.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689724153; a=rsa-sha256; cv=none; b=ZnIhxfjyvCwDT5HPXfSp9sn6KUVsp42dRZWZd0ObWRTcuQtT3w4DFw63Jyxx4JQh1IFXum 1Wo3534Pg9G5o/eCAm7RVwe9q8+LNnPPqydHG3tUQtO2LztjKxp/M6usqVW+98wuqe04X7 EH12zMcK3Oj52iWfNJcG20QhIGnINSI= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b8a44ee130so32272325ad.1 for ; Tue, 18 Jul 2023 16:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689724152; x=1692316152; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=pGQ5gVRuMnBz+jdxpSwzxuVc9EOZlP96OVaeomtmpkk=; b=2IP+YPfxNvjiaW9VMbkPph4zWt8don45lFKbHWgoQYVJCSZxgSAoTrJwRk0xU3bSB/ sJB5qD3FZVt8Ze6IV9hIaNYVvM6HbxMbldM07upaECnO4CedX1dugCNr5s9x/FmwtvtO si2av9K7pfZJ/7gTkPujf/XMubSer7Qe7Hk25O62UufmOcyJqVk+8eCPNK70zpezhYfY A9rO9H29+732lNEvb2WPSKb4tVXPWyzzY8EtOEkscIvFTwv6KnE4TjP9uoIgqNV/+oaA QzM/AXzRRDUz2a5t+BshOVSOVX+X2P43Bg9zMlMkd6w4tV0d4azrL5OFMA3XvIN7BoSE 3brg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689724152; x=1692316152; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pGQ5gVRuMnBz+jdxpSwzxuVc9EOZlP96OVaeomtmpkk=; b=QvPvs75cbJnX6N0Rpin+E3SYF8XR/8n49UdtLJ4M3P+btk9bkdSutzSPNLUb5IHmSC NWyCU7LbtJn0LJQtBV4B3AaQ+/hU6YZsY/1kagNH5B3cDoYfAfik9vf9uttU1QdcudMp dK+WKAIppMl+tdQNRzii8qCVhGZHbEmPFxhzHNEW7shP2wAHiRShF/8liASEuk9lJw6G +p5NR+q8/inx7A3L6Z61xf1BoZcS833AyH0UxXODAER+nBDwCr781VONyl/UO10Ttm5e quHF1O+oAPXXlAo1n6pRfF+5vKG/k+byQ0TKR4G4UaoLrWSO6N++QHuA0k3pec3NEI6h C7AA== X-Gm-Message-State: ABy/qLbi6x10EtQve6n5oA4cyfHri/Wh3is92irNVxuyMX17+3gl2yTe UdTBXb7VJbi6RDDesABwja8Rd+gWMsc= X-Google-Smtp-Source: APBJJlGQidXExDXOvSIttpWwi+Oy77zoM8uyPE3vIg+QQ5r0vSYyBiY+n22aaCj4624S2+uneMtj6gNdfj0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:e841:b0:1b5:2b14:5f2c with SMTP id t1-20020a170902e84100b001b52b145f2cmr6941plg.4.1689724152040; Tue, 18 Jul 2023 16:49:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 18 Jul 2023 16:45:04 -0700 In-Reply-To: <20230718234512.1690985-1-seanjc@google.com> Mime-Version: 1.0 References: <20230718234512.1690985-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230718234512.1690985-22-seanjc@google.com> Subject: [RFC PATCH v11 21/29] KVM: selftests: Add helpers to convert guest memory b/w private and shared From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , "Matthew Wilcox (Oracle)" , Andrew Morton , Paul Moore , James Morris , "Serge E. Hallyn" Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Peng , Fuad Tabba , Jarkko Sakkinen , Yu Zhang , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , Vlastimil Babka , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" X-Rspamd-Queue-Id: 446C740007 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: pi3r7kj5jnky47edooi8fbzy7afizhik X-HE-Tag: 1689724153-147556 X-HE-Meta: U2FsdGVkX1+Ftid+Sb9aPA3L6oxUNZizMM2H4QmUVjavGYNs4miTpeazQ8t3rMfyfVAEQars3ACJYEuZ9B4QSp7hsrsHrEYPDF3HZnAB7TEQjBWcritcnqsbpaipBuYqBhhvW+dKshnQK0ZeslDzYUKu6b0SPKluKUIHZ/XGs1IEl17tODNVu9LNOqi9nLG4ab0hCPP7/ggNDYLvQM9SJ+55cSRtcO6Rg0dZ68/ZXcWPGu/ehNqmW1tAwizY3b8mOILlWq4EflxVcNAiHtp3d5Bb2lirtpNL7VZ+iNfsrIO/OOWi5Md3wRwlfBave/wrke/JuxIU/ZjGkqXCdy9YYMZTXSc90qF/krpz/t8J/2Ubt5XQAampyROSnRZkKthzO49CsnwrUufaaO45kotpKCIan2PCaAIu9D6NoS6ZBszd1HJt0NzUdRkN1ZazZ1WSiRNu22RjtaQQggPEOzgpylYR6mQeU5WhzK46zGdgsiLNpURj2Ql8NSH6tVmbEn3Zp9SpazHz7BLNf/kV7v+4KrRg9RHNEnRuFFAXZVm8ZtiKT1mfbGEud/UUhI7OW3IN5iLj5DiUvGH0hxrrz35cmy5IHn1+es95//AzVTw9T3rKXYfg8rW4MBszlDfVYh3w8Pd9Kz8VOvFnGj4eymBWWH1kEgQLfq0COLqyJlmUe//m9otruw5hHSPG5gbFLJDePuBfOzpnsd3Hp9rXC9L2Wimgsiug8o/wqfIzYPhJ/ZYvh1M0550/1nErsNWAX8s9Gp3+D5VFWkSndgUwIWYCFlVvEdiI3Fb/0J4EzZPn5HVu/GaWFrMAnRwVPP5axFyT7EOBfYx8fR4yUl3fozU7vxbKfa6e3gqLuP/uqMKG8xW6tlldJA33EDBaIYFHHa73QsUcRVZHnsvV4NNLn+THdfktZdk0zUDjEehREjokV1K/Wlmuhe7VsvbuO/+WYp1pVShmvf6jzs9y0Ef/tI6 7m6qVfBm wX6UQsBiC22EzS2AnB+ITyIiUWbmpFkiExA2GauWUg3hh57Yhz0tDnwQ4RAhzzReuXfivy20mGW4h2tEh8unLRKtidhvCaqxeplW7GJ6qNJulFOP8tTGimwl30qVBI8huomBNrAs/s4Ptx2VQ0jl3t0a/kMYjMJX6Gmu91K9Pt0RLPxZCYhRuUhws+Cn1aoROanlTw1fP2xOtxLfwU4NkZ6JEl3o1Jo9vfnOSdi6OlT5efj57c/edYy15nHt5z7x8bymlCUaO2v3DIDU+f18GipTmURfFD5HNzqcW1SSTdGqtpXTe/ZgEt3osssuEHrVsH2crv/V+NlEmZW3RteXZ/fB4cI8KXllVwBtuf6rNiHJS7yydZmWuAw5qdaN41w3yaTHayp8ThPmG7RYo2qcCadbGDpXcoL7AskAD9Ooir/dnT/raFOwC736zWnCaGZ+wEV+tVG0hipPDJQCDWJMa2Irl7r4pbGW0OPICKtR3Ml3CVPXCmmR+XsCvqT2bPW2cmW0Ep154Bw3/9gRJAPHq9GkNnuGQldjNyOXC16OU3N5gmQ0XGiicmjRDjguCJxZo96/SBTwN0439w/dvBqjEH4ZPcKXUp1rizm/eH9oEGKVeFjUF7P51ptuAmL4FU9Z1v6jtx8TvDP7E3S+DbSuBi2v4eXIjfQ1s77z5K+KQHa5Ujqj9UEwbKLHZHEsShgBH6ICgcgzPl1sr+MLat5mwmj9MBTmN78YN9w6hDq3bMR9VsyVKgBFt1Zoxh/mtzSEJ9LTaos509efBIr0= 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: From: Vishal Annapurve Signed-off-by: Vishal Annapurve Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 48 +++++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 26 ++++++++++ 2 files changed, 74 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index f1de6a279561..1819787b773b 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -312,6 +312,54 @@ static inline void vm_enable_cap(struct kvm_vm *vm, uint32_t cap, uint64_t arg0) vm_ioctl(vm, KVM_ENABLE_CAP, &enable_cap); } +static inline void vm_set_memory_attributes(struct kvm_vm *vm, uint64_t gpa, + uint64_t size, uint64_t attributes) +{ + struct kvm_memory_attributes attr = { + .attributes = attributes, + .address = gpa, + .size = size, + .flags = 0, + }; + + /* + * KVM_SET_MEMORY_ATTRIBUTES overwrites _all_ attributes. These flows + * need significant enhancements to support multiple attributes. + */ + TEST_ASSERT(!attributes || attributes == KVM_MEMORY_ATTRIBUTE_PRIVATE, + "Update me to support multiple attributes!"); + + vm_ioctl(vm, KVM_SET_MEMORY_ATTRIBUTES, &attr); +} + + +static inline void vm_mem_set_private(struct kvm_vm *vm, uint64_t gpa, + uint64_t size) +{ + vm_set_memory_attributes(vm, gpa, size, KVM_MEMORY_ATTRIBUTE_PRIVATE); +} + +static inline void vm_mem_set_shared(struct kvm_vm *vm, uint64_t gpa, + uint64_t size) +{ + vm_set_memory_attributes(vm, gpa, size, 0); +} + +void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t gpa, uint64_t size, + bool punch_hole); + +static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, uint64_t gpa, + uint64_t size) +{ + vm_guest_mem_fallocate(vm, gpa, size, true); +} + +static inline void vm_guest_mem_allocate(struct kvm_vm *vm, uint64_t gpa, + uint64_t size) +{ + vm_guest_mem_fallocate(vm, gpa, size, false); +} + void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size); const char *vm_guest_mode_string(uint32_t i); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index b93717e62325..1283e24b76f1 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1171,6 +1171,32 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot) __vm_mem_region_delete(vm, memslot2region(vm, slot), true); } +void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t gpa, uint64_t size, + bool punch_hole) +{ + struct userspace_mem_region *region; + uint64_t end = gpa + size - 1; + off_t fd_offset; + int mode, ret; + + region = userspace_mem_region_find(vm, gpa, gpa); + TEST_ASSERT(region && region->region.flags & KVM_MEM_PRIVATE, + "Private memory region not found for GPA 0x%lx", gpa); + + TEST_ASSERT(region == userspace_mem_region_find(vm, end, end), + "fallocate() for guest_memfd must act on a single memslot"); + + fd_offset = region->region.gmem_offset + + (gpa - region->region.guest_phys_addr); + + mode = FALLOC_FL_KEEP_SIZE | (punch_hole ? FALLOC_FL_PUNCH_HOLE : 0); + + ret = fallocate(region->region.gmem_fd, mode, fd_offset, size); + TEST_ASSERT(!ret, "fallocate() failed to %s at %lx[%lu], fd = %d, mode = %x, offset = %lx\n", + punch_hole ? "punch hole" : "allocate", gpa, size, + region->region.gmem_fd, mode, fd_offset); +} + /* Returns the size of a vCPU's kvm_run structure. */ static int vcpu_mmap_sz(void) {