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: <d88bd755-8e41-a1bb-d9f1-5755ddfcc83d@amd.com>
Date:   Tue, 1 Mar 2022 21:02:49 +0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.6.1
Subject: Re: [RFC PATCH 12/13] KVM: SVM: Remove APICv inhibit reasone due to
 x2APIC
Content-Language: en-US
To:     Maxim Levitsky <mlevitsk@redhat.com>, linux-kernel@vger.kernel.org,
        kvm@vger.kernel.org
Cc:     pbonzini@redhat.com, seanjc@google.com, joro@8bytes.org,
        jon.grimm@amd.com, wei.huang2@amd.com, terry.bowman@amd.com
References: <20220221021922.733373-1-suravee.suthikulpanit@amd.com>
 <20220221021922.733373-13-suravee.suthikulpanit@amd.com>
 <e18ed786f77e4abec112cafef69608883099e19f.camel@redhat.com>
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
In-Reply-To: <e18ed786f77e4abec112cafef69608883099e19f.camel@redhat.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?MG5tZ2RBQXgrRHhkSmhuNUdreGlkd3d6MkVNN1NwNmVweUdjV1R6N1FJb2NI?=
 =?utf-8?B?ckVIRjZkY3poeXRmQWNvNUl5cWlMMEd0ZDgwQWlmeXJqVU13dUE4US9KMW9K?=
 =?utf-8?B?VnVXYnk5WFhzOHNzek5ZL0l5UlRvNmJPakYwMHRqQ2loZHEwSUdpOGVDcjFx?=
 =?utf-8?B?MWhwNVZwdUVpUEtZMDRRekl1RWpkNUxuT1RhaGFiSk14cWlITksyd25jeTNG?=
 =?utf-8?B?VG5RZ0M0eHg4T3hYN1pJZFpLYkdWRUdkckcwT2RtTjh1ckhacTlQb05oZFgr?=
 =?utf-8?B?azgxY1BqNzQ5SEJxSmM5eDUwRCtEYzRTS2tpYnpDQmU5WlVJVFZpbkhTbVpl?=
 =?utf-8?B?cDdnNG5RYVhkTENtYzNUamdSb0RINXZYMDdEZHJhMEFQenFTTTVmeW1xSldL?=
 =?utf-8?B?Vk1NV0p1ajB1L1pYWHpiRDZ5T2R3b1RUV3ZlUE1KNW9lVXRScGdlWHc3enYy?=
 =?utf-8?B?SkllWWJlaUZmK05tdVZqdXhjL1IzSmgyYkZFOUNEdk53bDlEalUvcmtCdTVk?=
 =?utf-8?B?b3J2dzhaVzVvWC9vVnNyM2t3S1RqSnEzNnV6N01VMWpITW1pWUFEb3NUbzhQ?=
 =?utf-8?B?b2tabVdwTDdiZUhycWp1cWtveEppWGNzU053ZlowYXpTREFXeXNEVW1mRjdy?=
 =?utf-8?B?TnVPeFhuUTZ6aWVwVGxsRDBwcDNIQk82TnFIaHdVeHM2WTRQbHlBNUg2SVFD?=
 =?utf-8?B?N3dESzB0dGd3SUlLZThNQmVzVHpXTGtFVkJDeWpQVWcralBSUCs1ci9KTXlP?=
 =?utf-8?B?SHN6b1RtaEdKOUdCalZQdW9OazVBQklQcWRDZFk3ekp6OEo2bmJiejc0cGVX?=
 =?utf-8?B?amp4b2pEdWRpbFk2aVY1a000TnNjd1NyQWNQK2RKNDVwZUIwdEtZWnVvQ1l4?=
 =?utf-8?B?TFh0RkZoVzEvOE0yT0ZKR3Y2bG1BYU5hZjRneUN5SVVaSGtXUktRTU4vNnRL?=
 =?utf-8?B?VG52T3hwZTFXWDZlU2RZZUFIK09EVWphaFJhcnhvL0hYWlppVXBkNkl0NFZ2?=
 =?utf-8?B?RVRpaWQ3ZjMxRHA1WHJKQlpRYmQ1N2xydnVaMVZyM1dmdk54aUJ5SkJ6a205?=
 =?utf-8?B?TjBockxHSytGamYwZm1JQzN6ZG9yRmxnQlBWUUJYbFFhVTRuR2VMWlVISE05?=
 =?utf-8?B?ODFJUFFQSXhsamh6dG0wZ3VNTFBTQTBDb3hwU0ZVVS9hUjMzZDdqM1BnTlVY?=
 =?utf-8?B?TlYyM3FOajRWMzIzd3VjeXkrZ2dIZHRNWjZMNWRBQVh0UUZ1cjJ6RCt6SUpE?=
 =?utf-8?B?SjA4LzI1ZnhHbzRtRFRvNWM4YTJ1WjdISGdvVEUvSUY5aE41SzNERnVhSTlu?=
 =?utf-8?B?NDRrN2Y1Q1FRVHFWeHRYUTI1RnlHQkNCM3NWaHRqMW5jMzhHaWdwWFFLN3cy?=
 =?utf-8?B?KzJSNzVWTVJ6UGJEQW44NDR3UzhaVzNETUdaMkxWcWttQ3R6aGNjTUg1R0dE?=
 =?utf-8?B?eXZtY2kzOUs0NzlERTFZNHlLeUJ6UXVNQkxRaXlOMmtsNjdYQ3pvcXg3K3RQ?=
 =?utf-8?B?ZnZLZHkzMUtsY01Tc1NjYWJYM0pzd0d0cWFPb1NFZWRQOFVkUW44WlkySUcr?=
 =?utf-8?B?MUxvNTRMajJSbFRYdnZqZUlhd2hZT3hwZHh4U210dlkrWVNuZXk5V0VoK0hp?=
 =?utf-8?B?R0xJMGlLRE9YK1pWNUpaMlhmaDZuUWlFaTgweVpoTzEyRzh6ekdUbXEyRUZW?=
 =?utf-8?B?MVNlQzI1OHFaeFhHU0svcW1zenh6ZlZQN0FaODhtVnRjT0FoM21ESVVuQWg4?=
 =?utf-8?B?aEpZNy9nZUdFR1ZrSGJWM0xCRmZMODdpMWRGQ3pCS3d6N2JMUllTZkEwWFhl?=
 =?utf-8?B?d1YxQW0vVlZoK0IvWGtnamRSRVlpU2YzMUUxVGFEVVhwdzNMd1JlNjBkcXB4?=
 =?utf-8?B?eXNrYWNRMXNwVklCakJjWXY4MjFtUGxERmRnOVRXRVdOdzlnVlExcldXUEp5?=
 =?utf-8?B?bmxwdlNCazgvRko1bWtBWXIxTlp6UVV1YWlXZ1oxOFh1WS9OQWk4SWVvZ0Fj?=
 =?utf-8?B?ckljMG9BZzA3M0ZsWE5HNmtWRGhaOXArUUM4eURhZWhBZnlDUE1EWTRhMEhP?=
 =?utf-8?B?R1dPNmZMUnhBNlVGRU4yaEJNbXUwWFVTUmxvZzJFc09SV3YrRXlLVWxvNk1m?=
 =?utf-8?B?N3BDMFdLYU96SlJRYitrWTNXU2hIOGdMRWsrWVoyaXcrSkRPVEVxSnNtM0N3?=
 =?utf-8?Q?XgRffhZQbjJHx2WO7alwQAA=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c1a74599-8134-442d-60f0-08d9fb8c3241
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5445.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 14:03:01.0055
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0xtmHl3R3dyv+J798vNvgCLP9Ni2D1W17rAeYByVSpRetK2xcb0YTZLg4Qz8lA2YZ9ePp8Ic0UBb3d1zoKxZqw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3570
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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

