Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\))
Subject: Re: [PATCH] KVM: LAPIC: ARBPRI is a reserved register for x2APIC
From:   Liran Alon <liran.alon@oracle.com>
In-Reply-To: <1562328872-27659-1-git-send-email-pbonzini@redhat.com>
Date:   Fri, 5 Jul 2019 15:37:41 +0300
Cc:     linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <D76638DF-1934-4B1C-84CD-FFCE11AA175F@oracle.com>
References: <1562328872-27659-1-git-send-email-pbonzini@redhat.com>
To:     Paolo Bonzini <pbonzini@redhat.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


> On 5 Jul 2019, at 15:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
>=20
> kvm-unit-tests were adjusted to match bare metal behavior, but KVM
> itself was not doing what bare metal does; fix that.
>=20
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/lapic.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>=20
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index d6ca5c4f29f1..2e4470f2685a 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -1318,7 +1318,7 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, =
u32 offset, int len,
> 	unsigned char alignment =3D offset & 0xf;
> 	u32 result;
> 	/* this bitmask has a bit cleared for each reserved register */
> -	static const u64 rmask =3D 0x43ff01ffffffe70cULL;
> +	u64 rmask =3D 0x43ff01ffffffe70cULL;

Why not rename this to =E2=80=9Cused_bits_mask=E2=80=9D and calculate it =
properly by macros?
It seems a lot nicer than having a pre-calculated magic.

-Liran

>=20
> 	if ((alignment + len) > 4) {
> 		apic_debug("KVM_APIC_READ: alignment error %x %d\n",
> @@ -1326,6 +1326,10 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, =
u32 offset, int len,
> 		return 1;
> 	}
>=20
> +	/* ARBPRI is also reserved on x2APIC */
> +	if (apic_x2apic_mode(apic))
> +		rmask &=3D ~(1 << (APIC_ARBPRI >> 4));
> +
> 	if (offset > 0x3f0 || !(rmask & (1ULL << (offset >> 4)))) {
> 		apic_debug("KVM_APIC_READ: read reserved register %x\n",
> 			   offset);
> --=20
> 1.8.3.1
>=20