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: <246a7466-dc61-0186-2ff2-77fe37e73c06@amd.com>
Date:   Tue, 10 May 2022 10:29:34 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [tip: perf/core] kvm: x86/cpuid: Fix CPUID leaf 0xA
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>
Cc:     linux-tip-commits@vger.kernel.org,
        Vasant Hegde <vasant.hegde@amd.com>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        pbonzini@redhat.com, x86@kernel.org, linux-kernel@vger.kernel.org
References: <165126412838.4207.9648561218200979307.tip-bot2@tip-bot2>
 <YnlOMDv5lMw2kGVb@zn.tnic>
From:   Sandipan Das <sandipan.das@amd.com>
In-Reply-To: <YnlOMDv5lMw2kGVb@zn.tnic>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NGpjV1VndnlkazlZeUJKNHZqbWFoUHlPcUV0RmtkUFdVVERRdjVuL2ROQUxQ?=
 =?utf-8?B?b01IWHJ4NUNCb05mVFB2MUFEazBOb2pDS244OEwzMkxzdE5jWGdLY0dVaHND?=
 =?utf-8?B?RjhHZjhzY0lMbkFGRmxtS015bXAyR1FSVVY4NnhSRUFqZ09za3ZEQ0ZUbWZE?=
 =?utf-8?B?Y3ZNdTZzU0dzZzhBWHE0UWxSUHB2bnpBQmtpTkR4djd2dXFRT0lYWDdDMEhj?=
 =?utf-8?B?TnJYeE5XZk5MM3B0Z2ZDMXJ0YmRTbWRyaVpQdUpNZmx0V3RFekY2NHQ4Rnh4?=
 =?utf-8?B?TldQdDRHZy9SWWRMVkF1dDlkL3FKdXROM3N1OXNpL3RFeElPM0pjZ0xpQStj?=
 =?utf-8?B?Y3RXbXlZcEdPek5ESkxUdGlNQ0N6bjNsZzFJTGRycjdLSVZnd1lnTnZhZ3Zj?=
 =?utf-8?B?OSs0MUlWcTFPSytrY3FYd1l6Z2RreVpCR21HaUVISnN1OUFSN2JKUmZiYnpL?=
 =?utf-8?B?SnBaNW90VGFEcERIS1FaVVVEWEw4SkNUakZ4SFlUeEowZ1RZMUZ4Y3JnTnho?=
 =?utf-8?B?RXNPVkZkOG0rL0Qvbzc3S0lhaHBlM2c2a3BFci9qNmtPK1prbXM5SHpTRFdG?=
 =?utf-8?B?SkFsVmFzT011OCtNR2h4eERINWlBQ1ozYTZoVEVzRjFPdSszdVdXejR0VENn?=
 =?utf-8?B?bFA5NUlwR3BlRlp6TW9raGdoZGVnb3diek1ZTjNHMFFLSmh0bFBTVGFCa2Zh?=
 =?utf-8?B?T1d1V1l5cVVCQWNmNmRuMno4UjUrRjdrdC9QMTFlK0NQMUUvVFRWVVBKVGFP?=
 =?utf-8?B?OWFBQTRPOERkcU1OdERpQjF2OWszV3d4UktLSTZ1dlFPdk40T2VJZktXY3ZN?=
 =?utf-8?B?UFIxbG5idktYZkU0ZUtUQ1YxVkFocVRFOGIxajlqVmIvY00vdE9ESEFLbFBn?=
 =?utf-8?B?aGlBR3BlZnVLNjJzZXIvQkFxREE2eDlTUTNGQkFjSkNBRWNuVWtONnZLbExP?=
 =?utf-8?B?ZGRjNmF5VTg1V0w2NksrM2NvcWt4cVpOUUY4ZnRtQ05tcWVVRUYxdkhyUnpO?=
 =?utf-8?B?dkhpQ25nQi82Tk5tYjV2MkdYdzE3ZzlINzRGZGc0RUJRMmJqa3p0UnF5dHFL?=
 =?utf-8?B?dC9YMFlKOEZBeVNXblFzdlpJZU55S3lERVdEd3huK1oyNzRSOUExVHVrY25N?=
 =?utf-8?B?OTc0MU1PZ1ZGQzlIODBhVDVscTFjK1FuZldMa0UrSkFLU3grL0pLS29XUTBr?=
 =?utf-8?B?VkpOVTh2N0J6K3pxdktOb1JJS0tPUnE0SStnckJKL0RYaWRiam1Jclk2NjBC?=
 =?utf-8?B?SUtVZHJaSGIwWjJsWEpneXFTeHhkb0wrUFF1VGFkUUk4SkhnWEpPYXhsbzNU?=
 =?utf-8?B?NldCWHJiQ0ZCUnU5V1JwMHJXUGZ2RFA5bm5ZMDd6bTJjK1lOVnZkSFFSMDBv?=
 =?utf-8?B?bDByWDRHYmlycVVjT0tTSWJKQVllMGxjZlBaTXh2dUVnRmptTXZubnEyMnpi?=
 =?utf-8?B?aVdRWjIwU0MwUC9KVDl3bU54TzVxdUFmSnJLWktuQ0tmSzJLSnFibHBuMm9q?=
 =?utf-8?B?WEd1QXh5V2k1cHpkamhGRVFGamNnUWNoYTQrT1ZKckJud2xwYVZsWlZHWUZJ?=
 =?utf-8?B?eTZtQkgzc0ZkNWpMQUovM3NGc2tFUWViMlRNZ0dqWGk1S25OU1BVZmxRRkV3?=
 =?utf-8?B?ZUVuWTNZVGxaR0IxMVlEWmpOelY2dk5qVURHTDQzZFhQSzByQlkrZ3dCSE1O?=
 =?utf-8?B?My9iUTc2ZjVTZ0t6dkx2UlpVYWV2N01TT3dSYzVBcGQ3MDJaNlVSbUU5RXBI?=
 =?utf-8?B?RnFDNU9rTHBiWEtRYkwzYzNKWER0OXJyZHpUTzgzSmQ4T0hJcXpLSDYrRTVK?=
 =?utf-8?B?M3dsc29NS05GRmVnLzQ1Z1hnbHErbXp2QXYrTWVPa0w5REVVREJabjNNczht?=
 =?utf-8?B?RTF4WFZtemlLQzBMYjk3M3FaZklHWUFoQ1hUVHZEQjJsZnZ6Slc2RzdGdGdk?=
 =?utf-8?B?VkIyRlFHR2FKUGVXbnZqYTV5WGUzSmgydzBaUzQvMU1xS2dUdUZibE9lKytq?=
 =?utf-8?B?SFhMcFJpNW5uL0hvUmdtWWFZM0Y3Q24zQjk1bXRuaDBWSk1rQmZRUjgvMkZq?=
 =?utf-8?B?T2FOb2VNY3lHcVBkMnhxaUovWFREVXB0Wlh4Y1pkbEhWRzZ2RS93aGsyWk5I?=
 =?utf-8?B?VkFIdG95NlBiQkc4aXZySUcxdHpvOFVtc1hENzdSMXdaSFdLVWJFNW9tVGda?=
 =?utf-8?B?cGRJRHBDalcwbTFDMHBYZVEwMU9seDNJTmN1T1J3SHUrUTErYlBuYk9NSXpi?=
 =?utf-8?B?c3pSS3YwYnN6VEMrMGJJRXRyYmZSZS9Za08vWlkzOWs0NkxJQk9BZFRtR0pa?=
 =?utf-8?B?Qm1CZktjbS9PR2J0TnVFTkVnRnAvY2dPMTFncUtLdytDbFZrQmpVZz09?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3beca310-5eb7-4408-ebe4-08da3241e746
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5712.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 04:59:46.4231
 (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: DlDfAD7b+XwACC3C+kerOUkeKr9QO6UZvj3oYCGALSPhpQ10SNo/i218hiHj3dy+gtuzVnNNzDmwmTqWiIks2A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2897
X-Spam-Status: No, score=-3.2 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,
        URIBL_BLOCKED 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 Boris,

On 5/9/2022 10:54 PM, Borislav Petkov wrote:
> On Fri, Apr 29, 2022 at 08:28:48PM -0000, tip-bot2 for Sandipan Das wrote:
>> The following commit has been merged into the perf/core branch of tip:
>>
>> Commit-ID:     fafd15ab6dc1fdfff66908e6d9231b124e1875cf
>> Gitweb:        https://git.kernel.org/tip/fafd15ab6dc1fdfff66908e6d9231b124e1875cf
>> Author:        Sandipan Das <sandipan.das@amd.com>
>> AuthorDate:    Thu, 21 Apr 2022 11:16:59 +05:30
>> Committer:     Peter Zijlstra <peterz@infradead.org>
>> CommitterDate: Fri, 29 Apr 2022 11:06:27 +02:00
>>
>> kvm: x86/cpuid: Fix CPUID leaf 0xA
>>
>> On some x86 processors, CPUID leaf 0xA provides information
>> on Architectural Performance Monitoring features. It
>> advertises a PMU version which Qemu uses to determine the
>> availability of additional MSRs to manage the PMCs.
>>
>> Upon receiving a KVM_GET_SUPPORTED_CPUID ioctl request for
>> the same, the kernel constructs return values based on the
>> x86_pmu_capability irrespective of the vendor.
>>
>> This leaf and the additional MSRs are not supported on AMD
>> processors. If PerfMonV2 is detected, the PMU version is
>> set to 2 and guest startup breaks because of an attempt to
>> access a non-existent MSR. Return zeros to avoid this.
>>
>> Fixes: a6c06ed1a60a ("KVM: Expose the architectural performance monitoring CPUID leaf")
>> Reported-by: Vasant Hegde <vasant.hegde@amd.com>
>> Signed-off-by: Sandipan Das <sandipan.das@amd.com>
>> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
>> Link: https://lkml.kernel.org/r/54bc7fe4cadf6bdef823bab1fba43d4891d2e1a9.1650515382.git.sandipan.das@amd.com
>> ---
>>  arch/x86/kvm/cpuid.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>> index b24ca7f..ae1d963 100644
>> --- a/arch/x86/kvm/cpuid.c
>> +++ b/arch/x86/kvm/cpuid.c
>> @@ -887,6 +887,12 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
>>  		union cpuid10_eax eax;
>>  		union cpuid10_edx edx;
>>  
>> +		if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||
>> +		    boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) {
>> +			entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
>> +			break;
>> +		}
>> +
> 
> This is all fine and dandy but this patch in tip conflicts with the very
> similar patch of yours:
> 
>   5a1bde46f98b ("kvm: x86/cpuid: Only provide CPUID leaf 0xA if host has architectural PMU")
> 
> which is already upstream.
> 
> So which is it? Should we zap this version in tip instead?
> 

Please remove this patch and keep commit 5a1bde46f98b instead.

- Sandipan