Re: [PATCH 11/11] KVM: SVM: Optimize nested svm msrpm merging

Alexander Graf
2010-02-24T19:27:50Z

On 24.02.2010, at 18:59, Joerg Roedel wrote:

> This patch optimizes the way the msrpm of the host and the
> guest are merged. The old code merged the 2 msrpm pages
> completly. This code needed to touch 24kb of memory for that
> operation. The optimized variant this patch introduces
> merges only the parts where the host msrpm may contain zero
> bits. This reduces the amount of memory which is touched to
> 48 bytes.

Nice catch!

>
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> ---
> arch/x86/kvm/svm.c | 45 ++++++++++++++++++++++++++++++++++++---------
> 1 files changed, 36 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index ae2f211..eb25fea 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -754,6 +754,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)
> svm->nested.hsave = page_address(hsave_page);
>
> svm->nested.msrpm = page_address(nested_msrpm_pages);
> + svm_vcpu_init_msrpm(svm->nested.msrpm);
>
> svm->vmcb = page_address(page);
> clear_page(svm->vmcb);
> @@ -1824,20 +1825,46 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
>
> static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm)
> {
> - u32 *nested_msrpm;
> - struct page *page;
> + /*
> + * This function merges the msr permission bitmaps of kvm and the
> + * nested vmcb. It is omptimized in that it only merges the parts where
> + * the kvm msr permission bitmap may contain zero bits
> + */
> + static const u32 msrpm_offsets[] = {
> + 0x0000002c, /* SYSENTER_CS */
> +
> + 0x00000038, /* LASTBRANCHFROMIP
> + LASTBRANCHTOIP
> + LASTINTFROMIP
> + LASTINTTOIP */
> +
> + 0x00000820, /* STAR
> + LSTAR
> + CSTAR
> + SYSCALL_MASK */
> +
> + 0x00000840, /* FS_BASE
> + GS_BASE
> + KERNEL_GS_BASE */
> +
> + 0xffffffff, /* End of List */

Isn't there such a list around somewhere already? We really should only keep this list once throughout the whole code. If necessary, just create the list on the fly when bits get set in the msrpm.

Alex