Commit f96fb2df authored by Uros Bizjak's avatar Uros Bizjak Committed by Borislav Petkov (AMD)

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: a68c439b ("apic, x86: Check if EILVT APIC registers are available (AMD only)")
Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230227160917.107820-1-ubizjak@gmail.com
parent 5b422b9b
...@@ -422,10 +422,9 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new) ...@@ -422,10 +422,9 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new)
if (vector && !eilvt_entry_is_changeable(vector, new)) if (vector && !eilvt_entry_is_changeable(vector, new))
/* may not change if vectors are different */ /* may not change if vectors are different */
return rsvd; return rsvd;
rsvd = atomic_cmpxchg(&eilvt_offsets[offset], rsvd, new); } while (!atomic_try_cmpxchg(&eilvt_offsets[offset], &rsvd, new));
} while (rsvd != new);
rsvd &= ~APIC_EILVT_MASKED; rsvd = new & ~APIC_EILVT_MASKED;
if (rsvd && rsvd != vector) if (rsvd && rsvd != vector)
pr_info("LVT offset %d assigned for vector 0x%02x\n", pr_info("LVT offset %d assigned for vector 0x%02x\n",
offset, rsvd); offset, rsvd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment