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: <c48a0191-d081-aad6-c65c-0c030dce8dcf@oracle.com>
Date:   Wed, 28 Sep 2022 16:50:15 -0400
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.0
Subject: Re: [PATCH v3 05/28] KVM: x86: Don't inhibit APICv/AVIC if xAPIC ID
 mismatch is due to 32-bit ID
Content-Language: en-US
To:     Sean Christopherson <seanjc@google.com>,
        Maxim Levitsky <mlevitsk@redhat.com>
Cc:     Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
        Li RongQing <lirongqing@baidu.com>
References: <20220920233134.940511-1-seanjc@google.com>
 <20220920233134.940511-6-seanjc@google.com>
 <d02d0b30-f29b-0ff6-98c7-89ddcd091c60@oracle.com>
 <e5d54876b233dc71a69249c3d02d649da5040a14.camel@redhat.com>
 <YzR7ezt67i1lH1/b@google.com>
From:   Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <YzR7ezt67i1lH1/b@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TXRNdU1mMXhaOGZIek51T0ozTTM1VHJFTlhmWExScTdWdVVZYUhjYmFyVUIw?=
 =?utf-8?B?WFBrZThvOTZmNDdMUTRHc2pWZUhVLzMzWnlPYVQ0cVIrTFVCT1o5RTZqcjZq?=
 =?utf-8?B?MnU1c09pTmQ4NmozNUlGVzhTYWdyOTJ6eEVlZTFKWmhCOGY1eCtySkt3c1RS?=
 =?utf-8?B?d2tkallHeUNhZXdIQzlYWFZuczY4VCtUYjJSK1RJTktFZmJOVWcxV0xZM21s?=
 =?utf-8?B?SE92a0trKzl2VUFOZjNFU2dNZWFNWkg3TmVDUXBpcDZCTUFMcmlJQjYyZllX?=
 =?utf-8?B?UmJ4SW80TWs4dWR6VTJhWVh5K01TVEV3WVRvZXBMUnp4VDVRV1lPNFFyaThS?=
 =?utf-8?B?Z3pHbmRQYWR5Ulk5M1RQdW5EYk1EK1o4Z2xwSHl4S3c3VE52cUFQaDdQaHh1?=
 =?utf-8?B?SEMrTjdOYitaMWtCaHN5QjhkM1VxSlRkR1N6cFR0WEpMVUJROWVObTlXUW9k?=
 =?utf-8?B?L09sY0xacmpobmlCbGp6TktLTkd1MXlxcHc1MmFyQVg2aDl2MWdIaDByeFB5?=
 =?utf-8?B?Mys5Z3dySEwyN1hQOUJJYnNtc0lqeHZDQWRJVVFVM0w0UmlIM2lHdEpIWkNs?=
 =?utf-8?B?YzFKajBoa0k3dmdTU1BwTmdoaFpJMGhmcFZqb0E0S2V0L2NWQ05hSWhyVUpx?=
 =?utf-8?B?VmNLNTVHN3lWOTFRdlR6NmJkUUxkbzBZTnlVWklTWVJkeVVrTjRBTlUwYWM0?=
 =?utf-8?B?anlNOU5CVFhFb094bWdXS080eDBKUHd4bno3YkZVUUlnTjZBV0VXV3ZZbVc0?=
 =?utf-8?B?WVBDZzB6MGEyVW9jRXNWOUVTd05haG1YOTVOVEtXdlZQbmZRQlcxbCtLSXYy?=
 =?utf-8?B?WHBtTVpKai9wY0h0aE5IOEV0Zys1bkdqd0R5aFVaL05JWGp3U3BKN0VqSHZt?=
 =?utf-8?B?dXBZU2ZDTERZb1U1SjFNeEN1TXlGZkxPSG01VERqVjdvQ21kaDhmRmVvOEgy?=
 =?utf-8?B?Y3pkSFNsTGxJZXM1RnY1Ukt5OHpqa0N3MlUrLy9NbldHcHg2ZEFZQlZXYWsr?=
 =?utf-8?B?OXM1MkNKaTVsNlFXeGtzVURRS2xkSUZQRnBHVU9NWFpUZGhPWkRiM0htdkMr?=
 =?utf-8?B?NFdUS3hNOTl0L1pQZGhkOWlBczBwUS9ZYWFqYk9SWmhlYk5hV0o0UktDSXpw?=
 =?utf-8?B?ZDhEQVJXRHBHRE82dTB4NGdFNHZ4WDU4SE5TUDQzKzJldDFtaU04SHpkNkk2?=
 =?utf-8?B?YjlWSEc2TWZiK2FEQUVPZUd4M0srMGpYMkJBRkJ4S0FBWjJjY3ZNbUFYNG1r?=
 =?utf-8?B?VEJiL0Iyc3dlRFFmR3VJQmh2WEg3WTJCVFFlWmpmUGgyV1NaRVJMQ0doMm1x?=
 =?utf-8?B?NkxwYmhoRzdjMHRaTmZFZkttaEQ0ZDFZTHVuTWxDNm1wdVY2aVRvbGd6MSt1?=
 =?utf-8?B?ek9Sc2xxcmhiS01tOWp2bDRiaWFKOWowdzhpNVhxOXp0V3B1UG5LSTRPWUE4?=
 =?utf-8?B?QzFiSC9YWUxnQjAyYkJHd09vakdyTnZCNVlZRk4xck9mYlpHVmxnb1ZFa0JQ?=
 =?utf-8?B?bndxU0o2UGsrNGtCemY0R0pLaFlRd3REbXBHRWRUcmZnNUM5b2VnT3YwZ2o4?=
 =?utf-8?B?aDhrMlk3aHNtV3Z3ZkFyVU9GVG8wWDgrbjQ1Y1lES1VkZWs5VmVBMndqQjh2?=
 =?utf-8?B?Q3FBRGFvb2tmWGpvM0JYWDgzWU1sOUd0VzNEaldTUHZGWDBOS1creE8zcVQ2?=
 =?utf-8?B?U3czamlucFdFZmc4QjAvSDlCMDcwcHd6NkRqeHp4N0Y3VUVIRXRheGNyNHVX?=
 =?utf-8?B?cGhxVUZXdDBjdHhGWFZxQ0w4LzVOUm0vbUJqbU9pYkl1Z2tkYzRXaWowbnpq?=
 =?utf-8?B?UWdMdUowVThDZEd2c3VOMlp3ME1HcDFqM1FDOXBuTU9PQ0xaRmtRR0M4Q0pp?=
 =?utf-8?B?NGpub0tWY1g5MFFLZlZobVBuT2pZNm93WXJNU2pHd2YwS2ZsNXBVaGpzS2F2?=
 =?utf-8?B?Z0Q4YU9ZR2hnRWI2eS9XUTZYRURNMjR4cWo4aGFxcy9rOXQ1bVJXb2FyTEdu?=
 =?utf-8?B?M1VmMXhmeEhyaktZemVBUHhGL2dGWnh3NEhWT3hiUUxSeXVzeGVnUkJOdG9u?=
 =?utf-8?B?NGJmWWFwUEZITGZSUFdmQkF3a3A5cDUxVkRtc2RzeUNvdm1MdWc2U3V3emFX?=
 =?utf-8?B?anp3TkV6M2FJY3hZS2E2d1R2SzZmWGFBazdjRjNsQ1VDWjIzQW1tQitEeUZh?=
 =?utf-8?B?bmc9PQ==?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ae113df-616c-486b-5648-08daa1930dd9
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5280.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 20:50:19.6269
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: uGcPeNHnWkLl3CT0uGS2Ck6tp6d+ucrnfF+L6Jjr0bssQ+thmxVdTaJTRlcaa4cAS/IWW9WneWKcJ9aTkxJOKidSPfSsXLztbAMnV1/B6OE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6367
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-28_09,2022-09-28_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 phishscore=0
 suspectscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000
 definitions=main-2209280123
