Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933566AbcLNQQh (ORCPT ); Wed, 14 Dec 2016 11:16:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52582 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753757AbcLNQQf (ORCPT ); Wed, 14 Dec 2016 11:16:35 -0500 Subject: Re: [PATCH v2 2/4] KVM: x86: replace kvm_apic_id with kvm_{x,x2}apic_id To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20161213163001.4567-1-rkrcmar@redhat.com> <20161213163001.4567-3-rkrcmar@redhat.com> Cc: Paolo Bonzini , Igor Mammedov From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <304d7935-6a0a-2296-b611-02177c888bb5@redhat.com> Date: Wed, 14 Dec 2016 17:15:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20161213163001.4567-3-rkrcmar@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 14 Dec 2016 16:15:40 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1427 Lines: 56 > kvm_for_each_vcpu(i, vcpu, kvm) > if (kvm_apic_present(vcpu)) > - max_id = max(max_id, kvm_apic_id(vcpu->arch.apic)); > + max_id = max(max_id, kvm_x2apic_id(vcpu->arch.apic)); > > new = kvm_kvzalloc(sizeof(struct kvm_apic_map) + > sizeof(struct kvm_lapic *) * ((u64)max_id + 1)); > @@ -179,16 +189,23 @@ static void recalculate_apic_map(struct kvm *kvm) > struct kvm_lapic *apic = vcpu->arch.apic; > struct kvm_lapic **cluster; > u16 mask; > - u32 ldr, aid; > + u32 ldr; > + u8 xapic_id; > + u32 x2apic_id; > > if (!kvm_apic_present(vcpu)) > continue; > > - aid = kvm_apic_id(apic); think I'd even prefer here a simple aid = kvm_xapic_id(apic); if (apic_x2apic_mode(apic)) aid = kvm_x2apic_id(apic); that would keep changes minimal and I don't really see any benefit in the code when splitting handling up. Patch 4 then simply can fixup setting code if (aid <= new->max_apic_id && !new->phys_map[aid]) new->phys_map[aid] = apic; (if I am not missing some important corner case here) > - ldr = kvm_lapic_get_reg(apic, APIC_LDR); > + xapic_id = kvm_xapic_id(apic); > + x2apic_id = kvm_x2apic_id(apic); > > - if (aid <= new->max_apic_id) > - new->phys_map[aid] = apic; > + if (apic_x2apic_mode(apic) && > + x2apic_id <= new->max_apic_id) > + new->phys_map[x2apic_id] = apic; > + else if (!apic_x2apic_mode(apic)) This looks good to me. -- David