From nobody Fri Oct 31 03:41:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1752687132; cv=none; d=zohomail.com; s=zohoarc; b=KD3nipiDNp8RJPm2whh2rRO8vSU1nD9NicDb2G0q+dsRHjAj0LDRzgnN2Q1YsvpzPNSkMfeR31KPA9G5RH4iwcYgIx3H97pKUubv4tXModchyQSBm9EU71Qy2aPmJETanYnHg7j+S1fzmZVv3n1eNRBnSDUPuIOpMLXNU6tLYA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752687132; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LCdmRIQ27rwgE2yCA9bmvyBIJOmpFRV7SefCKLOpp1c=; b=P5cRdnaN91FA7LIwPUg6T8VxwdI8MCWVzgKdt7rEpHuMQpUs1M5DphcQi2ru3f3oxuo3h9i0oQF/1q19gExmUh6bvaJ0Vp0e54t7L2gL/Pb7MPyywQI0y8rMdJvleogRwQ6xXwx83N6PkkuwcLGihwP/jS3EPySVq57VhUmwNdc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175268713232215.66683916176487; Wed, 16 Jul 2025 10:32:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1045523.1415701 (Exim 4.92) (envelope-from ) id 1uc5yr-0004AH-AF; Wed, 16 Jul 2025 17:31:45 +0000 Received: by outflank-mailman (output) from mailman id 1045523.1415701; Wed, 16 Jul 2025 17:31:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uc5yr-00049L-5h; Wed, 16 Jul 2025 17:31:45 +0000 Received: by outflank-mailman (input) for mailman id 1045523; Wed, 16 Jul 2025 17:31:44 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uc5yp-00030y-Tu for xen-devel@lists.xenproject.org; Wed, 16 Jul 2025 17:31:43 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bcbb50ef-626a-11f0-b894-0df219b8e170; Wed, 16 Jul 2025 19:31:42 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so557875e9.1 for ; Wed, 16 Jul 2025 10:31:42 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e7f2e68sm27048625e9.1.2025.07.16.10.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 10:31:40 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bcbb50ef-626a-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1752687101; x=1753291901; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LCdmRIQ27rwgE2yCA9bmvyBIJOmpFRV7SefCKLOpp1c=; b=Ln0z75RIQZ1E8bmFL54eF8lrG+LnC3QdB8/6QkcXXx38ttbAMlCbaBJV4HncJ3D4CE WHHv2fYcSp6s8VxgFFraDcwB02gb1NLkdvrz+tMnV/E+EHs2O6RKK45SWghcKfiTkm6t m8w1QEy4cHpbq/73Gso0r71uVYF8TOPk+Q8+k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752687101; x=1753291901; 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=LCdmRIQ27rwgE2yCA9bmvyBIJOmpFRV7SefCKLOpp1c=; b=n1++AhWn/jP3oZpcLZvQTXosoWqt899/7SnUY4ZLXImUlz2WzJcw40BmllDsBukhoJ 3LjIl+GLSBRdZHJ6Cryn5pTHfg0vagOb73qiywAq4VI8mdQxX7VjfVvgGz0AgS+cZHN4 j9B11stkPCCd+J8HAxzv4P7yOISC/7LtG9mR6gZs0l4hNI0pGXMyTOFkDhnUdUPBn4rM Cako/vMkWizFdt3K3HyQfR4huJy/aNLxwFH5Wxwmf28XzgK6aYTXoM6MfA66ACviGGYg /UDEqZ73EdRBSdDwpdQbejkriiI4P73i6xhJNLJLb+Yq0gVwHIrkiHwqpnhCa6OsqKnM 4pZw== X-Gm-Message-State: AOJu0Yx/tuwBcSuXznl0GuT8d3FtefXNiPjZ2Fj5z64msi5Z9OVWKcOm 811fE40qFlhwxYsVMw+oYxfU8pDK99DJ/XPRIJesL95VPZFgCRoZ5WYAGtUcgnAPjmNPEl2azOy yObXEqsHivQ== X-Gm-Gg: ASbGnct4T3o7yTdC07gRCjn9OZHG9s0VuX/88YvryTveJYtBLRjH+l5OI3zl4wybRLC idlMTIOIdKB1ry8ab3so/+jQTmdFl8XtylvMxB0xid7wdCceFL6wIiMhpscH9iSLxR2LZ77+k6Y wu7h4ofei5IfCoqyMuDiN6Id3VnDivpl6YTnYymyZlEkN8HEVJinwjCSJcQIQYtQvKkQ8giw54a 2A3t0JMT9vy7gl1F6uhG2gdG1h9sMxhguFsVyQNvvufEBannBObeaXiLzAPvXQgiAYCBM2p3aI3 enV40kphKdiTUkTl7e9wNfOqYbKaquXNgoo4b24X4Sv7WHX39fkG0LvvMCU1HgcZ1pMpaDP34BV 8a0ZbFQwBulw+Sh2XPd0f3bme381SdCRPq1rHzZWpXZQAPtYJGMLFJKmShkqdUqeyGK7CH94ahG zf X-Google-Smtp-Source: AGHT+IEG58dhEhZvnXvn8P7XJ4Ia6N+uuMUqPSmCPFS+5ao3mhFWC8kyh0y+xvyOS8aJcQXH8hEdqw== X-Received: by 2002:a05:600c:450f:b0:455:fab4:4b80 with SMTP id 5b1f17b1804b1-4562e275cd0mr37034325e9.19.1752687101375; Wed, 16 Jul 2025 10:31:41 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 6/6] x86/apic: Convert the TSC deadline errata table to X86_MATCH_*() Date: Wed, 16 Jul 2025 18:31:32 +0100 Message-Id: <20250716173132.2213891-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716173132.2213891-1-andrew.cooper3@citrix.com> References: <20250716173132.2213891-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1752687133609116600 With the ability to match on steppings, introduce a new X86_MATCH_VFMS() helper to match a specific stepping, and use it to rework deadline_match[]. Notably this removes the overloading of driver_data possibly being a functi= on pointer, and removes the latent bug where the target functions are missing ENDBR instructions owing to the lack of the cf_check attribute. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 The bloat-o-meter summary shows that the use of functions really wasn't the wisest idea: add/remove: 0/3 grow/shrink: 1/2 up/down: 80/-146 (-66) Function old new delta deadline_match 224 304 +80 APIC_init_uniprocessor 334 331 -3 skx_deadline_rev 30 - -30 CSWTCH 335 299 -36 hsx_deadline_rev 38 - -38 bdx_deadline_rev 39 - -39 --- xen/arch/x86/apic.c | 79 +++++++--------------------- xen/arch/x86/include/asm/match-cpu.h | 5 ++ 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index c4272ab4de4f..744124185189 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1051,64 +1051,32 @@ static void setup_APIC_timer(void) local_irq_restore(flags); } =20 -#define DEADLINE_MODEL_MATCH(m, fr) \ - { .vendor =3D X86_VENDOR_INTEL, .family =3D 6, .model =3D (m), \ - .feature =3D X86_FEATURE_TSC_DEADLINE, \ - .driver_data =3D (void *)(unsigned long)(fr) } +static const struct x86_cpu_id __initconst deadline_match[] =3D { + X86_MATCH_VFMS(INTEL_HASWELL_X, 0x2, 0x3a), /* EP */ + X86_MATCH_VFMS(INTEL_HASWELL_X, 0x4, 0x0f), /* EX */ =20 -static unsigned int __init hsx_deadline_rev(void) -{ - switch ( boot_cpu_data.x86_mask ) - { - case 0x02: return 0x3a; /* EP */ - case 0x04: return 0x0f; /* EX */ - } + X86_MATCH_VFM (INTEL_BROADWELL_X, 0x0b000020), =20 - return ~0U; -} + X86_MATCH_VFMS(INTEL_BROADWELL_D, 0x2, 0x00000011), + X86_MATCH_VFMS(INTEL_BROADWELL_D, 0x3, 0x0700000e), + X86_MATCH_VFMS(INTEL_BROADWELL_D, 0x4, 0x0f00000c), + X86_MATCH_VFMS(INTEL_BROADWELL_D, 0x5, 0x0e000003), =20 -static unsigned int __init bdx_deadline_rev(void) -{ - switch ( boot_cpu_data.x86_mask ) - { - case 0x02: return 0x00000011; - case 0x03: return 0x0700000e; - case 0x04: return 0x0f00000c; - case 0x05: return 0x0e000003; - } + X86_MATCH_VFMS(INTEL_SKYLAKE_X, 0x3, 0x01000136), + X86_MATCH_VFMS(INTEL_SKYLAKE_X, 0x4, 0x02000014), =20 - return ~0U; -} + X86_MATCH_VFM (INTEL_HASWELL, 0x22), + X86_MATCH_VFM (INTEL_HASWELL_L, 0x20), + X86_MATCH_VFM (INTEL_HASWELL_G, 0x17), =20 -static unsigned int __init skx_deadline_rev(void) -{ - switch ( boot_cpu_data.x86_mask ) - { - case 0x00 ... 0x02: return ~0U; - case 0x03: return 0x01000136; - case 0x04: return 0x02000014; - } - - return 0; -} - -static const struct x86_cpu_id __initconstrel deadline_match[] =3D { - DEADLINE_MODEL_MATCH(0x3c, 0x22), /* Haswell */ - DEADLINE_MODEL_MATCH(0x3f, hsx_deadline_rev), /* Haswell EP/EX */ - DEADLINE_MODEL_MATCH(0x45, 0x20), /* Haswell D */ - DEADLINE_MODEL_MATCH(0x46, 0x17), /* Haswell H */ + X86_MATCH_VFM (INTEL_BROADWELL, 0x25), + X86_MATCH_VFM (INTEL_BROADWELL_G, 0x17), =20 - DEADLINE_MODEL_MATCH(0x3d, 0x25), /* Broadwell */ - DEADLINE_MODEL_MATCH(0x47, 0x17), /* Broadwell H */ - DEADLINE_MODEL_MATCH(0x4f, 0x0b000020), /* Broadwell EP/EX */ - DEADLINE_MODEL_MATCH(0x56, bdx_deadline_rev), /* Broadwell D */ + X86_MATCH_VFM (INTEL_SKYLAKE_L, 0xb2), + X86_MATCH_VFM (INTEL_SKYLAKE, 0xb2), =20 - DEADLINE_MODEL_MATCH(0x4e, 0xb2), /* Skylake M */ - DEADLINE_MODEL_MATCH(0x55, skx_deadline_rev), /* Skylake X */ - DEADLINE_MODEL_MATCH(0x5e, 0xb2), /* Skylake D */ - - DEADLINE_MODEL_MATCH(0x8e, 0x52), /* Kabylake M */ - DEADLINE_MODEL_MATCH(0x9e, 0x52), /* Kabylake D */ + X86_MATCH_VFM (INTEL_KABYLAKE_L, 0x52), + X86_MATCH_VFM (INTEL_KABYLAKE, 0x52), =20 {} }; @@ -1125,14 +1093,7 @@ static void __init check_deadline_errata(void) if ( !m ) return; =20 - /* - * Function pointers will have the MSB set due to address layout, - * immediate revisions will not. - */ - if ( (long)m->driver_data < 0 ) - rev =3D ((unsigned int (*)(void))(m->driver_data))(); - else - rev =3D (unsigned long)m->driver_data; + rev =3D (unsigned long)m->driver_data; =20 if ( this_cpu(cpu_sig).rev >=3D rev ) return; diff --git a/xen/arch/x86/include/asm/match-cpu.h b/xen/arch/x86/include/as= m/match-cpu.h index 3862e766ccfc..b491232c351f 100644 --- a/xen/arch/x86/include/asm/match-cpu.h +++ b/xen/arch/x86/include/asm/match-cpu.h @@ -35,6 +35,11 @@ struct x86_cpu_id { VFM_MODEL(vfm), X86_STEPPINGS_ANY, \ X86_FEATURE_ANY, data) =20 +#define X86_MATCH_VFMS(vfm, stepping, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), \ + VFM_MODEL(vfm), 1U << (stepping), \ + X86_FEATURE_ANY, data) + /* * x86_match_cpu() - match the CPU against an array of x86_cpu_ids[] * --=20 2.39.5