From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Marc Zyngier <maz@kernel.org>, Andrew Jones <drjones@redhat.com>,
Huacai Chen <chenhuacai@kernel.org>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Anup Patel <anup.patel@wdc.com>,
Paul Mackerras <paulus@ozlabs.org>,
Michael Ellerman <mpe@ellerman.id.au>,
kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mips@vger.kernel.org, kvm-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] KVM: arm64: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
Date: Thu, 11 Nov 2021 17:27:42 +0100 [thread overview]
Message-ID: <20211111162746.100598-2-vkuznets@redhat.com> (raw)
In-Reply-To: <20211111162746.100598-1-vkuznets@redhat.com>
It doesn't make sense to return the recommended maximum number of
vCPUs which exceeds the maximum possible number of vCPUs.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
arch/arm64/kvm/arm.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 7838e9fb693e..391dc7a921d5 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -223,7 +223,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
r = 1;
break;
case KVM_CAP_NR_VCPUS:
- r = num_online_cpus();
+ if (kvm)
+ r = min_t(unsigned int, num_online_cpus(),
+ kvm->arch.max_vcpus);
+ else
+ r = min_t(unsigned int, num_online_cpus(),
+ kvm_arm_default_max_vcpus());
break;
case KVM_CAP_MAX_VCPUS:
case KVM_CAP_MAX_VCPU_ID:
--
2.33.1
next prev parent reply other threads:[~2021-11-11 16:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 16:27 [PATCH 0/5] KVM: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS and re-purpose it on x86 Vitaly Kuznetsov
2021-11-11 16:27 ` Vitaly Kuznetsov [this message]
2021-11-11 19:36 ` [PATCH 1/5] KVM: arm64: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS Marc Zyngier
2021-11-12 9:51 ` Vitaly Kuznetsov
2021-11-12 10:38 ` Andrew Jones
2021-11-12 10:51 ` Paolo Bonzini
2021-11-12 14:02 ` Marc Zyngier
2021-11-12 14:10 ` Paolo Bonzini
2021-11-16 13:23 ` Vitaly Kuznetsov
2021-11-16 15:50 ` Paolo Bonzini
2021-11-16 15:55 ` Marc Zyngier
2021-11-16 15:58 ` Paolo Bonzini
2021-11-11 16:27 ` [PATCH 2/5] KVM: MIPS: " Vitaly Kuznetsov
2021-11-11 16:27 ` [PATCH 3/5] KVM: PPC: " Vitaly Kuznetsov
2021-11-11 16:27 ` [PATCH 4/5] KVM: RISC-V: " Vitaly Kuznetsov
2021-11-11 16:27 ` [PATCH 5/5] KVM: x86: Drop arbitraty KVM_SOFT_MAX_VCPUS Vitaly Kuznetsov
2021-11-11 16:32 ` [PATCH 0/5] KVM: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS and re-purpose it on x86 Paolo Bonzini
2021-11-15 12:16 ` Christian Borntraeger
2021-11-15 12:33 ` Christian Borntraeger
2021-11-15 16:04 ` Vitaly Kuznetsov
2021-11-16 8:15 ` Christian Borntraeger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211111162746.100598-2-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=anup.patel@wdc.com \
--cc=chenhuacai@kernel.org \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jmattson@google.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@ozlabs.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).