Commit 167f8a5c authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Rename "nxe" role bit to "efer_nx" for macro shenanigans 



Rename "nxe" to "efer_nx" so that future macro magic can use the pattern
<reg>_<bit> for all CR0, CR4, and EFER bits that included in the role.
Using "efer_nx" also makes it clear that the role bit reflects EFER.NX,
not the NX bit in the corresponding PTE.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210622175739.3610207-25-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8626c120

Documentation/virt/kvm/mmu.rst

+2 −2
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ Shadow pages contain the following information: 
  role.gpte_is_8_bytes:

    Reflects the size of the guest PTE for which the page is valid, i.e. '1'

    if 64-bit gptes are in use, '0' if 32-bit gptes are in use.

  role.nxe:

    Contains the value of efer.nxe for which the page is valid.

  role.efer_nx:

    Contains the value of efer.nx for which the page is valid.

  role.cr0_wp:

    Contains the value of cr0.wp for which the page is valid.

  role.smep_andnot_wp:

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ struct kvm_kernel_irq_routing_entry; 
 * by indirect shadow page can not be more than 15 bits.

 *

 * Currently, we used 14 bits that are @level, @gpte_is_8_bytes, @quadrant, @access,

 * @nxe, @cr0_wp, @smep_andnot_wp and @smap_andnot_wp.

 * @efer_nx, @cr0_wp, @smep_andnot_wp and @smap_andnot_wp.

 */

union kvm_mmu_page_role {

	u32 word;
@@ -285,7 +285,7 @@ union kvm_mmu_page_role { 
		unsigned direct:1;

		unsigned access:3;

		unsigned invalid:1;

		unsigned nxe:1;

		unsigned efer_nx:1;

		unsigned cr0_wp:1;

		unsigned smep_andnot_wp:1;

		unsigned smap_andnot_wp:1;

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -4567,7 +4567,7 @@ static union kvm_mmu_role kvm_calc_mmu_role_common(struct kvm_vcpu *vcpu, 
	union kvm_mmu_role role = {0};



	role.base.access = ACC_ALL;

	role.base.nxe = ____is_efer_nx(regs);

	role.base.efer_nx = ____is_efer_nx(regs);

	role.base.cr0_wp = ____is_cr0_wp(regs);

	role.base.smm = is_smm(vcpu);

	role.base.guest_mode = is_guest_mode(vcpu);

arch/x86/kvm/mmu/mmutrace.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
			 role.direct ? " direct" : "",			\

			 access_str[role.access],			\

			 role.invalid ? " invalid" : "",		\

			 role.nxe ? "" : "!",				\

			 role.efer_nx ? "" : "!",			\

			 role.ad_disabled ? "!" : "",			\

			 __entry->root_count,				\

			 __entry->unsync ? "unsync" : "sync", 0);	\

tools/lib/traceevent/plugins/plugin_kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ union kvm_mmu_page_role { 
		unsigned direct:1;

		unsigned access:3;

		unsigned invalid:1;

		unsigned nxe:1;

		unsigned efer_nx:1;

		unsigned cr0_wp:1;

		unsigned smep_and_not_wp:1;

		unsigned smap_and_not_wp:1;
@@ -403,7 +403,7 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record, 
				 access_str[role.access],

				 role.invalid ? " invalid" : "",

				 role.cr4_pae ? "" : "!",

				 role.nxe ? "" : "!",

				 role.efer_nx ? "" : "!",

				 role.cr0_wp ? "" : "!",

				 role.smep_and_not_wp ? " smep" : "",

				 role.smap_and_not_wp ? " smap" : "",