Date:   Thu, 6 Jan 2022 12:46:37 -0600
From:   Venu Busireddy <venu.busireddy@oracle.com>
To:     Brijesh Singh <brijesh.singh@amd.com>
Cc:     x86@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
        linux-efi@vger.kernel.org, platform-driver-x86@vger.kernel.org,
        linux-coco@lists.linux.dev, linux-mm@kvack.org,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Joerg Roedel <jroedel@suse.de>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Ard Biesheuvel <ardb@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Jim Mattson <jmattson@google.com>,
        Andy Lutomirski <luto@kernel.org>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Sergio Lopez <slp@redhat.com>, Peter Gonda <pgonda@google.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
        David Rientjes <rientjes@google.com>,
        Dov Murik <dovmurik@linux.ibm.com>,
        Tobin Feldman-Fitzthum <tobin@ibm.com>,
        Borislav Petkov <bp@alien8.de>,
        Michael Roth <michael.roth@amd.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        "Kirill A . Shutemov" <kirill@shutemov.name>,
        Andi Kleen <ak@linux.intel.com>,
        "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
        tony.luck@intel.com, marcorr@google.com,
        sathyanarayanan.kuppuswamy@linux.intel.com
Subject: Re: [PATCH v8 23/40] KVM: x86: move lookup of indexed CPUID leafs to
 helper
