From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933719AbcGKKOj (ORCPT ); Mon, 11 Jul 2016 06:14:39 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34751 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933615AbcGKKOg (ORCPT ); Mon, 11 Jul 2016 06:14:36 -0400 Subject: Re: [PATCH v2 04/13] KVM: x86: dynamic kvm_apic_map To: Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20160707171550.14675-1-rkrcmar@redhat.com> <20160707171550.14675-5-rkrcmar@redhat.com> <963b542a-1111-db83-8338-c32d44f98874@gmail.com> Cc: "Lan, Tianyu" , Igor Mammedov , Jan Kiszka , Peter Xu From: Yang Zhang Message-ID: <3a5d86b6-9f1a-a6cf-8af4-ef6bf3936996@gmail.com> Date: Mon, 11 Jul 2016 18:14:31 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/7/11 15:43, Paolo Bonzini wrote: > > > On 11/07/2016 08:07, Yang Zhang wrote: >>> >>> mutex_lock(&kvm->arch.apic_map_lock); >>> >>> + kvm_for_each_vcpu(i, vcpu, kvm) >>> + if (kvm_apic_present(vcpu)) >>> + max_id = max(max_id, kvm_apic_id(vcpu->arch.apic)); >>> + >>> + new = kzalloc(sizeof(struct kvm_apic_map) + >>> + sizeof(struct kvm_lapic *) * (max_id + 1), >>> GFP_KERNEL); >>> + >> >> I think this may cause the host runs out of memory if a malicious guest >> did follow thing: >> 1. vcpu a is doing apic map recalculation. >> 2. vcpu b write the apic id with 0xff >> 3. then vcpu b enable the x2apic: in kvm_lapic_set_base(), we will set >> apic_base to new value before reset the apic id. >> 4. vcpu a may see the x2apic enabled in vcpu b plus an old apic >> id(0xff), and max_id will become (0xff >> 24). > > The bug is not really here but in patch 6---but you're right nevertheless! > > I guess the easiest solution is to replace kvm_apic_id with a field in > struct kvm_lapic, which is already shifted right by 24 in xAPIC mode. Or we can just simply put the assignment of apic_base to the end. diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index fdc05ae..9c69059 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1745,7 +1745,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) return; } - vcpu->arch.apic_base = value; /* update jump label if enable bit changes */ if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) { @@ -1753,7 +1752,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) static_key_slow_dec_deferred(&apic_hw_disabled); else static_key_slow_inc(&apic_hw_disabled.key); - recalculate_apic_map(vcpu->kvm); } if ((old_value ^ value) & X2APIC_ENABLE) { @@ -1764,6 +1762,8 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) kvm_x86_ops->set_virtual_x2apic_mode(vcpu, false); } + vcpu->arch.apic_base = value; + recalculate_apic_map(vcpu->kvm); apic->base_address = apic->vcpu->arch.apic_base & MSR_IA32_APICBASE_BASE; btw, i noticed that there is no apic map recalculation after turn off the x2apic mode.Is it correct? -- best regards yang