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 9CA2218DB35; Thu, 4 Sep 2025 09:29:13 +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=1756978153; cv=none; b=qmT8raI21wLrWML+MGkvGuJ1mO/dxAwAn09DFMyHJTS2/sjjfzfUoJmMTiq83OAzp1GGA/ytF3b2jgf19djZcK+FEXQZD6+ncYIRVETcQRf8bzbpnaJzpWTPJtF8LmbSUaSG8/bN6il3F1knfR3Ca1gnjh1y4l9OjX0Ureola6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756978153; c=relaxed/simple; bh=nau7kMpEG/k0ioNwzEP756kl3OKRZzgIs8ivDWYdEUM=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=bIA6BJ/fs9cp70JOxQ9hliEoqyzU65x/gEXr0V+p3AzPJG4fqeerAXfB4GjxkF+vnZK77cX3hvZkHsyLqBgR0a4HLiwlclUT0rc5fuqzyd56foMiKEBWlkLEy19t6pZRn/knYJDQ5u/Pj+o0LtWJEWrDISHVLHgg62jGFoUll5g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j51DwJyk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j51DwJyk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21C55C4CEF0; Thu, 4 Sep 2025 09:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756978153; bh=nau7kMpEG/k0ioNwzEP756kl3OKRZzgIs8ivDWYdEUM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=j51DwJykRcurtpU2Sp+0A7NQ1QLelFcrZOLttQSfUYPH03PqgVuRVF9/vr4XKogTb ArFiIlFJb/HW5VOV426tMt0hba7HO0fW5ZZOPyQJjkTinEWMIq6Goj254G0oKfLSj4 DPFmBrQbVzmVE7uQWq4OWXHGRiPeh+LxdsxzoIGocRMsfOPuQ2XQtt9OWWGkucB5a1 IfmZ2f92A9n5F1i4LkuP5A9Ipf4Q4DfWcyf7Ug/iNATlXIWQVAU7XeqJYXfod8vqxS k9rrjHVz24d7tTqtCy2va7Y2mpFeh6pN0w3jrn9W1bAoRRbgxwOnwJIiQ4Uv46czul EzRGro0fnPZVw== Received: from [131.175.126.3] (helo=lobster-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1uu6HG-00000003Fjy-1W1K; Thu, 04 Sep 2025 09:29:10 +0000 Date: Thu, 04 Sep 2025 10:29:09 +0100 Message-ID: <87wm6ezhui.wl-maz@kernel.org> From: Marc Zyngier To: p@sswd.pw Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , leedongha Subject: Re: [PATCH] arm64: kvm: Fix incorrect VNCR invalidation range calculation In-Reply-To: <20250903123949.24858-1-p@sswd.pw> References: <20250903123949.24858-1-p@sswd.pw> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 131.175.126.3 X-SA-Exim-Rcpt-To: p@sswd.pw, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, gapdev2004@gmail.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Wed, 03 Sep 2025 13:39:49 +0100, p@sswd.pw wrote: > > From: leedongha > > The code for invalidating VNCR entries in both kvm_invalidate_vncr_ipa() > and invalidate_vncr_va() incorrectly uses a bitwise AND with `(size - 1)` > instead of `~(size - 1)` to align the start address. This results > in masking the address bits instead of aligning them down to the start > of the block. > > This bug may cause stale VNCR TLB entries to remain valid even after a > TLBI or MMU notifier, leading to incorrect memory translation and > unexpected guest behavior. > > Credit > Team 0xB6 in bob14: > DongHa Lee (@GAP-dev) > Gyujeong Jin (@G1uN4sh) > Daehyeon Ko (@4ncienth) > Geonha Lee (@leegn4a) > Hyungyu Oh (@DQPC_lover) > Jaewon Yang (@R4mbb1) > > Signed-off-by: leedongha The SoB of the person sending the patch is required. > --- > arch/arm64/kvm/nested.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > index 77db81bae86f..d0ddce877b5d 100644 > --- a/arch/arm64/kvm/nested.c > +++ b/arch/arm64/kvm/nested.c > @@ -847,7 +847,7 @@ static void kvm_invalidate_vncr_ipa(struct kvm *kvm, u64 start, u64 end) > > ipa_size = ttl_to_size(pgshift_level_to_ttl(vt->wi.pgshift, > vt->wr.level)); > - ipa_start = vt->wr.pa & (ipa_size - 1); > + ipa_start = vt->wr.pa & ~(ipa_size - 1); > ipa_end = ipa_start + ipa_size; > > if (ipa_end <= start || ipa_start >= end) > @@ -887,7 +887,7 @@ static void invalidate_vncr_va(struct kvm *kvm, > > va_size = ttl_to_size(pgshift_level_to_ttl(vt->wi.pgshift, > vt->wr.level)); > - va_start = vt->gva & (va_size - 1); > + va_start = vt->gva & ~(va_size - 1); > va_end = va_start + va_size; > > switch (scope->type) { Yup, absolutely correct. Thanks a lot for spotting this. With the above nit addressed: Reviewed-by: Marc Zyngier M. -- Jazz isn't dead. It just smells funny.