Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a4b933 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Allow 4K ptes with bit 7 (PAT) set 



Bit 7 is perfectly legal in the 4K page leve; it is used for the PAT.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e244584f

arch/x86/kvm/mmu.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2157,7 +2157,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		else

		else

			/* 32 bits PSE 4MB page */

			/* 32 bits PSE 4MB page */

			context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);

			context->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

		break;

	case PT32E_ROOT_LEVEL:

	case PT32E_ROOT_LEVEL:

		context->rsvd_bits_mask[0][2] =

		context->rsvd_bits_mask[0][2] =
@@ -2170,7 +2170,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

			rsvd_bits(maxphyaddr, 62) |

			rsvd_bits(maxphyaddr, 62) |

			rsvd_bits(13, 20);		/* large page */

			rsvd_bits(13, 20);		/* large page */

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

		break;

	case PT64_ROOT_LEVEL:

	case PT64_ROOT_LEVEL:

		context->rsvd_bits_mask[0][3] = exb_bit_rsvd |

		context->rsvd_bits_mask[0][3] = exb_bit_rsvd |
@@ -2186,7 +2186,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu, int level) 
		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

		context->rsvd_bits_mask[1][1] = exb_bit_rsvd |

			rsvd_bits(maxphyaddr, 51) |

			rsvd_bits(maxphyaddr, 51) |

			rsvd_bits(13, 20);		/* large page */

			rsvd_bits(13, 20);		/* large page */

		context->rsvd_bits_mask[1][0] = ~0ull;

		context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[1][0];

		break;

		break;

	}

	}

}

}