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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C25EDEE0219 for ; Thu, 14 Sep 2023 01:57:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 076F58D000D; Wed, 13 Sep 2023 21:56:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 025C18D0001; Wed, 13 Sep 2023 21:56:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D959D8D000D; Wed, 13 Sep 2023 21:56:38 -0400 (EDT) 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 C27558D0001 for ; Wed, 13 Sep 2023 21:56:38 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9BAF7B42AA for ; Thu, 14 Sep 2023 01:56:38 +0000 (UTC) X-FDA: 81233538876.18.8A4E85A Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf13.hostedemail.com (Postfix) with ESMTP id D0D0420023 for ; Thu, 14 Sep 2023 01:56:36 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="WeKc41/R"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3VGgCZQYKCF0N95IE7BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--seanjc.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3VGgCZQYKCF0N95IE7BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--seanjc.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694656596; 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=SX/tmvtGQjfAKzRzM0R+P9Auz7l4k5LFyR/Je4f49mI=; b=U8aXR0yKGqWGgkpfNHKiNsCDcP80Qbo2wk094OXs88c3YaSSSgFMwwOb1cL54pwAH9FaqU hlqg/3I52QrX7nbgTRYQtAos80jp2reskOczY5l55TB95wlyM7yG+DR56lCt9nIOCEti+i FsPkYAhyL9aP5R/hlEfJ95lbRMddEQs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="WeKc41/R"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3VGgCZQYKCF0N95IE7BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--seanjc.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3VGgCZQYKCF0N95IE7BJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--seanjc.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694656596; a=rsa-sha256; cv=none; b=DQ5vC6XcnG8kIaBvPqDk9Spi9dNE5Vqdk7VCuhzDcDOlROkVchVadceYDc1rplFU0zlyzG nmXKYdtr+pgwtL+JF4fLIbCWvoBIMnpTJNvYmmRSFwhND0JhOVJ3Py2dkQqR8swWL4J0QB eaVFBl8YLW5Y+sVpkpNk1vxqhNLx4c8= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-59b59e1ac70so6842807b3.1 for ; Wed, 13 Sep 2023 18:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694656596; x=1695261396; darn=kvack.org; 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=SX/tmvtGQjfAKzRzM0R+P9Auz7l4k5LFyR/Je4f49mI=; b=WeKc41/RNsGzwSx5ao0iNVplGJPtfwUvl3f4LC9eHdxCUpQBHHWxejQkfGIlWN0l5z 0d/rbTEn1Gnr6T+2W4A7+3hLC766b/J9R6H/dp0x6b65zTvrFsMUuaFgEyKL2MgaumhQ MuGCFZf7UcR0P2TWnKl68b1RREWy+ZlF9RiShip8QcuxAJwMvEiJwujjTjBfMsw20w51 i2d3nUK4OvLPcJ4YHP/aeWjlt3phxhJPAu8uMetMc4xiZBwW3UZbBMem4jdZTwMn9l2u y8mZcEcdQ1f1I2Mi5Wak9W6zcVU+Ch2eqU4CvbQqXIZ36znG6rtAU0tlmYHeUpAherc3 xYQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694656596; x=1695261396; 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=SX/tmvtGQjfAKzRzM0R+P9Auz7l4k5LFyR/Je4f49mI=; b=oTMcEBTS69du7xhf349ZrJXRotfizxi4sjHygt1MKJcNnDVQ+w+MpOLAzLIuDKwPG+ wG2SzQxj1FQ+j8GeHUNECKeW5/6vktU+e0ZnpK4NBAx78eB87Qdh+G/vBNl1AOgcx5cw FlA8DPD0IPftCABHJrKrMeiEle6osrT7vE3bp90xu1pi6E0Id8+W0+wALb/gXt4CTHCK px8Wfu5PWfLwHnEcWOUK3hFz6+8A78q2RuyYm1dofrIyMdr3pa3LIGFyN76qKgdUirAI AoNvFZoECSz3/iq6CRBE2mllWQhwfql7HqkZf2QlWJEX5tr8o/xz1hh/hPS2MLA0WRGA J0GA== X-Gm-Message-State: AOJu0YwrOzCOyWVKzPTemDzQBSLALiNYY90uaHSHU0Ey48q5vtq6fkPv 5lEmrSrIcaFrz2OGa3/2QuHwiWcXfAo= X-Google-Smtp-Source: AGHT+IHERRdQQcWN7mkCNgIgj9nlxuSe44izkSe/zW2QZGFwDrBBBoEw/nSNmj2b/8hHFzwPazIBLLDdPVQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:905:b0:d64:f7ec:6d5d with SMTP id bu5-20020a056902090500b00d64f7ec6d5dmr96462ybb.10.1694656596047; Wed, 13 Sep 2023 18:56:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 13 Sep 2023 18:55:28 -0700 In-Reply-To: <20230914015531.1419405-1-seanjc@google.com> Mime-Version: 1.0 References: <20230914015531.1419405-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230914015531.1419405-31-seanjc@google.com> Subject: [RFC PATCH v12 30/33] KVM: selftests: Add KVM_SET_USER_MEMORY_REGION2 helper 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 , Anish Moorthy , Yu Zhang , Isaku Yamahata , Xu Yilun , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: D0D0420023 X-Stat-Signature: g8qu4ydyu3tj1tna3uszdetcc4ydqws9 X-HE-Tag: 1694656596-420293 X-HE-Meta: U2FsdGVkX19E94BQMU10H6RyplYdubFCdiTrM6T9qbGlPEbfaEH7Mn6TbfKb/iYHdxN78Pu3HQ4hq7aAKOHa2EIEX+bIRw7zTzfXtU2EPhDOcZ930+22Q0eAEsgn+4GFCajToRSm1djLEP7Qpv+evB4A1y7ccO/wmkzMIsm6a8OoyBM/c+U1mx/hgPcPOVl4VtQlVSnobG5RFQ6AQ5r+9Y4Wa+cQwqxmC9q6NBhhlSUcH1MjxieQukyAOyPUG/D1C8rFkwfouIwWUqnJb/KBmJmBrSGv73qMjYXn15QWSNtOQC45UFZpqj1B2OtmTMuf9tokNC3KX5btNICrjRBx89gxVzYvv4zdj8NXEjJdVdSRXwaAVsizoL37MB6mIhg1Gps131Y60noaR7icdOEa2tJg/FUNFqDbh7dnlaUJOGNLxqkBv5P0IYp/NbXMrps6wHrrELaJO6fjwKGb9h/YHM4AwpDd0ApouwH+MIIclznwYlhradiPXDmp4OVAZGWZCgUkMqtvEpu0W7PSqr4uBNuBCux0Fc+QfPv58lfnJE2eRAEeOmX1QUWHHEmjqydZiY8ankbPus2YjdLj3iFCJNWtkhxfAi5rm5/zWiasPHx2HFQc0hngzvUNuQSWKoGOLNaNtLmIssfvQ9KnGTNknKc9INHz6mV5Lgx6diiSSF0aYazXDEJhn4fZPjz9nQOXlSwfZ6L4BEVY+mPcyob5jj7CnF8SbPdd12DfcOeaJWr3XoaLj5UYs3Yz79xdJinC+6cM3F5DAn70tBXkSaV9kjb1Sxyf5WULSkWkd2LuR6rzLEQoZo/0+8kyjQ+aAj34HlbJS96w/Hvw1sP7Q9RU+Iybyt+UZZIfPY8G1VQNt9sPR1NEjCQ5rdpZ9MLzjmFwi5cbfXi2jJVK5/KjiU8QLmaXZ0Xe3BQH8Dadso3TVqQ+UPlznhxuEQkrzgiZ9SR6mRO/dx4LOjEB7YF6JjH NH8pqMHQ SS02bAOOvAZ4yhvKcxw9nd6xBZW2XETXFgn1h2jbEwKBfVjOBfprWeyon/+4pQj6Qyq0WK4T3wOVeo7xGu4aDesiBvQCHgHtD6fMqHCLxa/jdqhREpwi07bmLTQQX+uBHYCWPo4y8N9ngoLr0gfw+c2fw8Z7lO4sf+TfzDVvOmG4Iuk4Dh0u7X3s1llz/Wb1DsRx6IlLABrCgd+91EocZLBTzKgTj3l4KwIIW8Jc0ZQfKlC2zKN4q55FcL9Nky2B5jOlXtsXnYnBmwGoo/0cXHtb5G6n7zPlhaOtTw+eLA9X19wPojHYXr7NHf5MbznpJL7Ib7ta5vFQNVSfKI8tTSyhuCHaDjUs8RdiM7vjpFpx73SvFzffkFy3FYUZ69TwpUjRTQcrnFbUe7KmcCa7V4wqk4L8TdI2DNtZzvrRYs4z52OCrcKcj1R2wKMjwpY1wFJen+WzwasnpA3+xQhzbfWdZiG5TQidjPIbzeADTl8Z6ZlfpusYgenU9caE3v8SvJaBCAhfVlQG5O+Tg1pneRVLmwe9eyB/RzHiLGc0NAjqkKiPKC8MzQ0kvoTmUI0GojyuFy50SSDp9oW4qnSJyCulEQubFEta4DI92dKS+kIcMaR/ye6GZF8qt4wacft0/GesvFtlUd8ifWTvUVG0wp5hGlPiqeS7fyGuW+W6dDnfUs7A9m6z0RisYC1MA4TDS/htIi7LumzKGVCteSa6xzd/oz345x6773STcF07jUG6UKbKZEuzK8AhCsbhAsFrkejKFLhPdxNi3xS79gsZ0mDTu2BWwk/nyjH+dY1a5/zLNi2rbv1jhRMhCBdkmZeM3kWZWLNAk0hPuB6tJ1YfoXrPE0Q== 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: Chao Peng Add helpers to invoke KVM_SET_USER_MEMORY_REGION2 directly so that tests can validate of features that are unique to "version 2" of "set user memory region", e.g. do negative testing on gmem_fd and gmem_offset. Provide a raw version as well as an assert-success version to reduce the amount of boilerplate code need for basic usage. Signed-off-by: Chao Peng Signed-off-by: Ackerley Tng --- .../selftests/kvm/include/kvm_util_base.h | 7 +++++ tools/testing/selftests/kvm/lib/kvm_util.c | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index b608fbb832d5..edc0f380acc0 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -522,6 +522,13 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); int __vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, + uint32_t flags, uint64_t gpa, uint64_t size, + void *hva, uint32_t gmem_fd, uint64_t gmem_offset); +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, + uint32_t flags, uint64_t gpa, uint64_t size, + void *hva, uint32_t gmem_fd, uint64_t gmem_offset); + void vm_userspace_mem_region_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages, diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 68afea10b469..8fc70c021c1c 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -873,6 +873,35 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, errno, strerror(errno)); } +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, + uint32_t flags, uint64_t gpa, uint64_t size, + void *hva, uint32_t gmem_fd, uint64_t gmem_offset) +{ + struct kvm_userspace_memory_region2 region = { + .slot = slot, + .flags = flags, + .guest_phys_addr = gpa, + .memory_size = size, + .userspace_addr = (uintptr_t)hva, + .gmem_fd = gmem_fd, + .gmem_offset = gmem_offset, + }; + + return ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION2, ®ion); +} + +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, + uint32_t flags, uint64_t gpa, uint64_t size, + void *hva, uint32_t gmem_fd, uint64_t gmem_offset) +{ + int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva, + gmem_fd, gmem_offset); + + TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno = %d (%s)", + errno, strerror(errno)); +} + + /* FIXME: This thing needs to be ripped apart and rewritten. */ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages, -- 2.42.0.283.g2d96d420d3-goog