Skip to contentSkip to conversation

x86/apic: Fix atomic update of offset in reserve_eilvt_offset

PATCH Applied Uros Bizjak 2 participants 2 messages Feb 27, 2023 – Apr 7, 2023 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/apic: Fix atomic update of offset in reserve_eilvt_offset

The detection of atomic update failure in reserve_eilvt_offset is not correct. The value, returned by atomic_cmpxchg should be compared to the old value from the location to be updated. If these two are the same, then atomic update succeeded and "eilvt_offsets[offset]" location is updated to "new" in an atomic way. Otherwise, the atomic update failed and it should be retried with the value from "eilvt_offsets[offset]" - exactly what atomic_try_cmpxchg does in a correct and more optimal way.

Fixes a68c439b1966c ("apic, x86: Check if EILVT APIC registers are available (AMD only)")
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
---
 arch/x86/kernel/apic/apic.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/apic.c +2 -3
index 20d9a604da7c..770557110051 100644
@@ -422,10 +422,9 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new)
 		if (vector && !eilvt_entry_is_changeable(vector, new))
 			/* may not change if vectors are different */
 			return rsvd;
-		rsvd = atomic_cmpxchg(&eilvt_offsets[offset], rsvd, new);
-	} while (rsvd != new);
+	} while (!atomic_try_cmpxchg(&eilvt_offsets[offset], &rsvd, new));
 
-	rsvd &= ~APIC_EILVT_MASKED;
+	rsvd = new & ~APIC_EILVT_MASKED;
 	if (rsvd && rsvd != vector)
 		pr_info("LVT offset %d assigned for vector 0x%02x\n",
 			offset, rsvd);
Signature · 1 line
2.39.2
merge bot Applied
#1 lore raw

[tip: x86/apic] x86/apic: Fix atomic update of offset in reserve_eilvt_offset()

The following commit has been merged into the x86/apic branch of tip:

The following commit has been merged into the x86/apic branch of tip:

Commit-ID:     f96fb2df3eb31ede1b34b0521560967310267750
Gitweb:        https://git.kernel.org/tip/f96fb2df3eb31ede1b34b0521560967310267750
Author:        Uros Bizjak <[email protected]>
AuthorDate:    Mon, 27 Feb 2023 17:09:17 +01:00
Committer:     Borislav Petkov (AMD) <[email protected]>
CommitterDate: Fri, 07 Apr 2023 14:34:24 +02:00

x86/apic: Fix atomic update of offset in reserve_eilvt_offset()

The detection of atomic update failure in reserve_eilvt_offset() is not correct. The value returned by atomic_cmpxchg() should be compared to the old value from the location to be updated.

If these two are the same, then atomic update succeeded and "eilvt_offsets[offset]" location is updated to "new" in an atomic way.

Otherwise, the atomic update failed and it should be retried with the value from "eilvt_offsets[offset]" - exactly what atomic_try_cmpxchg() does in a correct and more optimal way.

Fixes a68c439b1966c ("apic, x86: Check if EILVT APIC registers are available (AMD only)")
---
 arch/x86/kernel/apic/apic.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/apic.c +2 -3
index 20d9a60..7705571 100644
@@ -422,10 +422,9 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new)
 		if (vector && !eilvt_entry_is_changeable(vector, new))
 			/* may not change if vectors are different */
 			return rsvd;
-		rsvd = atomic_cmpxchg(&eilvt_offsets[offset], rsvd, new);
-	} while (rsvd != new);
+	} while (!atomic_try_cmpxchg(&eilvt_offsets[offset], &rsvd, new));
 
-	rsvd &= ~APIC_EILVT_MASKED;
+	rsvd = new & ~APIC_EILVT_MASKED;
 	if (rsvd && rsvd != vector)
 		pr_info("LVT offset %d assigned for vector 0x%02x\n",
 			offset, rsvd);