Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <1f157cca-a71e-cdee-4427-e1f4bb1b1115@redhat.com>
Date:   Tue, 27 Dec 2022 12:30:18 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.1
Subject: Re: [PATCH v4 19/32] KVM: x86: Explicitly track all possibilities for
 APIC map's logical modes
Content-Language: en-US
To:     Sean Christopherson <seanjc@google.com>,
        Maxim Levitsky <mlevitsk@redhat.com>
Cc:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alejandro Jimenez <alejandro.j.jimenez@oracle.com>,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
        Li RongQing <lirongqing@baidu.com>
References: <20221001005915.2041642-1-seanjc@google.com>
 <20221001005915.2041642-20-seanjc@google.com>
 <96c369fb2042e8722256d36c9b2ccf4a930752d1.camel@redhat.com>
 <Y5y7VK9yk5qbfKVN@google.com> <Y50AhU1UwocNE/+M@google.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
In-Reply-To: <Y50AhU1UwocNE/+M@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 12/17/22 00:34, Sean Christopherson wrote:
> On Fri, Dec 16, 2022, Sean Christopherson wrote:
>> On Thu, Dec 08, 2022, Maxim Levitsky wrote:
> 
> ...
> 
>>>> @@ -282,7 +291,8 @@ void kvm_recalculate_apic_map(struct kvm *kvm)
>>>>   		if (!apic_x2apic_mode(apic) && !new->phys_map[xapic_id])
>>>>   			new->phys_map[xapic_id] = apic;
>>>>   
>>>> -		if (!kvm_apic_sw_enabled(apic))
>>>> +		if (new->logical_mode == KVM_APIC_MODE_MAP_DISABLED ||
>>>> +		    !kvm_apic_sw_enabled(apic))
>>>>   			continue;
>>> Very minor nitpick: it feels to me that code that updates the logical mode of the
>>> map, might be better to be in a function, or in 'if', like
>>
>> An if-statement would be rough due to the indentation.  A function works well
>> though, especially if both the physical and logical chunks are put into helpers.
>> E.g. the patch at the bottom (with other fixup for this patch) yields:
>>
>> 	new->max_apic_id = max_id;
>> 	new->logical_mode = KVM_APIC_MODE_SW_DISABLED;
>>
>> 	kvm_for_each_vcpu(i, vcpu, kvm) {
>> 		if (!kvm_apic_present(vcpu))
>> 			continue;
>>
>> 		if (kvm_recalculate_phys_map(new, vcpu, &xapic_id_mismatch)) {
>> 			kvfree(new);
>> 			new = NULL;
>> 			goto out;
>> 		}
>>
>> 		kvm_recalculate_logical_map(new, vcpu);
>> 	}
>>
>> I'll tack that patch on at the end of the series if it looks ok.

Yes, please send as a follow up.

Paolo