Subject: Re: [PATCH v5 7/8] KVM: VMX: Update PID-pointer table entry when APIC
 ID is changed
To:     Zeng Guang <guang.zeng@intel.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Tony Luck <tony.luck@intel.com>,
        Kan Liang <kan.liang@linux.intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Kim Phillips <kim.phillips@amd.com>,
        Jarkko Sakkinen <jarkko@kernel.org>,
        Jethro Beekman <jethro@fortanix.com>,
        Kai Huang <kai.huang@intel.com>
Cc:     x86@kernel.org, linux-kernel@vger.kernel.org,
        Robert Hu <robert.hu@intel.com>, Gao Chao <chao.gao@intel.com>
References: <20211231142849.611-1-guang.zeng@intel.com>
 <20211231142849.611-8-guang.zeng@intel.com>
From:   Tom Lendacky <thomas.lendacky@amd.com>
Message-ID: <640e82f3-489d-60af-1d31-25096bef1a46@amd.com>
Date:   Wed, 5 Jan 2022 13:13:46 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <20211231142849.611-8-guang.zeng@intel.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a0xJM2UycXlRNHord0k1bFpoaXV2aTRvZlh0ODJ4K3ZZS3JCS2x0dXhKb0hS?=
 =?utf-8?B?eFJKYTloSUtMOEJmT0U3SHFtU3hGaTIxTVh1S2YzTWFWU1EwMS9MNmJSRWE2?=
 =?utf-8?B?WnZzdE1MbUdNV0ZRNHlLNnp2STNmcEx3ZFlWSFBUcDFYR2JES3VKTm0yMVdn?=
 =?utf-8?B?SGNLTnc2K1MrZmd1dlFieUlkc2lMVVFva2phL3V6OHlTZktpZFZJZFhyWWto?=
 =?utf-8?B?ZkxZQXJ3YXNGMUFmSlFkZXRBaTRsZ2xoUTgyakFaOE5SQXZvQ1J6dDRyKy8x?=
 =?utf-8?B?ZkN1OEtOR2VFbmRqNTkrWHVSL1paZlRpalJ5bkNmWXp4elRWZmFIemErYVQ4?=
 =?utf-8?B?TExSNFN0UERjeVRUb2Y3dFE5S0Rsd0lrM012bWV3QkkrQ1B6UEhEeG5WMFpZ?=
 =?utf-8?B?d2JlaDFTOFhPNmZwQkdwYm1ITFBNdDlLQlhsN3Y1NXFHNmZkb3VWY2FjK0VI?=
 =?utf-8?B?YVdCbmlIVXhXT1ZNbzZ4THZ6ek5ZM0hrSW1XbmZIbE5GSVROZDk2QkpqcHRI?=
 =?utf-8?B?UW5WNkx1YW0xb0g3bmFwWCtuZ0dZL1lhbjAzSUxNenZnYTd4ZlFZekR0K3Mw?=
 =?utf-8?B?N1FmQTZWVVZKQ3dvMlNLUUtXbkdXZ3JoWXlVTFkvTnIwa0R2UHd3QjlveGdX?=
 =?utf-8?B?dGZueXdlM1loUHpFWllnZTI2K3dSNnRDWGJISG9oeDVhZVdac1o4akdRaDB0?=
 =?utf-8?B?dUVEQmg4UWNxM2JsdGN5N3BXMTk1a0ovQUExZmdjNWtGYkpmVkdPTnJueDJv?=
 =?utf-8?B?V0ZFNEJHdG5DYmJjb2RqV2ZlRURhdlhIQ2ozM3NrNkJPYVRHUjR2aVhLMGpK?=
 =?utf-8?B?ODVybE9WZEs2M2lFQUdZby9yOEVWd2ExZGRjR0R6OTBlMk1RbTRBdy9jQ2cr?=
 =?utf-8?B?SURtNVk0NW9wYStZTi9obEFSa0FtZDl2UmRPdlhZaWltMXR3VmJIcnBId2lu?=
 =?utf-8?B?em9aT1JtUnRidExLWTZ6ZHQ5K1haYmFMY2tPUDRtNG9yRVNmR0hyai9aN29z?=
 =?utf-8?B?YlJmWWc2UHphVTZxOFBsWmovbUZyMS9nT1hqd25IREV1ZnQ4N296Q08vbFNL?=
 =?utf-8?B?aERsRkFFMERHem9zWlRlTWJiU3Q3ZHhrcVpoanNzeHBmZ241V0FCbWJ0Q2Fh?=
 =?utf-8?B?RDFGWnk0ejhQYzNIU2hmNGxpR0l1WmR5VmpHb09iazE1UU9aOFlTV3JJRUg2?=
 =?utf-8?B?TjI5NFRSaWVxVGZBVmhaUXR5Q2oyVUhMK3lkV0RQVFRwQ1U3Qy9GREl2dUta?=
 =?utf-8?B?T2twelVkSzZBZHNZWUxsNE9RQ1BjSUo0U1JCbjZpRnBZQmEvZFh1WFNRN2Ft?=
 =?utf-8?B?RXZTTmM4LzB5MDIrS0lldHEyeEJzYUMvZnBxblNiMjBpbHN0OXYxOFQyUFpD?=
 =?utf-8?B?a3lQYTA1b2xqUnJDcGM0ekZOUDVIbGVjOG1jdm9BR2hXSk5tZExNR3lLL2FX?=
 =?utf-8?B?UUlERlJXLytsc3ptM1hod3JCVHdkN1FacWIxZjlvNzdYT0loS0w3MjBPd1NP?=
 =?utf-8?B?azdWQi90N3c0amdGYldHbVRPcjQ5QVV1QkFDZkQyUFg4SXBVbmE5SVlsWmYv?=
 =?utf-8?B?Z240TVVURW43bTBKOVBDeTAyNTd3QXJNcE9sb1V5ODVxTDB2ZFlETnB6ZTFi?=
 =?utf-8?B?bW8vVThIK0JqNnVCM2tRbmM3aHM5MVo0RzF2MGNLbkhiVklhN245bkQzdCtu?=
 =?utf-8?B?L0dOY2g1ZUMwWmVxWWZRVEZuRzRYaFNwcWdoRllzOXhDRjFRYVZsMUZ2dTJK?=
 =?utf-8?B?OGlXaWd1eGJBeEN1azB0Mkd6WTBuOU04Q1cyMW9sSTFOa2xsOXBqNzJYdFNQ?=
 =?utf-8?B?a2g0and3Q3N6anBQNnRsWlpxMzUzWnpwMEtYK1hROW5OTDJOdWJ1ZFFtdnp0?=
 =?utf-8?B?SnVXaWhjL1E4QXV1bHU3NTZDVEtNRlcwVzNVVmcvcjhMVUZyNkhrWTBCZ2pO?=
 =?utf-8?B?YW94K1ZTVldOVmx5V0hSeWFJRldEU2QrVzlIMWpIczhYcVIzSG0wL3JoQjA4?=
 =?utf-8?B?Z3lBeUljakFWTFRra29ocTRmbnlmdFpBQlpERGpsRUZPMHRZclByOHFVbllR?=
 =?utf-8?B?MmNPL2Q5RERrZnhObVE4dkV2eEkvMktURzhhOUdXQXd3cnFkM0NSeFNzSzBH?=
 =?utf-8?B?WnhXd1ZTcjFidS9ZQ1RDNlNRSHFLWlEwdGNaMnI3Qm5kMVhGaEkzNXcyeHdi?=
 =?utf-8?Q?yf2CbDgIraQVOQp/SAnXsfo=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 03001b38-7bc4-4966-3a7e-08d9d07f815c
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5229.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 19:13:50.1583
 (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: /n2XML08Lto0gUFCO4qcfqc/EhagYQeplb/TS2noTQrSLW69gBWWm2x7mh65L/Ug3S1raJphJskyrrQZVOSS6w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5414
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/31/21 8:28 AM, Zeng Guang wrote:
> In xAPIC mode, guest is allowed to modify APIC ID at runtime.
> If IPI virtualization is enabled, corresponding entry in
> PID-pointer table need change accordingly.
> 
> Signed-off-by: Zeng Guang <guang.zeng@intel.com>
> ---
>   arch/x86/include/asm/kvm_host.h |  1 +
>   arch/x86/kvm/lapic.c            |  7 +++++--
>   arch/x86/kvm/vmx/vmx.c          | 12 ++++++++++++
>   3 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index 2164b9f4c7b0..753bf2a7cebc 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1493,6 +1493,7 @@ struct kvm_x86_ops {
>   	int (*complete_emulated_msr)(struct kvm_vcpu *vcpu, int err);
>   
>   	void (*vcpu_deliver_sipi_vector)(struct kvm_vcpu *vcpu, u8 vector);
> +	void (*update_ipiv_pid_entry)(struct kvm_vcpu *vcpu, u8 old_id, u8 new_id);
>   };
>   
>   struct kvm_x86_nested_ops {
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 3ce7142ba00e..83c2c7594bcd 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2007,9 +2007,12 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
>   
>   	switch (reg) {
>   	case APIC_ID:		/* Local APIC ID */
> -		if (!apic_x2apic_mode(apic))
> +		if (!apic_x2apic_mode(apic)) {
> +			u8 old_id = kvm_lapic_get_reg(apic, APIC_ID) >> 24;
> +
>   			kvm_apic_set_xapic_id(apic, val >> 24);
> -		else
> +			kvm_x86_ops.update_ipiv_pid_entry(apic->vcpu, old_id, val >> 24);

Won't this blow up on AMD since there is no corresponding SVM op?

Thanks,
Tom

> +		} else
>   			ret = 1;
>   		break;
>   
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 2e65464d6dee..f21ce15c5eb8 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -7633,6 +7633,17 @@ static void vmx_vm_destroy(struct kvm *kvm)
>   		free_pages((unsigned long)kvm_vmx->pid_table, MAX_PID_TABLE_ORDER);
>   }
>   
> +static void vmx_update_ipiv_pid_entry(struct kvm_vcpu *vcpu, u8 old_id, u8 new_id)
> +{
> +	if (enable_ipiv && kvm_vcpu_apicv_active(vcpu)) {
> +		u64 *pid_table = to_kvm_vmx(vcpu->kvm)->pid_table;
> +
> +		WRITE_ONCE(pid_table[old_id], 0);
> +		WRITE_ONCE(pid_table[new_id], __pa(&to_vmx(vcpu)->pi_desc) |
> +				PID_TABLE_ENTRY_VALID);
> +	}
> +}
> +
>   static struct kvm_x86_ops vmx_x86_ops __initdata = {
>   	.name = "kvm_intel",
>   
> @@ -7770,6 +7781,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
>   	.complete_emulated_msr = kvm_complete_insn_gp,
>   
>   	.vcpu_deliver_sipi_vector = kvm_vcpu_deliver_sipi_vector,
> +	.update_ipiv_pid_entry = vmx_update_ipiv_pid_entry,
>   };
>   
>   static __init void vmx_setup_user_return_msrs(void)
>