Hi Maxim,

On 2/25/22 3:06 AM, Maxim Levitsky wrote:
> On Sun, 2022-02-20 at 20:19 -0600, Suravee Suthikulpanit wrote:
>> Currently, AVIC is inactive when booting a VM w/ x2APIC support.
>> With x2AVIC support, the APICV_INHIBIT_REASON_X2APIC can be removed.
> The commit title is a bit misleading - the inhibit reason is not removed,
> but rather AVIC is not inhibited when x2avic is present.
> 

I'll fix the commit message.

>> Signed-off-by: Suravee Suthikulpanit<suravee.suthikulpanit@amd.com>
>> ---
>>   arch/x86/kvm/svm/avic.c | 21 +++++++++++++++++++++
>>   arch/x86/kvm/svm/svm.c  | 18 ++----------------
>>   arch/x86/kvm/svm/svm.h  |  1 +
>>   3 files changed, 24 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c
>> index 3306b74f1d8b..874c89f8fd47 100644
>> --- a/arch/x86/kvm/svm/avic.c
>> +++ b/arch/x86/kvm/svm/avic.c
>> @@ -21,6 +21,7 @@
>>   
>>   #include <asm/irq_remapping.h>
>>   
>> +#include "cpuid.h"
>>   #include "trace.h"
>>   #include "lapic.h"
>>   #include "x86.h"
>> @@ -176,6 +177,26 @@ void avic_vm_destroy(struct kvm *kvm)
>>   	spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);
>>   }
>>   
>> +void avic_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu, int nested)
>> +{
>> +	/*
>> +	 * If the X2APIC feature is exposed to the guest,
>> +	 * disable AVIC unless X2AVIC mode is enabled.
>> +	 */
>> +	if (avic_mode == AVIC_MODE_X1 &&
>> +	    guest_cpuid_has(vcpu, X86_FEATURE_X2APIC))
>> +		kvm_request_apicv_update(vcpu->kvm, false,
>> +					 APICV_INHIBIT_REASON_X2APIC);
>> +
>> +	/*
>> +	 * Currently, AVIC does not work with nested virtualization.
>> +	 * So, we disable AVIC when cpuid for SVM is set in the L1 guest.
>> +	 */
>> +	if (nested && guest_cpuid_has(vcpu, X86_FEATURE_SVM))
>> +		kvm_request_apicv_update(vcpu->kvm, false,
>> +					 APICV_INHIBIT_REASON_NESTED);
> BTW, now that I am thinking about it, it would be nice to be able to force
> the AVIC_MODE_X1 even if x2avic is present, for debug purposes from a module
> param. Just a suggestion.

Actually, we can force AVIC_MODE_X1 on a VM by disabling Guest x2APIC mode via QEMU option.
That should work for debugging purpose, right?

Regards,
Suravee