X-Proofpoint-ORIG-GUID: MmpfDlTOcld_uYUEd-LsrJPQYQcO0cZv
X-Proofpoint-GUID: MmpfDlTOcld_uYUEd-LsrJPQYQcO0cZv
X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 9/28/2022 12:51 PM, Sean Christopherson wrote:
> On Wed, Sep 28, 2022, Maxim Levitsky wrote:
>> On Tue, 2022-09-27 at 23:15 -0400, Alejandro Jimenez wrote:
>>>
>>> On 9/20/2022 7:31 PM, Sean Christopherson wrote:
>>>> Truncate the vcpu_id, a.k.a. x2APIC ID, to an 8-bit value when comparing
>>>> it against the xAPIC ID to avoid false positives (sort of) on systems
>>>> with >255 CPUs, i.e. with IDs that don't fit into a u8.  The intent of
>>>> APIC_ID_MODIFIED is to inhibit APICv/AVIC when the xAPIC is changed from
>>>> it's original value,
>>>>
>>>> The mismatch isn't technically a false positive, as architecturally the
>>>> xAPIC IDs do end up being aliased in this scenario, and neither APICv
>>>> nor AVIC correctly handles IPI virtualization when there is aliasing.
>>>> However, KVM already deliberately does not honor the aliasing behavior
>>>> that results when an x2APIC ID gets truncated to an xAPIC ID.  I.e. the
>>>> resulting APICv/AVIC behavior is aligned with KVM's existing behavior
>>>> when KVM's x2APIC hotplug hack is effectively enabled.
>>>>
>>>> If/when KVM provides a way to disable the hotplug hack, APICv/AVIC can
>>>> piggyback whatever logic disables the optimized APIC map (which is what
>>>> provides the hotplug hack), i.e. so that KVM's optimized map and APIC
>>>> virtualization yield the same behavior.
>>>>
>>>> For now, fix the immediate problem of APIC virtualization being disabled
>>>> for large VMs, which is a much more pressing issue than ensuring KVM
>>>> honors architectural behavior for APIC ID aliasing.
>>>
>>> I built a host kernel with this entire series on top of mainline
>>> v6.0-rc6, and booting a guest with AVIC enabled works as expected on the
>>> initial boot. The issue is that during the first reboot AVIC is
>>> inhibited due to APICV_INHIBIT_REASON_APIC_ID_MODIFIED, and I see
>>> constant inhibition events due to APICV_INHIBIT_REASON_IRQWIN as seen in
>>
>>
>> APICV_INHIBIT_REASON_IRQWIN is OK, because that happens about every time
>> the good old PIT timer fires which happens on reboot.
>>
>> APICV_INHIBIT_REASON_APIC_ID_MODIFIED should not happen as you noted,
>> this needs investigation.
> 
> Ya, I'll take a look.
> 
>>> It happens regardless of vCPU count (tested with 2, 32, 255, 380, and
>>> 512 vCPUs). This state persists for all subsequent reboots, until the VM
>>> is terminated. For vCPU counts < 256, when x2apic is disabled the
>>> problem does not occur, and AVIC continues to work properly after reboots.
> 
> Bit of a shot in the dark, but does the below fix the issue? 
The patch below fixes the problems for all the scenarios I have tested 
so far.

