From nobody Sat Nov 15 12:47:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752492844; cv=none; d=zohomail.com; s=zohoarc; b=KIY53szY/F0GU6l0JfXJ3C5+6vFsedRIr75Xpl8WGT9VobVeEqs8bd+l5qSBMKLNY8WlaZ4JKhb/9GH7QK0O9W7jrFy4XhBOS6MPxuUi3zpxvadotbL5shPNZjo/ATi10V4YBIEKhzs2hFHgbjW1m2DsuNoeGXVtYCzmQFGMqi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752492844; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Oi8bDZgPdz2Od/uSi533f6cPYkkNmFxsGsLpcHgWdeo=; b=m4VkZLllST0aSO4o87Fd7M0a3u/sO688jts7kkf5Q1ojLN156W0/THGL14mMLvqMrf8PnpF8J8hRCbvrneWXCBtbBOjaj38PlbcOXv0v4mV69l0M1rGIoudmK0BRBuUhZrBEYrEkzTtfG+KXY6GQq2zVcE7vFI2HtVddVAGI5Po= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752492844580393.7522743657962; Mon, 14 Jul 2025 04:34:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubHOa-0000lK-Fj; Mon, 14 Jul 2025 07:31:01 -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 1ubH0f-0001Zn-3i for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:06:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubH0c-00024F-W3 for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:06:12 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-477-hwatsK3oOb6S1jMAqvHF7A-1; Mon, 14 Jul 2025 07:06:09 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4561bc2f477so5157985e9.0 for ; Mon, 14 Jul 2025 04:06:08 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4561b176f87sm27426185e9.35.2025.07.14.04.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 04:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752491170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oi8bDZgPdz2Od/uSi533f6cPYkkNmFxsGsLpcHgWdeo=; b=RKabXpDySgzK4c9OiAAxEcFAX8/5Sg7xDL8t1gB/g08IwK31HjwBw9SLn5nePia9AH+0cC 4Dn1akU6XHlIXKBOcsXWUXinuGWsPTjskJYEjmMTVDXlYBbL39G7lLX5BWjwNRaZQJ6T2u HMiW+rzaNecIod6cZvQHMs06QPQkD50= X-MC-Unique: hwatsK3oOb6S1jMAqvHF7A-1 X-Mimecast-MFC-AGG-ID: hwatsK3oOb6S1jMAqvHF7A_1752491168 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752491167; x=1753095967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oi8bDZgPdz2Od/uSi533f6cPYkkNmFxsGsLpcHgWdeo=; b=n6fNDeFO6KReXkKhywQi9hH89NMt7A57nho7cMqYJgyHR7JwavYYKKOPaxTPnTissi JDy0bKcH/BzMuXO4hBRGOIl6RRo1qCG6dM0hehKagDdBgFdE1u9GJXuREg99drkiyakF XjbJmSNKvlPUUO92/olTGiQpMGkeamdu1SYyVZpabU2G9HXcGdmHU6Rt/E0/Ebmzjpyu btGywUQEN/TMEBGFpLEdLRpQtGutE36ddf/bOrHY5aUUfo3LsoQIA14tcLqEbwb00tY9 r9FQlakGBf74xBQquDJ9FCljjNLBCIgxC5koOZPMw4+OP9pSA08Y5tpAHNcgTF0R/xvk GNxQ== X-Gm-Message-State: AOJu0Yz3H+hjEAgYLaXFdyVyHXo3OE1HTn2+0gH7P+nZ1tXE8vpBxkrQ 2U/td2vRvv+uDIsF2D0i7E8GSSovLP9YWJ8B/4Q5LAMS4zCKrkpwqbFDTMO5F1B+tItw/Zc3mUf oTlxQMxubwKAwLp121SO19S57jUhie7imXR6oX5wBQZjEtnH/s0QEnPvdZdCoL960zNQxNmiv8P aM3Z3uZE+jlQZvRadrMZkwVdcm5E2UrFE0K86CqCGt X-Gm-Gg: ASbGncs3pKULf3xOX4mbIbziL0eKSlcB9qSmo5bIF0MwnQLYXj6phPLwDIWq7H0wajB Fa1iXGq63V7P3Qj66jef8wKdnmF/R2cWrB+pWYqtVFEmkFK7+MIDGIUVXU+ZC7LKv7mWPi5GvcV 8dgBd97Js1w66VsfDGH7EbRb/mFNbb53xSeaIRLbtZaAJTKXu8GKizhdeTjkv3+ERHvMgz16NBA V/+ul1zXWRkEoaw0SiLAIG5FdamRSjVQ7h+Od4TNNlPlAUCr4HrGWNkV/FbKbQsjf2YloMXMH7P CXPBGT5j0hgfOoUaQVrLMb9Ez6EW0vc2CpmzT5J2h2U= X-Received: by 2002:a05:600c:3595:b0:450:d3b9:4b96 with SMTP id 5b1f17b1804b1-454ec16919emr127146305e9.13.1752491166794; Mon, 14 Jul 2025 04:06:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4hWWRCIhYwp5qsZwNEkB88L2TJPp0XNC/cs+jyDqM1HHUm9IcT8wTpSwYRYADh9Im/hOKAg== X-Received: by 2002:a05:600c:3595:b0:450:d3b9:4b96 with SMTP id 5b1f17b1804b1-454ec16919emr127145955e9.13.1752491166272; Mon, 14 Jul 2025 04:06:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Zhao Liu , Dapeng Mi , Yi Lai Subject: [PULL 45/77] i386/cpu: Drop CPUID 0x2 specific cache info in X86CPUState Date: Mon, 14 Jul 2025 13:03:34 +0200 Message-ID: <20250714110406.117772-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250714110406.117772-1-pbonzini@redhat.com> References: <20250714110406.117772-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752492845588116600 Content-Type: text/plain; charset="utf-8" From: Zhao Liu With the pre-defined cache model legacy_intel_cpuid2_cache_info, for X86CPUState there's no need to cache special cache information for CPUID 0x2 leaf. Drop the cache_info_cpuid2 field of X86CPUState and use the legacy_intel_cpuid2_cache_info directly. Reviewed-by: Dapeng Mi Tested-by: Yi Lai Signed-off-by: Zhao Liu Link: https://lore.kernel.org/r/20250711102143.1622339-7-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 3 ++- target/i386/cpu.c | 31 +++++++++++-------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index a3ebd3e08ce..d3f7c53e301 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2077,7 +2077,8 @@ typedef struct CPUArchState { * on each CPUID leaf will be different, because we keep compatibility * with old QEMU versions. */ - CPUCaches cache_info_cpuid2, cache_info_cpuid4, cache_info_amd; + CPUCaches cache_info_cpuid4, cache_info_amd; + bool enable_legacy_cpuid2_cache; =20 /* MTRRs */ uint64_t mtrr_fixed[11]; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 812e85b952f..ac22548f47d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -246,19 +246,27 @@ static uint8_t cpuid2_cache_descriptor(CPUCacheInfo *= cache, bool *unmacthed) return CACHE_DESCRIPTOR_UNAVAILABLE; } =20 +static const CPUCaches legacy_intel_cpuid2_cache_info; + /* Encode cache info for CPUID[2] */ static void encode_cache_cpuid2(X86CPU *cpu, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { CPUX86State *env =3D &cpu->env; - CPUCaches *caches =3D &env->cache_info_cpuid2; + const CPUCaches *caches; int l1d, l1i, l2, l3; bool unmatched =3D false; =20 *eax =3D 1; /* Number of CPUID[EAX=3D2] calls required */ *ebx =3D *ecx =3D *edx =3D 0; =20 + if (env->enable_legacy_cpuid2_cache) { + caches =3D &legacy_intel_cpuid2_cache_info; + } else { + caches =3D &env->cache_info_cpuid4; + } + l1d =3D cpuid2_cache_descriptor(caches->l1d_cache, &unmatched); l1i =3D cpuid2_cache_descriptor(caches->l1i_cache, &unmatched); l2 =3D cpuid2_cache_descriptor(caches->l2_cache, &unmatched); @@ -707,17 +715,6 @@ static CPUCacheInfo legacy_l2_cache =3D { .share_level =3D CPU_TOPOLOGY_LEVEL_CORE, }; =20 -/*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */ -static CPUCacheInfo legacy_l2_cache_cpuid2 =3D { - .type =3D UNIFIED_CACHE, - .level =3D 2, - .size =3D 2 * MiB, - .line_size =3D 64, - .associativity =3D 8, - .share_level =3D CPU_TOPOLOGY_LEVEL_INVALID, -}; - - /*FIXME: CPUID leaf 0x80000006 is inconsistent with leaves 2 & 4 */ static CPUCacheInfo legacy_l2_cache_amd =3D { .type =3D UNIFIED_CACHE, @@ -8955,18 +8952,12 @@ static void x86_cpu_realizefn(DeviceState *dev, Err= or **errp) "CPU model '%s' doesn't support legacy-cache=3Doff"= , name); return; } - env->cache_info_cpuid2 =3D env->cache_info_cpuid4 =3D env->cache_i= nfo_amd =3D - *cache_info; + env->cache_info_cpuid4 =3D env->cache_info_amd =3D *cache_info; } else { /* Build legacy cache information */ - env->cache_info_cpuid2.l1d_cache =3D &legacy_l1d_cache; - env->cache_info_cpuid2.l1i_cache =3D &legacy_l1i_cache; if (!cpu->consistent_cache) { - env->cache_info_cpuid2.l2_cache =3D &legacy_l2_cache_cpuid2; - } else { - env->cache_info_cpuid2.l2_cache =3D &legacy_l2_cache; + env->enable_legacy_cpuid2_cache =3D true; } - env->cache_info_cpuid2.l3_cache =3D &legacy_l3_cache; =20 env->cache_info_cpuid4.l1d_cache =3D &legacy_l1d_cache; env->cache_info_cpuid4.l1i_cache =3D &legacy_l1i_cache; --=20 2.50.0