]> www.infradead.org Git - users/jedix/linux-maple.git/commit
KVM: x86: Avoid double RDPKRU when loading host/guest PKRU
authorSean Christopherson <seanjc@google.com>
Sat, 21 Dec 2024 01:16:47 +0000 (17:16 -0800)
committerSean Christopherson <seanjc@google.com>
Wed, 8 Jan 2025 22:08:25 +0000 (14:08 -0800)
commit4c20cd4cee929aef89118ac8820cefab427c6ae1
treeb5a42f0bf35bf9e7d428a58d0e6c69c7fbc66f32
parentd6470627f5840057ae4d94ed070ec23457cb60d6
KVM: x86: Avoid double RDPKRU when loading host/guest PKRU

Use the raw wrpkru() helper when loading the guest/host's PKRU on switch
to/from guest context, as the write_pkru() wrapper incurs an unnecessary
rdpkru().  In both paths, KVM is guaranteed to have performed RDPKRU since
the last possible write, i.e. KVM has a fresh cache of the current value
in hardware.

This effectively restores KVM's behavior to that of KVM prior to commit
c806e88734b9 ("x86/pkeys: Provide *pkru() helpers"), which renamed the raw
helper from __write_pkru() => wrpkru(), and turned __write_pkru() into a
wrapper.  Commit 577ff465f5a6 ("x86/fpu: Only write PKRU if it is different
from current") then added the extra RDPKRU to avoid an unnecessary WRPKRU,
but completely missed that KVM already optimized away pointless writes.

Reported-by: Adrian Hunter <adrian.hunter@intel.com>
Fixes: 577ff465f5a6 ("x86/fpu: Only write PKRU if it is different from current")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20241221011647.3747448-1-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/x86.c