Thank you,
Alejandro

  There are two
> issues with calling kvm_lapic_xapic_id_updated() from kvm_apic_state_fixup():
> 
>    1. The xAPIC ID should only be refreshed on "set".
> 
>    2. The refresh needs to be noted after memcpy(vcpu->arch.apic->regs, s->regs, sizeof(*s));
> 
> and a third bug in the helper itself, as changes to the ID should be ignored if
> the APIC is hardward disabled since the ID is reset to the vcpu_id when the APIC
> is hardware enabled (architecturally behavior).
> 
> ---
>   arch/x86/kvm/lapic.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 804d529d9bfb..b8b2faf5abc7 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2159,6 +2159,9 @@ static void kvm_lapic_xapic_id_updated(struct kvm_lapic *apic)
>   {
>   	struct kvm *kvm = apic->vcpu->kvm;
>   
> +	if (!kvm_apic_hw_enabled(apic))
> +		return;
> +
>   	if (KVM_BUG_ON(apic_x2apic_mode(apic), kvm))
>   		return;
>   
> @@ -2875,8 +2878,6 @@ static int kvm_apic_state_fixup(struct kvm_vcpu *vcpu,
>   			icr = __kvm_lapic_get_reg64(s->regs, APIC_ICR);
>   			__kvm_lapic_set_reg(s->regs, APIC_ICR2, icr >> 32);
>   		}
> -	} else {
> -		kvm_lapic_xapic_id_updated(vcpu->arch.apic);
>   	}
>   
>   	return 0;
> @@ -2912,6 +2913,9 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s)
>   	}
>   	memcpy(vcpu->arch.apic->regs, s->regs, sizeof(*s));
>   
> +	if (!apic_x2apic_mode(vcpu->arch.apic))
> +		kvm_lapic_xapic_id_updated(vcpu->arch.apic);
> +
>   	atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);
>   	kvm_recalculate_apic_map(vcpu->kvm);
>   	kvm_apic_set_version(vcpu);
> 
> base-commit: 0b502152c0b8523f399bdb53096e2d620c5795b5