From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 531921E495; Tue, 14 May 2024 11:09:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715684947; cv=none; b=PdEQZQES76PY/5cr7WbBvy+jXzkzRNJrU5jDlE9Ie1NY50VQ2y9ogDseK2bY4W816MjOrO80o0jNAeRU68he3z8w67gBjtKsjhxNR3KyypGJS1gnIi94ItfFCdgPJjdERZ4vO7v1fWwzrgRrU3y98BNRfwkhs2nXRBW2WpIivVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715684947; c=relaxed/simple; bh=ULY86lZKmLB81mcT59Yx0I+rJ9YZk0exOEJdvzZI7yc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TogeUOcrt+jKhLS0YDWsCK1Mg7zfR2juT8txqMXNbghcLhEUs9JD6zUDA/szwtVB6gmTQPbykk1u7bx4ILsZ+MCLvnBjlZLFB2YvpCiolxJs563n+Fcl4norF6kwtprBLxPZpUhPyuN6Nkl0JoX2lcs8F9nr6PN0SccVbq0hlC8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1o1vtI6d; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1o1vtI6d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14FB0C2BD10; Tue, 14 May 2024 11:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715684947; bh=ULY86lZKmLB81mcT59Yx0I+rJ9YZk0exOEJdvzZI7yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1o1vtI6dl/8u8dNGMgtifa3/+C6Gt7H7lwwHJuBtzK2TcELzGjr7JERQ3BRT3TXAo sOk05R9jYm0s6fpG7FlKCxfpCCJc8UOKx/HdYCzHWzUpqF+09XZ06Ui9j3Uz5fEjhi NRs7rFtnxhCfsIdEuZbx1Sbw3umhZM4ltVJXorzQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zenghui Yu , Marc Zyngier , Oliver Upton , Sasha Levin Subject: [PATCH 6.6 094/301] KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id Date: Tue, 14 May 2024 12:16:05 +0200 Message-ID: <20240514101035.800993349@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Zyngier [ Upstream commit 4e7728c81a54b17bd33be402ac140bc11bb0c4f4 ] When parsing a GICv2 attribute that contains a cpuid, handle this as the vcpu_id, not a vcpu_idx, as userspace cannot really know the mapping between the two. For this, use kvm_get_vcpu_by_id() instead of kvm_get_vcpu(). Take this opportunity to get rid of the pointless check against online_vcpus, which doesn't make much sense either, and switch to FIELD_GET as a way to extract the vcpu_id. Reviewed-by: Zenghui Yu Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230927090911.3355209-5-maz@kernel.org Signed-off-by: Oliver Upton Stable-dep-of: 6ddb4f372fc6 ("KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()") Signed-off-by: Sasha Levin --- arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c index 212b73a715c1c..c11962f901e0c 100644 --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c @@ -339,13 +339,9 @@ int vgic_v2_parse_attr(struct kvm_device *dev, struct kvm_device_attr *attr, { int cpuid; - cpuid = (attr->attr & KVM_DEV_ARM_VGIC_CPUID_MASK) >> - KVM_DEV_ARM_VGIC_CPUID_SHIFT; + cpuid = FIELD_GET(KVM_DEV_ARM_VGIC_CPUID_MASK, attr->attr); - if (cpuid >= atomic_read(&dev->kvm->online_vcpus)) - return -EINVAL; - - reg_attr->vcpu = kvm_get_vcpu(dev->kvm, cpuid); + reg_attr->vcpu = kvm_get_vcpu_by_id(dev->kvm, cpuid); reg_attr->addr = attr->attr & KVM_DEV_ARM_VGIC_OFFSET_MASK; return 0; -- 2.43.0