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 98BAA20C016; Fri, 6 Dec 2024 15:15:14 +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=1733498114; cv=none; b=btVRqYMkmtOHgaSISLqaPh3A4zaIHQ0K6vHyuYEb9muH96TpaG0Eqzn9TSyUCuEJMxMwGt/koA1dwieq2CC4SbH7aY7ATR09NYWyslLbUCnWIyMnzPdR6RMJQw5Vi5Mx4EN17dhAQvI26fwB+w2Py5vFkCVA4haTxtJKtXuFZ3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733498114; c=relaxed/simple; bh=YjylkPL/paXeFXTMrOjBHXarQBUZb6H4Anb+IbHtM/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GFzUdI7yvM6PJsUIpAyLSJDtYyp9+sedWprsUMYpKFtwSEly7nbTX8ualDanpg8aY+M3B7m7yKAUnnaV7krDXI31C7DcOvIhuVQn562IRpI2kKo9yFQQ/Mx+mSjIWApZQlfJzUC6RJaFlPG2Mncyp5oiP+GXpHYW8G0Fa0nBOrg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x5s2Ny5Q; 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="x5s2Ny5Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D727C4CEE0; Fri, 6 Dec 2024 15:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733498114; bh=YjylkPL/paXeFXTMrOjBHXarQBUZb6H4Anb+IbHtM/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x5s2Ny5QtnWMBEv66yhQusqjlBTfxUnHL9wJ4bXFNvXLop8dT/T9GIUqnnV2/4CZJ 4LyP8IL3VBYv27gKUkxc8xTcq4S4PLP07HEgVYi0NaX0K8WT8pJIg9AygudTL6S0MM K5GJvrQPeRpEDZNNUmp454Jz63SBgC03Zg5h2OZY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shusen Li , Kunkun Jiang , Jing Zhang , Oliver Upton Subject: [PATCH 6.6 483/676] KVM: arm64: vgic-its: Clear DTE when MAPD unmaps a device Date: Fri, 6 Dec 2024 15:35:02 +0100 Message-ID: <20241206143712.228450245@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@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: Kunkun Jiang commit e9649129d33dca561305fc590a7c4ba8c3e5675a upstream. vgic_its_save_device_tables will traverse its->device_list to save DTE for each device. vgic_its_restore_device_tables will traverse each entry of device table and check if it is valid. Restore if valid. But when MAPD unmaps a device, it does not invalidate the corresponding DTE. In the scenario of continuous saves and restores, there may be a situation where a device's DTE is not saved but is restored. This is unreasonable and may cause restore to fail. This patch clears the corresponding DTE when MAPD unmaps a device. Cc: stable@vger.kernel.org Fixes: 57a9a117154c ("KVM: arm64: vgic-its: Device table save/restore") Co-developed-by: Shusen Li Signed-off-by: Shusen Li Signed-off-by: Kunkun Jiang [Jing: Update with entry write helper] Signed-off-by: Jing Zhang Link: https://lore.kernel.org/r/20241107214137.428439-5-jingzhangos@google.com Signed-off-by: Oliver Upton Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/vgic/vgic-its.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/arch/arm64/kvm/vgic/vgic-its.c +++ b/arch/arm64/kvm/vgic/vgic-its.c @@ -1215,9 +1215,11 @@ static int vgic_its_cmd_handle_mapd(stru bool valid = its_cmd_get_validbit(its_cmd); u8 num_eventid_bits = its_cmd_get_size(its_cmd); gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); + int dte_esz = vgic_its_get_abi(its)->dte_esz; struct its_device *device; + gpa_t gpa; - if (!vgic_its_check_id(its, its->baser_device_table, device_id, NULL)) + if (!vgic_its_check_id(its, its->baser_device_table, device_id, &gpa)) return E_ITS_MAPD_DEVICE_OOR; if (valid && num_eventid_bits > VITS_TYPER_IDBITS) @@ -1238,7 +1240,7 @@ static int vgic_its_cmd_handle_mapd(stru * is an error, so we are done in any case. */ if (!valid) - return 0; + return vgic_its_write_entry_lock(its, gpa, 0, dte_esz); device = vgic_its_alloc_device(its, device_id, itt_addr, num_eventid_bits);