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 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48811EB64D9 for ; Tue, 27 Jun 2023 09:27:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE4z6-0003fm-Pd; Tue, 27 Jun 2023 05:27:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE4z4-0003d2-HL for qemu-devel@nongnu.org; Tue, 27 Jun 2023 05:27:38 -0400 Received: from mga12.intel.com ([192.55.52.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE4z0-0006No-So for qemu-devel@nongnu.org; Tue, 27 Jun 2023 05:27:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687858054; x=1719394054; h=message-id:date:subject:to:cc:references:from: in-reply-to:content-transfer-encoding:mime-version; bh=0AR2PmQw68vTNHPnCWtopbF+saq8Y/b19y3YAH3AGaA=; b=L7Ze7bN65SV72la+Wkqm019ehkB9T60erry49l9zD2N/nGYmqmXG/bdm FbQVJlBMMy4s0H7NDC20vhf3+1KSV5K1s+yuRmxXhkOiBdSR9IXFlF0Jx RsQF7VnJAkYr2N5QIb4qHFitBBZv38bFbd/TiP98+PfVxtanhQuashsgn mEgMRu12yVZvjKATDkkFGxbTSJzoQhy38CrNN+7rtTXpw2QSOmy7a8ZDf ipFDCnvvLJdhWhAAUBCYETPytOD+BVrpWeLtVWVPTHRi044efr34DnT91 jNnRH3J9CtmbT143ACr7dP2Ew39xC3BfIQzVpQLtsJ3ZLnXhyTit9vPdL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="341112674" X-IronPort-AV: E=Sophos;i="6.01,162,1684825200"; d="scan'208";a="341112674" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2023 02:26:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="746133753" X-IronPort-AV: E=Sophos;i="6.01,162,1684825200"; d="scan'208";a="746133753" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga008.jf.intel.com with ESMTP; 27 Jun 2023 02:26:52 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 27 Jun 2023 02:26:53 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Tue, 27 Jun 2023 02:26:53 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Tue, 27 Jun 2023 02:26:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kjnzk2I1xGHybBB8Tb41cGINjDQ91r/C8tiBwqxKuh56d4axgw21IKDihn8/bCNGlXFBodKzNzEz4eSOFKBxgSoK6h4IlE7qESSu0pGSVDJxYfIoW5fwwT0jEbFI6NeJhWr5+HWcHY9jpZWC9hTl+yiTlZFdop1jQ7bh8dLsXsL0Dfs0NEaTXY83AIUZjWv7hY2xbaFeGr1C7hVSXIRYZSIBhbPoNIJBULkKFrc5RDSk8xF8IEGnp+sCNbg6pe0kjVOhpmSSqWk1VOGZYB9NMcum4w/J9ffAi4+TWcmWuPVLCRnCYrMLARLJrr3kQhonx3lHqYLudX2N8cMiGe9/iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ODHqgUOVW5tDmpyhYjnKLbENDpzCJyiohv8+6tN9fyE=; b=daKRdUlqHE4PUJ0cpHzSihEgHFuNnv+/TB9XrscSa6kNxD7rCsqKYL0iwgLkeVjYLnerJph1tO9mxemXj9lk8Cbq8jKFUyFr3eNVjtPILVs2McEBIPow1fAEdePRw0mlXaaXX7dgErdFWJUhyTmaoWEL87ElvorDWnwVuylgCDcYXD05heyZSevHnka9/RQDw/jskVGw9NRRHj6SDafxWxpaufvOvqBSWrV4WfbxDeThSJFHbcgqGa+Yyqy3J1HToON0nBa86YQN9QqJTFSGBpuWXRvKTyqZD1IW61y9t8eyUbiYr1l1WzhXEQ142RvxmYBZWSsWJAIzNrGybNMiqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from PH0PR11MB4965.namprd11.prod.outlook.com (2603:10b6:510:34::7) by DM4PR11MB8228.namprd11.prod.outlook.com (2603:10b6:8:180::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 09:26:48 +0000 Received: from PH0PR11MB4965.namprd11.prod.outlook.com ([fe80::4707:8818:a403:f7a9]) by PH0PR11MB4965.namprd11.prod.outlook.com ([fe80::4707:8818:a403:f7a9%6]) with mapi id 15.20.6521.023; Tue, 27 Jun 2023 09:26:48 +0000 Message-ID: Date: Tue, 27 Jun 2023 17:26:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 1/3] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F To: Xiaoyao Li CC: "kvm@vger.kernel.org" , "qemu-devel@nongnu.org" , Marcelo Tosatti , Paolo Bonzini References: <20230613131929.720453-1-xiaoyao.li@intel.com> <20230613131929.720453-2-xiaoyao.li@intel.com> Content-Language: en-US From: "Yang, Weijiang" In-Reply-To: <20230613131929.720453-2-xiaoyao.li@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR06CA0004.apcprd06.prod.outlook.com (2603:1096:4:186::20) To PH0PR11MB4965.namprd11.prod.outlook.com (2603:10b6:510:34::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR11MB4965:EE_|DM4PR11MB8228:EE_ X-MS-Office365-Filtering-Correlation-Id: ed32a058-1f07-44c4-fdbb-08db76f0a19a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bcTeqDN0/5xLZcrXjIBudpmv67Hm/Ve3g0KqyVkojgLz4oNZoSqB0LQpPIOlPQNf42ZAh4ZHsjQYiHnoweWrr/MIWBR4nRjqwtJSBh/ylK7JDvxI70ZKJRRm0pnAb+3ZMggqOXLvvBa5JHHanQ7n7TJuwd7NTtPR2jhlx+NQzSvfspan7+nbvBFizqR8bMPrn9126ByRfIT+se6gW7HcFLIPVgThwCeS9cRciV8DXGSwTSQsIMM3wVAmkzfp4xLptVL01JldQ4tyYt8s6qBLEGJhs4qmvp79JsZ7zEK88f/xaqh+k87N9i4HnULm6qtopGRetiFQ6hAgsBo9y/jcyAszTCTyqRV8YPLwZwg4lE15y9G8C7pF8S5qvUk3WcgY6vCsbh9FRWbj0iGHFMMe1nAZ7KtgrY7hqwpfeKgmXmZAjSZGkD419jvWloQUjgSERwGcBHCHAOJIb/f3ScWO3YuP01H1iOea2nisUgbe50nV9SaYNhYkYaidpcaLXJFPlRV3yCjkWHxyzM6ousUlEN1TVtUDF2x3/W2QzHKcz7Qz/B8b/z4HMGBys7ZtaTJ16iIsCALAlZ5hMAlmK1n3zUwGjsF71dzoJykP2OYItxmAf26JvGL6oZY7TjwBLqjUZRwto0P4pANFJw+WEU6FRA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB4965.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(136003)(366004)(376002)(39860400002)(396003)(346002)(451199021)(2906002)(4744005)(186003)(6486002)(82960400001)(38100700002)(2616005)(6666004)(6506007)(6512007)(53546011)(26005)(37006003)(31696002)(41300700001)(54906003)(86362001)(316002)(478600001)(36756003)(66556008)(4326008)(66946007)(66476007)(6636002)(31686004)(5660300002)(8676002)(8936002)(6862004)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VmpkUEg5UmVhakM3VmQ4OWRiUWxQNnRXT1c1S1lZdkFkc2puQXVzNnlOMlVj?= =?utf-8?B?Mjg3TUtrMDdrdmJHVEtacUFhYjhKc09lRUVHeXFnblRTdzlIbEd2aWtQM2RU?= =?utf-8?B?WmlMN3JZL2ltaDJyZExPcTRmRXdqV3orWC9NYitiZUd2Z1VHOUhNYXFVTVFX?= =?utf-8?B?NkxoYVFkeUtEbFpxUkd5dGg2NDZYd3BENVQwMXBTNFNsejRNSjN6SzIvTTVv?= =?utf-8?B?T3dTTEplbVRzdmx3WUFQWEdjSGlSVUtDTGxEb1dsZGN0N0dpa3dkeXdFc2NM?= =?utf-8?B?dThaZm9QTFhWcENBVExLRTFPV2RUK2VKb3VWdmF0TWdtclh2OXNlVTRZRWYv?= =?utf-8?B?clhXVmpyL2xUTThvZ044aGNaM2FYWVdJdVNFZGwyRUR0S1ZPSTR3aHk1TFYw?= =?utf-8?B?NitKL2g4RXlGblovcmF5dFh3cldFYzc5ZTVmY3Erbmgvdk5ZMm1NenJPUzQv?= =?utf-8?B?VkxBN2pDbkE3eWgrQTc1TUtSN0puRmNpcEtPSHJEVW1FMEE2VEVPZXJGNlFO?= =?utf-8?B?dGRhWENRTDRXNkdPZGEvQ1BhNGF6dHNld0dCbG9rYjVFa1k0ZUF1WUU4cXFW?= =?utf-8?B?TGQxVVN3aGNHMWRBRVFkbysweDhSaDR4ekJnQUtkZEl4S3F1S2UwY2N3enU3?= =?utf-8?B?TnVsWUxIckJvN1dCU1pkazFwQzhRQUNjM0VaLzY4SHpMemhLZEROZHZEMzFR?= =?utf-8?B?WUVXV0pHcnFlc0hvZFZtVGx0S2grNFNOTXBIR09rYW0xZmp6TzlxZ3dndXQz?= =?utf-8?B?aGFPdDNXNjVBNklVNGZVa0hhUUdVc3BNaVViRGtIZ1I0eVdSck9zTVVFUGQz?= =?utf-8?B?aTIvcm84OWIrdDcwY1pSWFNvcllFY1NpMWtKeU40N0t2QWs4VVYzNDlNb2o3?= =?utf-8?B?REZocm9WMUlFckZZQm1EZnJKT0E1QXRtMHdrcTV3clMyamVEMjcyQ0U3eDBt?= =?utf-8?B?YWxjV1JCaGZ6b29hOEI4RUlXZVZ0N3k2OG55N1pKY0lQZ2NFcXVDMTFSY3Qw?= =?utf-8?B?aUJjR0x1emZ2WmZTRUIxN3lMVG1SdXJNUEZFOHVsSmpmYm4xQUlIamtKaUdH?= =?utf-8?B?K0tMWnN2bXpwc0MyVEV3bzlQVFpXZ2pQUnV2b3ZYajRQNW9TYWVmNGpMY3RH?= =?utf-8?B?N1FCa05MSlhSbllIaTlQSzBXSVFsb0FGU04xeDhkTjBmT2huQVVFTmJpNWtL?= =?utf-8?B?Q0VUUXlkQWJhVDJwZ1BHQ0FlckxhTEdNN1RYdW11VlZTQms2US9vYTZlODRk?= =?utf-8?B?eVdqcWlHNkF3V0U4Um9ndkp1R09qaWZHRktwUWQxNk5lQ1BURU5QZEZZdzdU?= =?utf-8?B?UUUwMUtubWwvMG02L2RVVTlSTlJ4dmw0UTZqQWdyak1sc2taa1I0RFE2eU9B?= =?utf-8?B?aTNiV0tJLzZsTEpSekZJMjdkT2pUR3dZdDZhcmIxMFpVYWpSVGJHaWV5ZXlp?= =?utf-8?B?bGJDZXRZK2loSHJBSlo3bXVUb2hIYlZNWm9EUytkejhLWGFKMjUvdzZiN1o4?= =?utf-8?B?eXk4Y1d6aGkycWdNaUdpSUxoUmNEeHVnaGNWMGhrODMvbDVhb0JVbmxIUi9S?= =?utf-8?B?MVFpOGZTV052R3l3K0RDS3AvYTZZZERVb2RDL3pnMEt5NjZ5ZkNadGtsT1hk?= =?utf-8?B?dGQxWm9kMFVLQ2FjTGttU3d0dzU2WW04UWdrQnpNMHZQQzVueW8xV2psWnJn?= =?utf-8?B?RVE0UStreC8xbmhvK0hCTmRrVlloRkRSM1dTdks4YW5rWUgyNGljSmVCWXE4?= =?utf-8?B?VWVhZ25wbkY0NmVIOHREby85QjRjYkFvYlU2alVTSjFWaDk2K2d0b1ZLa2tZ?= =?utf-8?B?S3dkYmNTYStrZFJDaVpOV2p3RmhIdXA2Z2FFV0lGL0FqMEdKdEJCK2dPWjdX?= =?utf-8?B?c2phVWZuU0paSjdMSkVUdWJtdDZsNUtWaGhPNCtmYUsyMmxIaWYrTk83cXNm?= =?utf-8?B?WGdCZER3KzR5Q0pNTlNEZ1FLd0E4Q1pDUkV5ejNSRllpbTJWTXJFYjFlRkZ1?= =?utf-8?B?dWhSUnd1SFdkcjRJQmV6WGM2TFdtS2EzeHZDOG9uRk1ZQW44QjBvZW5SVzdj?= =?utf-8?B?b2MyOW9MdUxKakh5NlRHSXNUN2tyazlYbWk2V2tCdmdheW5vV2MvYlVGbGlG?= =?utf-8?B?MnNaV0JMNHFrSmFNbnFaWmR5TUxQRm5FNS9LWlRMMEZCdDVOaVE5RGZVUmNn?= =?utf-8?B?TGc9PQ==?= X-MS-Exchange-CrossTenant-Network-Message-Id: ed32a058-1f07-44c4-fdbb-08db76f0a19a X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4965.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 09:26:48.2795 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5Q38DxlfRLZ/bWeuxo0LYI70a8vHUjtX8/rN4AXuKh4FYqVYOSFVCKGvjklb1mr3EXjJeVi8EDnGGXX/3mS0ug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB8228 X-OriginatorOrg: intel.com Received-SPF: pass client-ip=192.55.52.136; envelope-from=weijiang.yang@intel.com; helo=mga12.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.09, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 6/13/2023 9:19 PM, Xiaoyao Li wrote: > Decrease array index cpuid_i when CPUID leaf 1F is skipped, otherwise it > will get an all zero'ed CPUID entry with leaf 0 and subleaf 0. It > conflicts with correct leaf 0. Maybe change the commit log like this: Exiting code misses a decrement of cpuid_i when skip left 0x1F, so there's a blank CPUID entry(with all fields stuffed 0s) left in the CPUID array.  Fix the issue to avoid the blank slot. Reviewed-by:Yang Weijiang > > Signed-off-by: Xiaoyao Li > --- > target/i386/kvm/kvm.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index de531842f6b1..afa97799d89a 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -1956,6 +1956,7 @@ int kvm_arch_init_vcpu(CPUState *cs) > } > case 0x1f: > if (env->nr_dies < 2) { > + cpuid_i--; > break; > } > /* fallthrough */