Message-ID: <c653acea-d060-ed81-d3a0-c7379ecb0799@amd.com>
Date:   Thu, 16 Feb 2023 03:20:38 +0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH v2 3/3] KVM: SVM: WARN if GATag generation drops VM or
 vCPU ID information
Content-Language: en-US
To:     Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
References: <20230207002156.521736-1-seanjc@google.com>
 <20230207002156.521736-4-seanjc@google.com>
From:   "Suthikulpanit, Suravee" <suravee.suthikulpanit@amd.com>
In-Reply-To: <20230207002156.521736-4-seanjc@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?K2pxZWU2N3N6eENaNUVZN1d1OFFCUVhUMDE1NjdlQjdRLzFtRFlteitHUFc5?=
 =?utf-8?B?bnFCWWhXUWVyZTRRaEVrTjRiUnc2N1FpU05MaDluMzVMOHV3d2VGeWdsbEQr?=
 =?utf-8?B?UTlEQlIrdVVtVStuNnQwL2kxQy9TVlZqQU9Ubzl3U1VaZDQ4b04xN0paT0x1?=
 =?utf-8?B?RStEMEhKTC8xWlRhMnJNQmxORGJJNU9rVkFaV2dCTGo2eWN6TEczcWczRS96?=
 =?utf-8?B?K0RqL0lQWVBNc0tNdU5XOVowRSthWFVtQm0rWXdpem8yNStKblVkM0ZNS284?=
 =?utf-8?B?NGs3c2dadEVwRC9QcFlSWmxTamJ3M1hpQ3RMNXRsVkZQOGg1VVVQOVllZzNY?=
 =?utf-8?B?ejYvaDVNU2tOOG5NdnBKSFRMWVNYdldqVWwyTEN0QXpGVUxIUjFiT0hpSGdt?=
 =?utf-8?B?RVpUZ2NCdEZ0WGg2R21IbFl4a041eWpWSUMxN0xWWXB0bzJqY0x5ZVVuNm1Y?=
 =?utf-8?B?aTUyTWRwcDBsQUh2dE9YWXQzcGVpTE8yLzRYTTdmTE9OZ2VHcmhLYlhOVzJZ?=
 =?utf-8?B?QTI0MTBhcVllalFRblBkNDYxMjlEeUMxaysvakRNQ1Q5Tk1Gb3lvc1dQOEFu?=
 =?utf-8?B?d1R6bmVVSHoxVS9TL1QyUFp5b2dNaXZaUzZFYzZjd3FaV2JaTkVtUnlRUFNt?=
 =?utf-8?B?eXc4ek5CWTRtdkNURGZQMDV2andwbW93VmNiU1dySzdxL1AzZ3I4VUEyU2RM?=
 =?utf-8?B?ckljT0EwaEk3VFlDVStjbDExSjJPeWFzM1hTS29qYkpMbG93NXpTSVRWZDhk?=
 =?utf-8?B?cEI2aDdwV01jV1ZyZDZ1VDUxTkNSeEdEbUk0TGJtL01uL0hCRGsvbkxTZU9K?=
 =?utf-8?B?T3NDbFd3Q3NrVmpMcE91UXU3dTJEa1U0YjY2NnFQWVBGSmpjaUJ4RGR1NFF5?=
 =?utf-8?B?dURjUjZJZFdMZHRLckRpVU9qRnBhOVFydjdZdFFkQlJ5TkI4U1JqL1BickpQ?=
 =?utf-8?B?eUoxZFZmYmJ6aSt5ckNrNEJEakJSUDh0S2JQUlZLRnFGT3kyR1lMTWpMc3hS?=
 =?utf-8?B?TERYOGk5U2pnRWtVZzR4ckdpMTVKc3RFM3EvR3dsZVl6dGkzNlEzK0g5cGlH?=
 =?utf-8?B?V0pQY2VzRHc3UnF3QXFPWmYxbWhFQ2cyeFBNR2MyUEtQK2FWQVRMWHRVQWJh?=
 =?utf-8?B?UmJtYWJiSzRYcjlzMUN3ZDdIZGMzTlVBcE5udnY3cWw0WEVkSEZuNDNiYlJX?=
 =?utf-8?B?VXBQYTA1VFFINDdIcGZ5S0JKNkh1YTFqcUxEeXprYzRIUDROdnZYdy9TWk9Y?=
 =?utf-8?B?UTZIajVURHRIR3Ewb2xFNE03WHc2azJ4QlR0b2Y0K285K0tieDhXcHJGRHEx?=
 =?utf-8?B?VmRIQjBkbUhjZWk1cGRDZFp6K1VWbFF6VXpUUVhpc2dETDVsbFZ3V0xBYklZ?=
 =?utf-8?B?NDJXd0JjSXdabUZhY1FrVHRnRDJ3SUFyRmxjNWxFaktNSGJUczYzanJQQjZv?=
 =?utf-8?B?YkszZ0JlMTJvcWNybjExd2MxUkNYRVAwNXVNa2RydTdrZTlXNjkxU21LTHA0?=
 =?utf-8?B?TG9aREhoRXR1c2JBazdSY1l4SU9LM1JVZ1RlejNQaVFqWEVIVlljalFyQjFm?=
 =?utf-8?B?elI0Yjh3MWF2eGs2bGtocXdNRjROZUY4MXdiUlFJamYzT3E4ai8xYVpXTzlP?=
 =?utf-8?B?RlRMbTdPM1JhSUU0QXBqamNkSk9XbHJMREhOYlY0YTNLRVI5NzA0S2FReEFo?=
 =?utf-8?B?RFJwdXMwajJINkNCdHFLVmE5Rm1HWkcrZjhWL1BKQzI0ZSsyNUpjc05DdExW?=
 =?utf-8?B?c1hRbHBhYWhPdUN0Zjl2T1pSbGRHVFpjQ1pacG43aVJUQ3Yvc0R5OUZSaXZt?=
 =?utf-8?B?b2xDTFdWOVgyMDMzSllWMVgxS0dRQjlZWHlvZ0FGV1FvNnhzLzJ1elVHeHQ2?=
 =?utf-8?B?dy9xUSsxYlJvKzJ0N1FEWU9vSVRtcGtEZk9kM3RRZnVBVllGNTdtcXlCZ1RQ?=
 =?utf-8?B?U28wZFo3UllJamVOT1FOenVudyt0dEs1U0cxUmNtMllJMzZDVWREWHFJZFZu?=
 =?utf-8?B?SVowa29OdEJ3NkxlcThYdmtJMFl4azg1UHlMbnlDR0w1ZVRTYW1yVFphTGRR?=
 =?utf-8?B?WkJLQ2xUeC9YSGlJUXpQTUtEeUNuYzVDZWlLckF0dSt5Rk8wYmZ2U0grTGQr?=
 =?utf-8?Q?g7TFdnepnb8OSWs+vOFqUGS9g?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0a75e680-2979-4317-a769-08db0f921f8c
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5445.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2023 20:20:47.5759
 (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: LSwyCRMOxOp15gqVmdxJE+1l77geLkpSHUFCsz6ziiWp6Qh176TPaZfxurWEzNlfN8IR56j1OoArfOoLOljMmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4370
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2/7/2023 7:21 AM, Sean Christopherson wrote:
> WARN if generating a GATag given a VM ID and vCPU ID doesn't yield the
> same IDs when pulling the IDs back out of the tag.  Don't bother adding
> error handling to callers, this is very much a paranoid sanity check as
> KVM fully controls the VM ID and is supposed to reject too-big vCPU IDs.
> 
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
>   arch/x86/kvm/svm/avic.c | 15 ++++++++++++---
>   1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c
> index 326341a22153..cfc8ab773025 100644
> --- a/arch/x86/kvm/svm/avic.c
> +++ b/arch/x86/kvm/svm/avic.c
> @@ -43,12 +43,21 @@
>   #define AVIC_VM_ID_SHIFT		HWEIGHT32(AVIC_PHYSICAL_MAX_INDEX_MASK)
>   #define AVIC_VM_ID_MASK			(GENMASK(31, AVIC_VM_ID_SHIFT) >> AVIC_VM_ID_SHIFT)
>   
> -#define AVIC_GATAG(x, y)		(((x & AVIC_VM_ID_MASK) << AVIC_VM_ID_SHIFT) | \
> -						(y & AVIC_VCPU_ID_MASK))
>   #define AVIC_GATAG_TO_VMID(x)		((x >> AVIC_VM_ID_SHIFT) & AVIC_VM_ID_MASK)
>   #define AVIC_GATAG_TO_VCPUID(x)		(x & AVIC_VCPU_ID_MASK)
>   
> -static_assert(AVIC_GATAG(AVIC_VM_ID_MASK, AVIC_VCPU_ID_MASK) == -1u);
> +#define __AVIC_GATAG(vm_id, vcpu_id)	((((vm_id) & AVIC_VM_ID_MASK) << AVIC_VM_ID_SHIFT) | \
> +					 ((vcpu_id) & AVIC_VCPU_ID_MASK))
> +#define AVIC_GATAG(vm_id, vcpu_id)					\
> +({									\
> +	u32 ga_tag = __AVIC_GATAG(vm_id, vcpu_id);			\
> +									\
> +	WARN_ON_ONCE(AVIC_GATAG_TO_VCPUID(ga_tag) != (vcpu_id));	\
> +	WARN_ON_ONCE(AVIC_GATAG_TO_VMID(ga_tag) != (vm_id));		\
> +	ga_tag;								\
> +})
> +
> +static_assert(__AVIC_GATAG(AVIC_VM_ID_MASK, AVIC_VCPU_ID_MASK) == -1u);
>   
>   static bool force_avic;
>   module_param_unsafe(force_avic, bool, 0444);

Reviewed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

Thanks,
Suravee