* [PATCH v2] svm/avic: Fix invalidate logical APIC id entry
@ 2019-03-26 3:57 Suthikulpanit, Suravee
2019-04-08 14:16 ` Suthikulpanit, Suravee
2019-04-09 16:39 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Suthikulpanit, Suravee @ 2019-03-26 3:57 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: joro, pbonzini, rkrcmar, vkuznets, Suthikulpanit, Suravee
Only clear the valid bit when invalidate logical APIC id entry.
The current logic clear the valid bit, but also set the rest of
the bits (including reserved bits) to 1.
Fixes: 98d90582be2e ('svm: Fix AVIC DFR and LDR handling')
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
arch/x86/kvm/svm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 7a4ce1a22ca0..8a123bd0f591 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -270,6 +270,7 @@ struct amd_svm_iommu_ir {
};
#define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK (0xFF)
+#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT 31
#define AVIC_LOGICAL_ID_ENTRY_VALID_MASK (1 << 31)
#define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK (0xFFULL)
@@ -4640,7 +4641,7 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu)
u32 *entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat);
if (entry)
- WRITE_ONCE(*entry, (u32) ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK);
+ clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry);
}
static int avic_handle_ldr_update(struct kvm_vcpu *vcpu)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] svm/avic: Fix invalidate logical APIC id entry
2019-03-26 3:57 [PATCH v2] svm/avic: Fix invalidate logical APIC id entry Suthikulpanit, Suravee
@ 2019-04-08 14:16 ` Suthikulpanit, Suravee
2019-04-09 16:39 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Suthikulpanit, Suravee @ 2019-04-08 14:16 UTC (permalink / raw)
To: linux-kernel, kvm; +Cc: joro, pbonzini, rkrcmar, vkuznets
Ping
On 3/26/19 10:57 AM, Suthikulpanit, Suravee wrote:
> Only clear the valid bit when invalidate logical APIC id entry.
> The current logic clear the valid bit, but also set the rest of
> the bits (including reserved bits) to 1.
>
> Fixes: 98d90582be2e ('svm: Fix AVIC DFR and LDR handling')
> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---
> arch/x86/kvm/svm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 7a4ce1a22ca0..8a123bd0f591 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -270,6 +270,7 @@ struct amd_svm_iommu_ir {
> };
>
> #define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK (0xFF)
> +#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT 31
> #define AVIC_LOGICAL_ID_ENTRY_VALID_MASK (1 << 31)
>
> #define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK (0xFFULL)
> @@ -4640,7 +4641,7 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu)
> u32 *entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat);
>
> if (entry)
> - WRITE_ONCE(*entry, (u32) ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK);
> + clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry);
> }
>
> static int avic_handle_ldr_update(struct kvm_vcpu *vcpu)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] svm/avic: Fix invalidate logical APIC id entry
2019-03-26 3:57 [PATCH v2] svm/avic: Fix invalidate logical APIC id entry Suthikulpanit, Suravee
2019-04-08 14:16 ` Suthikulpanit, Suravee
@ 2019-04-09 16:39 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2019-04-09 16:39 UTC (permalink / raw)
To: Suthikulpanit, Suravee, linux-kernel, kvm; +Cc: joro, rkrcmar, vkuznets
On 26/03/19 04:57, Suthikulpanit, Suravee wrote:
> Only clear the valid bit when invalidate logical APIC id entry.
> The current logic clear the valid bit, but also set the rest of
> the bits (including reserved bits) to 1.
>
> Fixes: 98d90582be2e ('svm: Fix AVIC DFR and LDR handling')
> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---
> arch/x86/kvm/svm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 7a4ce1a22ca0..8a123bd0f591 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -270,6 +270,7 @@ struct amd_svm_iommu_ir {
> };
>
> #define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK (0xFF)
> +#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT 31
> #define AVIC_LOGICAL_ID_ENTRY_VALID_MASK (1 << 31)
>
> #define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK (0xFFULL)
> @@ -4640,7 +4641,7 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu)
> u32 *entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat);
>
> if (entry)
> - WRITE_ONCE(*entry, (u32) ~AVIC_LOGICAL_ID_ENTRY_VALID_MASK);
> + clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry);
> }
>
> static int avic_handle_ldr_update(struct kvm_vcpu *vcpu)
>
Queued both this and the revert, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-09 16:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-26 3:57 [PATCH v2] svm/avic: Fix invalidate logical APIC id entry Suthikulpanit, Suravee
2019-04-08 14:16 ` Suthikulpanit, Suravee
2019-04-09 16:39 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).