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 28640C001DC for ; Fri, 21 Jul 2023 09:04:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06B702801A8; Fri, 21 Jul 2023 05:04:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01B9C2801A0; Fri, 21 Jul 2023 05:04:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB2642801A8; Fri, 21 Jul 2023 05:04:01 -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 CD43A2801A0 for ; Fri, 21 Jul 2023 05:04:01 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 892CEA0169 for ; Fri, 21 Jul 2023 09:04:01 +0000 (UTC) X-FDA: 81035031882.02.55BD6ED Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 618274001C for ; Fri, 21 Jul 2023 09:03:58 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LQP6XBIL; spf=pass (imf04.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689930238; h=from:from:sender: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UkppB3amY8e+ZFUORFAPfGoR63QBz1mTawh0tzwUFzU=; b=UekOwStTexhsbnJfD1YVNaBBireTe/z/NlL5GKgt/IUJLAkte5v/3q5lBmk3XlnlcZU570 KtrkjbGLP/Enjd4oNFL4iOzMouU/c7eQbTBqc+K1CC3c8H7DhJj2B613u/0uA/Sg9nQOdw ojUroeCYCnb6V2ugKShJG661iY6goZk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LQP6XBIL; spf=pass (imf04.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689930238; a=rsa-sha256; cv=none; b=24a6ZNLbYXhRxsEwQgIe6snS9NNCo+zXKK2IyGnG9NWogBwyA+R61CZZD5YX2DbrOyKD1p r2b5kSGgODi/5hIpVpTXOJ7u0+KeJtDKeRbvLBhDft7oGd50EQB7piqvAPsgtD5WFjvzTB 8COsnhgx8HjTsungEzJRTL8mS7UUiJM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689930237; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UkppB3amY8e+ZFUORFAPfGoR63QBz1mTawh0tzwUFzU=; b=LQP6XBILE98E9vsC1vDQTB4+jRvd/3e8SnMSohe/gtMVLoozMI1Al33V79jIwfp1dj5ZuN JzloFMiUXpT332GcmJj3Jz8J3ObnmzpccY3lKEMFMthaMNNUYTmZnH3bMxgYjsKMZzA2uy xTCduHU3SD6pjlA2cN4bltSuiSwDTPE= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-xawIicl2OvSeQLdxRSCuYA-1; Fri, 21 Jul 2023 05:03:56 -0400 X-MC-Unique: xawIicl2OvSeQLdxRSCuYA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-993c24f3246so206748266b.1 for ; Fri, 21 Jul 2023 02:03:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689930235; x=1690535035; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UkppB3amY8e+ZFUORFAPfGoR63QBz1mTawh0tzwUFzU=; b=gE3sk2Dv9X1g9QSE+mL2NqZrh7iTDxi86TnI3/eChBYDTQ4eSPZcBHdQjwVToPkZ3a wRifg2f9NM5I6GnKuGXpInZcf5nSN6pamoaeIm9Tmzgu6zOiB/ioKrlPY2S8CEOuEDDY 5yk1Ze5OadzBf+2a0bbXE2f1vE/iIdPov4IzBtklEyh/fwBxroVRaMnPmKUkCRqx8uZw YUT/TNZ7xvbYBbRoBmZl9at/hYIehCh1c3Wuedx9eBDxJZqlReP34ZzL70k3XTpu69mQ fYE/yODXQYybP+CJxGWZs/7LYdLkVYujXqSoi7zBd0kbdP0nxiGZA+9wYxrBvf9GNHgx /6bg== X-Gm-Message-State: ABy/qLYgO6CGq7sLSBkVKZ6CaLzi/IiNGo3EQwTVIarKHIZLglimqwlr rFoUjL2fLsgGpY/dGLntgy0ONwUX9U5z+vZk22EPHRcyd1KxXUCQFWEu8LBXWvK0wov6Jm/mWN+ s/JE1sL/61mg= X-Received: by 2002:a17:907:6d8c:b0:98d:abd4:4000 with SMTP id sb12-20020a1709076d8c00b0098dabd44000mr7889148ejc.35.1689930234811; Fri, 21 Jul 2023 02:03:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlGH6YzYN7wVD16W6bBWRZvka9R57MaW1yVsDxFFu0qfog7UhF1jWQDyj4gC4NTPLd7VWeWUJA== X-Received: by 2002:a17:907:6d8c:b0:98d:abd4:4000 with SMTP id sb12-20020a1709076d8c00b0098dabd44000mr7889108ejc.35.1689930234273; Fri, 21 Jul 2023 02:03:54 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:9af8:e5f5:7516:fa89? ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.googlemail.com with ESMTPSA id rv7-20020a17090710c700b00993a9a951fasm1915159ejb.11.2023.07.21.02.03.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Jul 2023 02:03:53 -0700 (PDT) Message-ID: <47c5f57c-a191-1983-b4ef-6e0c59c0c446@redhat.com> Date: Fri, 21 Jul 2023 11:03:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [RFC PATCH v11 06/29] KVM: Introduce KVM_SET_USER_MEMORY_REGION2 To: Sean Christopherson , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , "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" References: <20230718234512.1690985-1-seanjc@google.com> <20230718234512.1690985-7-seanjc@google.com> From: Paolo Bonzini In-Reply-To: <20230718234512.1690985-7-seanjc@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 618274001C X-Rspam-User: X-Stat-Signature: 4yh189y19hsywebhj86q6ke3nrzy4d9d X-Rspamd-Server: rspam01 X-HE-Tag: 1689930238-268417 X-HE-Meta: U2FsdGVkX18SQGlCACpVmXWwZrDtogJQt13GUpL/efr6xEejfDi/o8l74cXb98x6si1Hzr9N6+FxX2T7jMdWxEszsuT+j6ZzvW2SqsU2zLjkGYlZ8R1+nr7tZldV7Mce77/G3WWyQJ4pELkYsv15KOTGYLcb46bbqI+7wVPzpXu1jmn9le/wwM0bj7aaY9rY13ejnJ03RQKnRaZ2WVzh4F9sNqM2fPReSBbjtTEGuUizIFBEBWGSKxgEeRIISIrGOgD/dse1WCKIR5hjHoKszwgkQOTC5VPw7d+cRZfQWMPR/+ZvtCXLKykK40Lt8Ga+GYreZ1yHrD1RRzle1/769Ilodg2vWrMIj2h0TDeqltvYBHp4zAqA0wZmgL1FsG3pBS0UDK490LEaLCdIF7G1WdgaQKVoTM/i9Nf3R/g7vMCdwolLshjj6ehWHL88stvUbVSzF75ykUwgQUYNsxZ9g4WijiGK1P18XW98bCJGa51fDAmF3Sd2MFnVHOeeYxDs4JG4fKiF0XnDv0eNack+BVq3DE4d7DH1W+G+tAssWr19V6meyg24Xgd0epBaBQ6oH61STFo8xXxM3J5kldiWGEi8DK3y8NStMrmdrAWIV5knKF8eoyc2k3rka4uZVP3u2hp0NNpmG5eYCC8Cep0o/cGNifr6Co/wvoYeRS2teskv+ghbsNnqqyWEaeI76ZST+f+qlJo4ifq1BrH6SHmh1orqRiRkdPGd8/5v/ki6hD4jtHt5ItDKejpofvcQGXN3/YTy5fVdyxxTOyOvzwnbLEVIwqpvWYlTrZuZyWFCt6REulA9ABCF7sRfPBBKPwHfHVtwERVyRgK8CKbgfRwgzloaAT6i9ubE7VjcsQ7ryxd4Pqg8dfmFkpwEAOm7S14RN8RfGC3gO/ky5jkdvRwrqMtqkcjhaFe+ELsdT8OnTcAPYZcyZTQLJqUqv8H1G14ksgHki3MmeHgfyHbzef0 GPlixW/3 ZMwzICgDGaLYRwHCbGxhY7hRRqgv8Afu+R/+9NLs9JFWQVVcyWtTtDUZ40lR3uzqKCd7gG4TEhLZWHVavALx/xinIFKUNlmtp9nhDKssE4uGHhqVsPZHSOYXtLADEyywyAGgr3QknUdzmaJj9k2+1zFen6jyuamJUTx+Y/CgK4nmqjwlPiZjXkhAhFnz7kv0/CGN3g1ClLEudCV+47UAYVHvUDC0VGn0dOzcseE5/93VuKedpd2K7sYW8K2szKEx+hGYKLs5F1uqWAVW1x+7A6ZNtV4GxBk3prVunNzCRttp9tv/WyCoqAOzGB1JC0R13Uobsfs2PWcY08cju74WlmbY5BT+1ssWVqPj23JYgfdupQYCKFxJ+yY9477ATM87HXtvi0CaFRJMEH53j5z8lPZ5E1HXQlWTQY+x3fkT9iRFo7MA3W0pkGtgyd/FPnO7nLxhZYID2eD/SxhDA+qSs8SwSyNy+MnPwpnPU5+vvPG5bfv+FRLQSbYpoDWRSgmtfyatilhOFyKMWd5g4JiEFk2p4BpQVauBwAQ025X5uHnEtnCy0kWcfCTZ8io6Enjh0GhZY 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: On 7/19/23 01:44, Sean Christopherson wrote: > 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: { Reviewed-by: Paolo Bonzini