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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE262C433EF for ; Tue, 23 Nov 2021 16:39:22 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Hz8x51CtJz3clf for ; Wed, 24 Nov 2021 03:39:21 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=g35t7ep5; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=sashal@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=g35t7ep5; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Hz8tr6f9Fz2ywR for ; Wed, 24 Nov 2021 03:37:24 +1100 (AEDT) Received: by mail.kernel.org (Postfix) with ESMTPSA id 50A1860F9D; Tue, 23 Nov 2021 16:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637685442; bh=x9kazOj5xmu8CcSGoQdyaGj4+h5gviBqE8dLUXfhz0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g35t7ep5JJTtQ5Rp/9pqWnhohwXK0BRF9LmSRQ6OA9WTgfZN7K/igPdlZMqYLGQuj 5Gkaaq85wXAawA0ZHpdk+1W68bVoUusUm+W/rdumw4yw6Sl5lFWyESPupSlz8fwvYw LhDtJFKQ2Xhq1IpywkinzcT34mvsfq4o9lJef5oVyLG77mT2U9P+XiwTptObA11esA 9w71b6vjLCjqF5xqe1Xghu/gT3Zm8QCSnNKPqlAzo6yF6/TPRyYBSk0Xh5k8olxhbm hDHoPktlnCkw+JNX52UqeCAo+WQOACeqsBh/QEp+03S4vbmGttL6bWUuCXXzsL30Hw owkn/DOlotWqA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH MANUALSEL 4.19 3/4] KVM: PPC: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS Date: Tue, 23 Nov 2021 11:37:14 -0500 Message-Id: <20211123163715.289631-3-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211123163715.289631-1-sashal@kernel.org> References: <20211123163715.289631-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , jgross@suse.com, ravi.bangoria@linux.ibm.com, ndesaulniers@google.com, bharata@linux.ibm.com, npiggin@gmail.com, Paolo Bonzini , Vitaly Kuznetsov , linuxppc-dev@lists.ozlabs.org, clg@kaod.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Vitaly Kuznetsov [ Upstream commit b7915d55b1ac0e68a7586697fa2d06c018135c49 ] 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 Message-Id: <20211116163443.88707-4-vkuznets@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/powerpc/kvm/powerpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index ad5a871a6cbfd..e68b1bc86824a 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -627,9 +627,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) * implementations just count online CPUs. */ if (hv_enabled) - r = num_present_cpus(); + r = min_t(unsigned int, num_present_cpus(), KVM_MAX_VCPUS); else - r = num_online_cpus(); + r = min_t(unsigned int, num_online_cpus(), KVM_MAX_VCPUS); break; case KVM_CAP_NR_MEMSLOTS: r = KVM_USER_MEM_SLOTS; -- 2.33.0