Message-ID: <Ydc5DUrsKlOKneIB@dt>
References: <20211210154332.11526-1-brijesh.singh@amd.com>
 <20211210154332.11526-24-brijesh.singh@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211210154332.11526-24-brijesh.singh@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QpCL/GKUEQxsQ5EzAEjuLuRHNICPChwdf1dwyPGUYGZ6Z8b54wI5l+WMhHX/?=
 =?us-ascii?Q?O/zOhjunZP5rc/Pokk+77hfQpobOF7E+obg9ioZgYgu6eGu1mFCleX2Bf92x?=
 =?us-ascii?Q?owDZe/SbQ9VTN9tHN7PyMtXBPjjJOYlm0S39Myo9vlYl1rnRo/5Va7s+Eeyn?=
 =?us-ascii?Q?x/axcAsUvI5H142FVTJbs433QPmSXfjwhcVPAfbtqnkBwSfhwzvqObPgxE1P?=
 =?us-ascii?Q?hzDwY9QuR1SOR3W7heIJ3S02XkHWakzs4/Ce8/L9rqNUk+t11WDClzXu8ltp?=
 =?us-ascii?Q?gh5F1vaMDkdcBnzBCq01yRu70+E++vzKOCKaEF7aBcp6y07+LHu1v1BCjcKn?=
 =?us-ascii?Q?zaIMq6DN7IJu7pYTdismegNX9GFFcQ2cKtLo2nrcPrFTrz8nMdSN3i9ir1/h?=
 =?us-ascii?Q?c6vPeYoBuTdfy3kj6sCtQVdzHuaM/nW+UISEYzFVYYg4alWFh33lkvsCTlvN?=
 =?us-ascii?Q?c2dMIUpobnOOpFC1Kk7bKBk5I1p8+Yp2VInsxAlR8/ngZYbWW33PxuWvFfJe?=
 =?us-ascii?Q?Ijf7VE9ZoetnGPxt+fnYL4YoILTT0Ev5AUtyL0v89Ih4OABrh26k8rtD+zet?=
 =?us-ascii?Q?GDC8r67BRFqXDVxKYPyIn+ru9zKeGZo7h7Nu12375Z/5WGLsqGI43a/uOpSm?=
 =?us-ascii?Q?3O4msUTFsPMiDNtAK6yWhGmnxTKWj40mb62WSz8bsyl43z2olmDnhBb9H0Ei?=
 =?us-ascii?Q?PU6mWVMNIBMjy/NRb0gxfVizFPPQ5H+aJVINuURSzgtjIylKxxbULEbOiAip?=
 =?us-ascii?Q?bFr+QTN86SR8DRy+prPm+7NU0bt82frYspaF+mKb7lZP3Xxdv644SyogUsyq?=
 =?us-ascii?Q?Xq1k57ZC4P/IVlpwijRZZJl+GJ+JVjC3fUsb2a+OcYwGcrbQLbZZrNn9a3BX?=
 =?us-ascii?Q?k6jgta0EdPlPzUqu1l0+Rds/6N1q0PNwrbAwQjF/Q6ZQC6vOCDNt1/EncEh7?=
 =?us-ascii?Q?ZgkuHIu4Z1jOzV+D+5TgKy58dFUWz8Nleuf2BT78ZCZfZFVu7UU/OC+jMqIE?=
 =?us-ascii?Q?/l318BcvnHfS+LwsRQop8QIygucXlNULRIIFaernmViAE+e84+bkucCI0jwY?=
 =?us-ascii?Q?42Nsy4kB5JAtQ7Ivyzc8HcfatH4xuGr0yv1y7ckCMH2BormfX2aOpa1Xqfem?=
 =?us-ascii?Q?bvoEQ8T3TdS9VrcZQS6jKwc/aX1GCWBESqVVTXOseVFHlTb9XWY/rcrVDYyb?=
 =?us-ascii?Q?nwUiyYoW2kQcN+US95u/2G2j8aIDfbIQNEGB0n0NyqrC5vpZMFz6NQ9ydoYH?=
 =?us-ascii?Q?hpUH1pnle5yvOe6tzPhNljVvdyapk5pPQdAok1/MqtAS+/uozzedxsX53zKZ?=
 =?us-ascii?Q?PgFRYFwfTXqvDHie2mlQXsxUJnFcMlh5VKn/A+7yiKZAj0qmZxC/2XEj5Cgt?=
 =?us-ascii?Q?dFNffdr+1N4LaXAAl5BXJaTjig1vb23r71cQRwUv/e2w4UPwdTjwFvpt1x/a?=
 =?us-ascii?Q?K1mycfGyWI7r4Q0gQz564W+P1hYkZo6b2DZqvjIFKRUdQ+T0qHjpmH+ISTes?=
 =?us-ascii?Q?PJqYC4Ju043qFgAzryTnu2m6U0IolxFri9EVQ5di859+/3kSKbo4SIVyUPby?=
 =?us-ascii?Q?hmaZLJL2U8tCmufJj4tLvXPmam1kQbMq4x1qA3035Q/vuArIkYeLxdi/PZ2t?=
 =?us-ascii?Q?0KsKlbezr3gUZpWbv1zro6Xcjntw7sBtE4i34yqm+H4Zx3dnHGtP0xHULdGE?=
 =?us-ascii?Q?hyKobg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 89aac3e5-da68-4f80-f428-08d9d144e3ee
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB2576.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 18:46:46.3344
 (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: HhxBYYprjvGLDB8YDux+SchKIYIduSzRylr6w9A3PHzEHcRykoWMQ2gLYTMcdZ2XwnV5v5B5JYEGztieHJbk6bhF/LgsB2Du4P2RQov2KlI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2910
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10219 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 malwarescore=0
 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201060122
X-Proofpoint-ORIG-GUID: dNlvFG1sWnXrjwQdmv-3Oz0x6Z4R6hz4
X-Proofpoint-GUID: dNlvFG1sWnXrjwQdmv-3Oz0x6Z4R6hz4
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2021-12-10 09:43:15 -0600, Brijesh Singh wrote:
> From: Michael Roth <michael.roth@amd.com>
> 
> Determining which CPUID leafs have significant ECX/index values is
> also needed by guest kernel code when doing SEV-SNP-validated CPUID
> lookups. Move this to common code to keep future updates in sync.
> 
> Signed-off-by: Michael Roth <michael.roth@amd.com>
> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>

Reviewed-by: Venu Busireddy <venu.busireddy@oracle.com>

> ---
>  arch/x86/include/asm/cpuid.h | 26 ++++++++++++++++++++++++++
>  arch/x86/kvm/cpuid.c         | 17 ++---------------
>  2 files changed, 28 insertions(+), 15 deletions(-)
>  create mode 100644 arch/x86/include/asm/cpuid.h
> 
> diff --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
> new file mode 100644
> index 000000000000..61426eb1f665
> --- /dev/null
> +++ b/arch/x86/include/asm/cpuid.h
> @@ -0,0 +1,26 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _ASM_X86_CPUID_H
> +#define _ASM_X86_CPUID_H
> +
> +static __always_inline bool cpuid_function_is_indexed(u32 function)
> +{
> +	switch (function) {
> +	case 4:
> +	case 7:
> +	case 0xb:
> +	case 0xd:
> +	case 0xf:
> +	case 0x10:
> +	case 0x12:
> +	case 0x14:
> +	case 0x17:
> +	case 0x18:
> +	case 0x1f:
> +	case 0x8000001d:
> +		return true;
> +	}
> +
> +	return false;
> +}
> +
> +#endif /* _ASM_X86_CPUID_H */
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index 07e9215e911d..6b99e8e87480 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -19,6 +19,7 @@
>  #include <asm/user.h>
>  #include <asm/fpu/xstate.h>
>  #include <asm/sgx.h>
> +#include <asm/cpuid.h>
>  #include "cpuid.h"
>  #include "lapic.h"
>  #include "mmu.h"
> @@ -626,22 +627,8 @@ static struct kvm_cpuid_entry2 *do_host_cpuid(struct kvm_cpuid_array *array,
>  	cpuid_count(entry->function, entry->index,
>  		    &entry->eax, &entry->ebx, &entry->ecx, &entry->edx);
>  
> -	switch (function) {
> -	case 4:
> -	case 7:
> -	case 0xb:
> -	case 0xd:
> -	case 0xf:
> -	case 0x10:
> -	case 0x12:
> -	case 0x14:
> -	case 0x17:
> -	case 0x18:
> -	case 0x1f:
> -	case 0x8000001d:
> +	if (cpuid_function_is_indexed(function))
>  		entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
> -		break;
> -	}
>  
>  	return entry;
>  }
> -- 
> 2.25.1
>