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 C2B71EB64DC for ; Tue, 18 Jul 2023 23:48:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98B278D0025; Tue, 18 Jul 2023 19:48:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 93B238D0012; Tue, 18 Jul 2023 19:48:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B4E88D0025; Tue, 18 Jul 2023 19:48:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 59AA68D0012 for ; Tue, 18 Jul 2023 19:48:46 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 396E84050A for ; Tue, 18 Jul 2023 23:48:46 +0000 (UTC) X-FDA: 81026375052.05.27C3DAA Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf22.hostedemail.com (Postfix) with ESMTP id 548F4C000A for ; Tue, 18 Jul 2023 23:48:44 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=LvUy9xBw; spf=pass (imf22.hostedemail.com: domain of 32yS3ZAYKCC4cOKXTMQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=32yS3ZAYKCC4cOKXTMQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689724124; 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=ThXIJqX7As4i3dGm5wOXsZKmYyKWC1w3yhPdFi+UZh4=; b=iuMvu/VbzfBwlE6xa0BNR+Ypt9/zgA7xelfM9FUI1b+VwjMSegS2EYt449MQ9GKZI3mkH5 OUXzdu0Q5x57PFyfIvcjs+Q+QocJN7RC0wGHdoBXhryNm3JR4kQ3Bj8TkLTDitiQwI9qCD ewk9Q8swhdcpCKYGhccDAB92KYF8mdU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689724124; a=rsa-sha256; cv=none; b=4XT9apDtrR9FuFULNLi+BbRQUH3OJHahGpiJ5dKcHtXE1wgdG8PlWosWV92VUZIlTz8nDN f3rr6/GbHtOb5lsSpR/Bwcy6sZkL/KvLS8Cm9UDXompaaaSgtnmOzhGJqXjZiIOTt1JHkt 0V270Rg6gEf0l+BtifO1TicpmAf40rg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=LvUy9xBw; spf=pass (imf22.hostedemail.com: domain of 32yS3ZAYKCC4cOKXTMQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=32yS3ZAYKCC4cOKXTMQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b9de7951easo32355105ad.0 for ; Tue, 18 Jul 2023 16:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689724123; x=1692316123; 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=ThXIJqX7As4i3dGm5wOXsZKmYyKWC1w3yhPdFi+UZh4=; b=LvUy9xBwtvIfAPCO5pNNhARQQ5SNv50VuwzjIysubxMyr/2WT9iQpqxA6erzK7bWiu qihBKH4SJZf0AvBAqcBEejRsurglq/OJfXy6wCGPqNGQh8Ro3lrbfPRoj8tfypGRMlsn Uqch0IxGwwo0DLlZrr1zeRuXu1xNXvsURj/8G/FFYVp7s8AUP5ynEAUgVaPHCZ8dBxWo XzgPa/CMeeijvZgR9bdbpmr2gQZWkwBUQDlw7rhcaUYjPEJTs8NmkEkBHw+XU/kMKj/i AePIN4rloEM+TeBH/xMOBZ/pVRG+4qprH3PDbeKaJmr2/1mChRw4GYfNQ4J/UBEhhSrm FjFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689724123; x=1692316123; 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=ThXIJqX7As4i3dGm5wOXsZKmYyKWC1w3yhPdFi+UZh4=; b=DxBQHQasQsY2Ubnqn+xPtNuRtAlTJG3HYpnU8y/wNKX4OENB7fuV5jVqfjBmyo9C1f SF6wdhH9xF7MsB8CYW8j5atrxZlaleh0NdFJowkE35K82UtStgB0NnrKm992GS1m0P2y fMQXvXKKbD578pKywX1MC91tnD8sJJbFG5UjaDNCPSPBAT3rhcrPRsuCkTsDD8aMAVF4 HDZqzhbH1N1RZbhwju8SsX4c/0pZvxlH++3NUDfsGQiS/mjwJBOyZLSFK2BTo+elyQvi +7zTfWy2zJCdG8c/ZAVtsKnEmveMlyTqWTNBprV8+YqFMK8HEVOTEuzcexVsLcTNcECq AFjg== X-Gm-Message-State: ABy/qLZc6T7b78EgLNyOb8etapyOQKMy++FBUd/pHFKSy99nIwfyLh50 RBDxh33j37ckr2/d6iFb/U6FJn1mUf8= X-Google-Smtp-Source: APBJJlFjBm3uEK6hEcjuoeBKM7s5L/qQiT85mHjyEzQM1CYgv+bsN7btAmL4QIiVKpupcBcSQ8/VxXwLYM4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ec88:b0:1b9:df8f:888c with SMTP id x8-20020a170902ec8800b001b9df8f888cmr16353plg.8.1689724123174; Tue, 18 Jul 2023 16:48:43 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 18 Jul 2023 16:44:49 -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-7-seanjc@google.com> Subject: [RFC PATCH v11 06/29] KVM: Introduce KVM_SET_USER_MEMORY_REGION2 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" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 548F4C000A X-Rspam-User: X-Stat-Signature: 1nsx88uyccf43yyc63f45w4z91w3yuyc X-Rspamd-Server: rspam03 X-HE-Tag: 1689724124-465153 X-HE-Meta: U2FsdGVkX18BUqsAPblcOm2O4fBcnZKVnoJW2lxXcRBPNSkzF2rFAmxl2HLIexleg26ml2MkbzknDp7BA0l17m+Phh2hYPf5pV1r99uNX5nCuvslkoBqOBU5sdR8cNO3uOzLpIgeeAdl/V86++SPZujkqY2CcBm7ixY5cRxBrtAWIyafZ283Vb03pqbpwg5N9scY880grAP9roeNAfaSP3wneOn43QUfphQp4oTNGa9HooYY0nDPDlhD+B9K8sNxgywbKSMPUznL7tJ9qTrTE4AzwY38MNtW3UpkH2TlqOLX6WzUlETRaqR5LGcysB8YYehySfwqHUhpO+CQC4jJ34/jKlkUMkGXuh/HnmQS+9cLlclyASdHE+XBo3nVd8D4UzJIZlAvJFajLcAOoGx/qAM6Fdvd113Sa76LndCcHoiVA7slRfZnNReyrnfxGOQTP4meVYzJDIUn4U02G2tsDQj9IqSXSZm4Z+bEzFAQetZnMP11pngYr7PKgfHnwvDsGN6APH8UmrfSwfhVq0KLiKfJt0BU5XuEVTW26SeGtyoqP0MECAdKqF1xL7H1nWdqUMDJqVCyHNON6qS/90CJgN9S+3/KIdDZHyMva/EEPfy73lmFr9O8P8VJwi5CsQvotU5Pgn9t/u9X9kGUJxEDuPGMGe4LwpOtgEabf4Yd3/tQJu/MJ4Xbpe7BN5MpxyaQ9bjwVjNHHf7OFkeXQuvp3mmjK5UazNKv7suJTkPHwwzXDm/j5hCCJNa5HwBXYbm0FL/fJzWuD9p6sDqScUOMsAQs8Sec/SvqVcVspX2/4IUjq0osOd4fwJRyntbDivP70OMzN6yJSy5MRPx7Kvd9babn+YpJu/vczP8ikMQcenQEhD1OxZ2/zbvt79MFokf+rxSGZlHLemnez/bXntUPsDhYcr02v+FOiTFD2IK4+ia5zlnq5x3wD+AWPZYdHPkPgnLWlolha8+qH9XX8TB ibajP8jN l++gbz684uQGkVnTyCQPw2RmiBlv+8irhOxSFeRD8xOmd0vMHJlW6FzigmCcpEnZOkDGQyg7dkhX2dq92Aquxxl21jQMO4ZpMHwgO62jnvEoBaxP2oSQ1McCl1ssO3f+ITtOlqjwH94qECbVVd4+aj9Q+8eKA/BsJXy4ptf4ooFkCsnx+jpcriBVVW/bR34khMEugo4/V7aAaQfMNtPuzIQPzFmxHjhSphSVJ2Itrz2k7wUBky8WYFtyykX7jYxfU/+zaVxbyQhmf08taOFM8FYiBc43fwcS+4ql0XZYq8zUKJeXaFLOOMWzoPBnK9EuUU1d5TCKztieR9NGAuxd+qGIYHxIRFVwL0gVxJ48d4CIpgHOLTwaCvYFU8qQm8GGQYrUmyfMA3jg04cuKppUTIqwHSYQqlU8Axmz98jMrCy3NM5Nt9gBejJZ3GOgyJsaFztU2IMnyAd4H9E2bANhHWQhFNM3mj9worm1TJan/f4N3bT66x5Ih/JhN8FXP7e5gMdM6E/3NdBHKocqKEU3jQuizF/7lcx3xldeN0JcW2QctUhJULSa4P6m0SqL6fSvKxoUwCuB1x9LtHrzhLbrVpPcoMMt7pMqXa7fLw2Csf0Xt7FsbS9gpw6eSnZp4qeuKtj/UEIZdXgQ7vm2CAkJF8PgNRv8+U/ySGWWsCcFwvfJjixo9tV0Sg9UMyJBMD/o6I959rh0Ehdxwxd0LjSR1uOO9AekU/tEorpXPjzfEPpWuCZR7rY0dzsyQ5xDZnxRKrkAQD/q4yeZlAQRCGfCHoXJ//MlbJYfrKZKjfKkHVhFlqrtp4J7vsLGrjPQ36ZeW9uLdyZSIUiZPARxPfSl1dSu4woAyStQr56v/yyGpf8zFFmQ2xTAjdQWDUg== 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: Cc: Jarkko Sakkinen Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 2 +- include/linux/kvm_host.h | 4 ++-- include/uapi/linux/kvm.h | 13 +++++++++++++ virt/kvm/kvm_main.c | 38 ++++++++++++++++++++++++++++++-------- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a6b9bea62fb8..92e77afd3ffd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12420,7 +12420,7 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, } for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) { - struct kvm_userspace_memory_region m; + struct kvm_userspace_memory_region2 m; m.slot = id | (i << 16); m.flags = 0; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index d2d3e083ec7f..e9ca49d451f3 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1130,9 +1130,9 @@ enum kvm_mr_change { }; int kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region *mem); + const struct kvm_userspace_memory_region2 *mem); int __kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region *mem); + const struct kvm_userspace_memory_region2 *mem); void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot); void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen); int kvm_arch_prepare_memory_region(struct kvm *kvm, diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index f089ab290978..4d4b3de8ac55 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -95,6 +95,16 @@ struct kvm_userspace_memory_region { __u64 userspace_addr; /* start of the userspace allocated memory */ }; +/* for KVM_SET_USER_MEMORY_REGION2 */ +struct kvm_userspace_memory_region2 { + __u32 slot; + __u32 flags; + __u64 guest_phys_addr; + __u64 memory_size; + __u64 userspace_addr; + __u64 pad[16]; +}; + /* * The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for * userspace, other bits are reserved for kvm internal use which are defined @@ -1192,6 +1202,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_COUNTER_OFFSET 227 #define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228 #define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229 +#define KVM_CAP_USER_MEMORY2 230 #ifdef KVM_CAP_IRQ_ROUTING @@ -1466,6 +1477,8 @@ struct kvm_vfio_spapr_tce { struct kvm_userspace_memory_region) #define KVM_SET_TSS_ADDR _IO(KVMIO, 0x47) #define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64) +#define KVM_SET_USER_MEMORY_REGION2 _IOW(KVMIO, 0x49, \ + struct kvm_userspace_memory_region2) /* enable ucontrol for s390 */ struct kvm_s390_ucas_mapping { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 53346bc2902a..c14adf93daec 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1549,7 +1549,7 @@ static void kvm_replace_memslot(struct kvm *kvm, } } -static int check_memory_region_flags(const struct kvm_userspace_memory_region *mem) +static int check_memory_region_flags(const struct kvm_userspace_memory_region2 *mem) { u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; @@ -1951,7 +1951,7 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id, * Must be called holding kvm->slots_lock for write. */ int __kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region *mem) + const struct kvm_userspace_memory_region2 *mem) { struct kvm_memory_slot *old, *new; struct kvm_memslots *slots; @@ -2055,7 +2055,7 @@ int __kvm_set_memory_region(struct kvm *kvm, EXPORT_SYMBOL_GPL(__kvm_set_memory_region); int kvm_set_memory_region(struct kvm *kvm, - const struct kvm_userspace_memory_region *mem) + const struct kvm_userspace_memory_region2 *mem) { int r; @@ -2067,7 +2067,7 @@ int kvm_set_memory_region(struct kvm *kvm, EXPORT_SYMBOL_GPL(kvm_set_memory_region); static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, - struct kvm_userspace_memory_region *mem) + struct kvm_userspace_memory_region2 *mem) { if ((u16)mem->slot >= KVM_USER_MEM_SLOTS) return -EINVAL; @@ -4514,6 +4514,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) { switch (arg) { case KVM_CAP_USER_MEMORY: + case KVM_CAP_USER_MEMORY2: case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: case KVM_CAP_JOIN_MEMORY_REGIONS_WORKS: case KVM_CAP_INTERNAL_ERROR_DATA: @@ -4757,6 +4758,14 @@ static int kvm_vm_ioctl_get_stats_fd(struct kvm *kvm) return fd; } +#define SANITY_CHECK_MEM_REGION_FIELD(field) \ +do { \ + BUILD_BUG_ON(offsetof(struct kvm_userspace_memory_region, field) != \ + offsetof(struct kvm_userspace_memory_region2, field)); \ + BUILD_BUG_ON(sizeof_field(struct kvm_userspace_memory_region, field) != \ + sizeof_field(struct kvm_userspace_memory_region2, field)); \ +} while (0) + static long kvm_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) { @@ -4779,15 +4788,28 @@ static long kvm_vm_ioctl(struct file *filp, r = kvm_vm_ioctl_enable_cap_generic(kvm, &cap); break; } + case KVM_SET_USER_MEMORY_REGION2: case KVM_SET_USER_MEMORY_REGION: { - struct kvm_userspace_memory_region kvm_userspace_mem; + struct kvm_userspace_memory_region2 mem; + unsigned long size; + + if (ioctl == KVM_SET_USER_MEMORY_REGION) + size = sizeof(struct kvm_userspace_memory_region); + else + size = sizeof(struct kvm_userspace_memory_region2); + + /* Ensure the common parts of the two structs are identical. */ + SANITY_CHECK_MEM_REGION_FIELD(slot); + SANITY_CHECK_MEM_REGION_FIELD(flags); + SANITY_CHECK_MEM_REGION_FIELD(guest_phys_addr); + SANITY_CHECK_MEM_REGION_FIELD(memory_size); + SANITY_CHECK_MEM_REGION_FIELD(userspace_addr); r = -EFAULT; - if (copy_from_user(&kvm_userspace_mem, argp, - sizeof(kvm_userspace_mem))) + if (copy_from_user(&mem, argp, size)) goto out; - r = kvm_vm_ioctl_set_memory_region(kvm, &kvm_userspace_mem); + r = kvm_vm_ioctl_set_memory_region(kvm, &mem); break; } case KVM_GET_DIRTY_LOG: { -- 2.41.0.255.g8b1d071c50-goog