From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB398C83000 for ; Wed, 29 Apr 2020 14:11:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4FAC2083B for ; Wed, 29 Apr 2020 14:11:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4FAC2083B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jTnQn-0005sG-JH; Wed, 29 Apr 2020 14:11:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jTnQm-0005sB-D9 for xen-devel@lists.xenproject.org; Wed, 29 Apr 2020 14:11:20 +0000 X-Inumbo-ID: 4c1f8c00-8a23-11ea-9951-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4c1f8c00-8a23-11ea-9951-12813bfff9fa; Wed, 29 Apr 2020 14:11:19 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1C4D1AC6C; Wed, 29 Apr 2020 14:11:18 +0000 (UTC) To: "xen-devel@lists.xenproject.org" From: Jan Beulich Subject: [PATCH] x86/CPUID: correct error indicator for max extended leaf Message-ID: Date: Wed, 29 Apr 2020 16:11:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" With the max base leaf using 0, this one should be using the extended leaf counterpart thereof, rather than some arbitrary extended leaf. Fixes: 588a966a572e ("libx86: Introduce x86_cpu_policies_are_compatible()") Signed-off-by: Jan Beulich --- a/tools/tests/cpu-policy/test-cpu-policy.c +++ b/tools/tests/cpu-policy/test-cpu-policy.c @@ -570,7 +570,7 @@ static void test_is_compatible_failure(v { .name = "Host extd.max_leaf out of range", .guest_cpuid.extd.max_leaf = 1, - .e = { 0x80000008, -1, -1 }, + .e = { 0x80000000, -1, -1 }, }, { .name = "Host no CPUID faulting, Guest wanted", --- a/xen/lib/x86/policy.c +++ b/xen/lib/x86/policy.c @@ -19,7 +19,7 @@ int x86_cpu_policies_are_compatible(cons FAIL_CPUID(0, NA); if ( guest->cpuid->extd.max_leaf > host->cpuid->extd.max_leaf ) - FAIL_CPUID(0x80000008, NA); + FAIL_CPUID(0x80000000, NA); /* TODO: Audit more CPUID data. */