From nobody Thu Oct 30 22:51:11 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=1752848428; cv=none; d=zohomail.com; s=zohoarc; b=KfjFXppp61fBdQqj/bm8avysXBJcivksI0SEjqz9e0blDVkwEZyOeWTgbSuTWhXiMV5JNY0CbAj9GASiDochrhjsgKLKDT2or+o7rJ6hooWjjnDx/l5QC45UgJwkIO1bILMJUIN/INszSKgQdeDbXQrGpgmAnLrRWf9oj5mfE8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752848428; 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=1Dd0w/YkSH/FDbEpEMowhfozFRDqaxbwtwJrk5OT7EU=; b=TKbFEEITJG3pMCJwFAoEKlkpRG7rLq5fPdv0aW7XvuU++gkKVuezFalk4IleGn6+ud0p43cayJa1j+H7ZnhWeG2FbF2gaVm+Lzp53DQuka9qeFYxXcO/JWroPbUVx3PUblMEBq02sxMwgOBTCu0KGJSkVudWT4GSPFchNLfPb08= 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 1752848428631629.7388730814494; Fri, 18 Jul 2025 07:20:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1048843.1419051 (Exim 4.92) (envelope-from ) id 1uclwd-0006Ab-Dg; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (output) from mailman id 1048843.1419051; Fri, 18 Jul 2025 14:20:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uclwd-00069d-91; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (input) for mailman id 1048843; Fri, 18 Jul 2025 14:20:14 +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 1uclwb-0005sv-WC for xen-devel@lists.xenproject.org; Fri, 18 Jul 2025 14:20:14 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 50dd1b5c-63e2-11f0-b894-0df219b8e170; Fri, 18 Jul 2025 16:20:12 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3a4f379662cso1601779f8f.0 for ; Fri, 18 Jul 2025 07:20:12 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b61ca48cb9sm2005490f8f.45.2025.07.18.07.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 07:20:10 -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: 50dd1b5c-63e2-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1752848411; x=1753453211; 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=1Dd0w/YkSH/FDbEpEMowhfozFRDqaxbwtwJrk5OT7EU=; b=ZpjjHRw3P4Jzn7bcK1kTO/10FYok+bew7lH1DJvDg1NeIMwRvFtb83108gBzf4wCSh HBrgop+dArEwibzwd56Tt1GI286DWvHHe0xrJLQUbQeWJVduyTJUW41MyNnQSl/DbQAX tOAtuNALTiK0pzm8ZnZkUyp8mny7ALqno0zmc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752848411; x=1753453211; 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=1Dd0w/YkSH/FDbEpEMowhfozFRDqaxbwtwJrk5OT7EU=; b=WsSuZPn2vp1fAY7rnOlpOiqfLCn79FVe95TWJVFeQIXmz4mF3qEikfaoJ/ekQ4xzom 8MfDn59+1pq9GnPj44GatMrY3LMVAxkcF/b+nLqNZkHwZwAKU1OgjfesPZ8cvhCkbXNL KhE72jz7a2/Ba85vrAFQZLlVEp5Gdc9ZBwCAIky0zkb7rSTKbBsKUTGAHsbBxZXza5hs w2cMKlLBMk+RaO0hgYB1UwiyA3XMgt/K9I3qlVyD+3GJq6rrIsrl5lYWodWU0FRcccMX LrGhrzDad/WVVmgUeZsQuNv9VnKhp6iVKvQnjHJ+95LGE4eKEPlvyifgGu1CQuqTE3Iy 6UAw== X-Gm-Message-State: AOJu0YwtmwrfLqLrxTvEzY0jLJZd5XFtlbHCRgmzjVfq3xBQGuZWKSIm b9dJdKhdQ2gf8gAuTFlVE5aCko6XP2qzxcyvenA/Fy2vheKykQcLah6EMb9AyXWodUbDuupgIRt mY6w1oHQrnQ== X-Gm-Gg: ASbGncupgO8xT9+E/wamcKnqqAMrjGE4q2bW/IrgcsWlhTeatQfvY8jVRmxH8WDBeZp p2sJqzAQy3aIfa4leFntz5EtkH/su3H0fBc/gRou0H9wZzM2POkufsDa0KO8b+6Zv0WR3+NzMrB cKaFdmejtlxTBY0OaxV0JpSht/JSJ2LeCIEx90efK2b3ubllLs1PLgKbjpGLTWK0IPHDToYgA/L w2QtJl01zSejZXP909mUSWaD37hxoo3YjICG7JxbX3okG0QBJjWZ/Vhinkyct2OxrA1nhjiRAss fy3E37rZ6Zy3xEef41xV34YqiIOFHa9Dnf63mr5TRWQQRXF11NEJJD6qq88WFgUeC7T5/0nqJXd bKkLjyRXh3emGgAlhW6YpQgIJ2XliXrReMoyC9Pj89UIYVOgw+7Ii7s2NhNbrE6Ke/ShF41XJSV xfHWGY1OcJIO4= X-Google-Smtp-Source: AGHT+IE9nGXTZitxr81meInQyut8aU/u+gVr7Mes1WvVubhCsLQRqZXy5l2rWotlZ0sdQizDg1wgjA== X-Received: by 2002:a05:6000:2882:b0:3b4:9721:2b19 with SMTP id ffacd0b85a97d-3b60e4b8693mr9647013f8f.11.1752848411159; Fri, 18 Jul 2025 07:20:11 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v2 1/3] x86/match-cpu: Improvements to x86_match_cpu() Date: Fri, 18 Jul 2025 15:20:04 +0100 Message-Id: <20250718142006.2471129-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250718142006.2471129-1-andrew.cooper3@citrix.com> References: <20250718142006.2471129-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: 1752848429995116600 Xen's use of struct x86_cpu_id is a bit different to Linux's, so we can simplify the loop termination condition. Leave a comment explaining Xen's assumptions. Switch to Xen style, as we've properly devated from Linux, and switch to the new vendor/family/model names. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 v2: * New There is a marginal code generation improvement, because of not needing to hold as many registers live over the loop termination check. --- xen/arch/x86/cpu/common.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f221b9497c61..a659ea7bf604 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -1007,19 +1007,26 @@ void cpu_uninit(unsigned int cpu) =20 const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]) { - const struct x86_cpu_id *m; - const struct cpuinfo_x86 *c =3D &boot_cpu_data; + const struct x86_cpu_id *m; + const struct cpuinfo_x86 *c =3D &boot_cpu_data; =20 - for (m =3D table; m->vendor | m->family | m->model | m->feature; m++) { - if (c->x86_vendor !=3D m->vendor) - continue; - if (c->x86 !=3D m->family) - continue; - if (c->x86_model !=3D m->model) - continue; - if (!cpu_has(c, m->feature)) - continue; - return m; - } - return NULL; + /* + * Although derived from Linux originally, Xen has no valid rows where + * ->vendor is nonzero, so used this in place of checking all metadata. + */ + for ( m =3D table; m->vendor; m++ ) + { + if ( c->vendor !=3D m->vendor ) + continue; + if ( c->family !=3D m->family ) + continue; + if ( c->model !=3D m->model ) + continue; + if ( !cpu_has(c, m->feature) ) + continue; + + return m; + } + + return NULL; } --=20 2.39.5 From nobody Thu Oct 30 22:51:11 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=1752848435; cv=none; d=zohomail.com; s=zohoarc; b=lOVW65Waxu0w5FGSLzuZfkXtjrbhB83ydB4ha97ze6E3JTWlHWx+r8hEQtvvoHuanvCRnvhaSC2RelRFHpewChlvlH0bzVy/1iqL5arTLlp3JEqvmm92L/DrQHMRtAmBKjU93l6OqkTT9lO9Vk+RFbDDDa+WDuti2z/AhLjtouk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752848435; 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=xNGMNjfHX3Gm4WUa0mGufOewm724HaRVU6o6GBgJXW4=; b=URphfdvL11jw4qhOVmXnudUMqG8Sg9/xxSsYhBfjdpaFZEEQuaSIRMQcwPOSHWE3t+rohwlFOIgR8aO3DMPDre5RTGeA/nALUT8IZ2TYj6DB110rhjjRvqHeteoCeS8HBsg6WIrA4pf9Uxc6kaxxaSIdDvmNJ1DWbRfMhQpmsSc= 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 1752848435274341.8326773041207; Fri, 18 Jul 2025 07:20:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1048842.1419045 (Exim 4.92) (envelope-from ) id 1uclwd-000678-4P; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (output) from mailman id 1048842.1419045; Fri, 18 Jul 2025 14:20:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uclwd-000671-0k; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (input) for mailman id 1048842; Fri, 18 Jul 2025 14:20:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uclwb-0005sk-6u for xen-devel@lists.xenproject.org; Fri, 18 Jul 2025 14:20:13 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 514da7ed-63e2-11f0-a319-13f23c93f187; Fri, 18 Jul 2025 16:20:12 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-455b00339c8so16420805e9.3 for ; Fri, 18 Jul 2025 07:20:12 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b61ca48cb9sm2005490f8f.45.2025.07.18.07.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 07:20:11 -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: 514da7ed-63e2-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1752848412; x=1753453212; 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=xNGMNjfHX3Gm4WUa0mGufOewm724HaRVU6o6GBgJXW4=; b=fjhkkCfihJNjEC46zVLUcyYbLthbLzoFrgyUYPA/lcL/hF/AX2zI2aPO2JKt9NcZmn 0j8MvZxAYMky0eJStrBJ5aSA/6ZLdNHElLCz6k22oqj69RuMMYpgGkT5MoUazDHLkXZX 0m1fyDqyjUC96G0LbCcPPj6cZqcnhkPRIsyzY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752848412; x=1753453212; 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=xNGMNjfHX3Gm4WUa0mGufOewm724HaRVU6o6GBgJXW4=; b=j04hiE3Lpeo0I866x9v2aeyTyb9D50222vX4v0ZRxtpEkbfJuM1/v5uAOFRpDpDyEF eqFzCpAo5lNap73hq6A9JdW7xbIsKOpxOntEQ0wsx40fUOb6P45WFgN/qOl4iRKzzJ0b rlzymGUy9Euyxh6VktyjpxMQRFZu/YqVjEPGMx+kQckg5GVL/CUk7Y22nT3H48/AX1Vu 6sUzgC7PdYRPXPm8QeZO7sIl99xK18DKgCexr/Jv7X4EOPc8tvbzpST5BIOQMRrkeHgf f6XkiEBGVlTLu9bSpzju2ZoR+Sk6Crz0cujfpX2GHjXYaXYKkHJkPUoKFfy9ezAhKYqJ WfvQ== X-Gm-Message-State: AOJu0YxD/wuGNsDmXopHfHZo3O0ZLtsaMZI3kOlVywzGcvxKurguoRWl zN4W1JpBHcWZ3J7Z/EHJj6zQ3ymTptL+vmi4BMibC+05QZK3URbnZ/3d6hZCIALmTEuiIfg/pwU JDnq91VaG+A== X-Gm-Gg: ASbGncsdFtzK7bpSivqYChSYX2JOU/nfsOH4BJ1HXxaaneCmS7ZMm5brpKqNJu+NS7u Z2Qtaf1IAsMdcN5aikGGVyQDUXUpc3tn+KLOhX74mEe6zYYsMSMTfCayM2S3XuOyt7AWI+eEM6I nenxLj3D26q2P8ch33ZAUcDlZK2zhmxLK/QiHOjVa0py/uNcrMH6wJIWKM8lIk1rPerSzZTqZ/w vldy1aMoLKD8vipSNU1Neru7OO4SXPlz9B76boGwY4NSTPUANmg8BPkir1I9oN0ox507k40bz5A s4CLsfTIldx0vBM4OeyQyxbV5j17IoXPLL3LdmhDpb6SYAf5KSlC2gotXSTGiQRAuCFtNXzak9e ZS1Q4//jakxnszN6W/Iud+zReqb9VCgiR+rCnIBvVB0RY5BCUQ2NUew5z9iUyLsaw1IW84yHSkP 31Xyr3g8T/mmw= X-Google-Smtp-Source: AGHT+IFhb7WdfMMY78VTdNv7VeT/DANHpijhJu0rJbUbAdyEsjzoMpxvQtczimyLV67RPJ3IOW6USg== X-Received: by 2002:a05:600c:674a:b0:456:2b4d:d752 with SMTP id 5b1f17b1804b1-4562e373e16mr98695205e9.20.1752848412033; Fri, 18 Jul 2025 07:20:12 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v2 2/3] x86/match-cpu: Support matching on steppings Date: Fri, 18 Jul 2025 15:20:05 +0100 Message-Id: <20250718142006.2471129-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250718142006.2471129-1-andrew.cooper3@citrix.com> References: <20250718142006.2471129-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: 1752848436249116600 Architecturally, stepping is a 4-bit field, so a uint16_t suffices for a bitmap of steppings. In order to keep the size of struct x86_cpu_id the same, shrink the vendor = and family fields; there's no need for them to be uint16_t in Xen, and this matches the size of the fields in cpuinfo_x86. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 v2: * Rebase over adjustments to x86_match_cpu(). * Switch name to X86_STEPPING_ANY, and use 0xffff to remove a conditional from x86_match_cpu(). Combined with the previous patch, the code generation continues to be reasonable despite the analysis tangent taken on the v1 thread. --- xen/arch/x86/cpu/common.c | 2 ++ xen/arch/x86/include/asm/match-cpu.h | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index a659ea7bf604..7851142b737d 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -1022,6 +1022,8 @@ const struct x86_cpu_id *x86_match_cpu(const struct x= 86_cpu_id table[]) continue; if ( c->model !=3D m->model ) continue; + if ( !((1U << c->stepping) & m->steppings) ) + continue; if ( !cpu_has(c, m->feature) ) continue; =20 diff --git a/xen/arch/x86/include/asm/match-cpu.h b/xen/arch/x86/include/as= m/match-cpu.h index f8e4e37d9972..e25f414ea1b4 100644 --- a/xen/arch/x86/include/asm/match-cpu.h +++ b/xen/arch/x86/include/asm/match-cpu.h @@ -8,28 +8,32 @@ #include #include =20 +#define X86_STEPPING_ANY 0xffff #define X86_FEATURE_ANY X86_FEATURE_LM =20 struct x86_cpu_id { - uint16_t vendor; - uint16_t family; + uint8_t vendor; + uint8_t family; uint16_t model; + uint16_t steppings; /* Stepping bitmap, or X86_STEPPING_ANY */ uint16_t feature; /* X86_FEATURE_*, or X86_FEATURE_ANY */ const void *driver_data; }; =20 -#define X86_MATCH_CPU(v, f, m, feat, data) \ +#define X86_MATCH_CPU(v, f, m, steps, feat, data) \ { \ .vendor =3D (v), \ .family =3D (f), \ .model =3D (m), \ + .steppings =3D (steps), \ .feature =3D (feat), \ .driver_data =3D (const void *)(unsigned long)(data), \ } =20 #define X86_MATCH_VFM(vfm, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), X86_FEATURE_ANY, data) + VFM_MODEL(vfm), X86_STEPPING_ANY, \ + X86_FEATURE_ANY, data) =20 /* * x86_match_cpu() - match the CPU against an array of x86_cpu_ids[] --=20 2.39.5 From nobody Thu Oct 30 22:51:11 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=1752848437; cv=none; d=zohomail.com; s=zohoarc; b=erkixVliVNuEe1ereT4KLX6p3CXcDrIY/ZxAcIjMcgwp1Cn8yrrciO7Xqya8m0XdW5tP5/lCVlP0m3AXpskBiBn27iXpKzVOZ6FXpJjyXSRCCW0iZrOANRWkA0TxOt7AvNoGsZL+Pqy7YeKRt/Ed9c6pjCFxNdhl3k85AMdISYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752848437; 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=YElKLyiSf6iRZVbIUiya2Igy3WhWeDaluxJE0+b/rwI=; b=iHYnugBdVNnugv5aA6mSo9KWAq8tr38uJ/cMVjR3mTjfYwUbhRAdfe8m/bAVyjItAZb1tWJCH0s0u8Im3iE4jJThJVT9WffEEt+TScHelovl8CwdkJuXbBxNsQ6OhOJZjV1eicuC2uwdVTjtflZ0hYmRV/pm1FXIvpVmW+F+nBo= 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 1752848437672709.720493659988; Fri, 18 Jul 2025 07:20:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1048844.1419056 (Exim 4.92) (envelope-from ) id 1uclwd-0006GV-QJ; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (output) from mailman id 1048844.1419056; Fri, 18 Jul 2025 14:20:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uclwd-0006FZ-Iv; Fri, 18 Jul 2025 14:20:15 +0000 Received: by outflank-mailman (input) for mailman id 1048844; Fri, 18 Jul 2025 14:20:14 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uclwc-0005sk-40 for xen-devel@lists.xenproject.org; Fri, 18 Jul 2025 14:20:14 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 51d8db19-63e2-11f0-a319-13f23c93f187; Fri, 18 Jul 2025 16:20:13 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4563cfac2d2so6110435e9.3 for ; Fri, 18 Jul 2025 07:20:13 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b61ca48cb9sm2005490f8f.45.2025.07.18.07.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 07:20:12 -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: 51d8db19-63e2-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1752848413; x=1753453213; 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=YElKLyiSf6iRZVbIUiya2Igy3WhWeDaluxJE0+b/rwI=; b=Bn2hkEIOYaiQrTx6fIhew/SNX0iW1uRoAMJN4ezgFO+N3SKHe/y0RD++vscXi8I6RC 9asf/3XwGD2rmxBXbfUr48nv6dEKWSU35xdEwFgssmgDSzsDEiGyeE0JwvL2IxYHQuXz mAFLWD0x3o+cwlAY5PUPwSlI+GbOxspX4MAfU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752848413; x=1753453213; 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=YElKLyiSf6iRZVbIUiya2Igy3WhWeDaluxJE0+b/rwI=; b=v2c8E6xBYoGxduS8SmrYMGmVKRSdTHdemzFHzGQieqKG9LbwccVzjfxuE+yNgHEqkX Z7mtkpo6qocuaCQl5Zd/PHc92u8MxMD0dnQEJCZ5G/jRxgCnW7J/81YyHc49t7xWv3Z7 WT9vhhRiT62EofZpQrwuXcxBaK4KmQPjBGWHV/lX5BwzBeDeXE9ZhTIqdsZ3tIHgnGRl HfsNsOV4eytETqh98vlP27mdHRd7/jjODz90i1AUpImBT8sBuysk/QZKT+/jg/oMT/O7 aXOWkMjEpIf8m+ymJ6rDeuYGQ5xAPvVPg5JL3KuqYkoGBLwb5ZsPBwEpXazt/XjKex5n BdUQ== X-Gm-Message-State: AOJu0YyvO34OQB46OtUu+1ZaPFbdFCNhflyRLFKGR492ssS/ogvgxrYT stE2EY3oTRG6CCCpJnl3wpnWbRKksNywW4ojZvy5Av31IMSBdyP4L0WVynfjFWNFO3y/tJf6kfM G9WrGg670ww== X-Gm-Gg: ASbGncscuw3aJHVqO/43SppF+yaSfBdPvgWp8NxsMBlEF/rHjWi2TXgubwbkDNT0e4t qZHPkqHcntITUHff+7o/+VojanIWJ0CUFy0pGrN3XwvTvJ8h0jCyrOldwI92OD/nw51l1rdcPIx 6ZQrWRjGAPuddgXjX1qdid78KzsECEShPOj+sKPDX6LXGvsFBWTUcJFPp1N5WMqzeGq1GUy0VsZ zQxvKKNIgke8asQsZtCURqrIGiPEVjHg2cbXkICtfHjFEgAQrSpb3j365znjoao7xJp2UXPlEZg TLWxr3zcDNRaGJPG9WcLBL7BbMWsSnbiofFwMKWHm1PWIYf1vftkADF4MtzeOgSaXbOR8ozVqaj 6MxKY94p4kKs37QbUpVRvHFyG5G+7NziR5gtcOShJhFlJoyBB670aRBuZTwbzHlWtBuTRbgAC4R 3t X-Google-Smtp-Source: AGHT+IFsqmDtDL0W7m2uoMV6idneKeegAhMuNt11HC4G9I7LiPLy2NFX2KdvjCLKxVxBheSqypPnUA== X-Received: by 2002:a05:600c:468b:b0:456:2419:dc05 with SMTP id 5b1f17b1804b1-4562e33db7fmr119715235e9.12.1752848412917; Fri, 18 Jul 2025 07:20:12 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v2 3/3] x86/apic: Convert the TSC deadline errata table to X86_MATCH_*() Date: Fri, 18 Jul 2025 15:20:06 +0100 Message-Id: <20250718142006.2471129-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250718142006.2471129-1-andrew.cooper3@citrix.com> References: <20250718142006.2471129-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: 1752848438407116600 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[]. Currently, the table is scanned on all systems, even those without the TSC_DEADLINE feature. Introduce another early exit for that case, which removes the need to encode every row in the table with TSC_DEADLINE. 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 Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 v2: * Move deadline_match[] into check_deadline_errata() which produces a far more legible diff. * Check for TSC_DEADLINE early and skip the search on non-capable CPUs. 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 | 95 +++++++--------------------- xen/arch/x86/include/asm/match-cpu.h | 5 ++ 2 files changed, 29 insertions(+), 71 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index c4272ab4de4f..0fd8bdba7067 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1051,88 +1051,41 @@ 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 unsigned int __init hsx_deadline_rev(void) -{ - switch ( boot_cpu_data.x86_mask ) - { - case 0x02: return 0x3a; /* EP */ - case 0x04: return 0x0f; /* EX */ - } - - return ~0U; -} - -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; - } - - return ~0U; -} - -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 */ - - 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 */ - - 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 */ - - {} -}; - static void __init check_deadline_errata(void) { + static const struct x86_cpu_id __initconst deadline_match[] =3D { + X86_MATCH_VFM (INTEL_HASWELL, 0x22), + X86_MATCH_VFMS(INTEL_HASWELL_X, 0x2, 0x3a), + X86_MATCH_VFMS(INTEL_HASWELL_X, 0x4, 0x0f), + X86_MATCH_VFM (INTEL_HASWELL_L, 0x20), + X86_MATCH_VFM (INTEL_HASWELL_G, 0x17), + X86_MATCH_VFM (INTEL_BROADWELL, 0x25), + X86_MATCH_VFM (INTEL_BROADWELL_G, 0x17), + X86_MATCH_VFM (INTEL_BROADWELL_X, 0x0b000020), + 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), + X86_MATCH_VFM (INTEL_SKYLAKE_L, 0xb2), + X86_MATCH_VFM (INTEL_SKYLAKE, 0xb2), + X86_MATCH_VFMS(INTEL_SKYLAKE_X, 0x3, 0x01000136), + X86_MATCH_VFMS(INTEL_SKYLAKE_X, 0x4, 0x02000014), + X86_MATCH_VFM (INTEL_KABYLAKE_L, 0x52), + X86_MATCH_VFM (INTEL_KABYLAKE, 0x52), + {} + }; + const struct x86_cpu_id *m; unsigned int rev; =20 - if ( cpu_has_hypervisor ) + if ( cpu_has_hypervisor || !boot_cpu_has(X86_FEATURE_TSC_DEADLINE) ) return; =20 m =3D x86_match_cpu(deadline_match); 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 e25f414ea1b4..6d535c41c713 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_STEPPING_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